6805 files changed, 122850 insertions, 79716 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 68fe76d9f7..c67c6e9601 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,5326 @@
+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.
+academic/Gridcoin-Research: Fix README.
+academic/ITK: Fix README.
+academic/Kst: Fix README.
+academic/MetaPhlAn2: Fix README.
+academic/Mnemosyne: Fix README.
+academic/OpenFOAM: Fix README.
+academic/PyAMG: Fix README.
+academic/ViennaRNA: Fix README.
+academic/WordNet: Fix README.
+academic/Xyce: Fix README.
+academic/abella: Fix README.
+academic/aenig4: Fix README.
+academic/amd: Fix README.
+academic/antiprism: Fix README.
+academic/aris: Fix README.
+academic/armadillo: Fix README.
+academic/arpack-ng: Fix README.
+academic/artha: Fix README.
+academic/avogadro: Fix README.
+academic/bibus: Fix README.
+academic/boinc: Fix README.
+academic/bpp1.9-phyl: Fix slack-desc.
+academic/btf: Fix README.
+academic/calcoo: Fix README.
+academic/cap3: Fix README.
+academic/cblas: Fix README.
+academic/cdo: Fix README, slack-desc, script.
+academic/cholmod: Fix README.
+academic/cld2: Fix README.
+academic/colin: Fix README.
+academic/convertall: Fix README.
+academic/csparse: Fix README.
+academic/dakota: Fix README.
+academic/ed-v6: Fix README.
+academic/engauge: Fix README.
+academic/ess: Fix README.
+academic/fann: Fix README.
+academic/fityk: Fix README.
+academic/flann: Fix README.
+academic/free42: Fix README.
+academic/gcompris-qt: Fix README.
+academic/gcompris: Fix README.
+academic/geda-gaf: Fix README.
+academic/gerbv: Fix README.
+academic/getdp: Fix README, slack-desc.
+academic/ggobi: Fix README.
+academic/gmsh: Fix README, slack-desc.
+academic/gnucap: Fix README.
+academic/grace: Fix README.
+academic/grpn: Fix README.
+academic/gtkwave: Fix README.
+academic/jpicedt: Fix README.
+academic/kiwisolver: Fix README.
+academic/klu: Fix README.
+academic/lapack95: Convert script to utf-8.
+academic/lapacke: Fix README.
+academic/ldl: Fix README.
+academic/libqalculate: Fix README.
+academic/link-grammar: Fix README.
+academic/mathomatic: Fix README.
+academic/meep: Fix README, slack-desc.
+academic/mpb: Fix README, slack-desc.
+academic/nco: Remove template comments.
+academic/pari: Fix README.
+academic/parmetis: Fix README.
+academic/pianobooster: Fix README.
+academic/sage: Fix README, info.
+academic/scipy: Fix README.
+academic/siril: Fix README.
+academic/stellarium: Fix README.
+academic/suitesparseconfig: Fix README.
+academic/tiemu: Fix README.
+academic/treerecs: Fix README, install doinst.
+academic/tuxmath: Fix README.
+academic/verilog: Fix README.
+academic/wmcalc: Fix README.
+academic/xephem: Fix README.
+academic/xfoil: Fix README.
+accessibility/Synkron: Fix README.
+accessibility/easystroke: Fix README.
+accessibility/speech-dispatcher: Fix dep.
+accessibility/svox: Fix README.
+accessibility/unclutter: Fix README.
+accessibility/xdotool: Fix README.
+audio/MusicMixer: Fix README.
+audio/SuperCollider: Fix README.
+audio/TiMidity++: Fix README.
+audio/alsa-plugin-ffmpeg: Fix README.
+audio/alsamodularsynth: Fix README.
+audio/apulse: Fix README.
+audio/audacious-cue: Fix README.
+audio/calf-ladspa: Fix README.
+audio/calf: Fix README.
+audio/caps: Fix README.
+audio/carla: Fix README.
+audio/chuck: Fix README.
+audio/clam: Fix README.
+audio/connie: Fix README.
+audio/creox4: Fix README.
+audio/cuberok: Fix README.
+audio/decibel-audio-player: Fix README.
+audio/dssi-vst: Fix README.
+audio/eawpats: Fix README.
+audio/ezstream: Fix README, info.
+audio/flac123: Fix README.
+audio/fluid-soundfont: Fix README.
+audio/fluidsynth-dssi: Fix README.
+audio/fmit: Fix README.
+audio/gogglesmm: Fix README.
+audio/grip2: Fix README.
+audio/gtklick: Fix README.
+audio/guitarix: Fix README.
+audio/helm: Fix README.
+audio/herrie: Fix README.
+audio/horgand: Fix README.
+audio/ices-cc: Fix README.
+audio/jack-rack: Fix README.
+audio/jack1: Fix README.
+audio/jackmeter: Fix README.
+audio/jalv: Fix README.
+audio/jamulus: Fix README.
+audio/jvmetro: Fix README.
+audio/kid3: Fix README.
+audio/ladspa-bs2b: Fix README.
+audio/lastfm: Fix README.
+audio/libbs2b: Fix README.
+audio/linuxsampler: Fix README.
+audio/listener: Fix README.
+audio/llcon: Fix README.
+audio/lmms: Fix README.
+audio/lsmi: Fix README.
+audio/lv2dynparam1: Fix README.
+audio/mda-lv2: Fix README.
+audio/mhwaveedit: Fix README.
+audio/midillo: Fix README.
+audio/milkytracker: Fix README.
+audio/minimodem: Fix README.
+audio/mp3blaster: Fix README.
+audio/mp3splt-gtk: Fix README.
+audio/mp3splt: Fix README.
+audio/mppenc: Fix README.
+audio/mt-daapd: Fix README.
+audio/multimidicast: Fix README.
+audio/ncmpc: Fix README.
+audio/ngjackspa: Fix README.
+audio/non: Fix VERSION in .info.
+audio/non: Fix md5sum.
+audio/ntk: Add newline at end of .info.
+audio/ntk: Fix VERSION in .info.
+audio/ocp: Fix README.
+audio/opencore-amr: Fix README.
+audio/oss: Fix README.
+audio/pd: Fix README.
+audio/pd_mrpeach: Fix README.
+audio/pianobar: Fix README.
+audio/playmp3list: Fix README.
+audio/podget: Fix README.
+audio/pogo: Fix README.
+audio/portmidi: Fix README.
+audio/puddletag: Fix README.
+audio/pulseaudio-ctl: Updated for version 1.68.
+audio/python-audiotools: Fix README.
+audio/qm-vamp-plugins: Fix README.
+audio/qmidinet: Fix README.
+audio/quodlibet: Fix README.
+audio/rubyripper: Fix README.
+audio/rumor: Fix README.
+audio/sbagen: Fix README.
+audio/seq24: Fix README.
+audio/sfc: Fix README.
+audio/shell-fm: Fix README.
+audio/sonic-visualiser: Fix README.
+audio/soundconverter: Fix README.
+audio/swh-plugins-lv2: Fix README.
+audio/tagtool: Fix README.
+audio/tap_plugins: Fix README.
+audio/transcribe: Fix README.
+audio/tta: Fix README.
+audio/unsf: Fix README.
+audio/vcf_plugins: Fix README.
+audio/volti: Fix README.
+audio/volume.app: Fix README.
+audio/volwheel: Fix README.
+audio/wineasio: Fix README.
+audio/xforge: Fix README.
+audio/xmms-ladspa: Fix README.
+audio/xmms-scrobbler: Fix README.
+audio/xmms2: Fix README.
+audio/xmp: Fix README.
+business/AssociationSubscribersManager: Fix README.
+business/maltego: Fix README.
+business/openerp-client: Fix README.
+business/openerp-server: Fix README.
+business/reckon: Fix README.
+business/stansoft: Fix README.
+business/tryton: Fix README.
+business/trytond: Fix README.
+desktop/9menu: Fix README.
+desktop/ClipboardViewer: Fix README.
+desktop/LX-Colors-themes: Fix README.
+desktop/aero-mouse-theme: Fix README.
+desktop/afterstep: Fix README.
+desktop/ambiance-radiance-flat-colors-gtk-theme: Fix README.
+desktop/anki: Fix README.
+desktop/avant-window-navigator: Fix README.
+desktop/awesome-appmenu: Fix README.
+desktop/awoken-icon-theme: Fix README.
+desktop/bashish: Fix README.
+desktop/bmpanel2: Fix README.
+desktop/bukubrow: Fix README.
+desktop/cairo-compmgr: Fix README.
+desktop/clearlooks-phenix-theme: Fix README.
+desktop/clipmenu: Fix README.
+desktop/cmatrix: Fix README.
+desktop/compiz-boxmenu: Fix README.
+desktop/conky-manager: Fix README.
+desktop/crystal: Fix README.
+desktop/crystalcursors: Fix README.
+desktop/ctwm: Fix README.
+desktop/cwm-openbsd: Fix README.
+desktop/devilspie: Fix README.
+desktop/dmenu: Fix README.
+desktop/draco: Fix README.
+desktop/dzen2: Fix README.
+desktop/e16.theme.pack: Fix README.
+desktop/e16: Fix README, VERSION in .info.
+desktop/emerald: Fix README.
+desktop/faba-icon-theme: Fix README.
+desktop/ffmpegthumbnailer: Fix README.
+desktop/find-cursor: Fix README.
+desktop/flatpak-builder: Fix README.
+desktop/flatpak: Fix README.
+desktop/florence: Fix README.
+desktop/fvwm-crystal: Fix README.
+desktop/glabels: Fix README.
+desktop/herbstluftwm: Fix README.
+desktop/i3blocks: Remove template comments.
+desktop/i3lock: Fix README.
+desktop/i3minator: Fix README.
+desktop/icewm: Fix README.
+desktop/idesk: Fix README.
+desktop/ion: Fix README.
+desktop/j4-dmenu-desktop: Fix README.
+desktop/keynav: Fix README.
+desktop/lemonbar: Fix README.
+desktop/libqtxdg: Fix README.
+desktop/lumina: Fix README.
+desktop/macopix: Fix README.
+desktop/matrixgl: Fix README.
+desktop/mimi: Fix README.
+desktop/moka-icon-theme: Fix README, slack-desc.
+desktop/moka-minimal: Fix README.
+desktop/moka-themes: Fix README.
+desktop/mousepad: Fix README.
+desktop/murrine: Fix README.
+desktop/neutral: Fix README.
+desktop/nitrogen: Fix README.
+desktop/nitrokey-app: Fix README.
+desktop/obbrowser: Fix README.
+desktop/obmenu: Fix README.
+desktop/obshutdown: Fix README.
+desktop/openbox: Updated for version 3.6.1.
+desktop/parcellite: Fix README.
+desktop/peksystray: Fix README.
+desktop/pekwm: Fix README.
+desktop/perwindowlayoutd: Fix README.
+desktop/pidgin-libnotify: Fix README.
+desktop/plasma-eyasdp: Fix README.
+desktop/plasma-runner-browsefirefoxbookmarks: Fix README.
+desktop/pspshrink: Fix README.
+desktop/qtcurve: Fix README.
+desktop/qtpass: Fix README.
+desktop/ratpoison: Fix README.
+desktop/razercfg: Fix README.
+desktop/razorqt: Fix README.
+desktop/redshift: Fix README.
+desktop/rodent: Fix README.
+desktop/rofi: Fix README.
+desktop/rootactions_servicemenu: Fix README.
+desktop/sawfish: Fix README.
+desktop/screenkey: Fix README.
+desktop/spectrwm: Fix README, template comments.
+desktop/ssr: Fix README.
+desktop/stoken: Fix README.
+desktop/sun: Fix README.
+desktop/superkey-launch: Fix README.
+desktop/sxhkd: Fix README.
+desktop/thunar-archive-plugin: Fix README.
+desktop/thunar-dropbox: Fix README.
+desktop/thunar-media-tags-plugin: Fix README.
+desktop/thunar-thumbnailers: Fix README.
+desktop/tint2: Fix README.
+desktop/uwm: Fix README.
+desktop/vala-panel-appmenu: Fix README.
+desktop/vwm: Fix README.
+desktop/wally: Fix README.
+desktop/weston: Fix README.
+desktop/wmakerconf: Fix README.
+desktop/wmbattery: Fix README.
+desktop/wmcpufreq: Fix README.
+desktop/wmctrl: Fix README.
+desktop/wmii: Fix README.
+desktop/wmimagedock: Fix README.
+desktop/wmix: Fix README.
+desktop/wmname: Fix README.
+desktop/wmpinboard: Fix README.
+desktop/wmstickynotes: Fix README.
+desktop/wmsysmon: Fix slack-desc.
+desktop/wmtime: Fix README.
+desktop/wmtimer: Fix README.
+desktop/x-tile: Fix README.
+desktop/xdg-desktop-portal-gtk: Fix README.
+desktop/xdg-desktop-portal: Fix README.
+desktop/xdm-slackware-theme: Fix README.
+desktop/xed: Fix README.
+desktop/xfce4-embed-plugin: Fix README.
+desktop/xfce4-eyes-plugin: Fix README.
+desktop/xfce4-genmon-plugin: Fix README.
+desktop/xfce4-volumed-pulse: Fix README.
+desktop/xfce4-whiskermenu-plugin: Fix README.
+desktop/xsession: Fix README.
+desktop/xtrascreenhacks: Fix README.
+desktop/xtrlock: Fix README.
+desktop/xvkbd: Fix README.
+desktop/yawp: Fix README.
+development/4th: Fix README.
+development/Arduino: Fix README.
+development/Bottleneck: Fix README.
+development/CImg: Fix README.
+development/CVSTools: Fix README.
+development/Coin: Fix README.
+development/Editra: Fix README.
+development/Fennel: Fix README.
+development/GitEye: Fix README.
+development/J-Link: Fix README.
+development/Mk4tcl: Fix README.
+development/MySQL-python: Fix README.
+development/OpenHantek6022: Fix README.
+development/Pivy: Fix README.
+development/PythonToolkit: Fix README.
+development/ShellCheck-bin: Fix README.
+development/Sphinx: Fix README.
+development/WebStorm: Fix README.
+development/adms: Fix README, slack-desc.
+development/adoptopenjdk-openj9: Fix README.
+development/adoptopenjdk: Fix README.
+development/afl: Fix README.
+development/alloy: Fix README.
+development/amazon-corretto: Fix README.
+development/amd-app-sdk: Fix README.
+development/android-studio: Fix README.
+development/anjuta: Fix README.
+development/apache-ant: Fix README.
+development/apache-jmeter: Fix README.
+development/arduino: Fix README.
+development/arm-binutils: Fix README.
+development/asl: Fix README.
+development/asm6809: Fix README.
+development/astyle: Fix README.
+development/atasm: Fix README.
+development/avr-binutils: Fix README.
+development/avr8-gnu-toolchain: Fix README.
+development/avrdude: Fix README.
+development/bakefile: Fix README.
+development/bas55: Fix README.
+development/bashdb: Fix README.
+development/beav: Fix README.
+development/bed: Fix README.
+development/bigloo: Fix README.
+development/blassic: Fix README.
+development/bless: Fix README.
+development/bluefish: Fix README.
+development/bpython: Fix README.
+development/brackets: Fix README.
+development/brotli: Fix README.
+development/bsdiff: Fix README.
+development/cargo-vendor: Removed (part of cargo).
+development/cc65: Fix README.
+development/ccl: Fix README.
+development/cf-cli: Fix README, script.
+development/cgdb: Fix README.
+development/chibi-scheme: Fix README.
+development/cloc: Fix README.
+development/codeblocks: Fix README.
+development/complexity: Fix README.
+development/cpan2tgz: Fix README.
+development/cppcheck: Fix README.
+development/cppunit: Fix README.
+development/crosstool-ng: Fix README.
+development/crystal-lang: Fix README.
+development/cudatoolkit: Install doinst.
+development/cudnn: Fix README.
+development/cunit: Fix README.
+development/cvsd: Fix README.
+development/cvsps: Fix README.
+development/cxxtest: Fix README.
+development/d-tools: Fix README.
+development/dasht: Fix README.
+development/decklink-sdk: Fix README.
+development/dejagnu: Fix README.
+development/dhex: Fix README.
+development/diakonos: Fix README.
+development/diffuse: Fix README.
+development/dis6502: Fix README.
+development/dmd: Fix README.
+development/docutils: Fix README.
+development/dwarf: Fix README.
+development/dwz: Fix .info.
+development/eagle: Fix README.
+development/eclim: Fix README.
+development/eclipse-cpp: Updated for version 4.17.
+development/eclipse-java: Updated for version 4.17.
+development/eclipse-php: Fix README.
+development/edb-debugger: Fix README.
+development/egypt: Fix README.
+development/energia: Fix README.
+development/enki: Fix README.
+development/envytools: Fix README.
+development/eovim: Fix README.
+development/epydoc: Fix README.
+development/eric: Fix README.
+development/flawfinder: Fix README.
+development/flow: Fix README.
+development/fly: Fix README.
+development/fpc: Fix README.
+development/freetds: Fix README.
+development/frobtads: Fix README.
+development/fsharp: Fix README.
+development/ftnchek: Fix README.
+development/gcc-d: Fix README.
+development/gcclegacy494: Fix README.
+development/gedit: Fix README.
+development/gengetopt: Fix README.
+development/gforth: Fix README.
+development/gnats: Fix README.
+development/gnome-inform7: Fix README.
+development/gnustep-startup: Fix README.
+development/golang-googlecode-gonet: Fix README.
+development/golang-googlecode-gotools: Fix README.
+development/google-appengine-gosdk: Fix README.
+development/google-appengine-pysdk: Fix README.
+development/google-go-lang: Fix README.
+development/gradle: Fix README.
+development/groovy: Fix README.
+development/gtkextra: Fix README.
+development/henplus: Fix README.
+development/hexinator: Fix README.
+development/hhvm: Fix README.
+development/highlight: Fix README.
+development/ht: Removed (duplicate of development/hte).
+development/icecream: Fix README.
+development/idea: Fix README.
+development/idlex: Fix README.
+development/inform: Fix README.
+development/jam: Fix README.
+development/jasspa: Fix README.
+development/jdk11: Fix README.
+development/jdk11: Updated for version 11.0.8 (UNTESTED)
+development/jdk12: Fix README.
+development/jdk13: Fix README.
+development/jdk14: Updated for version 14.0.2 (UNTESTED).
+development/jdk15: Added (Java Platform SDK 15) (UNTESTED).
+development/jdk: Fix README.
+development/jsmin: Fix README.
+development/julia: Fix README.
+development/julius: Fix README.
+development/jupyter-ipyleaflet: Fix README.
+development/jupyter-ipywidgets: Fix README.
+development/jupyter-nbconvert: Fix README.
+development/jupyter-nbdime: Fix README.
+development/jupyter-nbformat: Fix README.
+development/jupyter-notebook: Fix README.
+development/jupyter-qtconsole: Fix README.
+development/jupyter-widgetsnbextension: Fix README.
+development/jupyter_client: Fix README.
+development/jupyter_console: Fix README.
+development/jupyter_core: Fix README.
+development/kconfig-frontends: Fix README.
+development/kdiff3: Fix README.
+development/kicad-footprints: Fix README.
+development/kicad-packages3D: Fix README.
+development/kicad-symbols: Fix README.
+development/kicad-templates: Fix README, slack-desc.
+development/kicad: Fix README.
+development/kotlin: Fix README.
+development/lcov: Fix README.
+development/ldns: Fix README.
+development/lepton-eda: Fix slack-desc.
+development/liquibase: Fix README.
+development/logisim: Fix README.
+development/luajit: Fix README.
+development/lwtools: Fix README.
+development/mads: Fix README.
+development/maude: Fix README.
+development/mawk: Fix README.
+development/mcrl2: Fix README.
+development/mcu8051ide: Fix README.
+development/medit: Fix README.
+development/meld3: Fix README.
+development/meld: Fix README.
+development/memchan: Fix README.
+development/menhir: Fix README.
+development/minikube: Fix README.
+development/mit-scheme: Fix README.
+development/mongodb-compass: Fix README.
+development/mono-addins: Fix README, script encoding.
+development/mono-basic: Fix README.
+development/mono-debugger: Fix script encoding.
+development/mono: Fix README.
+development/mrustc: Fix README.
+development/mtasc: Fix README.
+development/mysql-workbench: Fix README.
+development/newlisp: Fix README.
+development/nim: Fix README.
+development/ninja: Fix README.
+development/noweb: Fix README.
+development/nsis: Fix README.
+development/numpy-legacy3: Fix README.
+development/numpy-legacy: Fix README.
+development/numpy3: Fix README.
+development/numpy: Fix README.
+development/nvi: Fix README.
+development/obcpl: Fix README.
+development/obnc-libext: Fix README.
+development/ocaml: Fix README.
+development/octant: Fix README.
+development/ola: Fix README.
+development/omake: Fix README.
+development/omniORBpy: Fix README.
+development/openjdk6: Fix README.
+development/openjdk7: Fix README.
+development/openjdk8: Fix README.
+development/openocd: Fix README.
+development/osc: Fix README.
+development/p4: Fix README.
+development/p4d: Fix README.
+development/p4v: Fix README.
+development/pandas: Fix README.
+development/pcc: Fix README.
+development/pd-psql: Fix README.
+development/peg: Fix README.
+development/perf: Fix README.
+development/perl-shtags: Fix README.
+development/pforth: Fix README.
+development/pkgdiff: Fix README.
+development/poedit: Fix README.
+development/postman: Updated for version 7.34.0.
+development/processing: Fix README.
+development/pylint: Fix README.
+development/qconf: Fix README.
+development/qt-creator2: Fix README.
+development/quilt: Fix README.
+development/racer: Updated for version 2.1.39.
+development/racket: Fix README.
+development/regexxer: Fix README.
+development/regina-rexx: Fix README.
+development/robotframework: Fix README.
+development/rtags: Fix README.
+development/ruff: Fix README.
+development/rustup: Updated for version 1.22.1.
+development/s51dude: Fix README.
+development/sam: Fix README.
+development/scala: Fix README.
+development/sdcc: Fix README.
+development/shc: Fix README.
+development/shed: Fix README.
+development/smalltalk: Fix README.
+development/smartsvn: Fix README.
+development/snack: Fix README.
+development/snappy: Fix README, script encoding.
+development/source-highlight: Fix README.
+development/sourcenav: Fix README.
+development/spin: Fix README.
+development/splint: Fix README.
+development/spyder: Fix README.
+development/sqlcl: Fix README.
+development/srcML: Fix README.
+development/srecord: Fix README.
+development/staruml: Fix README.
+development/svn-all-fast-export: Fix README.
+development/swfmill: Fix README.
+development/tclvfs: Fix README.
+development/textadept: Fix README.
+development/thread: Fix README.
+development/tkdnd: Fix README.
+development/tora: Fix README.
+development/trac: Fix README.
+development/trf: Fix README.
+development/tweak: Fix README.
+development/ucblogo: Fix README.
+development/uncrustify: Fix README.
+development/unifdef: Fix README.
+development/unittest-cpp: Fix README.
+development/universal-ctags: Fix README.
+development/urn: Fix README.
+development/uz80as: Fix README.
+development/vala-12: Fix README.
+development/velero: Fix README.
+development/viewvc: Fix README.
+development/vis: Fix README.
+development/vispatch: Fix README.
+development/vscode-bin: Updated for version 1.50.1.
+development/vstudio: Fix README.
+development/watchman: Fix README.
+development/xdebug: Fix README.
+development/xnedit: Fix README.
+development/xvi: Fix README.
+development/yarn: Fix README.
+development/yarn: Updated for version 1.22.10.
+development/z88dk: Fix README.
+development/zeal: Fix README.
+development/zope.interface: Fix README.
+games/4digits: Fix README.
+games/Chatbot-Eliza: Fix README.
+games/KoboDeluxe: Fix README.
+games/OpenRA: Fix README.
+games/RetroArch: Updated for version 1.9.0.
+games/SLADE: Fix README.
+games/Scorched3D: Fix README.
+games/VASSAL: Fix README.
+games/VASSAL: Updated for version 3.4.3.
+games/VASSAL: Updated for version 3.4.5.
+games/abe: Fix README.
+games/ags: Fix README.
+games/aisleriot: Fix slack-desc.
+games/alienarena: Fix README.
+games/armagetronad: Fix README.
+games/atanks: Fix doinst.
+games/atari++: Fix README.
+games/atari800: Fix README.
+games/atari800_roms: Fix README.
+games/bastet: Fix README.
+games/beetle-lynx-libretro: Fix README.
+games/beetle-ngp-libretro: Fix README.
+games/beetle-pce-fast-libretro: Fix README.
+games/beetle-pcfx-libretro: Fix README.
+games/beetle-psx-libretro: Fix README.
+games/beetle-supergrafx-libretro: Fix README.
+games/beetle-vb-libretro: Fix README.
+games/beetle-wswan-libretro: Fix README.
+games/berusky2-data: Fix README.
+games/berusky2: Fix README.
+games/blastem-libretro: Fix README.
+games/bloodcm: Fix README.
+games/blueMSX-libretro: Fix README.
+games/bluez-sixaxis: Fix README.
+games/bomberclone: Fix README.
+games/brainparty: Fix README.
+games/brickout: Fix README.
+games/brutalchess: Fix README.
+games/bsnes-mercury: Fix README.
+games/bzflag: Fix README.
+games/chocolate-doom: Fix README.
+games/chroma: Fix README.
+games/circuslinux: Fix README.
+games/ckmame: Fix README.
+games/clonekeen: Fix README.
+games/colem: Fix README.
+games/commandergenius: Fix README.
+games/connectagram: Fix README.
+games/crimson: Fix README.
+games/crrcsim: Fix README.
+games/cubosphere: Fix README.
+games/curseofwar: Fix README.
+games/cutemaze: Fix README.
+games/darkplaces: Fix README.
+games/dhewm3: Fix README.
+games/dice: Fix README.
+games/doomseeker: Fix README.
+games/dungeon: Fix README.
+games/dustrac: Fix README.
+games/eduke32: Fix README.
+games/eduke32_hires_pack: Fix README.
+games/empire: Fix README.
+games/enigma: Fix README.
+games/eureka: Fix README.
+games/f1spirit: Fix README.
+games/fbalpha: Fix README.
+games/ffgo: Fix README.
+games/fgrun: Fix README.
+games/fifengine: Fix README.
+games/fizmo: Fix README.
+games/fmsx-libretro: Fix README.
+games/fortune-dune: Fix README.
+games/fortune-farscape: Fix README.
+games/fortune_doctor_who: Updated for version 20200923.
+games/fortune_firefly: Fix README.
+games/freeciv: Fix README.
+games/freedoom: Fix README.
+games/freeminer: Fix README.
+games/freeorion: Fix README.
+games/fs2open: Fix README.
+games/galaxyv2: Fix README.
+games/gambatte-libretro: Fix README.
+games/garden: Fix README.
+games/gemrb: Fix README.
+games/gl-117: Fix README.
+games/glbsp: Fix README.
+games/glestae: Fix README.
+games/gnonograms: Fix README.
+games/gnubg: Fix README.
+games/gtklife: Fix README.
+games/gw-libretro: Fix README.
+games/hatari: Fix README.
+games/hexalate: Fix README.
+games/higan: Fix README.
+games/ifm: Fix README.
+games/innoextract: Fix README.
+games/ioquake3: Fix README.
+games/jezzball-kazzmir: Fix README.
+games/jfsw: Fix README.
+games/jfsw_demo_data: Fix README.
+games/jfsw_hires_pack: Fix README.
+games/jfsw_registered_data: Fix README.
+games/jfsw_wanton_destruction: Fix README.
+games/jzintv: Fix README.
+games/knights: Fix README.
+games/koules: Fix README.
+games/libretro-desmume: Fix README.
+games/libretro-fceumm: Fix README.
+games/libretro-handy: Fix README.
+games/libretro-prboom: Fix README.
+games/libretro-vecx: Fix README.
+games/libretro-yabause: Fix README.
+games/liquidwar6: Fix README.
+games/lmpc: Fix README.
+games/lutris: Fix README.
+games/maelstrom: Fix README.
+games/mame: Fix README.
+games/marathon-infinity-data: Fix README.
+games/mednafen: Fix README.
+games/minetest: Fix README.
+games/miscom: Fix README.
+games/moon-buggy: Fix README.
+games/naev: Fix README.
+games/nestopia: Fix README.
+games/nevernoid: Fix README.
+games/noteye: Fix README.
+games/notpacman: Fix README.
+games/nottetris2: Fix README.
+games/nxengine-libretro: Fix README.
+games/oblige-legacy4: Fix README.
+games/oblige: Fix README.
+games/odamex: Fix README.
+games/open-adventure: Fix README.
+games/openarena: Fix README.
+games/opendune: Fix README.
+games/openjazz: Fix README.
+games/openmortal: Fix README.
+games/openmw: Updated for version 0.46.0.
+games/openttd: Fix README.
+games/parallel-n64: Fix README.
+games/pasang-emas: Fix README.
+games/pcsx-rearmed: Updated for version 2020.10.11_19b9695.
+games/pcsx2: Fix README.
+games/pcsxr: Fix README.
+games/peg-e: Fix README.
+games/penguin-command: Fix README.
+games/playonlinux: Fix README.
+games/powerslave_demo_data: Fix README.
+games/ppsspp: Fix README.
+games/prboom-plus: Fix README.
+games/prboom: Fix README.
+games/prosystem-libretro: Fix README.
+games/pushover: Fix README.
+games/pysolfc: Fix README.
+games/qtads: Fix README.
+games/qtsixa: Fix README.
+games/quakeforge: Fix README.
+games/quarry: Fix slack-desc.
+games/qxw: Fix README.
+games/rezerwar: Fix README.
+games/roll: Fix slack-desc.
+games/rott: Fix README.
+games/sauerbraten: Fix README.
+games/smokinguns: Fix script encoding.
+games/spring: Updated for version 104.0.
+games/steam: Updated for version 1.0.0.66
+games/stuntrally: Switch to binary release until ported to ogre-1.11+
+games/stuntrally: rm file that causes segfault on 64bit
+games/supertuxkart: Fix md5sum.
+games/unigine-superposition-benchmark: Added (benchmark/stability)
+games/vegastrike: Fix script.
+games/worldofpadman: Fix script encoding.
+gis/SFCGAL: Fix md5sum.
+graphics/dcraw: New homepage.
+graphics/flameshot: Fix README.
+graphics/fontforge: Updated for version 20190801.
+graphics/glslang: Added (GLSL/ESSL, HLSL front end SPIR-V generator)
+graphics/graphene: Added (graphic data types layer)
+graphics/icc_profiles_from_eci: Fix .info.
+graphics/libplacebo: Fix build with newer glslang.
+graphics/renderdoc: Updated for version 1.10.
+graphics/shaderc: Updated for version 2020.3.
+graphics/vuescan: Updated MD5SUMs.
+graphics/vulkan-sdk: Updated for version 1.2.154.0.
+ham/ax25-tools: Fix README, .info, doinst.
+ham/flrig: Fix slack-desc.
+ham/spectools: No dashes in VERSION, people!.
+libraries/Botan: Updated for version 2.16.0.
+libraries/MyGUI: Updated for version 3.4.0.
+libraries/adns: Fix slack-desc, template comments.
+libraries/bullet: Updated for version 3.05.
+libraries/bullet: Updated for version 3.06.
+libraries/cgicc: Fix README.
+libraries/cyrus-sasl-xoauth2: Added (Cyrus SASL XOAUTH2 Plugin)
+libraries/digimend-kernel-drivers: Fix script, info.
+libraries/flint: Fix slack-desc, template comments.
+libraries/gnome-sharp: Convert script to utf-8.
+libraries/libaec: Fix README, slack-desc.
+libraries/libfixposix: Fix README.
+libraries/libinput: Updated for version 1.16.2.
+libraries/libtecla: Fix README.
+libraries/libwpe: Fix README, info, script.
+libraries/libyubikey: Fix download link.
+libraries/live555: Updated for version 2020.08.19
+libraries/ogre: Add notes about assimp.
+libraries/ogre: Update dep.
+libraries/ogre: Updated for version 1.12.9.
+libraries/opencl-amd: Fix script, README.
+libraries/opencv: Updated for version 4.5.0
+libraries/qml-material: Fix README.
+libraries/qt5-legacy: Fix slack-desc.
+libraries/qwtplot3d: Fix README.
+libraries/rhonabwy: Fix README, info.
+libraries/skalibs: Updated for version 2.9.3.0.
+libraries/sqliteodbc: Updated for version 0.9998.
+libraries/tbb: Use correct github URL.
+libraries/tcl-inotify: Fix README.
+misc/BISP: Fix script encoding.
+misc/html-xml-utils: Fix README.
+misc/mosquitto: Updated for version 1.6.12
+misc/tidyp: Fix README, slack-desc.
+misc/ykpers: Fix download link.
+misc/yubikey-personalization-gui: Fix download link.
+misc/yubioath-desktop: Fix template comments.
+multimedia/audio-recorder: Fix README.
+multimedia/flashplayer-plugin: Updated for version 32.0.0.445.
+multimedia/k9copy-reloaded: Fix README.
+multimedia/mpv: Fix README, info.
+multimedia/pepperflash-plugin: Updated for version 32.0.0.445.
+multimedia/smplayer: Updated for version 20.6.0.
+multimedia/straw-viewer: Updated for version 0.1.0.
+multimedia/vlc: Updated for version 3.0.11.1
+network/NetworkManager-fortisslvpn: Fix slack-desc.
+network/Quaternion: Fix slack-desc.
+network/RTL8192: Fix README, info, slack-desc.
+network/acme.sh: Fix README.
+network/bollux: Fix slack-desc.
+network/brave-browser: Updated for version 1.15.75.
+network/coturn: Fix slack-desc.
+network/dropbear: Fix script encoding.
+network/nbtscan: Fix script encoding.
+network/neomutt: Updated to version 20200925.
+network/onionshare: Fix md5sum.
+network/opera-developer: Updated for version 73.0.3834.0.
+network/opera: Updated for version 71.0.3770.228.
+network/palemoon: Fix README, info.
+network/pulse-sms: Fix slack-desc.
+network/qutebrowser-tox: Updated for version 1.14.0.
+network/qutebrowser: Updated for version 1.14.0.
+network/resilio-sync: Fix slack-desc.
+network/rtl8821ce: Added (Realtek RTL8821CE Driver)
+network/squirrelmail: Fix slack-desc, README, info.
+network/sslscan: Updated for version 2.0.4.
+network/t50: Fix README.
+network/tcptunnel: Convert script to utf-8.
+network/tgt: Fix slack-desc, README.
+network/tor-browser: Updated for version 10.0.1.
+network/vivaldi: Updated for version 3.4.2066.76.
+network/wire: Standardize shebang.
+network/wp-cli: Script nitpick.
+network/yadifa: Fix README.
+network/youtube-upload: Fix README.
+network/zeek: Fix info, slack-desc.
+network/zoom-linux: Updated for version 5.3.472687.1012.
+office/ProjectLibre: Updated for version 1.9.2.
+office/calibre-bin: Updated for version 5.3.0.
+office/gnucash: Standardize shebang.
+office/hamster: Updated for version 3.0.2.
+office/lowdown: Fix slack-desc.
+office/mate-calc: Fix slack-desc.
+office/onlyoffice-desktopeditors: Updated for version 6.0.0.
+office/pandoc-bin: Fix README.
+office/plover: Fix README, slack-desc, VERSION.
+office/xournalpp: Fix README.
+perl/perl-Crypt-Eksblowfish: Fix info.
+perl/perl-Filesys-Df: Fix README.
+perl/perl-GooCanvas2: Fix README, slack-desc.
+perl/perl-HTML-Tidy: Fix slack-desc.
+perl/perl-IPC-Run: Fix info.
+perl/perl-Modern-Perl: Standardize shebang, fix slack-desc.
+perl/perl-Mojolicious-Plugin-I18N: Fix README, info.
+perl/perl-String-Random: Fix README, slack-desc.
+perl/perl-Text-CharWidth: Fix README.
+perl/perl-file-slurper: Fix slack-desc.
+python/DVR-Scan: Fix README, slack-desc.
+python/Flask-Babel: Fix README.
+python/Flask-HTMLmin: Fix README, slack-desc.
+python/Flask-WTF: Fix slack-desc.
+python/PyGreSQL: Updated for version 5.2.1
+python/PyXB: Fix README, script encoding.
+python/Yapps2: Fix slack-desc.
+python/captcha: Fix README.
+python/cheetah3: Fix slack-desc.
+python/contextlib2: Fix slack-desc.
+python/django-sass: Script nitpick.
+python/fixtures: Fix README, slack-desc.
+python/htmlmin: Fix README, slack-desc.
+python/jaraco-packaging: Fix README, PRGNAM.
+python/jsonpointer: Fix slack-desc.
+python/linecache2: Fix README, slack-desc.
+python/lockfile: Fix README.
+python/mypy: Updated for version 0.790.
+python/pathtools3: Script nitpick.
+python/pysass: Script nitpick.
+python/python-bitstring: Fix script, README, slack-desc.
+python/python-mimeparse: Fix slack-desc.
+python/python-netaddr: Updated for version 0.8.0
+python/python-soupsieve: Fix slack-desc.
+python/python3-Flask-httpauth: Fix README, slack-desc.
+python/python3-soupsieve: Fix slack-desc.
+python/python3-statsmodels: Fix slack-desc.
+python/repoze.lru: Fix README.
+python/rst-linker: Fix README, PRGNAM.
+python/rst: Script nitpick.
+python/speaklater: Fix README.
+python/testscenarios: Fix slack-desc.
+python/tgext.routes: Fix README.
+python/traceback2: Fix README, slack-desc.
+python/watchdog: Fix README, PRGNAM.
+python/workbook: Fix README.
+python/zeep: Fix README.
+ruby/rubygem-mini_mime: Fix slack-desc.
+ruby/rubygem-parser: Updated for version 2.7.2.0.
+system/CPU-X: Fix README.
+system/dget: Updated for version 2.20.4.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.23.
+system/epson-printer-utility: Updated for new models.
+system/execline: Updated for version 2.6.1.1.
+system/fasd: Fix slack-desc.
+system/fuse-overlayfs: Fix md5sum.
+system/fzf: Updated for version 0.23.1.
+system/guake: Standardize shebang.
+system/intelmas: Updated for version 1.3.
+system/kbfs: Updated for version 5.5.2_20201016183637.
+system/keybase: Updated for version 5.5.2.
+system/kitchen-sync: Updated for version 2.8.
+system/libtrash: Fix slack-desc.
+system/lynis: Updated for version 3.0.1.
+system/mdf2iso: Fix README.
+system/nvidia-legacy340-driver: Fix README, info.
+system/nvidia-legacy390-driver: Fix slack-desc.
+system/phoronix-test-suite: Updated for version 10.0.0.
+system/pspg: Updated for version 3.1.4.
+system/s6-rc: Updated for version 0.5.2.0.
+system/skopeo: Fix md5sum.
+system/splix: Fix README, script VERSION.
+system/steghide: Fix README, script.
+system/sysbench: Fix slack-desc, info.
+system/tiger: Fix script encoding.
+system/tmpwatch: Fix README, slack-desc.
+system/tpc: Fix README.
+system/unigine-heaven-benchmark: Fix template comments.
+system/unigine-valley-benchmark: Fix template comments.
+system/unionfs-fuse: Fix README, slack-desc.
+system/univga-font: Fix README.
+system/v4l2loopback: Fix slack-desc.
+system/vagrant: Updated for version 2.2.10.
+system/wine-staging: Updated for version 5.19.
+system/zfs-on-linux: Updated version to 0.8.5.
++--------------------------+
+Sat Oct 10 03:19:30 UTC 2020
+academic/Gridcoin-Research: Updated for version 5.0.1.0
+academic/Gridcoin-Research: Updated for version 5.0.2.0
+academic/Gridcoin-Research: fix md5sum
+academic/STAR: Updated for version 2.7.6a.
+academic/bcftools: Updated for version 1.11.
+academic/bowtie2: Updated for version 2.4.2.
+academic/bpp1.9-numcalc: Added (Bio++ 1.9 NumCalc Library)
+academic/bpp1.9-phyl: Added (Bio++ 1.9 Phyl Library)
+academic/bpp1.9-seq: Added (Bio++ 1.9 Seq Library)
+academic/bpp1.9-utils: Added (Bio++ 1.9 Utils Library)
+academic/pysam: Updated for version 0.16.0.1.
+academic/reduce-algebra: Updated for version 20201007svn5424.
+academic/rpy2: Updated for version 3.3.6.
+academic/samtools: Updated for version 1.11.
+academic/vCAPS_coevolution: Added (Coevolution Analysis)
+accessibility/speech-dispatcher: Updated for version 0.10.1
+desktop/fvwm3: Updated for version 1.0.1.
+development/CImg: Updated for version 2.9.2
+development/bfg: Updated for version 1.13.0.
+development/dbeaver-ce: Updated for version 7.2.2.
+development/ghex: Added (hex editor with GTK+3 GUI)
+games/chessx: Updated for version 1.5.4.
+games/instead: Updated for version 3.3.2.
+games/wesnoth: Updated for verion 1.14.14
+graphics/heif-gimp-plugin: Added (HEIF plugin for GIMP)
+graphics/vuescan: Updated MD5SUMs.
+libraries/flint: Added (Fast Library for Number Theory)
+libraries/htslib: Updated for version 1.11.
+libraries/imlib2: Updated for version 1.7.0.
+libraries/imlib2_loaders: Updated for version 1.7.0.
+libraries/libde265: Added (open h.265 codec implementation)
+libraries/libheif: Added (HEIF and AVIF format decoder and encoder)
+libraries/olm: Updated for version 3.2.1.
+misc/ghostpcl: Updated for version 9.53.3.
+multimedia/plexmediaserver: Updated for v 1.20.2.3402_0fec14d92.
+network/onedrive: Updated for version 2.4.6.
+network/signal-desktop: Updated for version 1.36.3.
+network/skypeforlinux: Updated for version 8.65.0.76.
+network/syncthing: Updated for version 1.9.0.
+network/telegram: Updated for version 2.4.3.
+network/wire: Updated for version 3.20.2934.
+office/MasterPDFEditor: Updated for version 5.6.49.
+office/calibre-bin: Updated for version 5.2.0.
+office/ghostwriter: Added (distraction-free Markdown editor)
+office/pdfstudio: Updated for version 2020.1.1.
+office/pdfstudioviewer: Updated for version 2020.1.1.
+ruby/ruby-build: Updated for version 20201005.
+system/chronograf: Updated for version 1.8.7.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.22.
+system/epson-printer-utility: Updated for version 1.1.1.
+system/fzf: Updated for version 0.23.0.
+system/kitchen-sync: Updated for version 2.7.
+system/laptop-mode-tools: Updated for version 1.74.
+system/letsencrypt: Updated for version 1.9.0.
+system/osquery-bin: Updated for version 4.5.1.
+system/xvfb-run: Added (Run a command in a virtual X server env)
++--------------------------+
+Sat Oct  3 02:02:30 UTC 2020
+academic/ds9: Fix md5sum.
+academic/nco: Updated for version 4.9.5.
+academic/units: Updated for version 2.20.
+audio/aj-snapshot: Fix md5sum.
+audio/non: Updated for version 20200928.
+audio/ntk: Updated for version 20200928
+desktop/dbgl-legacy: New URL.
+desktop/fbmenugen: Updated for version 0.85.
+desktop/imgur-screenshot: Updated for version 2.0.0.
+desktop/obbrowser: Updated for version 0.13.
+desktop/obmenu-generator: Updated for version 0.88.
+desktop/salmon: Added (afterstep-style load monitor applet)
+desktop/xfce4-timer-plugin: Updated for version 1.6.0.
+development/adms: Updated for version 2.3.7.
+development/d-tools: Updated for version 2.094.0
+development/dbeaver-ce: Updated for version 7.2.1.
+development/dmd: Updated for version 2.094.0
+development/pkgconf: Use personality files and add symlink.
+development/rustup: Updated for version 1.21.1.
+development/universal-ctags: Fix checksum
+games/7kaa: Updated for version 2.15.4p1.
+games/crispy-doom: Updated for version 5.9.2.
+games/domination: Updated for version 1.2.2.
+games/doomretro: Updated for version 3.6.1.
+games/sdlpop: Updated for version 1.21.
+games/starfighter: Updated for version 2.3.3.
+games/supertuxkart: Fix source MD5SUM.
+graphics/unison: Updated MD5SUMs.
+libraries/hiredis: Fix md5sum.
+libraries/libinput: Updated for version 1.16.1.
+libraries/libwacom: Updated for version 1.5.
+libraries/pigpio: Fix md5sum, README, VERSION.
+libraries/ulfius: Fix md5sum.
+libraries/xylib: Updated for version 1.6.
+misc/ghostpcl: Updated for version 9.53.2.
+multimedia/LBRY: Updated for version 0.48.0.
+multimedia/avidemux: Updated for version 2.7.6.
+multimedia/musixmatch: Fix md5sum, README.
+network/Signal-Desktop: Removed.
+network/asterisk: Updated for version 16.13.0.
+network/brave-browser: Updated for version 1.14.84.
+network/netsniff-ng: Fix md5sum.
+network/opera-developer: Updated for version 73.0.3820.0.
+network/opera: Updated for version 71.0.3770.171.
+network/prosody-mod-cloud-notify: Updated for version hg4151.
+network/prosody-mod-http-upload: Updated for version hg4076.
+network/rspamd: Add deps: cmake-202x libsodium.
+network/teamviewer: Updated for version 15.10.5.
+network/telegram: Updated for version 2.4.0.
+network/telegram: Updated for version 2.4.2.
+network/zoom-linux: Updated for version 5.3.469451.0927.
+office/calibre-bin: Updated for version 5.1.0.
+office/pdfstudio: Updated for version 2020.1.0.
+office/pdfstudioviewer: Updated for version 2020.1.0.
+office/smoffice2016: Change maintainer.
+office/smoffice2018: Change maintainer.
+office/smoffice2021: Added (office suite)
+office/wps-office: Fix md5sum.
+perl/MoarVM: Updated for version 2020.09.
+perl/nqp: Updated for version 2020.09.
+perl/perl-GD: Updated for version 2.73.
+perl/perl-glib: Updated for version 1.3293.
+perl/rakudo: Updated for version 2020.09.
+python/python-mysql-replication: Updated for version 0.22.
+python/python-precis-i18n: Updated for version 1.0.2.
+python/python3-astroid: Update homepage URL.
+python/python3-isort: Updated for version 5.5.4.
+ruby/ruby-build: Updated for version 20200926.
+system/Iosevka-slab: Updated for version 3.6.1.
+system/Iosevka: Updated for version 3.6.1.
+system/aha: Updated for version 0.5.1.
+system/archivemount: Fix md5sum.
+system/bleachbit: Updated for version 4.1.0.
+system/ck4up: Fix md5sum, README, slack-desc.
+system/cpuid2cpuflags: Updated for version 11.0.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.20.
+system/epson-printer-utility: Added (epson printer monitor+tools)
+system/monitorix: Update DEP.
+system/nvidia-driver: Updated for version 450.80.02.
+system/nvidia-kernel: Updated for version 450.80.02.
+system/unigine-heaven-benchmark: Added (benchmark software)
+system/unigine-valley-benchmark: Added (System benchmark tool)
+system/wine-staging: Updated for version 5.18.
+system/wine: Updated for version 5.0.2.
+system/zsh-completions: Updated for version 0.32.0.
++--------------------------+
+Sat Sep 26 09:13:36 UTC 2020
+academic/bibletime: Fix README.
+academic/xiphos: Updated for version 4.2.1.
+audio/ardour: Updated for version 6.3.
+desktop/i3-gaps: Updated for version 4.18.2.
+desktop/i3: Updated for version 4.18.2.
+development/ShellCheck-bin: Updated for version 0.7.1.
+development/cloc: Update to 1.88.
+development/composer: Updated for version 1.10.13
+development/d-tools: Updated for version 2.093.1
+development/dmd: Updated for version 2.093.1
+development/dotnet-runtime: Updated for version 3.1.8.
+development/dotnet-sdk: Updated for version 3.1.402.
+development/meson: Update to 0.55.3.
+development/universal-ctags: Updated for version 86bdb84
+development/vscode-bin: Updated for version 1.49.2.
+games/supertuxkart: Upgrade to 1.2.
+gis/GMT: Updated for version 6.1.1.
+gis/python3-basemap: Updated for version 1.2.2.
+graphics/vuescan: Updated for version 9.7.35.
+graphics/yacreader: Updated for version 9.7.1.2009123.
+libraries/Impacket: Updated for version 0.9.21.
+libraries/aspnetcore-runtime: Updated for version 3.1.8.
+libraries/libmediainfo: Update to 20.08.
+libraries/libzen: Update to 0.4.37.
+libraries/ode: Updated for version 0.16.2.
+libraries/tcl-promise: Added (A promise/future lib for tcl)
+misc/KeePass: Updated for version 2.46.
+multimedia/castget: Added (A command line tool to download podcasts)
+multimedia/mediainfo: Update to 20.08.
+multimedia/smplayer: Updated for version 20.4.2.
+multimedia/smtube: Updated for version 20.6.0.
+network/Electrum: Updated for version 4.0.3.
+network/anydesk: Updated for version 6.0.1.
+network/discord: Update to 0.0.12.
+network/newsboat: Updated for version 2.21.
+network/nordvpn: Updated for version 3.8.4.
+network/openresolv: Update to 3.11.0.
+network/qutebrowser-tox: Updated for version 1.13.1.
+network/rspamd: Updated for version 2.5.
+network/shorewall-core: Updated for version 5.2.8.
+network/shorewall6: Updated for version 5.2.8.
+network/shorewall: Updated for version 5.2.8.
+network/signal-desktop: Updated for version 1.36.2.
+network/sslscan: Updated for version 2.0.1.
+network/tor-browser: Updated for version 10.0.
+network/varnish: Updated for version 6.5.0.
+network/vivaldi: Updated for version 3.3.2022.47.
+network/wireshark: Updated for version 3.2.7.
+network/zoom-linux: Updated for version 5.3.465578.0920.
+office/calibre-bin: Updated for version 5.0.1.
+perl/perl-html-form: Fix download URL.
+python/passlib: Updated for version 1.7.2.
+python/python3-isort: Updated for version 5.5.3.
+python/python3-obspy: Updated for version 1.2.2.
+system/JetBrainsMono: Updated for version 2.001.
+system/archivemount: Updated for version 0.9.1.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.19.
+system/jsawk: Support mozjs78 from -current.
+system/monitorix: Updated for version 3.12.0.
+system/openmpi: Updated for version 4.0.5.
+system/powershell: Updated for version 7.0.3.
++--------------------------+
+Sat Sep 19 01:55:45 UTC 2020
+academic/HMMER: Updated for version 3.3.1.
+academic/PhyMLR: Updated for version 3.3.20200621.
+academic/RepeatMasker: Updated for version 4.1.1.
+academic/amplifx: Change URLs.
+academic/bedtools: Updated for version 2.29.2.
+academic/bibletime: Use cmake-202x.
+academic/diamond: Updated for version 0.9.36.
+academic/fiji: Updated for version 20200902_2101.
+academic/genometools: Updated for version 1.6.1.
+academic/io_lib: Updated for version 1.14.13.
+academic/jalview: Updated for version 2.11.1.0.
+academic/lalnview: Update script.
+academic/mafft: Updated for version 7.471.
+academic/megax: Updated for version 10.1.8_1.
+academic/meme-suite: Updated for version 5.1.1.
+academic/ncbi-blast+: Updated for version 2.10.1.
+academic/nco: Updated for version 4.9.4.
+academic/paml: Updated for version 4.9j.
+academic/pamlX: Update substitution.
+academic/seaview: Updated for version 5.0.4.
+academic/seqkit: Updated for version 0.13.2.
+academic/spades: Updated for version 3.14.1.
+academic/treerecs: Updated for version 1.2.
+academic/trfind: Updated for version 4.09.1.
+academic/trimmomatic: Updated for version 0.39.
+academic/ugene: Updated for version 35.0.
+academic/wehi-weasel: Updated for version 3.7.1.18.
+audio/exhale: Updated for version 1.0.7.
+audio/pianobar: Updated for version 2019.01.25.
+desktop/fvwm3: Added (fvwm window manager).
+development/Fennel: Updated for version 0.6.0.
+development/apache-jmeter: Updated for version 5.3.
+development/byacc: Updated for version 20200910.
+development/cf-cli: Updated for version 7.1.0.
+development/cmake-202x: Added (cross-platform, FOSS make system)
+development/dart-sdk: Updated for version 2.9.3
+development/gambas3: Updated for version 3.15.2.
+development/git-lfs: Updated for version 2.12.0.
+development/kotlin: Updated for version 1.4.10.
+development/minikube: Updated for version 1.13.0.
+development/neovim-remote: Added (remote control for neovim).
+development/octant: Updated for version 0.15.0.
+development/slibtool: Updated for version 0.5.31.
+development/yarn: Updated for version 1.22.5.
+games/angband: Updated for version 4.2.1.
+games/crispy-doom: Updated for version 5.9.1.
+games/nsudoku: Update URL.
+games/stone_soup: Updated for version 0.25.0.
+graphics/librecad: Updated for version 9f2c32d.
+graphics/mtpaint: Updated for version 3.49.29.
+graphics/qrencode: Updated for version 4.1.0.
+graphics/vuescan: Updated for version 9.7.33.
+libraries/bcdoc: Switch to python3.
+libraries/botocore: Updated for version 1.18.0.
+libraries/hiredis: Updated for version 1.0.0.
+libraries/libbson: Added (a cross platform BSON Library for C)
+libraries/libmicrohttpd: Updated for version 0.9.70.
+libraries/mxml: Remove static library.
+libraries/pexpect: Updated for version 4.8.0.
+misc/xca: Add doinst.sh.
+misc/xca: Updated for version 2.3.0.
+multimedia/straw-viewer: Updated for version 0.0.9.
+network/awscli: Updated for version 1.18.141.
+network/brave-browser: Updated for version 1.14.81.
+network/driftnet: Updated for version 1.3.0.
+network/hostapd: Security fix: CVE-2019-16275/CVE-2020-12695.
+network/r2e: Update DOWNLOAD url.
+network/rss2email: Added (rss to email gateway).
+network/shadowsocks-libev: Updated for version 3.3.5.
+network/sqlmap: Updated for version 1.4.9.
+network/squid: Updated for version 4.13.
+network/tor: Updated for version 0.4.4.5.
+network/ufw: Updated for version 0.36.
+network/youtube-dl: Updated for version 2020.09.14.
+network/zoom-linux: Updated for version 5.2.458699.0906.
+office/pdf2djvu: Updated for version 0.9.17.1.
+perl/perl-Class-Tiny: Updated for version 1.008.
+python/jmespath: Updated for version 0.10.0.
+python/pyasn1: Add optional dependency: python3.
+python/python-bitstring: Added (binary data analysis library).
+python/python3-isort: Updated for version 5.5.2.
+python/python3-rsa: Added (pure-Python RSA implementation).
+python/s3transfer: Added python3 support.
+system/autojump: Updated for version 22.5.3.
+system/clamav: Updated for version 0.103.0.
+system/clamtk: Updated for version 6.05.
+system/davfs2: Updated for version 1.5.6.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.18.
+system/fio: Updated for version 3.23.
+system/irqbalance: Updated for version 1.7.0.
+system/noto-emoji: Updated for version 20200916.
+system/osquery: Updated for version 4.5.0.
+system/terminology: Updated for version 1.8.1.
+system/yaft: Added (Yet another framebuffer terminal).
++--------------------------+
+Sat Sep 12 16:46:54 UTC 2020
+academic/gwyddion: Updated for version 2.56.
+academic/xiphos: Fix man location.
+audio/aj-snapshot: Updated for version 0.9.9
+desktop/kupfer: Updated for version v320.
+desktop/wmalauncher: Updated for version 2020.0905.
+desktop/x-tile: updated for version 3.2
+desktop/xkblayout-state: Updated for version 1b_git20200909.
+development/dart-sdk: Updated for version 2.9.2
+development/dbeaver-ce: Updated for version 7.2.0.
+development/love-legacy072: Fix download URL.
+development/love-legacy080: Fix download URL.
+development/redo: Added (a recursive build system)
+development/slibtool: Updated for version 0.5.29.
+development/swi-prolog: Remove dependency on unixODBC.
+development/watchman: No-upgrade comment in README.
+games/0ad: BUILD version bump.
+games/VASSAL: Updated for version 3.4.0.
+games/asc: Fix broken build.
+games/d1x-rebirth: Fix download URL.
+games/d2x-rebirth: Fix download URL.
+games/dreamchess: Updated for version 0.3.0.
+games/glestae: Fix build when wxGTK3 installed.
+games/higan: Use github download URL.
+games/mgba: Updated for version 0.8.3
+games/starfighter: Updated for version 2.3.2.
+games/yarntown: Added (2D homage to Bloodborne for solarus engine)
+gis/Fiona: Updated for version 1.8.17.
+gis/Shapely: Updated for version 1.7.1.
+gis/postgis: Updated for version 3.0.2.
+gis/proj: Updated for 7.1.1.
+gis/pyshp: Updated for version 2.1.1.
+graphics/feh: Updated for version 3.5.
+libraries/aqbanking: Updated for version 6.2.2.
+libraries/c-ares: Updated for version 1.16.1.
+libraries/gloox: Updated for version 1.0.24.
+libraries/gwenhywfar: Updated for version 5.4.0.
+libraries/libtorrent-rasterbar: Updated for version 1.2.10.
+libraries/libuv: Updated for version 1.39.0.
+libraries/libxnvctrl: Updated for version 450.66.
+libraries/mxml: Updated for version 3.1.
+misc/discount: Updated for version 2.2.7.
+multimedia/flashplayer-plugin: Updated for version 32.0.0.433.
+multimedia/pepperflash-plugin: Updated for version 32.0.0.433.
+network/bitcoin: Updated for version 0.20.1.
+network/brave-browser: Updated for version 1.12.114.
+network/discord: Fix download link.
+network/felinks: Added (A fork of Elinks, the web browser).
+network/hydra: Updated for version 9.1.
+network/signal-desktop: Updated for version 1.36.1.
+network/sipp: Updated for version 3.6.0.
+network/vivaldi: Updated for version 3.3.2022.45.
+network/wireguard-linux-compat: Updated for version 1.0.20200908.
+office/keepassxc: Updated for version 2.6.1.
+office/lyx: Fix MD5SUM.
+office/onlyoffice-desktopeditors: Updated for version 5.6.4.
+office/pdfstudio: Updated for version 2020.0.1.
+office/pdfstudioviewer: Updated for version 2020.0.1.
+perl/perl-Modern-Perl: Added (enable features of Modern Perl)
+python/python3-isort: Updated for version 5.5.1.
+system/autoslackpkg: Updated for version 1.1.
+system/bindfs: Updated for version 1.14.7.
+system/dash: Updated for version 0.5.11.2.
+system/direvent: Added (Directory event monitoring daemon)
+system/entr: Updated for version 4.6.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.17.
+system/john: Updated for version 1.9.0.
+system/letsencrypt: Updated for version 1.8.0.
+system/maxcso: Updated for version 1.12.0.
+system/mkslack: Updated for version 5.3.5.
+system/nvidia-driver: Fix typo.
+system/nvidia-kernel: Fix version.
+system/pspg: Updated for version 3.1.3.
+system/secure-delete: Updated for version 3.1_6.
+system/wesnoth: Updated to version 1.14.13
+system/xarchiver: Updated to version 0.5.4.15
++--------------------------+
+Sat Sep  5 01:28:04 UTC 2020
+academic/STAR: Updated for version 2.7.5c.
+academic/ViennaRNA: Updated for version 2.4.15.
+academic/bibletime: Updated for version 3.0.
+academic/cvc4: Updated for version 1.8.
+academic/eprover: Updated for version 2.5.
+academic/pysam: Updated for version 0.16.0.1.
+academic/rpy2: Updated for version 3.3.5.
+audio/fabla: Patch for the newer lv2.
+audio/lv2dynparam1: Fix for the newer lv2.
+audio/yoshimi: Updated for version 1.7.2.
+audio/zynjacku: Fix for the newer lv2.
+desktop/dbgl-legacy: Added (a Java frontend for DOSBox).
+desktop/dbgl: Updated for version 0.92.
+desktop/enlightenment: Updated for version 0.24.2.
+desktop/qt5ct: Updated for version 1.1.
+desktop/spectrwm: Updated for version 3.4.1.
+development/Fennel: Updated for version 0.5.0.
+development/atom: Updated for version 1.50.0.
+development/avra: Updated for version 1.4.2.
+development/brotli: Updated for version 1.0.9.
+development/check: Updated for version 0.15.2.
+development/chibi-scheme: Updated for version 0.9.
+development/dbeaver-ce: Updated for version 7.1.5.
+development/fossil: Updated for version 2.12.1.
+development/gambas3: Updated for version 3.15.1.
+development/google-webdesigner: Updated for version 8.0.3.0603.
+development/gprolog: Updated for version 1.4.5.
+development/hopper: Updated for version 4.5.29.
+development/idea: Updated for version 2020.2.
+development/kotlin: Updated for version 1.4.0.
+development/mg-troglobit: Updated for version 3.4.
+development/mlr: Updated for version 5.8.0.
+development/nodejs: Updated for version 12.16.3.
+development/regina-rexx: Updated for version 3.9.3.
+development/robotframework: Updated for version 3.2.2.
+development/sbcl: Updated for version 2.0.7.
+development/swi-prolog: Updated for version 8.2.1.
+development/tiled: updated for version 1.4.2
+development/vscode-bin: Updated for version 1.48.2.
+games/0ad-data: Updated for version 0.0.23b.
+games/0ad: Updated for version 0.0.23b.
+games/CorsixTH: Updated for version 0.63.
+games/ags: updated for version 3.5.0.26
+games/freedink: Patched for newer SDL2.
+games/fs-uae-arcade: Updated for version 3.0.5.
+games/fs-uae-launcher: Updated for version 3.0.5.
+games/fs-uae: Updated for version 3.0.5.
+games/mgba: Updated for version 0.8.2
+games/ppsspp: Updated for version 1.10.3
+games/solarus-quest-editor: Updated for version 1.6.4.
+games/solarus: Updated for version 1.6.4.
+games/starfighter: Updated for version 2.3.1.
+games/vegastrike: Patched and rebuilt.
+games/warzone2100: updated for version 3.4.1
+graphics/apitrace: Updated for v 9.0, Moved from Development.
+graphics/brlcad: updated for version 7.30.10
+graphics/renderdoc: Added (Stand-alone graphics debugging tool)
+graphics/ueberzug: Updated for version 18.1.6.
+graphics/vuescan: Updated MD5SUMs.
+libraries/Botan: Updated for version 2.15.0.
+libraries/PyQt5: Fix download link.
+libraries/QScintilla-qt5: Fix download link.
+libraries/SDL_kitchensink: updated for version 1.0.9
+libraries/adns: Updated for version 1.6.0.
+libraries/efl: Updated for version 1.24.3.
+libraries/gloox: Updated for version 1.0.23.
+libraries/iddawc: updated for version 0.9.6
+libraries/leptonica: Updated for version 1.80.0.
+libraries/lua-posix: Updated for version 35.0.
+libraries/orcania: updated for version 2.1.1
+libraries/python-efl: Updated for version 1.24.0.
+libraries/python3-PyQt5: Fix download link.
+libraries/python3-PyQtWebEngine: Fix download link.
+libraries/rhonabwy: updated for version 0.9.12
+libraries/slv2: Fix for the newer lv2.
+libraries/ulfius: updated for version 2.6.9
+libraries/yder: updated for version 1.4.12
+misc/jmri: Updated for version 4.20.
+misc/slop: Updated for version 7.5.
+multimedia/fdkaac: Updated for version 1.0.0
+multimedia/get_iplayer: Updated for version 3.26.
+multimedia/plexmediaserver: Updated for v 1.20.1.3252_a78fef9a9.
+network/AdGuardHome: Updated for version 0.103.3.
+network/UDR: Updated for version 0.9.4_774f2e7.
+network/brave-browser: Updated for version 1.11.104.
+network/ddclient: Updated for version 3.9.1.
+network/discord: Updated for version 0.0.11.
+network/dma: Added (DragonFlyBSD Mail Agent).
+network/dokuwiki: Updated for version 20200729.
+network/dropbox: Updated for version 104.4.175.
+network/glewlwyd: updated for version 2.3.3
+network/i2pd: Updated for version 2.33.0.
+network/keepalived: Updated for version 2.1.5.
+network/neomutt: Updated for version 20200821.
+network/nicotine+: Updated for version 2.0.1.
+network/onedrive: Updated for version 2.4.5.
+network/persepolis: Fix MD5SUM.
+network/protonmail-bridge: Updated for version 1.3.3.
+network/pulse-sms: Added (SMS messaging for Desktop)
+network/qutebrowser-tox: Update pdf.js version.
+network/qutebrowser-tox: Updated for version 1.13.1.
+network/sfeed: Updated for version 1.34.5.
+network/shorewall-core: Updated for version 5.2.7.
+network/shorewall6: Updated for version 5.2.7.
+network/shorewall: Updated for version 5.2.7.
+network/signal-desktop: Updated for version 1.34.5.
+network/sshuttle: updated for version 1.0.4
+network/teamviewer: Updated for version 15.9.5.
+network/tinc: Updated for version 1.0.36.
+network/tor-browser: Updated for version 9.5.4.
+network/tor: Updated for v 0.4.3.6.
+network/urlscan: Updated for version 0.9.5.
+network/wireguard-linux-compat: Updated for version 1.0.20200729.
+network/wireguard-tools: Updated for version 1.0.20200827.
+network/wsdd2: Added (WSD/LLMNR Descovery/Name Service Daemon)
+network/yle-dl: Updated for version 20200807.
+network/zoom-linux: Updated for version 5.2.454870.0831.
+office/LibreOffice: Mention clearing of environment variables
+office/MasterPDFEditor: Fix build.
+office/MasterPDFEditor: Updated for version 5.6.42.
+office/calibre-bin: Updated for version 4.23.0.
+office/fop: New dependency added.
+office/gnucash-docs: Updated for version 3.11.
+office/gnucash: Updated for version 3.11.
+office/lyx: Updated for version 2.3.5.2.
+office/onlyoffice-desktopeditors: Updated for version 5.6.0.
+office/pandoc-bin: Updated for version 2.10.1.
+office/pdfstudio: Remove PDF docs.
+office/pdfstudio: Updated for version 2019.2.3.
+office/pdfstudioviewer: Remove PDF docs.
+office/pdfstudioviewer: Updated for version 2019.2.3.
+office/zim: Updated for version 0.73.2.
+perl/MoarVM: Updated for version 2020.08.
+perl/nqp: Updated for version 2020.08.2.
+perl/perl-CPANPLUS-Dist-Slackware: Updated for version 1.029.
+perl/perl-DBD-SQLite: Updated for version 1.66.
+perl/rakudo: Updated for version 2020.08.2.
+python/google-images-download: Updated for version 620e7f5.
+python/internetarchive: Updated for version 1.9.4.
+python/josepy: Updated for version 1.4.0.
+python/mypy: Updated for version 0.782.
+python/python2-sip: Fix download link.
+python/python3-isort: Updated for version 5.4.2.
+python/python3-sip: Fix download link.
+python/ruffus: Updated for version 2.8.4.
+system/Solaar: Updated for version 1.0.3.
+system/ansible: Updated for version 2.9.13.
+system/avfs: Updated for version 1.1.3.
+system/beebem: Added (Acorn BBC Micro and Master 128 emulator).
+system/chronograf: Updated for version 1.8.6.
+system/dosbox-dev: updated for version 0.75_pre4358
+system/dosbox-x: Updated for version 0.83.2.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.16.
+system/intel-microcode: Updated for version 20200616.
+system/intelmas: Updated for version 1.2.
+system/jdupes: updated for version 1.18.2
+system/libtrash: Updated for version 3.6.
+system/logwatch: Updated for version 7.5.4.
+system/makeself: Updated for version 2.4.2.
+system/ncdu: Updated for version 1.15.1.
+system/nvidia-driver: Updated for version 450.66.
+system/nvidia-kernel: Updated for version 450.66.
+system/scrypt: Updated for version 1.3.1.
+system/sleepd: Fix bug.
+system/system76-power: Updated for version 1.1.10.
+system/terminology: Updated for version 1.8.0.
+system/thin-provisioning-tools: Updated for version 0.9.0.
+system/usermin: Updated for version 1.803.
+system/webmin: Updated for version 1.955.
+system/worker: Updated for version 4.5.1.
++--------------------------+
+Sat Aug 29 03:10:52 UTC 2020
+academic/OpenFOAM: Updated for version 8.
+academic/dakota: Updated for version 6.11.0.
+accessibility/espeak: Fix non-portaudio builds.
+accessibility/svox: Update download URL.
+audio/ardour: Updated for version 6.2.
+audio/calf-ladspa: Update download URL.
+audio/caps: Update download URL.
+audio/clam: Update download URL.
+audio/connie: Update download URL.
+audio/creox4: Update download URL.
+audio/faad2: Updated for version 2.9.2.
+audio/ff8dls: Update download URL.
+audio/fluidsynth-dssi: Update download URL.
+audio/fmmidi: Update download URL.
+audio/horgand: Update download URL.
+audio/jack-tools: Update download URL.
+audio/lash: Add texi2html auto-detection.
+audio/lmms: Update download URL.
+audio/lv2-mda-metapiano: Update download URL.
+audio/millennium-plugins: Update download URL.
+audio/mixxx: Updated for version 2.2.4.
+audio/mpd: Add meson to REQUIRES. Reformat README.
+audio/opusfile: Updated for version 0.12.
+audio/tapiir: Update download URL.
+audio/transcribe: Update download URL.
+audio/unsf: Update download URL.
+audio/vcf_plugins: Update download URL.
+desktop/9menu: Updated for version 1.10.
+desktop/bukubrow: Remove python dependency.
+desktop/ssr: Update to https.
+desktop/unsaver: Update download URL.
+desktop/vwm: Update download URL.
+desktop/wmclock: Update download URL.
+desktop/wmwebcam: Update download URL.
+development/bed: Update download URL.
+development/blassic: Update download URL.
+development/cc65: Update download URL.
+development/check: Fix MD5, info. Disable static.
+development/dkms: Updated for version 2.8.3
+development/eclipse-cpp: Updated for version 4.15.
+development/eclipse-java: Updated for version 4.15.
+development/eclipse-jee: Updated for version 4.15.
+development/inform: Update download URL.
+development/nchexedit: Update download URL.
+development/neovim: Updated for version 0.4.4.
+development/nim: Updated for version 1.2.4.
+development/ninja: Updated for version 1.10.1.
+development/racer: Remove python dependency.
+development/racket: Updated for version 7.8.
+development/re2c: Updated for version 2.0.3.
+development/rmac: Update download URL.
+development/robotframework: Switch to HTTPS.
+development/rustup: Remove python dependency.
+development/valgrind: Updated for version 3.16.1.
+development/vscode-bin: Updated for version 1.47.
+development/vscode-bin: Updated for version 1.47.3.
+development/xa: Update download URL.
+games/VASSAL: Updated for version 3.3.2.
+games/adl: Update download URL.
+games/antares: Updated for version 0.9.1.
+games/armagetronad: Updated for version 0.2.9.0.1.
+games/bstone: Updated for version 1.2.8.
+games/burgerspace: Update download URL.
+games/colem: Update download URL.
+games/cosmosmash: Update download URL.
+games/doomretro: Updated for version 3.5.10.
+games/ds-models: Update download URL.
+games/dungeon: Update download URL.
+games/eureka: Updated for version 1.27b.
+games/fortune-dune: Update download URL.
+games/fortune-farscape: Update download URL.
+games/fortune-slackware: Update download URL.
+games/fortune_firefly: Update download URL.
+games/goonies: Update download URL.
+games/gzdoom-legacy: Update old version URL.
+games/jezzball-kazzmir: Update download URL.
+games/jfsw_twin_dragon: Update download URL.
+games/jfsw_wanton_destruction: Update download URL.
+games/mari0: Update download URL.
+games/micropolis: Update download URL.
+games/minetest: Updated for version 5.3.0.
+games/minetest_game: Updated for version 5.3.0.
+games/mog: Update download URL.
+games/nblood: Update download URL.
+games/noteye: Update download URL.
+games/notpacman: Update download URL.
+games/nottetris2: Update download URL.
+games/openjazz: Update download URL.
+games/pentagram: Update download URL.
+games/pysolfc-extra-cardsets: Update download URL.
+games/smc: Update download URL.
+games/stella: Updated for version 6.2.1.
+games/syobonaction: Update download URL.
+games/warzone2100: Clean up build.
+games/wolf4sdl: Update download URL.
+games/xu4: Update download URL.
+games/yae: Update download URL.
+games/z26: Update download URL.
+games/zsnes: Update download URL.
+games/ztools: Update download URL.
+gis/geos: Update to https.
+gis/google-earth: Updated for version 7.3.3.7786.
+gis/proj-data: Updated for version 1.1.
+gis/proj: Updated for 7.1.0.
+gis/whitebox-tools: Updated for version 1.3.0.
+graphics/Blender: Updated for version 2.83.4
+graphics/gource: Updated for version 0.51.
+graphics/inkscape: Fix download link and README.
+graphics/libplacebo: Updated for version 2.72.0.
+graphics/pcx-pixbuf-loader: Update download URL.
+graphics/phatch: Update download URL.
+graphics/shaderc: Updated for version 2020.1.
+graphics/teighafileconverter: Update download URL.
+graphics/vuescan: Updated for version 9.7.32.
+graphics/webp-pixbuf-loader: Update download URL.
+graphics/wine-nine-standalone: Updated for version 0.6.
+graphics/xcf-pixbuf-loader: Update download URL.
+libraries/HawkNL: Update download URL.
+libraries/configobj: Add missing dep.
+libraries/flatzebra: Update download URL.
+libraries/libev: Updated for version 4.33.
+libraries/libgee: Updated for version 0.20.3.
+libraries/liblo: Updated for version 0.31.
+libraries/libosinfo: Updated for version 1.8.0, switch to meson.
+libraries/libseccomp: Updated for version 2.5.0.
+libraries/lilv: Updated for version 0.24.8.
+libraries/live555: Updated for version 2020.08.11
+libraries/quazip-qt5: Updated for version 0.9.1.
+libraries/quazip: Updated for version 0.9.1.
+libraries/serd: Updated for version 0.30.4.
+libraries/sparsehash: Updated for version 2.0.4.
+libraries/zita-alsa-pcmi: Updated for version 0.3.2.
+libraries/zita-resampler: Updated for version 1.6.2.
+misc/bdfresize: Update download URL.
+misc/keychain: Updated for version 2.8.5
+misc/moreutils: Make requirements optional, add a build variable
+misc/mosquitto: Updated for version 1.6.11
+misc/pinfo: Fix slack-desc, restore pman link.
+misc/xbanish: Updated for version 1.7.
+multimedia/ffmpeg4: Updated for version 4.3.1
+multimedia/flashplayer-plugin: Updated for version 32.0.0.414.
+multimedia/makemkv: Update download urls.
+multimedia/pepperflash-plugin: Updated for version 32.0.0.414.
+multimedia/straw-viewer: Update download URL.
+multimedia/straw-viewer: Updated for version 0.0.7.
+multimedia/x265: Switch to github mirror.
+network/2ping: Updated for version 4.5.
+network/cicb: Update download URL.
+network/dropbox: Updated for versoin 100.4.409.
+network/dropear: Updated for version 2020.80.
+network/ettercap: Updated for version 0.8.3.1.
+network/gophernicus: Update download URL.
+network/grsync: Updated for version 1.2.8.
+network/ipxnet: Update download URL.
+network/krb5: Remove unwanted files.
+network/lighttpd: Updated for version 1.4.55.
+network/mosaic-ck: Update download URL.
+network/newsboat: Updated for version 2.20.1.
+network/persepolis: Updated for version 3.2.0.
+network/policyd2: Update download URL.
+network/postgrey: Updated for version 1.37.
+network/prosody-mod-http-upload: Updated for version hg4070.
+network/prosody-mod-turncredentials: Updated for version hg4055.
+network/prosody-mod-vcard-muc: Updated for version hg4043.
+network/purple-facebook: Updated for version 0.9.6.
+network/qutebrowser: Updated for version 1.13.1.
+network/r8168: Updated for version 8.048.03.
+network/sshfs-fuse: Updated for version 3.7.0.
+network/sslcan: Updated for version 2.0.0.
+network/telegram: Updated for version 2.2.0.
+network/telegram: Updated for version 2.3.0.
+network/telegram: Updated for version 2.3.1.
+network/telegram: Updated for version 2.3.2.
+network/tor-browser: Updated for version 9.5.1.
+network/tor-browser: Updated for version 9.5.3.
+network/tribler: Update download URL.
+network/weechat: Updated for version 2.9.
+network/wireshark: Updated for version 3.2.5.
+network/wireshark: Updated for version 3.2.6.
+network/yle-dl: Updated for version 20200628.
+network/youtube-dl: Updated for version 2020.06.16.1.
+office/MasterPDFEditor: Updated for version 5.6.20.
+office/MasterPDFEditor: Updated for version 5.6.29.
+office/calcurse: Update README with optional dependency.
+office/fbpdf: Update download URL.
+office/keepassxc: Updated for version 2.6.0.
+office/tellico: Update to https.
+office/turtl: Update to version 0.7.2.6
+perl/perl-Math-MPC: Updated for version 1.09.
+perl/perl-Math-MPFR: Updated for version 4.14.
+perl/perl-Sidef: Updated for version 3.96.
+perl/perl-parallel-forkmanager: Added the dependency perl-test-warn.
+python/Pygments: Update to https.
+python/html2text: Use github URL.
+python/python-djvulibre: Updated for version 0.8.5.
+python/python-magick: Updated for version 0.9.19.
+python/python3-packaging: Fix homepage.
+python/python3-packaging: Updated for version 20.4.
+python/python3-pandas: Updated for version 1.0.5.
+python/python3-pylint: Updated for version 2.6.0.
+python/python3-wcwidth: Updated for version 0.2.5.
+ruby/ruby-build: Updated for version 20200819.
+system/ZoneMinder: Update download URL.
+system/ack: Updated for version 3.4.0.
+system/adobe-source-sans-pro-font: Updated for version 3.006R.
+system/agedu: Update download URL.
+system/alacritty: Remove python dependency.
+system/bitmapfont2ttf: Update download URL.
+system/blktrace: Switch to HTTPS.
+system/clamav: Updated for version 0.102.4.
+system/dse-typewriter-font: Update download URL.
+system/etsh: Update download URL.
+system/exa: Remove python dependency.
+system/exomizer: Update download URL.
+system/fd: Remove python dependency.
+system/fwupd: Updated for version 1.2.13.
+system/fzf: Updated for version 0.22.0.
+system/gnu-unifont: Updated for version 13.0.03.
+system/info2man: Update download URL.
+system/isextract: Update download URL.
+system/jsawk: Support mozjs68 from -current.
+system/kitchen-sync: Updated with version 2.5.
+system/letsencrypt: Updated for version 1.6.0.
+system/letsencrypt: Updated for version 1.7.0.
+system/lxsession: Updated for version 0.5.5.
+system/mkslack: Updated for version 5.3.4.
+system/noto-emoji: Updated for version 20200722.
+system/openstego: Updated for version 0.7.4.
+system/osinfo-db-tools: Updated for version 1.8.0, switch to meson.
+system/osinfo-db: Updated for version 20200813.
+system/osquery-bin: Updated for version 4.4.0.
+system/otf2bdf: Update download URL.
+system/ph: Update email.
+system/phoronix-test-suite: Updated for version 9.8.0.
+system/podman: change variable for repo source directory
+system/pucrunch: Update download URL.
+system/ripgrep: Remove python dependency.
+system/rtirq: Update download URL.
+system/sandy: Update download URL.
+system/sdl-jstest: Update download URL.
+system/setconf: Updated for version 0.7.7.
+system/slpkg: Updated for version 3.9.0.
+system/solarize-12x29-psf: Update download URL.
+system/ttf-console-fonts: Update download URL.
+system/usermin: Updated for version 1.802.
+system/vice: New maintainer.
+system/vinterm: Update download URL.
+system/vtcol: Remove python dependency.
+system/webmin: Updated for version 1.954.
+system/wine-staging: Updated for version 5.15.2.
+system/wine: Update README.
+system/xen: XSA 317-328 update.
++--------------------------+
+Sun Jun 28 01:18:06 UTC 2020
+academic/biblesync: Update README.
+academic/bibletime: Update README.
+academic/fet: Updated for version 5.44.9.
+academic/reduce-algebra: Updated for version 20200624svn5377.
+academic/rpy2: Updated for version 3.3.4.
+academic/scilab: Fix md5sum.
+academic/sword-data-kjv: Update README.
+academic/sword: Update README.
+academic/xiphos: Update README.
+accessibility/fonts-opendyslexic: Added (font for dyslexics)
+accessibility/xzoom: Added (magnify part of X display)
+desktop/Qogir-icon-theme: Updated for version 20200622.
+desktop/buku: Updated for version 4.4.
+desktop/menulibre: Added (FreeDesktop.org compliant menu editor)
+desktop/screenfetch: Updated for version 3.9.1.
+desktop/screenkey: Update links.
+desktop/ssr: Updated for version 0.4.2.
+development/check: Updated for version 0.15.0.
+development/composer: Updated for version 1.10.8
+development/d-tools: Updated for version 2.092.1
+development/dmd: Updated for version 2.092.1
+development/eclipse-cpp: Updated for version 4.16.
+development/eclipse-java: Updated for version 4.16.
+development/eclipse-jee: Updated for version 4.16.
+development/neovim-qt: Updated for version 0.2.16.1.
+development/qbs: Updated for version 1.16.0.
+development/qt-creator-llvm: Updated for version 8.0_c47ba33.
+development/qt-creator: Updated for version 4.12.3.
+development/tiled: updated for version 1.4.0
+development/tkdiff: Updated for version 5.0.
+development/universal-ctags: Updated for version 62f0144
+games/4do-libretro: Unmaintained.
+games/Gearboy: Unmaintained.
+games/Gearsystem: Unmaintained.
+games/Genesis-Plus-GX: Unmaintained.
+games/RetroArch: Updated for version 1.8.9.
+games/SameBoy: Unmaintained.
+games/VASSAL: Updated for version 3.3.1.
+games/beetle-lynx-libretro: Unmaintained.
+games/beetle-ngp-libretro: Unmaintained.
+games/beetle-pce-fast-libretro: Unmaintained.
+games/beetle-pcfx-libretro: Unmaintained.
+games/beetle-psx-libretro: Unmaintained.
+games/beetle-saturn-libretro: Unmaintained.
+games/beetle-supergrafx-libretro: Unmaintained.
+games/beetle-vb-libretro: Unmaintained.
+games/beetle-wswan-libretro: Unmaintained.
+games/blastem-libretro: Unmaintained.
+games/blueMSX-libretro: Unmaintained.
+games/bsnes-mercury: Unmaintained.
+games/cannonball-libretro: Unmaintained.
+games/fbalpha: Unmaintained.
+games/fmsx-libretro: Unmaintained.
+games/gambatte-libretro: Unmaintained.
+games/gw-libretro: Unmaintained.
+games/libretro-2048: Unmaintained.
+games/libretro-desmume: Unmaintained.
+games/libretro-fceumm: Unmaintained.
+games/libretro-handy: Unmaintained.
+games/libretro-prboom: Unmaintained.
+games/libretro-reicast: Unmaintained.
+games/libretro-vecx: Unmaintained.
+games/libretro-yabause: Unmaintained.
+games/mame2000-libretro: Unmaintained.
+games/nxengine-libretro: Unmaintained.
+games/parallel-n64: Unmaintained.
+games/pcsx-rearmed: Unmaintained.
+games/picodrive: Unmaintained.
+games/prosystem-libretro: Unmaintained.
+games/scummvm-libretro: Unmaintained.
+games/snes9x2010: Updated for version 2020.05.18_187e2b5.
+games/starfighter: Updated for version 2.2.1.
+games/stella-libretro: Unmaintained.
+games/tyrquake-libretro: Unmaintained.
+games/virtualjaguar-libretro: Unmaintained.
+games/warzone2100: updated for version 3.4.0
+gis/OWSLib: Updated for version 0.20.0.
+gis/geopy: Updated for version 2.0.0.
+gis/qgis: Build and dependency fixes.
+gis/rasterio: Updated for version 1.1.5.
+graphics/Blender: Updated for version 2.83.1
+graphics/vuescan: Updated MD5SUMs.
+libraries/QScintilla-qt5: Updated for version 2.11.5.
+libraries/iddawc: Added (OAuth2 client library).
+libraries/libpaper: Update README.
+libraries/libuv: Updated for version 1.38.0.
+libraries/live555: Updated for version 2020.06.25
+libraries/msgpack-c: Updated for version 3.3.0.
+libraries/mujs: Updated for version 1.0.7 & new maintainer
+libraries/qwt-qt5: Updated for version 6.1.5.
+libraries/rhonabwy: Added (Manage JW* libraries).
+libraries/robin-map: Updated for version 0.6.3
+libraries/ulfius: updated for version 2.6.7
+misc/conkyforecast: Removed.
+misc/par: Updated for version 1.53.0, new maintainer.
+multimedia/ffmpeg4: Updated for version 4.3. New maintainer
+multimedia/mpv: Updated for version 0.32.0. New maintainer
+multimedia/straw-viewer: Updated for version 0.0.5+20200619_9880e01.
+multimedia/strawberry: Fix source md5.
+network/ckermit: Updated for version 9.0.304.23.
+network/dokuwiki: Updated for version 20180422c.
+network/dropbear: Updated for version 2020.79.
+network/franz: Added (Messaging App Unification)
+network/glewlwyd: updated for version 2.3.0
+network/neomutt: Updated for version 20200619.
+network/newsboat: Updated for version 2.20.
+network/putty: Updated for version 0.74.
+network/qutebrowser-tox: Updated for version 1.13.0.
+network/qutebrowser: Updated for version 1.13.0.
+network/shorewall-core: Updated for version 5.2.5.1.
+network/shorewall6: Updated for version 5.2.5.1.
+network/shorewall: Updated for version 5.2.5.1.
+network/spice: Fix dep info in README
+network/sshuttle: updated for version 1.0.2
+network/teamviewer: Updated for version 15.7.6.
+network/telegram: Updated for version 2.1.13.
+network/vivaldi: Updated for version 3.1.1929.40.
+network/w3m: Updated SlackBuild for POSIX compliance.
+network/wireguard-linux-compat: Updated for version 1.0.20200623.
+network/yle-dl: Updated for version 20200618.
+office/abiword: Updated for version 3.0.4.
+perl/MoarVM: Updated for version 2020.06.
+perl/nqp: Updated for version 2020.06.
+perl/perl-B-COW: Added (additional B helpers to check COW status)
+perl/perl-Clone: Updated for version 0.45.
+perl/perl-Devel-Declare: Updated for version 0.006022.
+perl/perl-HTML-HTMLDoc: Added (HTML to PDF convertor).
+perl/perl-MaxMind-DB-Reader-XS: Fix slack-desc.
+perl/perl-MaxMind-DB-Reader: Add perl-Test-Number-Delta dependency.
+perl/perl-MooseX-Types-Structured: Update REQUIRES.
+perl/perl-Mutex: Added (Process synchronization primitives)
+perl/perl-Number-Convert-Roman: Added (numeral converter)
+perl/perl-Parse-Method-Signatures: Update REQUIRES.
+perl/perl-Scalar-List-Utils: Updated for version 1.55.
+perl/perl-namespace-autoclean: Add perl-Test_needs to REQUIRES.
+perl/rakudo: Updated for version 2020.06.
+perl/zef: Updated for version 0.8.5.
+python/PyGreSQL: Updated for version 5.2
+python/asttokens: Update README.
+python/esptool: Update README.
+python/google-images-download: Added (Py script for Google Images)
+python/mypy: Updated for version 0.781.
+python/pycryptodomex: Updated for version 3.9.8.
+python/python-netaddr: Updated for version 0.7.20
+python/python-requests: Updated for version 2.24.0.
+ruby/rubygem-parallel: Updated for version 1.19.2.
+ruby/rubygem-parser: Updated for version 2.7.1.4.
+system/CPU-X: Updated for version 4.0.1.
+system/Iosevka-slab: Added (Open source monospace coding font)
+system/Iosevka: Updated for version 3.2.2.
+system/bitmapfont2ttf: Added (convert BDF fonts to vector TTF)
+system/borgbackup: Updated for version 1.1.13.
+system/dosbox-dev: updated for version 0.75_pre4354
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.13.
+system/execline: Updated for version 2.6.1.0.
+system/filerunner: Added (two-pane graphical file manager)
+system/jdupes: updated for version 1.16.0
+system/lbench: Fix download link.
+system/md5deep: Fix build on -current.
+system/mkslack: Updated for version 5.3.0.
+system/nvidia-driver: Updated for version 440.100.
+system/nvidia-kernel: Updated for version 440.100.
+system/nvidia-legacy390-driver: Updated for version 390.138.
+system/nvidia-legacy390-kernel: Updated for version 390.138.
+system/ph: Added (A fast Slackware Package History tool).
+system/pspg: Updated for version 3.1.2.
+system/s6-linux-init: Updated for version 1.0.4.2.
+system/s6: Updated for version 2.9.2.0.
+system/slack-scripts: Removed
+system/targetcli-fb: Updated for version 2.1.53.
+system/telegraf: Updated for version 1.14.4.
+system/ttf-ancient-fonts: Added (Unicode fonts for ancient scripts)
+system/unionfs-fuse: Added (unionfs filesystem).
+system/v4l2loopback: Added (k/ module for V4L2 loopback devices)
+system/vice: Add optional ffmpeg dependency.
+system/wine-staging: Updated for version 5.11.
++--------------------------+
+Sat Jun 20 01:00:20 UTC 2020
+academic/colin: Updated for version 1.8.1.
+academic/copasi: Updated for version 4.28.226.
+academic/reduce-algrebra: Updated for version 20200614svn5365.
+academic/scilab: Updated for version 6.1.0
+academic/sundials: Updated for version 5.3.0.
+audio/gogglesmm: Fix VERSION.
+audio/podget: Updated for version 0.8.6.
+desktop/clipmenu: Added (clipboard management using dmenu)
+development/cudatoolkit: Updated for version 10.2.89.
+development/nodejs: Updated for version 12.18.0.
+development/perf: Updated for version 4.4.227.
+development/vscode-bin: Updated for version 1.46.1.
+games/VASSAL: Updated for version 3.3.0.
+games/openttd: Updated for version 1.10.1.
+games/pcsx2: Updated for version 1.6.0.
+games/tbftss: Updated for version 1.5.1.
+gis/qgis: Updated for version 3.14.0.
+gis/qmapshack: Updated for version 1.15.0.
+graphics/white_dune: Updated for version 1.876.
+ham/flmsg: Added (Amateur radio messaging tool)
+ham/flrig: Updated for version 1.3.50.
+libraries/olm: Updated for version 3.1.5.
+misc/OSCAR: Updated for version 1.1.1.
+misc/protobuf3: Updated for version 3.12.3.
+multimedia/LBRY: Updated for version 0.46.2.
+multimedia/strawberry: Updated for version 0.6.12.
+multimedia/vlc: Updated for version 3.0.11
+network/NetworkManager-fortisslvpn: Update build tag
+network/TeamSpeak3: Updated for version 3.5.3
+network/brave-browser: Updated for version 1.10.90.
+network/keepalived: Updated for version 2.1.2.
+network/mattermost-desktop: Updated for version 4.5.0.
+network/modemu2k: Updated for version 0.0.6.
+network/nicotine+: Updated for version 1.4.2.
+network/protonmail-bridge: Updated for version 1.2.7.
+network/shorewall-core: Updated for version 5.2.5.
+network/shorewall6: Updated for version 5.2.5.
+network/shorewall: Updated for version 5.2.5.
+network/telegram: Updated for version 2.1.12.
+network/zoom-linux: Updated for version 5.1.412382.0614.
+office/calibre-bin: Updated for version 4.19.0.
+office/latexdiff: Updated for version 1.3.1.1.
+office/mtp2-fonts: Update HOMEPAGE.
+office/texlive: Patched to fix xindy scripts.
+python/django-sass: Added (simplest way to use Sass with Django)
+python/pathtools3: Added (File system general utilities)
+python/pysass: Added (python3 watch capability)
+python/python-parsedatetime: Updated for version 2.6.
+python/watchdog: Added (Filesystem events monitoring)
+ruby/rubygem-ast: Updated for version 2.4.1.
+system/ansible: Updated for version 2.9.10.
+system/ft2demos: Added (freetype demos and tools)
+system/intelmas: Update HOMEPAGE.
+system/lynis: Updated for version 3.0.0.
+system/netdata: Updated for version 1.22.1.
+system/nvme-cli: Updated for version 1.12.
+system/parallel: Updated for version 20200522.
+system/passwordsafe: Updated for version 1.11.0.
+system/rmw: Updated for version 0.7.05.
++--------------------------+
+Sun Jun 14 10:46:44 UTC 2020
+academic/cadabra2: Updated for version 2.3.0.
+academic/cdo: Added (Climate Data Operators)
+academic/fet: Update DOWNLOAD url.
+academic/seqkit: Added (toolkit for FASTA/Q file manipulation)
+academic/tiemu: Remove SRCNAM from SlackBuild.
+audio/ardour: Updated for version 6.0.
+audio/gogglesmm: Updated for version 1.1.9.
+audio/lv2: Updated for version 1.18.0, changed maintainer.
+audio/twolame: Updated for version 0.4.0.
+desktop/qt5ct: Updated for version 1.0.
+desktop/wmsupermon: Added (monitoring dockapp for WindowMaker)
+development/Fennel: Updated for version 0.4.1.
+development/dart-sdk: Updated for version 2.8.4.
+development/dotnet-runtime: Updated for version 3.1.5.
+development/dotnet-sdk: Updated for version 3.1.301.
+development/fossil: Updated for version 2.11.1.
+development/lepton-eda: Updated for version 1.9.11.
+development/pkgconf: Updated for version 1.7.3.
+development/samurai: Updated for version 1.1.
+development/sbcl: Updated for version 2.0.5.
+development/tig: Fix __git_complete: command not found.
+games/steam: Updated for version 1.0.0.63
+gis/opencpn-plugin-oesenc: Updated for version 4.0.10.
+graphics/Blender: Update READMEs regarding CUDA
+graphics/feh: Updated for version 3.4.1.
+graphics/libplacebo: Updated for version 2.43.1.
+graphics/shaderc: Updated for version 2020.0.
+graphics/vuescan: Updated MD5SUMs.
+graphics/vulkan-sdk: Updated for version 1.2.141.0.
+libraries/PyQt5: Add qt5 to REQUIRES.
+libraries/VTK: No qt/plugins to install when QT=no
+libraries/adns: Updated for version 1.6.0.
+libraries/aspnetcore-runtime: Updated for version 3.1.5.
+libraries/cfitsio: Updated for version 3.48.
+libraries/lilv: Updated for version 0.24.6, changed maintainer.
+libraries/mbedtls: Updated for version 2.16.6.
+libraries/python3-PyQt5: Add qt5 to REQUIRES.
+libraries/qt5: Remove rpath block.
+libraries/serd: Updated for version 0.30.2, changed maintainer.
+libraries/sord: Updated for version 0.16.4, changed maintainer.
+libraries/sratom: Updated for version 0.6.4, changed maintainer.
+libraries/suil: Updated for version 0.10.6, changed maintainer.
+libraries/wimlib: Updated for version 1.13.2.
+multimedia/flashplayer-plugin: Updated for version 32.0.0.387.
+multimedia/k9copy-reloaded: Updated for ffmpeg 2.8.16.
+multimedia/lwks: Fix permission post building.
+multimedia/pepperflash-plugin: Updated for version 32.0.0.387.
+multimedia/plexmediaserver: Updated for v 1.19.4.2935_79e214ead.
+multimedia/x265: Updated for version 3.4.
+network/i2pd: Added (I2P Daemon)
+network/mattermost-desktop: Updated for version 4.4.2.
+network/nordvpn: Updated for version 3.7.3.
+network/palemoon-bin: Updated for version 28.10.0.
+network/palemoon: Updated for version 28.10.0.
+network/signal-desktop: Updated for version 1.34.2.
+network/telegram: Updated for version 2.1.11.
+network/vivaldi: Updated for version 3.1.1929.34.
+network/wireguard-linux-compat: Updated for version 1.0.20200611.
+network/zoom-linux: Updated for version 5.0.418682.0603.
+office/anorack: Updated for version 0.2.7.
+office/krop: Updated for version 0.6.0.
+office/latexdiff: Updated for version 1.3.1.
+office/lyx: Updated for version 2.3.5.1.
+office/pstoedit: Updated for version 3.75.
+office/texlive-docs: Updated for version 2020.200608.
+office/texlive-extra: Updated for version 2020.200608.
+office/texlive: Updated for version 2020.200608.
+office/texmacs: Updated for version 1.99.13.
+python/bleach: Add dependency.
+python/python3-astroid: Updated for version 2.4.2.
+python/python3-pylint: Updated for version 2.5.3.
+python/werkzeug: Updated for version 1.0.1.
+system/Iosevka: Updated for version 3.1.1.
+system/dse-typewriter-font: Added (typewriter-style TrueType font)
+system/fcron: Disable PAM.
+system/fwupd: Updated for version 1.2.12.
+system/guake: Updated for version 3.7.0.
+system/intelmas: Updated for version 1.0.6.
+system/kbfs: Updated for version 5.5.1_20200527202541.
+system/keybase: Updated for version 5.5.1.
+system/loksh: Updated for version 6.7.2.
+system/oksh: Updated for version 6.7.
+system/posh: Updated for version 0.14.1.
+system/powershell: Updated for version 7.0.2.
+system/sandbox: Updated for version 2.20.
+system/sqlite2: Update source.
+system/tpm: Updated for version 1.3.3.
+system/wine-staging: Updated for version 5.10.
+system/wine: Updated for version 5.0.1.
+system/wmgtemp: Updated for version 1.2.
+system/yash: Updated for version 2.50.
++--------------------------+
+Sat Jun  6 03:08:25 UTC 2020
+academic/R: Updated for version 4.0.0.
+academic/fet: Updated for version 5.44.8.
+academic/nco: Updated for version 4.9.3.
+academic/sage: Updated for version 9.1.
+academic/xiphos: Updated for version 4.2.1.
+audio/snd: Updated for version 20.3.
+desktop/autorandr: Updated for version 1.10.1.
+desktop/rofi-calc: Added (display configuration manager).
+desktop/rofi-emoji: Added (rofi emoji plugin).
+desktop/rofi-pass: Added (Simple Password Store).
+desktop/vertex-maia-icon-theme: Added (Manjaro icon theme).
+desktop/vertex-maia-themes: Added (Theme for Manjaro Linux).
+development/CImg: updated for version 2.9.0
+development/OpenHantek6022: Update REQUIRES.
+development/dbeaver-ce: Updated for version 7.1.0.
+games/FlightGear-data: Updated for version 2020.1.2.
+games/FlightGear: Updated for version 2020.1.2.
+games/steam: Make zenity required rather than optional
+graphics/Blender: Updated for version 2.83.0
+graphics/tuxpaint-stamps: Updated for version 2020.05.29.
+graphics/tuxpaint: Updated for version 0.9.24.
+graphics/vuescan: Updated for verion 9.7.28.
+libraries/PyQt5: Remove qt5-webkit dependency.
+libraries/SOPE: Updated for version 4.3.2.
+libraries/SimGear: Updated for version 2020.1.2.
+libraries/libedit: Updated for version 20191231_3.1.
+libraries/libtorrent-rasterbar-legacy: Added (C++ library).
+libraries/libtorrent-rasterbar: Updated for version 1.2.7.
+libraries/libxdg-basedir: Moved from development and patched.
+libraries/python3-PyQt5: Remove qt5-webkit dependency.
+libraries/python3-PyQtWebEngine: Move sip include dir.
+libraries/qwt: Updated for version 6.1.5
+multimedia/plexmediaserver: Updated for v 1.19.4.2902_69560ce1e.
+network/bitcoin: Updated for version 0.20.0.
+network/bollux: Added (bash Gemini client)
+network/dropbox: Updated for version 98.4.158.
+network/exim: Updated for version 4.94.
+network/mailspring: Updated for version 1.7.8.
+network/qbittorrent-qt5: Updated for version 4.2.5.
+network/qbittorrent: Update DEP.
+network/qutebrowser-tox: Updated for version 1.12.0.
+network/qutebrowser: Updated for version 1.12.0.
+network/telegram: Updated for version 2.1.10.
+network/tor-browser: Updated for version 9.5.
+network/transmission: Allow QT=no in env.
+office/SOGo: Updated for version 4.3.2.
+office/anorack: Updated for version 0.2.6.
+office/calibre-bin: Updated for version 4.18.0.
+office/qpdfview-qt5: Updated for version 0.4.18.
+office/qpdfview: Updated for version 0.4.18.
+perl/perl-Date-Manip: Updated for version 6.82.
+perl/perl-Panel-JSON-XSS: Updated for version 4.19.
+perl/perl-common-sense: Updated for version 3.75.
+perl/perl-html-form: Updated for version 6.07.
+perl/perl-http-server-simple: Updated for version 0.52.
+python/mypy: Updated for version 0.780.
+python/python-mysql-replication: Added (Manage MySQL Replication).
+ruby/rubygem-parser: Updated for version 2.7.1.3.
+system/dash: Updated for version 0.5.11.
+system/fish: Updated for version 3.1.2.
+system/letsencrypt: Updated for version 1.5.0.
+system/memtester: Added (memory test utility).
+system/pass-otp: Added (Manage OTP tokens).
+system/slpkg: Updated for version 3.8.9.
+system/xen: Updated for version 4.13.1.
++--------------------------+
+Mon Jun  1 01:47:11 UTC 2020
+academic/biblesync: Updated for version 2.1.0.
+academic/ngspice: Updated for version 32.
+academic/suitesparse: Updated for version 5.7.2
+audio/asunder: Updated for version 2.9.6.
+desktop/adapta-gtk-theme: Updated for version 3.95.0.11.
+desktop/autorand: Fix slack-desc.
+desktop/fvwm95: Updated for version 2.0.43f.
+desktop/icewm: Updated for version 1.6.6.
+desktop/jgmenu: Updated for version 4.2.1.
+development/Fennel: Updated for version 0.4.0.
+development/atom: Updated for version 1.47.0.
+development/dkms: Updated for version 2.8.2
+development/dotnet-runtime: Updated for version 3.1.4.
+development/dotnet-sdk: Updated for version 3.1.300.
+development/dte: Updated for version 1.9.1.
+development/electron: Updated for version 10.0.0_beta.1.
+development/hopper: Updated for version 4.5.28.
+development/kicad-footprints: Updated for version 5.1.6.
+development/kicad-packages3D: Updated for version 5.1.6.
+development/kicad-symbols: Updated for version 5.1.6.
+development/kicad-templates: Updated for version 5.1.6.
+development/minikube: Updated for version 1.9.2.
+development/pycharm: Updated for version 2020.1.1.
+development/tiled: updated for version 1.3.5
+development/uncrustify: Updated for version 0.71.0
+development/valgrind: Updated for version 3.16.0.
+games/higan: Update README.
+games/starfighter: Updated for version 2.2.
+libraries/VTK: Note that 8.2.0 is last version for 14.2
+libraries/aspnetcore-runtime: Updated for version 3.1.4.
+libraries/libcpuid: Updated for version 0.5.0.
+libraries/libmrss: Fix URLs.
+libraries/libuchardet: Updated for version 0.0.7.
+libraries/pigpio: Added (GPIO for Raspberry).
+libraries/uriparser: Updated for version 0.9.4.
+libraries/xview: New maintainer, build tweaks.
+misc/mosquitto: Updated for version 1.6.10
+misc/yubioath-desktop: Updated for version 5.0.4.
+multimedia/LBRY: Updated for version 0.45.2.
+multimedia/aom: Updated for version 2.0.0.
+multimedia/plexmediaserver: Updated for vers 1.19.3.2852_219a9974e
+multimedia/straw-viewer: Updated for version 0.0.3+20200516_820ebc7.
+multimedia/strawberry: Updated for version 0.6.11.
+multimedia/vlc: Remove references to libaom
+network/NetworkManager-fortisslvpn: Added (NetworkManager SSLVPN).
+network/anydesk: Updated for version 5.5.6.
+network/brave-browser: Updated for version 1.9.76.
+network/frr: Updated for version 7.3.1.
+network/krb5: Updated for version 1.18.2.
+network/lldpd: Updated for version 1.0.5.
+network/mod_auth_gssapi: Updated for version 1.6.2.
+network/mosh: Updated for version 1.3.2.
+network/nordvpn: Updated for version 3.7.2.
+network/onedrive: Updated for version 2.4.2.
+network/onionshare: Updated for version: 2.2.0
+network/openconnect: Updated for version 8.10 + slack-desc update.
+network/openfortivpn: Updated for version 1.14.1.
+network/opera-developer: Updated for version 70.0.3693.0.
+network/opera: Updated for version 68.0.3618.125.
+network/prosody-mod-turncredentials: Added (TURN credentials).
+network/riot-web: Updated for version 1.6.0
+network/speedometer: Updated for version 2.8.
+network/telegram: Updated for version 2.1.7.
+network/transmission-qt4: Added (bittorrent client)
+network/transmission-remote-gtk: Updated for v1.4.1, new maintainer.
+network/transmission: Updated for version 3.00.
+network/zoom-linux: Updated for version 5.0.413237.0524.
+office/calibre-bin: Updated for version 4.17.0.
+office/impressive: Updated for version 0.12.1.
+perl/perl-IO-Tty: Updated for version 1.14.
+ruby/rubygem-ruumba: Updated for version 0.1.16.
+system/CPU-X: Updated for version 4.0.0.
+system/bacula-client: Updated for version 9.6.3.
+system/bacula: Updated for version 9.6.3.
+system/bleachbit: Updated for version 4.0.0.
+system/btrbk: Updated for version 0.29.1.
+system/cpuid2cpuflags: Updated for version 9.0.
+system/dget: Updated for version 2.20.3.
+system/execline: Updated for version 2.6.0.2.
+system/fd: Updated for version 8.1.1.
+system/jdupes: updated for version 1.15.0
+system/mksh: Updated for version R59b.
+system/noto-emoji: Updated for version 20200408.
+system/nvme-cli: Updated for version 1.11.2.
+system/phoronix-test-suite: Updated for version 9.6.1.
+system/powershell: Updated for version 7.0.1.
+system/ripgrep: Updated for version 12.1.1.
+system/sunflower: Added (Twin-panel file manager)
+system/targetcli-fb: Fix version in info file.
+system/telegraf: Updated for version 1.14.3.
+system/zfs-on-linux: Updated for version 0.8.4.
++--------------------------+
+Sat May 23 02:32:35 UTC 2020
+academic/boinc: fix default data location
+academic/colin: Added (a structural analysis application).
+academic/muscle: Update script and added manual page.
+academic/rpy2: Updated for version 3.3.3.
+academic/tiemu: Added (TI-89/92/V200 emulator for linux)
+desktop/lumina: Updated for version 1.6.0.
+desktop/unsaver: Added (deactivate screensaver).
+development/OpenHantek6022: Added (Hantek6022 oscilloscope software)
+development/dasht: Updated for version 2.4.0.
+development/dbeaver-ce: Updated for version 7.0.5.
+development/dbeaver: Removed (use dbeaver-ce).
+games/VASSAL: Better desktop support.
+games/mangband: Fix MD5SUM.
+games/mgba: Fix typos when copying documents.
+games/mrboom: Update script.
+gis/qgis: Updated for version 3.12.3.
+graphics/tuxpaint: Add missing dep.
+libraries/aqbanking: Updated for version 6.2.1.
+libraries/enchant2: Updated for version 2.2.8.
+libraries/gwenhywfar: Updated for version 5.3.0.
+libraries/imlib2_loaders: Updated for version 1.6.1.
+misc/goldencheetah: Added desktop file and icons.
+misc/protobuf3: Updated for version 3.12.1.
+multimedia/aom: Added (Open Source Video Codec)
+multimedia/plexmediaserver: Updated to 1.19.3.2831_181d9145d.
+multimedia/xawtv: Updated for version 3.107.
+network/bluejeans: Updated for version 2.2.0.
+network/dropbox: Updated for version 97.4.467.
+network/etherape: Updated for version 0.9.19.
+network/frr: Updated for version 7.3.
+network/onedrive: Updated for version 2.4.1.
+network/pCloudDrive: Updated for version 1.8.2.
+network/prosody-mod-smacks-offline: Removed.
+network/signal-desktop: Updated for version 1.34.1.
+network/teamviewer: Updated for version 15.5.6.
+network/tor: Updated for version 0.4.3.5.
+network/wireguard-linux-compat: Updated for version 1.0.20200520.
+network/wireguard-tools: Updated for version 1.0.20200513.
+network/wireshark: Updated for version 3.2.4.
+network/zoom-linux: Updated for version 5.0.408598.0517.
+office/aspell6-es: Removed.
+office/focuswriter-legacy: Added (distraction-free word processor)
+office/focuswriter: Updated for version 1.7.6.
+office/fop2.0: Added (print formatter).
+office/fop: Updated for version 2.5.
+office/lumina-calculator: Updated for version 1.6.0.
+office/lumina-pdf: Updated for version 1.6.0.
+office/pstoedit: Added configure options.
+office/timew: Update MD5SUM.
+perl/perl-Module-Build: Updated README with optional deps..
+python/BeautifulSoup4: Updated for v 4.9.1, moved from libraries.
+python/PyAudio: Updated for version 0.2.11.
+python/WTForms: Updated for version 2.3.1.
+python/Yapps2: Added (Yet Another Python Parser System).
+python/alabaster: Updated for version 0.7.12.
+python/captcha: Added (A captcha python library)
+python/cheetah3: Added (template engine and code-generation tool)
+python/imagesize: Updated for version 1.2.0.
+python/jaraco-packaging: Added (Tools for packaging).
+python/jsonpatch: Added (Library to apply JSON Patches)
+python/python-soupsieve: Updated for version 1.9.6.
+python/python3-Flask-httpauth: Added (Extension for Python3-Flask)
+python/python3-multidict: Updated for version 4.7.6.
+python/python3-soupsieve: Updated for version 2.0.1.
+python/rst-linker: Added (routine for adding links).
+python/rst: Added (Python module).
+ruby/ruby-build: Updated for version 20200520.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.12.
+system/fd: Updated for version 8.1.0.
+system/gnu-unifont: Updated for version 13.0.02.
+system/kitchen-sync: Updated for version 2.3.
+system/slack-osquery: Added (osquery extensions for slackware).
+system/ttf-ipaex: Updated for version 004.01.
+system/vagrant: Updated md5sum.
++--------------------------+
+Sat May 16 01:45:30 UTC 2020
+academic/fet: Updated for version 5.44.6.
+academic/latex2html: Updated for version 2020.
+academic/libqalculate: Updated to version 3.10.0
+academic/meep: Updated for version 1.14.
+academic/mpb: Updated for version 1.10.0.
+academic/qalculate-gtk: Updated to version 3.10.0
+audio/ocp: Updated for version 0.2.1.
+desktop/x-tile: updated for version 3.1
+development/codelite: Fix build against newer libssh.
+development/colordiff: Updated for version 1.0.19.
+development/dbeaver-ce: Updated for version 7.0.4.
+development/git-lfs: Updated for version 2.11.0.
+development/nodejs: Fix MD5SUM.
+development/vscode-bin: Updated for version 0.98.
+games/FlightGear-data: Updated for version 2020.1.1.
+games/FlightGear: Updated for version 2020.1.1.
+games/mrboom: Updated for version 4.9.
+games/peg-e: Updated to version 1.2.8
+games/quarry: Added (a universal board game interface program)
+gis/Fiona: Remove Python 2 support.
+gis/Shapely: Remove Python 2 support.
+gis/geopandas: Added (Python tools for geographic data)
+gis/geopy: Updated for version 1.22.0.
+gis/navit: Updated for version 0.5.4.
+gis/pgsql-ogr-fdw: Updated for version 1.0.11.
+gis/pyproj: Updated for version 2.6.1.
+gis/rasterio: Updated for version 1.1.4.
+gis/saga-gis: Updated for version 7.6.3.
+graphics/qrencode: Remove .la files.
+libraries/Jinja2: Updated for version 2.11.2.
+libraries/SimGear: Updated for version 2020.1.1.
+libraries/digimend-kernel-drivers: Updated for version 20200429.
+libraries/libctl: Updated for version 4.5.0.
+libraries/libqb: Updated for version 2.0.0.
+libraries/libxnvctrl: Updated for version 440.82.
+libraries/libyang: Updated for version 1.0.167.
+libraries/live555: Updated for version 2020.05.15
+libraries/luasec: Updated for version 0.9.
+libraries/netcdf: Updated for version 4.7.4.
+libraries/pcre2: Updated to version 10.35
+libraries/podofo: Fix build version number
+misc/linux_logo: Updated for version 6.0.
+misc/yubioath-desktop: Added (Yubico Authenticator)
+multimedia/flashplayer-plugin: Updated for version 32.0.0.371.
+multimedia/pepperflash-plugin: Updated for version 32.0.0.371.
+multimedia/strawberry: Updated for version 0.6.10.
+multimedia/webvfx: Added (video effects engine).
+network/AdGuardHome: Updated for version 0.102.0.
+network/brave-browser: Updated for version 1.8.95.
+network/broadcom-sta: Support for Linux 5.6.
+network/deluge: Update DEP.
+network/icecat: Updated for version 60.7.0.
+network/netsniff-ng: Updated for version 0.6.7.
+network/prosody: Updated for version 11.5.
+network/sfeed: Updated for version 0.9.17.
+network/shorewall-core: Updated for version 5.2.4.5.
+network/shorewall6: Updated for version 5.2.4.5.
+network/shorewall: Updated for version 5.2.4.5.
+network/signal-desktop: Updated for version 1.33.4.
+network/spamassassin: Updated for version 3.4.4.
+network/syncthing: Updated for version 1.5.0.
+network/telegram: Updated for version 2.1.5.
+network/wireguard-tools: Updated for version 1.0.20200510.
+network/zoom-linux: Updated for version 5.0.403652.0509.
+office/calibre-bin: Updated for version 4.16.0.
+office/ganttproject: Updated for version 2.8.11.
+office/gnucash: Patched.
+office/when: Updated for version 1.1.40.
+perl/perl-MaxMind-DB-Reader-XS: Added (XS searching in MaxMind DB)
+perl/perl-MaxMind-DB-Reader: Added (MaxMind DB reader)
+python/contextlib2: Added (Context management).
+python/internetarchive: Added (CLI interface to Archive.org).
+python/jsonpointer: Added (Library to resolve JSON Pointers).
+python/python-branca: Updated for version 0.4.1.
+python/python-libnacl: Updated to version 1.7.1
+python/python-toml: Updated for version 0.10.1.
+python/python3-Cython: Updated for version 0.29.17
+python/python3-astroid: Updated for version 2.4.1.
+python/python3-jupyter-ipykernel: Updated for version 5.2.1.
+python/python3-pandas: Updated for version 1.0.3.
+python/python3-pylint: Updated for version 2.5.2.
+python/python3-seaborn: Updated for version 0.10.1.
+python/python3-wrapt: Updated for version 1.12.1.
+python/schema: Added (Python data structures validation).
+python/sphinx-rtd-theme: Added (decorator)
+python/typing-extensions: Added (Backported/Experimental Type Hints)
+python/vine: Added (promise, async, future)
+python/workbook: Added (App that creates xls reports or tables)
+python/xlutils: Added (utilities for working with Excel files)
+ruby/rubygem-parser: Updated for version 2.7.1.2.
+system/ansible: Updated for version 2.9.9.
+system/clamav: Updated for version 0.102.3.
+system/goaccess: Updated for version 1.3.
+system/letsencrypt: Updated for version 1.4.0.
+system/runit: Update config.tar.
+system/targetcli-fb: Updated for version 2.1.52.
+system/usbrelay: Updated for version 0.7.
+system/vagrant: Updated for version 2.2.9.
++--------------------------+
+Sun May 10 01:38:26 UTC 2020
+academic/biblesync: Fix pkg-config.
+academic/chartgeany: Added (market analysis tool)
+academic/cryptominisat: Updated for version 5.7.1.
+academic/freechartgeany: Removed
+academic/gcompris-qt: Added (an educational software suite)
+academic/libqalculate: Updated for version 3.9.0a
+academic/mpb: Added (computing electromagnetic band).
+academic/qalculate-gtk: Updated for version 3.9.0a
+academic/sage: Fix post-installation path.
+academic/sword: Add patch to fix formatting.
+audio/qmmp-plugin-pack: Updated for version 0.12.2.
+audio/qmmp: Updated for version 0.12.7.
+desktop/bukubrow: Updated for version 5.1.0.
+desktop/simplenote: Updated for version 1.16.0.
+development/cmocka: Updated for version 6.5.2.
+development/jdk11: Fix shebang.
+development/jdk12: Fix shebang.
+development/jdk13: Fix shebang.
+development/jdk14: Fix shebang.
+development/libb2: Updated for version 0.98.1.
+development/nodejs: Updated for version 12.16.3.
+development/robotframework: Updated for version 3.2.1.
+development/spin: Updated for version 6.5.2.
+games/fceux: Fix build with scons.
+games/onscripter: Updated for version 20200419.
+gis/cartopy: Updated for version 0.18.0.
+gis/qgis: Updated for version 3.12.2.
+graphics/brlcad: updated for version 7.30.8
+ham/ax25-apps: Added (AX.25 Packet radio support software).
+ham/ax25-tools: Added (AX.25 Packet radio supporting tools).
+ham/libax25: Added (AX.25 Packet radio support for linux).
+libraries/SDL_kitchensink: updated for version 1.0.8
+libraries/VTK: Note VTK-8.2.0 is last suitable version for SL-14.2
+libraries/hoel: updated for version 1.4.16
+libraries/http-parser: Updated for version 2.9.4
+libraries/podofo: Updated for version 0.9.6
+libraries/zziplib: Updated for version 0.13.71
+misc/KeePass: Updated for version 2.45.
+multimedia/dvdbackup: Fix name.
+multimedia/k9copy-reloaded: Fix path.
+multimedia/lives: Fix email.
+multimedia/plexmediaserver: Updated for v 1.19.3.2764_ef515a800.
+network/asterisk: Updated for version 16.10.0.
+network/bluejeans: Fix shebang.
+network/openconnect: Updated for version 8.09 + new maintainer.
+network/pexip-infinity-connect: Fix shebang.
+network/prosody-mod-cloud-notify: Updated for version hg3996.
+network/prosody-mod-smacks: Updated for version hg4009.
+network/qutebrowser-tox: Updated for version 1.11.1.
+network/slimjet: Updated for version 26.0.5.0.
+network/telegram: Updated for version 2.1.2.
+network/telegram: Updated for version 2.1.4.
+network/tor-browser: Updated for version 9.0.10.
+network/vivaldi: Updated for version 3.0.1874.38.
+network/wireguard-linux-compat: Updated for version 1.0.20200506.
+network/zeek: Updated for version 3.0.5.
+office/gnucash-legacy-docs: Update email.
+office/gnucash-legacy: Update README.
+office/gnucash: Update README.
+office/texmaker: Updated for version 5.0.4
+office/texstudio: Updated for version 2.12.22
+office/timew: Updated for version 1.3.0.
+office/when: Added (an extremely simple personal calendar program)
+perl/MoarVM: Updated for version 2020.05.
+perl/nqp: Updated for version 2020.05.
+perl/perl-Net-ARP: Updated for version 1.0.11.
+perl/rakudo: Updated for version 2020.05.
+perl/zef: Updated for version 0.8.4.
+python/python3-astroid: Updated for version 2.4.0.
+python/python3-ipython: Updated for version 7.14.0.
+python/python3-pylint: Updated for version 2.5.0.
+system/bat: Revert to version 0.13.0.
+system/ccd2cue: Added (convert CloneCD images to bin/cue)
+system/chronograf: Updated for version 1.8.4.
+system/crc32_simple: Added (calculate crc32 checksum of files)
+system/dosbox-x: Updated for version 0.98.1.
+system/mksh: Updated for version R59.
+system/nvidia-driver: Update script.
+system/nvidia-legacy390-driver: Update script.
+system/osquery-bin: Added (OS instrumentation framework)
+system/ripgrep: Updated for version 12.1.0.
+system/skopeo: Updated to version 0.2.0.
+system/sleuthkit: Updated for version 4.9.0.
+system/telegraf: Updated for version 1.14.2.
++--------------------------+
+Sun May  3 01:49:27 UTC 2020
+academic/fet: Fix download link.
+academic/fet: Updated for version 5.44.3.
+audio/exhale: Added (a CLI xHE-AAC encoder).
+audio/mixxx: Remove unnecessary scons routine.
+business/stansoft: Updated for version 7.19.
+desktop/breath-gtk-theme: Added (Theme for Manjaro Linux).
+desktop/i3blocks: Updated for version 1.5.
+desktop/ssr: Updated for version 0.4.1.
+desktop/xfce4-wavelan-plugin: Updated for version 0.6.1.
+development/Sphinx: 3.0.3.
+development/adoptopenjdk-openj9: Added (Open Implementation of JDK).
+development/arm-binutils: Updated for version 2.34.
+development/cgit: Fix GIT version.
+development/composer: Updated for version 1.10.5
+development/d-tools: Updated for version 2.091.1
+development/dbeaver-ce: Updated for version 7.0.3.
+development/dmd: Updated for version 2.091.1
+development/dwz: Added (dwarf compressor).
+development/google-go-lang: Updated for version 1.13.10.
+development/jdk: Updated for version 8u251.
+development/mg-troglobit: Fix slack-desc.
+development/psycopg2: Updated for version 2.8.5.
+development/robotframework: Updated for version 3.2.
+development/sbcl: Updated for version 2.0.4.
+development/svn-all-fast-export: Updated for version 1.0.18.
+development/universal-ctags: Updated for version 41e1fb6
+games/crispy-doom: Updated for version 5.8.0.
+games/endless-sky: updated for version 0.9.12
+games/fs-uae-arcade: Updated for version 3.0.3.
+games/fs-uae-launcher: Updated for version 3.0.3.
+games/fs-uae: Updated for version 3.0.3, moved from system.
+games/gzdoom-legacy: Fix window title.
+games/hatari: Support IPF/CTR images, various fixes.
+games/jfsw: Update docs, support Twin Dragon.
+games/jfsw_registered_data: Use CD image as source.
+games/jfsw_twin_dragon: Added (game data for Shadow Warrior)
+games/nblood: Added (Game Engine for Blood).
+games/powerslave_demo_data: Added (game data for nblood).
+games/steam: Updated for version 1.0.0.62
+gis/OTB: Updated for version 7.1.0.
+gis/ossim: Updated for version 2.11.1.
+gis/pdal: Updated for version 2.1.0.
+gis/proj: Updated for 7.0.1.
+gis/saga-gis: Updated for version 7.6.2.
+graphics/SweetHome3D: changed src for openjdk8
+graphics/SweetHome3D: updated for version 6.3
+graphics/fritzing: build against newer version of libgit2
+graphics/ueberzug: Added ueberzug (An alternative to w3mimgdisplay).
+haskell/haskell-ShellCheck: Updated for version 0.7.1.
+libraries/grantlee-qt5: Updated for version 5.2.0
+libraries/grpc: Updated for version 1.28.1
+libraries/jsoncpp: Updated for version 1.9.2
+libraries/libaal: Updated for version 1.0.7.
+libraries/libbluray: Updated for version 1.2.0
+libraries/libcapsimage: Added libcapsimage (decoder library)
+libraries/libcbor: updated for version 0.7.0
+libraries/libcec: Updated for version 4.0.4
+libraries/libgit2-glib: build against newer version of libgit2
+libraries/libgit2: Updated for version 1.0.0
+libraries/libotf: Updated for version 0.9.16
+libraries/libsass: updated for version 3.6.4
+libraries/liburcu: Updated for version 0.12.1.
+libraries/live555: Updated for version 2020.04.24
+libraries/nltk: Updated for version 3.5.
+libraries/python3-PyQt5: Change python3 include path.
+libraries/qt5: Update README.
+libraries/re2: Updated for version 2020_05_01
+libraries/tinyxml2: Updated for version 8.0.0
+libraries/wxGTK3: Updated for version 3.0.5.
+libraries/xmlsec: Updated for version 1.2.30.
+misc/bchunk: Updated for version 1.2.2.
+misc/dvtm: Fix and install terminfo.
+misc/subsurface: Fix building against newer version of libgit2
+multimedia/MuseScore: Updated for version 3.4.2.
+multimedia/plexmediaserver: Updated for v 1.19.2.2737_b69929dab.
+multimedia/vlc: Updated for version 3.0.10
+multimedia/xmms-cue: Added xmms-cue (XMMS Cuesheet reader plugin).
+network/coturn: Updated for version 4.5.1.2.
+network/hostapd: Updated for version 2.9.
+network/opensmtpd-extras: updated for version 6.7.1
+network/owncloud-client: Updated for version 2.5.4.11654.
+network/palemoon-bin: Fix SlackBuild for version 28.8.4.
+network/pexip-infinity-connect: Add missing image.
+network/prosody-mod-cloud-notify: Updated for version hg3979.
+network/prosody-mod-smacks: Updated for version hg3986.
+network/qutebrowser-tox: Updated for version 1.11.0.
+network/shorewall-core: Updated for version 5.2.4.4.
+network/shorewall6: Updated for version 5.2.4.4.
+network/shorewall: Updated for version 5.2.4.4.
+network/signal-desktop: Updated for version 1.33.3.
+network/sqlmap: Updated for version 1.4.4.
+network/teamviewer: Updated for version 15.5.3.
+network/telegram: Updated for version 2.1.0.
+network/telegram: Updated for version 2.1.1.
+network/tgt: Added SCSI target driver (iSCSI, Fibre Channel, SRP, etc)
+network/unbound: Updated for version 1.10.0.
+network/vivaldi: Updated for version 3.0.1874.33.
+network/wireguard-linux-compat: Updated for version 1.0.20200429.
+network/zabbix_agentd: Updated for version 4.4.7.
+network/zabbix_java_gateway: Updated for version 4.4.7.
+network/zabbix_proxy: Updated for version 4.4.7.
+network/zabbix_server: Updated for version 4.4.7.
+network/zoom-linux: Updated for version 5.0.398100.0427.
+office/calcurse: Updated for version 4.6.0.
+office/calibre-bin: Updated for version 4.14.0.
+office/calibre-bin: Updated for version 4.15.0.
+office/htmldoc: Updated for version 1.9.8.
+office/pdfstudio: Updated for version 2019.2.2.
+office/pdfstudioviewer: Updated for version 2019.2.2.
+perl/perl-Data-IEEE754: Added (Support for IEEE754 floats)
+perl/perl-MaxMind-DB-Common: Added (Common code/metadata)
+perl/perl-Net-ARP: Updated for version 1.0.10.
+perl/perl-Net-Works: Added (APIs for IP addresses and networks)
+perl/perl-Path-Tiny: Updated for version 0.114.
+perl/perl-Test-Bits: Added perl-Test-Bits (Test single bits)
+python/PyGreSQL: Updated for version 5.1.2
+python/bleach: Updated for version 3.1.5.
+python/et_xmlfile: Added (python library to create large XML files)
+python/jdcal: Added jdcal (python module to convert dates)
+python/pyperclip: Updated for version 1.7.0.
+python/python-configargparse: Updated for version 1.2.3.
+python/python-toml: Added (A Python library).
+python/python3-aiohttp-socks: Updated for version 0.3.9.
+python/python3-openpyxl: Added (lib to read/write Excel 2010 files)
+python/python3-sip: Change python3 include path.
+python/sphinxcontrib-websupport: Updated for version 1.2.2.
+ruby/ruby-native-package-installer: Updated for version 1.0.9.
+ruby/rubygem-mime-types-data: Updated for version 3.2020.0425.
+ruby/rubygem-parser: Updated for version 2.7.1.1.
+system/avfs: Updated for version 1.1.2.
+system/bat: Updated for version 0.15.0.
+system/corosync: Updated for version 2.4.5.
+system/dlm: Updated for version 4.0.9.
+system/dtrx: Updated for version 7.1.
+system/epson-inkjet-printer-escpr2: Updated for version 1.1.11.
+system/fio: Updated for version 3.19.
+system/hwloc: Updated for version 2.2.0.
+system/isextract: Added (extract v3 InstallShield files).
+system/kapacitor: Updated for version 1.5.5.
+system/kbfs: Updated for version 5.4.2_20200424214931.
+system/keybase: Updated for version 5.4.2.
+system/motion: Updated for version 4.3.1.
+system/numactl: Updated for version 2.0.13.
+system/nvme-cli: Updated for version 1.11.1.
+system/pacemaker: Updated for version 2.0.3.
+system/passwordsafe: Updated for version 1.010.0.
+system/phoronix-test-suite: Updated for version 9.6.0.
+system/pspg: Updated for version 3.0.7.
+system/rclone: Updated for version 1.51.0.
+system/reiserfs4progs: Updated for version 1.2.1.
+system/sysdig: Updated for version 0.26.6
+system/wine-staging: Updated for version 5.7.
+system/wine: Updated for version 5.0.
++--------------------------+
+Fri Apr 24 01:19:39 UTC 2020
+academic/rpy2: Updated for version 3.3.1.
+desktop/anki: Add REQUIRES python3-PyQtWebEngine.
+desktop/find-cursor: Updated for version 1.6.
+development/Sphinx: Fix README.
+development/cgit: Updated for version 1.2.3.
+development/jdk11: Updated for version 11.0.7.
+development/jdk12: Update script.
+development/jdk13: Update script.
+development/jdk14: Added (Java Platform SDK).
+games/edgar: Updated for version 1.33.
+games/ppsspp: Rename .info file to avoid confusion.
+gis/saga-gis: Add clarifying note about OpenCV.
+graphics/nomacs: Updated for version 3.14.2.
+ham/chirp: Updated for version 20200409.
+libraries/BeautifulSoup4: Updated for version 4.9.0.
+libraries/hdf5: Updated for version 1.10.6.
+libraries/libuv: Updated for version 1.37.0.
+libraries/med: Updated for version 4.0.0.
+libraries/opencv: Updated for version 4.3.0
+libraries/pcre2: Updated for version 10.34
+libraries/qt5-styleplugins: Patched for qt5-5.12.8.
+libraries/qt5-webkit: Fix source directory.
+libraries/qt5: Update README.
+misc/dmg2img: added missing man page
+multimedia/LBRY: Updated for version 0.45.0.
+multimedia/dvdbackup: Updated for version 0.4.2.
+multimedia/flashplayer-plugin: Updated for version 32.0.0.363.
+multimedia/pepperflash-plugin: Updated for version 32.0.0.363.
+multimedia/plexmediaserver: Updated for v 1.19.1.2701-6327e27bf.
+multimedia/strawberry: Updated for version 0.6.9.
+multimedia/xawtv: Fix path issue.
+network/RTL8192: Added (Realtek RTL8192 chip Driver).
+network/bluejeans: Updated for version 2.1.1.
+network/dnscrypt-proxy: Updated for version 2.0.42.
+network/easyrsa: Updated for version 3.0.7.
+network/keepalived: Updated for version 2.0.20.
+network/neomutt: Updated for version 20200417.
+network/pCloudDrive: Updated for version 1.8.0.
+network/pexip-infinity-connect: Updated for v 1.6.0.52922.63.120.
+network/qutebrowser-tox: Updated for version 1.10.2.
+network/vivaldi: Updated for version 3.0.1874.23.
+network/wp-cli: Added (A command line interface for WordPress).
+network/yle-dl: Updated for version 20200419.
+office/gnucash-docs: Updated for version 3.10.
+office/gnucash: Updated for version 3.10.
+office/xournalpp: Updated for version 1.0.18.
+python/pytables: Removed (abandoned and not compatible with hdf5).
+python/python-zipp: Updated dependencies.
+python/python3-setuptools_autover: Updated for version 1.0.2.
+python/python3-uth: Updated for version 1.1.1.
+ruby/rubygem-asciidoctor: Updated for version 2.0.10.
+system/ansible: Updated for version 2.9.7.
+system/cluster-glue: Updated for version 20161102_afaeeb.
+system/docker-proxy: Fix MD5SUM.
+system/fence-agents: Updated for version 4.5.2.
+system/heartbeat: Added (Linux-HA heartbeat).
+system/nvme-cli: Updated for version 1.11.
+system/resource-agents: Updated for version 4.5.0.
+system/worker: Updated for version 4.4.0.
++--------------------------+
+Sun Apr 19 03:58:19 UTC 2020
+academic/fet: Updated for version 5.44.1.
+academic/rpy2: Added (R in Python).
+audio/audacity: Use correct github URL.
+audio/carla: Updated for version 2.1.
+audio/deadbeef: New maintainer.
+audio/faac: Use correct github URL.
+audio/faad2: Use correct github URL.
+audio/fluidsynth-dssi: Updated for version 1.0.0+20190112_c9b4107.
+audio/lmms: Updated for version 1.2.1.
+audio/mpd: Updated for version 0.21.22.
+audio/muse: Patched.
+audio/muse: Updated for version 3.1.
+audio/swami: Updated for version 2.2.1.
+desktop/Qogir-icon-theme: Speed up build.
+desktop/Surfn: Simplify & speed up build.
+desktop/Zafiro-icons: Speed up build.
+desktop/arc-icon-theme: Speed up build.
+desktop/areao43-icon-theme: Speed up build.
+desktop/awoken-icon-theme: Speed up build.
+desktop/faba-mono-icons: Speed up build.
+desktop/faenza-icon-theme: Speed up build.
+desktop/faience-icon-theme: Speed up build.
+desktop/find-cursor: Updated for version 1.5.
+desktop/flatwoken-icon-theme: Speed up build.
+desktop/kfaenza-icon-theme: Speed up build.
+desktop/meliae-icon-theme: Speed up build.
+desktop/numix-icon-theme-square: Speed up build.
+desktop/numix-icon-theme-square: Updated for version 20191227.
+desktop/numix-icon-theme: Fix VERSION, speed up build.
+desktop/oranchelo-icon-theme: Speed up build.
+desktop/papirus-icon-theme: Speed up build.
+desktop/ssr: Updated for version 0.4.0.
+desktop/vivacious-colors-gtk-icon-theme: Speed up build.
+desktop/weston: Update DEP.
+development/cf-cli: Updated for version 6.51.0.
+development/codelite: Updated for version 14.0.
+development/google-webdesigner: Updated for version 8.0.1.0401.
+development/kotlin: Updated for version 1.3.72.
+development/love: Updated for version 11.3, new maintainer.
+development/tea: new maintainer
+development/tig: Updated for version 2.5.1.
+development/tiled: Updated for version 1.3.4.
+development/tiled: updated for version 1.3.3
+development/uz80as: Update MD5SUM.
+development/vscode-bin: Updated for version 1.44.1.
+development/vscode-bin: Updated for version 1.44.2.
+games/7kaa: Updated for version 2.15.3.
+games/FlightGear-data: Updated for version 2018.3.5.
+games/FlightGear: Updated for version 2018.3.5.
+games/SLADE: Updated for version 3.1.11, new maintainer.
+games/ags: updated for version 3.5.0.24
+games/doomretro: Updated for version 3.5.4, new maintainer.
+games/eureka: Updated for version 1.24, new maintainer.
+games/innoextract: New maintainer.
+games/jfsw: Fix fluidsynth 2.x build.
+games/lgogdownloader: updated for version 3.7
+games/lmpc: Updated for version 1b70022.
+games/mangband: Updated for version 1.5.3.
+games/mgba: Updated for version 0.8.1.
+games/mrrescue: Updated for version 1.02e+20180818_a5be73c.
+games/nestopia: Updated for version 1.50.
+games/ppsspp: Add missing file.
+games/ppsspp: Fix missing dep.
+games/ppsspp: Updated for version 1.9.4.
+games/prboom-plus: Updated for version 2.5.1.7um, new maintainer.
+games/qzdl: New maintainer.
+games/scummvm: Updated for version 2.1.2, fix build.
+games/yamagi-quake2: New maintainer.
+gis/gpxsee: Updated for version 7.28.
+graphics/brlcad: updated for version 7.30.2
+graphics/wayland-egl: Removed (included in wayland).
+ham/CubicSDR: Updated for version d2f9333.
+ham/liquid-dsp: Updated for version 1.3.2.
+libraries/Botan: Updated for version 2.14.0.
+libraries/SDL2: Updated for version 2.0.12, new maintainer.
+libraries/SDL2_image: Updated for version 2.0.5, new maintainer.
+libraries/SDL2_mixer: new maintainer.
+libraries/SDL2_net: new maintainer.
+libraries/SDL2_ttf: Updated for version 2.0.15, new maintainer.
+libraries/SimGear: Add missing patch.
+libraries/SimGear: Updated for version 2018.3.5.
+libraries/efl: Fix build.
+libraries/hoel: updated for version 1.4.15
+libraries/libcbor: updated for version 0.6.1
+libraries/libinput: Updated for version 1.15.5.
+libraries/libinstpatch: Updated for version 1.1.2.
+libraries/librsync: New maintainer.
+libraries/liburcu: Updated for version 0.12.0.
+libraries/live555: Updated for version 2020.04.12
+libraries/lua-readline: Updated for version 2.6.
+libraries/lua-std.normalize: Updated for version 2.0.3.
+libraries/python3-PyQt5: Update REQUIRES.
+libraries/qt5-legacy: Remove README.benchmarks.
+libraries/qt5-webkit-annulen: Removed.
+libraries/qt5-webkit: Add -reduce-relocations.
+libraries/qt5-webkit: Use correct github URL.
+libraries/qt5: Updated for version 5.12.8.
+libraries/tolua++: Use correct github URL.
+libraries/ulfius: updated for version 2.6.6
+libraries/yder: updated for version 1.4.10
+misc/grc: New maintainer.
+misc/qtkeychain: Updated for version 0.10.0.
+multimedia/dvdbackup: Remove instructions for current.
+multimedia/k9copy-reloaded: Use internal dvdnav.
+multimedia/obs-studio: Note latest buildable version
+multimedia/vlc: Updated for version 3.0.9.2
+network/coturn: Added (open source TURN and STUN Server).
+network/freerdp: Updated for version 2.0.0.
+network/insync: Updated for version 3.1.3.40790.
+network/krb5: Updated for version 1.18.1.
+network/netcat-openbsd: Removed unused patches.
+network/palemoon: Updated for version 28.9.1.
+network/qutebrowser-tox: Updated for version 1.10.2.
+network/qutebrowser: Update README.
+network/qutebrowser: Updated for version 1.10.2.
+network/shorewall-core: Updated for version 5.2.4.1.
+network/shorewall6: Updated for version 5.2.4.1.
+network/shorewall: Updated for version 5.2.4.1.
+network/signal-desktop: Updated for version 1.33.1.
+network/skypeforlinux: Updated for version 8.59.0.77.
+network/translate-shell: Updated for version 0.9.6.11.
+network/uTox: Updated for version 0.17.2
+network/urlgrabber: New maintainer.
+network/wireguard-linux-compat: Updated for version 1.0.20200413.
+network/zoom-linux: Updated for version 3.5.385850.0413.
+office/hunspell-de: Fix script.
+office/keepassxc: Updated for version 2.5.4.
+office/plover: Added (Open source stenotype engine).
+office/xlsx2csv: Added (xlsx to csv converter).
+office/xournal: Updated for version 0.4.8.2016.
+perl/perl-CPANPLUS: Updated for version 0.9908.
+perl/perl-List-AllUtils: Added (All List utilities).
+perl/perl-Moo: Updated for version 2.004000.
+perl/perl-MooX-StrictConstructor: Updated for version 0.011.
+python/asttokens: Updated for version 2.0.4.
+python/pybind11: Updated for version 2.5.0
+python/pycdio: Updated for version 0.21.
+python/python-configargparse: Updated for version 1.2.1.
+python/python-jsonrpclib: Updated for version 0.4.1.
+python/python-soupsieve: Update README.
+python/python3-pyrsistent: Updated for version 0.16.0.
+python/python3-soupsieve: Updated for version 1.9.5.
+python/sphinxcontrib-plantuml: Updated for version 0.18.
+python/sphinxcontrib-websupport: Updated for version 1.2.1.
+system/acpitool: New maintainer.
+system/bleachbit: Updated for version 3.9.2.
+system/chronograf: Updated for version 1.8.2.
+system/ciopfs: New maintainer.
+system/containerd: Updated for version 1.2.13.
+system/docker-proxy: Updated for version 20200102_9fd385b.
+system/docker: Updated for version 19.03.8.
+system/dosbox-dev: updated for version 0.74.3.r4335
+system/fd: Updated for version 8.0.0.
+system/kbfs: Updated for version 5.4.0_20200416162659.
+system/keybase: Updated for version 5.4.0.
+system/lnav: Updated for version 0.8.5.
+system/netdata: Updated for version 1.21.1.
+system/nvidia-driver: Updated for version 440.82.
+system/nvidia-kernel: Updated for version 440.82.
+system/nvidia-legacy390-driver: Fix nvidia-switch.
+system/ossec-agent: Update copyright year and credits.
+system/ossec-local: Update copyright year and credits.
+system/ossec-server: Update copyright year and credits.
+system/runc: Updated for version 1.0.0_rc10.
+system/skim: Updated for version 0.8.1.
+system/sysbench: Added (benchmark suite).
+system/telegraf: Updated for version 1.14.1.
+system/thinkfan: Updated for version 1.1.
+system/unetbootin: Updated for version 677.
+system/xen: Updated for version 4.13.0.
+system/xldconfig: Updated for version 0.7.
++--------------------------+
+Sat Apr 11 02:30:39 UTC 2020
+academic/gri: Update HOMEPAGE.
+audio/fluidsynth: Updated for version 2.1.1, new maintainer.
+audio/pd: Updated for version 0.50_2.
+audio/qsynth: Updated for version 0.6.2.
+desktop/boston-icon-theme: Updated for version 0.6.
+desktop/gkrellm-themes: Added (Themes for GKrellM).
+desktop/numix-icon-theme-circle: Speed up symlink creation.
+desktop/numix-icon-theme: Speed up symlink creation.
+development/Sphinx: Updated for version 2.4.4.
+development/bas55: Updated for version 1.18.
+development/byacc: Updated for version 20200330.
+development/codeblocks: Updated for version 20.03.
+development/crystal-lang: Added (a Ruby-like programming language).
+development/minikube: Updated for version 1.9.2.
+development/nim: Updated for version 1.2.0.
+development/octant: Added (Web Interface for Kubernetes).
+development/rustup: Support building newer versions.
+development/snappy: Fix build with gtest installed.
+development/uz80as: Updated for version 1.11.
+development/velero: Updated for version 1.3.2.
+development/vscode-bin: Updated for version 1.44.0.
+games/speed-dreams: Updated for version 2.2.2_r6553.
+games/starfighter: Updated for version 2.1.
+gis/OWSLib: Updated for version 0.19.2.
+gis/pyproj: Updated for version 2.6.0.
+graphics/vuescan: Update MD5SUMs.
+libraries/digimend-kernel-drivers: Added (Tablet drivers).
+libraries/hdf: Updated for version 4.2.15.
+libraries/libQuotient: Updated for version 0.5.3.2.
+libraries/qt5-webkit: Updated for version 5.212.0_alpha4.
+libraries/skalibs: Updated for version 2.9.2.1.
+libraries/tbb: Updated for version 2020u2.
+multimedia/dvdbackup: Fix build on -current.
+multimedia/plexmediaserver: Updated for v 1.19.1.2630_72c16a276.
+network/Quaternion: Updated for version 0.0.9.4e.
+network/axel: Updated for version 2.17.8.
+network/dropbox: Updated for version 94.4.384.
+network/insync: Updated for version 3.1.2.40785.
+network/netcat-openbsd: Updated for version 1.217-1.
+network/nordvpn: Updated for version 3.7.0.
+network/opera-developer: Updated for version 69.0.3653.0.
+network/opera: Updated for version 67.0.3575.137.
+network/prosody-mod-smacks: Updated for version hg3968.
+network/protonmail-bridge: Added (ProtonMail Bridge).
+network/qutebrowser-tox: Update OpenSSL version.
+network/signal-desktop: Updated for version 1.33.0.
+network/slack: Updated for version 4.4.2.
+network/tor-browser: Updated for version 9.0.9.
+network/wireguard-linux-compat: Updated for version 1.0.20200401.
+network/wireshark: Updated for version 3.2.3.
+network/zoom-linux: Updated for version 3.5.383291.0407.
+office/CherryTree: Updated for version 0.39.2.
+office/onlyoffice-desktopeditors: Updated for version 5.5.1.
+office/xournal: Update HOMEPAGE.
+perl/perl-Clone: Updated for version 0.43.
+perl/perl-Data-Dumper-Concise: Update HOMEPAGE.
+perl/perl-Data-Validate-IP: Update HOMEPAGE.
+perl/perl-HTML-Tidy: Update HOMEPAGE.
+perl/perl-IO-Socket-SSL: Updated for version 2.068.
+perl/perl-Moose: Updated for version 2.2012.
+perl/perl-Scalar-List-Utils: Updated for version 1.54.
+perl/perl-String-Random: Update HOMEPAGE.
+perl/perl-String-Scanf: Update HOMEPAGE.
+perl/perl-Test-HexDifferences: Update HOMEPAGE.
+perl/perl-namespace-autoclean: Updated for version 0.29.
+python/bleach: Updated for version 3.1.4.
+python/python-importlib_metadata: Updated for 1.6.0.
+python/python-soupsieve: Added (A CSS selector implementation).
+python/python3-ipython: Updated for version 7.13.0.
+python/python3-jupyter-ipykernel: Updated for version 5.2.0.
+python/python3-soupsieve: Added (A CSS selector implementation).
+python/python3-tornado: Updated for version 6.0.4.
+python/python3-wcwidth: Updated for version 0.1.9.
+python/sphinxcontrib-devhelp: Updated for version 1.0.2.
+python/sphinxcontrib-qthelp: Updated for version 1.0.3.
+python/sphinxcontrib-serializinghtml: Updated for version 1.1.4.
+ruby/rubygem-parser: Updated for version 2.7.1.0.
+ruby/sequel: Updated for version 5.31.0.
+system/apache-tomcat: Updated for version 7.0.103.
+system/bleachbit: Updated for version 3.9.0.
+system/kbfs: Updated for version 5.3.1_20200320154633.
+system/kexec-tools: Updated for version 2.0.20.
+system/keybase: Updated for version 5.3.1.
+system/libtrash: Added (trash can).
+system/netdata: Updated for version 1.21.0.
+system/nvidia-driver: added rc.nvidia-persistenced.
+system/nvidia-kernel: New maintainer.
+system/nvidia-legacy390-driver: added rc.nvidia-persistenced.
+system/nvidia-legacy390-kernel: New maintainer.
+system/psuinfo: Added (Custom system usage info).
+system/tbsm: Fix README.
+system/telegraf: Updated for version 1.14.0.
++--------------------------+
+Mon Apr  6 04:12:40 UTC 2020
+development/qbs: Requires qt5-legacy.
+development/sqlitebrowser: downgrade to 3.10.1.
+graphics/qelectrotech: Requires qt5-legacy.
+graphics/scantailor: Requires qt5-legacy.
+libraries/PyQt5: Updated for version 5.13.2.
+libraries/python3-PyQt5: Updated for version 5.13.2.
+libraries/qt5-legacy: Update README
+libraries/qt5-legacy: Update to 5.9.9.
+libraries/qt5: Fix QtWebEngine
+libraries/qt5: Fix typo
+libraries/qt5: Remove old benchmarks file
+libraries/qt5: Remove patch for private includes
+libraries/qt5: Remove unneeded find for libqgsttools_p.prl
+libraries/qt5: Update README
+libraries/qt5: Update to 5.12.6
+libraries/qt5: Updated for version 5.12.7.
+network/qutebrowser: Add python3-PyQtWebEngine to REQUIRES
+python/python2-sip: Updated for version 4.19.20.
+python/python3-sip: Added private sip module
+python/python3-sip: Updated for version 4.19.20.
++--------------------------+
+Sat Apr  4 02:50:46 UTC 2020
+academic/fet: Updated for version 5.44.0.
+academic/h5utils: Fixed the md5sum.
+academic/sage: Fix build on x86.
+academic/veusz: Updated for version 3.2.1.
+academic/zotero: Updated for version 5.0.85.
+accessibility/xdotool: Fix potential security issue.
+audio/qmmp-plugin-pack-qt5: Updated for version 1.3.2.
+audio/qmmp-qt5: Updated for version 1.3.7.
+business/stansoft: Updated for version 7.18.
+desktop/numix-icon-theme-circle: Fix VERSION.
+desktop/numix-icon-theme: Fix VERSION.
+desktop/wmix: Updated for version 3.4.
+desktop/wmsysmon: Added (Dock Applications).
+development/bpython: Updated for version 0.19.
+development/dotnet-runtime: Updated for version 3.1.3.
+development/dotnet-sdk: Updated for version 3.1.201.
+development/gede: Updated for version 2.16.2.
+development/nim: Added (Programming Language).
+development/sbcl: Updated for version 2.0.3.
+development/xnedit: Updated for version 1.2.0.
+games/nethack: Updated for version 3.6.6.
+games/stella: Updated for version 6.1.
+gis/basemap: Removed.
+gis/qmapshack: Updated for version 3.0.1.
+graphics/flameshot: Fixed DBUS path.
+graphics/vuescan: Updated for version 9.7.27.
+ham/SDRPlay: Updated for version 2.13.1.
+ham/SoapyRemote: Added (Remote support for Soapy SDR).
+ham/SoapySDR: Updated for version 0.7.2.
+ham/SoapySDRPlay: Updated for version 0.2.0.
+libraries/SDL2: Updated for version 2.0.12.
+libraries/aspnetcore-runtime: Updated for version 3.1.3.
+libraries/ctemplate: Updated for version 2.4.
+libraries/libuv: Disable static.
+libraries/libwebp: Updated for version 1.1.0.
+libraries/opencl-amd: Added (OpenCL Userspace Driver).
+libraries/protobuf-c: Updated for version 1.3.3.
+libraries/wayland: Updated for version 1.18.0.
+multimedia/LBRY: Added (Browser to LBRY Network).
+multimedia/plexmediaserver: Updated for v 1.18.9.2578_513b381af.
+network/asterisk: Update DOWNLOAD url.
+network/brave-browser: Updated for version 1.5.115.
+network/dissenter-browser: Updated for version 1.5.114.
+network/dropbox: Updated for version 93.4.273.
+network/newsboat: Updated for version 2.19.
+network/palemoon-bin: Update DOWNLOAD URLs.
+network/palemoon: Updated for version 28.9.0.2.
+network/prosody-mod-cloud-notify: Updated for version hg3944.
+network/prosody-mod-http-upload: Updated for version hg3963.
+network/prosody-mod-smacks-offline: Updated for version hg3938.
+network/prosody-mod-smacks: Updated for version hg3956.
+network/shorewall-core: Updated for version 5.2.4.
+network/shorewall6: Updated for version 5.2.4.
+network/shorewall: Updated for version 5.2.4.
+network/signal-desktop: Updated for version 1.32.3.
+network/syncthing: Updated for version 1.4.0.
+network/t38modem: Updated for version 3.15.
+network/telegram: Updated for version 2.0.0.
+network/telegram: Updated for version 2.0.1.
+network/weechat: Updated for version 2.8.
+network/wireguard-linux-compat: Updated for version 1.0.20200330.
+office/gnucash-doc: Updated for version 3.9.
+office/gnucash: Updated for version 3.9.
+office/hamster: Updated for version 3.0.1.
+office/libreoffice-helppack: Updated for version 6.2.8.2.
+office/libreoffice-langpack: Updated for version 6.2.8.2.
+office/libreoffice: Updated for version 6.2.8.2.
+office/pandoc-bin: Updated for version 2.9.2.1.
+perl/perl-List-SomeUtils: Added (Missing methods from List::Util).
+perl/perl-Template-Toolkit: Updated for version 3.008.
+python/obspy: Removed.
+python/python-unicodedata2: Updated for version 13.0.0_2.
+python/python3-aiohttp-socks: Updated for version 0.3.7.
+python/python3-obspy: Updated for version 1.2.1.
+ruby/ruby-build: Updated for version 2.7.1.
+ruby/rubygem-parser: Updated for version 2.7.0.5
+system/duply: Updated for version 2.2.2.
+system/fzf: Updated for version 0.21.1.
+system/gnu-unifont: Updated for version 13.0.01.
+system/nvidia-driver: Fix URLs.
+system/nvidia-legacy390-driver: Fix empty email.
+system/nvidia-legacy390-kernel: Fix empty email.
+system/pcf2bdf: Added (convert X fonts).
+system/rEFInd: Updated for version 0.12.0.
+system/refind: Updated for version 0.12.0.
+system/ripgrep: Updated for version 12.0.1.
+system/slpkg: Updated for version 3.8.7.
+system/symbola-font-ttf: Updated for version 13.00.
+system/tbsm: Update README.
+system/vice: Updated for version 3.4.
++--------------------------+
+Sat Mar 28 06:21:53 UTC 2020
+desktop/Qogir-icon-theme: Added (A colorful design icon theme).
+desktop/neofetch: Updated for version 7.0.0.
+desktop/numix-icon-theme-circle: Updated for version 19.12.27.
+desktop/numix-icon-theme: Updated for version 20.03.20.
+development/composer: Updated for version 1.10.1
+development/dart: Updated for version 2.7.2.
+development/eclipse-cpp: Updated for version 4.15.
+development/eclipse-java: Updated for version 4.15.
+development/eclipse-jee: Updated for version 4.15.
+development/fly: Updated for version 6.0.0.
+development/gede: Updated for version 2.15.4.
+development/hexinator: Updated for version 1.12.
+development/kotlin: Updated for version 1.3.71.
+development/lepton-eda: Updated for version 1.9.10.
+development/snappy: Updated for version 1.1.8.
+development/tea: Updated for version 50.0.4.
+development/universal-ctags: Updated for version 09b7cc5
+development/velero: Added (Backup and migrate Kubernetes resources).
+development/vscode-bin: Updated for version 1.43.2.
+games/steam: Add desktop file
+gis/qgis: Updated for version 3.12.1.
+graphics/vuescan: Updated for version 9.7.26.
+libraries/libwacom: Updated for version 1.3.
+libraries/stfl: Support builds on current.
+libraries/t38modem-opal: Added (Open Phone Abstraction Library).
+libraries/t38modem-ptlib: Added (Portable Tools Library).
+libraries/tbb: Cleanup temp file.
+misc/ghostpcl: Updated for version 9.52.
+misc/par2cmdline-tbb: Updated for version 0.4_20150503.
+multimedia/plexmediaserver: Updated for v 1.18.9.2571_e106a8a91.
+network/asterisk: Updated for version 16.9.0.
+network/emailrelay: Updated HOMEPAGE.
+network/insync: Updated for version 3.1.0.40756.
+network/onedrive: Updated for version 2.4.0.
+network/opera-developer: Updated for version 69.0.3638.0.
+network/opera: Updated for version 67.0.3575.115.
+network/palemoon-bin: Updated for version 28.8.4.
+network/palemoon: Updated for version 28.8.4.
+network/speedtest-cli: Updated script.
+network/teamviewer: Updated for version 15.4.4445.
+network/tor-browser: Updated for version 9.0.7.
+network/zoom-linux: Updated for version 3.5.374815.0324.
+office/calibre-bin: Updated for version 4.13.0.
+perl/perl-Sidef: Updated for version 3.95.
+perl/perl-xml-libxml: Updated for version 2.0134.
+python/DVR-Scan: Added (Motion Events Detector).
+python/python3-aiohttp-socks: Updated for version 0.3.6.
+system/bat: Updated for version 0.13.0.
+system/duplicity: Updated for version 0.7.19.
+system/fd: Updated for version 7.5.0.
+system/fzf: Updated for version 0.21.0.
+system/nvidia-driver: Fix permission.
+system/nvidia-driver: fix scripts; updated for version 440.64
+system/nvidia-kernel: updated for version 440.64
+system/nvidia-legacy340-driver: corrected maintainer
+system/nvidia-legacy390-driver: unmaintained
+system/nvidia-legacy390-kernel: unmaintained
+system/ranger: Updated for version 1.9.3.
+system/ripgrep: Updated for version 12.0.0.
+system/slpkg: Updated for version 3.8.6.
+system/splix: Updated for version 2.0.0_76268c4.
+system/unison: Updated HOMEPAGE.
+system/wine: Updated for version 4.0.3.
++--------------------------+
 Sat Mar 21 02:01:07 UTC 2020
 academic/boinc: update dependency list
 academic/verilator: Added (Verilog HDL Simulator).
diff --git a/academic/CAFS_divergence/README b/academic/CAFS_divergence/README
index 9320c24786..61ae3acb06 100644
--- a/academic/CAFS_divergence/README
+++ b/academic/CAFS_divergence/README
@@ -1,24 +1,25 @@
 CAFS: Clustering Analysis of Functional Shifts
 
-CAFS is a simple and fast method for Clustering functionally divergent (FD)
-genes by Functional Category.
+CAFS is a simple and fast method for Clustering functionally divergent
+(FD) genes by Functional Category.
 
-The method implemented in CAFS is one of several sequence-based methods
-for identifying the 'interesting' subset of substitutions that might
-underpin functional divergence. These methods are based on the idea of that
-functionally-important residues are highly conserved, so that evolutionary
-rates tend to be low at important sites. Functional divergence can then be
-identified by comparing rates (or levels of conservation) between two
-clades of proteins at a homologous site. Alternatively, a significant
-change in amino acid identity (such as a large, positively-charged residue
-in one group of sequences versus a small, neutral residue in the other)
-could indicate functional divergence even without a change in rate.
+The method implemented in CAFS is one of several sequence-based
+methods for identifying the 'interesting' subset of substitutions
+that might underpin functional divergence. These methods are based
+on the idea of that functionally-important residues are highly
+conserved, so that evolutionary rates tend to be low at important
+sites. Functional divergence can then be identified by comparing
+rates (or levels of conservation) between two clades of proteins at
+a homologous site. Alternatively, a significant change in amino acid
+identity (such as a large, positively-charged residue in one group of
+sequences versus a small, neutral residue in the other) could indicate
+functional divergence even without a change in rate.
 
 This program analyses alignments and provides the user with the best
 putative sites under functional divergence.
 
-NOTE: This only repackages the 64bit binary provided from upstream. A 32bit
-executable is not available.
+NOTE: This only repackages the 64bit binary provided from upstream. A
+32bit executable is not available.
 
 Citing:
 Caffrey BE, Williams TA, Jiang X, Toft C, Hokamp K, Fares MA (2011).
diff --git a/academic/FreeFem/README b/academic/FreeFem/README
index 99703a0063..c9a6765f55 100644
--- a/academic/FreeFem/README
+++ b/academic/FreeFem/README
@@ -1,12 +1,13 @@
 FreeFem is a high level multiphysics finite element software
 
-FreeFEM is a popular 2D and 3D partial differential equations (PDE) solver used 
-by thousands of researchers across the world. It allows you to easily implement 
-your own physics modules using the provided FreeFEM language. FreeFEM offers a 
-large list of finite elements, like the Lagrange, Taylor-Hood, etc., usable in 
-the continuous and discontinuous Galerkin method framework. 
+FreeFEM is a popular 2D and 3D partial differential equations (PDE)
+solver used by thousands of researchers across the world. It allows
+you to easily implement your own physics modules using the provided
+FreeFEM language. FreeFEM offers a large list of finite elements,
+like the Lagrange, Taylor-Hood, etc., usable in the continuous and
+discontinuous Galerkin method framework.
 
-FreeFEM has it own internal mesher, called BAMG, and is compatible with the best
-open-source mesh and visualization software like Tetgen, Gmsh, Mmg and ParaView.
-Written in C++ to optimize for speed, FreeFEM is interfaced with the popular 
-mumps, PETSc and HPDDM solvers.
+FreeFEM has it own internal mesher, called BAMG, and is compatible
+with the best open-source mesh and visualization software like Tetgen,
+Gmsh, Mmg and ParaView.  Written in C++ to optimize for speed, FreeFEM
+is interfaced with the popular mumps, PETSc and HPDDM solvers.
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
index 6010e6a9ab..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:-4.0.6.0}
+VERSION=${VERSION:-5.3.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+NUMJOBS=${NUMJOBS:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -92,12 +93,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-gui=auto \
+  --with-gui=yes \
   $useqr \
   $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 \
@@ -119,7 +120,7 @@ cp -a $TMP/$PRGNAM-$VERSION/share/pixmaps/* $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/doc
 cp -a \
-  COPYING CHANGELOG.md README.md VULNERABILITY_RESPONSE_PROCESS.md \
+  COPYING CHANGELOG.md README.md SECURITY.md CONTRIBUTING.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
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 47125005f4..a3675fa047 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.info
+++ b/academic/Gridcoin-Research/Gridcoin-Research.info
@@ -1,8 +1,8 @@
 PRGNAM="Gridcoin-Research"
-VERSION="4.0.6.0"
+VERSION="5.3.1.0"
 HOMEPAGE="https://gridcoin.us/"
-DOWNLOAD="https://github.com/gridcoin-community/Gridcoin-Research/archive/4.0.6.0/Gridcoin-Research-4.0.6.0.tar.gz"
-MD5SUM="6c924899a3a75f0c072fb3e0a8d64b4f"
+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 ac7e670e22..bc15acbd92 100644
--- a/academic/Gridcoin-Research/README
+++ b/academic/Gridcoin-Research/README
@@ -1,16 +1,19 @@
-Gridcoin is an open source cryptocurrency (Ticker: GRC) which securely rewards
-volunteer computing performed on the BOINC platform. BOINC is an open source
-volunteer computing grid which combines the processing power of individual users
-for the purposes of scientific research.
+Gridcoin is an open source cryptocurrency (Ticker: GRC) which securely
+rewards volunteer computing performed on the BOINC platform. BOINC is
+an open source volunteer computing grid which combines the processing
+power of individual users for the purposes of scientific research.
 
-QT5, qrencode and miniupnpc are optional (available on SBo) to build GUI, QR
-and UPnP support. QT5 will be detected automatically, for the others, run
-script as
+QT5, qrencode and miniupnpc are optional (available on SBo) to build
+GUI, QR and UPnP support. QT5 will be detected automatically, for the
+others, run script as
 
 QRENC=yes ./Gridcoin-Research.SlackBuild
 UPNP=yes ./Gridcoin-Research.SlackBuild
 
-You will need to edit the configuration file gridcoinresearch.conf 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
+You will need to edit the configuration file gridcoinresearch.conf
+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/HMMER/HMMER.SlackBuild b/academic/HMMER/HMMER.SlackBuild
index 6fc40670d6..e0e4f5bfcf 100644
--- a/academic/HMMER/HMMER.SlackBuild
+++ b/academic/HMMER/HMMER.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for HMMER
 
-# Copyright 2016-2018 Petar Petrov slackalaxy@gmail.com
+# Copyright 2016-2020 Petar Petrov slackalaxy@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=HMMER
-VERSION=${VERSION:-3.3}
+VERSION=${VERSION:-3.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/HMMER/HMMER.info b/academic/HMMER/HMMER.info
index f7a4d2d81d..80f7a1ebe5 100644
--- a/academic/HMMER/HMMER.info
+++ b/academic/HMMER/HMMER.info
@@ -1,8 +1,8 @@
 PRGNAM="HMMER"
-VERSION="3.3"
+VERSION="3.3.1"
 HOMEPAGE="http://hmmer.org/"
-DOWNLOAD="http://eddylab.org/software/hmmer/hmmer-3.3.tar.gz"
-MD5SUM="507849e98a5a44b22f2c4a1cf192b36b"
+DOWNLOAD="http://eddylab.org/software/hmmer/hmmer-3.3.1.tar.gz"
+MD5SUM="07da6661a17bd4ddbaded4a0dc9c5b6d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
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/ITK/README b/academic/ITK/README
index f152989931..ea82c00fc2 100644
--- a/academic/ITK/README
+++ b/academic/ITK/README
@@ -1,4 +1,4 @@
 ITK is an open-source software toolkit for performing registration and
-segmentation. Segmentation is the process of identifying and classifying data
-found in a digitally sampled representation. Registration is the task of
-aligning or developing correspondences between data.
+segmentation. Segmentation is the process of identifying and classifying
+data found in a digitally sampled representation. Registration is the
+task of aligning or developing correspondences between data.
diff --git a/academic/Kst/README b/academic/Kst/README
index cfad9f4c4b..cb1ad83042 100644
--- a/academic/Kst/README
+++ b/academic/Kst/README
@@ -8,14 +8,15 @@ Kst is very user-friendly (both the community and the program itself!).
 Kst contains many powerful built-in features and is expandable with
 plugins and extensions.
 
-Kst is licensed under the GPL, and is as such freely available for anyone.
+Kst is licensed under the GPL, and is as such freely available for
+anyone.
 
 Note that KDE libraries are an optional dependency (i.e. you can run Kst
 without KDE, but you get additional features when running on a platform
 with KDE).
 
 Optional dependencies are: 
-- gsl (a lot of very useful data analysis plugins are based) - RECOMMENDED
+- gsl (many very useful data analysis plugins are based) - RECOMMENDED
 - netcdf (which provides support for files in the netCDF format)
 - muParser (which is used in the general non-linear fitting plugin)
 - GetData (which provides support for files in the Dirfile format)
diff --git a/academic/MetaPhlAn2/README b/academic/MetaPhlAn2/README
index 15d1bc4265..55665c56e1 100644
--- a/academic/MetaPhlAn2/README
+++ b/academic/MetaPhlAn2/README
@@ -12,7 +12,7 @@ archaeal and ~500 eukaryotic), allowing:
 
 * unambiguous taxonomic assignments;
 * accurate estimation of organismal relative abundance;
-* species-level resolution for bacteria, archaea, eukaryotes and viruses;
+* species-level resolution for bacteria, archaea, eukaryotes, viruses;
 * strain identification and tracking
 * orders of magnitude speedups compared to existing methods.
 * metagenomic strain-level population genomics
diff --git a/academic/Mnemosyne/README b/academic/Mnemosyne/README
index 6149871479..a4ee7f3e3e 100644
--- a/academic/Mnemosyne/README
+++ b/academic/Mnemosyne/README
@@ -6,4 +6,5 @@ it is very powerful, and its architecture allows infinite
 extensibility and customisibility through plugins and a
 scripting API, for the benefit of power users.
 
-Optional Dependency: texlive (for entering mathematical equations in cards using LaTeX)
+Optional Dependency: texlive (for entering mathematical equations in
+cards using LaTeX)
diff --git a/academic/OpenFOAM/OpenFOAM.SlackBuild b/academic/OpenFOAM/OpenFOAM.SlackBuild
index 94b7b00d56..14db243780 100644
--- a/academic/OpenFOAM/OpenFOAM.SlackBuild
+++ b/academic/OpenFOAM/OpenFOAM.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OpenFOAM
 
-# Copyright 2017, 2018, 2019 Lorenzo Trevisan, Caorle, Venice, Italy
+# Copyright 2017, 2018, 2019, 2020 Lorenzo Trevisan, Caorle, Venice, 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=OpenFOAM
-VERSION=${VERSION:-7}
+VERSION=${VERSION:-8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/OpenFOAM/OpenFOAM.info b/academic/OpenFOAM/OpenFOAM.info
index 4ca7458532..df75c6f7c1 100644
--- a/academic/OpenFOAM/OpenFOAM.info
+++ b/academic/OpenFOAM/OpenFOAM.info
@@ -1,10 +1,10 @@
 PRGNAM="OpenFOAM"
-VERSION="7"
+VERSION="8"
 HOMEPAGE="https://openfoam.org/"
-DOWNLOAD="https://github.com/OpenFOAM/OpenFOAM-7/archive/version-7/OpenFOAM-7-version-7.tar.gz \
-          https://github.com/OpenFOAM/ThirdParty-7/archive/version-7/ThirdParty-7-version-7.tar.gz"
-MD5SUM="638b38ae0e80cbb1201abec3f5c88641 \
-        2a4fe46807730e70ce0b81d4a4dd4fc8"
+DOWNLOAD="https://github.com/OpenFOAM/OpenFOAM-8/archive/version-8/OpenFOAM-8-version-8.tar.gz \
+          https://github.com/OpenFOAM/ThirdParty-8/archive/version-8/ThirdParty-8-version-8.tar.gz"
+MD5SUM="261dc0d01c4417b737487a60ab4784aa \
+        a1beb9f9ce9ca547cd458ec6c1472bcd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openmpi CGAL"
diff --git a/academic/OpenFOAM/OpenFOAM.sh b/academic/OpenFOAM/OpenFOAM.sh
index e6164c0869..a4e69f6d1e 100644
--- a/academic/OpenFOAM/OpenFOAM.sh
+++ b/academic/OpenFOAM/OpenFOAM.sh
@@ -1 +1 @@
-. /opt/OpenFOAM/OpenFOAM-7/etc/bashrc
+. /opt/OpenFOAM/OpenFOAM-8/etc/bashrc
diff --git a/academic/OpenFOAM/README b/academic/OpenFOAM/README
index fd23aef9b7..d91ec421c8 100644
--- a/academic/OpenFOAM/README
+++ b/academic/OpenFOAM/README
@@ -9,4 +9,5 @@ multi-core processors and multi-processor computers.
 
 Optional dependency: graphviz (for documentation with graphs)
 
-You can build with multiple jobs by setting the MAKEFLAGS environment variable.
+You can build with multiple jobs by setting the MAKEFLAGS environment
+variable.
diff --git a/academic/PhyML/PhyML.SlackBuild b/academic/PhyML/PhyML.SlackBuild
index bddb063c00..893454e123 100644
--- a/academic/PhyML/PhyML.SlackBuild
+++ b/academic/PhyML/PhyML.SlackBuild
@@ -25,7 +25,7 @@
 # Thanks to Niels Horn for some handy modifications and corrections.
 
 PRGNAM=PhyML
-VERSION=${VERSION:-3.3.20190909}
+VERSION=${VERSION:-3.3.20200621}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -89,7 +89,9 @@ find -L . \
 # Use our CFLAGS
 sed -i "/^CFLAGS/s/=/+=/" Makefile src/Makefile
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+# The -mfma flag is needed for building on 14.2. Help is from here:
+# https://github.com/horovod/horovod/issues/1832
+CFLAGS="$SLKCFLAGS -mfma" CXXFLAGS="$SLKCFLAGS -mfma" make
 make install DESTDIR=$PKG
 
 # This is PhyML MPI. If you do not want it, comment the lines below. Then you do
@@ -108,7 +110,7 @@ make install DESTDIR=$PKG
 # Use our CFLAGS
 sed -i "/^CFLAGS/s/=/+=/" Makefile src/Makefile
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+CFLAGS="$SLKCFLAGS -mfma" CXXFLAGS="$SLKCFLAGS -mfma" make
 make install DESTDIR=$PKG
 
 # This is Phyrex
@@ -126,7 +128,7 @@ make install DESTDIR=$PKG
 # Use our CFLAGS
 sed -i "/^CFLAGS/s/=/+=/" Makefile src/Makefile
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+CFLAGS="$SLKCFLAGS -mfma" CXXFLAGS="$SLKCFLAGS -mfma" make
 make install DESTDIR=$PKG
 
 # This is PhyTime
@@ -144,7 +146,7 @@ make install DESTDIR=$PKG
 # Use our CFLAGS
 sed -i "/^CFLAGS/s/=/+=/" Makefile src/Makefile
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+CFLAGS="$SLKCFLAGS -mfma" CXXFLAGS="$SLKCFLAGS -mfma" make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/academic/PhyML/PhyML.info b/academic/PhyML/PhyML.info
index f44eaca3de..ec04310e99 100644
--- a/academic/PhyML/PhyML.info
+++ b/academic/PhyML/PhyML.info
@@ -1,8 +1,8 @@
 PRGNAM="PhyML"
-VERSION="3.3.20190909"
+VERSION="3.3.20200621"
 HOMEPAGE="https://github.com/stephaneguindon/phyml/"
-DOWNLOAD="https://github.com/stephaneguindon/phyml/archive/v3.3.20190909/phyml-3.3.20190909.tar.gz"
-MD5SUM="35698ff61c1db57b238f5b2d2cc784b3"
+DOWNLOAD="https://github.com/stephaneguindon/phyml/archive/v3.3.20200621/phyml-3.3.20200621.tar.gz"
+MD5SUM="12622e111c388bcb16696660033143b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openmpi"
diff --git a/academic/PyAMG/README b/academic/PyAMG/README
index c72262fa35..f5a2ac3fe5 100644
--- a/academic/PyAMG/README
+++ b/academic/PyAMG/README
@@ -1,9 +1,9 @@
-PyAMG is a library of **Algebraic Multigrid (AMG)** solvers with a convenient
-Python interface.
+PyAMG is a library of **Algebraic Multigrid (AMG)** solvers with a
+convenient Python interface.
 
-AMG is a multilevel technique for solving large-scale linear systems with
-optimal or near-optimal efficiency.  Unlike geometric multigrid, AMG requires
-little or no geometric information about the underlying problem and develops a
-sequence of coarser grids directly from the input matrix. This feature is
-especially important for problems discretized on unstructured meshes and
-irregular grids.
+AMG is a multilevel technique for solving large-scale linear systems
+with optimal or near-optimal efficiency.  Unlike geometric multigrid,
+AMG requires little or no geometric information about the underlying
+problem and develops a sequence of coarser grids directly from the
+input matrix. This feature is especially important for problems
+discretized on unstructured meshes and irregular grids.
diff --git a/academic/R/R.SlackBuild b/academic/R/R.SlackBuild
index 6fb687f83a..3f31ad4a38 100644
--- a/academic/R/R.SlackBuild
+++ b/academic/R/R.SlackBuild
@@ -2,9 +2,8 @@
 
 # SlackBuild script for R
 
-# Copyright 2019 Andrew Payne, Boston, MA <phalange@komputermatrix.com>
-# Copyright 2014-2017 melikamp, Andrew Rowland. (Contributors are
-# listed in order of first participation.)
+# Copyright 2019-2020 Andrew Payne <phalange@komputermatrix.com>
+# Copyright 2014-2017 melikamp, Andrew Rowland
 
 # 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
@@ -25,7 +24,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=R
-VERSION=${VERSION:-3.6.2}
+VERSION=${VERSION:-4.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/R/R.info b/academic/R/R.info
index 9ce4d10cd4..04109237e7 100644
--- a/academic/R/R.info
+++ b/academic/R/R.info
@@ -1,10 +1,10 @@
 PRGNAM="R"
-VERSION="3.6.2"
+VERSION="4.0.0"
 HOMEPAGE="http://www.r-project.org/"
-DOWNLOAD="https://cran.r-project.org/src/base/R-3/R-3.6.2.tar.gz"
-MD5SUM="90d23d138cee26d275da14b58296e521"
+DOWNLOAD="https://cran.r-project.org/src/base/R-4/R-4.0.0.tar.gz"
+MD5SUM="48c487c68112cb3191f3015c6277a50b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="pcre2"
 MAINTAINER="Andrew Payne"
 EMAIL="phalange@komputermatrix.com"
diff --git a/academic/RepeatMasker/RepeatMasker.SlackBuild b/academic/RepeatMasker/RepeatMasker.SlackBuild
index b94763c2a8..2975550e19 100644
--- a/academic/RepeatMasker/RepeatMasker.SlackBuild
+++ b/academic/RepeatMasker/RepeatMasker.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=RepeatMasker
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-4.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/RepeatMasker/RepeatMasker.info b/academic/RepeatMasker/RepeatMasker.info
index 62eacca432..322653dd70 100644
--- a/academic/RepeatMasker/RepeatMasker.info
+++ b/academic/RepeatMasker/RepeatMasker.info
@@ -1,8 +1,8 @@
 PRGNAM="RepeatMasker"
-VERSION="4.1.0"
+VERSION="4.1.1"
 HOMEPAGE="http://www.repeatmasker.org/"
-DOWNLOAD="http://www.repeatmasker.org/RepeatMasker-4.1.0.tar.gz"
-MD5SUM="936894df2b8291f42afce22a5793b4bf"
+DOWNLOAD="http://www.repeatmasker.org/RepeatMasker-4.1.1.tar.gz"
+MD5SUM="6df7b188757b5ef2d2575320eb0b014e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Text-Soundex trfind HMMER ncbi-rmblastn"
diff --git a/academic/STAR/STAR.SlackBuild b/academic/STAR/STAR.SlackBuild
index 0e9417d8bf..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.3a}
+VERSION=${VERSION:-2.7.8a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/STAR/STAR.info b/academic/STAR/STAR.info
index 2257366358..68740e69a3 100644
--- a/academic/STAR/STAR.info
+++ b/academic/STAR/STAR.info
@@ -1,10 +1,10 @@
 PRGNAM="STAR"
-VERSION="2.7.3a"
+VERSION="2.7.8a"
 HOMEPAGE="https://github.com/alexdobin/STAR"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/alexdobin/STAR/archive/2.7.3a/STAR-2.7.3a.tar.gz"
-MD5SUM_x86_64="6642ef8b8404d923fefe7c72348f12f4"
+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/README b/academic/ViennaRNA/README
index 6ad531d628..a82c7160b2 100644
--- a/academic/ViennaRNA/README
+++ b/academic/ViennaRNA/README
@@ -7,8 +7,9 @@ A tutorial (see /usr/doc/$PRGNAM-$VERSION/RNA-tutorial-$VERSION.pdf)
 and examples can be found in /usr/share/$PRGNAM/tutorial and
 /usr/share/$PRGNAM/examples
 
-For those who wish to link the Vienna package to their own C, perl or python programs (see below),
-the RNAlib Reference Manual can be assessed at:
+For those who wish to link the Vienna package to their own C, perl
+or python programs (see below), the RNAlib Reference Manual can be
+assessed at:
 
 https://www.tbi.univie.ac.at/RNA/ViennaRNA/doc/html/index.html
 (or unpacked from the src: $PRGNAM-$VERSION/doc/html/)
@@ -22,29 +23,31 @@ Amongst other things, the ViennRNA implementations allow you to:
 - compute various equilibrium probabilities
 - calculate suboptimal structures in a given energy range
 - compute local structures in long sequences
-- predict consensus secondary structures from a multiple sequence alignment
+- predict consensus secondary structures from a multiple sequence
+  alignment
 - predict melting curves
 - search for sequences folding into a given structure
 - compare two secondary structures 
 - predict hybridization structures of two RNA molecules
 
-The package includes `Perl 5` and `Python 3` modules that give
-access to almost all functions of the C library from within the respective
+The package includes `Perl 5` and `Python 3` modules that give access
+to almost all functions of the C library from within the respective
 scripting languages. For this reason, python3 is a dependency
 
-The `Python 2` module can be built as well, or instead of the one for `Python 3`;
-just edit the SlackBuild or run it by setting build options PYTHON=yes PYTHON3=no.
-(e.g. in sbopkg or run it from the commandline -within the directory containing
-the SlackBuild script and downloaded source archive- as:
-`PYTHON=yes PYTHON3=no ./ViennaRNA.SlackBuild`)
+The `Python 2` module can be built as well, or instead of the one
+for `Python 3`; just edit the SlackBuild or run it by setting build
+options PYTHON=yes PYTHON3=no.  (e.g. in sbopkg or run it from
+the commandline -within the directory containing the SlackBuild
+script and downloaded source archive- as: `PYTHON=yes PYTHON3=no
+./ViennaRNA.SlackBuild`)
 
 There is also a set of programs for analyzing sequence and distance
-data using split decomposition, statistical geometry, and cluster methods.
-They are not maintained any more and not built by default.
+data using split decomposition, statistical geometry, and cluster
+methods.  They are not maintained any more and not built by default.
 
-The code very rarely uses static arrays, and all programs should work for 
-sequences up to a length of 32,700 (if you have huge amounts of memory that
-is).
+The code very rarely uses static arrays, and all programs should work
+for sequences up to a length of 32,700 (if you have huge amounts of
+memory that is).
 
 For further info see:
 
diff --git a/academic/ViennaRNA/ViennaRNA.SlackBuild b/academic/ViennaRNA/ViennaRNA.SlackBuild
index ff63062efc..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.14}
+VERSION=${VERSION:-2.4.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/ViennaRNA/ViennaRNA.info b/academic/ViennaRNA/ViennaRNA.info
index 06e2675530..162b17f93a 100644
--- a/academic/ViennaRNA/ViennaRNA.info
+++ b/academic/ViennaRNA/ViennaRNA.info
@@ -1,10 +1,10 @@
 PRGNAM="ViennaRNA"
-VERSION="2.4.14"
+VERSION="2.4.17"
 HOMEPAGE="https://www.tbi.univie.ac.at/RNA"
-DOWNLOAD="https://github.com/ViennaRNA/ViennaRNA/releases/download/v2.4.14/ViennaRNA-2.4.14.tar.gz"
-MD5SUM="b9c64be709d3dfef72cc27e615845a04"
+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/WordNet/README b/academic/WordNet/README
index ccebc68f64..836afa9950 100644
--- a/academic/WordNet/README
+++ b/academic/WordNet/README
@@ -1,8 +1,9 @@
-WordNet(r) is a large lexical database of English, developed under the
-direction of George A. Miller. Nouns, verbs, adjectives and adverbs are
-grouped into sets of cognitive synonyms (synsets), each expressing a
-distinct concept. Synsets are interlinked by means of conceptual-semantic
-and lexical relations. The resulting network of meaningfully related words
-and concepts can be navigated with the browser. WordNet is also freely
-and publicly available for download.  WordNet's structure makes it a
-useful tool for computational linguistics and natural language processing.
+WordNet(r) is a large lexical database of English, developed under
+the direction of George A. Miller. Nouns, verbs, adjectives and
+adverbs are grouped into sets of cognitive synonyms (synsets), each
+expressing a distinct concept. Synsets are interlinked by means of
+conceptual-semantic and lexical relations. The resulting network of
+meaningfully related words and concepts can be navigated with the
+browser. WordNet is also freely and publicly available for download.
+WordNet's structure makes it a useful tool for computational
+linguistics and natural language processing.
diff --git a/academic/Xyce/README b/academic/Xyce/README
index ff16f7e41f..14d894e3e0 100644
--- a/academic/Xyce/README
+++ b/academic/Xyce/README
@@ -1,21 +1,22 @@
 Xyce is an open source, SPICE-compatible, high-performance analog
-circuit simulator, capable of solving extremely large circuit problems
-by supporting large-scale parallel computing platforms. It also supports
-serial execution on all common desktop platforms, and small-scale parallel
-runs on Unix-like systems. In addition to analog electronic simulation,
-Xyce has also been used to investigate more general network systems,
-such as neural networks and power grids.
+circuit simulator, capable of solving extremely large circuit
+problems by supporting large-scale parallel computing platforms. It
+also supports serial execution on all common desktop platforms, and
+small-scale parallel runs on Unix-like systems. In addition to analog
+electronic simulation, Xyce has also been used to investigate more
+general network systems, such as neural networks and power grids.
 
 The Xyce Parallel Electronic Simulator is a SPICE-compatible circuit
-simulator, developed internally at Sandia National Laboratories and funded
-by the National Nuclear Security Administration's Advanced Simulation and
-Computing (ASC) Campaign. In continuous development since 1999, Xyce is
-designed to run on large-scale parallel computing platforms, though it
-also executes efficiently on a variety of architectures, including single
-processor workstations. As a mature platform for large-scale parallel
-circuit simulation, Xyce supports standard capabilities available from
-commercial simulators, in addition to a variety of devices and models
-specific to Sandia's needs.
+simulator, developed internally at Sandia National Laboratories
+and funded by the National Nuclear Security Administration's
+Advanced Simulation and Computing (ASC) Campaign. In continuous
+development since 1999, Xyce is designed to run on large-scale
+parallel computing platforms, though it also executes efficiently on a
+variety of architectures, including single processor workstations. As
+a mature platform for large-scale parallel circuit simulation, Xyce
+supports standard capabilities available from commercial simulators,
+in addition to a variety of devices and models specific to Sandia's
+needs.
 
 The package is intalled at: /opt/Xyce
 Remember to set the library and path:
diff --git a/academic/abella/README b/academic/abella/README
index a6f078794e..7954d1e751 100644
--- a/academic/abella/README
+++ b/academic/abella/README
@@ -1,16 +1,19 @@
 Abella is an interactive theorem prover based on lambda-tree syntax.
 
-This means that Abella is well-suited for reasoning about the meta-theory
-of programming languages and other logical systems which manipulate
-objects with binding. For example, the following applications are included
-in the distribution of Abella.
+This means that Abella is well-suited for reasoning about the
+meta-theory of programming languages and other logical systems
+which manipulate objects with binding. For example, the following
+applications are included in the distribution of Abella.
 
-* Various results on the lambda calculus involving big-step evaluation, small-step evaluation, and typing judgments
+* Various results on the lambda calculus involving big-step
+  evaluation, small-step evaluation, and typing judgments
 * Cut-admissibility for a sequent calculus
 * Part 1a and Part 2a of the POPLmark challenge
 * Takahashi's proof of the Church-Rosser theorem
-* Tait's logical relations argument for weak normalization of the simply-typed lambda calculus
-* Girard's proof of strong normalization of the simply-typed lambda calculus
+* Tait's logical relations argument for weak normalization of the
+  simply-typed lambda calculus
+* Girard's proof of strong normalization of the simply-typed lambda
+  calculus
 * Some ?-calculus meta-theory
 * Relation between ?-reduction and paths in A-calculus
 
@@ -23,8 +26,8 @@ lambda-tree syntax. This logic is executable and is a subset of the
 AProlog language (see the Teyjus system for an implementation of this
 language).
 
-The reasoning logic of Abella is the culmination of a series of extensions
-to proof theory for the treatment of definitions, lambda-tree syntax,
-and generic judgments. The reasoning logic of Abella is able to encode
-the semantics of our specification logic as a definition and thereby
-reason over specifications in that logic.
+The reasoning logic of Abella is the culmination of a series
+of extensions to proof theory for the treatment of definitions,
+lambda-tree syntax, and generic judgments. The reasoning logic of
+Abella is able to encode the semantics of our specification logic as a
+definition and thereby reason over specifications in that logic.
diff --git a/academic/aenig4/README b/academic/aenig4/README
index 3ac2263e9d..ee1505f360 100644
--- a/academic/aenig4/README
+++ b/academic/aenig4/README
@@ -1,5 +1,5 @@
 aenig4 (Enigma M4 Cipher Machine Emulator)
 
-aenig4 emulates the Enigma M4 cipher machine used by the U-boot divsion of
-the German Navy during World War II. It can be used as well to emulate the
-Enigma I machine (M1, M2, M3).
+aenig4 emulates the Enigma M4 cipher machine used by the U-boot
+divsion of the German Navy during World War II. It can be used as well
+to emulate the Enigma I machine (M1, M2, M3).
diff --git a/academic/amd/README b/academic/amd/README
index 07e4dcafc0..b2ae697056 100644
--- a/academic/amd/README
+++ b/academic/amd/README
@@ -1,6 +1,7 @@
-AMD is a set of routines for ordering a sparse matrix prior to Cholesky
-factorization (or for LU factorization with diagonal pivoting).  There are
-versions in both C and Fortran.  Note that this software has nothing to do
-with AMD the company.  This package runs on any platform.
+AMD is a set of routines for ordering a sparse matrix prior to
+Cholesky factorization (or for LU factorization with diagonal
+pivoting).  There are versions in both C and Fortran.  Note that this
+software has nothing to do with AMD the company.  This package runs on
+any platform.
 
 This package is part of SuiteSparse.
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/amplifx/amplifx.info b/academic/amplifx/amplifx.info
index 1ec2301b5b..b8e5894a9f 100644
--- a/academic/amplifx/amplifx.info
+++ b/academic/amplifx/amplifx.info
@@ -1,7 +1,7 @@
 PRGNAM="amplifx"
 VERSION="1.7.0"
-HOMEPAGE="http://crn2m.univ-mrs.fr/AmplifX"
-DOWNLOAD="http://crn2m.univ-mrs.fr/IMG/zip/AmplifX_Lin_Latest.zip"
+HOMEPAGE="https://inp.univ-amu.fr/en/amplifx-manage-test-and-design-your-primers-for-pcr"
+DOWNLOAD="http://jim.inp.univ-amu.fr/IMG/zip/AmplifX_Lin_Latest.zip"
 MD5SUM="ff84d1c4a800dcb651beaa877ff7b1ca"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
diff --git a/academic/amplifx/slack-desc b/academic/amplifx/slack-desc
index 2de0b1133a..670bbfccee 100644
--- a/academic/amplifx/slack-desc
+++ b/academic/amplifx/slack-desc
@@ -14,6 +14,6 @@ amplifx: which can be use to amplify a fragment into a target sequence,
 amplifx: for example, and particularly, to design strategies to screen
 amplifx: recombinant clones by PCR.
 amplifx:
-amplifx: Home: http://crn2m.univ-mrs.fr/AmplifX
-amplifx: References: /usr/doc/amplifx-1.7.0/References
+amplifx:
+amplifx:
 amplifx:
diff --git a/academic/antiprism/README b/academic/antiprism/README
index e81e3a4e32..6d7cca97a3 100644
--- a/academic/antiprism/README
+++ b/academic/antiprism/README
@@ -1,2 +1,2 @@
-Antiprism is a set of programs for generating, manipulating, transforming
-and visualising polyhedra.
+Antiprism is a set of programs for generating, manipulating,
+transforming and visualising polyhedra.
diff --git a/academic/aris/README b/academic/aris/README
index 65cf47df47..13f3372b78 100644
--- a/academic/aris/README
+++ b/academic/aris/README
@@ -1,6 +1,6 @@
-GNU Aris is a sequential proof program, designed to assist anyone interested
-in solving logical proofs. Aris supports both propositional and predicate
-logic, as well as Boolean algebra and arithmetical logic in the form of
-abstract sequences. It uses a predefined set of both inference and equivalence
-rules, however gives the user options to use older proofs as lemmas, including
-Isabelle's Isar proofs.
+GNU Aris is a sequential proof program, designed to assist anyone
+interested in solving logical proofs. Aris supports both propositional
+and predicate logic, as well as Boolean algebra and arithmetical logic
+in the form of abstract sequences. It uses a predefined set of both
+inference and equivalence rules, however gives the user options to use
+older proofs as lemmas, including Isabelle's Isar proofs.
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/armadillo/README b/academic/armadillo/README
index 17bef8f786..9327750b8d 100644
--- a/academic/armadillo/README
+++ b/academic/armadillo/README
@@ -2,9 +2,10 @@ Armadillo is a high quality C++ linear algebra library useful
 for development of algorithms in machine learning, pattern recognition,
 signal processing, bioinformatics, statistics, etc.
 
-Armadillo makes extensive use of template meta-programming, recursive templates
-and template based function overloading.  As such, C++ compilers which do not
-fully implement the C++ standard may not work correctly.
+Armadillo makes extensive use of template meta-programming, recursive
+templates and template based function overloading.  As such, C++
+compilers which do not fully implement the C++ standard may not work
+correctly.
 
 The functionality of Armadillo is partly dependent on other libraries:
 LAPACK, BLAS and ARPACK. The LAPACK and BLAS libraries are used for
diff --git a/academic/arpack-ng/README b/academic/arpack-ng/README
index e24427e956..596f89a447 100644
--- a/academic/arpack-ng/README
+++ b/academic/arpack-ng/README
@@ -4,15 +4,18 @@ large scale eigenvalue problems.
 This is a fork of ARPACK that is actively maintained.  As such, this
 package will conflict with the ARPACK package.  Do not install both.
 
-This requires a BLAS/LAPACK implementation.  Choose one of these package sets:
+This requires a BLAS/LAPACK implementation.  Choose one of these
+package sets:
  * OpenBLAS (includes both a BLAS and a LAPACK implementation)
  * atlas (includes both a BLAS and a LAPACK implementation)
  * blas, lapack (the Netlib reference implementations)
-If more than one set is installed (assuming there are no packaging conflicts)
-then the auto-detection will use the first implementation from this list that
-it finds.  If in doubt, choose the Netlib reference implementations; other
-packages that require a BLAS or LAPACK implementation may not build if they
-are not configured to detect/use alternate implementations.
+If more than one set is installed (assuming there are no packaging
+conflicts) then the auto-detection will use the first implementation
+from this list that it finds.  If in doubt, choose the Netlib
+reference implementations; other packages that require a BLAS or
+LAPACK implementation may not build if they are not configured to
+detect/use alternate implementations.
 
-If the `make check` command fails, try switching to the Netlib reference
-implementations, or comment out that command at your own risk.
+If the `make check` command fails, try switching to the Netlib
+reference implementations, or comment out that command at your own
+risk.
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/artha/README b/academic/artha/README
index dc6d794f61..5e08f3e1fd 100644
--- a/academic/artha/README
+++ b/academic/artha/README
@@ -4,7 +4,7 @@ off-line and is based on WordNet.
 The main focus of Artha is high usability, with much simplicity. It has
 distinct features like:
 
-* hotkey press - word look-up (select text and press a hotkey for look-up)
+* hotkey press - word lookup (select text and press a hotkey for lookup)
 * regex-based search (find words using wild-cards like *, ?, etc.)
 * passive desktop notifications (of word definitions for uninterrupted
   workflow)
diff --git a/academic/avogadro/README b/academic/avogadro/README
index 531f972b75..ef97a2fae0 100644
--- a/academic/avogadro/README
+++ b/academic/avogadro/README
@@ -1,5 +1,6 @@
-Avogadro is a molecular graphics and modelling system targeted at molecules
-and biomolecules. It can visualize properties like molecular orbitals or 
-electrostatic potentials and features an intuitive molecular builder.
+Avogadro is a molecular graphics and modelling system targeted at
+molecules and biomolecules. It can visualize properties like molecular
+orbitals or electrostatic potentials and features an intuitive
+molecular builder.
 
 Optionally numpy can be installed for python support.
diff --git a/academic/bcftools/README b/academic/bcftools/README
index aef002668d..51b0b0b55b 100644
--- a/academic/bcftools/README
+++ b/academic/bcftools/README
@@ -4,6 +4,6 @@ vcfisec, etc.) and the samtools BCF calling from bcftools subdirectory
 of the previous samtools. BCFtools are meant as a faster replacement 
 for most of the perl VCFtools commands.
 
-Prior to the introduction of HTSlib, SAMtools and BCFtools were distributed 
-in a single samtools-0.1.x package. This old version remains available from 
-SBo as samtools-legacy.
+Prior to the introduction of HTSlib, SAMtools and BCFtools were
+distributed in a single samtools-0.1.x package. This old version remains
+available from SBo as samtools-legacy.
diff --git a/academic/bcftools/bcftools.SlackBuild b/academic/bcftools/bcftools.SlackBuild
index 526b44d687..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.10.2}
+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 b8201d734d..ad211ee207 100644
--- a/academic/bcftools/bcftools.info
+++ b/academic/bcftools/bcftools.info
@@ -1,8 +1,8 @@
 PRGNAM="bcftools"
-VERSION="1.10.2"
+VERSION="1.12"
 HOMEPAGE="http://www.htslib.org"
-DOWNLOAD="https://github.com/samtools/bcftools/releases/download/1.10.2/bcftools-1.10.2.tar.bz2"
-MD5SUM="081ebb6138f5fdf394cb6a074effadb3"
+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/bedtools/bedtools.SlackBuild b/academic/bedtools/bedtools.SlackBuild
index ee87fbbbe4..c29f69d3e2 100644
--- a/academic/bedtools/bedtools.SlackBuild
+++ b/academic/bedtools/bedtools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bedtools
 
-# Copyright 2014-2019 Petar Petrov slackalaxy@gmail.com
+# Copyright 2014-2020 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=bedtools
 DIRNAM=bedtools2
-VERSION=${VERSION:-2.28.0}
+VERSION=${VERSION:-2.29.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,11 +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 {} \;
 
-# Use our CFLAGS
-sed -i "/CXXFLAGS/s/=/+=/" Makefile
-
-CXXFLAGS="$SLKCFLAGS -std=c++11" \
-make
+CXXFLAGS="$SLKCFLAGS" make
 
 # Install the binary and scripts
 cd bin
@@ -91,7 +87,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 LICENSE README.md RELEASE_HISTORY $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
diff --git a/academic/bedtools/bedtools.info b/academic/bedtools/bedtools.info
index 8ebd0862f4..79634be6cb 100644
--- a/academic/bedtools/bedtools.info
+++ b/academic/bedtools/bedtools.info
@@ -1,8 +1,8 @@
 PRGNAM="bedtools"
-VERSION="2.28.0"
+VERSION="2.29.2"
 HOMEPAGE="http://bedtools.readthedocs.org/"
-DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.28.0/bedtools-2.28.0.tar.gz"
-MD5SUM="611d55ab9f03a7ee0fa6639af7299acf"
+DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.29.2/bedtools-2.29.2.tar.gz"
+MD5SUM="a600f2cd58768310cb8427eb1ae54c17"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/biblesync/README b/academic/biblesync/README
index 6a70d6d96d..d2d91161ca 100644
--- a/academic/biblesync/README
+++ b/academic/biblesync/README
@@ -9,7 +9,7 @@ Bible program induces the audience's programs to follow along.
 
 Some History.
 Up until and including xiphos 4.0.0 biblesync was included as part of
-the xiphos source code. It has been removed from the source in xiphos 4.0.1
-and set to be a general library for any bible software that wants to use
-shared navigation.
+the xiphos source code. It has been removed from the source in xiphos
+4.0.1 and set to be a general library for any bible software that
+wants to use shared navigation.
 biblesync is a requirement for xiphos 4.0.1 or higher.
diff --git a/academic/biblesync/biblesync.SlackBuild b/academic/biblesync/biblesync.SlackBuild
index dfdd60598a..ffe9300400 100644
--- a/academic/biblesync/biblesync.SlackBuild
+++ b/academic/biblesync/biblesync.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for biblesync
 
-# Copyright (c) 2015/2018  Tim Dickson <dickson.tim@googlemail.com>
+# Copyright (c) 2015/2020  Tim Dickson <dickson.tim@googlemail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -31,7 +31,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=biblesync
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -91,23 +91,18 @@ 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
 
-# Compress man page
-mkdir -p $PKG/usr/man/man7
-mv $PKG/usr/share/man/man7/$PRGNAM.7 $PKG/usr/man/man7/$PRGNAM.7
+mv $PKG/usr/share/man $PKG/usr/
 gzip $PKG/usr/man/man7/$PRGNAM.7
 
 #remove old man path
 rm -r $PKG/usr/share
 
-#copy over docs etc.
 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
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-#now to make the package
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/biblesync/biblesync.info b/academic/biblesync/biblesync.info
index 00a1bb56d4..560d81ec74 100644
--- a/academic/biblesync/biblesync.info
+++ b/academic/biblesync/biblesync.info
@@ -1,8 +1,8 @@
 PRGNAM="biblesync"
-VERSION="2.0.1"
+VERSION="2.1.0"
 HOMEPAGE="https://github.com/karlkleinpaste/biblesync"
-DOWNLOAD="https://github.com/karlkleinpaste/biblesync/releases/download/2.0.1/biblesync-2.0.1.tar.gz"
-MD5SUM="b9db8aae61bb0f9a4545c0782968466e"
+DOWNLOAD="https://github.com/karlkleinpaste/biblesync/releases/download/2.1.0/biblesync-2.1.0.tar.gz"
+MD5SUM="51b0deef468812a1f5b3c87ae5d14fb9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/biblesync/doinst.sh b/academic/biblesync/doinst.sh
deleted file mode 100644
index 682c942551..0000000000
--- a/academic/biblesync/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-#we installed a library so run ldconfig
-/sbin/ldconfig
diff --git a/academic/bibletime/README b/academic/bibletime/README
index b6137880cc..7a44c6d012 100644
--- a/academic/bibletime/README
+++ b/academic/bibletime/README
@@ -1,6 +1,4 @@
-BibleTime is a Bible study application for Linux.  It is based on the K Desktop
-Environment and uses the Sword programming library to work with Bible texts,
-commentaries, dictionaries, and books provided by the Crosswire Bible Society.
-
-This version requires sword version 1.8.1 or higher, and qt5.9 or higher.
-Homepage: http://bibletime.info/
+BibleTime is a Bible study application for Linux.  It is based on the K
+Desktop Environment and uses the Sword programming library to work with
+Bible texts, commentaries, dictionaries, and books provided by the 
+Crosswire Bible Society.
diff --git a/academic/bibletime/bibletime.SlackBuild b/academic/bibletime/bibletime.SlackBuild
index 9af701fef1..807cf266c2 100644
--- a/academic/bibletime/bibletime.SlackBuild
+++ b/academic/bibletime/bibletime.SlackBuild
@@ -26,11 +26,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by Robert Delahunt [twinreverb[at]puresimplicity.net
-# Modified 2018/9 by Tim Dickson (dickson.tim@googlemail.com)
+# Modified 2018/19/20 by Tim Dickson (dickson.tim@googlemail.com)
+# Modified 20200918 by B. Watson <yalhcru@gmail.com>
 
 PRGNAM=bibletime
-VERSION=${VERSION:-3.0_beta2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,21 +69,15 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar -xJvf $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 {} \;
-
-mkdir build
-#patch CMakeLists.txt so it works with verson of cmake on slack14.2
-#these patches can be removed once cmake gets to 3.10 or higher
-sed -i "s/VERSION 3.10/VERSION 3.5/g" CMakeLists.txt
-sed -i "s/^CHECK_IPO_SUPPORTED(RESULT HAVE_IPO)/SET(HAVE_IPO FALSE)/g" CMakeLists.txt
-sed -i "s/^INCLUDE(CheckIPO/#INCLUDE(CheckIPO/g" CMakeLists.txt
-sed -i "/TARGET_COMPILE_FEATURES/s/.*/SET(CMAKE_CXX_STANDARD 11)/" CMakeLists.txt
+
+#we need to patch the cmake file to skip tests as they fail at the moment
+#hopefully they will be fixed in 3.0.1
+
+sed -i "/BTTests/s/^/#/" cmake/BTApplication.cmake
+
+mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
@@ -90,7 +85,7 @@ cd build
     -DCMAKE_SKIP_RPATH:BOOL=ON \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-    -DLIB_SUFFIX=$LIBDIRSUFFIX ..
+    -DLIB_SUFFIX=$LIBDIRSUFFIX .. 
   make
   make install DESTDIR=$PKG
 cd ..
diff --git a/academic/bibletime/bibletime.info b/academic/bibletime/bibletime.info
index 06b7202b16..43b5b02595 100644
--- a/academic/bibletime/bibletime.info
+++ b/academic/bibletime/bibletime.info
@@ -1,10 +1,10 @@
 PRGNAM="bibletime"
-VERSION="3.0_beta2"
+VERSION="3.0"
 HOMEPAGE="http://www.bibletime.info/"
-DOWNLOAD="https://github.com/bibletime/bibletime/releases/download/v3.0_beta2/bibletime-3.0_beta2.tar.xz"
-MD5SUM="1874d442546791b5611343fbcf2aed73"
+DOWNLOAD="https://github.com/bibletime/bibletime/releases/download/v3.0/bibletime-3.0.tar.xz"
+MD5SUM="c90bcafa7938ff0257a8599c3d9cb024"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="sword qt5"
+REQUIRES="cmake-202x sword qt5 po4a fop"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"
diff --git a/academic/bibus/README b/academic/bibus/README
index 80e25c8602..4286359d52 100644
--- a/academic/bibus/README
+++ b/academic/bibus/README
@@ -1,4 +1,5 @@
-Bibus is a bibliographic and reference management software.  As with other
-such tools, Bibus allows one to search, edit, and sort bibliographic records.
-In addition, Bibus contains features that makes it unique among open source
-and even commercial bibliographic databases.
+Bibus is bibliographic and reference management software.
+As with other such tools, Bibus allows one to search, edit, and sort
+bibliographic records.  In addition, Bibus contains features that
+makes it unique among open source and even commercial bibliographic
+databases.
diff --git a/academic/boinc/README b/academic/boinc/README
index 5c3f695a28..f2130e2d19 100644
--- a/academic/boinc/README
+++ b/academic/boinc/README
@@ -1,15 +1,16 @@
 The Berkeley Open Infrastructure for Network Computing (BOINC)
 
-BOINC is an open source middleware system for volunteer and grid computing.
-It was originally developed to support the SETI@home project before it became
-useful as a platform for other distributed applications in areas as diverse as
-mathematics, medicine, molecular biology, climatology, and astrophysics. The
-intent of BOINC is to make it possible for researchers to tap into the
-enormous processing power of personal computers around the world.
-
-Use the idle time on your computer (Windows, Mac, or Linux) to cure diseases,
-study global warming, discover pulsars, and do many other types of scientific
-research. It's safe, secure, and easy.
+BOINC is an open source middleware system for volunteer and grid
+computing.  It was originally developed to support the SETI@home
+project before it became useful as a platform for other distributed
+applications in areas as diverse as mathematics, medicine, molecular
+biology, climatology, and astrophysics. The intent of BOINC is to make
+it possible for researchers to tap into the enormous processing power
+of personal computers around the world.
+
+Use the idle time on your computer (Windows, Mac, or Linux) to cure
+diseases, study global warming, discover pulsars, and do many other
+types of scientific research. It's safe, secure, and easy.
 
 
 Building
diff --git a/academic/boinc/boinc.SlackBuild b/academic/boinc/boinc.SlackBuild
index 7e94c5251c..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
@@ -60,7 +61,7 @@ fi
 set -e
 
 # Your default working directory location. Pass with DATADIR=<dir> Boinc.SlackBuild
-DATADIR=${DATADIR:-'~/.boinc_data'}
+DATADIR=${DATADIR:-'$HOME/.boinc_data'}
 
 BOINCMGR=${BOINCMGR:-yes}
 if [ "$BOINCMGR" = "yes" ]; then
@@ -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/bowtie2/bowtie2.SlackBuild b/academic/bowtie2/bowtie2.SlackBuild
index 370b409bc0..fa8d2dfa04 100644
--- a/academic/bowtie2/bowtie2.SlackBuild
+++ b/academic/bowtie2/bowtie2.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bowtie2
-VERSION=${VERSION:-2.4.1}
+VERSION=${VERSION:-2.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,8 +72,6 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 #Use our FLAGS
-#sed -i "/RELEASE_FLAGS/s/=/+=/" Makefile
-
 RELEASE_FLAGS+="$SLKCFLAGS" \
 make
 
@@ -102,7 +100,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS LICENSE MANUAL NEWS TUTORIAL VERSION doc \
+  AUTHORS LICENSE MANUAL NEWS TUTORIAL BOWTIE2_VERSION doc \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/bowtie2/bowtie2.info b/academic/bowtie2/bowtie2.info
index 8c3fb45d87..c57cd185f3 100644
--- a/academic/bowtie2/bowtie2.info
+++ b/academic/bowtie2/bowtie2.info
@@ -1,8 +1,8 @@
 PRGNAM="bowtie2"
-VERSION="2.4.1"
+VERSION="2.4.2"
 HOMEPAGE="https://github.com/BenLangmead/bowtie2/releases"
-DOWNLOAD="https://github.com/BenLangmead/bowtie2/archive/v2.4.1/bowtie2-2.4.1.tar.gz"
-MD5SUM="5938482fab363c6356f9662cce38f99c"
+DOWNLOAD="https://github.com/BenLangmead/bowtie2/archive/v2.4.2/bowtie2-2.4.2.tar.gz"
+MD5SUM="d5f8674aed8bdbf6b96bd07f3df528ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="tbb python3"
diff --git a/academic/bpp1.9-numcalc/README b/academic/bpp1.9-numcalc/README
new file mode 100644
index 0000000000..a514a0450e
--- /dev/null
+++ b/academic/bpp1.9-numcalc/README
@@ -0,0 +1,10 @@
+Bio++ is a set of C++ libraries for Bioinformatics, including sequence
+analysis, phylogenetics, molecular evolution and population genetics.
+Bio++ is Object Oriented and is designed to be both easy to use and
+computer efficient. Bio++ intends to help programmers to write
+computer expensive programs, by providing them a set of re-usable
+tools.
+
+This contains the Bio++ 1.9 (April 2010) NumCalc Library. It can be
+installed along the current Bio++ suite libraries, however they better
+not be present at compile time.
diff --git a/academic/bpp1.9-numcalc/bpp1.9-numcalc.SlackBuild b/academic/bpp1.9-numcalc/bpp1.9-numcalc.SlackBuild
new file mode 100644
index 0000000000..4c23467bad
--- /dev/null
+++ b/academic/bpp1.9-numcalc/bpp1.9-numcalc.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Slackware build script for bpp1.9-utils
+
+# 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=bpp1.9-numcalc
+SRCNAM=bpp-numcalc
+VERSION=${VERSION:-1.8.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
+
+# This is needed for vCAPS to find its libraries at runtime. Thanks Urachlay!
+LIBDIRPATH="-Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/Bpp1.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
+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 {} \;
+
+# Use custom install place, so libs can coexist with latest bpp
+export PATH="/usr/lib${LIBDIRSUFFIX}/Bpp1.9/:$PATH"
+sed -i "s:/lib/:/lib${LIBDIRSUFFIX}/Bpp1.9/:g" NumCalc.spec
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS $LIBDIRPATH" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+sed -i "s:/lib/:/lib${LIBDIRSUFFIX}/Bpp1.9/:g" NumCalc/cmake_install.cmake
+sed -i "s:/lib\b:/lib${LIBDIRSUFFIX}/Bpp1.9:g" NumCalc/cmake_install.cmake
+
+  make
+  make DESTDIR=$PKG install
+cd ..
+
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/Bpp1.9/libbpp-numcalc.a
+
+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 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/academic/bpp1.9-numcalc/bpp1.9-numcalc.info b/academic/bpp1.9-numcalc/bpp1.9-numcalc.info
new file mode 100644
index 0000000000..0a1c619ed1
--- /dev/null
+++ b/academic/bpp1.9-numcalc/bpp1.9-numcalc.info
@@ -0,0 +1,10 @@
+PRGNAM="bpp1.9-numcalc"
+VERSION="1.8.0"
+HOMEPAGE="http://biopp.univ-montp2.fr/"
+DOWNLOAD="http://biopp.univ-montp2.fr/repos/sources/bpp-numcalc-1.8.0.tar.gz"
+MD5SUM="0d6d51aaefcb4f89816704feae010bc9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="bpp1.9-utils"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/academic/bpp1.9-numcalc/slack-desc b/academic/bpp1.9-numcalc/slack-desc
new file mode 100644
index 0000000000..0b1db4fe56
--- /dev/null
+++ b/academic/bpp1.9-numcalc/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------------------------------------------------------|
+bpp1.9-numcalc: bpp1.9-numcalc (Bio++ 1.9 NumCalc Library)
+bpp1.9-numcalc:
+bpp1.9-numcalc: Contains the Bio++ 1.9 NumCalc Library.
+bpp1.9-numcalc:
+bpp1.9-numcalc:
+bpp1.9-numcalc:
+bpp1.9-numcalc:
+bpp1.9-numcalc:
+bpp1.9-numcalc:
+bpp1.9-numcalc:
+bpp1.9-numcalc:
diff --git a/academic/bpp1.9-phyl/README b/academic/bpp1.9-phyl/README
new file mode 100644
index 0000000000..292485c428
--- /dev/null
+++ b/academic/bpp1.9-phyl/README
@@ -0,0 +1,10 @@
+Bio++ is a set of C++ libraries for Bioinformatics, including sequence
+analysis, phylogenetics, molecular evolution and population genetics.
+Bio++ is Object Oriented and is designed to be both easy to use and
+computer efficient. Bio++ intends to help programmers to write
+computer expensive programs, by providing them a set of re-usable
+tools.
+
+This contains the Bio++ 1.9 (April 2010) Phyl Library. It can be
+installed along the current Bio++ suite libraries, however they better
+not be present at compile time.
diff --git a/academic/bpp1.9-phyl/bpp1.9-phyl.SlackBuild b/academic/bpp1.9-phyl/bpp1.9-phyl.SlackBuild
new file mode 100644
index 0000000000..f9caa0030c
--- /dev/null
+++ b/academic/bpp1.9-phyl/bpp1.9-phyl.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackware build script for bpp1.9-phyl
+
+# 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=bpp1.9-phyl
+SRCNAM=bpp-phyl
+VERSION=${VERSION:-1.9.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
+
+# This is needed for vCAPS to find its libraries at runtime. Thanks Urachlay!
+LIBDIRPATH="-Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/Bpp1.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
+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 {} \;
+
+# CAPS wants TreeTemplateTools to be modified a bit...
+patch -p1 -i $CWD/caps_TreeTemplateTools.patch
+
+# Use custom install place, so libs can coexist with latest bpp
+export PATH="/usr/lib${LIBDIRSUFFIX}/Bpp1.9/:$PATH"
+sed -i "s:/lib/:/lib${LIBDIRSUFFIX}/Bpp1.9/:g" Phyl.spec
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS $LIBDIRPATH" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+  sed -i "s:/lib/:/lib${LIBDIRSUFFIX}/Bpp1.9/:g" Phyl/cmake_install.cmake
+  sed -i "s:/lib\b:/lib${LIBDIRSUFFIX}/Bpp1.9:g" Phyl/cmake_install.cmake
+
+  make
+  make DESTDIR=$PKG install
+cd ..
+
+# Remove static library
+rm -f $PKG/usr/lib64/Bpp1.9/libbpp-phyl.a
+
+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 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/academic/bpp1.9-phyl/bpp1.9-phyl.info b/academic/bpp1.9-phyl/bpp1.9-phyl.info
new file mode 100644
index 0000000000..26d984b0c4
--- /dev/null
+++ b/academic/bpp1.9-phyl/bpp1.9-phyl.info
@@ -0,0 +1,10 @@
+PRGNAM="bpp1.9-phyl"
+VERSION="1.9.0"
+HOMEPAGE="http://biopp.univ-montp2.fr/"
+DOWNLOAD="http://biopp.univ-montp2.fr/repos/sources/bpp-phyl-1.9.0.tar.gz"
+MD5SUM="1b100b688faca52419e9f782798b8add"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="bpp1.9-seq"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/academic/bpp1.9-phyl/caps_TreeTemplateTools.patch b/academic/bpp1.9-phyl/caps_TreeTemplateTools.patch
new file mode 100644
index 0000000000..b4f79029de
--- /dev/null
+++ b/academic/bpp1.9-phyl/caps_TreeTemplateTools.patch
@@ -0,0 +1,39 @@
+diff -pruN orig/Phyl/TreeTemplateTools.h new/Phyl/TreeTemplateTools.h
+--- orig/Phyl/TreeTemplateTools.h	2010-04-01 16:37:04.000000000 +0300
++++ new/Phyl/TreeTemplateTools.h	2017-02-03 14:33:11.000000000 +0200
+@@ -191,7 +191,7 @@ class TreeTemplateTools
+     static void dropLeaf(TreeTemplate<N>& tree, const std::string& leafName) throw (NodeNotFoundException, Exception)
+     {
+       N* leaf = tree.getNode(leafName);
+-      if (!leaf->hasfather())
++      if (!leaf->hasFather())
+         throw Exception("TreeTemplateTools::dropLeaf(). Leaf is the only node in the tree, can't remove it.");
+       N* parent = leaf->getFather();
+       if (parent->getNumberOfSons() > 2)
+@@ -203,7 +203,7 @@ class TreeTemplateTools
+       else if (parent->getNumberOfSons() == 2)
+       {
+         //We have to delete the parent node as well:
+-        N* brother = parent->getson(0);
++        N* brother = parent->getSon(0);
+         if (brother == leaf) brother = parent->getSon(1);
+         if (!parent->hasFather())
+         {
+@@ -212,7 +212,7 @@ class TreeTemplateTools
+           {
+             brother->setDistanceToFather(brother->getDistanceToFather() + leaf->getDistanceToFather());
+           }
+-          tree->setRootNode(brother);
++          tree.setRootNode(brother);
+           delete parent;
+           delete leaf;
+         }
+@@ -223,7 +223,7 @@ class TreeTemplateTools
+           {
+             brother->setDistanceToFather(brother->getDistanceToFather() + parent->getDistanceToFather());
+           }
+-          unsigned int pos = gParent->getsonPosition(parent);
++          unsigned int pos = gParent->getSonPosition(parent);
+           gParent->setSon(pos, brother);
+           delete parent;
+           delete leaf;
diff --git a/academic/bpp1.9-phyl/slack-desc b/academic/bpp1.9-phyl/slack-desc
new file mode 100644
index 0000000000..05245c02f1
--- /dev/null
+++ b/academic/bpp1.9-phyl/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------------------------------------------------------|
+bpp1.9-phyl: bpp1.9-phyl (Bio++ 1.9 Phyl Library)
+bpp1.9-phyl:
+bpp1.9-phyl: Contains the Bio++ 1.9 Phyl Library.
+bpp1.9-phyl:
+bpp1.9-phyl:
+bpp1.9-phyl:
+bpp1.9-phyl:
+bpp1.9-phyl:
+bpp1.9-phyl:
+bpp1.9-phyl:
+bpp1.9-phyl:
diff --git a/academic/bpp1.9-seq/README b/academic/bpp1.9-seq/README
new file mode 100644
index 0000000000..eaeb91d929
--- /dev/null
+++ b/academic/bpp1.9-seq/README
@@ -0,0 +1,10 @@
+Bio++ is a set of C++ libraries for Bioinformatics, including sequence
+analysis, phylogenetics, molecular evolution and population genetics.
+Bio++ is Object Oriented and is designed to be both easy to use and
+computer efficient. Bio++ intends to help programmers to write
+computer expensive programs, by providing them a set of re-usable
+tools.
+
+This contains the Bio++ 1.9 (April 2010) Seq Library. It can be
+installed along the current Bio++ suite libraries, however they better
+not be present at compile time.
diff --git a/academic/bpp1.9-seq/bpp1.9-seq.SlackBuild b/academic/bpp1.9-seq/bpp1.9-seq.SlackBuild
new file mode 100644
index 0000000000..a35ba4e508
--- /dev/null
+++ b/academic/bpp1.9-seq/bpp1.9-seq.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for bpp1.9-seq
+
+# 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=bpp1.9-seq
+SRCNAM=bpp-seq
+VERSION=${VERSION:-1.7.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
+
+# This is needed for vCAPS to find its libraries at runtime. Thanks Urachlay!
+LIBDIRPATH="-Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/Bpp1.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
+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 {} \;
+
+# Use custom install place, so libs can coexist with latest bpp
+export PATH="/usr/lib${LIBDIRSUFFIX}/Bpp1.9/:$PATH"
+sed -i "s:/lib/:/lib${LIBDIRSUFFIX}/Bpp1.9/:g" Seq.spec
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS $LIBDIRPATH" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+  sed -i "s:/lib/:/lib${LIBDIRSUFFIX}/Bpp1.9/:g" Seq/cmake_install.cmake
+  sed -i "s:/lib\b:/lib${LIBDIRSUFFIX}/Bpp1.9:g" Seq/cmake_install.cmake
+
+  make
+  make DESTDIR=$PKG install
+cd ..
+
+# Remove static lib
+rm -f $PKG/usr/lib64/Bpp1.9/libbpp-seq.a
+
+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 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/academic/bpp1.9-seq/bpp1.9-seq.info b/academic/bpp1.9-seq/bpp1.9-seq.info
new file mode 100644
index 0000000000..35b6d40f95
--- /dev/null
+++ b/academic/bpp1.9-seq/bpp1.9-seq.info
@@ -0,0 +1,10 @@
+PRGNAM="bpp1.9-seq"
+VERSION="1.7.0"
+HOMEPAGE="http://biopp.univ-montp2.fr/"
+DOWNLOAD="http://biopp.univ-montp2.fr/repos/sources/bpp-seq-1.7.0.tar.gz"
+MD5SUM="4256293637ac4131c0d030f5265b8b8b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="bpp1.9-numcalc"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/academic/bpp1.9-seq/slack-desc b/academic/bpp1.9-seq/slack-desc
new file mode 100644
index 0000000000..bd154ce1f1
--- /dev/null
+++ b/academic/bpp1.9-seq/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------------------------------------------------------|
+bpp1.9-seq: bpp1.9-seq (Bio++ 1.9 Seq Library)
+bpp1.9-seq:
+bpp1.9-seq: Contains the Bio++ 1.9 Seq Library.
+bpp1.9-seq:
+bpp1.9-seq:
+bpp1.9-seq:
+bpp1.9-seq:
+bpp1.9-seq:
+bpp1.9-seq:
+bpp1.9-seq:
+bpp1.9-seq:
diff --git a/academic/bpp1.9-utils/README b/academic/bpp1.9-utils/README
new file mode 100644
index 0000000000..5ee42d9632
--- /dev/null
+++ b/academic/bpp1.9-utils/README
@@ -0,0 +1,10 @@
+Bio++ is a set of C++ libraries for Bioinformatics, including sequence
+analysis, phylogenetics, molecular evolution and population genetics.
+Bio++ is Object Oriented and is designed to be both easy to use and
+computer efficient. Bio++ intends to help programmers to write
+computer expensive programs, by providing them a set of re-usable
+tools.
+
+This contains the Bio++ 1.9 (April 2010) Utils Library. It can be
+installed along the current Bio++ suite libraries, however they better
+not be present at compile time.
diff --git a/academic/bpp1.9-utils/bpp1.9-utils.SlackBuild b/academic/bpp1.9-utils/bpp1.9-utils.SlackBuild
new file mode 100644
index 0000000000..daff8c88bf
--- /dev/null
+++ b/academic/bpp1.9-utils/bpp1.9-utils.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Slackware build script for bpp1.9-utils
+
+# 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=bpp1.9-utils
+SRCNAM=bpp-utils
+VERSION=${VERSION:-1.5.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
+
+# This is needed for vCAPS to find its libraries at runtime. Thanks Urachlay!
+LIBDIRPATH="-Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/Bpp1.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
+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 {} \;
+
+# This is needed on newer systems (-current)
+sed -i "s:file;:file.good();:g" Utils/FileTools.cpp
+
+# Use custom install place, so libs can coexist with latest Bio++
+sed -i "s:/lib/:/lib${LIBDIRSUFFIX}/Bpp1.9/:g" Utils.spec
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS $LIBDIRPATH" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+# More about word boundary and sed:
+# https://linuxize.com/post/how-to-use-sed-to-find-and-replace-string-in-files/
+sed -i "s:/lib/:/lib${LIBDIRSUFFIX}/Bpp1.9/:g" Utils/cmake_install.cmake
+sed -i "s:/lib\b:/lib${LIBDIRSUFFIX}/Bpp1.9:g" Utils/cmake_install.cmake
+
+  make
+  make DESTDIR=$PKG install
+cd ..
+
+# static library not needed
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/Bpp1.9/libbpp-utils.a
+
+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 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/academic/bpp1.9-utils/bpp1.9-utils.info b/academic/bpp1.9-utils/bpp1.9-utils.info
new file mode 100644
index 0000000000..8e7863e9f1
--- /dev/null
+++ b/academic/bpp1.9-utils/bpp1.9-utils.info
@@ -0,0 +1,10 @@
+PRGNAM="bpp1.9-utils"
+VERSION="1.5.0"
+HOMEPAGE="http://biopp.univ-montp2.fr/"
+DOWNLOAD="http://biopp.univ-montp2.fr/repos/sources/bpp-utils-1.5.0.tar.gz"
+MD5SUM="4625b7f2146caa1815ed7dc433d5eb78"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.copm"
diff --git a/academic/bpp1.9-utils/slack-desc b/academic/bpp1.9-utils/slack-desc
new file mode 100644
index 0000000000..be9d333c61
--- /dev/null
+++ b/academic/bpp1.9-utils/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------------------------------------------------------|
+bpp1.9-utils: bpp1.9-utils (Bio++ 1.9 Utils Library)
+bpp1.9-utils:
+bpp1.9-utils: Contains the Bio++ 1.9 Utils Library.
+bpp1.9-utils:
+bpp1.9-utils:
+bpp1.9-utils:
+bpp1.9-utils:
+bpp1.9-utils:
+bpp1.9-utils:
+bpp1.9-utils:
+bpp1.9-utils:
diff --git a/academic/btf/README b/academic/btf/README
index 3666aedf6b..625663f5fe 100644
--- a/academic/btf/README
+++ b/academic/btf/README
@@ -1,5 +1,5 @@
-BTF permutes an unsymmetric matrix (square or rectangular) into its block
-upper triangular form (more precisely, it computes a Dulmage-Mendelsohn
-decomposition).
+BTF permutes an unsymmetric matrix (square or rectangular) into
+its block upper triangular form (more precisely, it computes a
+Dulmage-Mendelsohn decomposition).
 
 This package is part of SuiteSparse.
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/README b/academic/cadabra2/README
index 5e8287722a..0533ffcdd3 100644
--- a/academic/cadabra2/README
+++ b/academic/cadabra2/README
@@ -28,5 +28,6 @@ command-line and a graphical interface are available.
 
 * Programmable using Python.
 
-Mathematica (not on SBo) is an optional dependency, it will be
-autodetected at build time.
+If this SlackBuild run on a system which has Mathematica (not on SBo)
+installed, the support of Mathematica can be enabled by setting the
+environment variable MMA=ON (default: MMA=OFF).
diff --git a/academic/cadabra2/cadabra2.SlackBuild b/academic/cadabra2/cadabra2.SlackBuild
index 53b6152b13..f6a618c3ff 100644
--- a/academic/cadabra2/cadabra2.SlackBuild
+++ b/academic/cadabra2/cadabra2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cadabra2
 
-# Copyright 2017-2019, 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,9 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cadabra2
-VERSION=${VERSION:-2.2.8}
+VERSION=${VERSION:-2.3.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+MMA=${MMA:-OFF}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -91,10 +92,14 @@ 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
   make install DESTDIR=$PKG
@@ -108,7 +113,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  doc examples README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a contrib doc examples paper CONTRIBUTING.md JUPYTER.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/academic/cadabra2/cadabra2.info b/academic/cadabra2/cadabra2.info
index eba8bf8144..164ad63867 100644
--- a/academic/cadabra2/cadabra2.info
+++ b/academic/cadabra2/cadabra2.info
@@ -1,10 +1,10 @@
 PRGNAM="cadabra2"
-VERSION="2.2.8"
+VERSION="2.3.6.3"
 HOMEPAGE="https://cadabra.science"
-DOWNLOAD="https://downloads.sourceforge.net/slackbuildsdirectlinks/cadabra2/cadabra2-2.2.8.tar.gz"
-MD5SUM="a4c91eca89e75a079038e9dae3c5d00e"
+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/calcoo/README b/academic/calcoo/README
index 5c4e7ef8c3..d9891857aa 100644
--- a/academic/calcoo/README
+++ b/academic/calcoo/README
@@ -1,4 +1,5 @@
-Calcoo is an RPN and scientific calculator that uses the GTK library.  It 
-features both RPN and algebraic modes, bitmapped button labels and display 
-glyths, undo/redo options, copy/paste interaction with the X clipboard, two 
-memory registers with displays, and displays for Y, Z, and T registers.
+Calcoo is an RPN and scientific calculator that uses the GTK library.
+It features both RPN and algebraic modes, bitmapped button labels and
+display glyths, undo/redo options, copy/paste interaction with the X
+clipboard, two memory registers with displays, and displays for Y, Z,
+and T registers.
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/cap3/README b/academic/cap3/README
index 62792bb4c7..bd6e1fb491 100644
--- a/academic/cap3/README
+++ b/academic/cap3/README
@@ -1,11 +1,12 @@
 CAP3: A DNA sequence assembly program.
 
 CAP3 if the third generation of the CAP sequence assembly program. The
-program has a capability to clip 5' and 3' low-quality regions of reads.
-It uses base quality values in computation of overlaps between reads,
-construction of multiple sequence alignments of reads, and generation
-of consensus sequences. The program also uses forward-reverse constraints
-to correct assembly errors and link contigs.
+program has a capability to clip 5' and 3' low-quality regions
+of reads.  It uses base quality values in computation of overlaps
+between reads, construction of multiple sequence alignments of
+reads, and generation of consensus sequences. The program also uses
+forward-reverse constraints to correct assembly errors and link
+contigs.
 
 This just repackages the binaries provided from upstream.
 
diff --git a/academic/cblas/README b/academic/cblas/README
index 37cd0e0795..96f920457b 100644
--- a/academic/cblas/README
+++ b/academic/cblas/README
@@ -1,9 +1,10 @@
-CBLAS is a collection of wrappers that provide a C interface to the FORTRAN
-BLAS library.  The interface can be consulted by opening /usr/include/cblas.h
+CBLAS is a collection of wrappers that provide a C interface to the
+FORTRAN BLAS library.  The interface can be consulted by opening
+/usr/include/cblas.h
 
-This package is intended for use with the Netlib reference BLAS.  It should
-also work with other BLAS implementations that do not already provide a CBLAS
-implementation.
+This package is intended for use with the Netlib reference BLAS.
+It should also work with other BLAS implementations that do not
+already provide a CBLAS implementation.
 
 To build a static library in addition to the shared library,
 pass STATIC=yes to the script.
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/README b/academic/cdo/README
new file mode 100644
index 0000000000..e767d4ea31
--- /dev/null
+++ b/academic/cdo/README
@@ -0,0 +1,7 @@
+CDO (Climate Data Operators)
+
+CDO is a collection of command line Operators to manipulate and analyse
+Climate and NWP model Data.
+
+Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and
+IEG. There are more than 600 operators available.
diff --git a/academic/cdo/cdo.SlackBuild b/academic/cdo/cdo.SlackBuild
new file mode 100644
index 0000000000..9aef1c9fdb
--- /dev/null
+++ b/academic/cdo/cdo.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware build script for cdo
+
+# Copyright 2020 Gregory J. L. Tourte <artourter@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=cdo
+VERSION=${VERSION:-1.9.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 {} \;
+
+# static.
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-szlib=yes \
+  --with-netcdf=yes \
+  --with-hdf5=yes \
+  --with-udunits2 \
+  --with-threads=yes \
+  --disable-static \
+  --with-fftw3 \
+  --with-proj \
+  --with-curl \
+  --with-libxml2 \
+  --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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS OPERATORS README \
+  doc/*.pdf \
+  $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/cdo/cdo.info b/academic/cdo/cdo.info
new file mode 100644
index 0000000000..74453e1a40
--- /dev/null
+++ b/academic/cdo/cdo.info
@@ -0,0 +1,10 @@
+PRGNAM="cdo"
+VERSION="1.9.10"
+HOMEPAGE="https://code.mpimet.mpg.de/projects/cdo"
+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"
+MAINTAINER="Greg Tourte"
+EMAIL="artourter@gmail.com"
diff --git a/academic/cdo/slack-desc b/academic/cdo/slack-desc
new file mode 100644
index 0000000000..49f7b868c9
--- /dev/null
+++ b/academic/cdo/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------------------------------------------------------|
+cdo: cdo (Climate Data Operators)
+cdo:
+cdo: CDO is a collection of command line Operators to manipulate and
+cdo: analyse Climate and NWP model Data.
+cdo:
+cdo: Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and
+cdo: IEG. There are more than 600 operators available.
+cdo:
+cdo:
+cdo:
+cdo:
diff --git a/academic/chartgeany/README b/academic/chartgeany/README
new file mode 100644
index 0000000000..0b49fa40f0
--- /dev/null
+++ b/academic/chartgeany/README
@@ -0,0 +1,6 @@
+Chart Geany is a cross platform software solution for market technical
+analysis and charting.
+
+Optional: qt5
+
+QT5GUI=yes ./chartgeany.SlackBuild
diff --git a/academic/chartgeany/chartgeany.SlackBuild b/academic/chartgeany/chartgeany.SlackBuild
new file mode 100644
index 0000000000..7c9da765d8
--- /dev/null
+++ b/academic/chartgeany/chartgeany.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for chartgeany
+
+# Copyright 2020 Larry Hajali <larryhaja[at]gmail[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=chartgeany
+VERSION=${VERSION:-6.1.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 {} \;
+
+# Fix file locaations.
+sed -i '/^target.path/s|= /opt/$$PKG_NAME|= /usr/bin|' \
+  ChartGeany/ChartGeany.pro cgtool/cgtool.pro
+sed -i '/^images.path/s|= /opt/$$PKG_NAME|= /usr/share/pixmaps|' \
+  ChartGeany/ChartGeany.pro
+sed -i "s|/opt/$PRGNAM/||" ChartGeany/chartgeany.desktop
+
+if [ "${QT5GUI:-no}" == "yes" ]; then
+  qmake-qt5 PREFIX="/usr" QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+    -o Makefile $PRGNAM.pro
+else
+  qmake PREFIX="/usr" QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+    -o Makefile $PRGNAM.pro
+fi
+
+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
+
+chmod 0644 $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  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
+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/chartgeany/chartgeany.info b/academic/chartgeany/chartgeany.info
new file mode 100644
index 0000000000..83d6be57c8
--- /dev/null
+++ b/academic/chartgeany/chartgeany.info
@@ -0,0 +1,10 @@
+PRGNAM="chartgeany"
+VERSION="6.1.5"
+HOMEPAGE="https://sourceforge.net/projects/chart-geany/"
+DOWNLOAD="https://downloads.sourceforge.net/chart-geany/chartgeany-6.1.5.tar.gz"
+MD5SUM="c2f0acdc7025de66ff6cbcba65212751"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libxls"
+MAINTAINER="Larry Hajali"
+EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/academic/chartgeany/doinst.sh b/academic/chartgeany/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/academic/chartgeany/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/chartgeany/slack-desc b/academic/chartgeany/slack-desc
new file mode 100644
index 0000000000..cb4c4a3b5c
--- /dev/null
+++ b/academic/chartgeany/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------------------------------------------------------|
+chartgeany: chartgeany (market analysis tool)
+chartgeany:
+chartgeany: Chart Geany is a cross platform software solution for market technical
+chartgeany: analysis and charting.
+chartgeany:
+chartgeany: Homepage: https://sourceforge.net/projects/chart-geany/
+chartgeany:
+chartgeany:
+chartgeany:
+chartgeany:
+chartgeany:
diff --git a/academic/cholmod/README b/academic/cholmod/README
index 46350dc390..f91a13d263 100644
--- a/academic/cholmod/README
+++ b/academic/cholmod/README
@@ -1,16 +1,18 @@
-CHOLMOD is a set of ANSI C routines for sparse Cholesky factorization and
-update/downdate.
+CHOLMOD is a set of ANSI C routines for sparse Cholesky factorization
+and update/downdate.
 
 This package is part of SuiteSparse.
 
-This requires a BLAS/LAPACK implementation.  Choose one of these package sets:
+This requires a BLAS/LAPACK implementation.  Choose one of these
+package sets:
  * OpenBLAS (includes both a BLAS and a LAPACK implementation)
  * atlas (includes both a BLAS and a LAPACK implementation)
  * blas, lapack (the Netlib reference implementations)
-If more than one set is installed (assuming there are no packaging conflicts)
-then the auto-detection will use the first implementation from this list that
-it finds.  If in doubt, choose the Netlib reference implementations; other
-packages that require a BLAS or LAPACK implementation may not build if they
-are not configured to detect/use alternate implementations.
+If more than one set is installed (assuming there are no packaging
+conflicts) then the auto-detection will use the first implementation
+from this list that it finds.  If in doubt, choose the Netlib
+reference implementations; other packages that require a BLAS or
+LAPACK implementation may not build if they are not configured to
+detect/use alternate implementations.
 
 metis is an optional dependency and will be used if found.
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/cld2/README b/academic/cld2/README
index 164357bf4f..d7d86bd3d4 100644
--- a/academic/cld2/README
+++ b/academic/cld2/README
@@ -1,9 +1,11 @@
-The Compact Language Detection library can detect the language of UTF8-encoded
-text. CLD2 supports over 160 languages and can parse both plain text and HTML.
+The Compact Language Detection library can detect the language of
+UTF8-encoded text. CLD2 supports over 160 languages and can parse both
+plain text and HTML.
 
-The Slackware script builds two shared libraries, libcld2 and libcld2_full. The
-libcld2 library can recognise the core 83 languages while the libcld2_full
-library has support for the entire set of 160+ language tables. 
+The Slackware script builds two shared libraries, libcld2 and
+libcld2_full. The libcld2 library can recognise the core 83 languages
+while the libcld2_full library has support for the entire set of 160+
+language tables.
 
-The script also builds a commandline tool, cld2, which is compiled against the
-libcld2_full library.
+The script also builds a commandline tool, cld2, which is compiled
+against the libcld2_full library.
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/README b/academic/colin/README
new file mode 100644
index 0000000000..7b913061cc
--- /dev/null
+++ b/academic/colin/README
@@ -0,0 +1,5 @@
+colin (a structural analysis application)
+
+Colin is a structural analysis application with a lightweight
+interface.  This software for civil engineering students provides an
+easier way to learn civil engineering.
diff --git a/academic/colin/colin.SlackBuild b/academic/colin/colin.SlackBuild
new file mode 100644
index 0000000000..487197cf4d
--- /dev/null
+++ b/academic/colin/colin.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# SlackBuild build script for colin
+
+# 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=colin
+VERSION=${VERSION:-1.8.2}
+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
+
+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
+
+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 {} \;
+
+qmake
+make
+
+# make install DESTDIR not implemented so go manual !
+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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a 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/academic/colin/colin.info b/academic/colin/colin.info
new file mode 100644
index 0000000000..39bcb740ad
--- /dev/null
+++ b/academic/colin/colin.info
@@ -0,0 +1,10 @@
+PRGNAM="colin"
+VERSION="1.8.2"
+HOMEPAGE="https://sourceforge.net/projects/colin2"
+DOWNLOAD="https://sourceforge.net/projects/colin2/files/colin-1.8.2.tar.xz"
+MD5SUM="e7260f262dbc563b40b6de529d6aa519"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="brotli graphite2"
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/academic/colin/slack-desc b/academic/colin/slack-desc
new file mode 100644
index 0000000000..73ce0befc5
--- /dev/null
+++ b/academic/colin/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------------------------------------------------------|
+colin: colin (a structural analysis application)
+colin:
+colin: Colin is a structural analysis application with a lightweight
+colin: interface. This structural analysis software for civil engineering
+colin: students, provide an easier way to learn civil engineering.
+colin:
+colin: Some tutorials (in German) can be found on youtube.com:
+colin: http://www.youtube.com/user/ognop42
+colin:
+colin: By Prof. Horstmann www.eipg.fr <wmh (at) eipg.fr>
+colin:
diff --git a/academic/convertall/README b/academic/convertall/README
index f0cf40819c..9739c0472c 100644
--- a/academic/convertall/README
+++ b/academic/convertall/README
@@ -1,7 +1,6 @@
 ConvertAll (unit conversion)
 
-With ConvertAll, you can convert units as necessary, or combine any units any
-way you want. If you want to convert from inches per decade, that's fine. Or
-from meter-pounds. Or from cubic nautical miles. The units don't have to make
-sense to anyone else.
-
+With ConvertAll, you can convert units as necessary, or combine any
+units any way you want. If you want to convert from inches per decade,
+that's fine. Or from meter-pounds. Or from cubic nautical miles. The
+units don't have to make sense to anyone else.
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/copasi/README b/academic/copasi/README
index 4da8b74120..c640a01c87 100644
--- a/academic/copasi/README
+++ b/academic/copasi/README
@@ -12,6 +12,6 @@ command line version is also included that allows for processing
 computations in batch mode.
 
 COPASI is a collaboration between research groups at the Biocomplexity
-Institute at Virginia Tech, University of Heidelberg, University of
-Connecticut, and previously the University of Manchester and the
-EML-Research.
+Institute and Initiative  at University of Virginia, University of 
+Heidelberg, University of Connecticut, and previously the University
+of Manchester, Virginia Tech, and the EML-Research.
diff --git a/academic/copasi/copasi.SlackBuild b/academic/copasi/copasi.SlackBuild
index d446a59979..ea41da828c 100644
--- a/academic/copasi/copasi.SlackBuild
+++ b/academic/copasi/copasi.SlackBuild
@@ -23,14 +23,25 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=copasi
-VERSION=${VERSION:-4.27.217}
+VERSION=${VERSION:-4.28.226}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-case "$(uname -m)" in
-  i?86) ARCH=i586 ;;
-  arm*) ARCH=arm ;;
-     *) ARCH=$(uname -m) ;;
+if [ -z "$ARCH" ]; then
+  ARCH="$(uname -m)"
+fi
+
+case "$ARCH" in
+  i?86)
+    BINNAME="Linux-32bit"
+    ;;
+  x86_64)
+    BINNAME="Linux-64bit"
+    ;;
+  *)
+    echo "$ARCH is not supported by the $PRGNAM build script..."
+    exit 1
+    ;;
 esac
 
 CWD=$(pwd)
@@ -38,15 +49,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  BINNAME="Linux-32bit"
-elif [ "$ARCH" = "x86_64" ]; then
-  BINNAME="Linux-64bit"
-else
-  echo "$ARCH is not supported by the $PRGNAM build script..."
-  exit 1
-fi
-
 # This is a repackage of a binary distribution
 # CFLAGS are not required
 
diff --git a/academic/copasi/copasi.info b/academic/copasi/copasi.info
index 6e5b69b94a..93b7729f70 100644
--- a/academic/copasi/copasi.info
+++ b/academic/copasi/copasi.info
@@ -1,10 +1,10 @@
 PRGNAM="copasi"
-VERSION="4.27.217"
-HOMEPAGE="http://www.copasi.org"
-DOWNLOAD="https://github.com/copasi/COPASI/releases/download/Build-217/COPASI-4.27.217-Linux-32bit.tar.gz"
-MD5SUM="a218e91000bba6ca3071feddd95fd0d2"
-DOWNLOAD_x86_64="https://github.com/copasi/COPASI/releases/download/Build-217/COPASI-4.27.217-Linux-64bit.tar.gz"
-MD5SUM_x86_64="f9fd439a6b6a9f60bb2b54c666235aec"
+VERSION="4.28.226"
+HOMEPAGE="http://copasi.org"
+DOWNLOAD="https://github.com/copasi/COPASI/releases/download/Build-226/COPASI-4.28.226-Linux-32bit.tar.gz"
+MD5SUM="3fd18c60296def1158295b4b39a41085"
+DOWNLOAD_x86_64="https://github.com/copasi/COPASI/releases/download/Build-226/COPASI-4.28.226-Linux-64bit.tar.gz"
+MD5SUM_x86_64="9709892e02b9ec7e9ccb0d9ec7e8b08b"
 REQUIRES=""
 MAINTAINER="Pedro Mendes"
 EMAIL="pedro@gepasi.org"
diff --git a/academic/cryptominisat/cryptominisat.SlackBuild b/academic/cryptominisat/cryptominisat.SlackBuild
index 8a59f1367e..f8f0deea19 100644
--- a/academic/cryptominisat/cryptominisat.SlackBuild
+++ b/academic/cryptominisat/cryptominisat.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cryptominisat
-VERSION=${VERSION:-5.6.8}
+VERSION=${VERSION:-5.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/cryptominisat/cryptominisat.info b/academic/cryptominisat/cryptominisat.info
index 4ceb3bef16..ecbc9f24ff 100644
--- a/academic/cryptominisat/cryptominisat.info
+++ b/academic/cryptominisat/cryptominisat.info
@@ -1,8 +1,8 @@
 PRGNAM="cryptominisat"
-VERSION="5.6.8"
+VERSION="5.7.1"
 HOMEPAGE="https://www.msoos.org/cryptominisat5/"
-DOWNLOAD="https://github.com/msoos/cryptominisat/archive/5.6.8/cryptominisat-5.6.8.tar.gz"
-MD5SUM="ca1bf853e568c19968daa5464ab86843"
+DOWNLOAD="https://github.com/msoos/cryptominisat/archive/5.7.1/cryptominisat-5.7.1.tar.gz"
+MD5SUM="e4ff835bbfe1995cc5e62a6e464dfd98"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/csparse/README b/academic/csparse/README
index 7119c1bf65..2726898d3c 100644
--- a/academic/csparse/README
+++ b/academic/csparse/README
@@ -1,5 +1,5 @@
-CSparse is a small yet feature-rich sparse matrix package.  Its purpose is
-to demonstrate a wide range of sparse matrix algorithms in as concise a
-code as possible.
+CSparse is a small yet feature-rich sparse matrix package.  Its
+purpose is to demonstrate a wide range of sparse matrix algorithms in
+as concise a code as possible.
 
 This package is part of SuiteSparse.
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/cvc4/README b/academic/cvc4/README
index 830c7394fb..ed00fa62b8 100644
--- a/academic/cvc4/README
+++ b/academic/cvc4/README
@@ -4,4 +4,8 @@ either prove the formula or find a counterexample. CVC4 supports
 arithmetic, reasoning about arrays, and several other built-in
 theories. Input problems are written in SMT-LIB format.
 
-This package includes the cvc4 program as well as libraries.
+This package includes the cvc4 program, libraries, and Python 2
+bindings.
+
+Note that this SlackBuild builds CVC4 with readline support, which means
+the resulting executable is licensed under the GPLv3.
diff --git a/academic/cvc4/cvc4.SlackBuild b/academic/cvc4/cvc4.SlackBuild
index ce4b43bebf..d3a964cf03 100644
--- a/academic/cvc4/cvc4.SlackBuild
+++ b/academic/cvc4/cvc4.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cvc4
 
-# Copyright 2019 Nick Smallbone, Gothenburg, Sweden
+# Copyright 2019-2020 Nick Smallbone, Gothenburg, Sweden
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,12 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# TO DO:
+# Add new Python bindings (requires a newer version of Cython?)
+# Add Java bindings (requires a newer version of CMake?)
+
 PRGNAM=cvc4
-VERSION=${VERSION:-1.7}
+VERSION=${VERSION:-1.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 SRCNAM=CVC4
@@ -70,22 +74,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 {} \;
 
-sed -i "s/DESTINATION lib/DESTINATION lib${LIBDIRSUFFIX}/" src/CMakeLists.txt src/parser/CMakeLists.txt
-chmod +x $CWD/run-antlr
+sed -i "s/LIBRARY_INSTALL_DIR lib/&${LIBDIRSUFFIX}/" CMakeLists.txt
+install -m 755 $CWD/run-antlr .
+cp $CWD/antlr-3.4-complete.jar .
 
 cmake \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DCMAKE_BUILD_TYPE=Production \
-  -DENABLE_OPTIMIZED=ON \
   -DANTLR_INCLUDE_DIR=/usr/include/antlr3 \
-  -DANTLR_BINARY="$CWD/run-antlr" \
+  -DANTLR_BINARY="$TMP/$SRCNAM-$VERSION/run-antlr" \
+  -DUSE_READLINE=OFF \
+  -DBUILD_BINDINGS_PYTHON=OFF \
+  -DBUILD_SWIG_BINDINGS_PYTHON=ON \
+  -DBUILD_SWIG_BINDINGS_JAVA=OFF \
   .
 
 make
-make doc
-make install/strip DESTDIR=$PKG
+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
+
 mv $PKG/usr/share/man $PKG/usr/man
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/academic/cvc4/cvc4.info b/academic/cvc4/cvc4.info
index 9058f04efd..4fc4ede8c6 100644
--- a/academic/cvc4/cvc4.info
+++ b/academic/cvc4/cvc4.info
@@ -1,12 +1,12 @@
 PRGNAM="cvc4"
-VERSION="1.7"
+VERSION="1.8"
 HOMEPAGE="https://cvc4.cs.stanford.edu/"
-DOWNLOAD="https://github.com/CVC4/CVC4/archive/1.7/CVC4-1.7.tar.gz \
+DOWNLOAD="https://github.com/CVC4/CVC4/archive/1.8/CVC4-1.8.tar.gz \
           https://www.antlr3.org/download/antlr-3.4-complete.jar"
-MD5SUM="eadb05f5092c4310f3bbe52745f9b7b9 \
+MD5SUM="9f7657e21fec3c4042225b0b8f513c34 \
         1b91dea1c7d480b3223f7c8a9aa0e172"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk libantlr3c"
+REQUIRES="jdk libantlr3c python-toml"
 MAINTAINER="Nick Smallbone"
 EMAIL="nick@smallbone.se"
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/dakota/README b/academic/dakota/README
index 01d05fcdec..3a0d5dbe15 100644
--- a/academic/dakota/README
+++ b/academic/dakota/README
@@ -1,12 +1,16 @@
 The Dakota toolkit provides a flexible, extensible interface between
 analysis codes and iteration methods. Dakota contains algorithms for
 optimization with gradient and nongradient-based methods; uncertainty
-quantification with sampling, reliability, stochastic expansion, and
-epistemic methods; parameter estimation with nonlinear least squares
-methods; and sensitivity/variance analysis with design of experiments
-and parameter study capabilities.  These capabilities may be used on
-their own or as components within advanced strategies such as
-surrogate-based optimization, mixed integer nonlinear programming, or
-optimization under uncertainty.
+quantification with sampling, reliability, stochastic expansion,
+and epistemic methods; parameter estimation with nonlinear least
+squares methods; and sensitivity/variance analysis with design of
+experiments and parameter study capabilities.  These capabilities may
+be used on their own or as components within advanced strategies such
+as surrogate-based optimization, mixed integer nonlinear programming,
+or optimization under uncertainty.
 
-Optional dependency: openmpi
+Optional dependency: openmpi (for distributed memory parallel
+capabilities)
+
+You can build with multiple jobs by setting the MAKEFLAGS environment
+variable.
diff --git a/academic/dakota/dakota.SlackBuild b/academic/dakota/dakota.SlackBuild
index cc8e00e755..bd119d0e0d 100644
--- a/academic/dakota/dakota.SlackBuild
+++ b/academic/dakota/dakota.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Dakota
 
-# Copyright 2017 Lorenzo Trevisan, Caorle, Venice, Italy
+# Copyright 2017, 2018, 2019, 2020 Lorenzo Trevisan, Caorle, Venice, 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=dakota
-VERSION=${VERSION:-6.8}
+VERSION=${VERSION:-6.11.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/dakota/dakota.info b/academic/dakota/dakota.info
index f20e72ed14..80d0d1cd01 100644
--- a/academic/dakota/dakota.info
+++ b/academic/dakota/dakota.info
@@ -1,8 +1,8 @@
 PRGNAM="dakota"
-VERSION="6.8"
+VERSION="6.11.0"
 HOMEPAGE="https://dakota.sandia.gov/"
-DOWNLOAD="https://dakota.sandia.gov/sites/default/files/distributions/public/dakota-6.8-release-public.src-UI.tar.gz"
-MD5SUM="85375e8c4df406fe017beda63ab28215"
+DOWNLOAD="https://dakota.sandia.gov/sites/default/files/distributions/public/dakota-6.11.0-release-public.src-UI.tar.gz"
+MD5SUM="3a81ce3f6b0c3a9087a0cd8f53e16249"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas lapack"
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/academic/datamash/slack-desc b/academic/datamash/slack-desc
new file mode 100644
index 0000000000..86ef966a72
--- /dev/null
+++ b/academic/datamash/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------------------------------------------------------|
+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/diamond/diamond.SlackBuild b/academic/diamond/diamond.SlackBuild
index 06d783043f..9a59218bbd 100644
--- a/academic/diamond/diamond.SlackBuild
+++ b/academic/diamond/diamond.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=diamond
-VERSION=${VERSION:-0.9.29}
+VERSION=${VERSION:-0.9.36}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,7 +85,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ${PRGNAM}_manual.pdf LICENSE README.md src/ChangeLog \
+  LICENSE README.md src/ChangeLog \
   $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
diff --git a/academic/diamond/diamond.info b/academic/diamond/diamond.info
index e94f42b60b..e1160377d7 100644
--- a/academic/diamond/diamond.info
+++ b/academic/diamond/diamond.info
@@ -1,10 +1,10 @@
 PRGNAM="diamond"
-VERSION="0.9.29"
+VERSION="0.9.36"
 HOMEPAGE="https://github.com/bbuchfink/diamond"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/bbuchfink/diamond/archive/v0.9.29/diamond-0.9.29.tar.gz"
-MD5SUM_x86_64="c9a1cb0f2128e621695f7ee0a05c2af8"
+DOWNLOAD="https://github.com/bbuchfink/diamond/archive/v0.9.36/diamond-0.9.36.tar.gz"
+MD5SUM="ce6f019e2e5dbc22e1210ba408ccefb4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
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 17023a3adf..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="3dd24162553617565182d1016d24a6de"
+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/ed-v6/README b/academic/ed-v6/README
index 373767752c..f116d5fc40 100644
--- a/academic/ed-v6/README
+++ b/academic/ed-v6/README
@@ -71,7 +71,7 @@ info page.
 
 This is the closest I can find to the original man page:
 
-https://www.freebsd.org/cgi/man.cgi?query=ed&apropos=0&sektion=0&manpath=Unix%20Seventh%20Edition&arch=default&format=html
+https://freebsd.org/cgi/man.cgi?query=ed&manpath=Unix+Seventh+Edition
 
 Among other things, there is no -p option, single , or ;
 will throw errors, no G//, and r does not support shell
diff --git a/academic/engauge/README b/academic/engauge/README
index 8e946775e7..a1c9e75bbf 100644
--- a/academic/engauge/README
+++ b/academic/engauge/README
@@ -1,7 +1,8 @@
-Engauge digitizing software converts an image file showing a graph or map,
-into numbers. The image file can come from a scanner, digital camera or
-screenshot. The numbers can be read on the screen, and written or copied
-to a spreadsheet. Engauge Digitizer compensates for rotation, scaling
-and skew (also known as shearing) in graphs. Engauge recognizes BMP, CUR,
-DDS, GIF, ICNS, ICO, JP2, JPG, MNG, PBM, PDF, PGM, PNG, PPM, SVG, SVGZ,
-TGA, TIFF, WBMP, WEBP, XBM and XPM image files.
+Engauge digitizing software converts an image file showing a graph or
+map, into numbers. The image file can come from a scanner, digital
+camera or screenshot. The numbers can be read on the screen, and
+written or copied to a spreadsheet. Engauge Digitizer compensates for
+rotation, scaling and skew (also known as shearing) in graphs. Engauge
+recognizes BMP, CUR, DDS, GIF, ICNS, ICO, JP2, JPG, MNG, PBM, PDF,
+PGM, PNG, PPM, SVG, SVGZ, TGA, TIFF, WBMP, WEBP, XBM and XPM image
+files.
diff --git a/academic/eprover/eprover.SlackBuild b/academic/eprover/eprover.SlackBuild
index af3094b78b..5ab9c7485b 100644
--- a/academic/eprover/eprover.SlackBuild
+++ b/academic/eprover/eprover.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for eprover
 
-# Copyright 2019 Nick Smallbone, Gothenburg, Sweden
+# Copyright 2019-2020 Nick Smallbone, Gothenburg, Sweden
 # 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=eprover
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -90,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 \
-  README.md COPYING DOC/CONTRIBUTORS DOC/eprover.pdf DOC/NEWS \
+  README COPYING DOC/CONTRIBUTORS DOC/eprover.pdf DOC/NEWS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/eprover/eprover.info b/academic/eprover/eprover.info
index 542d9c982e..9371d82d3e 100644
--- a/academic/eprover/eprover.info
+++ b/academic/eprover/eprover.info
@@ -1,8 +1,8 @@
 PRGNAM="eprover"
-VERSION="2.4"
+VERSION="2.5"
 HOMEPAGE="http://www.eprover.org"
-DOWNLOAD="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_2.4/E.tgz"
-MD5SUM="a303126a27deaedb0ce1bb884ab9ab97"
+DOWNLOAD="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_2.5/E.tgz"
+MD5SUM="f73852315dde1071acfa552b9532c7ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/ess/README b/academic/ess/README
index 75a031fca0..79cd22990b 100644
--- a/academic/ess/README
+++ b/academic/ess/README
@@ -1,4 +1,4 @@
-Emacs Speaks Statistics is an add-on package for emacs-based text editors 
-such as GNU Emacs and XEmacs.  It is designed to support editing of scripts
-and interaction with various statistical analysis programs such S-Plus, R, 
-SAS, Stata, and others.
+Emacs Speaks Statistics is an add-on package for emacs-based text
+editors such as GNU Emacs and XEmacs.  It is designed to support
+editing of scripts and interaction with various statistical analysis
+programs such S-Plus, R, SAS, Stata, and others.
diff --git a/academic/fann/README b/academic/fann/README
index 8fd6161fd4..936d077cc7 100644
--- a/academic/fann/README
+++ b/academic/fann/README
@@ -1,7 +1,8 @@
-Fast Artificial Neural Network Library is a free open source neural network
-library, which implements multilayer artificial neural networks in C with
-support for both fully connected and sparsely connected networks.
-Cross-platform execution in both fixed and floating point are supported. It
-includes a framework for easy handling of training data sets. It is easy to
-use, versatile, well documented, and fast. Bindings to more than 15 programming
-languages are available.
+Fast Artificial Neural Network Library is a free open source neural
+network library, which implements multilayer artificial neural
+networks in C with support for both fully connected and sparsely
+connected networks.  Cross-platform execution in both fixed and
+floating point are supported. It includes a framework for easy
+handling of training data sets. It is easy to use, versatile, well
+documented, and fast. Bindings to more than 15 programming languages
+are available.
diff --git a/academic/fet/fet.SlackBuild b/academic/fet/fet.SlackBuild
index 91ec211628..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.43.1}
+VERSION=${VERSION:-5.49.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/fet/fet.info b/academic/fet/fet.info
index 697155db4d..81c5073643 100644
--- a/academic/fet/fet.info
+++ b/academic/fet/fet.info
@@ -1,8 +1,8 @@
 PRGNAM="fet"
-VERSION="5.43.1"
+VERSION="5.49.1"
 HOMEPAGE="https://www.lalescu.ro/liviu/fet/"
-DOWNLOAD="https://www.lalescu.ro/liviu/fet/download/fet-5.43.1.tar.bz2"
-MD5SUM="9d904384e36040378d77c42d425ff571"
+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/fet/slack-desc b/academic/fet/slack-desc
index 9a8953386d..7d6260d777 100644
--- a/academic/fet/slack-desc
+++ b/academic/fet/slack-desc
@@ -13,7 +13,7 @@ fet: the timetable of a school, high-school or university.
 fet: It uses a fast and efficient timetabling algorithm.
 fet: It is licensed under GNU GPL.
 fet:
-fet:
+fet: https://www.lalescu.ro/liviu/fet/
 fet:
 fet:
 fet:
diff --git a/academic/fiji/fiji.SlackBuild b/academic/fiji/fiji.SlackBuild
index bad800afcd..68c84ec4a6 100644
--- a/academic/fiji/fiji.SlackBuild
+++ b/academic/fiji/fiji.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fiji
-VERSION=${VERSION:-20191216_2110}
+VERSION=${VERSION:-20200902_2101}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -31,7 +31,7 @@ DIRNAM=Fiji.app
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i386 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,12 +42,10 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-UPDATER=imagej-updater-0.10.3.jar
-
 set -e
 
 # Stop if arch is not supported
-if [ "$ARCH" != "i386" ] && [ "$ARCH" != "x86_64" ]; then
+if [ "$ARCH" != "x86_64" ]; then
   printf "\n\n$ARCH is not supported... \n"
   exit 1
 fi
@@ -66,11 +64,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Rename the binary we need
-if [ "$ARCH" = "x86_64" ]; then
-  mv ImageJ-linux64 $PRGNAM
-else
-  mv ImageJ-linux32 $PRGNAM
-fi
+mv ImageJ-linux64 $PRGNAM
 
 # We will put here two tools, so they are not run at startup.
 mkdir -p unused
@@ -85,7 +79,7 @@ mv ../plugins/Scripts/Plugins/AutoRun/Check_Required_Update_Sites.js .
 # is your system, so if you want this functionality, then comment out
 # the line below. You can always "enable" it, by placing it in the jars
 # folder.
-mv ../jars/$UPDATER .
+mv ../jars/imagej-updater-* .
 
 cd ..
 
diff --git a/academic/fiji/fiji.info b/academic/fiji/fiji.info
index bab997b64e..20c501e557 100644
--- a/academic/fiji/fiji.info
+++ b/academic/fiji/fiji.info
@@ -1,10 +1,10 @@
 PRGNAM="fiji"
-VERSION="20191216_2110"
+VERSION="20200902_2101"
 HOMEPAGE="https://fiji.sc/"
-DOWNLOAD="https://downloads.imagej.net/fiji/archive/20191216-2110/fiji-nojre.tar.gz"
-MD5SUM="692b2b0920d5d86bf5dfb6661444f19d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://downloads.imagej.net/fiji/archive/20200902-2101/fiji-nojre.tar.gz"
+MD5SUM_x86_64="79c19275017206c662c4381dd43f7dc2"
 REQUIRES="jdk"
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
diff --git a/academic/fityk/README b/academic/fityk/README
index c3e6500623..423a6114f5 100644
--- a/academic/fityk/README
+++ b/academic/fityk/README
@@ -1,6 +1,7 @@
 Fityk (program for data processing and nonlinear curve fitting)
 
-Fityk [fi:tik] is a program for data processing and nonlinear curve fitting.
+Fityk [fi:tik] is a program for data processing and nonlinear curve
+fitting.
 
 Primarily used:
 
diff --git a/academic/flann/README b/academic/flann/README
index c47071aeab..23c6f4c075 100644
--- a/academic/flann/README
+++ b/academic/flann/README
@@ -1,7 +1,8 @@
-FLANN is a library for performing fast approximate nearest neighbor searches
-in high dimensional spaces. It contains a collection of algorithms we found
-to work best for nearest neighbor search and a system for automatically
-choosing the best algorithm and optimum parameters depending on the dataset.
+FLANN is a library for performing fast approximate nearest neighbor
+searches in high dimensional spaces. It contains a collection of
+algorithms we found to work best for nearest neighbor search and
+a system for automatically choosing the best algorithm and optimum
+parameters depending on the dataset.
 
-FLANN is written in C++ and contains bindings for the following languages:
-C, MATLAB and Python.
+FLANN is written in C++ and contains bindings for the following
+languages: C, MATLAB and Python.
diff --git a/academic/free42/README b/academic/free42/README
index 3c30f40e9f..dea3c02b7c 100644
--- a/academic/free42/README
+++ b/academic/free42/README
@@ -1,6 +1,7 @@
-Free42 is a re-implementation of the HP-42S calculator and the HP-82240 printer.
-It is a complete rewrite, not using any HP code, and it does not require an
-HP-42S ROM image.  Free42 is an Open Source project. The executables and source
-code are released under the terms of the GNU General Public License, version 2.
-All third-party code used in Free42 is either in the public domain, or licensed 
-under terms compatible with GPLv2, or used with the authors' permission. 
+Free42 is a re-implementation of the HP-42S calculator and the
+HP-82240 printer.  It is a complete rewrite, not using any HP code,
+and it does not require an HP-42S ROM image.  Free42 is an Open Source
+project. The executables and source code are released under the terms
+of the GNU General Public License, version 2.  All third-party code
+used in Free42 is either in the public domain, or licensed under terms
+compatible with GPLv2, or used with the authors' permission.
diff --git a/academic/freechartgeany/README b/academic/freechartgeany/README
deleted file mode 100644
index 82ef887a59..0000000000
--- a/academic/freechartgeany/README
+++ /dev/null
@@ -1,15 +0,0 @@
-Free Chart Geany is a multi platform software solution for market technical
-analysis and charting.
-
-Key features of Free Chart Geany:
-
-* Support for major technical analysis indicators like: Simple Moving Average,
-Exponential Moving Average, MACD, Relative Strength Index,  Bollinger Bands and
-Parabolic SAR.
-* Support for various Comma Separated Values  (CSV) formats like Metastock 7,
-Metastock 8, AMI Broker, Yahoo Finance, Google Finance and Standard CSV.
-* Support for various drawing and text objects like Labels, Trailing Text,
-Horizontal Lines, Vertical Lines, Trend Lines and Fibonacci Retracements.
-* Easy download of quotes from Yahoo Finance or Google Finance.
-* Free Chart Geany is a tab based application. You can manage the opened charts
-the same way you manage the open pages of your web browser.
diff --git a/academic/freechartgeany/freechartgeany.SlackBuild b/academic/freechartgeany/freechartgeany.SlackBuild
deleted file mode 100644
index 13ac323d36..0000000000
--- a/academic/freechartgeany/freechartgeany.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for freechartgeany
-
-# Copyright 2012-2016 Larry Hajali <larryhaja[at]gmail[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=freechartgeany
-VERSION=${VERSION:-2.0.3}
-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/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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 {} \;
-
-qmake QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-  -o Makefile FreeChartGeany.pro
-
-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 .desktop item and icons.
-sed -i "/^Icon/s|=.*|=${PRGNAM}|" $PKG/usr/share/applications/$PRGNAM.desktop
-rm -rf $PKG/usr/share/pixmaps
-for i in 16 32 64 128; do
-  install -D -m 0644 images/icons/logo${i}.png \
-    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING images/icons/Readme.rtf licenses/* $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/academic/freechartgeany/freechartgeany.info b/academic/freechartgeany/freechartgeany.info
deleted file mode 100644
index 265aec66fc..0000000000
--- a/academic/freechartgeany/freechartgeany.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="freechartgeany"
-VERSION="2.0.3"
-HOMEPAGE="http://freechartgeany.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/freechartgeany/freechartgeany-2.0.3.tar.gz"
-MD5SUM="20a084279ea44f99ffb5b18cebbcc217"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/academic/freechartgeany/slack-desc b/academic/freechartgeany/slack-desc
deleted file mode 100644
index e59bc3b7d8..0000000000
--- a/academic/freechartgeany/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------------------------------------------------------|
-freechartgeany: freechartgeany (market analysis tool)
-freechartgeany:
-freechartgeany: Free Chart Geany is a multi platform software solution for market
-freechartgeany: technical analysis and charting.
-freechartgeany:
-freechartgeany: Homepage: http://freechartgeany.sourceforge.net/
-freechartgeany:
-freechartgeany:
-freechartgeany:
-freechartgeany:
-freechartgeany:
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/README b/academic/gcompris-qt/README
new file mode 100644
index 0000000000..72416bbd9c
--- /dev/null
+++ b/academic/gcompris-qt/README
@@ -0,0 +1,18 @@
+GCompris is a high quality educational software suite, including
+a large number of activities for children aged 2 to 10. Some of the
+activities are game oriented, but nonetheless still educational.
+
+Currently GCompris offers more than 100 activities, and more are
+being developed.
+
+This is Qt5-based version of gcompris.
+
+NOTE:
+This software runs better on a platform that has OpenGL 2 support.
+If you do not have OpenGL 2 support, you have 2 options:
+- Add the following parameter "--software-renderer" at the end of
+  the last line of the script in /opt/gcompris-qt/bin/gcompris-qt.sh
+  This will affect all users, system-wide.
+- Replace "renderer=auto" into "renderer=software" in your local config,
+  located in ~/.config/gcompris-qt/gcompris-qt.conf
+  This will affect current user only.
diff --git a/academic/gcompris-qt/doinst.sh b/academic/gcompris-qt/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/academic/gcompris-qt/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/academic/gcompris-qt/gcompris-qt b/academic/gcompris-qt/gcompris-qt
new file mode 100644
index 0000000000..f77dbd5de6
--- /dev/null
+++ b/academic/gcompris-qt/gcompris-qt
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /opt/gcompris-qt/bin
+./gcompris-qt.sh
diff --git a/academic/gcompris-qt/gcompris-qt.SlackBuild b/academic/gcompris-qt/gcompris-qt.SlackBuild
new file mode 100644
index 0000000000..82f9a43aac
--- /dev/null
+++ b/academic/gcompris-qt/gcompris-qt.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for gcompris-qt
+
+# Copyright 2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# 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.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# 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.
+
+# This software is licensed under the GNU GENERAL PUBLIC LICENSE Version 3,
+# 29 June 2007
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+PRGNAM=gcompris-qt
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  ARCH="$( uname -m )"
+fi
+
+case "$ARCH" in
+  i?86)
+    ARCH=i586
+    SRCARCH=32
+    ;;
+  x86_64)
+    ARCH=x86_64
+    SRCARCH=64
+    ;;
+  *)
+    echo "Unsupported architecture"
+    exit 1
+    ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $PKG/opt/gcompris-qt $OUTPUT
+cd $PKG/opt/gcompris-qt
+
+sh $CWD/$PRGNAM-$VERSION-Linux${SRCARCH}.sh \
+  --prefix=$PKG/opt/gcompris-qt \
+  --exclude-subdir \
+  --skip-license
+
+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 -L $PKG \
+ \( -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 -m644 $CWD/gcompris-qt.desktop \
+  $PKG/usr/share/applications/gcompris-qt.desktop
+
+install -D -m644 $CWD/gcompris-qt.png \
+  $PKG/usr/share/icons/hicolor/256x256/apps/gcompris-qt.png
+
+install -D -m755 $CWD/gcompris-qt $PKG/usr/bin/gcompris-qt
+
+# move this here to catch anything that may not have proper ownership
+chown -R root:root $PKG
+
+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/academic/gcompris-qt/gcompris-qt.desktop b/academic/gcompris-qt/gcompris-qt.desktop
new file mode 100644
index 0000000000..6940f39c97
--- /dev/null
+++ b/academic/gcompris-qt/gcompris-qt.desktop
@@ -0,0 +1,88 @@
+[Desktop Entry]
+Name=GCompris
+Name[ca]=GCompris
+Name[cs]=GCompris
+Name[el]=GCompris
+Name[en_GB]=GCompris
+Name[es]=GCompris
+Name[et]=GCompris
+Name[eu]=GCompris
+Name[fr]=GCompris
+Name[gl]=GCompris
+Name[it]=GCompris
+Name[ml]=ജികോംപ�രി
+Name[nl]=GCompris
+Name[nn]=GCompris
+Name[pl]=GCompris
+Name[pt]=GCompris
+Name[pt_BR]=GCompris
+Name[ro]=GCompris
+Name[sk]=GCompris
+Name[sv]=GCompris
+Name[uk]=GCompris
+Name[x-test]=xxGComprisxx
+Name[zh_TW]=GCompris
+GenericName=Educational Game
+GenericName[ca]=Joc educatiu
+GenericName[cs]=Výuková hra
+GenericName[el]=Εκπαιδευτικό παιχνίδι
+GenericName[en_GB]=Educational Game
+GenericName[es]=Juego educativo
+GenericName[et]=Hariv mäng
+GenericName[eu]=Hezkuntza-jokoa
+GenericName[fr]=Jeu éducatif
+GenericName[gl]=Xogo educativo
+GenericName[it]=Gioco didattico
+GenericName[ml]=വിദ�യാഭ�യാസപരമായ കളി
+GenericName[nl]=Educatief spel
+GenericName[nn]=Leik-og-lær-spel
+GenericName[pl]=Gra edukacyjna
+GenericName[pt]=Jogo Educativo
+GenericName[pt_BR]=Jogo educacional
+GenericName[ro]=Joc educațional
+GenericName[sk]=Výuková hra
+GenericName[sv]=Pedagogiskt spel
+GenericName[uk]=О�вітн� гра
+GenericName[x-test]=xxEducational Gamexx
+GenericName[zh_CN]=教育游�
+GenericName[zh_TW]=教育�戲
+Comment=Multi-Activity Educational game for children 2 to 10
+Comment[br]=C'hoari kelennadel gant oberezhioù a bep seurt evit ar vugale etre 2 ha 10 vloaz
+Comment[ca]=Joc educatiu amb múltiples activitats per a infants de 2 a 10 anys
+Comment[ca@valencia]=Joc educatiu amb múltiples activitats per a infants de 2 a 10 anys
+Comment[de]=Lernspiel mit vielen Aktivitäten für Kinder von 2 bis 10 Jahren
+Comment[el]=Εκπαιδευτικό παιχνίδι πολλαπλών δ�αστη�ιοτήτων για ηλικίες 2 έως 10 ετών
+Comment[en_GB]=Multi-Activity Educational game for children 2 to 10
+Comment[es]=Juego educativo multiactividad para niños de 2 a 10 años
+Comment[et]=Rohkete tegevustega hariv mäng lastele vanuses 2-10
+Comment[eu]=Jarduera anitzeko Hezkuntza-jokoa 2 eta 10 urte arteko haurrentzat
+Comment[fi]=Useampitoimintoinen opettavainen peli 2–10-vuotiaille lapsille
+Comment[fr]=Jeu éducatif multi-activités pour les enfants de 2 à 10 ans
+Comment[gl]=Xogo educativo con varias actividades para nenos entre 2 e 10 anos
+Comment[hi]=२ से १० वर�ष के बच�चों के लि� विभिन�न क�रिया�ं वाला शेक�षणिक खेल
+Comment[id]=GCompris adalah kumpulan permainan kegiatan pendidikan untuk anak umur 2  sampai 10 tahun
+Comment[it]=Gioco didattico multi-attività per bambini da 2 a 10 anni
+Comment[ko]=2-10세 어린�를 위한 다양한 활�� 있는 �육용 게임
+Comment[ml]=2 മ�തൽ 10 വയസ�സ�വരെയ�ള�ള ക�ട�ടികൾക�ക� വിവിധ പ�രവർത�തനങ�ങളിലൂടെ പഠിക�കാനായ�ള�ള കളി.
+Comment[nl]=Educatief spel met meerdere activiteiten voor kinderen van 2 tot 10
+Comment[nn]=Leik-og-lærspel med mange aktivitetar – for barn frå 2 til 10 år
+Comment[pl]=Gra edukacyjna z wieloma aktywnościami dla dzieci w wieku od 2 do 10 lat
+Comment[pt]=Jogo educativo multi-actividades para crianças dos 2 aos 10 anos
+Comment[pt_BR]=Jogo educacional com várias atividades para crianças de 2 a 10 anos
+Comment[ro]=Joc educațional cu activități multiple pentru copii între 2 și 10 ani
+Comment[ru]=Обучающие игры дл� детей от 2 до 10 лет
+Comment[sk]=Viac-aktivitová výuková hra pre deti od 2 do 10 rokov
+Comment[sl]=Izobraževalna igra z ve� dejavnostmi za otroke med drugim in desetim letom starosti
+Comment[sv]=Pedagogiskt multiaktivitetsspel för barn från 2 till 10 år
+Comment[tr]=2-10 yaş arası çocuklar için Çoklu Etkileşimli Eğitici oyun
+Comment[uk]=�абір о�вітніх ігор дл� дітей від 2 до 10 років
+Comment[x-test]=xxMulti-Activity Educational game for children 2 to 10xx
+Comment[zh_CN]=为 2 到 10 �儿童准备的多功能教育游�
+Comment[zh_TW]=為 2-10 歲孩�設計的教育�戲
+Exec=gcompris-qt
+Icon=gcompris-qt
+Terminal=false
+Type=Application
+Categories=Education;Game;KidsGame;
+StartupNotify=true
+X-DocPath=gcompris/index.html
diff --git a/academic/gcompris-qt/gcompris-qt.info b/academic/gcompris-qt/gcompris-qt.info
new file mode 100644
index 0000000000..91ca5b1c07
--- /dev/null
+++ b/academic/gcompris-qt/gcompris-qt.info
@@ -0,0 +1,10 @@
+PRGNAM="gcompris-qt"
+VERSION="1.1"
+HOMEPAGE="http://gcompris.net/"
+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/gcompris-qt/gcompris-qt.png b/academic/gcompris-qt/gcompris-qt.png
new file mode 100644
index 0000000000..40cec079f4
--- /dev/null
+++ b/academic/gcompris-qt/gcompris-qt.png
diff --git a/academic/gcompris-qt/slack-desc b/academic/gcompris-qt/slack-desc
new file mode 100644
index 0000000000..995c085f2f
--- /dev/null
+++ b/academic/gcompris-qt/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------------------------------------------------------|
+gcompris-qt: gcompris-qt (an educational software suite)
+gcompris-qt:
+gcompris-qt: GCompris is a high quality educational software suite, including
+gcompris-qt: a large number of activities for children aged 2 to 10. Some of the
+gcompris-qt: activities are game orientated, but nonetheless still educational.
+gcompris-qt:
+gcompris-qt: Currently GCompris offers more than 100 activities, and more are
+gcompris-qt: being developed. 
+gcompris-qt:
+gcompris-qt: Homepage: http://gcompris.net/
+gcompris-qt:
diff --git a/academic/gcompris/README b/academic/gcompris/README
index ec155c2ea3..63345e597b 100644
--- a/academic/gcompris/README
+++ b/academic/gcompris/README
@@ -1,5 +1,5 @@
-GCompris is an educational software suite comprising of numerous activities
-for children aged 2 to 10. Some of the activities are game oriented, but
-nonetheless still educational. Currently GCompris offers in excess of 140
-activities and more are being developed. GCompris currently is translated
-in more than 40 languages.
+GCompris is an educational software suite comprising of numerous
+activities for children aged 2 to 10. Some of the activities are game
+oriented, but nonetheless still educational. Currently GCompris offers
+in excess of 140 activities and more are being developed. GCompris
+currently is translated into more than 40 languages.
diff --git a/academic/geda-gaf/README b/academic/geda-gaf/README
index 58eabd38cd..d5484fbf37 100644
--- a/academic/geda-gaf/README
+++ b/academic/geda-gaf/README
@@ -1,8 +1,8 @@
-The gEDA project has produced and continues working on a full GPL'd suite 
-and toolkit of Electronic Design Automation tools.  These tools are used for 
-electrical circuit design, schematic capture, simulation, prototyping, and 
-production.  Currently, the gEDA project offers a mature suite of free 
-software applications for electronics design, including schematic capture, 
-attribute management, bill of materials (BOM) generation, netlisting into 
-over 20 netlist formats, analog and digital simulation, and printed circuit 
-board (PCB) layout.
+The gEDA project has produced and continues working on a full GPL'd
+suite and toolkit of Electronic Design Automation tools.  These tools
+are used for electrical circuit design, schematic capture, simulation,
+prototyping, and production.  Currently, the gEDA project offers a
+mature suite of free software applications for electronics design,
+including schematic capture, attribute management, bill of materials
+(BOM) generation, netlisting into over 20 netlist formats, analog and
+digital simulation, and printed circuit board (PCB) layout.
diff --git a/academic/genometools/genometools.SlackBuild b/academic/genometools/genometools.SlackBuild
index f4af4db0f9..0814b7dc9e 100644
--- a/academic/genometools/genometools.SlackBuild
+++ b/academic/genometools/genometools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for genometools
 
-# Copyright 2014-2018 Petar Petrov slackalaxy@gmail.com
+# Copyright 2014-2020 Petar Petrov slackalaxy@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=genometools
-VERSION=${VERSION:-1.5.10}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,9 +72,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 {} \;
 
-# Fix library path
+# Fix library and man pages path
 sed -i "s:lib/libgenometools:lib${LIBDIRSUFFIX}/libgenometools:g" Makefile
 sed -i "s:\$(prefix)/lib:\$(prefix)/lib${LIBDIRSUFFIX}:g" Makefile
+sed -i "s:/share/man/:/man/:g" Makefile
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -90,10 +91,6 @@ cd gtpython
 python setup.py install --root=$PKG
 cd ..
 
-# We don't need this
-rm -rf $PKG/usr/bin/genometools-config
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libgenometools.a
-
 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/genometools/genometools.info b/academic/genometools/genometools.info
index 5026cd2a29..7692e762e8 100644
--- a/academic/genometools/genometools.info
+++ b/academic/genometools/genometools.info
@@ -1,8 +1,8 @@
 PRGNAM="genometools"
-VERSION="1.5.10"
+VERSION="1.6.1"
 HOMEPAGE="http://genometools.org/"
-DOWNLOAD="http://genometools.org/pub/genometools-1.5.10.tar.gz"
-MD5SUM="2c654825746692b968e1c58873b6a3d2"
+DOWNLOAD="http://genometools.org/pub/genometools-1.6.1.tar.gz"
+MD5SUM="1dc80df17be32973266f5a3601fc64b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/gerbv/README b/academic/gerbv/README
index df4a71fc61..9cd537e588 100644
--- a/academic/gerbv/README
+++ b/academic/gerbv/README
@@ -2,9 +2,9 @@ Gerbv is one of the utilities affiliated with the gEDA project, an
 umbrella organization dedicated to producing free software tools for
 electronic design.
 
-Gerbv is a viewer for Gerber RS-274X files, Excellon drill files, and
-CSV pick-and-place files. It is a native Linux application, and it runs
-on many common unix platforms. Gerbv is free / open-source software. The
-core functionality of gerbv is located in a separate library (libgerbv),
-allowing developers to include Gerber parsing/editing/exporting/rendering
-into other programs.
+Gerbv is a viewer for Gerber RS-274X files, Excellon drill files,
+and CSV pick-and-place files. It is a native Linux application, and
+it runs on many common unix platforms. Gerbv is free / open-source
+software. The core functionality of gerbv is located in a separate
+library (libgerbv), allowing developers to include Gerber parsing,
+editing, exporting, rendering into other programs.
diff --git a/academic/getdp/README b/academic/getdp/README
index dd3d1673d9..3dab37d132 100644
--- a/academic/getdp/README
+++ b/academic/getdp/README
@@ -1,3 +1,8 @@
 GetDP (A General Environment for the Treatment of Discrete Problems)
 
-GetDP is a free finite element solver using mixed elements to discretize de Rham-type complexes in one, two and three dimensions. The main feature of GetDP is the closeness between the input data defining discrete problems (written by the user in ASCII data files) and the symbolic mathematical expressions of these problems.
+GetDP is a free finite element solver using mixed elements
+to discretize de Rham-type complexes in one, two and three
+dimensions. The main feature of GetDP is the closeness between
+the input data defining discrete problems (written by the user in
+ASCII data files) and the symbolic mathematical expressions of these
+problems.
diff --git a/academic/getdp/slack-desc b/academic/getdp/slack-desc
index 7e8b01e9fd..bed2d36f97 100644
--- a/academic/getdp/slack-desc
+++ b/academic/getdp/slack-desc
@@ -5,15 +5,15 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-     |-----handy-ruler---------------------------------------------------------|
+     |-----handy-ruler------------------------------------------------------|
 getdp: getdp (Finite Element Solver)
 getdp:
-getdp: GetDP a free finite element solver using mixed elements to discretize de
-getdp: Rham-type complexes in one, two and three dimensions. The main feature of
-getdp: GetDP is the closeness between the input data defining discrete problems 
-getdp: (written by the user in ASCII data files) and the symbolic mathematical 
-getdp: expressions of these problems.
-getdp:
-getdp: GetDP is distributed under the terms of the GNU General Public License.
-getdp:
+getdp: GetDP a free finite element solver using mixed elements
+getdp: to discretize de Rham-type complexes in one, two and three
+getdp: dimensions. The main feature of GetDP is the closeness between
+getdp: the input data defining discrete problems (written by the user
+getdp: in ASCII data files) and the symbolic mathematical expressions
+getdp: of these problems.
 getdp:
+getdp: GetDP is distributed under the terms of the GNU General Public
+getdp: License.
diff --git a/academic/ggobi/README b/academic/ggobi/README
index 2a325c43df..1bb21d26b4 100644
--- a/academic/ggobi/README
+++ b/academic/ggobi/README
@@ -1,7 +1,8 @@
-GGobi is an interactive, direct manipulation tool for visualizing high
-dimensional data across linked plots.  It provides highly dynamic and 
-interactive graphics such as tours, as well as familiar graphics such 
-as the scatterplot, barchart and parallel coordinates plots.  Plots are 
-interactive and linked with brushing and identification. The GUI is built 
-using Gtk+.  It reads data in regular ASCII format and more richly using 
-an XML format.  Plugins for other formats are also available.
+GGobi is an interactive, direct manipulation tool for visualizing
+high dimensional data across linked plots.  It provides highly dynamic
+and interactive graphics such as tours, as well as familiar graphics
+such as the scatterplot, barchart and parallel coordinates plots.
+Plots are interactive and linked with brushing and identification. The
+GUI is built using Gtk+.  It reads data in regular ASCII format and
+more richly using an XML format.  Plugins for other formats are also
+available.
diff --git a/academic/gmsh/README b/academic/gmsh/README
index 4414b6009d..e2980522f6 100644
--- a/academic/gmsh/README
+++ b/academic/gmsh/README
@@ -1,7 +1,22 @@
-Gmsh (A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities)
+Gmsh (A three-dimensional finite element mesh generator with built-in
+pre- and post-processing facilities)
 
-Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor. Its design goal is to provide a fast, light and user-friendly meshing tool with parametric input and advanced visualization capabilities. Gmsh is built around four modules: geometry, mesh, solver and post-processing. The specification of any input to these modules is done either interactively using the graphical user interface, in ASCII text files using Gmsh's own scripting language (.geo files), or using the C++, C, Python or Julia Application Programming Interface (API).
+Gmsh is an open source 3D finite element mesh generator with a
+built-in CAD engine and post-processor. Its design goal is to provide
+a fast, light and user-friendly meshing tool with parametric input
+and advanced visualization capabilities. Gmsh is built around four
+modules: geometry, mesh, solver and post-processing. The specification
+of any input to these modules is done either interactively using
+the graphical user interface, in ASCII text files using Gmsh's own
+scripting language (.geo files), or using the C++, C, Python or Julia
+Application Programming Interface (API).
 
-See this general presentation for a high-level overview of Gmsh and recent developments, the screencasts for a quick tour of Gmsh's graphical user interface, and the reference manual for a more thorough overview of Gmsh's capabilities, some frequently asked questions and the documentation of the C++, C, Python and Julia API.
+See this general presentation for a high-level overview of Gmsh
+and recent developments, the screencasts for a quick tour of Gmsh's
+graphical user interface, and the reference manual for a more thorough
+overview of Gmsh's capabilities, some frequently asked questions and
+the documentation of the C++, C, Python and Julia API.
 
-The source code repository contains many examples written using both the built-in script language (see e.g. the tutorials and demos) and the API. 
+The source code repository contains many examples written using both
+the built-in script language (see e.g. the tutorials and demos) and
+the API.
diff --git a/academic/gmsh/slack-desc b/academic/gmsh/slack-desc
index f88f19320c..35305eed9d 100644
--- a/academic/gmsh/slack-desc
+++ b/academic/gmsh/slack-desc
@@ -5,15 +5,15 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-    |-----handy-ruler---------------------------------------------------------|
+    |-----handy-ruler------------------------------------------------------|
 gmsh: gmsh (finite element mesh generator)
 gmsh:
 gmsh: Gmsh is an automatic three-dimensional finite element mesh generator
 gmsh: with built-in pre- and post-processing facilities.
-gmsh: 
-gmsh: Gmsh is copyright (C) 1997-2019 C. Geuzaine and J.-F. Remacle, and is
-gmsh: distributed under the terms of the GNU General Public License, Version 2
-gmsh: or later, with an exception to allow for easier linking with external
-gmsh: libraries.
+gmsh:
+gmsh: Gmsh is copyright (C) 1997-2019 C. Geuzaine and J.-F. Remacle,
+gmsh: and is distributed under the terms of the GNU General Public
+gmsh: License, Version 2 or later, with an exception to allow for
+gmsh: easier linking with external libraries.
 gmsh:
 gmsh:
diff --git a/academic/gnucap/README b/academic/gnucap/README
index a13ef46e8f..c03f05979f 100644
--- a/academic/gnucap/README
+++ b/academic/gnucap/README
@@ -1,5 +1,5 @@
-Gnucap is a modern "post-spice" analog and mixed signal circuit simulator.
-Gnucap is designed so it can eventually replace Spice. Today, it can
-replace Spice in some applications. There are some significant technical
-advantages. It is a work in progress. New features are added regularly
-as time and demand permits.
+Gnucap is a modern "post-spice" analog and mixed signal circuit
+simulator.  Gnucap is designed so it can eventually replace
+Spice. Today, it can replace Spice in some applications. There are
+some significant technical advantages. It is a work in progress. New
+features are added regularly as time and demand permits.
diff --git a/academic/grace/README b/academic/grace/README
index 0e60c72cf5..8d1c5d7724 100644
--- a/academic/grace/README
+++ b/academic/grace/README
@@ -2,10 +2,11 @@ Grace is a WYSIWYG tool to make two-dimensional plots of numerical
 data. It runs under various (if not all) flavors of Unix with X11 and
 M*tif (LessTif or Motif). It also runs under VMS, OS/2, and Windows
 (95/98/NT/2000/XP). Its capabilities are roughly similar to GUI-based
-programs like Sigmaplot or Microcal Origin plus script-based tools
-like Gnuplot or Genplot. Its strength lies in the fact that it
-combines the convenience of a graphical user interface with the power
-of a scripting language which enables it to do sophisticated
-calculations or perform automated tasks.
+programs like Sigmaplot or Microcal Origin plus script-based tools like
+Gnuplot or Genplot. Its strength lies in the fact that it combines the
+convenience of a graphical user interface with the power of a scripting
+language which enables it to do sophisticated calculations or perform
+automated tasks.
 
-Grace is derived from Xmgr (a.k.a. ACE/gr), originally written by Paul Turner.
+Grace is derived from Xmgr (a.k.a. ACE/gr), originally written by Paul
+Turner.
diff --git a/academic/gri/gri.info b/academic/gri/gri.info
index 4ca61c4974..6e4ee42dde 100644
--- a/academic/gri/gri.info
+++ b/academic/gri/gri.info
@@ -1,6 +1,6 @@
 PRGNAM="gri"
 VERSION="2.12.23"
-HOMEPAGE="https://gri.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/p/gri/wiki/Home/"
 DOWNLOAD="https://github.com/dankelley/gri/archive/v2.12.23/gri-2.12.23.tar.gz"
 MD5SUM="7594140fdd1ea1ccf890c2d7ede0e1e9"
 DOWNLOAD_x86_64=""
diff --git a/academic/grpn/README b/academic/grpn/README
index af0f57f7b3..ebe90d81ce 100644
--- a/academic/grpn/README
+++ b/academic/grpn/README
@@ -1,9 +1,10 @@
-GRPN is a graphical reverse polish notation (RPN) calculator.
-GRPN is written in C and uses the GIMP Toolkit (GTK) on top of X11.  GRPN
-was developed under Linux but has also been tested under SunOS and Solaris.
-It should work with almost any UNIX, though. GRPN works with real numbers
-and complex numbers.  Numbers can be displayed in 4 different radix modes,
-and complex numbers can be displayed in either Cartesian or polar form.
+GRPN is a graphical reverse polish notation (RPN) calculator.  GRPN is
+written in C and uses the GIMP Toolkit (GTK) on top of X11.  GRPN was
+developed under Linux but has also been tested under SunOS and Solaris.
+It should work with almost any UNIX, though. GRPN works with real
+numbers and complex numbers.  Numbers can be displayed in 4 different
+radix modes, and complex numbers can be displayed in either Cartesian
+or polar form.
 
-GRPN uses a stack and reverse polish notation to evaluate expressions.  The
-stack in GRPN is infinite and limited only by available memory.
+GRPN uses a stack and reverse polish notation to evaluate expressions.
+The stack in GRPN is infinite and limited only by available memory.
diff --git a/academic/gtkwave/README b/academic/gtkwave/README
index fa42f8d4de..6c030894b0 100644
--- a/academic/gtkwave/README
+++ b/academic/gtkwave/README
@@ -1,2 +1,2 @@
-GTKWave is a fully featured GTK+ based wave viewer which reads LXT, LXT2, 
-VZT, and GHW files as well as standard Verilog VCD EVCD files.
+GTKWave is a fully featured GTK+ based wave viewer which reads LXT,
+LXT2, VZT, and GHW files as well as standard Verilog VCD EVCD files.
diff --git a/academic/gwyddion/README b/academic/gwyddion/README
index 3b8a4dee6f..6821f7110c 100644
--- a/academic/gwyddion/README
+++ b/academic/gwyddion/README
@@ -1,7 +1,7 @@
 Gwyddion is a modular program for SPM (scanning probe microscopy) data
 visualization and analysis. Primarily it is intended for analysis of
 height fields obtained by means of scanning probe microscopy techniques
-(AFM, MFM, STM, SNOM/NSOM), however it can be generally used for any other
-height field and image analysis.
+(AFM, MFM, STM, SNOM/NSOM), however it can be generally used for any
+other height field and image analysis.
 
 libminizip, libwebp and cfitsio are the optional dependencies.
diff --git a/academic/gwyddion/doinst.sh b/academic/gwyddion/doinst.sh
index 36863cab7d..8a5ffa8af5 100644
--- a/academic/gwyddion/doinst.sh
+++ b/academic/gwyddion/doinst.sh
@@ -1,12 +1,3 @@
-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
-}
-
-schema_install gwyddion-thumbnailer.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/academic/gwyddion/gwyddion.SlackBuild b/academic/gwyddion/gwyddion.SlackBuild
index 9537fb157d..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.55}
+VERSION=${VERSION:-2.58}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/gwyddion/gwyddion.info b/academic/gwyddion/gwyddion.info
index ab4ec07b9d..13e0741611 100644
--- a/academic/gwyddion/gwyddion.info
+++ b/academic/gwyddion/gwyddion.info
@@ -1,8 +1,8 @@
 PRGNAM="gwyddion"
-VERSION="2.55"
+VERSION="2.58"
 HOMEPAGE="http://gwyddion.net"
-DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.55.tar.xz"
-MD5SUM="91d7f7cdc2fb46ec639f87349425d3d2"
+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/h5utils/h5utils.info b/academic/h5utils/h5utils.info
index aa2cd02582..a600f211b9 100644
--- a/academic/h5utils/h5utils.info
+++ b/academic/h5utils/h5utils.info
@@ -2,7 +2,7 @@ PRGNAM="h5utils"
 VERSION="1.13.1"
 HOMEPAGE="https://github.com/NanoComp/h5utils"
 DOWNLOAD="https://github.com/NanoComp/h5utils/releases/download/1.13.1/h5utils-1.13.1.tar.gz"
-MD5SUM="f4d3eac775b6c2a18eac56138e659c37"
+MD5SUM="b116cbb79ea22bbd1640cd8a1290f6f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="hdf5"
diff --git a/academic/io_lib/io_lib.SlackBuild b/academic/io_lib/io_lib.SlackBuild
index 43a72cb84f..9a6f5a76d6 100644
--- a/academic/io_lib/io_lib.SlackBuild
+++ b/academic/io_lib/io_lib.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=io_lib
-VERSION=${VERSION:-1.14.11}
+VERSION=${VERSION:-1.14.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/io_lib/io_lib.info b/academic/io_lib/io_lib.info
index ba3fb88a0c..246c55cff8 100644
--- a/academic/io_lib/io_lib.info
+++ b/academic/io_lib/io_lib.info
@@ -1,8 +1,8 @@
 PRGNAM="io_lib"
-VERSION="1.14.11"
+VERSION="1.14.13"
 HOMEPAGE="https://github.com/jkbonfield/io_lib"
-DOWNLOAD="https://github.com/jkbonfield/io_lib/releases/download/io_lib-1-14-11/io_lib-1.14.11.tar.gz"
-MD5SUM="90fa0b6ad125e033a9b2c48b3fe4ac0a"
+DOWNLOAD="https://github.com/jkbonfield/io_lib/releases/download/io_lib-1-14-13/io_lib-1.14.13.tar.gz"
+MD5SUM="5b15a68b9dac242a4e5c83900e330d7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/jalview/jalview b/academic/jalview/jalview
index 31813c2c2a..cfdcceef1f 100644
--- a/academic/jalview/jalview
+++ b/academic/jalview/jalview
@@ -1,16 +1,2 @@
 #!/bin/sh
-
-# This wrapper script is taken from Arch Linux AUR entry of jalview.
-# https://aur.archlinux.org/packages/jalview/
-# Maintainer of the PKGBUILD is Stefan Seemayer.
-
-progname="jalview"
-mainclass="jalview.bin.Jalview"
-basedir="/usr/share/java/$progname"
-
-# build classpath: all jars in $basedir
-cp=$( ls $basedir/*.jar | xargs echo | sed "s/ /:/g" );
-
-
-# run jar
-"$JAVA_HOME/bin/java" -cp $cp $mainclass
+java -jar /opt/jalview/jalview
diff --git a/academic/jalview/jalview.SlackBuild b/academic/jalview/jalview.SlackBuild
index 1ec9acf47f..30d2cdbe8f 100644
--- a/academic/jalview/jalview.SlackBuild
+++ b/academic/jalview/jalview.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jalview
 
-# Copyright 2013-2016 Petar Petrov slackalaxy@gmail.com
+# Copyright 2013-2020 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# With help from the jalview PKGBUILD at Arch linux AUR:
-# https://aur.archlinux.org/packages/jalview/
-
 PRGNAM=jalview
-VERSION=${VERSION:-2.10.0b1}
+VERSION=${VERSION:-2.11.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
+JAVA=j1.8
+
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -42,27 +41,11 @@ 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 $PKG/usr/share/java/$PRGNAM
-cp -a *.jar $PKG/usr/share/java/$PRGNAM
 
-# The wrapper is from Arch. Thank you!
+install -D -m755 $CWD/$PRGNAM-all-$VERSION-$JAVA.jar $PKG/opt/$PRGNAM/$PRGNAM
 install -D -m755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  building.html exampleFeatures.txt LICENSE README_IA \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/TheJalviewTutorial_screen.pdf > $PKG/usr/doc/$PRGNAM-$VERSION/Tutorial.pdf
 cat $CWD/References > $PKG/usr/doc/$PRGNAM-$VERSION/References
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/jalview/jalview.info b/academic/jalview/jalview.info
index 928c20cf89..499422a4d6 100644
--- a/academic/jalview/jalview.info
+++ b/academic/jalview/jalview.info
@@ -1,10 +1,8 @@
 PRGNAM="jalview"
-VERSION="2.10.0b1"
+VERSION="2.11.1.0"
 HOMEPAGE="http://www.jalview.org/"
-DOWNLOAD="http://sourceforge.net/projects/sboppetrov/files/JalView/2.10/jalview-2.10.0b1.tar.gz \
-	http://sourceforge.net/projects/sboppetrov/files/JalView/TheJalviewTutorial_screen.pdf"
-MD5SUM="fb5b30202210e21647ecc7da5242bab3 \
-	5e2f8da8f2528049f055263aecd2f8af"
+DOWNLOAD="http://www.jalview.org/getdown/release/jalview-all-2.11.1.0-j1.8.jar"
+MD5SUM="7f79b598a5bfd25d89adf6fe8c9b98f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/academic/jpicedt/README b/academic/jpicedt/README
index ddc93e1dee..2c578cf5bc 100644
--- a/academic/jpicedt/README
+++ b/academic/jpicedt/README
@@ -1,12 +1,14 @@
-jPicEdt is a software aimed at alleviating the burden of using PSTricks, 
-eepic or LaTeX's picture environment macros in a LaTeX file. It allows the 
-user to draw graphical objects using graphic primitives (e.g. splines, 
-arcs, polygons,...), position them easily with the mouse, and add text 
-using LaTeX/PSTricks box commands (e.g. dashbox, psframebox,...). 
+jPicEdt is a software aimed at alleviating the burden of using
+PSTricks, eepic or LaTeX's picture environment macros in a LaTeX
+file. It allows the user to draw graphical objects using graphic
+primitives (e.g. splines, arcs, polygons,...), position them easily
+with the mouse, and add text using LaTeX/PSTricks box commands
+(e.g. dashbox, psframebox,...).
 
 This is a repackaging of the JPicEdt distribution jar archive.
 
-There is a required pstricks-add.{sty,tex} available in add-ons/Tex-macros 
-of the source.  The versions supplied with Slackware's tetex package are 
-newer and seem to work fine by default; however, if you encounter any problems
-with it, you might try using the files supplied with JPicEdt.
+There is a required pstricks-add.{sty,tex} available in
+add-ons/Tex-macros of the source.  The versions supplied with
+Slackware's tetex package are newer and seem to work fine by default;
+however, if you encounter any problems with it, you might try using the
+files supplied with JPicEdt.
diff --git a/academic/kiwisolver/README b/academic/kiwisolver/README
index 7773aa35ea..96743769c0 100644
--- a/academic/kiwisolver/README
+++ b/academic/kiwisolver/README
@@ -1,7 +1,7 @@
-This is an efficient C++ implementation of the Cassowary constraint solving
-algorithm. Kiwi(solver) is an implementation of the algorithm based on the
-seminal Cassowary paper. It is not a refactoring of the original C++ solver.
-Kiwi(solver) has been designed from the ground up to be lightweight and fast.
-It ranges from 10x to 500x faster than the original Cassowary solver with
-typical use cases gaining a 40x improvement. Memory savings are consistently
-> 5x.
+This is an efficient C++ implementation of the Cassowary constraint
+solving algorithm. Kiwi(solver) is an implementation of the algorithm
+based on the seminal Cassowary paper. It is not a refactoring of the
+original C++ solver.  Kiwi(solver) has been designed from the ground
+up to be lightweight and fast.  It ranges from 10x to 500x faster than
+the original Cassowary solver with typical use cases gaining a 40x
+improvement. Memory savings are consistently > 5x.
diff --git a/academic/klu/README b/academic/klu/README
index fe8941f406..e3da56e0c7 100644
--- a/academic/klu/README
+++ b/academic/klu/README
@@ -1,7 +1,7 @@
-KLU is a sparse LU factorization algorithm well-suited for use in circuit
-simulation.
+KLU is a sparse LU factorization algorithm well-suited for use in
+circuit simulation.
 
 This package is part of SuiteSparse.
 
-CHOLMOD is an optional dependency and will be used if found.
-It is primarily used for this package's test suite.
+CHOLMOD is an optional dependency and will be used if found.  It is
+primarily used for this package's test suite.
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/lalnview/README b/academic/lalnview/README
index e91c30683f..364d8d0378 100644
--- a/academic/lalnview/README
+++ b/academic/lalnview/README
@@ -5,6 +5,13 @@ similarities between the two sequences. Blocks of similarity between
 the two sequences are colored according to the degree of identity
 between segments.
 
+A suitable alignment tool for protein sequences is SIM at ExPASy:
+https://web.expasy.org/sim/
+
+SIM finds a user-defined number of best non-intersecting alignments
+between two protein sequences or within a sequence. Once the alignment
+is computed, you can view it using LalnView.
+
 For details and citation:
 Duret, L., Gasteiger, E. and Perriere, G. (1996) LalnView: a
 graphical viewer for pairwise sequence alignments. Comput. Applic.
diff --git a/academic/lalnview/lalnview.SlackBuild b/academic/lalnview/lalnview.SlackBuild
index cb92a3bcc3..3ba95c44d5 100644
--- a/academic/lalnview/lalnview.SlackBuild
+++ b/academic/lalnview/lalnview.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lalnview
 
-# Copyright 2011-2016 Petar Petrov slackalaxy@gmail.com
+# Copyright 2011-2020 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,12 +26,14 @@
 
 PRGNAM=lalnview
 VERSION=${VERSION:-3.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
+SRCTAR=sources20050615.tar
+
 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 +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,24 +66,24 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-tar xvf $CWD/sources20050615.tar
+tar xvf $CWD/$SRCTAR
 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 {} \;
 
 # Point to the correct place of lalnview.help
-sed -i "s:lalnview.help:/usr/doc/$PRGNAM-$VERSION/lalnview.help:" MF_MainWindow.cxx
+sed -i "s:$PRGNAM.help:/usr/doc/$PRGNAM-$VERSION/$PRGNAM.help:" MF_MainWindow.cxx
 
 OPT="$SLKCFLAGS" make
-install -D -m755 lalnview $PKG/usr/bin/$PRGNAM
+install -D -m755 $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
 
-# Couldn't find an icon, so i made one myself. I know it sucks.
+# Couldn't find an icon, so i made one myself.
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 cp $CWD/$PRGNAM.png $PKG/usr/share/pixmaps
diff --git a/academic/lalnview/lalnview.png b/academic/lalnview/lalnview.png
index f4cc77c61c..f528cc3d46 100644
--- a/academic/lalnview/lalnview.png
+++ b/academic/lalnview/lalnview.png
diff --git a/academic/lapack95/lapack95.SlackBuild b/academic/lapack95/lapack95.SlackBuild
index 6a4a9e7815..92c1139843 100644
--- a/academic/lapack95/lapack95.SlackBuild
+++ b/academic/lapack95/lapack95.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lapack95
 
-# Written by Pablo Santamaría (pablosantamaria@gmail.com)
+# Written by Pablo Santamaría (pablosantamaria@gmail.com)
 # Copyright 2017 Ekin Akoglu, Erdemli, Mersin, Turkey
 # All rights reserved.
 #
diff --git a/academic/lapacke/README b/academic/lapacke/README
index 56e7a29488..118c2449de 100644
--- a/academic/lapacke/README
+++ b/academic/lapacke/README
@@ -1,10 +1,12 @@
 LAPACKE provides a native C interface to LAPACK routines available at
-www.netlib.org/lapack to facilitate usage of LAPACK functionality for C
-programmers.
+www.netlib.org/lapack to facilitate usage of LAPACK functionality for
+C programmers.
 
-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.
+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.
 
-To build a static library in addition to the shared library,
-pass STATIC=yes to the script.
+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/latex2html/latex2html.SlackBuild b/academic/latex2html/latex2html.SlackBuild
index 31b157c4bb..5509805331 100644
--- a/academic/latex2html/latex2html.SlackBuild
+++ b/academic/latex2html/latex2html.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=latex2html
-VERSION=${VERSION:-2019.2}
+VERSION=${VERSION:-2020}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,7 +80,9 @@ CXXFLAGS="$SLKCFLAGS" \
    --with-perl=/usr/bin/perl \
   --enable-eps \
   --enable-gif \
-  --enable-png \
+  --enable-svg \
+  --enable-pk \
+  --enable-pipes \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
diff --git a/academic/latex2html/latex2html.info b/academic/latex2html/latex2html.info
index b732075636..199a5829f2 100644
--- a/academic/latex2html/latex2html.info
+++ b/academic/latex2html/latex2html.info
@@ -1,8 +1,8 @@
 PRGNAM="latex2html"
-VERSION="2019.2"
+VERSION="2020"
 HOMEPAGE="http://www.latex2html.org"
-DOWNLOAD="https://github.com/latex2html/latex2html/archive/v2019.2/latex2html-2019.2.tar.gz"
-MD5SUM="e9ca34903ac23a6f51385f05fa63c6eb"
+DOWNLOAD="https://github.com/latex2html/latex2html/archive/v2020/latex2html-2020.tar.gz"
+MD5SUM="d5e2d765ed2bb4d52bd7331a6420f5be"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/latex2html/manual.pdf b/academic/latex2html/manual.pdf
index 28a5159b38..699a2ce464 100644
--- a/academic/latex2html/manual.pdf
+++ b/academic/latex2html/manual.pdf
diff --git a/academic/ldl/README b/academic/ldl/README
index b3628fc188..ce58f1983d 100644
--- a/academic/ldl/README
+++ b/academic/ldl/README
@@ -1,11 +1,12 @@
 LDL is a set of concise routines for factorizing symmetric
 positive-definite sparse matrices, with some applicability to symmetric
-indefinite matrices.  Its primary purpose is to illustrate much of the
-basic theory of sparse matrix algorithms in as concise a code as possible,
-including an elegant new method of sparse symmetric factorization that
-computes the factorization row-by-row but stores it column-by-column.
+indefinite matrices.  Its primary purpose is to illustrate much of
+the basic theory of sparse matrix algorithms in as concise a code
+as possible, including an elegant new method of sparse symmetric
+factorization that computes the factorization row-by-row but stores it
+column-by-column.
 
 This package is part of SuiteSparse.
 
-AMD is an optional dependency and will be used if found.
-It is primarily used for this package's test suite.
+AMD is an optional dependency and will be used if found.  It is
+primarily used for this package's test suite.
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/libqalculate/README b/academic/libqalculate/README
index d67d9a7bd8..aa40e23964 100644
--- a/academic/libqalculate/README
+++ b/academic/libqalculate/README
@@ -1,4 +1,4 @@
-Qalculate! is a multi-purpose desktop calculator for GNU/Linux (and Mac OS). It
-is small and simple to use but with much power and versatility underneath.
-Features include customizable functions, units, arbitrary precision, plotting,
-and a user-friendly interface (GTK+ and CLI).
+Qalculate! is a multi-purpose desktop calculator for GNU/Linux (and Mac
+OS). It is small and simple to use but with much power and versatility
+underneath.  Features include customizable functions, units, arbitrary
+precision, plotting, and a user-friendly interface (GTK+ and CLI).
diff --git a/academic/libqalculate/libqalculate.SlackBuild b/academic/libqalculate/libqalculate.SlackBuild
index 86ade486fc..9d906e36f5 100644
--- a/academic/libqalculate/libqalculate.SlackBuild
+++ b/academic/libqalculate/libqalculate.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libqalculate
 
-# Copyright 2016-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2016-2020 Larry Hajali <larryhaja[at]gmail[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=libqalculate
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-3.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/libqalculate/libqalculate.info b/academic/libqalculate/libqalculate.info
index 0ff5260bd8..a2ac9c6801 100644
--- a/academic/libqalculate/libqalculate.info
+++ b/academic/libqalculate/libqalculate.info
@@ -1,8 +1,8 @@
 PRGNAM="libqalculate"
-VERSION="3.4.0"
-HOMEPAGE="http://qalculate.github.io/"
-DOWNLOAD="https://github.com/Qalculate/libqalculate/releases/download/v3.4.0/libqalculate-3.4.0.tar.gz"
-MD5SUM="71374cfffa41ccb7721543924dea3f8d"
+VERSION="3.10.0"
+HOMEPAGE="https://qalculate.github.io/"
+DOWNLOAD="https://github.com/Qalculate/libqalculate/releases/download/v3.10.0/libqalculate-3.10.0.tar.gz"
+MD5SUM="2f68e3dfeb36de2c88fc7078cb86ab4c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/link-grammar/README b/academic/link-grammar/README
index f985d7cb61..1250ac3145 100644
--- a/academic/link-grammar/README
+++ b/academic/link-grammar/README
@@ -1,6 +1,6 @@
-The Link Grammar Parser is a syntactic parser of English, based on link
-grammar, an original theory of English syntax. Given a sentence, the system
-assigns to it a syntactic structure, which consists of a set of labeled links
-connecting pairs of words. The parser also produces a "constituent" (Penn
-tree-bank style phrase tree) representation of a sentence (showing noun
-phrases, verb phrases, etc.).
+The Link Grammar Parser is a syntactic parser of English, based on
+link grammar, an original theory of English syntax. Given a sentence,
+the system assigns to it a syntactic structure, which consists of a set
+of labeled links connecting pairs of words. The parser also produces a
+"constituent" (Penn tree-bank style phrase tree) representation of a
+sentence (showing noun phrases, verb phrases, etc.).
diff --git a/academic/mafft/mafft.SlackBuild b/academic/mafft/mafft.SlackBuild
index 77bac2a01d..844be72f25 100644
--- a/academic/mafft/mafft.SlackBuild
+++ b/academic/mafft/mafft.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mafft
-VERSION=${VERSION:-7.453}
+VERSION=${VERSION:-7.471}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/mafft/mafft.info b/academic/mafft/mafft.info
index 4fae8a0354..dcc03b7049 100644
--- a/academic/mafft/mafft.info
+++ b/academic/mafft/mafft.info
@@ -1,8 +1,8 @@
 PRGNAM="mafft"
-VERSION="7.453"
+VERSION="7.471"
 HOMEPAGE="https://mafft.cbrc.jp/alignment/software/"
-DOWNLOAD="https://mafft.cbrc.jp/alignment/software/mafft-7.453-with-extensions-src.tgz"
-MD5SUM="749a7867831482a75b1a728928ec2a1a"
+DOWNLOAD="https://mafft.cbrc.jp/alignment/software/mafft-7.471-with-extensions-src.tgz"
+MD5SUM="6ac312a0261d99221dc0be437caba132"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/mathomatic/README b/academic/mathomatic/README
index 3c01da81e0..7c3e5292c8 100644
--- a/academic/mathomatic/README
+++ b/academic/mathomatic/README
@@ -4,11 +4,11 @@ subtraction, multiplication, division, modulo division, and all forms
 of exponentiation. All arithmetic is double precision floating point
 with up to 14 decimal digits accuracy.
 
-Mathomatic can symbolically combine and solve equations containing many 
-variables, completely simplify and compare expressions and equations, do 
-simple calculus transformations and series, perform standard, complex 
-number, and polynomial arithmetic, generate optimized C, Java, and Python 
-language code from simplified equations, carry out quick calculations, and 
-much more. Plotting with gnuplot is also supported. Not implemented in 
-Mathomatic are named functions, arbitrary-precision arithmetic, and
-matrices.
+Mathomatic can symbolically combine and solve equations containing many
+variables, completely simplify and compare expressions and equations,
+do simple calculus transformations and series, perform standard,
+complex number, and polynomial arithmetic, generate optimized C,
+Java, and Python language code from simplified equations, carry
+out quick calculations, and much more. Plotting with gnuplot is
+also supported. Not implemented in Mathomatic are named functions,
+arbitrary-precision arithmetic, and matrices.
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 9baddd56dd..a0623df2cc 100644
--- a/academic/meep/README
+++ b/academic/meep/README
@@ -1,14 +1,42 @@
 meep (electromagnetic FDTD solver)
 
-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.
+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.
 
-You may wish to preinstall: harminv, mpb
+You probably will also want to preinstall: harminv, openmpi
 
 You may wish to also install: h5utils
 
-If the build script can find the ATLAS libraries, it will
-adapt the configure options to use them rather than the
-default lapack.
+You very probably want to build a multi-processor version of this 
+code by adding the "--with-openmp" configure option. Here, mpb is 
+specified as a prerequisite since at the present time the python 
+interface will not build without it.
+
+
+
+Configuration:
+
+If the build script can find the ATLAS libraries, it will adapt the
+configure options to use them, rather than the the default choice of
+lapack.
+
+You can add additional options to the command line using
+the environment variable SBOPTIONS_MEEP; e.g. to enable MPI
+(multi-processor calculation) using openmp, use:
+
+SBOPTIONS_MEEP="--with-openmp" ./meep.Slackbuild
+
+Alternatively, if building non-interactively (e.g. if using slpkg),
+use/create the file /etc/sbo_pkg_options.conf since this slackbuild
+script will search it for options. Simply include a line starting
+"meep:" followed by options, e.g.:
+
+meep: --with-openmp
+
+Currently, building the python support for meep can be problematic
+unless the mpb package is also installed; if you do so, and (e.g.) use
+openmp, it is best to build mpb with the same option. You may also
+need to install mpi4py using pip.  If you do not want python support,
+specify "--without-python", and in this case installing mpb is not
+necessary.
diff --git a/academic/meep/meep.SlackBuild b/academic/meep/meep.SlackBuild
index 347fb3f9ae..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.12.0}
+VERSION=${VERSION:-1.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,13 +74,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 {} \;
 
-LOCALCONFIGS=" --without-python --with-mpi "
+# if there is no configure script, try to build one!
+if [ ! -f ./configure ] ; then
+  ./autogen.sh
+fi
+
+LOCALCONFIGS=
+XDBFILE=/etc/sbo_pkg_options.conf
+if [ -f ${XDBFILE} ] ; then
+  LOCALCONFIGS=${LOCALCONFIGS}" "$(grep "^${PRGNAM}:" ${XDBFILE} | grep -v '^#' | awk -F: '{print$2}') 
+  echo Build options selected by file: LOCALCONFIGS=${LOCALCONFIGS}
+fi
+if [  -n "${SBOPTIONS_MEEP}" ] ; then
+  LOCALCONFIGS=${LOCALCONFIGS}" "${SBOPTIONS_MEEP}
+  echo Build options selected by environment: LOCALCONFIGS=${LOCALCONFIGS}
+fi
 
 # check for the Atlas replacement for blas; if the libraries are found,
 #  add the configure option accordingly
 
-if [ -f /usr/lib${LIBDIRSUFFIX}/libatlas.a ] ; then
-  if [ -f /usr/lib${LIBIRSUFFIX}/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
@@ -94,20 +108,14 @@ CPPFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --disable-static \
   $LOCALCONFIGS
 
 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
 install -m 0644 $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -115,11 +123,5 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-###sbolint off
-if [ -f $CWD/doinst.sh ] ; then 
-  cat $CWD/doinst.sh > $PKG/install/doinst.sh
-fi
-###sbolint on
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/meep/meep.info b/academic/meep/meep.info
index 4c77d9c392..8faea2fd0f 100644
--- a/academic/meep/meep.info
+++ b/academic/meep/meep.info
@@ -1,10 +1,10 @@
 PRGNAM="meep"
-VERSION="1.12.0"
+VERSION="1.17.1"
 HOMEPAGE="https://github.com/NanoComp/meep"
-DOWNLOAD="https://github.com/NanoComp/meep/releases/download/v1.12.0/meep-1.12.0.tar.gz"
-MD5SUM="ce2064167a540036f315b5b7b4b8253e"
+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 openmpi hdf5 libctl"
+REQUIRES="lapack hdf5 libctl mpb"
 MAINTAINER="PaulKinsler"
 EMAIL="dr.paul@kinsler.org"
diff --git a/academic/meep/slack-desc b/academic/meep/slack-desc
index aa2462124c..8187e87c47 100644
--- a/academic/meep/slack-desc
+++ b/academic/meep/slack-desc
@@ -8,7 +8,7 @@
     |-----handy-ruler------------------------------------------------------|
 meep: meep (electromagnetics simulation using FDTD)
 meep:
-meep: Meep is a free and open-source software package for
+meep: Meep is a free and open-source software package for 
 meep: electromagnetics simulation via the finite-difference
 meep: time-domain (FDTD) method spanning a broad range of
 meep: applications.
diff --git a/academic/megax/megax.SlackBuild b/academic/megax/megax.SlackBuild
index 4710ababcc..e7ae3b4e24 100644
--- a/academic/megax/megax.SlackBuild
+++ b/academic/megax/megax.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=megax
-VERSION=${VERSION:-10.1.6_1}
+VERSION=${VERSION:-10.1.8_1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/megax/megax.info b/academic/megax/megax.info
index 2f53c52fb5..cf1d99f562 100644
--- a/academic/megax/megax.info
+++ b/academic/megax/megax.info
@@ -1,10 +1,10 @@
 PRGNAM="megax"
-VERSION="10.1.6_1"
+VERSION="10.1.8_1"
 HOMEPAGE="http://www.megasoftware.net/"
-DOWNLOAD="https://www.megasoftware.net/releases/megax_10.1.6-1_i386.deb"
-MD5SUM="04d125f5dc9fd43ee3550cc65c4c7fbd"
-DOWNLOAD_x86_64="https://www.megasoftware.net/releases/megax_10.1.6-1_amd64.deb"
-MD5SUM_x86_64="3f3d3f937443e6baca0b8530e075fab8"
+DOWNLOAD="https://www.megasoftware.net/releases/megax_10.1.8-1_i386.deb"
+MD5SUM="132278353e321cf8d6097aefb45dc582"
+DOWNLOAD_x86_64="https://www.megasoftware.net/releases/megax_10.1.8-1_amd64.deb"
+MD5SUM_x86_64="7083d62e933fd482aac50c98a13dd723"
 REQUIRES=""
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
diff --git a/academic/meme-suite/meme-suite.SlackBuild b/academic/meme-suite/meme-suite.SlackBuild
index acc62dc3a5..558c35ebd6 100644
--- a/academic/meme-suite/meme-suite.SlackBuild
+++ b/academic/meme-suite/meme-suite.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=meme-suite
-VERSION=${VERSION:-5.1.0}
+VERSION=${VERSION:-5.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/meme-suite/meme-suite.info b/academic/meme-suite/meme-suite.info
index 4c8ad796e8..8c94b67b1f 100644
--- a/academic/meme-suite/meme-suite.info
+++ b/academic/meme-suite/meme-suite.info
@@ -1,8 +1,8 @@
 PRGNAM="meme-suite"
-VERSION="5.1.0"
+VERSION="5.1.1"
 HOMEPAGE="http://meme-suite.org/"
-DOWNLOAD="http://meme-suite.org/meme-software/5.1.0/meme-5.1.0.tar.gz"
-MD5SUM="71e357be7bce1686f516858957de3921"
+DOWNLOAD="http://meme-suite.org/meme-software/5.1.1/meme-5.1.1.tar.gz"
+MD5SUM="98ffab29abb95621b947b2b2fa6e5ee7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openmpi perl-HTML-Template perl-JSON python3 meme-db-gomo meme-db-motif meme-db-tgene"
diff --git a/academic/mpb/README b/academic/mpb/README
new file mode 100644
index 0000000000..4710eced99
--- /dev/null
+++ b/academic/mpb/README
@@ -0,0 +1,42 @@
+mpb (computes electromagnetic band structures and modes)
+
+MPB is a free and open-source software package for computing
+electromagnetic band structures and modes. It saves results in hdf5
+format.
+
+This package requires: hdf5, libctl, lapack
+
+You may wish to also install: h5utils
+
+You very probably want to build a multi-processor version of this
+code by adding the "--with-openmp" configure option.
+
+Configuration:
+
+If the build script can find the ATLAS libraries, it will adapt the
+configure options to use them rather than the default lapack.
+
+You can add additional options to the command line using
+the environment variable SBOPTIONS_MPB; e.g. to enable MPI
+(multi-processor calculation) using openmp, use:
+
+SBOPTIONS_MPB="--with-openmp" ./mpb.Slackbuild
+
+Alternatively, if building non-interactively (e.g. if using slpkg),
+use/create the file /etc/sbo_pkg_options.conf since this slackbuild
+script will search it for options. Simply include a line starting
+"mpb:" followed by options, e.g.:
+
+mpb: --with-openmp
+
+If you want to use mpich instead of openmp, you will have to recompile
+the installed slackware fftw library with two additional configure
+options, i.e.  not only "--with-mpi" but also "--enable-type-prefix".
+
+Note:
+
+This mpb build script does *two* passes. This is so that when
+MPI support is enabled, the first compiles the mpb-data utility,
+then the second builds the full MPI version. The resulting package
+includes both, with any MPI version of the files replacing the non-
+MPI version.
diff --git a/academic/mpb/mpb.SlackBuild b/academic/mpb/mpb.SlackBuild
new file mode 100644
index 0000000000..2191964934
--- /dev/null
+++ b/academic/mpb/mpb.SlackBuild
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+# Slackware build script for mpb
+
+# Copyright 2019,2020 Paul Kinsler, U.K.
+# 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=mpb
+VERSION=${VERSION:-1.11.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
+
+# change annoying underscores into hyphens
+SVERSION=$(echo $VERSION | tr '_' '-')
+# make a custom list of doc files in advance
+DOCFILES="AUTHORS COPYING COPYRIGHT TODO README.md NEWS.md"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SVERSION
+tar xvf $CWD/$PRGNAM-$SVERSION.tar.gz
+cd $PRGNAM-$SVERSION
+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 there is no configure script, try to build one!
+if [ ! -f ./configure ] ; then
+  ./autogen.sh
+fi
+
+LOCALCONFIGS=
+XDBFILE=/etc/sbo_pkg_options.conf
+if [ -f ${XDBFILE} ] ; then
+  LOCALCONFIGS=${LOCALCONFIGS}" "$(grep "^${PRGNAM}:" ${XDBFILE} | grep -v '^#' | awk -F: '{print$2}')
+  echo Build options selected by file: LOCALCONFIGS=${LOCALCONFIGS}
+fi
+if [  -n "${SBOPTIONS_MPB}" ] ; then
+  LOCALCONFIGS=${LOCALCONFIGS}" "${SBOPTIONS_MPB}
+  echo Build options selected by environment: LOCALCONFIGS=${LOCALCONFIGS}
+fi
+
+# 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
+    echo "NOTICE: libatlas was found, configure --with-blas=atlas"
+    LOCALCONFIGS=${LOCALCONFIGS}" --with-blas=atlas"
+  fi
+fi
+
+#  LOCALCONFIGS without any mpi requests so I can do a no-mpi compile.
+SPLOCALCONFIGS=$(echo $LOCALCONFIGS | sed s/--with-mpi// | sed s/--with-openmp//)
+
+
+# do two passes; first with no mpi (to get mpb-data),
+# then a second *with* mpi
+
+CFLAGS="$SLKCFLAGS" \
+CPPFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $SPLOCALCONFIGS
+
+make
+make install DESTDIR=$PKG
+
+CFLAGS="$SLKCFLAGS" \
+CPPFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $LOCALCONFIGS
+
+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
+install -m 0644 $DOCFILES $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/mpb/mpb.info b/academic/mpb/mpb.info
new file mode 100644
index 0000000000..bd24b0e499
--- /dev/null
+++ b/academic/mpb/mpb.info
@@ -0,0 +1,10 @@
+PRGNAM="mpb"
+VERSION="1.11.1"
+HOMEPAGE="https://github.com/NanoComp/mpb"
+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"
+MAINTAINER="PaulKinsler"
+EMAIL="dr.paul@kinsler.org"
diff --git a/academic/mpb/slack-desc b/academic/mpb/slack-desc
new file mode 100644
index 0000000000..221d698891
--- /dev/null
+++ b/academic/mpb/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------------------------------------------------------|
+mpb: mpb (computation of electromagnetic band structures and modes)
+mpb:
+mpb: MPB is a free and open-source software package for 
+mpb: computing electromagnetic band structures and modes.
+mpb:
+mpb: Homepage: https://github.com/NanoComp/mpb
+mpb:
+mpb:
+mpb:
+mpb:
+mpb:
diff --git a/academic/muscle/README b/academic/muscle/README
index 4db82130b5..2a8b2c538d 100644
--- a/academic/muscle/README
+++ b/academic/muscle/README
@@ -3,7 +3,29 @@ nucleotide sequences. A range of options is provided that give you the
 choice of optimizing accuracy, speed, or some compromise between the 
 two.
 
-For details and citation:
-Edgar, R.C. (2004) MUSCLE: multiple sequence alignment with high 
-accuracy and high throughput. Nucleic Acids Res. 32(5):1792-1797. 
-doi:10.1093/nar/gkh340
+Fast, accurate and easy to use
+MUSCLE is one of the best-performing multiple alignment programs
+according to published benchmark tests, with accuracy and speed that
+are consistently better than CLUSTALW. MUSCLE can align hundreds of
+sequences in seconds. Most users learn everything they need to know
+about MUSCLE in a few minutes—only a handful of command-line options
+are needed to perform common alignment tasks.
+
+NOTE about the "-stable" option no longer being supported:
+The "-stable" option had a bug, which sometimes resulted in incorrect
+alignments to be produced. The author has created a python script to
+be used as a workaround. The SlackBuild includes it and its usage is:
+
+  python muscle-stable.py input.fasta aligned.fasta > stable.fasta
+
+Papers
+There are two papers. The first (NAR) introduced the algorithm, and is
+the primary citation if you use the program. The second (in BMC Bio-
+informatics) gives more technical details, including descriptions of
+non-default options.
+
+Edgar, R.C. (2004) MUSCLE: multiple sequence alignment with high
+accuracy and high throughput. Nucleic Acids Res. 32(5):1792-1797
+
+Edgar, R.C. (2004) MUSCLE: a multiple sequence alignment method with
+reduced time and space complexity BMC Bioinformatics, (5) 113
diff --git a/academic/muscle/muscle.1 b/academic/muscle/muscle.1
new file mode 100644
index 0000000000..057c81da47
--- /dev/null
+++ b/academic/muscle/muscle.1
@@ -0,0 +1,135 @@
+.\"     Title: MUSCLE
+.\"    Author: Robert Elgar
+.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
+.\"      Date: 02/06/2008
+.\"    Manual: Muscle Manual
+.\"    Source: muscle 3.7
+.\"
+.TH "MUSCLE" "1" "02/06/2008" "muscle 3.7" "Muscle Manual"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+muscle - Multiple Protein Sequence Alignment
+.SH "SYNOPSIS"
+.HP 7
+\fBmuscle\fR \fB\-in\ \fR\fB\fIinput\ file\ (fasta)\fR\fR [\fB\-out\ \fR\fB\fIoutput\ file\ (default\ fasta)\fR\fR] [\fB\-diags\fR] [\fB\-log\ \fR\fB\fIlog\ file\fR\fR] [\fB\-maxiters\ \fR\fB\fIn\fR\fR] [\fB\-maxhours\ \fR\fB\fIn\fR\fR] [\fB\-maxmb\ \fR\fB\fIm\fR\fR] [\fB\-html\fR] [\fB\-msf\fR] [\fB\-clw\fR] [\fB\-clwstrict\fR] [\fB\-log[a]\ \fR\fB\fIlogfile\fR\fR] [\fB\-quiet\fR] [\fB\-stable\fR] [\fB\-group\fR] [\fB\-version\fR]
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBmuscle\fR
+command\.
+.PP
+\fBmuscle\fR
+aligns protein sequences and is considered superior and faster than Clustal\ W\.
+.SH "OPTIONS"
+.PP
+\fB\-in \fR\fB\fIinput file\fR\fR
+.RS 4
+Path to FASTA formatted input file
+.RE
+.PP
+\fB\-out \fR\fB\fIoutput file\fR\fR
+.RS 4
+Path to output file, FASTA formatted by default
+.RE
+.PP
+\fB\-diags\fR
+.RS 4
+Find diagonals (faster for similar sequences)
+.RE
+.PP
+\fB\-maxiters \fR\fB\fIn\fR\fR
+.RS 4
+Maximum number of iterations (integer, default 16)
+.RE
+.PP
+\fB\-maxhours \fR\fB\fIn\fR\fR
+.RS 4
+Maximum time to iterate in hours (default no limit)
+.RE
+.PP
+\fB\-maxmb \fR\fB\fIm\fR\fR
+.RS 4
+Maximum memory to allocate in Mb (default 80% of RAM)
+.RE
+.PP
+\fB\-html\fR
+.RS 4
+Write output in HTML format (default FASTA)
+.RE
+.PP
+\fB\-msf\fR
+.RS 4
+Write output in MSF format (default FASTA)
+.RE
+.PP
+\fB\-clw\fR
+.RS 4
+Write output in Clustal\ W format (default FASTA)
+.RE
+.PP
+\fB\-clwstrict\fR
+.RS 4
+As \-clw, with \'CLUSTAL W (1\.81)\' header
+.RE
+.PP
+\fB\-log[a] \fR\fB\fIlogfile\fR\fR
+.RS 4
+Log to file (append if \-loga, overwrite if \-log)
+.RE
+.PP
+\fB\-quiet\fR
+.RS 4
+Do not write progress messages to stderr
+.RE
+.PP
+\fB\-stable\fR
+.RS 4
+Output sequences in input order (default is \-group)
+.RE
+.PP
+\fB\-group\fR
+.RS 4
+Group sequences by similarity (this is the default)
+.RE
+.PP
+\fB\-version\fR
+.RS 4
+Display version information and exit
+.RE
+.SH "SEE ALSO"
+.PP
+
+\fBclustalw\fR(1),
+\fBseaview\fR(1),
+\fBt_coffee\fR(1)\.
+.SH "AUTHORS"
+.PP
+\fBRobert Elgar\fR
+.sp -1n
+.IP "" 4
+Wrote Muscle\.
+.PP
+\fBSteffen Moeller\fR <\&moeller@debian\.org\&>
+.sp -1n
+.IP "" 4
+Wrote this manpage\.
+.PP
+\fBCharles Plessy\fR <\&charles\-debian\-nospam@plessy\.org\&>
+.sp -1n
+.IP "" 4
+Updated this manpage\.
+.SH "COPYRIGHT"
+Copyright \(co 2003, 2004 Steffen Moeller (manpage)
+.br
+Copyright \(co 2007, 2008 Charles Plessy (manpage)
+.br
+.PP
+Muscle is in the public domain, and therefore not subjected to copyright\.
+.PP
+This manual page was written by Steffen Moeller moeller@debian\.org for the
+Debian(TM)
+system (but may be used by others)\. Permission is granted to copy, distribute and/or modify this document as if it were in public domain\.
+.sp
diff --git a/academic/muscle/muscle.SlackBuild b/academic/muscle/muscle.SlackBuild
index 9e69c5b702..2258892211 100644
--- a/academic/muscle/muscle.SlackBuild
+++ b/academic/muscle/muscle.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for muscle
 
-# Copyright 2011-2019 Petar Petrov slackalaxy@gmail.com
+# Copyright 2011-2020 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,11 @@
 
 PRGNAM=muscle
 VERSION=${VERSION:-3.8.1551}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
+MANUAL=muscle_userguide3.8.pdf
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -63,6 +65,7 @@ rm -rf ${PRGNAM}-${VERSION}
 mkdir -p ${PRGNAM}-${VERSION}
 cd ${PRGNAM}-${VERSION}
 tar xvf $CWD/${PRGNAM}_src_${VERSION}.tar.gz
+tar xvf $CWD/stable.tar.gz
 
 chown -R root:root .
 find -L . \
@@ -78,12 +81,21 @@ CFLAGS="$SLKCFLAGS" \
 make
 
 install -D -m755 $PRGNAM $PKG/usr/bin/$PRGNAM
+install -D -m755 stable.py $PKG/usr/bin/$PRGNAM-stable.py
+
+# Thanks to Debian for the man page
+mkdir -p $PKG/usr/man/man1
+cp $CWD/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.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
 
+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
+cat $CWD/$MANUAL > $PKG/usr/doc/$PRGNAM-$VERSION/$MANUAL
 cat $CWD/References > $PKG/usr/doc/$PRGNAM-$VERSION/References
 
 mkdir -p $PKG/install
diff --git a/academic/muscle/muscle.info b/academic/muscle/muscle.info
index e7671cd1bc..e747bd6443 100644
--- a/academic/muscle/muscle.info
+++ b/academic/muscle/muscle.info
@@ -1,8 +1,12 @@
 PRGNAM="muscle"
 VERSION="3.8.1551"
 HOMEPAGE="http://www.drive5.com/muscle/"
-DOWNLOAD="http://www.drive5.com/muscle/muscle_src_3.8.1551.tar.gz"
-MD5SUM="1b7c9661f275a82d3cf708f923736bf8"
+DOWNLOAD="http://www.drive5.com/muscle/muscle_src_3.8.1551.tar.gz \
+	http://www.drive5.com/muscle/stable.tar.gz \
+	http://www.drive5.com/muscle/muscle_userguide3.8.pdf"
+MD5SUM="1b7c9661f275a82d3cf708f923736bf8 \
+	fceeab190ff13576bfd681a601e7859b \
+	58bb1b7989cf6f2c197dd46552759a40"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/muscle/slack-desc b/academic/muscle/slack-desc
index 5e4e7da441..d3d95c0c28 100644
--- a/academic/muscle/slack-desc
+++ b/academic/muscle/slack-desc
@@ -13,7 +13,7 @@ muscle: or nucleotide sequences. A range of options is provided that give
 muscle: you the choice of optimizing accuracy, speed, or some compromise
 muscle: between the two.
 muscle:
-muscle: Home: http://www.drive5.com/muscle/
-muscle: References: /usr/doc/muscle-3.8.31/References
+muscle: http://www.drive5.com/muscle/
+muscle: http://www.drive5.com/muscle/stable.html
 muscle:
 muscle:
diff --git a/academic/ncbi-blast+/ncbi-blast+.SlackBuild b/academic/ncbi-blast+/ncbi-blast+.SlackBuild
index 8796217010..ded8e93c20 100644
--- a/academic/ncbi-blast+/ncbi-blast+.SlackBuild
+++ b/academic/ncbi-blast+/ncbi-blast+.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ncbi-blast+
-VERSION=${VERSION:-2.10.0}
+VERSION=${VERSION:-2.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/ncbi-blast+/ncbi-blast+.info b/academic/ncbi-blast+/ncbi-blast+.info
index 4c2a4057d1..e41785d7da 100644
--- a/academic/ncbi-blast+/ncbi-blast+.info
+++ b/academic/ncbi-blast+/ncbi-blast+.info
@@ -1,10 +1,10 @@
 PRGNAM="ncbi-blast+"
-VERSION="2.10.0"
+VERSION="2.10.1"
 HOMEPAGE="https://blast.ncbi.nlm.nih.gov/"
-DOWNLOAD="ftp://ftp.ncbi.nih.gov/blast/executables/blast+/2.10.0/ncbi-blast-2.10.0+-src.tar.gz"
-MD5SUM="0be82e26787579c5d14517af63502197"
+DOWNLOAD="ftp://ftp.ncbi.nih.gov/blast/executables/blast+/2.10.1/ncbi-blast-2.10.1+-src.tar.gz"
+MD5SUM="216cddf560eedc2b8d88bdd1ada1dfd1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lmdb"
+REQUIRES="lmdb python3"
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
diff --git a/academic/nco/README b/academic/nco/README
index eebc302ed8..2b1492ef0e 100644
--- a/academic/nco/README
+++ b/academic/nco/README
@@ -1,9 +1,10 @@
 NCO (netCDF Operators Software Stack)
 
-The NCO toolkit manipulates and analyzes data stored in netCDF- accessible
-formats, including DAP, HDF4, and HDF5. It exploits the geophysical
-expressivity of many CF (Climate & Forecast) metadata conventions, the
-flexible description of physical dimensions translated by UDUnits, the network
-transparency of OPeNDAP, the storage features (e.g., compression, chunking,
-groups) of HDF (the Hierarchical Data Format), and many powerful mathematical
-and statistical algorithms of GSL (the GNU Scientific Library).
+The NCO toolkit manipulates and analyzes data stored in netCDF-
+accessible formats, including DAP, HDF4, and HDF5. It exploits the
+geophysical expressivity of many CF (Climate & Forecast) metadata
+conventions, the flexible description of physical dimensions translated
+by UDUnits, the network transparency of OPeNDAP, the storage features
+(e.g., compression, chunking, groups) of HDF (the Hierarchical Data
+Format), and many powerful mathematical and statistical algorithms of
+GSL (the GNU Scientific Library).
diff --git a/academic/nco/nco.SlackBuild b/academic/nco/nco.SlackBuild
index 3a20201103..74bd346139 100644
--- a/academic/nco/nco.SlackBuild
+++ b/academic/nco/nco.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PRGNAM=nco
-VERSION=${VERSION:-4.9.2}
+VERSION=${VERSION:-4.9.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,7 +55,7 @@ else
    LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -83,7 +83,6 @@ CXXFLAGS="$SLKCFLAGS" \
    --disable-static \
    --build=$ARCH-slackware-linux
 
-# Compile the application and install it into the $PKG directory
 make
 make install DESTDIR=$PKG
 
@@ -93,18 +92,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
 
-# Compress info pages and remove the package's dir file
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
-# Copy program documentation into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
    AUTHORS CITATION COPYING COPYRIGHT INSTALL LICENSE README.md \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/academic/nco/nco.info b/academic/nco/nco.info
index 3a4b113fb2..89cf7d6c3e 100644
--- a/academic/nco/nco.info
+++ b/academic/nco/nco.info
@@ -1,8 +1,8 @@
 PRGNAM="nco"
-VERSION="4.9.2"
+VERSION="4.9.7"
 HOMEPAGE="http://nco.sf.net"
-DOWNLOAD="https://github.com/nco/nco/archive/4.9.2/nco-4.9.2.tar.gz"
-MD5SUM="366a949084d404b0380af7426ed94648"
+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/nco/slack-desc b/academic/nco/slack-desc
index 15c846b9c3..a65912dc40 100644
--- a/academic/nco/slack-desc
+++ b/academic/nco/slack-desc
@@ -9,7 +9,7 @@
 nco: nco (netCDF Operators Software Stack)
 nco:
 nco: The NCO toolkit manipulates and analyzes data stored in netCDF-
-nco: accessible formats, including DAP, HDF4, and HDF5. It exploits the 
+nco: accessible formats, including DAP, HDF4, and HDF5. It exploits the
 nco: geophysical expressivity of many CF (Climate & Forecast) metadata
 nco: conventions, the flexible description of physical dimensions
 nco: translated by UDUnits, the network transparency of OPeNDAP, the
diff --git a/academic/ngspice/ngspice.SlackBuild b/academic/ngspice/ngspice.SlackBuild
index 26525cf138..964f6d0aaf 100644
--- a/academic/ngspice/ngspice.SlackBuild
+++ b/academic/ngspice/ngspice.SlackBuild
@@ -7,8 +7,8 @@
 # Set initial variables:
 
 PRGNAM=ngspice
-VERSION=${VERSION:-31}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-34}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -55,38 +55,48 @@ find -L . \
 
 # Fix the lib path to the code modules
 if [ "$ARCH" = "x86_64" ]; then
-    sed -i "s%/lib/%/lib${LIBDIRSUFFIX}/%g" src/spinit.in
+  sed -i "s%/lib/%/lib${LIBDIRSUFFIX}/%g" src/spinit.in
 fi
 
-./configure --prefix=/usr \
-            --mandir=/usr/man \
-            --infodir=/usr/info \
-            --with-readline=yes \
-            --enable-xspice \
-            --enable-cider \
-            --enable-openmp \
-            --with-ngshared
+mkdir release
+cd release
+
+  ../configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --enable-xspice \
+  --enable-cider \
+  --enable-openmp \
+  --with-x \
+  --disable-debug \
+  --with-ngshared
+
 make
 
 CFLAGS="$SLKCFLAGS" \
-    ./configure \
-    --prefix=/usr \
-    --bindir=/usr/bin \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --mandir=/usr/man \
-    --infodir=/usr/info \
-    --disable-debug \
-    --with-readline=yes \
-    --enable-xspice \
-    --enable-cider \
-    --enable-shared \
-    --disable-static \
-    --enable-ndev \
-    --enable-openmp \
-    --build=$ARCH-slackware-linux
+  ../configure --prefix=/usr \
+  --bindir=/usr/bin \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-debug \
+  --enable-xspice \
+  --enable-cider \
+  --enable-shared \
+  --disable-static \
+  --enable-ndev \
+  --enable-openmp \
+  --with-x \
+  --build=$ARCH-slackware-linux
+
 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 \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -94,17 +104,29 @@ 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/examples
-cp -a ANALYSES AUTHORS BUGS COPYING ChangeLog DEVICES FAQ \
-    INSTALL NEWS README* examples/ $PKG/usr/doc/$PRGNAM-$VERSION/
+
+cp -a \
+  ANALYSES AUTHORS BUGS COPYING ChangeLog DEVICES FAQ \
+  INSTALL NEWS README* examples/ \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
+
 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
+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"
 
-install -Dm755 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"
 
-mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
-install -m644 $CWD/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
+# 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
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
diff --git a/academic/ngspice/ngspice.info b/academic/ngspice/ngspice.info
index cc47ace1ae..23f93fdba1 100644
--- a/academic/ngspice/ngspice.info
+++ b/academic/ngspice/ngspice.info
@@ -1,12 +1,12 @@
 PRGNAM="ngspice"
-VERSION="31"
+VERSION="34"
 HOMEPAGE="http://ngspice.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/ngspice/files/ng-spice-rework/31/ngspice-31.tar.gz \
-          https://sourceforge.net/projects/ngspice/files/ng-spice-rework/31/ngspice-31-manual.pdf"
-MD5SUM="f50b4d8c6ecbf01acf121cd9edc3baab \
-        cd746e20a1a23889acab51d918cc1f77"
+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=""
+REQUIRES="openmpi"
 MAINTAINER="R. S. Ananda Murthy"
 EMAIL="rsamurti@gmail.com"
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/paml/paml.SlackBuild b/academic/paml/paml.SlackBuild
index 0a6759536a..8c56506e26 100644
--- a/academic/paml/paml.SlackBuild
+++ b/academic/paml/paml.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for paml
 
-# Copyright 2013-2018 Petar Petrov slackalaxy@gmail.com
+# Copyright 2013-2020 Petar Petrov slackalaxy@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=paml
-VERSION=${VERSION:-4.9h}
+VERSION=${VERSION:-4.9j}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -97,9 +97,10 @@ install -D -m755 evolverNSbranches 	$PKG/usr/libexec/$PRGNAM/evolverNSbranches
 install -D -m755 evolverNSbranchsites 	$PKG/usr/libexec/$PRGNAM/evolverNSbranchsites
 install -D -m755 evolverNSsites 	$PKG/usr/libexec/$PRGNAM/evolverNSsites
 
-# Compile and install TreeTime
-cc $SLKCFLAGS -o TreeTimeJeff TreeTimeJeff.c tools.c -lm
-install -D -m755 TreeTimeJeff 	$PKG/usr/libexec/$PRGNAM/TreeTimeJeff
+# This does not build at the moment, so let's disable it for now
+# # Compile and install TreeTime
+# cc $SLKCFLAGS -o TreeTimeJeff TreeTimeJeff.c tools.c -lm
+# install -D -m755 TreeTimeJeff 	$PKG/usr/libexec/$PRGNAM/TreeTimeJeff
 
 # Rename the local README, so we include it in the package.
 mv README.txt README-compiling.txt
diff --git a/academic/paml/paml.info b/academic/paml/paml.info
index 3617cf5097..7c31ba8a04 100644
--- a/academic/paml/paml.info
+++ b/academic/paml/paml.info
@@ -1,9 +1,9 @@
 PRGNAM="paml"
-VERSION="4.9h"
+VERSION="4.9j"
 HOMEPAGE="http://abacus.gene.ucl.ac.uk/software/paml.html"
-DOWNLOAD="http://abacus.gene.ucl.ac.uk/software/paml4.9h.tgz \
+DOWNLOAD="http://abacus.gene.ucl.ac.uk/software/paml4.9j.tgz \
           http://ponce.cc/slackware/sources/repo/MCMCtree.Tutorials.pdf"
-MD5SUM="b45d60cc0a82e4835e8dcda6a4c32040 \
+MD5SUM="50c1760512b7a5df50305e5fd26d0ca5 \
         29c851d887eea56b949c01ab42cc48fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/academic/pamlX/pamlX.SlackBuild b/academic/pamlX/pamlX.SlackBuild
index e25f9f4651..f2e73890c5 100644
--- a/academic/pamlX/pamlX.SlackBuild
+++ b/academic/pamlX/pamlX.SlackBuild
@@ -74,8 +74,8 @@ find -L . \
 # manuals installed by paml.
 sed -i 's|QApplication::applicationDirPath()|"/usr"|g' mainwindow.cpp
 sed -i 's|+= "/pamlx.conf"|= "~/.pamlX/pamlx.conf"|g' mainwindow.cpp
-sed -i 's|/doc/|/doc/paml-4.9h/|g' mainwindow.cpp
-sed -i 's|/doc/|/doc/paml-4.9h/|g' pamlhistorydialog.cpp
+sed -i 's|/doc/|/doc/paml-4.9j/|g' mainwindow.cpp
+sed -i 's|/doc/|/doc/paml-4.9j/|g' pamlhistorydialog.cpp
 
 # If you want the "Help" menu to use something else than Okular for
 # viewing the PDF documentation, uncomment the appropriate line below
diff --git a/academic/pari/README b/academic/pari/README
index 6e10ca3d19..b51ae28edf 100644
--- a/academic/pari/README
+++ b/academic/pari/README
@@ -1,7 +1,7 @@
-PARI/GP is a widely used computer algebra system designed for fast computations
-in number theory (factorizations, algebraic number theory, elliptic curves,
-modular forms, L functions...), but also contains a large number of other
-useful functions to compute with mathematical entities such as matrices,
-polynomials, power series, algebraic numbers etc., and a lot of transcendental
-functions. PARI is also available as a C library to allow for faster
-computations.
+PARI/GP is a widely used computer algebra system designed for fast
+computations in number theory (factorizations, algebraic number theory,
+elliptic curves, modular forms, L functions...), but also contains a
+large number of other useful functions to compute with mathematical
+entities such as matrices, polynomials, power series, algebraic numbers
+etc., and a lot of transcendental functions. PARI is also available as
+a C library to allow for faster computations.
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/parmetis/README b/academic/parmetis/README
index 018f15ca02..ac2b847cf4 100644
--- a/academic/parmetis/README
+++ b/academic/parmetis/README
@@ -1,10 +1,10 @@
-ParMETIS (Parallel Graph Partitioning and Fill-reducing Matrix  Ordering)
+ParMETIS (Parallel Graph Partitioning and Fill-reducing Matrix
+Ordering)
 
-ParMETIS is an MPI-based parallel library that implements a variety 
-of algorithms for partitioning unstructured graphs, meshes, and for 
+ParMETIS is an MPI-based parallel library that implements a variety
+of algorithms for partitioning unstructured graphs, meshes, and for
 computing fill-reducing orderings of sparse matrices.
 
-Set precision type:
-DP=yes (for 64-bit, default is 32-bit)
+Set precision type: DP=yes (for 64-bit, default is 32-bit)
 
 The requirement is a MPI implementation, either mpich or openmpi.
diff --git a/academic/pianobooster/README b/academic/pianobooster/README
index bbc0a15b05..a191b9f461 100644
--- a/academic/pianobooster/README
+++ b/academic/pianobooster/README
@@ -1,7 +1,7 @@
 pianobooster (educational music software)
 
 PianoBooster is a fun way of playing along with a musical accompaniment
-and at the same time learning the basics of reading musical notation. The
-difference between playing along to a CD or a standard midi file is
-that PianoBooster listens and follows what you are playing on a midi
-piano keyboard.
+and at the same time learning the basics of reading musical
+notation. The difference between playing along to a CD or a standard
+midi file is that PianoBooster listens and follows what you are playing
+on a midi piano keyboard.
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/pysam/pysam.SlackBuild b/academic/pysam/pysam.SlackBuild
index 1145e63733..dcbc06e1a6 100644
--- a/academic/pysam/pysam.SlackBuild
+++ b/academic/pysam/pysam.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pysam
 
-# Copyright 2017 Rob van Nues
+# Copyright 2017-2020 Rob van Nues
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 
 PRGNAM=pysam
-VERSION=${VERSION:-0.15.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.16.0.1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 #set which python version to install it for
@@ -75,8 +75,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 {} \;
 
-###When pysam gets linked to htslib-1.10 this can be done again:
-##use system htslib instead:
+### pysam linked to htslib-1.10; SBo-htslib is at 1.11:
+##use system htslib:
 #export HTSLIB_LIBRARY_DIR=/usr/lib$LIBDIRSUFFIX
 #export HTSLIB_INCLUDE_DIR=/usr/include
 
diff --git a/academic/pysam/pysam.info b/academic/pysam/pysam.info
index 8e87762f0f..724abb43a7 100644
--- a/academic/pysam/pysam.info
+++ b/academic/pysam/pysam.info
@@ -1,8 +1,8 @@
 PRGNAM="pysam"
-VERSION="0.15.4"
+VERSION="0.16.0.1"
 HOMEPAGE="https://github.com/pysam-developers/pysam"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pysam/pysam-0.15.4.tar.gz"
-MD5SUM="fed157466d6e267e32593119c05247b2"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pysam/pysam-0.16.0.1.tar.gz"
+MD5SUM="5b4b73431f2511727f4fef43a67b392e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-Cython"
diff --git a/academic/qalculate-gtk/qalculate-gtk.SlackBuild b/academic/qalculate-gtk/qalculate-gtk.SlackBuild
index 569baa8084..62576920e9 100644
--- a/academic/qalculate-gtk/qalculate-gtk.SlackBuild
+++ b/academic/qalculate-gtk/qalculate-gtk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qalculate-gtk
 
-# Copyright 2016-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2016-2020 Larry Hajali <larryhaja[at]gmail[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=qalculate-gtk
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-3.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/qalculate-gtk/qalculate-gtk.info b/academic/qalculate-gtk/qalculate-gtk.info
index e3b8170127..4884e43fbc 100644
--- a/academic/qalculate-gtk/qalculate-gtk.info
+++ b/academic/qalculate-gtk/qalculate-gtk.info
@@ -1,8 +1,8 @@
 PRGNAM="qalculate-gtk"
-VERSION="3.4.0"
-HOMEPAGE="http://qalculate.github.io/"
-DOWNLOAD="https://github.com/Qalculate/qalculate-gtk/releases/download/v3.4.0/qalculate-gtk-3.4.0.tar.gz"
-MD5SUM="58a8670ce4f3e692acbd2f27d104f82e"
+VERSION="3.10.0"
+HOMEPAGE="https://qalculate.github.io/"
+DOWNLOAD="https://github.com/Qalculate/qalculate-gtk/releases/download/v3.10.0/qalculate-gtk-3.10.0.tar.gz"
+MD5SUM="5880b40c4a5beb9da290b28a54eb4f46"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libqalculate"
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/reduce-algebra/README b/academic/reduce-algebra/README
index 5b6e1afcff..863d14a3ad 100644
--- a/academic/reduce-algebra/README
+++ b/academic/reduce-algebra/README
@@ -4,8 +4,8 @@ interactively for simple calculations but also provides a flexible and
 expressive user programming language.
 
 The development of the REDUCE computer algebra system was started in the
-1960s by Anthony C. Hearn.  Since then, many scientists from all over the
-world have contributed to its development.  REDUCE has a long and
+1960s by Anthony C. Hearn.  Since then, many scientists from all over
+the world have contributed to its development.  REDUCE has a long and
 distinguished place in the history of computer algebra systems.  Other
 systems that address some of the same issues but sometimes with rather
 different emphasis are Axiom, Derive, Macsyma (Maxima), Maple,
diff --git a/academic/reduce-algebra/reduce-algebra.SlackBuild b/academic/reduce-algebra/reduce-algebra.SlackBuild
index 83786cf637..a843ef1d3a 100644
--- a/academic/reduce-algebra/reduce-algebra.SlackBuild
+++ b/academic/reduce-algebra/reduce-algebra.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=reduce-algebra
-VERSION=${VERSION:-20200301svn5286}
+VERSION=${VERSION:-20201007svn5424}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/reduce-algebra/reduce-algebra.info b/academic/reduce-algebra/reduce-algebra.info
index a5f168bf25..46f79d0bcb 100644
--- a/academic/reduce-algebra/reduce-algebra.info
+++ b/academic/reduce-algebra/reduce-algebra.info
@@ -1,10 +1,10 @@
 PRGNAM="reduce-algebra"
-VERSION="20200301svn5286"
+VERSION="20201007svn5424"
 HOMEPAGE="https://reduce-algebra.sourceforge.io"
-DOWNLOAD="https://downloads.sourceforge.net/reduce-algebra/snapshot_2020-03-01/Reduce-svn5286-src.tar.gz \
-          https://downloads.sourceforge.net/reduce-algebra/snapshot_2020-03-01/linux64/reduce-common_5286_all.tgz"
-MD5SUM="28fa5a23835e5ec1474844e18bf29855 \
-        6a3b2b2e3243ff0894bef9f336597164"
+DOWNLOAD="https://downloads.sourceforge.net/reduce-algebra/snapshot_2020-10-07/Reduce-svn5424-src.tar.gz \
+          https://downloads.sourceforge.net/reduce-algebra/snapshot_2020-10-07/linux64/reduce-common_5424_all.tgz"
+MD5SUM="46eb107df176f965a2bd011c95451382 \
+        325258e8a864bb1098940ed82e9d17b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/rpy2/README b/academic/rpy2/README
new file mode 100644
index 0000000000..702373878f
--- /dev/null
+++ b/academic/rpy2/README
@@ -0,0 +1,22 @@
+Python interface to the R language.
+
+rpy2 is running an embedded R, providing access to it
+from Python using R's own C-API through either:
+
+1) a high-level interface making R functions and objects
+just like Python functions and providing a seamless
+conversion to numpy and pandas data structures
+
+2) a low-level interface closer to the C-API
+
+It is also providing features for when working with
+jupyter notebooks or ipython.
+
+NOTE:
+R needs to be compiled with the shared library flag,
+thus: build R on SBo with R_SHLIB=yes and BLAS_SHLIB=yes
+
+(See also the notes in the rpy2.Slackbuild)
+
+home:https://rpy2.github.io/
+documentation:https://rpy2.github.io/doc/latest/html/index.html
diff --git a/academic/rpy2/Rlibs.conf b/academic/rpy2/Rlibs.conf
new file mode 100644
index 0000000000..cd1ea265b7
--- /dev/null
+++ b/academic/rpy2/Rlibs.conf
@@ -0,0 +1,2 @@
+##placed as rpy2 cannot load R without "export LD_LIBRARY_PATH=/usr/lib64/R/lib/"
+/usr/lib64/R/lib
\ No newline at end of file
diff --git a/academic/rpy2/doinst.sh b/academic/rpy2/doinst.sh
new file mode 100644
index 0000000000..bf984ccfe4
--- /dev/null
+++ b/academic/rpy2/doinst.sh
@@ -0,0 +1,2 @@
+#load the path to the R libraries to enable linking
+ldconfig
diff --git a/academic/rpy2/rpy2.SlackBuild b/academic/rpy2/rpy2.SlackBuild
new file mode 100644
index 0000000000..b31616bdbe
--- /dev/null
+++ b/academic/rpy2/rpy2.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+#
+# SlackBuild for rpy2
+#
+# 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:
+#
+# 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=rpy2
+VERSION=${VERSION:-3.4.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 sure there is R
+if ! [ -x "$(command -v R)" ]; then
+  echo 'Error: R is not installed.' >&2
+  exit 1
+fi
+
+## make sure that R has been compiled with
+## --enable-R-shlib
+## --enable-BLAS-shlib
+RHOMLIB=$(R RHOME)/lib
+echo "R libs are in $RHOMLIB"
+
+if ! [ "$(readelf -h $RHOMLIB/libR*.so | grep DYN)" ]; then
+  echo "Error: R is not compiled with shared libraries." >&2
+  exit 1
+fi
+
+## this removes an error message from setup.py
+## https://github.com/rpy2/rpy2/issues/675
+export LD_LIBRARY_PATH="${RHOMLIB}:${LD_LIBRARY_PATH}"
+echo "LD_LIBRARY_PATH set to ${LD_LIBRARY_PATH}"
+
+python3 setup.py build install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS gpl-2.0.txt NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+## to facilitate dynamic linking with R,
+## libR.so and libRblas.so still need to be found
+## https://github.com/rpy2/rpy2/issues/675
+mkdir -p $PKG/etc/ld.so.conf.d/
+cat $CWD/Rlibs.conf > $PKG/etc/ld.so.conf.d/Rlibs.conf
+
+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/rpy2/rpy2.info b/academic/rpy2/rpy2.info
new file mode 100644
index 0000000000..4671f1a69b
--- /dev/null
+++ b/academic/rpy2/rpy2.info
@@ -0,0 +1,10 @@
+PRGNAM="rpy2"
+VERSION="3.4.3"
+HOMEPAGE="https://rpy2.github.io/"
+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"
+MAINTAINER="Rob van Nues"
+EMAIL="sborg63@disroot.org"
diff --git a/academic/rpy2/slack-desc b/academic/rpy2/slack-desc
new file mode 100644
index 0000000000..4b6f260ede
--- /dev/null
+++ b/academic/rpy2/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------------------------------------------------------|
+rpy2: rpy2 (R in Python)
+rpy2:
+rpy2: rpy2 is an interface to R running embedded in a Python process.
+rpy2: The project is mature, stable, documented, and widely used
+rpy2:
+rpy2: It is also providing features for when working
+rpy2: with jupyter notebooks or ipython.
+rpy2:
+rpy2: home:https://rpy2.github.io/
+rpy2: https://rpy2.github.io/doc/latest/html/index.html
+rpy2:
diff --git a/academic/sage/README b/academic/sage/README
index ab5e912702..6772d6b5d3 100644
--- a/academic/sage/README
+++ b/academic/sage/README
@@ -14,11 +14,17 @@ redefine $TMP and/or $OUTPUT.
 Note that the build will likely spit out many "zero length file" errors,
 which can safely be ignored.
 
-See README.BUILDOPTS for additional (important) information about
-build options and such.
+See README.BUILDOPTS for additional (important) information
+about build options and such. Specifically, if you do not move the
+installation directory via a specification of SAGEROOT, you may need
+to do something like
 
-This package does not include the doc files. Those can be found at doc.sagemath.org.
+source /etc/profile.d/sage.ch
 
-NOTE:
-If you have ATOM processors, you need to run this command prior building:
-export OPENBLAS_CONFIGURE="TARGET=ATOM"
+so make sure the binary is in your path.
+
+This package does not include the doc files. Those can be found at
+doc.sagemath.org.
+
+NOTE: If you have ATOM processors, you need to run this command prior
+building: export OPENBLAS_CONFIGURE="TARGET=ATOM"
diff --git a/academic/sage/pynac.patch b/academic/sage/pynac.patch
deleted file mode 100644
index c8a0cdc26b..0000000000
--- a/academic/sage/pynac.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/pkgs/pynac/spkg-install.orig	2014-08-11 20:52:14.220516400 +0700
-+++ build/pkgs/pynac/spkg-install	2014-08-11 20:52:27.906551659 +0700
-@@ -31,6 +31,7 @@
- 
- build_pynac()
- {
-+    chmod -R g-w ${PYNACDIR}
-     cd ${PYNACDIR}
-     PKG_CONFIG_PATH=${SAGE_LOCAL}/lib/pkgconfig; export PKG_CONFIG_PATH
-     ./configure --disable-static --prefix=${SAGE_LOCAL} --libdir="$SAGE_LOCAL/lib"
diff --git a/academic/sage/sage-build-root.patch b/academic/sage/sage-build-root.patch
deleted file mode 100644
index 0daaca9c33..0000000000
--- a/academic/sage/sage-build-root.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- sage-6.10/configure.old	2015-12-19 08:15:37.404497471 +0700
-+++ sage-6.10/configure	2015-12-19 08:15:55.691461292 +0700
-@@ -2965,21 +2965,6 @@
- 
- #---------------------------------------------------------
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for root user" >&5
--$as_echo_n "checking for root user... " >&6; }
--
--uid=`id -u`
--if test "x$uid" == "x0"; then
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--    as_fn_error $? "You cannot build Sage as root, switch to an unpriviledged user" "$LINENO" 5
--else
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--fi;
--
--
- # Check whether we are on a supported platform
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
diff --git a/academic/sage/sage.SlackBuild b/academic/sage/sage.SlackBuild
index 7049bb6d27..6cb41edaa4 100644
--- a/academic/sage/sage.SlackBuild
+++ b/academic/sage/sage.SlackBuild
@@ -3,6 +3,8 @@
 # Slackware build script for sage
 # Written by Jack Maddox <jack@auburn.edu>
 # Currently maintained by Christopher L Duston <christopher.duston@protonmail.com>
+# Last update June 2020.
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sage
-VERSION=${VERSION:-9.0}
+VERSION=${VERSION:-9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,8 +37,22 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+#### These lines are to ensure the build can happen on multilib systems.
+if [ "$ARCH" = "i586" ]; then
+LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+LIBDIRSUFFIX="64"
+else
+LIBDIRSUFFIX=""
+fi
+####
+
+# SAGE_ROOT/bin/sage points to the build directory, which can't be
+# in the /tmp folder if we want it to remain after installation.
+# So we'll put it in /var/tmp. Maybe just sticking it in /usr is better.
+
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
+TMP=${TMP:-/var/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -60,16 +76,10 @@ find -L . \
 mkdir -p $PKG/$SAGEROOT $PKG/usr/share/{applications,pixmaps} \
          $PKG/usr/doc/$PRGNAM-$VERSION $PKG/etc/profile.d
 
-# Added freeBSD patch to build as root, thanks to Heinz for pointing it
-patch -p0 < $CWD/pynac.patch
-
-# Added more patch to build as root.
-patch -p1 < $CWD/sage-build-root.patch
-
-# Thanks to Philip Lacroix <slackph@posteo.de>
-rm build/pkgs/python2/patches/sys_path_security-issue_16202.patch
-
-# The docs do not build correctly, so instead of make, do:
+# The docs do not build correctly, so instead of make, do the following:
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
+       ./configure \
+       --enable-build-as-root
 make build
 
 # test all examples in the documentation (over 93,000 line of input)
@@ -114,6 +124,8 @@ fi
 sed "s%SAGEROOT%${SAGEROOT}%" $CWD/$PRGNAM-notebook.desktop > $PKG/usr/share/applications/$PRGNAM-notebook.desktop
 cp src/doc/common/themes/sage/static/sageicon.png $PKG/usr/share/pixmaps/
 
+# Put a line here which *actually* adds sage to the path
+
 # install sagetex to a location that is accessible to the system TeX installation
 cp -a local/share/texmf $PKG/usr/share
 
diff --git a/academic/sage/sage.info b/academic/sage/sage.info
index c88eea8153..141f25c9ef 100644
--- a/academic/sage/sage.info
+++ b/academic/sage/sage.info
@@ -1,8 +1,8 @@
 PRGNAM="sage"
-VERSION="9.0"
+VERSION="9.1"
 HOMEPAGE="http://www.sagemath.org"
-DOWNLOAD="http://mirrors.mit.edu/sage/src/sage-9.0.tar.gz"
-MD5SUM="b864b8c19d376193e70eb2c8084bbd50"
+DOWNLOAD="http://mirrors.mit.edu/sage/src/sage-9.1.tar.gz"
+MD5SUM="35e0ecbc6cc2ae4e1a68479598e70b7a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/samtools/README b/academic/samtools/README
index 857bfbeaa7..d8e2540720 100644
--- a/academic/samtools/README
+++ b/academic/samtools/README
@@ -1,16 +1,16 @@
-SAM (Sequence Alignment/Map) format is a generic format for storing large 
-nucleotide sequence alignments. The original samtools package has been split 
-into three separate but tightly coordinated projects: htslib (C library for 
-handling high-throughput sequencing data), samtools (for handling SAM, BAM, 
-CRAM), and bcftools (for handling VCF and BCF).
+SAM (Sequence Alignment/Map) format is a generic format for storing
+large nucleotide sequence alignments. The original samtools package has
+been split into three separate but tightly coordinated projects: htslib
+(C library for handling high-throughput sequencing data), samtools (for
+handling SAM, BAM, CRAM), and bcftools (for handling VCF and BCF).
 
-Samtools is now distributed as an individual package. Installation is set up 
-so that the code uses an external HTSlib (also at SBo). Although deprecated 
-upstream, in the case that people need parts of samtools-legacy (e.g header 
-files or libbam) these can be installed from this package by modifying the 
-samtools.Slackbuild. Note that the sam.h of htslib differs from sam.h coming 
-with samtools.
+Samtools is now distributed as an individual package. Installation is
+set up so that the code uses an external HTSlib (also at SBo). Although
+deprecated upstream, in the case that people need parts of
+samtools-legacy (e.g header files or libbam) these can be installed from
+this package by modifying the samtools.Slackbuild. Note that the sam.h
+of htslib differs from sam.h coming with samtools.
 
-Prior to the introduction of HTSlib, SAMtools and BCFtools were distributed 
-in a single samtools-0.1.x package. This old version remains available from 
-SBo as samtools-legacy.
+Prior to the introduction of HTSlib, SAMtools and BCFtools were
+distributed in a single samtools-0.1.x package. This old version remains
+available from SBo as samtools-legacy.
diff --git a/academic/samtools/samtools.SlackBuild b/academic/samtools/samtools.SlackBuild
index 4a7efb30d8..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:
@@ -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=samtools			
-VERSION=${VERSION:-1.10}
+PRGNAM=samtools
+VERSION=${VERSION:-1.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -117,7 +117,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS LICENSE README INSTALL NEWS examples \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/README.references $PKG/usr/doc/$PRGNAM-$VERSION
+cp $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/academic/samtools/samtools.info b/academic/samtools/samtools.info
index 05fe9a33a0..91b54352ff 100644
--- a/academic/samtools/samtools.info
+++ b/academic/samtools/samtools.info
@@ -1,8 +1,8 @@
 PRGNAM="samtools"
-VERSION="1.10"
+VERSION="1.12"
 HOMEPAGE="http://www.htslib.org"
-DOWNLOAD="https://github.com/samtools/samtools/releases/download/1.10/samtools-1.10.tar.bz2"
-MD5SUM="506b0b9b2628e1f3bbedd77855b4c709"
+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/scilab/README b/academic/scilab/README
index 300aaf1edf..66d62a3753 100644
--- a/academic/scilab/README
+++ b/academic/scilab/README
@@ -11,3 +11,6 @@ to run the updated profile scripts.
 
 If you have issues on upgrading/reinstalling or changing desktop
 environments, try delete/rename $HOME/.Scilab to resolve.
+
+Openjdk8 or jdk are optional. Scilab will use the system-wide installed
+java if found. Otherwise, scilab will use its own internal jre.
diff --git a/academic/scilab/scilab.SlackBuild b/academic/scilab/scilab.SlackBuild
index dba3c52491..56e6904a67 100644
--- a/academic/scilab/scilab.SlackBuild
+++ b/academic/scilab/scilab.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scilab
-VERSION=${VERSION:-6.0.2}
+VERSION=${VERSION:-6.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,13 +70,14 @@ mv $PKG/opt/$PRGNAM/lib/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}
 mv $PKG/opt/$PRGNAM/share/mime $PKG/usr/share
 mv $PKG/opt/$PRGNAM/share/icons $PKG/usr/share
 
-# Fix an issue reported here:
-#https://www.linuxquestions.org/questions/slackware-14/how-recover-from-damage-from-slackpkg-%27upgrade%27-scilab-4175656261/page3.html#post6009411
-# Slackware's versions should be plenty new enough.
-mv $PKG/opt/$PRGNAM/lib/thirdparty/redist $PKG/opt/$PRGNAM/lib/thirdparty/NONWORKING_redist
+# Remove conflicting libs (esp. for current)
+rm -f $PKG/opt/$PRGNAM/lib/thirdparty/redist/libncurses.so
+rm -f /$PKG/opt/$PRGNAM/lib/thirdparty/redist/libncurses.so.5
+rm -f $PKG/opt/$PRGNAM/lib/thirdparty/redist/libncurses.so.5.7
 
 # fix issues with .desktop files due to upstream bugs
-rm -rf $PKG/opt/$PRGNAM/share/applications
+rm -rf $PKG/opt/$PRGNAM/share/applications 
+mkdir -p $PKG/usr/share/applications
 cp -a $CWD/*.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/scilab/scilab.info b/academic/scilab/scilab.info
index 2e04b16077..16c72a868c 100644
--- a/academic/scilab/scilab.info
+++ b/academic/scilab/scilab.info
@@ -1,10 +1,10 @@
 PRGNAM="scilab"
-VERSION="6.0.2"
+VERSION="6.1.0"
 HOMEPAGE="http://www.scilab.org"
-DOWNLOAD="http://www.scilab.org/download/6.0.2/scilab-6.0.2.bin.linux-i686.tar.gz"
-MD5SUM="ace129667674a7292511a242fe6b921d"
-DOWNLOAD_x86_64="http://www.scilab.org/download/6.0.2/scilab-6.0.2.bin.linux-x86_64.tar.gz"
-MD5SUM_x86_64="667cb0789c365beab5c2b0a675ffe98d"
-REQUIRES="jdk"
+DOWNLOAD="http://www.scilab.org/download/6.1.0/scilab-6.1.0.bin.linux-i686.tar.gz"
+MD5SUM="dd249770ff4e4c8ef7c7395b1efb713b"
+DOWNLOAD_x86_64="http://www.scilab.org/download/6.1.0/scilab-6.1.0.bin.linux-x86_64.tar.gz"
+MD5SUM_x86_64="e52f9a66d5a015bd03be86b77fd0d7a0"
+REQUIRES=""
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/academic/scipy/README b/academic/scipy/README
index 730af33108..81198ddbe7 100644
--- a/academic/scipy/README
+++ b/academic/scipy/README
@@ -1,24 +1,26 @@
 SciPy (pronounced "Sigh Pie") is open-source software for mathematics,
 science, and engineering.
 
-The SciPy library is built to work with NumPy arrays, and provides many
-user-friendly and efficient numerical routines such as routines for
-numerical integration and optimization. Together, they run on all popular
-operating systems, are quick to install, and are free of charge. NumPy
-and SciPy are easy to use, but powerful enough to be depended upon by
-some of the world's leading scientists and engineers.
+The SciPy library is built to work with NumPy arrays, and provides
+many user-friendly and efficient numerical routines such as routines
+for numerical integration and optimization. Together, they run on
+all popular operating systems, are quick to install, and are free of
+charge. NumPy and SciPy are easy to use, but powerful enough to be
+depended upon by some of the world's leading scientists and engineers.
 
-matplotlib and ipython are nice to have in connection with scipy, but scipy
-does not depend on them.
+matplotlib and ipython are nice to have in connection with scipy, but
+scipy does not depend on them.
 
-Since ver. 0.14.0 scipy uses SuperLU instead of UMFPACK for solving unsymmetric
-sparse linear systems. If you want to use UMFPACK you must install it in advance
-of numpy and build numpy accordingly (see the README to numpy's SlackBuild).
-Moreover, after installing scipy, you have to install scikit-umfpack, which
-presently is not available on SlackBuilds.org.
+Since ver. 0.14.0 scipy uses SuperLU instead of UMFPACK for solving
+unsymmetric sparse linear systems. If you want to use UMFPACK you
+must install it in advance of numpy and build numpy accordingly (see
+the README to numpy's SlackBuild).  Moreover, after installing scipy,
+you have to install scikit-umfpack, which presently is not available on
+SlackBuilds.org.
 
 If you need to build scipy for debugging, set DEBUG=y.
 
 NOTE: If you use this SlackBuild scipy will run with the python version
-      provided by Slackware Linux, which is presently 2.7.xx. If you'd like to
-      use python 3.x then you have to install scipy with the scipy3 SlackBuild.
+      provided by Slackware Linux, which is presently 2.7.xx. If you'd
+      like to use python 3.x then you have to install scipy with the
+      scipy3 SlackBuild.
diff --git a/academic/seaview/seaview.SlackBuild b/academic/seaview/seaview.SlackBuild
index 522170872c..876be6afbc 100644
--- a/academic/seaview/seaview.SlackBuild
+++ b/academic/seaview/seaview.SlackBuild
@@ -26,7 +26,7 @@
 # Thanks to developer Dr. Manolo Gouy for all his help.
 
 PRGNAM=seaview
-VERSION=${VERSION:-5.0}
+VERSION=${VERSION:-5.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/seaview/seaview.info b/academic/seaview/seaview.info
index fc329f3fd3..8a1ff60d21 100644
--- a/academic/seaview/seaview.info
+++ b/academic/seaview/seaview.info
@@ -1,8 +1,8 @@
 PRGNAM="seaview"
-VERSION="5.0"
+VERSION="5.0.4"
 HOMEPAGE="http://doua.prabi.fr/software/seaview/"
-DOWNLOAD="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_5.0.tar.gz"
-MD5SUM="d9f1a97672efb3fd24850cf542326915"
+DOWNLOAD="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_5.0.4.tar.gz"
+MD5SUM="8b36176fb98a508e483285966ad7100c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk PDFlib-Lite Gblocks PhyML clustalo muscle treerecs"
diff --git a/academic/seqkit/README b/academic/seqkit/README
new file mode 100644
index 0000000000..d78d8069cd
--- /dev/null
+++ b/academic/seqkit/README
@@ -0,0 +1,26 @@
+SeqKit - a cross-platform and ultrafast toolkit for FASTA/Q file
+manipulation
+
+FASTA and FASTQ are basic and ubiquitous formats for storing nucleotide
+and protein sequences. Common manipulations of FASTA/Q file include
+converting, searching, filtering, deduplication, splitting, shuffling,
+and sampling. Existing tools only implement some of these manipulations,
+and not particularly efficiently, and some are only available for
+certain operating systems. Furthermore, the complicated installation
+process of required packages and running environments can render these
+programs less user friendly.
+
+This project describes a cross-platform ultrafast comprehensive toolkit
+for FASTA/Q processing. SeqKit provides executable binary files for all
+major operating systems, including Windows, Linux, and Mac OS X, and can
+be directly used without any dependencies or pre-configurations. SeqKit
+demonstrates competitive performance in execution time and memory usage
+compared to similar tools. The efficiency and usability of SeqKit enable
+researchers to rapidly accomplish common FASTA/Q file manipulations.
+
+Note: This just repackages the binaries provided from upstream.
+
+Please cite:
+Wei Shen,Shuai Le,Yan Li ,Fuquan Hu. SeqKit: A Cross-Platform and
+Ultrafast Toolkit for FASTA/Q File Manipulation. October 5, 2016
+https://doi.org/10.1371/journal.pone.0163962
diff --git a/academic/seqkit/seqkit.SlackBuild b/academic/seqkit/seqkit.SlackBuild
new file mode 100644
index 0000000000..d0d7b7265d
--- /dev/null
+++ b/academic/seqkit/seqkit.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# Slackware build script for seqkit
+
+# 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=seqkit
+VERSION=${VERSION:-0.13.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  ARCH=$( uname -m )
+fi
+
+case "$ARCH" in
+  i?86) ARCH=i386
+    BINARCH="386"
+    ;;
+  x86_64)
+    BINARCH="amd64"
+    ;;
+  *)
+    printf "\n\n%s\n" "$ARCH is not supported."
+    exit 1
+    ;;
+esac
+
+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
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_linux_${BINARCH}.tar.gz
+
+install -D -m755 $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
+
+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/academic/seqkit/seqkit.info b/academic/seqkit/seqkit.info
new file mode 100644
index 0000000000..791ed0fc60
--- /dev/null
+++ b/academic/seqkit/seqkit.info
@@ -0,0 +1,10 @@
+PRGNAM="seqkit"
+VERSION="0.13.2"
+HOMEPAGE="https://bioinf.shenwei.me/seqkit/"
+DOWNLOAD="https://github.com/shenwei356/seqkit/releases/download/v0.13.2/seqkit_linux_386.tar.gz"
+MD5SUM="9d5636a8f33651717775313798e1bd5d"
+DOWNLOAD_x86_64="https://github.com/shenwei356/seqkit/releases/download/v0.13.2/seqkit_linux_amd64.tar.gz"
+MD5SUM_x86_64="ec667c86988f968202f9413fb77ca91a"
+REQUIRES=""
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/academic/seqkit/slack-desc b/academic/seqkit/slack-desc
new file mode 100644
index 0000000000..5cbf1904cb
--- /dev/null
+++ b/academic/seqkit/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------------------------------------------------------|
+seqkit: seqkit (Ultrafast toolkit for FASTA/Q file manipulation)
+seqkit:
+seqkit: A cross-platform ultrafast comprehensive toolkit for FASTA/Q
+seqkit: processing.
+seqkit:
+seqkit: https://bioinf.shenwei.me/seqkit/
+seqkit: https://github.com/shenwei356/seqkit
+seqkit: https://doi.org/10.1371/journal.pone.0163962
+seqkit:
+seqkit:
+seqkit:
diff --git a/academic/siril/README b/academic/siril/README
index 3e9ef4ac5e..9d75056201 100644
--- a/academic/siril/README
+++ b/academic/siril/README
@@ -1,7 +1,7 @@
 SIRIL is an astronomical image processing tool.
 
-SIRIL is an image processing tool specially tailored for noise reduction and
-improving the signal/noise ratio of an image from multiple captures as
-required in astronomy.
-SIRIL can align automatically or manually, stack and enhance pictures from
-various file formats, even images sequences (movies and SER files).
+SIRIL is an image processing tool specially tailored for noise
+reduction and improving the signal/noise ratio of an image
+from multiple captures as required in astronomy.  SIRIL can align
+automatically or manually, stack and enhance pictures from various file
+formats, even images sequences (movies and SER files).
diff --git a/academic/spades/spades.SlackBuild b/academic/spades/spades.SlackBuild
index 9111d7444e..c15747f33b 100644
--- a/academic/spades/spades.SlackBuild
+++ b/academic/spades/spades.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=spades
-VERSION=${VERSION:-3.14.0}
+VERSION=${VERSION:-3.14.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/spades/spades.info b/academic/spades/spades.info
index 34c460730b..33a015e53e 100644
--- a/academic/spades/spades.info
+++ b/academic/spades/spades.info
@@ -1,10 +1,10 @@
 PRGNAM="spades"
-VERSION="3.14.0"
+VERSION="3.14.1"
 HOMEPAGE="http://cab.spbu.ru/software/spades/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://cab.spbu.ru/files/release3.14.0/SPAdes-3.14.0.tar.gz"
-MD5SUM_x86_64="e809eeb822fd103461a27eed39b6e709"
+DOWNLOAD_x86_64="http://cab.spbu.ru/files/release3.14.1/SPAdes-3.14.1.tar.gz"
+MD5SUM_x86_64="239f76e0ffe0e06d26f0a24f8d38f278"
 REQUIRES=""
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
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/README b/academic/stellarium/README
index c4a3136eca..09942222a2 100644
--- a/academic/stellarium/README
+++ b/academic/stellarium/README
@@ -5,5 +5,5 @@ projectors. Just set your coordinates and go.
 For reasonable performance, you will want to have some kind of 3D
 acceleration.
 
-gpsd is an optional dependency for enabling location detection through a GPS
-device.
+gpsd is an optional dependency for enabling location detection through
+a GPS device.
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 938a5758fd..ea5d9248da 100644
--- a/academic/suitesparse/suitesparse.SlackBuild
+++ b/academic/suitesparse/suitesparse.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for suitesparse
 
-# Copyright 2017-2019 Christoph Willing,  Brisbane Australia
+# Copyright 2017-2021 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 # Thanks to Pablo Santamaria for previous versions
 #
@@ -25,7 +25,7 @@
 
 PRGNAM=suitesparse
 SRCNAM=SuiteSparse
-VERSION=${VERSION:-5.4.0}
+VERSION=${VERSION:-5.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,7 +63,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -93,7 +93,7 @@ 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
 
-cp -a LICENSE.txt CONTRIBUTOR-LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt CONTRIBUTOR-LICENSE.txt 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/academic/suitesparse/suitesparse.info b/academic/suitesparse/suitesparse.info
index 9e33539498..d8b009880b 100644
--- a/academic/suitesparse/suitesparse.info
+++ b/academic/suitesparse/suitesparse.info
@@ -1,8 +1,8 @@
 PRGNAM="suitesparse"
-VERSION="5.4.0"
+VERSION="5.7.2"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.4.0.tar.gz"
-MD5SUM="4a6d4e74fc44c503f52996ae95cad03a"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.7.2/SuiteSparse-5.7.2.tar.gz"
+MD5SUM="7dc408bd99f825ef75fca0dda708f95d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lapack OpenBLAS chrpath"
diff --git a/academic/suitesparseconfig/README b/academic/suitesparseconfig/README
index 1832b9d60e..88061d2d50 100644
--- a/academic/suitesparseconfig/README
+++ b/academic/suitesparseconfig/README
@@ -1,5 +1,6 @@
-SuiteSparse_config is a common configuration library for the SuiteSparse
-family of sparse matrix packages, including SuiteSparseQR, AMD, CAMD, COLAMD,
-CCOLAMD, CHOLMOD, KLU, BTF, LDL, CXSparse, RBio, and UMFPACK.
+SuiteSparse_config is a common configuration library for the
+SuiteSparse family of sparse matrix packages, including SuiteSparseQR,
+AMD, CAMD, COLAMD, CCOLAMD, CHOLMOD, KLU, BTF, LDL, CXSparse, RBio,
+and UMFPACK.
 
 This library was formerly named UFconfig.
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 67f7922291..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:-3.1.1}
+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 609a18e7f3..561c6831af 100644
--- a/academic/sundials/sundials.info
+++ b/academic/sundials/sundials.info
@@ -1,10 +1,10 @@
 PRGNAM="sundials"
-VERSION="3.1.1"
+VERSION="5.6.1"
 HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-DOWNLOAD="https://computation.llnl.gov/projects/sundials/download/sundials-3.1.1.tar.gz"
-MD5SUM="e63f4de0be5be97f750b30b0fa11ef34"
+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/README b/academic/sword-data-kjv/README
index d4dc4c01ad..1ecea1c77b 100644
--- a/academic/sword-data-kjv/README
+++ b/academic/sword-data-kjv/README
@@ -10,12 +10,13 @@ Go to www.crosswire.org/sword/modules/ to find more texts,
 dictionaries, commentaries and other related stuff which can be used
 by the sword engine.
 
-wget has problems using the urls directly at www.crosswire.org/sword/modules
-allthough a browser such as firefox works fine. See the .info file for an
-example of url location when using wget.
+wget has problems using the urls directly at
+www.crosswire.org/sword/modules allthough a browser such as firefox
+works fine. See the .info file for an example of url location when using
+wget.
 
-most sword based bible programs, such as bibletime or xiphos (gnomesword)
-have a facility to download more content using their gui.
+most sword based bible programs, such as bibletime or xiphos
+(gnomesword) have a facility to download more content using their gui.
 
 Please Note: you need at least sword 1.7.0 or higher to read this data.
 It has been tested with sword 1.7.0 1.7.5a1 and 1.8.1
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/sword/README b/academic/sword/README
index 2de1d80d89..a9972f2fae 100644
--- a/academic/sword/README
+++ b/academic/sword/README
@@ -1,13 +1,19 @@
-The SWORD Project is an effort to create an ever expanding software package
-for research and study of God and His Word.  The SWORD Bible Framework allows
-easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc.
-Many frontends are build using this framework. An installed module set may
-be shared between any frontend using the framework.
+The SWORD Project is an effort to create an ever expanding software
+package for research and study of God and His Word.  The SWORD Bible
+Framework allows easy manipulation of Bible texts, commentaries,
+lexicons,dictionaries, etc.
+Many frontends are build using this framework. An installed module set
+may be shared between any frontend using the framework.
 
 This engine/library needs data to operate on to be usefull.
 
-A sword-data-kjv package is available on sbo to provide a basic bible with
-strongs and Greek and Hebrew dictionaries for use with this library. Many
-more bibles, commentries etc. can be found on the crosswire.org website.
+A sword-data-kjv package is available on sbo to provide a basic bible
+with strongs and Greek and Hebrew dictionaries for use with this
+library. Many more bibles, commentries etc. can be found on the
+crosswire.org website.
+
 modules can be downloaded in raw format (zip) and extracted into the
 /usr/share/sword  directory.
+
+You will also need a frontend, such as xiphos or bibletime (both on sbo)
+to view the bible data.
diff --git a/academic/sword/sword.SlackBuild b/academic/sword/sword.SlackBuild
index ffdff4fc6a..9f12ed43b1 100644
--- a/academic/sword/sword.SlackBuild
+++ b/academic/sword/sword.SlackBuild
@@ -5,7 +5,7 @@
 # Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
-# changes updating to v1.7.5a1 and v1.8.1 Copyright 2015-2018 Tim Dickson, Scotland
+# changes updating to v1.7.5a1 and v1.8.1 Copyright 2015-2020 Tim Dickson, Scotland
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -26,7 +26,7 @@
 
 PRGNAM=sword
 VERSION=${VERSION:-1.8.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -64,6 +64,9 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+#patch to fix pre-chapter text, required for xiphos. when sword tag>1.8.1
+#remove this patch as it will be included.
+patch -p0 -i $CWD/$PRGNAM.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/academic/sword/sword.diff b/academic/sword/sword.diff
new file mode 100644
index 0000000000..ac57df456c
--- /dev/null
+++ b/academic/sword/sword.diff
@@ -0,0 +1,75 @@
+Index: src/mgr/stringmgr.cpp
+===================================================================
+--- src/mgr/stringmgr.cpp	(revision 3718)
++++ src/mgr/stringmgr.cpp	(revision 3721)
+@@ -20,6 +20,7 @@
+  *
+  */
+ 
++#include <ctype.h>
+ #include <stringmgr.h>
+ #include <swlog.h>
+ #include <localemgr.h>
+Index: src/modules/filters/osisxhtml.cpp
+===================================================================
+--- src/modules/filters/osisxhtml.cpp	(revision 3718)
++++ src/modules/filters/osisxhtml.cpp	(revision 3721)
+@@ -849,7 +849,11 @@
+ 			     else if (tag.isEndTag()) {
+ 			     	outText("</div>", buf, u);
+ 			}
+-			else if (!(type == "colophon")) outText(tag, buf, u);
++			else if (!(type == "colophon")) {
++				if (tag.getAttribute("sID")) tag.setEmpty(false);
++				if (tag.getAttribute("eID")) tag.setEndTag(true);
++				outText(tag, buf, u);
++			}
+ 			
+ 		}
+ 		else if (!strcmp(tag.getName(), "span")) {
+Index: src/utilfuns/utilxml.cpp
+===================================================================
+--- src/utilfuns/utilxml.cpp	(revision 3718)
++++ src/utilfuns/utilxml.cpp	(revision 3721)
+@@ -291,13 +291,16 @@
+ 		tag.append('/');
+ 
+ 	tag.append(getName());
+-	for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) {
+-		//tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str());
+-		tag.append(' ');
+-		tag.append(it->first.c_str());
+-		tag.append((strchr(it->second.c_str(), '\"')) ? "=\'" : "=\"");
+-		tag.append(it->second.c_str());
+-		tag.append((strchr(it->second.c_str(), '\"'))? '\'' : '\"');
++
++	if (!isEndTag()) {
++		for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) {
++			//tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str());
++			tag.append(' ');
++			tag.append(it->first.c_str());
++			tag.append((strchr(it->second.c_str(), '\"')) ? "=\'" : "=\"");
++			tag.append(it->second.c_str());
++			tag.append((strchr(it->second.c_str(), '\"'))? '\'' : '\"');
++		}
+ 	}
+ 
+ 	if (isEmpty())
+Index: include/utilxml.h
+===================================================================
+--- include/utilxml.h	(revision 3718)
++++ include/utilxml.h	(revision 3721)
+@@ -75,6 +75,13 @@
+ 	 * otherwise, we return if we're a simple XML end </tag>.
+ 	 */
+ 	bool isEndTag(const char *eID = 0) const;
++	inline void setEndTag(bool value) {
++		if (!parsed)
++			parse();
++		endTag = value;
++		if (value)
++			empty = false;
++	}
+ 
+ 	const StringList getAttributeNames() const;
+ 	int getAttributePartCount(const char *attribName, char partSplit = '|') const;
diff --git a/academic/tiemu/README b/academic/tiemu/README
new file mode 100644
index 0000000000..83497217ab
--- /dev/null
+++ b/academic/tiemu/README
@@ -0,0 +1,7 @@
+TiEmu is a multi-platform emulator for TI89 / TI89 Titanium / TI92 /
+TI92+ / V200PLT hand-helds.
+
+TiEmu does not emulate TI82, 83, ... hand-helds but TiLem does.
+
+TiEmu requires a ROM for your calculator.  A GPL'd ROM called PedroM
+is included.
diff --git a/academic/freechartgeany/doinst.sh b/academic/tiemu/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/academic/freechartgeany/doinst.sh
+++ b/academic/tiemu/doinst.sh
diff --git a/academic/tiemu/patches/01-build-fix.patch b/academic/tiemu/patches/01-build-fix.patch
new file mode 100644
index 0000000000..7660b69430
--- /dev/null
+++ b/academic/tiemu/patches/01-build-fix.patch
@@ -0,0 +1,487 @@
+# This patch is based on the Ubuntu patch for TiEmu 3.02, see 
+# http://packages.ubuntu.com/de/oneiric/tiemu
+
+
+diff -purN tiemu-3.03.orig/src/gui/calc/calc.c tiemu-3.03/src/gui/calc/calc.c
+--- tiemu-3.03.orig/src/gui/calc/calc.c	2007-12-16 16:29:16.000000000 +0100
++++ tiemu-3.03/src/gui/calc/calc.c	2011-11-04 23:11:40.000000000 +0100
+@@ -313,7 +313,7 @@ on_drawingarea1_expose_event           (
+ {
+     gdk_draw_pixmap(
+         widget->window,
+-		widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++		widget->style->fg_gc[gtk_widget_get_state (widget)],
+ 		pixmap,
+ 		event->area.x, event->area.y,
+ 		event->area.x, event->area.y,
+@@ -586,7 +586,7 @@ int  hid_init(void)
+ 
+     // Install LCD refresh: 100 FPS (10 ms)
+     tid = g_timeout_add((params.lcd_rate == -1) ? 50 : params.lcd_rate, 
+-		(GtkFunction)hid_refresh, NULL);
++		(GSourceFunc)hid_refresh, NULL);
+ 
+ 	explicit_destroy = 0;
+ 	gtk_widget_show(main_wnd);	// show wnd here
+@@ -640,7 +640,7 @@ void hid_lcd_rate_set(void)
+ 	g_source_remove(tid);
+ 
+ 	tid = g_timeout_add((params.lcd_rate == -1) ? 50 : params.lcd_rate, 
+-		(GtkFunction)hid_refresh, NULL);
++		(GSourceFunc)hid_refresh, NULL);
+ }
+ 
+ int hid_switch_with_skin(void)
+diff -purN tiemu-3.03.orig/src/gui/calc/popup.c tiemu-3.03/src/gui/calc/popup.c
+--- tiemu-3.03.orig/src/gui/calc/popup.c	2009-05-08 22:43:47.000000000 +0200
++++ tiemu-3.03/src/gui/calc/popup.c	2011-11-04 22:45:28.000000000 +0100
+@@ -26,7 +26,9 @@
+ #  include <config.h>
+ #endif
+ 
++#undef GTK_DISABLE_DEPRECATED
+ #include <gtk/gtk.h>
++#define GTK_DISABLE_DEPRECATED
+ #include <glade/glade.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff -purN tiemu-3.03.orig/src/gui/calc/screen.c tiemu-3.03/src/gui/calc/screen.c
+--- tiemu-3.03.orig/src/gui/calc/screen.c	2006-11-06 18:18:51.000000000 +0100
++++ tiemu-3.03/src/gui/calc/screen.c	2011-11-04 23:12:09.000000000 +0100
+@@ -187,7 +187,7 @@ void redraw_skin(void)
+ 	skin_infos.image = gdk_pixbuf_scale_simple(skin_infos.raw, wr.wr.w, wr.wr.h, GDK_INTERP_NEAREST);
+ 
+ 	// and draw image into pixmap (next, into window on expose event)
+-    gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
++    gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
+ 		  skin_infos.image, 0, 0, 0, 0, -1, -1, GDK_RGB_DITHER_NONE, 0, 0);
+ 	gdk_window_invalidate_rect(main_wnd->window, &wr.gr, FALSE);
+ }
+@@ -204,7 +204,7 @@ void redraw_lcd(void)
+ 		gdk_pixbuf_scale_simple(skin_infos.raw, sr.w, sr.h, GDK_INTERP_NEAREST);
+ 
+ 	// and draw
+-	gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
++	gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
+ 		  skin_infos.image, ls.x, ls.y, lr.x, lr.y, lr.w, lr.h, GDK_RGB_DITHER_NONE, 0, 0);
+ 	gtk_widget_queue_draw_area(area, lr.x, lr.y, lr.w, lr.h);
+ }
+@@ -324,7 +324,7 @@ int hid_update_lcd(void)
+ 			skin_infos.image = gdk_pixbuf_scale_simple(lcd, lr.w, lr.h, GDK_INTERP_NEAREST);
+ 
+ 			// and draw image into pixmap (next, into window on expose event)
+-			gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
++			gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
+ 			 skin_infos.image, src.x, src.y, lr.x, lr.y, src.w, src.h,
+ 			  GDK_RGB_DITHER_NONE, 0, 0);
+ 			gtk_widget_queue_draw_area(area, lr.x, lr.y, src.w, src.h);
+@@ -332,7 +332,7 @@ int hid_update_lcd(void)
+ 		else
+ 		{
+ 			// and draw image into pixmap (next, into window on expose event)
+-			gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
++			gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
+ 			  lcd_mem, src.x, src.y, lr.x, lr.y, src.w, src.h,
+ 			  GDK_RGB_DITHER_NONE, 0, 0);
+ 			gtk_widget_queue_draw_area(area, lr.x, lr.y, src.w, src.h);
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_all.c tiemu-3.03/src/gui/debugger/dbg_all.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_all.c	2009-05-08 12:56:40.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_all.c	2011-11-04 22:46:29.000000000 +0100
+@@ -90,21 +90,21 @@ void gtk_debugger_refresh(void)
+ {	
+ 	WND_TMR_START();
+ 
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.regs))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.regs))
+ 		dbgregs_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.mem))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.mem))
+ 		dbgmem_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.bkpts))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.bkpts))
+ 		dbgbkpts_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.pclog))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.pclog))
+ 		dbgpclog_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.code))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.code))
+ 		dbgcode_refresh_window();
+-    if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.stack))
++    if(options3.dbg_dock || gtk_widget_get_visible(dbgw.stack))
+ 		dbgstack_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.heap))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.heap))
+ 		dbgheap_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.iop))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.iop))
+ 		dbgiop_refresh_window();
+ 
+ 	WND_TMR_STOP("Debugger Refresh Time");
+@@ -163,7 +163,7 @@ int gtk_debugger_enter(int context)
+ 	gtk_debugger_refresh();
+ 
+ 	// enable the debugger if GDB disabled it
+-	if (!options3.dbg_dock && !GTK_WIDGET_SENSITIVE(dbgw.regs))
++	if (!options3.dbg_dock && !gtk_widget_get_sensitive(dbgw.regs))
+ 		gtk_debugger_enable();
+ 
+ 	// handle automatic debugging requests
+@@ -180,7 +180,7 @@ int gtk_debugger_enter(int context)
+ 
+ 			ti68k_bkpt_get_pgmentry_offset(id, &handle, &offset);
+ 			ti68k_bkpt_del_pgmentry(handle);
+-			if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.bkpts))
++			if(options3.dbg_dock || gtk_widget_get_visible(dbgw.bkpts))
+ 				dbgbkpts_refresh_window();
+ 
+ 			delete_command(NULL, 0);
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_bkpts.c tiemu-3.03/src/gui/debugger/dbg_bkpts.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_bkpts.c	2009-05-06 21:48:47.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_bkpts.c	2011-11-04 22:46:29.000000000 +0100
+@@ -388,7 +388,7 @@ GtkWidget* dbgbkpts_display_window(void)
+ 		gtk_window_iconify(GTK_WINDOW(wnd));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.bkpts) && !options3.bkpts.closed)
++	if(!gtk_widget_get_visible(dbgw.bkpts) && !options3.bkpts.closed)
+ 		gtk_widget_show(wnd);
+ 
+ 	return wnd;
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_code.c tiemu-3.03/src/gui/debugger/dbg_code.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_code.c	2009-05-06 21:48:47.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_code.c	2011-11-04 22:46:29.000000000 +0100
+@@ -1117,7 +1117,7 @@ void gdbcallback_refresh_debugger(void)
+ 
+ int dbgcode_quit_enabled(void)
+ {
+-	return GTK_WIDGET_SENSITIVE(mi.m8);
++	return gtk_widget_get_sensitive(mi.m8);
+ }
+ 
+ static int close_debugger_wrapper(gpointer data)
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_dock.c tiemu-3.03/src/gui/debugger/dbg_dock.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_dock.c	2008-05-26 18:48:30.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_dock.c	2011-11-04 23:05:02.000000000 +0100
+@@ -151,22 +151,22 @@ void dbgdock_set_sensitivity(int state)
+ 

+ void dbgdock_show_all(int all)

+ {

+-	if(!GTK_WIDGET_VISIBLE(dbgw.dock) && all)

++	if(!gtk_widget_get_visible(dbgw.dock) && all)

+         gtk_widget_show(dbgw.dock);

+ 

+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))

++	if(gtk_widget_get_visible(dbgw.iop))

+         gtk_window_iconify(GTK_WINDOW(dbgw.iop));

+-	if(GTK_WIDGET_VISIBLE(dbgw.pclog))

++	if(gtk_widget_get_visible(dbgw.pclog))

+         gtk_window_iconify(GTK_WINDOW(dbgw.pclog));

+ }

+ 

+ void dbgdock_hide_all(int all)

+ {

+-	if(GTK_WIDGET_VISIBLE(dbgw.dock) && all)

++	if(gtk_widget_get_visible(dbgw.dock) && all)

+         gtk_widget_hide(dbgw.dock);

+ 

+-    if(GTK_WIDGET_VISIBLE(dbgw.pclog))

++    if(gtk_widget_get_visible(dbgw.pclog))

+         gtk_widget_hide(dbgw.pclog);

+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))

++	if(gtk_widget_get_visible(dbgw.iop))

+         gtk_widget_hide(dbgw.iop);

+ }

+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_heap.c tiemu-3.03/src/gui/debugger/dbg_heap.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_heap.c	2009-05-06 21:48:47.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_heap.c	2011-11-04 22:46:29.000000000 +0100
+@@ -171,7 +171,7 @@ GtkWidget* dbgheap_display_window(void)
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.heap));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.heap) && !options3.heap.closed)
++	if(!gtk_widget_get_visible(dbgw.heap) && !options3.heap.closed)
+ 		gtk_widget_show(dbgw.heap);
+ 
+ 	return dbgw.heap;
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_iop.c tiemu-3.03/src/gui/debugger/dbg_iop.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_iop.c	2009-05-02 21:46:04.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_iop.c	2011-11-04 22:46:29.000000000 +0100
+@@ -455,7 +455,7 @@ GtkWidget* dbgiop_display_window(void)
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.iop));
+ #endif
+     
+-	if(!GTK_WIDGET_VISIBLE(dbgw.iop) && !options3.iop.closed)
++	if(!gtk_widget_get_visible(dbgw.iop) && !options3.iop.closed)
+ 		gtk_widget_show(dbgw.iop);
+ 
+ 	return dbgw.iop;
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_mem.c tiemu-3.03/src/gui/debugger/dbg_mem.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_mem.c	2009-05-06 21:48:47.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_mem.c	2011-11-04 22:46:29.000000000 +0100
+@@ -435,7 +435,7 @@ GtkWidget* dbgmem_display_window(void)
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.mem));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.mem) && !options3.mem.closed)
++	if(!gtk_widget_get_visible(dbgw.mem) && !options3.mem.closed)
+ 		gtk_widget_show(dbgw.mem);
+ 
+     return dbgw.mem;
+@@ -605,7 +605,7 @@ dbgmem_button6_clicked
+ 
+ GLADE_CB void
+ on_notebook1_switch_page               (GtkNotebook     *notebook,
+-                                        GtkNotebookPage *page,
++                                        gpointer        *page,
+                                         guint            page_num,
+                                         gpointer         user_data)
+ {
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_pclog.c tiemu-3.03/src/gui/debugger/dbg_pclog.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_pclog.c	2009-05-02 21:46:04.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_pclog.c	2011-11-04 22:46:29.000000000 +0100
+@@ -163,7 +163,7 @@ GtkWidget* dbgpclog_display_window(void)
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.pclog));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.pclog) && !options3.pclog.closed)
++	if(!gtk_widget_get_visible(dbgw.pclog) && !options3.pclog.closed)
+ 		gtk_widget_show(dbgw.pclog);
+ 
+ 	return dbgw.pclog;
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_regs.c tiemu-3.03/src/gui/debugger/dbg_regs.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_regs.c	2009-05-06 21:48:47.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_regs.c	2011-11-04 22:46:29.000000000 +0100
+@@ -302,7 +302,7 @@ GtkWidget* dbgregs_display_window(void)
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.regs));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.regs) && !options3.regs.closed)
++	if(!gtk_widget_get_visible(dbgw.regs) && !options3.regs.closed)
+ 		gtk_widget_show(dbgw.regs);
+ 
+ 	return dbgw.regs;
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_romcall.c tiemu-3.03/src/gui/debugger/dbg_romcall.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_romcall.c	2007-07-05 13:36:10.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_romcall.c	2011-11-04 22:46:29.000000000 +0100
+@@ -29,7 +29,9 @@
+ #  include <config.h>
+ #endif
+ 
+-#include <gtk/gtk.h>
++#undef GTK_DISABLE_DEPRECATED
++ #include <gtk/gtk.h>
++#define GTK_DISABLE_DEPRECATED
+ #include <glade/glade.h>
+ #include <string.h>
+ 
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_stack.c tiemu-3.03/src/gui/debugger/dbg_stack.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_stack.c	2009-05-06 21:48:47.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_stack.c	2011-11-04 22:46:29.000000000 +0100
+@@ -197,7 +197,7 @@ GtkWidget* dbgstack_display_window(void)
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.stack));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.stack) && !options3.stack.closed)
++	if(!gtk_widget_get_visible(dbgw.stack) && !options3.stack.closed)
+ 		gtk_widget_show(dbgw.stack);
+ 
+ 	return dbgw.stack;
+diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_wnds.c tiemu-3.03/src/gui/debugger/dbg_wnds.c
+--- tiemu-3.03.orig/src/gui/debugger/dbg_wnds.c	2009-05-07 09:18:02.000000000 +0200
++++ tiemu-3.03/src/gui/debugger/dbg_wnds.c	2011-11-04 23:07:54.000000000 +0100
+@@ -74,21 +74,21 @@ void dbgwnds_minimize_all(int all)
+ 	if(options3.dbg_dock)

+ 		return;

+ 

+-    if(GTK_WIDGET_VISIBLE(dbgw.regs))

++    if(gtk_widget_get_visible(dbgw.regs))

+         gtk_window_iconify(GTK_WINDOW(dbgw.regs));

+-    if(GTK_WIDGET_VISIBLE(dbgw.bkpts))

++    if(gtk_widget_get_visible(dbgw.bkpts))

+         gtk_window_iconify(GTK_WINDOW(dbgw.bkpts));

+-    if(GTK_WIDGET_VISIBLE(dbgw.mem))

++    if(gtk_widget_get_visible(dbgw.mem))

+         gtk_window_iconify(GTK_WINDOW(dbgw.mem));

+-    if(GTK_WIDGET_VISIBLE(dbgw.pclog))

++    if(gtk_widget_get_visible(dbgw.pclog))

+         gtk_window_iconify(GTK_WINDOW(dbgw.pclog));

+-    if(GTK_WIDGET_VISIBLE(dbgw.code) & all)

++    if(gtk_widget_get_visible(dbgw.code) & all)

+         gtk_window_iconify(GTK_WINDOW(dbgw.code));

+-    if(GTK_WIDGET_VISIBLE(dbgw.stack))

++    if(gtk_widget_get_visible(dbgw.stack))

+         gtk_window_iconify(GTK_WINDOW(dbgw.stack));

+-	if(GTK_WIDGET_VISIBLE(dbgw.heap))

++	if(gtk_widget_get_visible(dbgw.heap))

+         gtk_window_iconify(GTK_WINDOW(dbgw.heap));

+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))

++	if(gtk_widget_get_visible(dbgw.iop))

+         gtk_window_iconify(GTK_WINDOW(dbgw.iop));

+ }

+ 

+@@ -98,21 +98,21 @@ void dbgwnds_unminimize_all(int all)
+ 	if(options3.dbg_dock)

+ 		return;

+ 

+-    if(GTK_WIDGET_VISIBLE(dbgw.regs))

++    if(gtk_widget_get_visible(dbgw.regs))

+         gtk_window_deiconify(GTK_WINDOW(dbgw.regs));

+-    if(GTK_WIDGET_VISIBLE(dbgw.bkpts))

++    if(gtk_widget_get_visible(dbgw.bkpts))

+         gtk_window_deiconify(GTK_WINDOW(dbgw.bkpts));

+-    if(GTK_WIDGET_VISIBLE(dbgw.mem))

++    if(gtk_widget_get_visible(dbgw.mem))

+         gtk_window_deiconify(GTK_WINDOW(dbgw.mem));

+-    if(GTK_WIDGET_VISIBLE(dbgw.pclog))

++    if(gtk_widget_get_visible(dbgw.pclog))

+         gtk_window_deiconify(GTK_WINDOW(dbgw.pclog));

+-    if(GTK_WIDGET_VISIBLE(dbgw.code) & all)

++    if(gtk_widget_get_visible(dbgw.code) & all)

+         gtk_window_deiconify(GTK_WINDOW(dbgw.code));

+-    if(GTK_WIDGET_VISIBLE(dbgw.stack))

++    if(gtk_widget_get_visible(dbgw.stack))

+         gtk_window_deiconify(GTK_WINDOW(dbgw.stack));

+-	if(GTK_WIDGET_VISIBLE(dbgw.heap))

++	if(gtk_widget_get_visible(dbgw.heap))

+         gtk_window_deiconify(GTK_WINDOW(dbgw.heap));

+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))

++	if(gtk_widget_get_visible(dbgw.iop))

+         gtk_window_deiconify(GTK_WINDOW(dbgw.iop));

+ }

+ 

+@@ -122,21 +122,21 @@ void dbgwnds_show_all(int all)
+     if(options3.dbg_dock)

+ 		return;

+ 

+-    if(!GTK_WIDGET_VISIBLE(dbgw.regs))

++    if(!gtk_widget_get_visible(dbgw.regs))

+         gtk_widget_show(dbgw.regs);

+-    if(!GTK_WIDGET_VISIBLE(dbgw.bkpts))

++    if(!gtk_widget_get_visible(dbgw.bkpts))

+         gtk_widget_show(dbgw.bkpts);

+-    if(!GTK_WIDGET_VISIBLE(dbgw.mem))

++    if(!gtk_widget_get_visible(dbgw.mem))

+         gtk_widget_show(dbgw.mem);

+-    if(!GTK_WIDGET_VISIBLE(dbgw.pclog))

++    if(!gtk_widget_get_visible(dbgw.pclog))

+         gtk_widget_show(dbgw.pclog);

+-    if(!GTK_WIDGET_VISIBLE(dbgw.code) && all)

++    if(!gtk_widget_get_visible(dbgw.code) && all)

+         gtk_widget_show(dbgw.code);

+-    if(!GTK_WIDGET_VISIBLE(dbgw.stack))

++    if(!gtk_widget_get_visible(dbgw.stack))

+         gtk_widget_show(dbgw.stack);

+-	if(!GTK_WIDGET_VISIBLE(dbgw.heap))

++	if(!gtk_widget_get_visible(dbgw.heap))

+         gtk_widget_show(dbgw.heap);

+-	if(!GTK_WIDGET_VISIBLE(dbgw.iop))

++	if(!gtk_widget_get_visible(dbgw.iop))

+         gtk_widget_show(dbgw.iop);

+ }

+ 

+@@ -146,21 +146,21 @@ void dbgwnds_hide_all(int all)
+     if(options3.dbg_dock)

+ 		return;

+ 

+-    if(GTK_WIDGET_VISIBLE(dbgw.regs))

++    if(gtk_widget_get_visible(dbgw.regs))

+         gtk_widget_hide(dbgw.regs);

+-    if(GTK_WIDGET_VISIBLE(dbgw.bkpts))

++    if(gtk_widget_get_visible(dbgw.bkpts))

+         gtk_widget_hide(dbgw.bkpts);

+-    if(GTK_WIDGET_VISIBLE(dbgw.mem))

++    if(gtk_widget_get_visible(dbgw.mem))

+         gtk_widget_hide(dbgw.mem);

+-    if(GTK_WIDGET_VISIBLE(dbgw.pclog))

++    if(gtk_widget_get_visible(dbgw.pclog))

+         gtk_widget_hide(dbgw.pclog);

+-    if(GTK_WIDGET_VISIBLE(dbgw.code) && all)

++    if(gtk_widget_get_visible(dbgw.code) && all)

+         gtk_widget_hide(dbgw.code);

+-    if(GTK_WIDGET_VISIBLE(dbgw.stack))

++    if(gtk_widget_get_visible(dbgw.stack))

+         gtk_widget_hide(dbgw.stack);

+-	if(GTK_WIDGET_VISIBLE(dbgw.heap))

++	if(gtk_widget_get_visible(dbgw.heap))

+         gtk_widget_hide(dbgw.heap);

+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))

++	if(gtk_widget_get_visible(dbgw.iop))

+         gtk_widget_hide(dbgw.iop);

+ }

+ 

+@@ -338,7 +338,7 @@ void update_submenu(GtkWidget *widget, g
+ 	if(!options3.dbg_dock)

+ 	{

+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_registers1_activate, NULL);

+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.regs));

++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.regs));

+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_registers1_activate, NULL);

+ 	}

+ 	else

+@@ -350,7 +350,7 @@ void update_submenu(GtkWidget *widget, g
+ 	if(!options3.dbg_dock)

+ 	{

+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_breakpoints1_activate, NULL);

+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.bkpts));

++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.bkpts));

+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_breakpoints1_activate, NULL);

+ 	}

+ 	else

+@@ -362,7 +362,7 @@ void update_submenu(GtkWidget *widget, g
+ 	if(!options3.dbg_dock)

+ 	{

+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_memory1_activate, NULL);

+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.mem));

++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.mem));

+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_memory1_activate, NULL);

+ 	}

+ 	else

+@@ -372,7 +372,7 @@ void update_submenu(GtkWidget *widget, g
+     elt = g_list_nth(list, 3);

+     item = GTK_CHECK_MENU_ITEM(elt->data);

+     g_signal_handlers_block_by_func(GTK_OBJECT(item), on_pc_log1_activate, NULL);

+-    gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.pclog));

++    gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.pclog));

+     g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_pc_log1_activate, NULL);

+ 

+     // stack

+@@ -381,7 +381,7 @@ void update_submenu(GtkWidget *widget, g
+ 	if(!options3.dbg_dock)

+ 	{

+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_stack_frame1_activate, NULL);

+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.stack));

++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.stack));

+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_stack_frame1_activate, NULL);

+ 	}

+ 	else

+@@ -393,7 +393,7 @@ void update_submenu(GtkWidget *widget, g
+ 	if(!options3.dbg_dock)

+ 	{

+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_heap_frame1_activate, NULL);

+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.heap));

++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.heap));

+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_heap_frame1_activate, NULL);

+ 	}

+ 	else

+@@ -403,7 +403,7 @@ void update_submenu(GtkWidget *widget, g
+ 	elt = g_list_nth(list, 6);

+     item = GTK_CHECK_MENU_ITEM(elt->data);

+     g_signal_handlers_block_by_func(GTK_OBJECT(item), on_ioports_frame1_activate, NULL);

+-    gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.iop));

++    gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.iop));

+     g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_ioports_frame1_activate, NULL);

+ 

+ 	// dock/multi mode

+diff -purN tiemu-3.03.orig/src/gui/filesel.c tiemu-3.03/src/gui/filesel.c
+--- tiemu-3.03.orig/src/gui/filesel.c	2007-12-16 16:54:33.000000000 +0100
++++ tiemu-3.03/src/gui/filesel.c	2011-11-04 22:45:28.000000000 +0100
+@@ -41,7 +41,9 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#undef GTK_DISABLE_DEPRECATED
+ #include <gtk/gtk.h>
++#define GTK_DISABLE_DEPRECATED
+ #include <string.h>
+ 
+ #ifdef __WIN32__
diff --git a/academic/tiemu/patches/sysdeps.patch b/academic/tiemu/patches/sysdeps.patch
new file mode 100644
index 0000000000..8a4addb76e
--- /dev/null
+++ b/academic/tiemu/patches/sysdeps.patch
@@ -0,0 +1,15 @@
+--- sysdeps.h.orig	2018-10-18 19:48:03.258705538 -0700
++++ tiemu-3.03/src/core/uae/sysdeps.h	2018-10-18 19:48:34.178704986 -0700
+@@ -137,12 +137,6 @@
+ #define ENUMDECL typedef enum
+ #define ENUMNAME(name) name
+ 
+-/* While we're here, make abort more useful.  */
+-#define abort() \
+-  do { \
+-    fprintf (stderr, "UAE: Internal error; file %s, line %d\n", __FILE__, __LINE__); \
+-    (abort) (); \
+-} while (0)
+ #else
+ #define ENUMDECL enum
+ #define ENUMNAME(name) ; typedef int name
diff --git a/academic/tiemu/slack-desc b/academic/tiemu/slack-desc
new file mode 100644
index 0000000000..36e348bc0a
--- /dev/null
+++ b/academic/tiemu/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------------------------------------------------------|
+tiemu: tiemu (TI-89/92/V200 emulator for linux)
+tiemu:
+tiemu: TiEmu emulates Texas Instruments calculators TI-89/92/92+/V200PLT
+tiemu: (no GDB).
+tiemu:
+tiemu: Homepage: http://lpg.ticalc.org/prj_tiemu/
+tiemu:
+tiemu:
+tiemu:
+tiemu:
+tiemu:
diff --git a/academic/tiemu/tiemu.SlackBuild b/academic/tiemu/tiemu.SlackBuild
new file mode 100644
index 0000000000..19e4cbaca5
--- /dev/null
+++ b/academic/tiemu/tiemu.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackbuild for tiemu
+
+# 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=tiemu
+VERSION=${VERSION:-3.03}
+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-nogdb.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 {} \;
+
+# A few necessary patches
+# https://aur.archlinux.org/packages/tiemu/#comment-667308
+patch -p1 < $CWD/patches/01-build-fix.patch
+patch -p1 < $CWD/patches/sysdeps.patch
+
+OPT_CFLAGS="" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux \
+  --without-kde \
+  --disable-gdb
+
+make
+
+DESTDIR=$PKG make 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
+
+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 BUGS COPYING ChangeLog INSTALL LICENSES NEWS \
+  README RELEASE TODO docs/ \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc -name "Makefile" -delete
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+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/tiemu/tiemu.info b/academic/tiemu/tiemu.info
new file mode 100644
index 0000000000..d665780f3f
--- /dev/null
+++ b/academic/tiemu/tiemu.info
@@ -0,0 +1,10 @@
+PRGNAM="tiemu"
+VERSION="3.03"
+HOMEPAGE="http://lpg.ticalc.org/prj_tiemu/"
+DOWNLOAD="http://download.sourceforge.net/project/gtktiemu/tiemu-linux/TIEmu%203.03/tiemu-3.03-nogdb.tar.gz"
+MD5SUM="2736440d717a0ee97cdb35189814fc93"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libticalcs2"
+MAINTAINER="shelldweller"
+EMAIL="shelldweller@beauxbead.com"
diff --git a/academic/treerecs/README b/academic/treerecs/README
index cd3794ca26..e338496bfb 100644
--- a/academic/treerecs/README
+++ b/academic/treerecs/README
@@ -28,3 +28,10 @@ Bio++ use.
 
 2) genetreeEditor: a small program which provides editing of gene names 
 using species names and format conversion (Newick, Nhx or PhyloXML) . 
+
+For more information, see preprint at  bioRxiv:
+Treerecs: an integrated phylogenetic tool, from sequences to reconciliations
+Nicolas Comte, Benoit Morel, Damir Hasic, Laurent Guéguen, Bastien Boussau,
+Vincent Daubin, Simon Penel, Celine Scornavacca, Manolo Gouy, Alexandros
+Stamatakis, Eric Tannier, View ORCID ProfileDavid P. Parsons
+https://www.biorxiv.org/content/10.1101/782946v1
diff --git a/academic/treerecs/treerecs.SlackBuild b/academic/treerecs/treerecs.SlackBuild
index 4bff8e9c09..ca63edaedc 100644
--- a/academic/treerecs/treerecs.SlackBuild
+++ b/academic/treerecs/treerecs.SlackBuild
@@ -22,17 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Thanks to David Parsons for clarifications about the scipt and suggestions!
+
 PRGNAM=treerecs
-VERSION=${VERSION:-1.1_gitd1c1bfaf}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-COMMIT=d1c1bfaf3e6f072436661c80346dee9ae54b3310
-
-# Depending on whether you clicked or used wget to download, the tarball
-# name is different. Bleh...
-WGETNAME=archive
-CLICKNAME=Treerecs-master
+SRCNAM=Treerecs
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -66,15 +63,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $CLICKNAME-$COMMIT
-
-if [ -e $CWD/$WGETNAME.tar.gz ]; then
-  tar xvf $CWD/$WGETNAME.tar.gz
-else
-  tar xvf $CWD/$CLICKNAME-$COMMIT.tar.gz
-fi
-
-cd $CLICKNAME-$COMMIT
+rm -rf $SRCNAM-v${VERSION}
+tar xvf $CWD/$SRCNAM-v${VERSION}.tar.gz
+cd $SRCNAM-v${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -87,12 +78,12 @@ cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=MinSizeRel ..
+    -DCMAKE_BUILD_TYPE=Release ..
   make
 cd ..
 
 # This is the program executable. Using "make install DESTDIR=$PKG"
-# works, but is simply puts the treerecs in /usr/local/bin and that's it
+# works, but it simply puts treerecs in /usr/local/bin and that's it
 install -D -m755 build/bin/$PRGNAM $PKG/usr/bin/$PRGNAM
 
 # Include the extra binaries
@@ -115,6 +106,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/academic/treerecs/treerecs.info b/academic/treerecs/treerecs.info
index 12feb2eed3..f6a81aa05b 100644
--- a/academic/treerecs/treerecs.info
+++ b/academic/treerecs/treerecs.info
@@ -1,8 +1,8 @@
 PRGNAM="treerecs"
-VERSION="1.1_gitd1c1bfaf"
+VERSION="1.2"
 HOMEPAGE="https://project.inria.fr/treerecs/"
-DOWNLOAD="https://gitlab.inria.fr/Phylophile/Treerecs/repository/archive.tar.gz"
-MD5SUM="1a378daca947481f08071b51950e021e"
+DOWNLOAD="https://gitlab.inria.fr/Phylophile/Treerecs/-/archive/v1.2/Treerecs-v1.2.tar.gz"
+MD5SUM="a85d2dc0047278bfb0017c2b69824b56"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/trfind/trfind.SlackBuild b/academic/trfind/trfind.SlackBuild
index 76783294e3..22702f68c8 100644
--- a/academic/trfind/trfind.SlackBuild
+++ b/academic/trfind/trfind.SlackBuild
@@ -23,16 +23,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=trfind
-VERSION=${VERSION:-4.09}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.09.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=trf
-BINVER=409
+SRCNAM=TRF
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i386 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -43,30 +42,64 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e
-
-if [ "$ARCH" != "i386" ] && [ "$ARCH" != "x86_64" ]; then
-  printf "\n\n$ARCH is not supported... \n"
-  exit 1
-fi
-
-# Determine binary architecture
-if [ "$ARCH" = "x86_64" ]; then
-  BINARCH="linux64"
+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
-  BINARCH="linux32"
+  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" \
+./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" works, but it is simpler this way
+install -D -m755 src/trf $PKG/usr/bin/trf
+
+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 -D -m755 $CWD/${SRCNAM}${BINVER}.${BINARCH} $PKG/usr/bin/$SRCNAM
+# Include FASTA examples, but let's compress the file first
+mkdir -p $PKG/usr/share/$PRGNAM
+gzip test_seqs.fasta
+cp test_seqs.fasta.gz $PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md COPYING INSTALL history.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
-cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/academic/trfind/trfind.info b/academic/trfind/trfind.info
index 2dfb07986d..adaf4da150 100644
--- a/academic/trfind/trfind.info
+++ b/academic/trfind/trfind.info
@@ -1,10 +1,10 @@
 PRGNAM="trfind"
-VERSION="4.09"
+VERSION="4.09.1"
 HOMEPAGE="https://tandem.bu.edu/trf/trf.html"
-DOWNLOAD="http://tandem.bu.edu/trf/downloads/trf409.linux32"
-MD5SUM="285478f16f417d6e9c9700f556373e43"
-DOWNLOAD_x86_64="http://tandem.bu.edu/trf/downloads/trf409.linux64"
-MD5SUM_x86_64="0c594fe666e0332db1df9d160d7fabc8"
+DOWNLOAD="https://github.com/Benson-Genomics-Lab/TRF/archive/v4.09.1/TRF-4.09.1.tar.gz"
+MD5SUM="8569300f69776b65e22ad12caa682ab8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
diff --git a/academic/trimmomatic/trimmomatic.SlackBuild b/academic/trimmomatic/trimmomatic.SlackBuild
index 1ed26bf60e..0d97cfc60f 100644
--- a/academic/trimmomatic/trimmomatic.SlackBuild
+++ b/academic/trimmomatic/trimmomatic.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=trimmomatic
 ZIPNAM=Trimmomatic
-VERSION=${VERSION:-0.38}
+VERSION=${VERSION:-0.39}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/trimmomatic/trimmomatic.info b/academic/trimmomatic/trimmomatic.info
index b16aab676e..6c32699d20 100644
--- a/academic/trimmomatic/trimmomatic.info
+++ b/academic/trimmomatic/trimmomatic.info
@@ -1,8 +1,8 @@
 PRGNAM="trimmomatic"
-VERSION="0.38"
+VERSION="0.39"
 HOMEPAGE="http://www.usadellab.org/cms/?page=trimmomatic"
-DOWNLOAD="http://www.usadellab.org/cms/uploads/supplementary/Trimmomatic/Trimmomatic-0.38.zip"
-MD5SUM="4b3df3caf7fe803ca54c79db1a99c464"
+DOWNLOAD="http://www.usadellab.org/cms/uploads/supplementary/Trimmomatic/Trimmomatic-0.39.zip"
+MD5SUM="271ed9dca91132eee0c960e0ae487bcd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/academic/tuxmath/README b/academic/tuxmath/README
index 6f0d31eb6c..c41e37853f 100644
--- a/academic/tuxmath/README
+++ b/academic/tuxmath/README
@@ -1,4 +1,4 @@
-"Tux, of Math Command" (aka. tuxmath) is a math drill game starring Tux,
-the Linux Penguin. Lessons are included from simple number typing through
-addition, subtraction, multiplication, and division of positive and
-negative numbers.  It is intended for kids ~4-10.
+"Tux, of Math Command" (aka. tuxmath) is a math drill game starring
+Tux, the Linux Penguin. Lessons are included from simple number typing
+through addition, subtraction, multiplication, and division of positive
+and negative numbers.  It is intended for kids ~4-10.
diff --git a/academic/ugene/README b/academic/ugene/README
index a75fc649e8..de420023f9 100644
--- a/academic/ugene/README
+++ b/academic/ugene/README
@@ -52,7 +52,7 @@ program. All of them are available at SlackBuilds.org:
 - fastqc (A quality control tool for high throughput sequence data)
 - HMMER (Biosequence analysis using profile hidden Markov models)
 - kraken (Assign taxonomic labels to short DNA sequences)
-- MetaPhlAn2 (Metagenomic Phylogenetic Analysis)
+- MetaPhlAn (Metagenomic Phylogenetic Analysis)
 - ncbi-blast (BLAST: Basic Local Alignment Search Tool)
 - ncbi-blast+ (BLAST+ Command Line Applications)
 - PhyML (Phylogenetic estimation using Maximum Likelihood)
diff --git a/academic/ugene/ugene.SlackBuild b/academic/ugene/ugene.SlackBuild
index c9c8a749b1..45a5a5885a 100644
--- a/academic/ugene/ugene.SlackBuild
+++ b/academic/ugene/ugene.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ugene
-VERSION=${VERSION:-33.0}
+VERSION=${VERSION:-35.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,7 +79,8 @@ sed -i "s:/share/man:/man:g" src/ugene_globals.pri
 
 qmake-qt5 $QMAKECONFIG -r \
 QMAKE_CFLAGS="$SLKCFLAGS" \
-QMAKE_CXXFLAGS="$SLKCFLAGS"
+QMAKE_CXXFLAGS="$SLKCFLAGS" \
+UGENE_EXCLUDE_LIST_ENABLED=1
 make
 make install INSTALL_ROOT=$PKG
 
diff --git a/academic/ugene/ugene.info b/academic/ugene/ugene.info
index 6bacb212b0..e253011b26 100644
--- a/academic/ugene/ugene.info
+++ b/academic/ugene/ugene.info
@@ -1,8 +1,8 @@
 PRGNAM="ugene"
-VERSION="33"
+VERSION="35.0"
 HOMEPAGE="http://ugene.net/"
-DOWNLOAD="https://github.com/ugeneunipro/ugene/archive/33.0/ugene-33.0.tar.gz"
-MD5SUM="d4314b2294d0bd48c26deba7101250e3"
+DOWNLOAD="https://github.com/ugeneunipro/ugene/archive/35.0/ugene-35.0.tar.gz"
+MD5SUM="c1cb1ee73140d09568706f1fc1b798dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5-webkit"
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/units/units.SlackBuild b/academic/units/units.SlackBuild
index 3897551a24..188212ddbd 100644
--- a/academic/units/units.SlackBuild
+++ b/academic/units/units.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=units
-VERSION=${VERSION:-2.19}
+VERSION=${VERSION:-2.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/units/units.info b/academic/units/units.info
index 679d03f203..72cad5e9c9 100644
--- a/academic/units/units.info
+++ b/academic/units/units.info
@@ -1,8 +1,8 @@
 PRGNAM="units"
-VERSION="2.19"
+VERSION="2.20"
 HOMEPAGE="https://www.gnu.org/software/units/"
-DOWNLOAD="https://ftpmirror.gnu.org/units/units-2.19.tar.gz"
-MD5SUM="f38468b31a55baa926b449dfdaacc8aa"
+DOWNLOAD="https://ftpmirror.gnu.org/units/units-2.20.tar.gz"
+MD5SUM="28e2ba6fd2dbf056b7559e03c31577d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Unidecode"
diff --git a/academic/vCAPS_coevolution/README b/academic/vCAPS_coevolution/README
new file mode 100644
index 0000000000..51350cd21e
--- /dev/null
+++ b/academic/vCAPS_coevolution/README
@@ -0,0 +1,29 @@
+vCAPS: (verbose) Coevolution Analysis using Protein Sequences
+
+CAPS is aimed at measuring the coevolution between amino acid sites
+belonging to the same protein (intra-molecular coevolution) or to two
+functionally or physically interacting proteins (inter-molecular
+coevolution). The Software implements an improved method to detect
+intra-molecular coevolution as published in Genetics (Fares and Travers,
+2006) and also inter-protein coevolution analysis. The improved scoring
+of amino acid sites is obtained by maximum likelihood ancestral state
+reconstruction along with simulations to assess significance.
+
+In addition, a test which assesses whether two proteins are interacting
+is implemented.
+
+NOTE:
+This applies an _unofficial_ patch by Petrov et al 2020, to enable more
+verbose output of the program, including CAPS generated phylogenetic
+trees and p-values of the pairwise results. The produced executable is
+called "vCAPS" and can be installed along "caps" from CAPS_coevolution.
+Building CAPS from source requires the Bio++ 1.9 suite.
+
+CITING:
+CAPS: coevolution analysis using protein sequences. Fares MA, McNally D.
+Bioinformatics. 2006 Nov 15;22(22):2821-2. PMID: 17005535
+
+The mathematical model has been described separately:
+A novel method for detecting intramolecular coevolution: adding a
+further dimension to selective constraints analyses. Fares MA, Travers
+SA. Genetics. 2006 May;173(1):9-23. PMID: 16547113
diff --git a/academic/vCAPS_coevolution/References b/academic/vCAPS_coevolution/References
new file mode 100644
index 0000000000..e8236cd282
--- /dev/null
+++ b/academic/vCAPS_coevolution/References
@@ -0,0 +1,14 @@
+If you use CAPS in your research, please include the following citations:
+
+CAPS: coevolution analysis using protein sequences.
+Fares MA, McNally D.
+Bioinformatics. 2006 Nov 15;22(22):2821-2.
+PMID: 17005535
+https://www.ncbi.nlm.nih.gov/pubmed/17005535
+
+The mathematical model has been described separately:
+A novel method for detecting intramolecular coevolution: adding a further dimension to selective constraints analyses.
+Fares MA, Travers SA.
+Genetics. 2006 May;173(1):9-23.
+PMID: 16547113
+https://www.ncbi.nlm.nih.gov/pubmed/16547113
diff --git a/academic/vCAPS_coevolution/caps_verbose.patch b/academic/vCAPS_coevolution/caps_verbose.patch
new file mode 100644
index 0000000000..7f64d80f34
--- /dev/null
+++ b/academic/vCAPS_coevolution/caps_verbose.patch
@@ -0,0 +1,114 @@
+diff -pruN orig/caps.cpp new/caps.cpp
+--- orig/caps.cpp	2012-12-15 17:13:23.000000000 +0200
++++ new/caps.cpp	2020-09-09 23:07:46.080566000 +0300
+@@ -14,7 +14,7 @@
+ #include <gsl/gsl_statistics.h>
+ #include<sys/time.h>
+ #include<iomanip>
+-
++#include <bits/stdc++.h> 
+ 
+ 
+ 
+@@ -69,6 +69,8 @@
+ const gsl_rng_type * T;
+ gsl_rng *r;
+ 
++vector<double> totaltempnew;
++double alphathresh = 0;
+ int main(int argc, char *argv[]){
+ 
+ 
+@@ -543,16 +545,27 @@ int main(int argc, char *argv[]){
+ 
+ 
+ 					print_splash(output);
++					OUTPUT << "\n\File1: " << files[i] << endl;
+ 					vec1.print_to_fasta(output.c_str());
++					OUTPUT << "\n\nFile2: " << files[j] << endl;
+ 					vec2.print_to_fasta(output.c_str());
+ 					int length1 = vec1.sequences[0].length();			
+ 					int length2 = vec2.sequences[0].length();
+ 
++					OUTPUT << "\n\nLength1: " << length1 << endl;
++					OUTPUT << "Length2: " << length2 << endl;
+ 
+ 
+ 					if(tree_in ==0){
+ 						tree1 = create_input_tree(vec1.names, vec1.sequences);
+ 						tree2 = create_input_tree(vec2.names, vec2.sequences);
++						
++						// Output the CAPS generated trees to the .out file of each pair
++						string temptre1 = TreeTemplateTools::treeToParenthesis(*tree1, true);
++						string temptre2 = TreeTemplateTools::treeToParenthesis(*tree2, true);
++						OUTPUT << "\n" << endl;
++						OUTPUT << "CAPS generated tree 1: " << temptre1 << endl;
++						OUTPUT << "CAPS generated tree 2: " << temptre2 << endl;
+ 					}/*else if(tree_in ==1 && variable==1){
+ 
+ 					   std::auto_ptr<DistanceMatrix> DS;
+@@ -666,6 +679,7 @@ int main(int argc, char *argv[]){
+ 					int value = floor(((totaltemp.size())*(1-(threshval))))+1;
+ 
+ 					threshold = totaltemp[value];
++					totaltempnew = totaltemp;
+ 
+ 
+ 					/*=======================================================*/
+@@ -870,6 +884,30 @@ int Chi_squared (int num_pairs, int num_
+ 
+ }		/* -----  end of function Chi_squared  ----- */
+ 
++/* 
++ * ===  FUNCTION  ======================================================================
++ *         Name:  find_alpha
++ *  Description:  Find the index of an element in a vector totaltemp
++ *    Help from:  https://www.geeksforgeeks.org/how-to-find-index-of-a-given-element-in-a-vector-in-cpp/
++ *                https://stackoverflow.com/questions/8647635/elegant-way-to-find-closest-value-in-a-vector-from-above
++ *       Author:  Petar Petrov, University of Turku (Finland); pebope@utu.fi
++ * =====================================================================================
++ */
++double getIndex(std::vector<double> const& v, double K) 
++{ 
++    auto const it = std::lower_bound(v.begin(), v.end(), fabs(K));
++    //auto it = std::upper_bound(v.begin(), v.end(), fabs(K));
++  
++    if (it != v.end()) { 
++        int index = distance(v.begin(), it);
++	alphathresh = (((int)1+(double)v.size()-(int)index)/(double)v.size());
++	return alphathresh;
++        //cerr << index << "\t" << alphathresh << endl; 
++    } 
++    else { 
++        cerr << "ELEMENT NOT FOUND!" << endl; 
++    } 
++} 
+ 
+ 
+ 
+@@ -890,9 +928,9 @@ int print_inter(vector<double>& Correl1,
+ 	output << endl << endl;
+ 
+ 	output << "Coevolving Pairs of amino acid sites\n";
+-	output << "=============================================================================\n";
+-	output << "Col1(real)\tCol2(real)\tDmean1\t\tDmean2\t\tCorrelation\tBootstrap value\n\n";
+-	output << "=============================================================================\n";
++	output << "================================================================================================================================\n";
++	output << "Col1(real)\tCol2(real)\tDmean1\t\tDmean2\t\tCorrelation\tBootstrap value\tP-value1\tP-value2\tMean P-value\tCorrelation1\tCorrelation2\n\n";
++	output << "================================================================================================================================\n";
+ 
+ 	//double mean = average_vec<double>(Correl);
+ 	//double SD = SD_vf(Correl, mean);
+@@ -951,9 +989,11 @@ int print_inter(vector<double>& Correl1,
+ 
+ 						//	}
+ 
++						double Alpha1 = getIndex(totaltempnew, Correl1[cor]);
++						double Alpha2 = getIndex(totaltempnew, Correl2[cor]);
+ 						//if(bootval>=bootcut && re1<=8 && re2<=8 ){
+ 						if(bootval>=bootcut){
+-							output << i+1 << "(" << i-gaps1+1 << ")\t\t" << j+1 << "(" << (j+1)-gaps2 << ")\t\t" << averDi << "\t\t" << averDj << "\t\t" << (Correl1[cor]+Correl2[cor])/2 << "\t" << bootval << endl; 
++							output << i+1 << "(" << i-gaps1+1 << ")\t\t" << j+1 << "(" << (j+1)-gaps2 << ")\t\t" << averDi << "\t\t" << averDj << "\t" << (Correl1[cor]+Correl2[cor])/2 << "\t" << bootval << "\t" << Alpha1 << "\t" << Alpha2 << "\t" << (Alpha1+Alpha2)/2 << "\t" << Correl1[cor] << "\t" << Correl2[cor] << endl; 
+ 							signif.push_back(((Correl1[cor]+Correl2[cor])/2));
+ 							++pairs;
+ 							vector<int> tem;
diff --git a/academic/vCAPS_coevolution/slack-desc b/academic/vCAPS_coevolution/slack-desc
new file mode 100644
index 0000000000..5cd78f0770
--- /dev/null
+++ b/academic/vCAPS_coevolution/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------------------------------------------------------|
+vCAPS_coevolution: vCAPS_coevolution (Coevolution Analysis using Protein Sequences)
+vCAPS_coevolution:
+vCAPS_coevolution: CAPS is aimed at measuring the coevolution between amino acid
+vCAPS_coevolution: sites belonging to the same protein (intra-molecular coevolution)
+vCAPS_coevolution: or to two functionally or physically interacting proteins (inter-
+vCAPS_coevolution: molecular coevolution). In addition, a test which assesses
+vCAPS_coevolution: whether two proteins are interacting is implemented.
+vCAPS_coevolution:
+vCAPS_coevolution: Home: http://bioinf.gen.tcd.ie/~faresm/software/software.html
+vCAPS_coevolution:
+vCAPS_coevolution:
diff --git a/academic/vCAPS_coevolution/vCAPS_coevolution.SlackBuild b/academic/vCAPS_coevolution/vCAPS_coevolution.SlackBuild
new file mode 100644
index 0000000000..bdd3b3e794
--- /dev/null
+++ b/academic/vCAPS_coevolution/vCAPS_coevolution.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# Slackware build script for vCAPS_coevolution
+
+# 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=vCAPS_coevolution
+VERSION=${VERSION:-2.0_1UN}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=caps
+SRCVER=2.0
+BINNAM=vCAPS
+
+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
+
+# This is needed for vCAPS to find its libraries at runtime. Thanks Urachlay!
+LIBDIRPATH="-Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/Bpp1.9"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf ${SRCNAM}${SRCVER}_src
+unzip $CWD/${SRCNAM}2_src.zip
+cd ${SRCNAM}${SRCVER}_src
+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 {} \;
+
+# This is needed for gcc in Slackware 14.2
+sed -i "s:CC=g++ -g:CC=g++ -g -std=c++11:" Makefile
+
+# Use our CFLAGS and the custom (legacy) lib path
+sed -i "s:CFLAGS=:CFLAGS=$SLKCFLAGS $LIBDIRPATH:" Makefile
+
+# Find the legacy bpp libraries
+sed -i "s:-lbpp-phyl:-L/usr/lib${LIBDIRSUFFIX}/Bpp1.9 -lbpp-phyl:g" Makefile
+sed -i "s:-lbpp-numcalc:-L/usr/lib64${LIBDIRSUFFIX}/Bpp1.9 -lbpp-numcalc:g" Makefile
+sed -i "s:-lbpp-utils:-L/usr/lib64${LIBDIRSUFFIX}/Bpp1.9 -lbpp-utils:g" Makefile
+sed -i "s:-lbpp-seq:-L/usr/lib64${LIBDIRSUFFIX}/Bpp1.9 -lbpp-seq:g" Makefile
+
+# Rename the produced executable 
+sed -i "s:-o caps:-o $BINNAM:" Makefile
+
+# Use our unofficial patch
+patch -p1 -i $CWD/caps_verbose.patch
+
+make all
+
+# Install the binary produced from our patched source, as "vCAPS"
+install -D -m755 $BINNAM $PKG/usr/bin/$BINNAM
+
+mkdir -p $PKG/usr/share/$PRGNAM
+cp -a sample structures trees TLR1.fa.out $PKG/usr/share/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  caps_manual.pdf \
+  $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/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/vCAPS_coevolution/vCAPS_coevolution.info b/academic/vCAPS_coevolution/vCAPS_coevolution.info
new file mode 100644
index 0000000000..84ebd91d4c
--- /dev/null
+++ b/academic/vCAPS_coevolution/vCAPS_coevolution.info
@@ -0,0 +1,10 @@
+PRGNAM="vCAPS_coevolution"
+VERSION="2.0_1UN"
+HOMEPAGE="http://bioinf.gen.tcd.ie/~faresm/software/software.html"
+DOWNLOAD="http://bioinf.gen.tcd.ie/~faresm/software/files/caps2_src.zip"
+MD5SUM="0914007c32ed22a9cb8a47b55cd18a39"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="bpp1.9-phyl"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/academic/verilog/README b/academic/verilog/README
index c8ebda2ee7..9df78abc32 100644
--- a/academic/verilog/README
+++ b/academic/verilog/README
@@ -1,5 +1,6 @@
-Icarus Verilog is a Verilog simulation and synthesis tool.  It operates as
-a compiler, compiling source code written in Verilog (IEEE-1364) into some 
-target format.  For batch simulation, the compiler can generate an intermediate
-form called vvp assembly.  This intermediate form is executed by the 'vvp' 
-command.  For synthesis, the compiler generates netlists in the desired format.
+Icarus Verilog is a Verilog simulation and synthesis tool.  It operates
+as a compiler, compiling source code written in Verilog (IEEE-1364)
+into some target format.  For batch simulation, the compiler can
+generate an intermediate form called vvp assembly.  This intermediate
+form is executed by the 'vvp' command.  For synthesis, the compiler
+generates netlists in the desired format.
diff --git a/academic/veusz/README b/academic/veusz/README
index 7f72b64c93..f8e783a6ac 100644
--- a/academic/veusz/README
+++ b/academic/veusz/README
@@ -10,7 +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 at
-https://veusz.github.io/releasenotes/3.2.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.3.1. Please, check the dependencies.
+****
diff --git a/academic/veusz/veusz.SlackBuild b/academic/veusz/veusz.SlackBuild
index 41c21ffc1d..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}
+VERSION=${VERSION:-3.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,16 +70,15 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
-export SIP_EXE=/usr/bin/python2-sip
-export SIP_INCLUDE_DIR="/usr/include/python$PYTHONVER/python2-sip"
+export SIP_EXE=/usr/bin/python3-sip
 
-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  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
 
@@ -94,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 9bc08e238a..eac4b5be7a 100644
--- a/academic/veusz/veusz.info
+++ b/academic/veusz/veusz.info
@@ -1,10 +1,10 @@
 PRGNAM="veusz"
-VERSION="3.2"
+VERSION="3.3.1"
 HOMEPAGE="https://veusz.github.io/"
-DOWNLOAD="https://github.com/veusz/veusz/releases/download/veusz-3.2/veusz-3.2.tar.gz"
-MD5SUM="94e361a011001dda060e3a3b3c32c4f1"
+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="numpy PyQt5"
+REQUIRES="numpy3 python3-PyQt5"
 MAINTAINER="Fellype do Nascimento"
-EMAIL="fellype(at)gmail(dot)com"
+EMAIL="fellype (at) gmail (dot) com"
diff --git a/academic/wehi-weasel/wehi-weasel b/academic/wehi-weasel/wehi-weasel
index 994a389f76..f086e18ce9 100644
--- a/academic/wehi-weasel/wehi-weasel
+++ b/academic/wehi-weasel/wehi-weasel
@@ -3,4 +3,4 @@
 # This starts the program jar file. The -Xmx1024m value indicates the
 # amount of RAM allocated to the program. You may wish to change this.
 
-java -jar -Xmx1024m /usr/share/java/wehi-weasel/Weasel.jar
+java -jar -Xmx2048m /opt/wehi-weasel/Weasel.jar
diff --git a/academic/wehi-weasel/wehi-weasel.SlackBuild b/academic/wehi-weasel/wehi-weasel.SlackBuild
index 5a8de5b25c..2eae95610b 100644
--- a/academic/wehi-weasel/wehi-weasel.SlackBuild
+++ b/academic/wehi-weasel/wehi-weasel.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wehi-weasel
-VERSION=${VERSION:-3.6.11.8}
+VERSION=${VERSION:-3.7.1.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,7 +36,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 SRCNAM=wsl
 JARNAM=Weasel
-SRCVER=36118
+SRCVER=37118
 SRCDIST=unix
 LICENSE=WeaselLicence.doc
 
@@ -57,10 +57,10 @@ find -L . \
 
 # Copy the jar file and the icons. I am not sure the icons are needed
 # by the program at runtime, but it will not hurt to have them there.
-mkdir -p $PKG/usr/share/java/$PRGNAM
+mkdir -p $PKG/opt/$PRGNAM
 cp -a \
   $JARNAM.jar WeaselIcon16.gif WeaselIcon32.gif WeaselIcon.ico \
-  $PKG/usr/share/java/$PRGNAM
+  $PKG/opt/$PRGNAM
 
 # You may wish to check this simple wrapper for the amount of RAM that
 # is allocated to the program.
diff --git a/academic/wehi-weasel/wehi-weasel.info b/academic/wehi-weasel/wehi-weasel.info
index fd10edf09c..11c1529672 100644
--- a/academic/wehi-weasel/wehi-weasel.info
+++ b/academic/wehi-weasel/wehi-weasel.info
@@ -1,8 +1,8 @@
 PRGNAM="wehi-weasel"
-VERSION="3.6.11.8"
+VERSION="3.7.1.18"
 HOMEPAGE="http://www.frankbattye.com.au/Weasel/"
 DOWNLOAD="http://www.frankbattye.com.au/Weasel/WeaselDownload.html"
-MD5SUM="d13a157935311839de4a8b582389f809"
+MD5SUM="d9154f7e71dbd1a8311f8cbd03b44090"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/academic/wmcalc/README b/academic/wmcalc/README
index 6b8bee5461..b898b6bfce 100644
--- a/academic/wmcalc/README
+++ b/academic/wmcalc/README
@@ -1,6 +1,6 @@
 wmcalc (calculator dockapp for windowmaker)
 
-wmcalc is a program designed to act as a simple four-function calculator.
-It is different from other calculator programs, however in that it is
-designed to take up very little desktop space. As such, it can be left
-running on the desktop at all times.
+wmcalc is a program designed to act as a simple four-function
+calculator.  It is different from other calculator programs, however
+in that it is designed to take up very little desktop space. As such,
+it can be left running on the desktop at all times.
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/xephem/README b/academic/xephem/README
index ab546d369a..fb0bde75c4 100644
--- a/academic/xephem/README
+++ b/academic/xephem/README
@@ -1,6 +1,7 @@
 xephem - Astronomy program
 
-xephem is a scientific-grade interactive astronomical ephemeris software
-package for UNIX-like* systems.
+xephem is a scientific-grade interactive astronomical ephemeris
+software package for UNIX-like* systems.
 
-Note that this is not free software: read the license agreement carefully.
+Note that this is not free software: read the license agreement
+carefully.
diff --git a/academic/xfoil/README b/academic/xfoil/README
index c9bb85dfea..6eb218961a 100644
--- a/academic/xfoil/README
+++ b/academic/xfoil/README
@@ -1,7 +1,8 @@
-XFOIL is an interactive program for the design and analysis of subsonic isolated
-airfoils. It consists of a collection of menu-driven routines which perform
-various useful functions, such as viscous (or inviscid) analysis of an existing
-airfoil, airfoil design and redesign by interactive modification of surface
-speed distributions or geometric parameters, blending of airfoils, writing and
-reading of airfoil coordinates and polar save files, and plotting of geometry,
-pressure distributions, and multiple polars.
+XFOIL is an interactive program for the design and analysis of subsonic
+isolated airfoils. It consists of a collection of menu-driven routines
+which perform various useful functions, such as viscous (or inviscid)
+analysis of an existing airfoil, airfoil design and redesign by
+interactive modification of surface speed distributions or geometric
+parameters, blending of airfoils, writing and reading of airfoil
+coordinates and polar save files, and plotting of geometry, pressure
+distributions, and multiple polars.
diff --git a/academic/xiphos/README b/academic/xiphos/README
index 1860dba832..166b55e9b6 100644
--- a/academic/xiphos/README
+++ b/academic/xiphos/README
@@ -2,27 +2,15 @@ xiphos (formerly gnomesword. A bible study application)
 Xiphos is a bible study program for GNOME. Xiphos is based on the
 Sword project by the CrossWire Bible Society.
 
-computer reading of the text using festival has not been tested.
-if it works let me know, and i'll remove these two lines from the readme.
+computer reading of the text using festival has not been tested. if
+it works let me know, and i'll remove these two lines from the readme.
 
-if you pass the variable WK2=yes to the build script, the dependencies
-change slightly. instead of webkitgtk3, webkit2gtk and gtkhtml (v4) are
-required.
+xiphos version 4.2.1 requires sword v1.8.1-3 or higher
+and biblesync v2.0.1 or higher
 
-note: End program differences between webkit and webkit2 versions.
-webkit:
-   studypad is missing the image for the "bold" text button (but it works)
-   reported not to work with current
-webkit2:
-   studypad has an "add emoticon" button, but the images included are not
-found, so an empty imagebox is added in the text if you try to add an icon.
-   a few warnings shown on compile (but seems to work just fine).
-   try this one for current. if it works, let me know, and I might change
-   the default to WK2 :-).
-
-For both versions, there is an issue where if the previewer is in the sidebar,
-text is offset to the left, so you can't see the first 2 characters of each
-line. This can be fixed by making the sidebar a little bit wider.
-
-Note. xiphos version 4.1.0 requires sword v1.8 or higher
-and biblesync v1.2 or higher
+xiphos needs a version of cmake 3.11 or higher. A private version is
+included in the slackbuild to enable xiphos to be built. If you want to
+use a different cmake to that included here, pass CMVERSION with the
+version you need (and make sure that the source tar.gz is available)
+There are a few new dependencies as the documentation is now created by
+the build process rather than shipped preprocessed in the source.
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index cd9533ba6f..f1f484b971 100644
--- a/academic/xiphos/xiphos.SlackBuild
+++ b/academic/xiphos/xiphos.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xiphos
 
-# Copyright 2015-2018 Tim Dickson, email: dickson.tim@googlemail.com
+# Copyright 2015-2020 Tim Dickson, email: dickson.tim@googlemail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xiphos
-VERSION=${VERSION:-4.1.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.2.1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
-#if WK2 is yes use webkit2. this requires webkit2gtk and gtkhtml (v4) instead of webkitgtk3
-WK2=${WK2:-no}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -65,45 +62,51 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+#we will use a newer version of cmake (at least 3.11)
+
+#sane permissions for everything
 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 {} \;
-
-./waf distclean
+#
+#lets make newer cmake available to the xiphos build
+OLDPATH=$PATH
+export PATH=/opt/cmake-202x/bin:$PATH
 
 # patch navbar_versekey.gtkbuilder to work with gtk shipped with slackware 14.2
 # patch won't be needed for slackware 15
 sed -i "s/3.20/3.14/g" ui/navbar_versekey.gtkbuilder
 
-if [ "x$WK2" = "xyes" ]; then
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  ./waf configure \
-    --prefix=/usr \
-    --enable-webkit2 \
-    --gtk=3
-  # --disable-dbus
-  #  --gtk=2   doesn't work with webkitgtk as gtk2 is disabled
-else
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  ./waf configure \
-    --prefix=/usr \
-    --enable-webkit-editor \
-    --gtk=3
-  #  --disable-dbus
-  #  --gtk=2   doesn't work with webkitgtk as gtk2 is disabled
-fi
-
-./waf build
-./waf install --destdir=$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 \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  -DCMAKE_INSTALL_MANDIR=man \
+  -DHTMLHELP=ON \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DDBUS=OFF -DSTRIP=ON -DPOSTINST=OFF -DGTKHTML=ON ..
+
+#cmake should have created make file so restore PATH
+export PATH=$OLDPATH
+make
+make install DESTDIR=$PKG
+cd ..
+
+#output should be stripped but we just make sure..
 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
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/academic/xiphos/xiphos.info b/academic/xiphos/xiphos.info
index d2cd894617..1fa129b3f2 100644
--- a/academic/xiphos/xiphos.info
+++ b/academic/xiphos/xiphos.info
@@ -1,10 +1,10 @@
 PRGNAM="xiphos"
-VERSION="4.1.0"
+VERSION="4.2.1"
 HOMEPAGE="http://xiphos.org"
-DOWNLOAD="https://github.com/crosswire/xiphos/releases/download/4.1.0/xiphos-4.1.0.tar.gz"
-MD5SUM="f40c5b249c50a49af71de94420ee720d"
+DOWNLOAD="https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.gz"
+MD5SUM="77d8a99c063433bea3006954710b2fd5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="sword webkitgtk3 biblesync rarian %README%"
+REQUIRES="sword webkitgtk3 biblesync rarian gtkhtml libminizip appstream-glib yelp cmake-202x"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"
diff --git a/academic/zotero/zotero.SlackBuild b/academic/zotero/zotero.SlackBuild
index 5daa350027..8ad1d6a014 100644
--- a/academic/zotero/zotero.SlackBuild
+++ b/academic/zotero/zotero.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=zotero
 SRCNAM=Zotero
-VERSION=${VERSION:-5.0.81}
+VERSION=${VERSION:-5.0.85}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/zotero/zotero.info b/academic/zotero/zotero.info
index b0d3909001..564a6702dd 100644
--- a/academic/zotero/zotero.info
+++ b/academic/zotero/zotero.info
@@ -1,10 +1,10 @@
 PRGNAM="zotero"
-VERSION="5.0.81"
+VERSION="5.0.85"
 HOMEPAGE="https://www.zotero.org/"
-DOWNLOAD="https://download.zotero.org/client/release/5.0.81/Zotero-5.0.81_linux-i686.tar.bz2"
-MD5SUM="dac7c4c7ebae94d4b47dc3b05b0d8235"
-DOWNLOAD_x86_64="https://download.zotero.org/client/release/5.0.81/Zotero-5.0.81_linux-x86_64.tar.bz2"
-MD5SUM_x86_64="e39871c269ed89320f8503fc0091d765"
+DOWNLOAD="https://download.zotero.org/client/release/5.0.85/Zotero-5.0.85_linux-i686.tar.bz2"
+MD5SUM="196d758dc19a658a54d30877fe0c41b2"
+DOWNLOAD_x86_64="https://download.zotero.org/client/release/5.0.85/Zotero-5.0.85_linux-x86_64.tar.bz2"
+MD5SUM_x86_64="6509c159079ed59c2c95ac0132dc2328"
 REQUIRES=""
 MAINTAINER="Andrew Payne"
 EMAIL="phalange@komputermatrix.com"
diff --git a/accessibility/Synkron/README b/accessibility/Synkron/README
index 81b3be2edb..a35ec6a5d5 100644
--- a/accessibility/Synkron/README
+++ b/accessibility/Synkron/README
@@ -4,5 +4,5 @@ Synkron is an application that helps you keep your files and folders
 always updated. You can easily sync your documents, music, or pictures
 to have their latest versions everywhere.
 
-Synkron provides an easy-to-use interface and a lot of features. Moreover,
-it is free and cross-platform.
+Synkron provides an easy-to-use interface and a lot of
+features. Moreover, it is free and cross-platform.
diff --git a/accessibility/easystroke/README b/accessibility/easystroke/README
index 69bf0bf7bb..20984b6d76 100644
--- a/accessibility/easystroke/README
+++ b/accessibility/easystroke/README
@@ -1,13 +1,14 @@
-Easystroke is a gesture-recognition application for X11.  Gestures or strokes 
-are movements that you make with you mouse (or your pen, finger etc.) while 
-holding down a specific mouse button.  Easystroke will execute certain actions 
-if it recognizes the stroke; currently easystroke can emulate key presses, 
-execute shell commands, hold down modifiers and emulate a scroll wheel. 
+Easystroke is a gesture-recognition application for X11.  Gestures or
+strokes are movements that you make with you mouse (or your pen,
+finger etc.) while holding down a specific mouse button.  Easystroke
+will execute certain actions if it recognizes the stroke; currently
+easystroke can emulate key presses, execute shell commands, hold down
+modifiers and emulate a scroll wheel.
 
-The program was designed with Tablet PCs in mind and can be used effectively 
-even without access to a keyboard. Easystroke tries to provide an intuitive 
-and efficient user interface while at the same time being highly configurable
-and offering many advanced features.
+The program was designed with Tablet PCs in mind and can be used
+effectively even without access to a keyboard. Easystroke tries to
+provide an intuitive and efficient user interface while at the same
+time being highly configurable and offering many advanced features.
 
-If you'd also like the manpage installed, then help2man needs to be installed 
-and then pass COMPILE_MAN=yes to the slackbuild.
+If you'd also like the manpage installed, then help2man needs to be
+installed and then pass COMPILE_MAN=yes to the slackbuild.
diff --git a/accessibility/espeak/espeak.SlackBuild b/accessibility/espeak/espeak.SlackBuild
index 1a6402a5d3..a0f5941a0d 100644
--- a/accessibility/espeak/espeak.SlackBuild
+++ b/accessibility/espeak/espeak.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200822 bkw:
+# - BUILD=3
+# - Fix PORTAUDIO=no builds, thanks to timsoft for reporting this.
+
 # 20191218 bkw:
 # - BUILD=2
 # - Update man page (still using the one from Debian).
@@ -17,7 +21,7 @@
 
 PRGNAM=espeak
 VERSION=${VERSION:-1.48.04}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -109,7 +113,7 @@ cd src
   LIBDIR=/usr/lib$LIBDIRSUFFIX
   SLKCFLAGS="$SLKCFLAGS -Wno-narrowing"
   make LDFLAGS="-Wl,-s" LIBDIR=$LIBDIR CXXFLAGS="$SLKCFLAGS" AUDIO="$AUDIO"
-  make install LIBDIR=$LIBDIR DESTDIR=$PKG
+  make install LIBDIR=$LIBDIR DESTDIR=$PKG AUDIO="$AUDIO"
   rm -f $PKG/$LIBDIR/*.a # guidelines say no static libs
 cd ..
 
diff --git a/accessibility/fonts-opendyslexic/README b/accessibility/fonts-opendyslexic/README
new file mode 100644
index 0000000000..c9b8ac8514
--- /dev/null
+++ b/accessibility/fonts-opendyslexic/README
@@ -0,0 +1,17 @@
+font-opendyslexic (font designed for readers with dyslexia)
+
+OpenDyslexic is an open sourced font created to increase readability for
+readers with dyslexia. It includes regular, bold, italic, bold-italic,
+and monospaced styles. It is being updated continually and improved
+based on input from dyslexic users.
+
+The fonts are shipped in multiple formats. By default, the package will
+include only the OpenType (OTF) fonts. If you need the others, export
+the variable FORMATS as a space-separated list of font types. The
+choices are: otf ttf eot woff svg. You can also say "all". Example:
+
+# FORMATS="ttf woff" ./font-opendyslexic.SlackBuild
+
+Note that Xorg only knows how to use OpenType and TrueType. The others
+will be installed in /usr/share/fonts/<format>, for use with whatever
+software you have that supports them.
diff --git a/accessibility/fonts-opendyslexic/doinst.sh b/accessibility/fonts-opendyslexic/doinst.sh
new file mode 100644
index 0000000000..4aa0dcbf0f
--- /dev/null
+++ b/accessibility/fonts-opendyslexic/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then
+  for FMT in @MKFDIRS@; do
+    ( cd usr/share/fonts/$FMT
+      /usr/bin/mkfontscale .
+      /usr/bin/mkfontdir .
+    )
+  done
+fi
+
+[ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
diff --git a/accessibility/fonts-opendyslexic/fonts-opendyslexic.SlackBuild b/accessibility/fonts-opendyslexic/fonts-opendyslexic.SlackBuild
new file mode 100644
index 0000000000..08972b0ae0
--- /dev/null
+++ b/accessibility/fonts-opendyslexic/fonts-opendyslexic.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for fonts-opendyslexic
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Yes, I know, there are newer versions of this at github. However,
+# they lack the compiled OpenDyslexicMono (terminal) font, and the tools
+# required to compile the source would require me submitting 15 or 20
+# python SlackBuilds for the tools and all their deps. Plus, they need
+# versions of libraries that probably are too new to work on 14.2.
+
+# The Debian package only includes the .otf fonts. That's what I'll do
+# by default, but I'll support installing the other types if needed.
+
+PRGNAM=fonts-opendyslexic
+VERSION=${VERSION:-20160623}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCDIR=open-dyslexic-$VERSION-Stable
+
+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 $SRCDIR
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
+cd $SRCDIR
+chown -R root:root .
+# rotten upstream perms, do not revert to template please.
+find . -type d -exec chmod 755 {} \+
+find . -type f -exec chmod 644 {} \+
+
+# See README
+FORMATS="$( echo ${FORMATS:-otf} | tr A-Z a-z )"
+ALLFMT="otf ttf eot woff svg"
+[ "$FORMATS" = "all" ] && FORMATS="$ALLFMT"
+
+for i in $FORMATS; do
+  ok=0
+  for j in $ALLFMT; do
+    [ "$i" = "$j" ] && ok=1
+  done
+  if [ "$ok" != "1" ]; then
+    cat <<EOF
+***
+*** Unsupported font format '$i'. Supported formats are: $ALLFMT all
+***
+EOF
+    exit 1
+  fi
+done
+
+mkdir -p $PKG/usr/share/fonts
+for fmt in $FORMATS; do
+  FMT=$( echo $fmt | tr a-z A-Z )
+  cp -a $fmt $PKG/usr/share/fonts/$FMT
+  [ "$FMT" = "TTF" -o "$FMT" = "OTF" ] && MKFDIRS+="$FMT "
+  DESCFMT+=" $FMT"
+done
+
+# I thought about including screenshots/ in the doc dir, but they're
+# more like an advertisement (anyone building this package has already
+# "bought" the product).
+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
+
+sed "s,@DESCFMT@,$DESCFMT," $CWD/slack-desc > $PKG/install/slack-desc
+
+# Only install doinst.sh if TTF and/or OTF fonts are included, because
+# fc-cache and X only know about these 2 types.
+if [ -n "$MKFDIRS" ]; then
+  sed "s,@MKFDIRS@,$MKFDIRS," $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/accessibility/fonts-opendyslexic/fonts-opendyslexic.info b/accessibility/fonts-opendyslexic/fonts-opendyslexic.info
new file mode 100644
index 0000000000..662bbadf3d
--- /dev/null
+++ b/accessibility/fonts-opendyslexic/fonts-opendyslexic.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-opendyslexic"
+VERSION="20160623"
+HOMEPAGE="http://dyslexicfonts.com/"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/f/fonts-opendyslexic/fonts-opendyslexic_20160623.orig.tar.gz"
+MD5SUM="b00df57c8f26be3caf8599f6a61d24b8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/accessibility/fonts-opendyslexic/slack-desc b/accessibility/fonts-opendyslexic/slack-desc
new file mode 100644
index 0000000000..f818d049d2
--- /dev/null
+++ b/accessibility/fonts-opendyslexic/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------------------------------------------------------|
+fonts-opendyslexic: fonts-opendyslexic (font designed for readers with dyslexia)
+fonts-opendyslexic:
+fonts-opendyslexic: OpenDyslexic is an open sourced font created to increase readability
+fonts-opendyslexic: for readers with dyslexia. It includes regular, bold, italic,
+fonts-opendyslexic: bold-italic, and monospaced styles. It is being updated continually
+fonts-opendyslexic: and improved based on input from dyslexic users.
+fonts-opendyslexic:
+fonts-opendyslexic: This package includes these font types:@DESCFMT@
+fonts-opendyslexic:
+fonts-opendyslexic:
+fonts-opendyslexic:
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/speech-dispatcher/README b/accessibility/speech-dispatcher/README
index 027beae076..c0074427a8 100644
--- a/accessibility/speech-dispatcher/README
+++ b/accessibility/speech-dispatcher/README
@@ -6,4 +6,4 @@ use Speech Dispatcher, you will also need a Software synthesizer, such
 as espeak, flite (available on Slackbuilds.org), or festival (not
 available on Slackbuilds.org).
 
-Python3, PyXDG (both for spd-conf), festival-freebsoft-utils are optional dependencies.
+festival-freebsoft-utils is an optional dependency.
diff --git a/accessibility/speech-dispatcher/speech-dispatcher.SlackBuild b/accessibility/speech-dispatcher/speech-dispatcher.SlackBuild
index a39fd8eb18..53ae6c4e76 100644
--- a/accessibility/speech-dispatcher/speech-dispatcher.SlackBuild
+++ b/accessibility/speech-dispatcher/speech-dispatcher.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for speech-dispatcher
 
-# Copyright 2016, 2017 Edward W. Koenig, Vancouver, WA <kingbeowulf@gmail.com>
+# Copyright 2016-2020 Edward W. Koenig, Vancouver, WA <kingbeowulf@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=speech-dispatcher
-VERSION=${VERSION:-0.8.8}
+VERSION=${VERSION:-0.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOC_LIST="ANNOUNCE AUTHORS BUGS COPYING INSTALL README README.* TODO"
+DOC_LIST="ANNOUNCE AUTHORS BUGS COPYING.* FAQ INSTALL NEWS README.* TODO"
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -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 {} \;
 
+./build.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/accessibility/speech-dispatcher/speech-dispatcher.info b/accessibility/speech-dispatcher/speech-dispatcher.info
index 1671552997..deaa4708b5 100644
--- a/accessibility/speech-dispatcher/speech-dispatcher.info
+++ b/accessibility/speech-dispatcher/speech-dispatcher.info
@@ -1,10 +1,10 @@
 PRGNAM="speech-dispatcher"
-VERSION="0.8.8"
+VERSION="0.10.1"
 HOMEPAGE="https://devel.freebsoft.org/speechd/"
-DOWNLOAD="https://devel.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.8.tar.gz"
-MD5SUM="ad9fb4798004983abd9de15a08cddebc"
+DOWNLOAD="https://github.com/brailcom/speechd/releases/download/0.10.1/speech-dispatcher-0.10.1.tar.gz"
+MD5SUM="49bc64d8517762d9c9818f5ef3d3bc42"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dotconf"
+REQUIRES="dotconf python3 pyxdg"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
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/svox/README b/accessibility/svox/README
index e632b22fb7..c4e9b82c23 100644
--- a/accessibility/svox/README
+++ b/accessibility/svox/README
@@ -1,9 +1,9 @@
 svox (small footprint text-to-speech engine)
 
-The SVOX Pico engine is a software speech synthesizer for German, English
-(GB and US), Spanish, French and Italian. SVOX produces a clear and
-distinct speech output made possible by the use of Hidden Markov Model
-(HMM) algorithms.
+The SVOX Pico engine is a software speech synthesizer for German,
+English (GB and US), Spanish, French and Italian. SVOX produces a clear
+and distinct speech output made possible by the use of Hidden Markov
+Model (HMM) algorithms.
 
 The package includes the pico2wave utility, and everything else from
 the Debian packages libttspico-data, libttspico-dev, libttspico-utils,
diff --git a/accessibility/svox/svox.info b/accessibility/svox/svox.info
index 021717e3ee..8d2603be71 100644
--- a/accessibility/svox/svox.info
+++ b/accessibility/svox/svox.info
@@ -2,7 +2,7 @@ PRGNAM="svox"
 VERSION="1.0+git20130326_8"
 HOMEPAGE="https://packages.debian.org/source/sid/svox"
 DOWNLOAD="http://http.debian.net/debian/pool/non-free/s/svox/svox_1.0+git20130326.orig.tar.gz \
-          http://urchlay.naptime.net/~urchlay/src/svox_1.0+git20130326-8.debian.tar.xz"
+          https://slackware.uk/~urchlay/src/svox_1.0+git20130326-8.debian.tar.xz"
 MD5SUM="df4bf610ff4273b420e80ff64af93130 \
         fe78ebb55777b01fbbde150e90d23e00"
 DOWNLOAD_x86_64=""
diff --git a/accessibility/unclutter/README b/accessibility/unclutter/README
index 1a12d6b98e..afb0dfdcb3 100644
--- a/accessibility/unclutter/README
+++ b/accessibility/unclutter/README
@@ -3,13 +3,14 @@ X11 session.  It checks on the X11 pointer (cursor) position every
 few seconds, and when it finds it has not moved (and no buttons are
 pressed on the mouse, and the cursor is not in the root window) it
 creates a small sub-window as a child of the window the cursor is in.
-The new window installs a cursor of size 1x1 but a mask of all 0, ie
-an invisible cursor.  This allows you to see all the text in an xterm
-or xedit, for example.  The human factors crowd would agree it should
-make things less distracting.
+The new window installs a cursor of size 1x1 but a mask of all 0, ie an
+invisible cursor.  This allows you to see all the text in an xterm or
+xedit, for example.  The human factors crowd would agree it should make
+things less distracting.
 
 This is an "old-school" X11 app, from the days before desktop
 environments. To run when X starts, add "unclutter &" to your .xinitrc,
 before the line that execs your window manager.
 
-This build conflicts with unclutter-xfixes. Only install one or the other.
+This build conflicts with unclutter-xfixes. Only install one or the
+other.
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/xdotool/README b/accessibility/xdotool/README
index 87037a5cd0..6f65856683 100644
--- a/accessibility/xdotool/README
+++ b/accessibility/xdotool/README
@@ -1,8 +1,8 @@
 xdotool (fake X11 keyboard/mouse input)
 
-This tool lets you programatically (or manually) simulate keyboard input and
-mouse activity, move and resize windows, etc. It does this using X11's XTEST
-extension and other Xlib functions.
+This tool lets you programatically (or manually) simulate keyboard
+input and mouse activity, move and resize windows, etc. It does this
+using X11's XTEST extension and other Xlib functions.
 
 Example: focus the firefox url bar
 
diff --git a/accessibility/xdotool/xdotool.SlackBuild b/accessibility/xdotool/xdotool.SlackBuild
index adc0c6780a..22c2082077 100644
--- a/accessibility/xdotool/xdotool.SlackBuild
+++ b/accessibility/xdotool/xdotool.SlackBuild
@@ -6,6 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200329 bkw:
+# - BUILD=3
+# - Stop including references to the build and $PKG dirs in the binary. This
+#   was a potential security risk. Thanks to Leonardo Citrolo for reporting
+#   this (along with a solution).
+# - Actually install the binary stripped.
+
 # 20191219 bkw:
 # - BUILD=2
 # - install API (doxygen) docs.
@@ -43,7 +50,7 @@
 
 PRGNAM=xdotool
 VERSION=${VERSION:-3.20160805.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -85,21 +92,38 @@ 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 $PKG/usr/lib$LIBDIRSUFFIX
-make WARNFLAGS="$SLKCFLAGS" PREFIX=/usr INSTALLLIB=/usr/lib$LIBDIRSUFFIX
-strip $PRGNAM libxdo.so
-make install PREFIX=$PKG/usr INSTALLLIB=$PKG/usr/lib$LIBDIRSUFFIX LDCONFIG=true
+# 20200329 bkw: make this section a bit more readable I hope.
+# The LDCONFIG=true is counter-intuitive: it means "run the 'true'
+# command instead of the 'ldconfig' command". In other words, do
+# NOT run ldconfig (opposite of what it seems to mean in English).
+COMMON="WITHOUT_RPATH_FIX=1 LDCONFIG=true"
+LIBDIR=/usr/lib$LIBDIRSUFFIX
+
+mkdir -p $PKG/$LIBDIR
+
+make \
+  WARNFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  INSTALLLIB=$LIBDIR \
+  $COMMON
+
+make install \
+  PREFIX=$PKG/usr \
+  INSTALLLIB=$PKG/$LIBDIR \
+  $COMMON
+
+# 20200329 bkw: strip binary *after* installing, since 'make install' is
+# relinking it.
+strip $PKG/usr/bin/$PRGNAM $PKG/usr/lib$LIBDIRSUFFIX/libxdo.so.?
+
 make docs $PRGNAM.html
 
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
-chmod 755 examples/*.sh
-chmod 644 $PKG/usr/include/*.h
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-chmod 0644 examples/*.sh
+chmod 0644 examples/*.sh $PKG/usr/include/*.h
 cp -a CHANGELIST README COPYRIGHT examples $PRGNAM.html docs/html \
-     $PKG/usr/doc/$PRGNAM-$VERSION
+      $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
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/accessibility/xzoom/README b/accessibility/xzoom/README
new file mode 100644
index 0000000000..09e504084d
--- /dev/null
+++ b/accessibility/xzoom/README
@@ -0,0 +1,16 @@
+xzoom (magnify part of X display, with real-time updates)
+
+Like xmag, xzoom magnifies a section of the X display. Xzoom is
+different because it will continuously update the magnified area as
+the display changes. It is fast enough to enlarge small animations,
+for example. It can also mirror or rotate a part of the screen.
+
+Xzoom displays in its window a magnified area of the X11 display. The
+user can interactively change the zoomed area, the window size,
+magnification (optionally different magnification for X and Y axes) or
+rotate or mirror the image. See the man page for the list of keyboard
+and mouse commands.
+
+If you don't like the "rubber-band" frame xzoom uses when dragging with
+the mouse, you can disable it by exporting FRAME=no in the script's
+environment (sorry, it's a compile-time option only).
diff --git a/accessibility/xzoom/doinst.sh b/accessibility/xzoom/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/accessibility/xzoom/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/accessibility/xzoom/fixmanpage.diff b/accessibility/xzoom/fixmanpage.diff
new file mode 100644
index 0000000000..b0f11620e5
--- /dev/null
+++ b/accessibility/xzoom/fixmanpage.diff
@@ -0,0 +1,89 @@
+diff -Naur xzoom-0.3.orig/debian/manpage/xzoom.1 xzoom-0.3.orig.patched/debian/manpage/xzoom.1
+--- xzoom-0.3.orig/debian/manpage/xzoom.1	2020-06-22 18:56:07.000000000 -0400
++++ xzoom-0.3.orig.patched/debian/manpage/xzoom.1	2020-06-24 02:07:37.340848752 -0400
+@@ -1,5 +1,5 @@
+ .\" Text automatically generated by txt2man
+-.TH xzoom 1 "22 Jun 2020" "xzoom-0.3-26" "magnify part of X display"
++.TH xzoom 1 "24 Jun 2020" "xzoom-0.3-26" "magnify part of X display"
+ .SH NAME
+ \fBxzoom \fP- magnify part of X display, with real-time updates
+ \fB
+@@ -23,7 +23,7 @@
+ (optionally different \fImagnification\fP for X and Y axes) or rotate or mirror
+ the image.
+ .PP
+-Use commands to change rotation, zoom or mirror the image.
++Use COMMANDS (see below) to change rotation, zoom, or mirror the image.
+ .SH OPTIONS
+ .TP
+ .B
+@@ -33,16 +33,16 @@
+ .B
+ \fB-mag\fP <\fImagnification\fP [ \fImagnification\fP ]>
+ What \fImagnification\fP to use. If two
+-number arguments are supplied the first is used for X magnications and the
++number arguments are supplied the first is used for X magnication and the
+ second is used for Y \fImagnification\fP. Magnification should be greater than 0.
+ .TP
+ .B
+ \fB-geometry\fP <geometry>
+-Size and position \fBxzoom\fP's window.
++Size and position of \fBxzoom\fP's window.
+ .TP
+ .B
+ \fB-source\fP <geometry>
+-Size and position the initial source area which is
++Size and position of the initial source area which is
+ magnified. The dimensions of this area are multiplied by the \fImagnification\fP
+ to get the size of \fBxzoom\fP's window. If these dimensions are given separately
+ (by use of \fB-geometry\fP) then an error is reported.
+@@ -82,11 +82,11 @@
+ .TP
+ .B
+ w
+-Next '+' or '-' only change width scaling.
++Next '+' or '-' only changes width scaling.
+ .TP
+ .B
+ h
+-Next '+' or '-' only change height scaling.
++Next '+' or '-' only changes height scaling.
+ .TP
+ .B
+ d
+@@ -100,7 +100,7 @@
+ .B
+ Arrow keys
+ Scroll the zoomed area 1 pixel in the direction of the arrow.
+-if the control key is pressed the zoomed area will scroll 10
++If the control key is pressed the zoomed area will scroll 10
+ pixels.
+ .TP
+ .B
+@@ -109,7 +109,7 @@
+ button inside \fBxzoom\fP's window and then move it (keep the button
+ pressed) to the place which you want to see magnified.
+ .PP
+-Xzoom allow you to resize it's window at any time.
++Xzoom allows you to resize its window at any time.
+ .PP
+ When \fBxzoom\fP is iconified it simply waits to get deiconified.
+ .SH EXAMPLES
+@@ -120,14 +120,14 @@
+ .TP
+ .B
+ \fBxzoom\fP \fB-mag\fP 2 \fB-geometry\fP 800x400
+-# Open \fBxzoom\fP with \fImagnification\fP 2 and windows size 800x400.
++# Open \fBxzoom\fP with \fImagnification\fP 2 and window size 800x400.
+ .TP
+ .B
+ \fBxzoom\fP -\fIx\fP
+ # Open display flipping right and left.
+ .SH SEE ALSO
+-\fBxmag\fP(1), \fBxzoom\fP help page.
++\fBxmag\fP(1)
+ .SH AUTHORS
+ \fBxzoom\fP was written by Itai Nahshon.
+ .PP
+-This manual page was written by Daniel Lenharo de Souza <lenharo@debian.org> for the Debian project (but may be used by others).
++This manual page was written by Daniel Lenharo de Souza <lenharo@debian.org> for the Debian project (but may be used by others). It was cleaned up slightly by B. Watson <yalhcru@gmail.com> for the SlackBuilds.org project.
diff --git a/accessibility/xzoom/slack-desc b/accessibility/xzoom/slack-desc
new file mode 100644
index 0000000000..267b67ec76
--- /dev/null
+++ b/accessibility/xzoom/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------------------------------------------------------|
+xzoom: xzoom (magnify part of X display, with real-time updates)
+xzoom:
+xzoom: Like xmag, xzoom magnifies a section of the X display. Xzoom is
+xzoom: different because it will continuously update the magnified area as
+xzoom: the display changes. It is fast enough to enlarge small animations,
+xzoom: for example.
+xzoom:
+xzoom: It can also mirror or rotate a part of the screen.
+xzoom:
+xzoom:
+xzoom:
diff --git a/accessibility/xzoom/xzoom.SlackBuild b/accessibility/xzoom/xzoom.SlackBuild
new file mode 100644
index 0000000000..c123de8281
--- /dev/null
+++ b/accessibility/xzoom/xzoom.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for xzoom
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# The _26 is the Debian patchlevel. They've done a lot to this, such as
+# support for >8bpp displays... since it's the future now, everyone's
+# using 24/32bpp, so the Debian maintainers rescued xzoom from the
+# scrap heap. Thanks!
+
+PRGNAM=xzoom
+VERSION=${VERSION:-0.3_26}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ORIGVER="$( 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-$ORIGVER.orig
+tar xvf $CWD/${PRGNAM}_$ORIGVER.orig.tar.gz
+cd $PRGNAM-$ORIGVER.orig
+tar xvf $CWD/${PRGNAM}_$ORIGVER-$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 Debian's patches, since they're our real upstream.
+for i in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$i
+done
+
+# Fix a few typo/grammar issues.
+patch -p1 < $CWD/fixmanpage.diff
+
+# Avoid warnings about alarm() and usleep() missing prototypes.
+sed -i '1i#include <unistd.h>' $PRGNAM.c
+
+# Allow turning off the frame at compile time.
+[ "${FRAME:-yes}" = "no" ] && sed -i '/^DEFINES/s,-DFRAME ,,' Imakefile
+
+xmkmf
+make CDEBUGFLAGS="$SLKCFLAGS"
+
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/share/applications
+install -s -m0755 $PRGNAM $PKG/usr/bin
+
+gzip -9c < debian/manpage/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# Not too sure about the icon. It's system-search, which doesn't even
+# exist in the default (hicolor) icon theme on Slackware. Not a huge
+# deal I suppose.
+cat debian/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a debian/changelog README $PRGNAM.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
+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/accessibility/xzoom/xzoom.info b/accessibility/xzoom/xzoom.info
new file mode 100644
index 0000000000..bf947084e1
--- /dev/null
+++ b/accessibility/xzoom/xzoom.info
@@ -0,0 +1,12 @@
+PRGNAM="xzoom"
+VERSION="0.3_26"
+HOMEPAGE="https://packages.debian.org/sid/xzoom"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/x/xzoom/xzoom_0.3.orig.tar.gz \
+          http://deb.debian.org/debian/pool/main/x/xzoom/xzoom_0.3-26.debian.tar.xz"
+MD5SUM="4393017fcca4983313a018bbe41dc696 \
+        c9b1c1f57848ac4c114214d65291cd4b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
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/MusicMixer/README b/audio/MusicMixer/README
index f0641e376b..dabf3ba227 100644
--- a/audio/MusicMixer/README
+++ b/audio/MusicMixer/README
@@ -1,6 +1,6 @@
-MusicIP Mixer is a program by AmpliFIND (formerly MusicIP) that has features
-used to analyze music files to generate PUIDs on the MusicDNS servers, amongst
-other added value "end user" features (recommending similar music, building
-playlists etc) 
+MusicIP Mixer is a program by AmpliFIND (formerly MusicIP) that has
+features used to analyze music files to generate PUIDs on the MusicDNS
+servers, amongst other added value "end user" features (recommending
+similar music, building playlists etc)
 
 This is a very CPU-hungry program; you may prefer the cli tool genpuid.
diff --git a/audio/SuperCollider/README b/audio/SuperCollider/README
index 52543bcba9..ce92d8df27 100644
--- a/audio/SuperCollider/README
+++ b/audio/SuperCollider/README
@@ -1,15 +1,17 @@
-SuperCollider is an environment and programming language for real time audio 
-synthesis and algorithmic composition.  It provides an interpreted object
-oriented language which functions as a network client to a state of the art, 
-realtime sound synthesis server.
+SuperCollider is an environment and programming language for real
+time audio synthesis and algorithmic composition.  It provides an
+interpreted object oriented language which functions as a network
+client to a state of the art, realtime sound synthesis server.
 
-To use scvim editor copy the contents of /usr/share/scvim/vim to ~/.vim/
+To use scvim editor copy the contents of /usr/share/scvim/vim to
+~/.vim/
 
-This will perform setcap cap_ipc_lock,cap_sys_nice=ep to /usr/bin/sclang,
-/usr/bin/scsynth, /usr/bin/scide and /usr/bin/scvim. If you don't want this
-behaviour pass CAPS="no" to the script.
+This will perform setcap cap_ipc_lock,cap_sys_nice=ep
+to /usr/bin/sclang, /usr/bin/scsynth, /usr/bin/scide and
+/usr/bin/scvim. If you don't want this behaviour pass CAPS="no" to the
+script.
 
-Pass EMACS=no to the script to disable emacs support. avahi (enabled with
-the switch AVAHI=yes), cwiid, and gedit are optional dependencies.
+Pass EMACS=no to the script to disable emacs support. avahi (enabled
+with the switch AVAHI=yes), cwiid, and gedit are optional dependencies.
 
 NOTE: yaml-cpp0.3 is a runtime dependency.
diff --git a/audio/TiMidity++/README b/audio/TiMidity++/README
index 0f516bd33d..bced4e92f1 100644
--- a/audio/TiMidity++/README
+++ b/audio/TiMidity++/README
@@ -1,13 +1,16 @@
-TiMidity++ is a software synthesizer.  It can play MIDI files by converting
-them into PCM waveform data or other various audio file formats.
+TiMidity++ is a software synthesizer.  It can play MIDI files by
+converting them into PCM waveform data or other various audio file
+formats.
 
-TiMidity++ can also be run as an ALSA sequencer client.  To do this, make
-/etc/rc.d/rc.timidity executable and add this line to /etc/rc.d/rc.local:
+TiMidity++ can also be run as an ALSA sequencer client.  To do
+this, make /etc/rc.d/rc.timidity executable and add this line to
+/etc/rc.d/rc.local:
 
     /etc/rc.d/rc.timidity start
 
 Optional dependencies are jack, speex, and portaudio.
 
-You will need a set of instrument patch files or soundbank fonts for
-TiMidity++ to be of any use.  Install freepats, eawpats, or fluid-soundfont
-(or any combination of these) to satisfy this dependency.
+You will need a set of instrument patch files or soundbank fonts
+for TiMidity++ to be of any use.  Install freepats, eawpats,
+or fluid-soundfont (or any combination of these) to satisfy this
+dependency.
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/aj-snapshot/aj-snapshot.SlackBuild b/audio/aj-snapshot/aj-snapshot.SlackBuild
index f4d322faea..84d4e44fad 100644
--- a/audio/aj-snapshot/aj-snapshot.SlackBuild
+++ b/audio/aj-snapshot/aj-snapshot.SlackBuild
@@ -9,7 +9,7 @@
 # without any warranty.
 
 PRGNAM=aj-snapshot
-VERSION=${VERSION:-0.9.6}
+VERSION=${VERSION:-0.9.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/aj-snapshot/aj-snapshot.info b/audio/aj-snapshot/aj-snapshot.info
index a2b6f6709c..fb8fa292cc 100644
--- a/audio/aj-snapshot/aj-snapshot.info
+++ b/audio/aj-snapshot/aj-snapshot.info
@@ -1,8 +1,8 @@
 PRGNAM="aj-snapshot"
-VERSION="0.9.6"
+VERSION="0.9.9"
 HOMEPAGE="http://aj-snapshot.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/aj-snapshot/aj-snapshot-0.9.6.tar.bz2"
-MD5SUM="fd755bbcade848001f16740462a08dff"
+DOWNLOAD="http://downloads.sourceforge.net/project/aj-snapshot/aj-snapshot-0.9.9.tar.bz2"
+MD5SUM="0b5f30312206be17f276ca305fbc0250"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack mxml"
diff --git a/audio/alsa-plugin-ffmpeg/README b/audio/alsa-plugin-ffmpeg/README
index 345d21592a..b25d2dae4d 100644
--- a/audio/alsa-plugin-ffmpeg/README
+++ b/audio/alsa-plugin-ffmpeg/README
@@ -6,8 +6,8 @@ The a52 plugin converts S16 linear format to an A52 compressed stream
 and sends it to an SPDIF output.
 
 The lavcrate plugin is an external rate converter using libavcodec's
-resampler, which may produce higher quality results than the libsamplerate
-converter included in Slackware's alsa-plugins package.
+resampler, which may produce higher quality results than the
+libsamplerate converter included in Slackware's alsa-plugins package.
 
 These plugins are included in the alsa-plugins source, but are not
 included in Slackware's alsa-plugins package because Slackware doesn't
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/alsamodularsynth/README b/audio/alsamodularsynth/README
index 074697ec01..0ca1a4a19f 100644
--- a/audio/alsamodularsynth/README
+++ b/audio/alsamodularsynth/README
@@ -1,5 +1,5 @@
-AlsaModularSynth is a realtime modular synthesizer and effect processor. It
-features MIDI controlled modular software synthesis, Realtime effect processing
-with capture from e.g. "Line In" or "Mic In", Full control of all synthesis and
-effect parameters via MIDI, Integrated LADSPA Browser with search capability
-and JACK Support.
+AlsaModularSynth is a realtime modular synthesizer and effect
+processor. It features MIDI controlled modular software synthesis,
+Realtime effect processing with capture from e.g. "Line In" or "Mic
+In", Full control of all synthesis and effect parameters via MIDI,
+Integrated LADSPA Browser with search capability and JACK Support.
diff --git a/audio/amSynth/amSynth.SlackBuild b/audio/amSynth/amSynth.SlackBuild
index 7a9abb63e0..2f6a11ff70 100644
--- a/audio/amSynth/amSynth.SlackBuild
+++ b/audio/amSynth/amSynth.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for amsynth
 
+# Copyright 2019 - 2020  Johannes Schoepfer, Germany
 # Copyright 2006  paul wisehart wise@lupulin.net
-# Copyright 2019  Johannes Schoepfer, Germany
 # 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=amSynth
-VERSION=${VERSION:-1.9.0}
+VERSION=${VERSION:-1.12.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.bz2
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/audio/amSynth/amSynth.info b/audio/amSynth/amSynth.info
index c8b30da140..32345a6094 100644
--- a/audio/amSynth/amSynth.info
+++ b/audio/amSynth/amSynth.info
@@ -1,8 +1,8 @@
 PRGNAM="amSynth"
-VERSION="1.9.0"
+VERSION="1.12.2"
 HOMEPAGE="https://amsynth.github.io/"
-DOWNLOAD="https://github.com/amsynth/amsynth/releases/download/release-1.9.0/amsynth-1.9.0.tar.bz2"
-MD5SUM="2328dba5ffb5310ff7b1ab14805da9d5"
+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 75d2adf6df..516ac721e5 100644
--- a/audio/apulse/README
+++ b/audio/apulse/README
@@ -1,15 +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 94e80e5cc9..177a2ab9f9 100644
--- a/audio/ardour/ardour.SlackBuild
+++ b/audio/ardour/ardour.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for ardour
 
 # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2018 Matteo Bernardini, Pisa, Italy
+# Copyright 2018-2020 Matteo Bernardini, 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=ardour
-VERSION=${VERSION:-5.12.0}
+VERSION=${VERSION:-6.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +65,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf Ardour-$VERSION
-tar xvf $CWD/Ardour-$VERSION.tar.bz2
+tar xvf $CWD/Ardour-$VERSION.tar.?z*
 cd Ardour-$VERSION
 chown -R root:root .
 find -L . \
@@ -74,19 +74,24 @@ 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/vendor_qm-dsp.patch
+
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11 -fpermissive" \
 ./waf configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --configdir=/etc \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-backends="jack,alsa" \
+  --with-backends="dummy,alsa,jack,pulseaudio" \
   --libjack=weak \
   --optimize \
   --freedesktop \
   --no-phone-home \
+  --nls \
+  --ptformat \
+  --lxvst \
   --cxx11
 
 ./waf build
@@ -97,12 +102,12 @@ 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/share/{appdata,applications,icons}
-cp build/gtk2_ardour/ardour5.appdata.xml $PKG/usr/share/appdata/
-cp build/gtk2_ardour/ardour5.desktop $PKG/usr/share/applications/
+cp build/gtk2_ardour/ardour6.appdata.xml $PKG/usr/share/appdata/
+cp build/gtk2_ardour/ardour6.desktop $PKG/usr/share/applications/
 for isize in 16 22 32 48 ; do
   mkdir -p $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps
   cp gtk2_ardour/icons/application-x-ardour_${isize}px.png \
-    $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps/ardour5.png
+    $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps/ardour6.png
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -115,10 +120,10 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Let's not clobber config files
-cd $PKG/etc/ardour5
+cd $PKG/etc/ardour6
   for i in $(find . -type f) ; do
     mv $i $i.new
-    echo "config etc/ardour5/$i.new" >> $PKG/install/doinst.sh
+    echo "config etc/ardour6/$i.new" >> $PKG/install/doinst.sh
   done
 cd -
 
diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info
index 480f145a9a..ceff37bec5 100644
--- a/audio/ardour/ardour.info
+++ b/audio/ardour/ardour.info
@@ -1,10 +1,10 @@
 PRGNAM="ardour"
-VERSION="5.12.0"
+VERSION="6.6"
 HOMEPAGE="http://ardour.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/Ardour-5.12.0.tar.bz2"
-MD5SUM="cb45f31a59dd5a0da07422e4ac1c44fd"
+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 lv2 cwiid lilv"
+REQUIRES="aubio jack liblo liblrdf vamp-plugin-sdk rubberband suil cwiid lilv"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/audio/ardour/vendor_qm-dsp.patch b/audio/ardour/vendor_qm-dsp.patch
new file mode 100644
index 0000000000..f8265fd6e4
--- /dev/null
+++ b/audio/ardour/vendor_qm-dsp.patch
@@ -0,0 +1,37 @@
+diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript
+index 775098e06b..13f6b9410a 100644
+--- i/libs/qm-dsp/wscript
++++ w/libs/qm-dsp/wscript
+@@ -23,17 +23,10 @@ def options(opt):
+     autowaf.set_options(opt)
+ 
+ def configure(conf):
+-    if conf.is_defined('USE_EXTERNAL_LIBS'):
+-        conf.check_cxx(header_name="base/Pitch.h", mandatory=True)
+-        conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
+-    else:
+-        conf.load('compiler_cxx')
+-        autowaf.configure(conf)
++    conf.load('compiler_cxx')
++    autowaf.configure(conf)
+ 
+ def build(bld):
+-    if bld.is_defined('USE_EXTERNAL_LIBS'):
+-        return
+-
+     # Host Library
+     obj = bld(features = 'c cxx cxxstlib')
+     obj.source = '''
+diff --git i/wscript w/wscript
+index 1c9bb1ff5d..95d377d8a7 100644
+--- i/wscript
++++ w/wscript
+@@ -1041,8 +1041,6 @@ def configure(conf):
+ 
+     if Options.options.use_external_libs:
+         conf.define('USE_EXTERNAL_LIBS', 1)
+-        conf.env.append_value(
+-            'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
+ 
+     if Options.options.boost_include != '':
+         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)
diff --git a/audio/asunder/asunder.SlackBuild b/audio/asunder/asunder.SlackBuild
index 8b1a742162..9784d8a07a 100644
--- a/audio/asunder/asunder.SlackBuild
+++ b/audio/asunder/asunder.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Asunder
 
 # Copyright 2008-2012  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2017-2019  Alan Ianson, Penticton, BC Canada
+# Copyright 2017-2020  Alan Ianson, Penticton, BC Canada
 # 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=asunder
-VERSION=${VERSION:-2.9.5}
+VERSION=${VERSION:-2.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/asunder/asunder.info b/audio/asunder/asunder.info
index 6dfd60d015..3295eaac0f 100644
--- a/audio/asunder/asunder.info
+++ b/audio/asunder/asunder.info
@@ -1,8 +1,8 @@
 PRGNAM="asunder"
-VERSION="2.9.5"
+VERSION="2.9.6"
 HOMEPAGE="http://littlesvr.ca/asunder/"
-DOWNLOAD="http://littlesvr.ca/asunder/releases/asunder-2.9.5.tar.bz2"
-MD5SUM="9b69fd292b243e2e725224bf93ca14ec"
+DOWNLOAD="http://littlesvr.ca/asunder/releases/asunder-2.9.6.tar.bz2"
+MD5SUM="64c1d87e0eb9e695af5bea9af19131b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/audacious-cue/README b/audio/audacious-cue/README
index 30260acf2f..3cfdd13876 100644
--- a/audio/audacious-cue/README
+++ b/audio/audacious-cue/README
@@ -1,4 +1,4 @@
 audacious-cue (Cue Sheet Plugin used by the Audacious media player)
 
-This plugin adds Cue Sheet support to the Audacious media player that comes
-with Slackware stock packages
+This plugin adds Cue Sheet support to the Audacious media player that
+comes with Slackware stock packages
diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild
index 6b7f0746eb..8daaf2c3c6 100644
--- a/audio/audacity/audacity.SlackBuild
+++ b/audio/audacity/audacity.SlackBuild
@@ -76,7 +76,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCNAM-$VERSION.tar.?z* || tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$SRCNAM-$VERSION.tar.gz
 cd $PRGNAM-$SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/audio/audacity/audacity.info b/audio/audacity/audacity.info
index 7bef11469d..4919a914c4 100644
--- a/audio/audacity/audacity.info
+++ b/audio/audacity/audacity.info
@@ -1,7 +1,7 @@
 PRGNAM="audacity"
 VERSION="2.3.2"
 HOMEPAGE="https://www.audacityteam.org"
-DOWNLOAD="https://github.com/audacity/audacity/archive/Audacity-2.3.2.tar.gz \
+DOWNLOAD="https://github.com/audacity/audacity/archive/Audacity-2.3.2/audacity-Audacity-2.3.2.tar.gz \
           http://ponce.cc/slackware/sources/repo/audacity-manual-2.3.2.zip"
 MD5SUM="ca1b5b5258e7a8839ca72bb20093b31b \
         e26f7f919b2ebc01f89d4f22bfae410f"
diff --git a/audio/calf-ladspa/README b/audio/calf-ladspa/README
index 8ffe92ee3b..3fbe03c4b1 100644
--- a/audio/calf-ladspa/README
+++ b/audio/calf-ladspa/README
@@ -1,17 +1,17 @@
 Calf "legacy" audio plugin pack for LADSPA and JACK. Contains effects
 (flanger, reverb, tape-like delay, phaser, rotary speaker, multi-mode
-filter, multi-tap chorus and compressor) and instruments (organ simulator
-and a monophonic synthesizer). This is the last release of Calf that
-supports LADSPA.
+filter, multi-tap chorus and compressor) and instruments (organ
+simulator and a monophonic synthesizer). This is the last release of
+Calf that supports LADSPA.
 
-This build only contains LADSPA plugins. It can be installed on the same
-system as the main "calf" build without conflict. If you're looking for
-LV2 plugins and/or the standalone calfjackhost, see the main "calf" build.
-The main purpose for calf-ladspa is to allow old Ardour/etc sessions
-to keep working after upgrading calf to the new non-LADSPA version. New
-projects should use the LV2 plugins in the calf build, since that's what
-upstream supports.
+This build only contains LADSPA plugins. It can be installed on the
+same system as the main "calf" build without conflict. If you're
+looking for LV2 plugins and/or the standalone calfjackhost, see the
+main "calf" build.  The main purpose for calf-ladspa is to allow old
+Ardour/etc sessions to keep working after upgrading calf to the new
+non-LADSPA version. New projects should use the LV2 plugins in the calf
+build, since that's what upstream supports.
 
-If you're looking for DSSI, please contact the script maintainer. Adding
-DSSI to this build is possible, but more work than I want to do unless
-someone actually *needs* it for opening old sessions.
+If you're looking for DSSI, please contact the script
+maintainer. Adding DSSI to this build is possible, but more work than I
+want to do unless someone actually *needs* it for opening old sessions.
diff --git a/audio/calf-ladspa/calf-ladspa.info b/audio/calf-ladspa/calf-ladspa.info
index 24c34db47c..9ab966e10a 100644
--- a/audio/calf-ladspa/calf-ladspa.info
+++ b/audio/calf-ladspa/calf-ladspa.info
@@ -1,7 +1,7 @@
 PRGNAM="calf-ladspa"
 VERSION="0.0.19kx"
 HOMEPAGE="http://kxstudio.sourceforge.net/Plugins"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/calf-0.0.19kx.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/calf-0.0.19kx.tar.gz"
 MD5SUM="ba2147ddc53022ddf1ffdf28c3340a57"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/calf/README b/audio/calf/README
index 148284f848..387ffbff30 100644
--- a/audio/calf/README
+++ b/audio/calf/README
@@ -1,13 +1,14 @@
-Calf Studio Gear is an audio plug-in pack for LV2 and JACK environments
-under Linux operating systems. The suite contains lots of effects (delay,
-modulation, signal processing, filters, equalizers, dynamics, distortion
-and mastering effects), instruments (SF2 player, organ simulator and
-a monophonic synthesizer) and tools (analyzer, mono/stereo tools,
-crossovers). Calf Studio Gear aims for a professional audience.
+Calf Studio Gear is an audio plug-in pack for LV2 and JACK
+environments under Linux operating systems. The suite contains
+lots of effects (delay, modulation, signal processing, filters,
+equalizers, dynamics, distortion and mastering effects), instruments
+(SF2 player, organ simulator and a monophonic synthesizer) and tools
+(analyzer, mono/stereo tools, crossovers). Calf Studio Gear aims for a
+professional audience.
 
-By default, the package is built with SSE support if the host CPU supports
-SSE. If building for another host, you can set SSE=yes or SSE=no in the
-environment to override the autodetection.
+By default, the package is built with SSE support if the host CPU
+supports SSE. If building for another host, you can set SSE=yes or
+SSE=no in the environment to override the autodetection.
 
 Optional dependency: lash. This will be autodetected at build time.
 
diff --git a/audio/caps/README b/audio/caps/README
index f75e0f44c4..cf7a00c6bf 100644
--- a/audio/caps/README
+++ b/audio/caps/README
@@ -1,22 +1,24 @@
 caps (audio plugin suite for LADSPA)
 
-CAPS, the C* Audio Plugin Suite, is a collection of refined LADSPA audio
-plugins capable of (and mainly intended for) realtime operation. The suite
-includes DSP units emulating instrument amplifiers, stomp-box classics,
-versatile 'virtual analogue' oscillators, fractal oscillation, reverb,
-equalization and more.
+CAPS, the C* Audio Plugin Suite, is a collection of refined LADSPA
+audio plugins capable of (and mainly intended for) realtime
+operation. The suite includes DSP units emulating instrument
+amplifiers, stomp-box classics, versatile 'virtual analogue'
+oscillators, fractal oscillation, reverb, equalization and more.
 
-By default, CAPS will use SSE and/or SSE3 optimizations, if they are
-supported on the build host. If you're building a package to be deployed
-on a different system, you might need to set FORCE_SLACK_CFLAGS=yes in
-the script's environment, which will completely disable SSE/SSE3 (but
-might cause performance problems, your mileage may vary).
+By default, CAPS will use SSE and/or SSE3 optimizations, if they
+are supported on the build host. If you're building a package
+to be deployed on a different system, you might need to set
+FORCE_SLACK_CFLAGS=yes in the script's environment, which will
+completely disable SSE/SSE3 (but might cause performance problems, your
+mileage may vary).
 
 The CAPS HTML documentation is about 1MB in size, located in
-/usr/doc/caps-$VERSION/html/index.html. If you want to leave it out of
-the package, set DOCS=no in the script's environment. Note that the HTML
-doc is also available online (it's the caps homepage)... but only the
-most recent version, which might be newer than this build.
+/usr/doc/caps-$VERSION/html/index.html. If you want to leave it out
+of the package, set DOCS=no in the script's environment. Note that the
+HTML doc is also available online (it's the caps homepage)... but only
+the most recent version, which might be newer than this build.
 
-If you're upgrading from an older version of caps, or need to install
-an older version of caps for e.g. an old Ardour session, read UPGRADE.txt.
+If you're upgrading from an older version of caps, or need to
+install an older version of caps for e.g. an old Ardour session, read
+UPGRADE.txt.
diff --git a/audio/caps/UPGRADE.txt b/audio/caps/UPGRADE.txt
index 206028d4db..7b633efa4c 100644
--- a/audio/caps/UPGRADE.txt
+++ b/audio/caps/UPGRADE.txt
@@ -27,14 +27,14 @@ you can still build many of them with this SlackBuild. Upstream removes
 the old sources from their site, but there are several versions archived
 here:
 
-http://urchlay.naptime.net/~urchlay/src/caps_0.9.7.tar.bz2
+https://slackware.uk/~urchlay/src/caps_0.9.7.tar.bz2
 [no documentation available for 0.9.7; package won't contain docs]
 
-http://urchlay.naptime.net/~urchlay/src/caps_0.9.20.tar.bz2
-http://urchlay.naptime.net/~urchlay/src/caps-doc-unofficial_0.9.20.tar.bz2
+https://slackware.uk/~urchlay/src/caps_0.9.20.tar.bz2
+https://slackware.uk/~urchlay/src/caps-doc-unofficial_0.9.20.tar.bz2
 
-http://urchlay.naptime.net/~urchlay/src/caps_0.9.24.tar.bz2
-http://urchlay.naptime.net/~urchlay/src/caps-doc-unofficial_0.9.24.tar.bz2
+https://slackware.uk/~urchlay/src/caps_0.9.24.tar.bz2
+https://slackware.uk/~urchlay/src/caps-doc-unofficial_0.9.24.tar.bz2
 
 Build with a command like:
 
diff --git a/audio/caps/caps.info b/audio/caps/caps.info
index a66240fdcd..0c10120cba 100644
--- a/audio/caps/caps.info
+++ b/audio/caps/caps.info
@@ -2,7 +2,7 @@ PRGNAM="caps"
 VERSION="0.9.26"
 HOMEPAGE="http://quitte.de/dsp/caps.html"
 DOWNLOAD="http://quitte.de/dsp/caps_0.9.26.tar.bz2 \
-          http://urchlay.naptime.net/~urchlay/src/caps-doc-unofficial_0.9.26.tar.bz2"
+          https://slackware.uk/~urchlay/src/caps-doc-unofficial_0.9.26.tar.bz2"
 MD5SUM="36b30c7c7db2d2bc5f4f54077e97b5ee \
         3c3eb99856f0d21b5a7212622ff0b55f"
 DOWNLOAD_x86_64=""
diff --git a/audio/carla/README b/audio/carla/README
index 895b61c2c9..f64325675e 100644
--- a/audio/carla/README
+++ b/audio/carla/README
@@ -1,12 +1,13 @@
-Carla is a fully-featured audio plugin host, with support for many audio drivers
-and plugin formats.
+Carla is a fully-featured audio plugin host, with support for many
+audio drivers and plugin formats.
 
-It's open source and licensed under the GNU General Public License, version 2 or
-later.
+It's open source and licensed under the GNU General Public License,
+version 2 or later.
 
-It's also an internal audio and midi file player, remote control via OSC, Rack
-and Patchbay.
+It's also an internal audio and midi file player, remote control via
+OSC, Rack and Patchbay.
 
-Carla is a plugins host for VST, LADSPA, DSSI, LV2. A replacement for dssi-vst.
+Carla is a plugins host for VST, LADSPA, DSSI, LV2. A replacement for
+dssi-vst.
 
 Optional dependencies: fluidsynth, linuxsampler, projectM
diff --git a/audio/carla/carla.SlackBuild b/audio/carla/carla.SlackBuild
index b0a71bb524..331247c784 100644
--- a/audio/carla/carla.SlackBuild
+++ b/audio/carla/carla.SlackBuild
@@ -4,13 +4,11 @@
 # Michales (clavisound) Michaloudes korgie@gmail.com <2018>
 
 PRGNAM=carla
-VERSION=${VERSION:-2.0beta6}
+VERSION=${VERSION:-2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=Carla
-SRCVER=1.9.8
-TARVER=2.0-beta6-src
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -44,15 +42,14 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$SRCVER
-tar xvf $CWD/${SRCNAM}_${TARVER}.tar.gz
-cd $SRCNAM-$SRCVER
+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 {} \;
+# upstream ships archive with broken symlinks, remove
+find -L . -type l -exec rm -f {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 sed -i -e /CARLA_LIBDIR/s/\"lib\"/\"lib$LIBDIRSUFFIX\"/ data/carla-single
 
diff --git a/audio/carla/carla.info b/audio/carla/carla.info
index 81d4884e4d..0d0c6fdd40 100644
--- a/audio/carla/carla.info
+++ b/audio/carla/carla.info
@@ -1,8 +1,8 @@
 PRGNAM="carla"
-VERSION="2.0beta6"
+VERSION="2.1"
 HOMEPAGE="http://kxstudio.linuxaudio.org/"
-DOWNLOAD="https://github.com/falkTX/Carla/releases/download/1.9.8/Carla_2.0-beta6-src.tar.gz"
-MD5SUM="279acb33716327c82516d6edb8ff6d13"
+DOWNLOAD="https://github.com/falkTX/Carla/archive/v2.1/Carla-2.1.tar.gz"
+MD5SUM="908c535c4b88021f773f574f420552fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack liblo python3-PyQt5"
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/chuck/README b/audio/chuck/README
index a77fec203c..5f7fb32aad 100644
--- a/audio/chuck/README
+++ b/audio/chuck/README
@@ -1,13 +1,14 @@
-ChucK is a new (and developing) audio programming language for real-time
-synthesis, composition, performance, and now, analysis.
+ChucK is a new (and developing) audio programming language for
+real-time synthesis, composition, performance, and now, analysis.
 
-ChucK presents a new time-based, concurrent programming model that's highly
-precise and expressive (we call this strongly-timed), as well as dynamic
-control rates, and the ability to add and modify code on-the-fly. In addition,
-ChucK supports MIDI, OSC, HID device, and multi-channel audio. It's fun and
-easy to learn, and offers composers, researchers, and performers a powerful
-programming tool for building and experimenting with complex audio
-synthesis/analysis programs, and real-time interactive control.
+ChucK presents a new time-based, concurrent programming model that's
+highly precise and expressive (we call this strongly-timed), as well
+as dynamic control rates, and the ability to add and modify code
+on-the-fly. In addition, ChucK supports MIDI, OSC, HID device, and
+multi-channel audio. It's fun and easy to learn, and offers composers,
+researchers, and performers a powerful programming tool for building
+and experimenting with complex audio synthesis/analysis programs, and
+real-time interactive control.
 
 Please e-mail me if it works for 64-bit.
 
diff --git a/audio/clam/README b/audio/clam/README
index 7bd0274c48..6fe5230399 100644
--- a/audio/clam/README
+++ b/audio/clam/README
@@ -5,7 +5,7 @@ search for "clamav".
 
 CLAM is a software framework for research and application development
 on the audio and music domain. It provides means to perform complex
-audio signal analysis, transformations and synthesis. It also provides a
-uniform interface to common tasks on audio applications such as accessing
-audio devices and audio files, thread safe communication with the user
-interface and DSP algorithms recombination and scaling.
+audio signal analysis, transformations and synthesis. It also provides
+a uniform interface to common tasks on audio applications such as
+accessing audio devices and audio files, thread safe communication with
+the user interface and DSP algorithms recombination and scaling.
diff --git a/audio/clam/clam.info b/audio/clam/clam.info
index 47f5637c98..a791421d81 100644
--- a/audio/clam/clam.info
+++ b/audio/clam/clam.info
@@ -1,7 +1,7 @@
 PRGNAM="clam"
 VERSION="r15456"
 HOMEPAGE="http://clam-project.org/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/CLAM-r15456.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/CLAM-r15456.tar.xz"
 MD5SUM="c54caaa742960c015dc4783935ddc8d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/README b/audio/connie/README
index e77f2c03c0..ef912989a8 100644
--- a/audio/connie/README
+++ b/audio/connie/README
@@ -10,10 +10,11 @@ By default, connie is built with SSE math support. If installing on a
 system without SSE ("grep sse /proc/cpuinfo" will tell you), set SSE=no
 in the script's environment.
 
-connie's standard user interface is console-based. If you want to also
-build a simple Qt user interface, set QT=yes in the script's environment.
-The Qt version is called connie_qt4. It accepts the same arguments as
-the terminal version, but doesn't support any keyboard commands.
+connie's standard user interface is console-based. If you want to
+also build a simple Qt user interface, set QT=yes in the script's
+environment.  The Qt version is called connie_qt4. It accepts the same
+arguments as the terminal version, but doesn't support any keyboard
+commands.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
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 37f3bc3d26..e84a5479f5 100644
--- a/audio/connie/connie.info
+++ b/audio/connie/connie.info
@@ -1,7 +1,7 @@
 PRGNAM="connie"
 VERSION="0.4.3rc9"
-HOMEPAGE="https://bitbucket.org/horo/connie/wiki/Home"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/connie-0.4.3rc9.tar.gz"
+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=""
 MD5SUM_x86_64=""
diff --git a/audio/creox4/README b/audio/creox4/README
index b47357b420..19b4326725 100644
--- a/audio/creox4/README
+++ b/audio/creox4/README
@@ -1,10 +1,10 @@
 creox4 (guitar/etc effects for JACK)
 
-Creox is a real-time sound processor. You can plug your electric guitar
-or any other musical instrument directly to the PC's sound card and start
-experimenting with various sound effects. Creox has a nice user-friendly
-GUI, a preset support, a low-latency DSP engine and each effect parameter
-can be altered "on the fly".
+Creox is a real-time sound processor. You can plug your electric
+guitar or any other musical instrument directly to the PC's sound card
+and start experimenting with various sound effects. Creox has a nice
+user-friendly GUI, a preset support, a low-latency DSP engine and each
+effect parameter can be altered "on the fly".
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/creox4/creox4.info b/audio/creox4/creox4.info
index 6239f2383f..53abbb7557 100644
--- a/audio/creox4/creox4.info
+++ b/audio/creox4/creox4.info
@@ -1,7 +1,7 @@
 PRGNAM="creox4"
 VERSION="20140309"
 HOMEPAGE="https://github.com/laudrup/Creox4"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/creox4-20140309.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/creox4-20140309.tar.gz"
 MD5SUM="68783d31cca9358e1e26a95c76f5cfe9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/cuberok/README b/audio/cuberok/README
index 9e22c85215..dafad4c43c 100644
--- a/audio/cuberok/README
+++ b/audio/cuberok/README
@@ -2,5 +2,6 @@ cuberok (Cuberok audio player)
 
 Cuberok is an audio player and a collection manager based on Qt4.
 
-This should build the Phonon, GStreamer, and Audiere (if installed) engines.
-The ffmpeg engine is disable by default because it is not compiling correctly.
+This should build the Phonon, GStreamer, and Audiere (if installed)
+engines.  The ffmpeg engine is disable by default because it is not
+compiling correctly.
diff --git a/audio/deadbeef/deadbeef.info b/audio/deadbeef/deadbeef.info
index 192ebfe25f..fcac4b478a 100644
--- a/audio/deadbeef/deadbeef.info
+++ b/audio/deadbeef/deadbeef.info
@@ -6,5 +6,5 @@ MD5SUM="9c087836aa67b7bc7a873e312b04ce24"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jansson"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="Ruoh-Shoei Lin"
+EMAIL="lin.ruohshoei@gmail.com"
diff --git a/audio/decibel-audio-player/README b/audio/decibel-audio-player/README
index 4d120bb229..19a384acc4 100644
--- a/audio/decibel-audio-player/README
+++ b/audio/decibel-audio-player/README
@@ -5,13 +5,13 @@ GNU/Linux. It is very straightforward to use thanks to a clean and
 user-friendly interface. It is especially targeted at Gnome and follows
 the Gnome HIG.
 
-Decibel Audio Player is built around a highly modular structure that lets
-the user disable completely the features he does not need. A disabled
-feature uses absolutely no memory and no processor time.
+Decibel Audio Player is built around a highly modular structure that
+lets the user disable completely the features he does not need. A
+disabled feature uses absolutely no memory and no processor time.
 
-Decibel Audio Player is a real audio player and does not include features
-that are not meant to be part of an audio player. These features,
-such as tagging files or burning CDs, generally have a better support
-in dedicated software. If you are looking for an audio player than can
-make coffee, then you should stay away from Decibel and give a try to
-other players (e.g., Amarok, Exaile).
+Decibel Audio Player is a real audio player and does not include
+features that are not meant to be part of an audio player. These
+features, such as tagging files or burning CDs, generally have a better
+support in dedicated software. If you are looking for an audio player
+than can make coffee, then you should stay away from Decibel and give a
+try to other players (e.g., Amarok, Exaile).
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/Signal-Desktop/doinst.sh b/audio/drumstick/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/Signal-Desktop/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/dssi-vst/README b/audio/dssi-vst/README
index e7b1d6192b..27ad6b73f8 100644
--- a/audio/dssi-vst/README
+++ b/audio/dssi-vst/README
@@ -1,6 +1,6 @@
 The dssi-vst package contains a wrapper plugin for Windows VSTs that
-enables them to be used by DSSI hosts running on Linux or similar on i386
-using Wine.
+enables them to be used by DSSI hosts running on Linux or similar on
+i386 using Wine.
 
 VST's dll must installed in /usr/lib/vst. You can override this with
 variable VST_PATH in your ~/.profile
diff --git a/audio/eawpats/README b/audio/eawpats/README
index 6de2812428..0fecfa8091 100644
--- a/audio/eawpats/README
+++ b/audio/eawpats/README
@@ -1,13 +1,14 @@
-eawpats is a sound patches library for TiMidity++.  This package contains
-a patchset for the TiMidity++ MIDI player.  A patchset is required for
-MIDI files to be audible through TiMidity++.  These patches also work
-with applications that use SDL_mixer for MIDI audio.
+eawpats is a sound patches library for TiMidity++.  This package
+contains a patchset for the TiMidity++ MIDI player.  A patchset is
+required for MIDI files to be audible through TiMidity++.  These
+patches also work with applications that use SDL_mixer for MIDI audio.
 
 Note that eawpats contains proprietary sound samples.  According to the
 ALSA Wiki:
 
-"Half of the patches in eawpats are derived from original Gravis patches,
-and therefore may have some intellectual property issues."
+"Half of the patches in eawpats are derived from original Gravis
+patches, and therefore may have some intellectual property issues."
 
-If this is a concern to you, use freepats instead (however, eawpats does
-sound nicer).  For more information, see /usr/doc/eawpats-12/copyrigh.txt
+If this is a concern to you, use freepats instead (however,
+eawpats does sound nicer).  For more information, see
+/usr/doc/eawpats-12/copyrigh.txt
diff --git a/audio/exhale/README b/audio/exhale/README
new file mode 100644
index 0000000000..7651261bd0
--- /dev/null
+++ b/audio/exhale/README
@@ -0,0 +1,4 @@
+exhale, which is an acronym for "Ecodis eXtended High-efficiency And
+Low-complexity Encoder", is the first Open Source xHE-AAC encoder
+available to Linux users. It has a command line interface to convert
+wav files to xHE-AAC (USAC) files.
diff --git a/audio/exhale/exhale.SlackBuild b/audio/exhale/exhale.SlackBuild
new file mode 100644
index 0000000000..fa74a977bf
--- /dev/null
+++ b/audio/exhale/exhale.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+# ----------------------------------------------------------------------
+# Slackware build script for exhale
+#
+# 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
+#   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.
+# ----------------------------------------------------------------------
+
+PRGNAM=exhale
+VERSION=${VERSION:-1.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}
+
+# 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 -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-v$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 \
+  -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_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
+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/audio/exhale/exhale.info b/audio/exhale/exhale.info
new file mode 100644
index 0000000000..1c4fee3cc5
--- /dev/null
+++ b/audio/exhale/exhale.info
@@ -0,0 +1,10 @@
+PRGNAM="exhale"
+VERSION="1.1.1"
+HOMEPAGE="https://gitlab.com/ecodis/exhale"
+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=""
+MAINTAINER="Andrew Strong"
+EMAIL="andrew.david.strong@gmail.com"
diff --git a/audio/exhale/slack-desc b/audio/exhale/slack-desc
new file mode 100644
index 0000000000..fac7c0d9da
--- /dev/null
+++ b/audio/exhale/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------------------------------------------------------|
+exhale: exhale (a CLI xHE-AAC encoder)
+exhale:
+exhale: An Open Source encoder to convert wav files to xHE-AAC (USAC) files.
+exhale:
+exhale:
+exhale: https://gitlab.com/ecodis/exhale
+exhale:
+exhale:
+exhale:
+exhale:
+exhale:
diff --git a/audio/ezstream/README b/audio/ezstream/README
index b4de5a8f40..bf77ea3063 100644
--- a/audio/ezstream/README
+++ b/audio/ezstream/README
@@ -1 +1,2 @@
-Ezstream is a command line source client for Icecast media streaming servers.
+Ezstream is a command line source client for Icecast media streaming
+servers.
diff --git a/audio/ezstream/ezstream.info b/audio/ezstream/ezstream.info
index 8dd90b70d7..ebc686f3ac 100644
--- a/audio/ezstream/ezstream.info
+++ b/audio/ezstream/ezstream.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libshout"
 MAINTAINER="nullmaster"
-EMAIL="nullmaster@pm.me"
\ No newline at end of file
+EMAIL="nullmaster@pm.me"
diff --git a/audio/faac/faac.SlackBuild b/audio/faac/faac.SlackBuild
index 36e0930a1e..9f267909b9 100644
--- a/audio/faac/faac.SlackBuild
+++ b/audio/faac/faac.SlackBuild
@@ -31,6 +31,8 @@ VERSION=${VERSION:-1.30}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCVER=${VERSION/./_}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -63,10 +65,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-mv $PRGNAM-$(echo $VERSION | tr . _ ) $PRGNAM-$VERSION
-cd $PRGNAM-$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 \
diff --git a/audio/faac/faac.info b/audio/faac/faac.info
index f9d907070a..1931cef7b0 100644
--- a/audio/faac/faac.info
+++ b/audio/faac/faac.info
@@ -1,7 +1,7 @@
 PRGNAM="faac"
 VERSION="1.30"
 HOMEPAGE="https://sourceforge.net/projects/faac"
-DOWNLOAD="https://github.com/knik0/faac/archive/1_30/faac-1.30.tar.gz"
+DOWNLOAD="https://github.com/knik0/faac/archive/1_30/faac-1_30.tar.gz"
 MD5SUM="8d61e6d55088e599aa91532d5e6995b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/faad2/faad2.SlackBuild b/audio/faad2/faad2.SlackBuild
index 450f81f672..4122231289 100644
--- a/audio/faad2/faad2.SlackBuild
+++ b/audio/faad2/faad2.SlackBuild
@@ -24,10 +24,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=faad2
-VERSION=${VERSION:-2.9.1}
+VERSION=${VERSION:-2.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCVER=${VERSION//./_}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -60,10 +62,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-mv $PRGNAM-$(echo $VERSION | tr . _ ) $PRGNAM-$VERSION
-cd $PRGNAM-$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 \
diff --git a/audio/faad2/faad2.info b/audio/faad2/faad2.info
index 819807147b..473b14d76b 100644
--- a/audio/faad2/faad2.info
+++ b/audio/faad2/faad2.info
@@ -1,8 +1,8 @@
 PRGNAM="faad2"
-VERSION="2.9.1"
+VERSION="2.9.2"
 HOMEPAGE="https://github.com/knik0/faad2"
-DOWNLOAD="https://github.com/knik0/faad2/archive/2_9_1/faad2-2.9.1.tar.gz"
-MD5SUM="a880fadc4fc4a564d0833f0c1e7c08b5"
+DOWNLOAD="https://github.com/knik0/faad2/archive/2_9_2/faad2-2_9_2.tar.gz"
+MD5SUM="ed0db61d6ffa3e67748c3f03468c6eec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/fabla/fabla-1.3.2-lv2-1.18.0.patch b/audio/fabla/fabla-1.3.2-lv2-1.18.0.patch
new file mode 100644
index 0000000000..a3bd4bcc34
--- /dev/null
+++ b/audio/fabla/fabla-1.3.2-lv2-1.18.0.patch
@@ -0,0 +1,24 @@
+From 6d692c374178ae7efd373ca309bfa4a3dcc86156 Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Thu, 21 May 2020 15:29:43 +0200
+Subject: [PATCH] Fix for building with lv2 >= 1.18.0
+
+The update to lv2 1.18.0 dropped _LV2UI_Descriptor in favor of
+LV2UI_Descriptor.
+---
+ gui/fabla_ui.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gui/fabla_ui.cxx b/gui/fabla_ui.cxx
+index a722d98..2e721f3 100644
+--- a/gui/fabla_ui.cxx
++++ b/gui/fabla_ui.cxx
+@@ -52,7 +52,7 @@ extern void initForge(Fabla*);
+ extern void writeUpdateUiPaths(Fabla*);
+ extern void writeLoadSample(Fabla* self, int pad, const char* filename, size_t filename_len);
+ 
+-static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor * descriptor,
++static LV2UI_Handle instantiate(const struct LV2UI_Descriptor * descriptor,
+                 const char * plugin_uri,
+                 const char * bundle_path,
+                 LV2UI_Write_Function write_function,
diff --git a/audio/fabla/fabla.SlackBuild b/audio/fabla/fabla.SlackBuild
index ca8b68da7a..3e54daf878 100644
--- a/audio/fabla/fabla.SlackBuild
+++ b/audio/fabla/fabla.SlackBuild
@@ -59,6 +59,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 for the newer lv2
+patch -p1 < $CWD/fabla-1.3.2-lv2-1.18.0.patch
+
 mkdir -p build
 cd build
   cmake \
diff --git a/audio/ff8dls/ff8dls.info b/audio/ff8dls/ff8dls.info
index a18713a744..6374c8d38e 100644
--- a/audio/ff8dls/ff8dls.info
+++ b/audio/ff8dls/ff8dls.info
@@ -1,7 +1,7 @@
 PRGNAM="ff8dls"
 VERSION="1.39"
 HOMEPAGE="https://ffsf.aaron-kelley.net/download_8.html"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ff8dls_v139.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ff8dls_v139.zip"
 MD5SUM="85a9bffa1469b5c9ffde764858d21a30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/flac123/README b/audio/flac123/README
index d885c3ea94..ca85a45200 100644
--- a/audio/flac123/README
+++ b/audio/flac123/README
@@ -4,4 +4,4 @@ which provide a standalone tool to encode and decode files, a tool
 to manipulate metadata but no command line tool for playback.
 
 Since it uses libao for audio output, it can output to ALSA and Pulse,
-despite those not being listed in its --help message.
\ No newline at end of file
+despite those not being listed in its --help message.
diff --git a/audio/fluid-soundfont/README b/audio/fluid-soundfont/README
index ffce647df5..839ea183de 100644
--- a/audio/fluid-soundfont/README
+++ b/audio/fluid-soundfont/README
@@ -1,7 +1,7 @@
 Fluid General MIDI SoundFont
 
-This is a GM SoundFont, for use with any modern MIDI synthesiser: hardware
-(like the emu10k1 sound card) or software (like FluidSynth).
+This is a GM SoundFont, for use with any modern MIDI synthesiser:
+hardware (like the emu10k1 sound card) or software (like FluidSynth).
 
 This package includes a shell script wrapper "fluidplay" that runs
 fluidsynth with this SoundFont pre-loaded.
diff --git a/audio/fluidsynth-dssi/README b/audio/fluidsynth-dssi/README
index 8d3e1268c1..12a8d5d807 100644
--- a/audio/fluidsynth-dssi/README
+++ b/audio/fluidsynth-dssi/README
@@ -1,2 +1,2 @@
-fluidsynth-dssi is a wrapper for the FluidSynth SoundFont-playing software
-synthesizer, allowing it to function as a DSSI plugin.
+fluidsynth-dssi is a wrapper for the FluidSynth SoundFont-playing
+software synthesizer, allowing it to function as a DSSI plugin.
diff --git a/audio/fluidsynth-dssi/fluidsynth-dssi.SlackBuild b/audio/fluidsynth-dssi/fluidsynth-dssi.SlackBuild
index e21673dc6d..d5bf6b716f 100644
--- a/audio/fluidsynth-dssi/fluidsynth-dssi.SlackBuild
+++ b/audio/fluidsynth-dssi/fluidsynth-dssi.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=fluidsynth-dssi
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.0.0+20190112_c9b4107}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,14 +44,13 @@ 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.[gx]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 {} \+
+
+[ -e configure ] || sh autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -68,9 +67,7 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING ChangeLog README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog 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/audio/fluidsynth-dssi/fluidsynth-dssi.info b/audio/fluidsynth-dssi/fluidsynth-dssi.info
index 99c39a25c1..c07149d830 100644
--- a/audio/fluidsynth-dssi/fluidsynth-dssi.info
+++ b/audio/fluidsynth-dssi/fluidsynth-dssi.info
@@ -1,8 +1,8 @@
 PRGNAM="fluidsynth-dssi"
-VERSION="1.0.0"
+VERSION="1.0.0+20190112_c9b4107"
 HOMEPAGE="http://dssi.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/dssi/fluidsynth-dssi-1.0.0.tar.gz"
-MD5SUM="6c9f660f0df4d2aad5076de75b2a0a67"
+DOWNLOAD="https://slackware.uk/~urchlay/src/fluidsynth-dssi-1.0.0+20190112_c9b4107.tar.xz"
+MD5SUM="fcc8d82ea6d7bae337aebdda9aded8c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dssi fluidsynth"
diff --git a/audio/fluidsynth/README b/audio/fluidsynth/README
index 60219b06ac..a5daa0a947 100644
--- a/audio/fluidsynth/README
+++ b/audio/fluidsynth/README
@@ -1,9 +1,21 @@
-FluidSynth is a software real-time synthesizer based on the Soundfont 2
-specifications. FluidSynth reads and handles MIDI events from the MIDI
-input device. It is the software analogue of a MIDI synthesizer.
-FluidSynth can also play midifiles using a Soundfont.
+fluidsynth (software synthesizer)
 
-If you want to build support for ladspa plugins, you can pass
-LADSPA=yes to the script. That requires ladspa_sdk.
+FluidSynth is a software real-time synthesizer based on the Soundfont
+2 specifications. FluidSynth reads and handles MIDI events from the
+MIDI input device. It is the software analogue of a MIDI synthesizer.
+FluidSynth can also play MIDI files using a Soundfont.
 
-Optional deps are lash, portaudio, and jack.
+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):
+
+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 7cf814a89d..3fcb1f23ed 100644
--- a/audio/fluidsynth/fluidsynth.SlackBuild
+++ b/audio/fluidsynth/fluidsynth.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for fluidsynth
 
 # Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +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:-1.1.6}
+VERSION=${VERSION:-2.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,11 +67,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 {} \+
 
 mkdir build
 cd build
@@ -80,21 +81,27 @@ cd build
     -DLIB_SUFFIX="$LIBDIRSUFFIX" \
     -DDOC_INSTALL_DIR="doc" \
     -DMAN_INSTALL_DIR="man/man1" \
-    -Denable-ladspa="${LADSPA:-no}" \
+    -Denable-ladspa="${LADSPA:-yes}" \
+    -Denable-pulseaudio="${PULSE:-yes}" \
+    -Denable-oss="${OSS:-no}" \
+    -Denable-jack="${JACK:-yes}" \
+    -Denable-sdl2="${SDL2:-yes}" \
+    -Denable-portaudio="${PORTAUDIO:-yes}" \
+    -Denable-libinstpatch="${IPATCH:-yes}" \
+    -Denable-systemd=no \
     ..
 
   make
-  make install DESTDIR=$PKG
+  make install/strip 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 {} \;
 
+DOCS="AUTHORS ChangeLog COPYING NEWS README THANKS TODO CONTRIBUTING.md LICENSE README.md"
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+for i in $DOCS; do
+  [ -e "$i" ] && cp -a "$i" $PKG/usr/doc/$PRGNAM-$VERSION
+done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/fluidsynth/fluidsynth.info b/audio/fluidsynth/fluidsynth.info
index d3b454c60f..eb6ca5c794 100644
--- a/audio/fluidsynth/fluidsynth.info
+++ b/audio/fluidsynth/fluidsynth.info
@@ -1,10 +1,10 @@
 PRGNAM="fluidsynth"
-VERSION="1.1.6"
+VERSION="2.1.5"
 HOMEPAGE="http://www.fluidsynth.org/"
-DOWNLOAD="http://downloads.sourceforge.net/fluidsynth/fluidsynth-1.1.6.tar.gz"
-MD5SUM="ae5aca6de824b4173667cbd3a310b263"
+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=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/audio/fluidsynth/slack-desc b/audio/fluidsynth/slack-desc
index 46df5825cd..4228b2cd1d 100644
--- a/audio/fluidsynth/slack-desc
+++ b/audio/fluidsynth/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-fluidsynth: fluidsynth (Software Synthesizer)
+fluidsynth: fluidsynth (software synthesizer)
 fluidsynth:
 fluidsynth: FluidSynth is a software real-time synthesizer based on the
 fluidsynth: Soundfont 2 specifications. FluidSynth reads and handles MIDI
 fluidsynth: events from the MIDI input device. It is the software analogue
-fluidsynth: of a MIDI synthesizer. FluidSynth can also play midifiles
+fluidsynth: of a MIDI synthesizer. FluidSynth can also play MIDI files
 fluidsynth: using a Soundfont.
 fluidsynth:
 fluidsynth: Homepage: http://www.fluidsynth.org/
diff --git a/audio/fmit/README b/audio/fmit/README
index 732080fbe2..85f33d9871 100644
--- a/audio/fmit/README
+++ b/audio/fmit/README
@@ -1,8 +1,9 @@
-fmit (Free Music Instrument Tuner) is a piece of software for tuning musical
-instruments, using Qt as a GUI library, supporting ALSA, JACK, OSS, or
-PortAudio for audio input. Features error and volume history, tuning scales
-using Scala (.scl) files, microtonal tuning, harmonic ratios, wave shapes, and
-more. 
+fmit (Free Music Instrument Tuner) is a piece of software for tuning
+musical instruments, using Qt as a GUI library, supporting ALSA, JACK,
+OSS, or PortAudio for audio input. Features error and volume history,
+tuning scales using Scala (.scl) files, microtonal tuning, harmonic
+ratios, wave shapes, and more.
 
-fmit will automatically detect ALSA and if jack, oss or portaudio support
-is desired, pass JACK="ON", OSS="ON" or PORTAUDIO="ON" to the SlackBuild.
+fmit will automatically detect ALSA and if jack, oss or portaudio
+support is desired, pass JACK="ON", OSS="ON" or PORTAUDIO="ON" to the
+SlackBuild.
diff --git a/audio/fmmidi/fmmidi.info b/audio/fmmidi/fmmidi.info
index f9aabb0864..77235a0278 100644
--- a/audio/fmmidi/fmmidi.info
+++ b/audio/fmmidi/fmmidi.info
@@ -1,7 +1,7 @@
 PRGNAM="fmmidi"
 VERSION="1.0.1"
 HOMEPAGE="http://web.archive.org/web/20190910030450/http://unhaut.x10host.com:80/fmmidi/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/fmmidi-1.0.1.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/fmmidi-1.0.1.tar.gz"
 MD5SUM="d846a3add02adb34304d8f529a4290d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/README b/audio/gogglesmm/README
index 7cd66c0dbf..58c78fdce1 100644
--- a/audio/gogglesmm/README
+++ b/audio/gogglesmm/README
@@ -1,3 +1,4 @@
-Goggles Music Manager is a music collection manager and player that 
-automatically categorizes your music files based on genre, artist, album,
-and song.  It supports gapless playback and features easy tag editing.
+Goggles Music Manager is a music collection manager and player that
+automatically categorizes your music files based on genre, artist,
+album, and song.  It supports gapless playback and features easy tag
+editing.
diff --git a/audio/gogglesmm/gogglesmm.SlackBuild b/audio/gogglesmm/gogglesmm.SlackBuild
index 1c09e5bacc..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.1.9}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/gogglesmm/gogglesmm.info b/audio/gogglesmm/gogglesmm.info
index 8a922e8360..a68fd7fe24 100644
--- a/audio/gogglesmm/gogglesmm.info
+++ b/audio/gogglesmm/gogglesmm.info
@@ -1,10 +1,10 @@
 PRGNAM="gogglesmm"
-VERSION="1.1.9"
+VERSION="1.2.2"
 HOMEPAGE="https://gogglesmm.github.io/"
-DOWNLOAD="https://github.com/gogglesmm/gogglesmm/archive/1.1.9/gogglesmm-1.1.9.tar.gz"
-MD5SUM="94f4db0be28abb1a27d8ef27fcf0ab12"
+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="fox-toolkit-devel"
-MAINTAINER="Keith Richie"
-EMAIL="disturbed1976@gmail.com"
+REQUIRES=""
+MAINTAINER="jarbowski"
+EMAIL="jarbowski@cock.lu"
diff --git a/audio/grip2/README b/audio/grip2/README
index 18e67b0e70..4cf5e11247 100644
--- a/audio/grip2/README
+++ b/audio/grip2/README
@@ -6,10 +6,11 @@ This is an older version of Grip that does not require GNOME. If you're
 looking for a modern version of Grip, see the package "grip".
 
 By default, it is safe to install grip2 and grip at the same time,
-although not particularly useful. If you don't plan to install both, pass
-SMYLINKS=yes to the build script. This will allow you to run "grip" and/or
-"gcd" (instead of having to say "grip2" and "gcd2"). Note that with
-SMYLINKS=yes, this package will conflict with the regular grip package.
+although not particularly useful. If you don't plan to install both,
+pass SMYLINKS=yes to the build script. This will allow you to run
+"grip" and/or "gcd" (instead of having to say "grip2" and "gcd2"). Note
+that with SMYLINKS=yes, this package will conflict with the regular
+grip package.
 
 Before running grip2 for the first time, you may want to copy the file
 "/usr/doc/grip2-2.96/dot.grip.sample" to "$HOME/.grip". This sets the
diff --git a/audio/gtklick/README b/audio/gtklick/README
index ca23532447..43ce0bbc4c 100644
--- a/audio/gtklick/README
+++ b/audio/gtklick/README
@@ -7,4 +7,4 @@ klick must be built with OSC (liblo) support to work with gtklick. If
 you get 'timeout waiting for klick to start', rebuild your klick package
 without LIBLO=no.
 
-You must build this package using "su -" instead of regular "su".
\ No newline at end of file
+You must build this package using "su -" instead of regular "su".
diff --git a/audio/guitarix/README b/audio/guitarix/README
index 365e6deeed..803394b6bc 100644
--- a/audio/guitarix/README
+++ b/audio/guitarix/README
@@ -1,8 +1,10 @@
-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 heard before. Guitarix
-can be used as a standalone application, as LADSPA plugins, or as LV2
-plugins.
+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
+heard before. Guitarix can be used as a standalone application, as
+LADSPA plugins, or as LV2 plugins.
 
 For 32-bit x86, a CPU with SSE instructions is required. For other
 architectures, SSE will be used if available.
@@ -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/helm/README b/audio/helm/README
index 476425cdaa..d0432853b4 100644
--- a/audio/helm/README
+++ b/audio/helm/README
@@ -1,4 +1,4 @@
-Helm is a free, cross-platform, polyphonic synthesizer that runs on
-GNU/Linux, Mac, and Windows as a standalone program and as a LV2/VST/AU/AAX
-plugin. Release is in beta so there are outstanding bugs. Please send any
-bugs found to matthewtytel@gmail.com
+Helm is a free, cross-platform, polyphonic synthesizer that runs
+on GNU/Linux, Mac, and Windows as a standalone program and as a
+LV2/VST/AU/AAX plugin. Release is in beta so there are outstanding
+bugs. Please send any bugs found to matthewtytel@gmail.com
diff --git a/audio/herrie/README b/audio/herrie/README
index 91533cccdf..9686e0b8ba 100644
--- a/audio/herrie/README
+++ b/audio/herrie/README
@@ -4,17 +4,17 @@ including playlists.
 
 Herrie has a split-screen user interface, with a playlist at the top
 of the screen and a file browser at the bottom. Herrie supports XMMS
-shortcuts for playback control and can play in XMMS mode or "party" mode
-(which acts as a song queue). Herrie also has some more exotic features,
-including support for AudioScrobbler and the ability to chroot() itself
-into a directory.
+shortcuts for playback control and can play in XMMS mode or "party"
+mode (which acts as a song queue). Herrie also has some more exotic
+features, including support for AudioScrobbler and the ability to
+chroot() itself into a directory.
 
 The default options for this Slackbuild are set for no scrobbler,
 modplugin, wave, or XSPF support. ALSA is the chosen sound output. This
-makes it so the program can be built with the least amount of dependencies
-(with these options all of them should be included in Slackware 12.1).
-See the README in the herrie source for the dependencies needed if you
-enable other options.
+makes it so the program can be built with the least amount of
+dependencies (with these options all of them should be included
+in Slackware 12.1).  See the README in the herrie source for the
+dependencies needed if you enable other options.
 
 This SlackBuild also includes some experimental patches to add
 functionality to herrie. These include adding more signals and remote
diff --git a/audio/horgand/README b/audio/horgand/README
index 90bfef3bee..ab2f2c53c2 100644
--- a/audio/horgand/README
+++ b/audio/horgand/README
@@ -1,16 +1,16 @@
 horgand (organ sounds softsynth)
 
-horgand is a softsynth, really simple and easy to use, specially designed
-to produce organ sounds, and is also capable of generating other sound
-types like Electric Pianos, Jazz Guitar, Strings, Brass, Fretless Bass,
-Accordion etc. using low CPU resources.
+horgand is a softsynth, really simple and easy to use, specially
+designed to produce organ sounds, and is also capable of generating
+other sound types like Electric Pianos, Jazz Guitar, Strings, Brass,
+Fretless Bass, Accordion etc. using low CPU resources.
 
 NOTE: The first time you start horgand, jack should NOT be running. To
 enable jack in horgand, use its Settings menu (Audio Output => Jack,
-then Save). Then exit horgand, start jack (with e.g. qjackctl), and run
-horgand again. It should now be able to connect to the jack server. Don't
-forget to connect its audio ouputs to something, if you want to hear it
-(and its MIDI inputs to something, to play it).
+then Save). Then exit horgand, start jack (with e.g. qjackctl),
+and run horgand again. It should now be able to connect to the jack
+server. Don't forget to connect its audio ouputs to something, if you
+want to hear it (and its MIDI inputs to something, to play it).
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/horgand/horgand.info b/audio/horgand/horgand.info
index e0a502c252..169b819228 100644
--- a/audio/horgand/horgand.info
+++ b/audio/horgand/horgand.info
@@ -1,7 +1,7 @@
 PRGNAM="horgand"
 VERSION="1.14"
 HOMEPAGE="https://sourceforge.net/projects/horgand.berlios/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/horgand-1.14.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/horgand-1.14.tar.gz"
 MD5SUM="e2bd4720a262cb739a2132904c241828"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/ices-cc/README b/audio/ices-cc/README
index e95ebee7e1..8eb515b8c2 100644
--- a/audio/ices-cc/README
+++ b/audio/ices-cc/README
@@ -1,6 +1,7 @@
-ices-cc is a Source client for broadcasting in MP3 format to an icecast server.
+ices-cc is a Source client for broadcasting in MP3 format to an icecast
+server.
 
-Optional dependencies are lame (for re-encoding support), libmp4v2 and faad2
-(for mp4 support, *broken ATM*).
+Optional dependencies are lame (for re-encoding support), libmp4v2 and
+faad2 (for mp4 support, *broken ATM*).
 
 See README.init if you plan to use /etc/rc.d/rc.ices-cc
diff --git a/audio/jack-rack/README b/audio/jack-rack/README
index 00a9a00873..8b0d86b253 100644
--- a/audio/jack-rack/README
+++ b/audio/jack-rack/README
@@ -1,8 +1,9 @@
 jack-rack (LADSPA effects host)
 
 JACK Rack is an effects "rack" for the JACK low latency audio API. The
-rack can be filled with LADSPA effects plugins and can be controlled using
-the ALSA sequencer. It's phat; it turns your computer into an effects box.
+rack can be filled with LADSPA effects plugins and can be controlled
+using the ALSA sequencer. It's phat; it turns your computer into an
+effects box.
 
 Optional build dependency: lash (pass LASH=yes to the script to enable)
 Optional runtime dependency: ecasound (for /usr/bin/ecarack script)
diff --git a/audio/jack-tools/jack-tools.info b/audio/jack-tools/jack-tools.info
index 1bf9c55dec..27de70d9f9 100644
--- a/audio/jack-tools/jack-tools.info
+++ b/audio/jack-tools/jack-tools.info
@@ -1,7 +1,7 @@
 PRGNAM="jack-tools"
 VERSION="20170117"
 HOMEPAGE="http://rd.slavepianos.org/?t=rju"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/jack-tools-20170117.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/jack-tools-20170117.tar.xz"
 MD5SUM="1733e89a77b9a5fa1c04f6b0327e362e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/jack1/README b/audio/jack1/README
index 42c1a7aa67..11a0d7e612 100644
--- a/audio/jack1/README
+++ b/audio/jack1/README
@@ -1,10 +1,10 @@
 jack1 (realtime low-latency sound server)
 
 JACK is a low-latency audio server written primarily for Linux.  It can
-connect a number of different applications to an audio device, as well as
-allow them to share audio among themselves.  Its clients can run in their
-own processes (ie. as a normal application) or they can run within a JACK
-server instance (i.e. as a "plugin").
+connect a number of different applications to an audio device, as well
+as allow them to share audio among themselves.  Its clients can run
+in their own processes (ie. as a normal application) or they can run
+within a JACK server instance (i.e. as a "plugin").
 
 Optional dependencies are libffado and celt.
 
@@ -14,9 +14,9 @@ This is the "mature, stable" JACK1 branch. It's not 100% deprecated,
 but it no longer receives much attention from the upstream JACK
 developers. They recommend not using JACK1 at all, actually.
 
-Note: this build was formerly known as jack-audio-connection-kit. Before
-installing this, "removepkg jack-audio-connection-kit" if you had it
-installed.
+Note: this build was formerly known as
+jack-audio-connection-kit. Before installing this, "removepkg
+jack-audio-connection-kit" if you had it installed.
 
 SBo build maintainers, please DO NOT list this as a dependency for
 your builds. If the software you're trying to build really does work
diff --git a/audio/jackmeter/README b/audio/jackmeter/README
index bca5390674..af31153d98 100644
--- a/audio/jackmeter/README
+++ b/audio/jackmeter/README
@@ -1,6 +1,7 @@
-Jack Meter is a basic console based DPM (Digital Peak Meter) for JACK. The
-author wrote it for quickly checking remote signal levels, without having
-to run X11 to use a pretty graphical meter such as meterbridge.
+Jack Meter is a basic console based DPM (Digital Peak Meter) for
+JACK. The author wrote it for quickly checking remote signal levels,
+without having to run X11 to use a pretty graphical meter such as
+meterbridge.
 
 Note: the package is called jackmeter, but the actual binary is called
 jack_meter (with underscore).
diff --git a/audio/jalv/README b/audio/jalv/README
index cba689d276..8e5aebef8d 100644
--- a/audio/jalv/README
+++ b/audio/jalv/README
@@ -5,10 +5,10 @@ plugins and exposes their ports as Jack ports, essentially making any
 LV2 plugin function as a Jack application.
 
 Jalv is a small program which is useful, but also intended to be an
-appropriate test host for plugin development. It runs plugins from the
-command line with no user interaction, is light enough to run in valgrind,
-and is capable of dumping all plugin to/from UI communication in a human
-readable format.
+appropriate test host for plugin development. It runs plugins from
+the command line with no user interaction, is light enough to run in
+valgrind, and is capable of dumping all plugin to/from UI communication
+in a human readable format.
 
 For testing with various host toolkits, there are several Jalv
 executables: jalv, jalv.gtk, jalv.gtkmm, and jalv.qt. The jalv and
diff --git a/audio/jamulus/README b/audio/jamulus/README
index 7076933b9d..f59d8c40b2 100644
--- a/audio/jamulus/README
+++ b/audio/jamulus/README
@@ -1,9 +1,9 @@
 jamulus (real-time jam session client/server)
 
-The Jamulus software enables musicians to perform real-time jam sessions
-over the internet. There is one server running the Jamulus server software
-which collects the audio data from each Jamulus client, mixes the audio
-data and sends the mix back to each client.
+The Jamulus software enables musicians to perform real-time jam
+sessions over the internet. There is one server running the Jamulus
+server software which collects the audio data from each Jamulus client,
+mixes the audio data and sends the mix back to each client.
 
 The jamulus binary can be run as a client (default) or a server. See
 "jamulus --help" and SERVER.txt for details.
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/jvmetro/README b/audio/jvmetro/README
index b60e2456f3..86d31a6169 100644
--- a/audio/jvmetro/README
+++ b/audio/jvmetro/README
@@ -1,4 +1,5 @@
-JVMetro provides a colorful, realtime visual indication of the passage of bars
-and beats on the Jack transport--without generating any sound of its own.
+JVMetro provides a colorful, realtime visual indication of the passage
+of bars and beats on the Jack transport--without generating any sound
+of its own.
 
-For simplicity, SDL is used to generate graphics. 
+For simplicity, SDL is used to generate graphics.
diff --git a/audio/kid3/README b/audio/kid3/README
index 8752e0d20a..1d8db2c536 100644
--- a/audio/kid3/README
+++ b/audio/kid3/README
@@ -1,7 +1,7 @@
 If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC,
-MP2, Speex, TrueAudio and WavPack files (e.g. full albums) without typing
-the same information again and again and have control over both ID3v1
-and ID3v2 tags, then Kid3 is the program you are looking for.
+MP2, Speex, TrueAudio and WavPack files (e.g. full albums) without
+typing the same information again and again and have control over both
+ID3v1 and ID3v2 tags, then Kid3 is the program you are looking for.
 
 kid3-cli for command line execution.
 
diff --git a/audio/ladspa-bs2b/README b/audio/ladspa-bs2b/README
index 86dec1a4e3..477e45f304 100644
--- a/audio/ladspa-bs2b/README
+++ b/audio/ladspa-bs2b/README
@@ -1,6 +1,6 @@
-The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins is designed
-to improve headphone listening of stereo audio records. Recommended for
-headphone prolonged listening to disable superstereo fatigue without essential
-distortions.
+The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins
+is designed to improve headphone listening of stereo audio
+records. Recommended for headphone prolonged listening to disable
+superstereo fatigue without essential distortions.
 
 This package includes LADSPA plugin.
diff --git a/audio/lash/README b/audio/lash/README
index 90d52868ff..5bbf72a798 100644
--- a/audio/lash/README
+++ b/audio/lash/README
@@ -1,4 +1,8 @@
 LASH is a session management system for GNU/Linux audio applications.
-It allows you to save and restore audio sessions consisting of
-multiple interconneced applications, restoring program state (ie
-loaded patches) and the connections between them.
+It allows you to save and restore audio sessions consisting of multiple
+interconnected applications, restoring program state (i.e. loaded
+patches) and the connections between them.
+
+NOTE:
+
+tetex or texi2html is required to build the HTML manual.
diff --git a/audio/lash/lash.SlackBuild b/audio/lash/lash.SlackBuild
index 15270712ba..281ad2b76e 100644
--- a/audio/lash/lash.SlackBuild
+++ b/audio/lash/lash.SlackBuild
@@ -27,12 +27,12 @@
 PRGNAM=lash
 VERSION=${VERSION:-0.6.0.594}
 SOURCE=$PRGNAM-0.6.0~rc2
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 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
@@ -43,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"
@@ -67,15 +67,19 @@ tar xvf $CWD/$SOURCE.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 {} \;
 
-if [ "$(/usr/share/texmf/bin/texi2html --version)" != "1.76" ]; then
+if [ "$(/usr/share/texmf/bin/texi2html --version 2>/dev/null)" != "1.76" ]; then
     patch -p1 --verbose < $CWD/texlive.patch
 fi
 
+if $( which texi2html >/dev/null 2>&1 ); then
+    manual=docs/lash-manual-html-one-page/lash-manual.html
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -91,12 +95,12 @@ 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp AUTHORS README.SECURITY COPYING ChangeLog ChangeLog.old NEWS INSTALL README \
-    docs/lash-manual-html-one-page/lash-manual.html \
+    $manual \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/audio/lash/lash.info b/audio/lash/lash.info
index e4730a1801..0b66446572 100644
--- a/audio/lash/lash.info
+++ b/audio/lash/lash.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://download.savannah.gnu.org/releases/lash/lash-0.6.0~rc2.tar.bz2"
 MD5SUM="af1dc4f4ceb284b1b0845de4f4c2fe47"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack"
+REQUIRES="jack %README%"
 MAINTAINER="David Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/audio/lash/slack-desc b/audio/lash/slack-desc
index 797ba2331c..076a1cd802 100644
--- a/audio/lash/slack-desc
+++ b/audio/lash/slack-desc
@@ -10,10 +10,10 @@ lash: lash (audio session management system)
 lash:
 lash: LASH is a session management system for GNU/Linux audio applications.
 lash: It allows you to save and restore audio sessions consisting of
-lash: multiple interconneced applications, restoring program state (ie
+lash: multiple interconnected applications, restoring program state (i.e.
 lash: loaded patches) and the connections between them.
 lash:
-lash: Slackbuild by David Woodfall
+lash: http://savannah.nongnu.org/projects/lash
 lash:
 lash:
 lash:
diff --git a/audio/lastfm/README b/audio/lastfm/README
index 6a0457036f..5aa750a768 100644
--- a/audio/lastfm/README
+++ b/audio/lastfm/README
@@ -1,6 +1,6 @@
-Last.fm is the flagship product from the team that designed the Audioscrobbler
-system, a music engine based on a massive collection of Music Profiles.
-Each music profile belongs to one person, and describes their taste in music.
-Last.fm uses these music profiles to make personalized recommendations, match
-you up with people who like similar music, and generate custom radio
-stations for each person.
+Last.fm is the flagship product from the team that designed the
+Audioscrobbler system, a music engine based on a massive collection
+of Music Profiles.  Each music profile belongs to one person, and
+describes their taste in music.  Last.fm uses these music profiles to
+make personalized recommendations, match you up with people who like
+similar music, and generate custom radio stations for each person.
diff --git a/audio/libbs2b/README b/audio/libbs2b/README
index 667d168fa3..bbbc60852f 100644
--- a/audio/libbs2b/README
+++ b/audio/libbs2b/README
@@ -1,7 +1,7 @@
-The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins is designed
-to improve headphone listening of stereo audio records. Recommended for
-headphone prolonged listening to disable superstereo fatigue without essential
-distortions.
+The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins
+is designed to improve headphone listening of stereo audio
+records. Recommended for headphone prolonged listening to disable
+superstereo fatigue without essential distortions.
 
 This package includes the library, libbs2b, and command line tools for
 processing audio files.
diff --git a/audio/linuxsampler/README b/audio/linuxsampler/README
index 0c745f9fd8..c7310e78cb 100644
--- a/audio/linuxsampler/README
+++ b/audio/linuxsampler/README
@@ -1,6 +1,6 @@
-The LinuxSampler project was founded with the goal to produce a free
-streaming-capable open source pure software audio sampler with professional
-grade features.
+The LinuxSampler project was founded with the goal to produce a
+free streaming-capable open source pure software audio sampler with
+professional grade features.
 
 Optional dependencies: jack, lv2, dssi, ladspa_sdk
 
diff --git a/audio/listener/README b/audio/listener/README
index 9fcafeebaa..b5cf3cb863 100644
--- a/audio/listener/README
+++ b/audio/listener/README
@@ -1,12 +1,13 @@
 This program listens for sound. If it detects any, it starts recording
-automatically and also automatically stops when things become silent again.
+automatically and also automatically stops when things become silent
+again.
 
 In order to use this, a few steps need to be completed first:
 
 1. Run setlistener (as an ordinary user), and use the
-   cursor keys on your keybord to move the "|" left and right until
-   <silence> appears in place of <SOUND!>. Make a note of the "Current
-   detection level", and modify the detect_level value in
+   cursor keys on your keybord to move the "|" left and right
+   until <silence> appears in place of <SOUND!>. Make a note of the
+   "Current detection level", and modify the detect_level value in
    /etc/listener.conf to match.
 
 2. To start, run listener -f (to prevent it forking to the background.
diff --git a/audio/llcon/README b/audio/llcon/README
index 6ecde6c38f..493e466b85 100644
--- a/audio/llcon/README
+++ b/audio/llcon/README
@@ -1,4 +1,4 @@
-The llcon software enables musicians to perform real-time jam sessions over
-the internet.  There is one server running the llcon server software which
-collects the audio data from each llcon client software, mixes the audio
-data and sends the mix back to each client.
+The llcon software enables musicians to perform real-time jam sessions
+over the internet.  There is one server running the llcon server
+software which collects the audio data from each llcon client software,
+mixes the audio data and sends the mix back to each client.
diff --git a/audio/lmms/README b/audio/lmms/README
index 53f4c127d7..d0e14b66e9 100644
--- a/audio/lmms/README
+++ b/audio/lmms/README
@@ -1,8 +1,9 @@
-LMMS is a free cross-platform alternative to commercial programs like FL
-Studio, which allow you to produce music with your computer. This includes
-the creation of melodies and beats, the synthesis and mixing of sounds, and
-arranging of samples. You can have fun with your MIDI-keyboard and much
-more; all in a user-friendly and modern interface.
+LMMS is a free cross-platform alternative to commercial programs like
+FL Studio, which allow you to produce music with your computer. This
+includes the creation of melodies and beats, the synthesis and
+mixing of sounds, and arranging of samples. You can have fun with
+your MIDI-keyboard and much more; all in a user-friendly and modern
+interface.
 
 jack, fluidsynth + fluid-soundfont are optional (but are highly
 recommended) - libgig, carla, stk, portaudio also are optional.
diff --git a/audio/lmms/lmms.SlackBuild b/audio/lmms/lmms.SlackBuild
index 521fc88259..c895d0c74a 100644
--- a/audio/lmms/lmms.SlackBuild
+++ b/audio/lmms/lmms.SlackBuild
@@ -4,14 +4,19 @@
 
 # Written by Zbigniew Baniewski, <Zbigniew [dot] Baniewski [at] gmail [dot] com>
 
+# 20200415 bkw: modified by SlackBuilds.org
+
 PRGNAM=lmms
-VERSION=${VERSION:-1.1.90}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# 20200415 bkw: rpmalloc version
+LIBVER=${LIBVER:-20190202_d9b5ee0}
+
 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 +27,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"
@@ -44,13 +49,29 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+# 20200415 bkw: upstream didn't bother to include rpmalloc in their
+# release tarball. The lmms build system is set up to expect rpmalloc
+# source, not a library in e.g. /usr/lib64, so we can't just make a
+# rpmalloc build and make it a depencency of lmms. Furthermore, we can't
+# just use an autogenerated github tarball, as it doesn't contain the
+# CMakeLists.txt required by lmms. The rpmalloc source here came from
+# the rpmalloc submodule from a git clone of lmms.
+cd src/3rdparty
+  rm -rf rpmalloc
+  tar xvf $CWD/rpmalloc-$LIBVER.tar.?z
+  # mv rpmalloc-$LIBVER rpmalloc # only need for rpmalloc releases
+cd -
+
 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 {} \+
 
+# 20200415 bkw: warning: if we don't set BASHCOMP_PKG_PATH, the
+# completions get installed to /usr (ignores DESTDIR)!
 mkdir build
 cd build
   cmake \
@@ -58,6 +79,7 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
+    -DBASHCOMP_PKG_PATH=$PKG/usr/share/bash-completion/completions \
     ..
   make VERBOSE=1
   make install DESTDIR=$PKG
@@ -73,12 +95,24 @@ 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 doc/AUTHORS INSTALL.txt README.md LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/AUTHORS README.md 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
 
+# 20200415 bkw: if we built with jack, do the realtime thing.
+if ldd $PKG/usr/bin/$PRGNAM | grep -q libjack; then
+  if [ "${SETCAP:-yes}" = "yes" ]; then
+    echo "[ -x /sbin/setcap ] && " \
+         "/sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$PRGNAM" \
+         >> $PKG/install/doinst.sh
+    # Only allow execution by audio group
+    chown root:audio $PKG/usr/bin/$PRGNAM
+    chmod 0750 $PKG/usr/bin/$PRGNAM
+  fi
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/lmms/lmms.info b/audio/lmms/lmms.info
index 9608f611eb..634bffd503 100644
--- a/audio/lmms/lmms.info
+++ b/audio/lmms/lmms.info
@@ -1,8 +1,10 @@
 PRGNAM="lmms"
-VERSION="1.1.90"
+VERSION="1.2.1"
 HOMEPAGE="https://lmms.io/"
-DOWNLOAD="https://github.com/LMMS/lmms/archive/v1.1.90/lmms-1.1.90.tar.gz"
-MD5SUM="c89d7132f1bbb3731c32b543f0b72302"
+DOWNLOAD="https://github.com/LMMS/lmms/archive/v1.2.1/lmms-1.2.1.tar.gz \
+          https://slackware.uk/~urchlay/src/rpmalloc-20190202_d9b5ee0.tar.xz"
+MD5SUM="b669265b5c811a3ed4ed9336be2babc0 \
+        c7c9f171a93af5b65b6293cb6bfcc8ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
diff --git a/audio/lsmi/README b/audio/lsmi/README
index 21d8f4b6b0..28dd918675 100644
--- a/audio/lsmi/README
+++ b/audio/lsmi/README
@@ -2,12 +2,13 @@ lsmi (map keyboard/mouse/joystick input to ALSA MIDI sequencer events)
 
 These simple user-space drivers support using certain homemade,
 repurposed, or commercial devices as MIDI controllers on Linux, even
-though the devices themselves are not capable of generating MIDI messages;
-this does not include things like MIDI-over-serial or PIC based projects,
-which are true MIDI devices.
+though the devices themselves are not capable of generating MIDI
+messages; this does not include things like MIDI-over-serial or PIC
+based projects, which are true MIDI devices.
 
-Reasons for using this software include: achieving MIDI entry on machines
-without MIDI ports, reusing old hardware, pure frugality, and fun.
+Reasons for using this software include: achieving MIDI entry on
+machines without MIDI ports, reusing old hardware, pure frugality,
+and fun.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/lv2-mda-metapiano/lv2-mda-metapiano.info b/audio/lv2-mda-metapiano/lv2-mda-metapiano.info
index 51c95d49a4..7263a0dd36 100644
--- a/audio/lv2-mda-metapiano/lv2-mda-metapiano.info
+++ b/audio/lv2-mda-metapiano/lv2-mda-metapiano.info
@@ -1,7 +1,7 @@
 PRGNAM="lv2-mda-metapiano"
 VERSION="0.0.2"
 HOMEPAGE="https://web.archive.org/web/20160713004948/http://git.elephly.net/gitweb.cgi?p=software/lv2-mdametapiano.git"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/lv2-mda-metapiano-0.0.2.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/lv2-mda-metapiano-0.0.2.tar.gz"
 MD5SUM="2285d3bf306a9ca4a6a0effe1c687ce1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/lv2/lv2.SlackBuild b/audio/lv2/lv2.SlackBuild
index bf9b5d3d22..2d640930c8 100644
--- a/audio/lv2/lv2.SlackBuild
+++ b/audio/lv2/lv2.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for lv2core
 
 # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2020 Matteo Bernardini, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lv2
-VERSION=${VERSION:-1.12.0}
+VERSION=${VERSION:-1.18.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
@@ -40,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"
@@ -64,10 +65,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 {} \;
 
 ./waf configure \
   --prefix=/usr \
diff --git a/audio/lv2/lv2.info b/audio/lv2/lv2.info
index 01e4da7809..09b68a0503 100644
--- a/audio/lv2/lv2.info
+++ b/audio/lv2/lv2.info
@@ -1,10 +1,10 @@
 PRGNAM="lv2"
-VERSION="1.12.0"
+VERSION="1.18.0"
 HOMEPAGE="http://lv2plug.in/"
-DOWNLOAD="http://lv2plug.in/spec/lv2-1.12.0.tar.bz2"
-MD5SUM="665580dc761de40b0d335001a204496a"
+DOWNLOAD="http://lv2plug.in/spec/lv2-1.18.0.tar.bz2"
+MD5SUM="e5cd231b43bd2b114e43ebab68861d99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+REQUIRES="sord"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/audio/lv2dynparam1/README b/audio/lv2dynparam1/README
index 9c2ee205a4..827f96e8bb 100644
--- a/audio/lv2dynparam1/README
+++ b/audio/lv2dynparam1/README
@@ -1,8 +1,8 @@
 lv2dynparam is a LV2 plugin interface extension that enables plugin
-parameters to appear and disappear (i.e. number of voices). It also allows
-nested grouping of parameters. Groups can be used for things like ADSR
-abstraction, i.e. group of 4 float parameters.
+parameters to appear and disappear (i.e. number of voices). It also
+allows nested grouping of parameters. Groups can be used for things
+like ADSR abstraction, i.e. group of 4 float parameters.
 
-The extension consists of a header describing the extension interface
-and libraries, one for plugins and one for hosts, to expose functionality
-in more usable, from programmer point of view, interface.
+The extension consists of a header describing the extension
+interface and libraries, one for plugins and one for hosts, to expose
+functionality in more usable, from programmer point of view, interface.
diff --git a/audio/lv2dynparam1/lv2dynparam1.SlackBuild b/audio/lv2dynparam1/lv2dynparam1.SlackBuild
index 29c93a4b04..9e7529728d 100644
--- a/audio/lv2dynparam1/lv2dynparam1.SlackBuild
+++ b/audio/lv2dynparam1/lv2dynparam1.SlackBuild
@@ -53,6 +53,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# In the newer lv2 the pkgconfig file is named differently...
+sed -i "s|lv2core|lv2|" configure
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/audio/mda-lv2/README b/audio/mda-lv2/README
index c6f240d4cb..5ddd5e8ab5 100644
--- a/audio/mda-lv2/README
+++ b/audio/mda-lv2/README
@@ -9,4 +9,5 @@ toggle ports (> 0.0 is on, rather than 0.5). All the plugins have been
 tested, and thanks to several bug fixes this collection should be more
 reliable than the original.
 
-See /usr/doc/mda-lv2-$VERSION/plugins.txt for descriptions of the plugins.
+See /usr/doc/mda-lv2-$VERSION/plugins.txt for descriptions of the
+plugins.
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/mhwaveedit/README b/audio/mhwaveedit/README
index ee4c88b298..8dfc8d8bb7 100644
--- a/audio/mhwaveedit/README
+++ b/audio/mhwaveedit/README
@@ -5,16 +5,16 @@ sound files. It is lightweight, portable, user-friendly, and handles
 large files very well.
 
 The program itself has only simple editing features such as cut'n'paste
-and volume adjustment, but it can also use Ladspa effect plugins and
-the effects provided by the SoX application. It can also support
+and volume adjustment, but it can also use Ladspa effect plugins
+and the effects provided by the SoX application. It can also support
 additional file formats besides wav through libsndfile and mp3/ogg
 import and export through lame and oggenc/oggdec.
 
 lame, jack[*], and portaudio are optional dependencies.
 
 [*] If jack support is included, 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.
+    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.
diff --git a/audio/midillo/README b/audio/midillo/README
index b2626ff1dc..d6594c5f5b 100644
--- a/audio/midillo/README
+++ b/audio/midillo/README
@@ -1,7 +1,7 @@
 midillo (MIDI file tools)
 
 midillo is a library and set of tools for MIDI files manipulation. At
-this point it consists of simple diagnostic dump of MIDI file (mididump),
-a filter that strips unwanted events (midifilter), and a converter to
-SMF format 0 files (midi2f0), so that a keyboard which is not as capable
-as a computer would understand it.
+this point it consists of simple diagnostic dump of MIDI file
+(mididump), a filter that strips unwanted events (midifilter), and a
+converter to SMF format 0 files (midi2f0), so that a keyboard which is
+not as capable as a computer would understand it.
diff --git a/audio/milkytracker/README b/audio/milkytracker/README
index f16c7e8551..95f7c891ce 100644
--- a/audio/milkytracker/README
+++ b/audio/milkytracker/README
@@ -1,5 +1,5 @@
-This is MilkyTracker 0.90.80. MilkyTracker is an audio tracker, and can create
-standard .MOD and .XM module files.
+This is MilkyTracker 0.90.80. MilkyTracker is an audio tracker, and can
+create standard .MOD and .XM module files.
 
 JACK support is optional and can be added by doing:
   JACK=yes ./milkytracker.SlackBuild
diff --git a/audio/millennium-plugins/millennium-plugins.info b/audio/millennium-plugins/millennium-plugins.info
index dc447a81cd..c887b57d18 100644
--- a/audio/millennium-plugins/millennium-plugins.info
+++ b/audio/millennium-plugins/millennium-plugins.info
@@ -1,7 +1,7 @@
 PRGNAM="millennium-plugins"
 VERSION="20100722"
 HOMEPAGE="http://pxu.sourceforge.net/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/The%20Millennium%20Plugin%20Suite.tar.bz2"
+DOWNLOAD="https://slackware.uk/~urchlay/src/The%20Millennium%20Plugin%20Suite.tar.bz2"
 MD5SUM="88e79c0260302bc439f631dbcf5a2e9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/minimodem/README b/audio/minimodem/README
index bcbba794a1..0c3d45a0fb 100644
--- a/audio/minimodem/README
+++ b/audio/minimodem/README
@@ -1,11 +1,12 @@
-Minimodem is a command-line program which decodes (or generates) audio modem
-tones at any specified baud rate, using various framing protocols. It acts a
-general-purpose software FSK modem, and includes support for various standard
-FSK protocols such as Bell103, Bell202, RTTY, NOAA SAME, and Caller-ID. 
+Minimodem is a command-line program which decodes (or generates)
+audio modem tones at any specified baud rate, using various framing
+protocols. It acts a general-purpose software FSK modem, and includes
+support for various standard FSK protocols such as Bell103, Bell202,
+RTTY, NOAA SAME, and Caller-ID.
 
-Minimodem can play and capture audio modem tones in real-time via the system
-audio device, or in batched mode via audio files.
+Minimodem can play and capture audio modem tones in real-time via the
+system audio device, or in batched mode via audio files.
 
-Minimodem can be used to transfer data between nearby computers using an audio
-cable (or just via sound waves), or between remote computers using radio,
-telephone, or another audio communications medium. 
+Minimodem can be used to transfer data between nearby computers using
+an audio cable (or just via sound waves), or between remote computers
+using radio, telephone, or another audio communications medium.
diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild
index 7e805adebd..18a05fe4a1 100644
--- a/audio/mixxx/mixxx.SlackBuild
+++ b/audio/mixxx/mixxx.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for mixxx
 
 # Copyright 2011 Elvio "HelLViS69" Basello <hellvis69@gmail.com>
-# Copyright 2018-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2018-2020 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 SlackBuilds.org
 
 PRGNAM=mixxx
-VERSION=${VERSION:-2.2.3}
+VERSION=${VERSION:-2.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -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 \
@@ -90,10 +95,6 @@ scons \
   vamp=1 \
   lilv=1 \
   wv=1 \
-  prefix=/usr
-
-QTDIR=/usr/lib$LIBDIRSUFFIX/qt5 \
-scons \
   install_root=$PKG/usr \
   prefix=/usr \
   install
diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info
index 2df47291f9..3f45810e8b 100644
--- a/audio/mixxx/mixxx.info
+++ b/audio/mixxx/mixxx.info
@@ -1,10 +1,10 @@
 PRGNAM="mixxx"
-VERSION="2.2.3"
+VERSION="2.2.4"
 HOMEPAGE="https://www.mixxx.org"
-DOWNLOAD="https://github.com/mixxxdj/mixxx/archive/release-2.2.3/mixxx-release-2.2.3.tar.gz"
-MD5SUM="f0b0eefb5e394d2a46150deea4beabb6"
+DOWNLOAD="https://github.com/mixxxdj/mixxx/archive/release-2.2.4/mixxx-release-2.2.4.tar.gz"
+MD5SUM="25bbebca0187254db4d1c53dc0bdd77d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="chromaprint faad2 libmodplug libmp4v2 libshout lilv opencore-amr opusfile portaudio portmidi protobuf qt5 rubberband 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/mp3blaster/README b/audio/mp3blaster/README
index 6aed084864..3db2724b9f 100644
--- a/audio/mp3blaster/README
+++ b/audio/mp3blaster/README
@@ -1,3 +1,3 @@
-mp3blaster is a ncurses/CLI media player for mp3/ogg files. It supports the 
-same functions other media players have, without the big memory footprint 
-and the big dependencies.
+mp3blaster is a ncurses/CLI media player for mp3/ogg files. It supports
+the same functions other media players have, without the big memory
+footprint and the big dependencies.
diff --git a/audio/mp3splt-gtk/README b/audio/mp3splt-gtk/README
index 4e7d88e197..719414c0b7 100644
--- a/audio/mp3splt-gtk/README
+++ b/audio/mp3splt-gtk/README
@@ -1,13 +1,16 @@
-Mp3Splt-project is a utility to split mp3 and ogg files selecting a begin
-and an end time position, without decoding. It's very useful to split
-large mp3/ogg to make smaller files or to split entire albums to obtain
-original tracks. If you want to split an album, you can select split
-points and filenames manually or you can get them automatically from CDDB
-(internet or a local file) or from .cue files. Supports also automatic
-silence split, that can be used also to adjust cddb/cue splitpoints. You
-can extract tracks from Mp3Wrap or AlbumWrap files in few seconds.
+Mp3Splt-project is a utility to split mp3 and ogg files selecting a
+begin and an end time position, without decoding. It's very useful to
+split large mp3/ogg to make smaller files or to split entire albums to
+obtain original tracks. If you want to split an album, you can select
+split points and filenames manually or you can get them automatically
+from CDDB (internet or a local file) or from .cue files. Supports
+also automatic silence split, that can be used also to adjust cddb/cue
+splitpoints. You can extract tracks from Mp3Wrap or AlbumWrap files in
+few seconds.
+
+The mp3splt project is divided in 3 parts (all available from
+SlackBuilds.org):
 
-Mp3splt-project is divided in 3 parts (all available from SlackBuilds.org):
  - libmp3splt, a library (created from mp3splt version 2.1c)
  - mp3splt, a command line program
  - mp3splt-gtk, a GTK2 gui
diff --git a/audio/mp3splt/README b/audio/mp3splt/README
index cbc45ad90f..cb0ccf0cc0 100644
--- a/audio/mp3splt/README
+++ b/audio/mp3splt/README
@@ -1,13 +1,16 @@
-Mp3Splt-project is a utility to split mp3 and ogg files selecting a begin
-and an end time position, without decoding. It's very useful to split
-large mp3/ogg to make smaller files or to split entire albums to obtain
-original tracks. If you want to split an album, you can select split
-points and filenames manually or you can get them automatically from CDDB
-(internet or a local file) or from .cue files. Supports also automatic
-silence split, that can be used also to adjust cddb/cue splitpoints. You
-can extract tracks from Mp3Wrap or AlbumWrap files in few seconds.
+Mp3Splt-project is a utility to split mp3 and ogg files selecting a
+begin and an end time position, without decoding. It's very useful to
+split large mp3/ogg to make smaller files or to split entire albums to
+obtain original tracks. If you want to split an album, you can select
+split points and filenames manually or you can get them automatically
+from CDDB (internet or a local file) or from .cue files. Supports
+also automatic silence split, that can be used also to adjust cddb/cue
+splitpoints. You can extract tracks from Mp3Wrap or AlbumWrap files in
+few seconds.
+
+The mp3splt project is divided in 3 parts (all available from
+SlackBuilds.org):
 
-Mp3splt-project is divided in 3 parts (all available from SlackBuilds.org):
  - libmp3splt, a library (created from mp3splt version 2.1c)
  - mp3splt, a command line program
  - mp3splt-gtk, a gtk2 gui
diff --git a/audio/mpd/README b/audio/mpd/README
index 4ff9ef98d7..3e33dbd623 100644
--- a/audio/mpd/README
+++ b/audio/mpd/README
@@ -1,24 +1,23 @@
+mpd (Music Player Daemon)
+
 Music Player Daemon (MPD) allows remote access for playing music (MP3,
-Ogg Vorbis, FLAC, AAC, Mod, and wave files) and managing playlists.
-MPD is designed for integrating a computer into a stereo system that
-provides control for music playback over a local network. It also makes
-a great desktop music player, especially if you are a console junkie,
-like frontend options, or restart X often.
+Ogg Vorbis, FLAC, AAC, Mod, MIDI, and wave files) and managing
+playlists.  MPD is designed for integrating a computer into a stereo
+system that provides control for music playback over a local network. It
+also makes a great desktop music player, especially if you are a console
+junkie, like frontend options, or restart X often.
 
 Some optional and important dependencies, detected automatically:
-* ffmpeg: is recommended for support a wide audio files variety
-* libshout: this enables the shoutcast streaming output
+* ffmpeg: is recommended for support a wide variety of audio file types
+* libshout: enables shoutcast streaming output
 * libmms: used for play mms:// and mmsh:// type network streams
 * id3lib: add support for edit ID3 tags
-* avahi: add support for discover services on network
+* avahi: add support for discovering services on network
 * yajl: add support for open soundcloud.com streams
 
-Other optional dependencies:
+Other optional dependencies, detected automatically:
 libmpdclient, musepack-tools, lame, faad2, fluidsynth, libsidplay2,
-twolame, libnfs and jack.
-
-You can enable this optional feature:
-ZZIPLIB=yes|no (default: no), enables open zip files, requires zziplib
+twolame, libnfs, jack, zziplib.
 
-NOTE:  Be sure to edit the config file (/etc/mpd.conf  or ~/mpd.conf)
+NOTE: Be sure to edit the config file (/etc/mpd.conf or ~/mpd.conf)
 before running the daemon.
diff --git a/audio/mpd/doinst.sh b/audio/mpd/doinst.sh
index 62f245e304..0137e611aa 100644
--- a/audio/mpd/doinst.sh
+++ b/audio/mpd/doinst.sh
@@ -1,13 +1,11 @@
 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/mpd.conf.new
diff --git a/audio/mpd/mpd.SlackBuild b/audio/mpd/mpd.SlackBuild
index d24d93c3b3..9ccb34020f 100644
--- a/audio/mpd/mpd.SlackBuild
+++ b/audio/mpd/mpd.SlackBuild
@@ -23,8 +23,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200411 bkw: not taking this over, but I'm upgrading it to the latest
+# release as part of the migration to fluidsynth-2.x.
+
 PRGNAM=mpd
-VERSION=${VERSION:-0.20.18}
+VERSION=${VERSION:-0.21.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,11 +60,11 @@ fi
 
 set -e
 
-# zziplib support
-if [ "${ZZIPLIB:-no}" != "no" ]; then
-    zziplib="enable"
+# undocumented, but allow disabling pulseaudio
+if [ "${PULSE:-yes}" = "yes" ]; then
+    PULSE="enabled"
 else
-    zziplib="disable"
+    PULSE="disabled"
 fi
 
 rm -rf $PKG
@@ -71,40 +74,44 @@ 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 {} \;
-
-#adding LDFLAGS="-lnsl" for libwrap, part of tcp_wrappers package
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lnsl" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --enable-documentation \
-  --enable-database \
-  --enable-pulse \
-  --enable-iso9660 \
-  --${zziplib}-zzip \
-  --enable-cdio-paranoia \
-  --disable-dependency-tracking \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-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 -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lnsl" \
+  meson .. \
+    -Dsystemd=disabled \
+    -Dpulse=$PULSE \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ${NINJA:-ninja}
+  DESTDIR=$PKG ninja install
+cd ..
+
+strip $PKG/usr/bin/$PRGNAM
+
+# 20200411 bkw: meson doesn't support --docdir
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
 
 # Use sample config, without overwriting
 install -D -m 644 doc/mpdconf.example $PKG/etc/mpd.conf.new
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+# 20200411 bkw: after the switch to meson, man pages aren't installed
+# automatically for some reason.
+for SECT in 1 5; do
+  mkdir -p $PKG/usr/man/man$SECT
+  cp doc/*.$SECT $PKG/usr/man/man$SECT
+  gzip -9 $PKG/usr/man/man$SECT/*.$SECT
+done
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/audio/mpd/mpd.info b/audio/mpd/mpd.info
index e1d297c8b9..57ce03e37d 100644
--- a/audio/mpd/mpd.info
+++ b/audio/mpd/mpd.info
@@ -1,10 +1,10 @@
 PRGNAM="mpd"
-VERSION="0.20.18"
+VERSION="0.21.22"
 HOMEPAGE="https://www.musicpd.org/"
-DOWNLOAD="https://www.musicpd.org/download/mpd/0.20/mpd-0.20.18.tar.xz"
-MD5SUM="8dc87ba95473fd738f2aff9bd69cc212"
+DOWNLOAD="https://www.musicpd.org/download/mpd/0.21/mpd-0.21.22.tar.xz"
+MD5SUM="bb2629c875aae28460cda5cf5257434b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="meson"
 MAINTAINER="DhabyX"
 EMAIL="slack.dhabyx@gmail.com"
diff --git a/audio/mpd/slack-desc b/audio/mpd/slack-desc
index 6035c0897f..630bf9d651 100644
--- a/audio/mpd/slack-desc
+++ b/audio/mpd/slack-desc
@@ -9,7 +9,7 @@
 mpd: mpd (Music Player Daemon)
 mpd:
 mpd: MPD is designed for integrating a computer into a stereo system that
-mpd: provides control for music playback over a local network.  It is also
+mpd: provides control for music playback over a local network. It is also
 mpd: a great music player using one of many available clients.
 mpd:
 mpd: Homepage: https://www.musicpd.org/
diff --git a/audio/mppenc/README b/audio/mppenc/README
index 159a156330..0aa548dd2e 100644
--- a/audio/mppenc/README
+++ b/audio/mppenc/README
@@ -1,6 +1,6 @@
 Mppenc (Musepack encoder)
 
-Musepack is an audio compression format with a strong emphasis on high 
-quality.  It's not lossless, but it is designed for transparency so that 
-you won't be able to hear differences between the original wave file and 
-the much smaller MPC file.
+Musepack is an audio compression format with a strong emphasis on
+high quality.  It's not lossless, but it is designed for transparency
+so that you won't be able to hear differences between the original wave
+file and the much smaller MPC file.
diff --git a/audio/mt-daapd/README b/audio/mt-daapd/README
index 8c560bb90a..2f32124b14 100644
--- a/audio/mt-daapd/README
+++ b/audio/mt-daapd/README
@@ -1,20 +1,22 @@
-mt-daapd is an iTunes server for POSIX systems.  When run, iTunes will see the 
-music as a shared library to other clients on the LAN, just as the OS X and 
-Windows clients.  
+mt-daapd is an iTunes server for POSIX systems.  When run, iTunes will
+see the music as a shared library to other clients on the LAN, just as
+the OS X and Windows clients.
 
-To work properly, the music must be located on the same filesystem on which 
-the daemon is running.  Also, a template has been placed in /etc/mt-daapd.conf
-This file should be edited before the daemon is run.
+To work properly, the music must be located on the same filesystem
+on which the daemon is running.  Also, a template has been placed
+in /etc/mt-daapd.conf This file should be edited before the daemon
+is run.
+
+An init script has been included for the daemon; to run at boot time,
+add the following to /etc/rc.d/rc.local:
 
-An init script has been included for the daemon; to run at boot time, add the 
-following to /etc/rc.d/rc.local:
-  
   if [ -x /etc/rc.d/rc.mt-daapd ]; then
     /etc/rc.d/rc.mt-daapd start
   fi
 
-You might also want to have the daemon shut down gracefully on system halt or 
-reboot; if so, add the following to /etc/rc.d/rc.local_shutdown:
+You might also want to have the daemon shut down gracefully
+on system halt or reboot; if so, add the following to
+/etc/rc.d/rc.local_shutdown:
 
   if [ -x /etc/rc.d/rc.mt-daapd ]; then
     /etc/rc.d/rc.mt-daapd stop
diff --git a/audio/multimidicast/README b/audio/multimidicast/README
index 9efc02cc26..37126c78d5 100644
--- a/audio/multimidicast/README
+++ b/audio/multimidicast/README
@@ -1,8 +1,9 @@
-multimidicast sends and receives MIDI from Alsa sequencers over your network.
+multimidicast sends and receives MIDI from Alsa sequencers over your
+network.
 
-It uses UDP multicast datagrams and is thus subscriptionless and plug'n'play.
-This program currently only works on Linux, since the Alsa API is only available
-on Linux.
+It uses UDP multicast datagrams and is thus subscriptionless and
+plug'n'play.  This program currently only works on Linux, since the
+Alsa API is only available on Linux.
 
-It is designed to interoperate with the windows software ipMIDI or multimidicast
-for windows.
+It is designed to interoperate with the windows software ipMIDI or
+multimidicast for windows.
diff --git a/audio/muse/README b/audio/muse/README
index 232eb66968..83befba3bd 100644
--- a/audio/muse/README
+++ b/audio/muse/README
@@ -7,3 +7,9 @@ License.
 Optional dependencies are fluidsynth, dssi and lash.
 
 To start MusE, the user has to be in the "audio" group.
+
+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.
diff --git a/audio/muse/doinst.sh b/audio/muse/doinst.sh
index 6ad1d419f4..aea0f894eb 100644
--- a/audio/muse/doinst.sh
+++ b/audio/muse/doinst.sh
@@ -1,5 +1,3 @@
-setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/muse3 2>/dev/null
-
 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/audio/muse/muse.SlackBuild b/audio/muse/muse.SlackBuild
index a8c4d3193e..2c5465ff53 100644
--- a/audio/muse/muse.SlackBuild
+++ b/audio/muse/muse.SlackBuild
@@ -4,14 +4,19 @@
 
 # Written by Felix Pfeifer pfeifer[dot]felix[at]googlemail[dot]com
 
+# 20200416 bkw: Modified by the SlackBuilds.org project
+# - updated for v3.1
+# - don't install docs in /usr/share/doc
+# - add realtime capability support
+
 PRGNAM=muse
-VERSION=${VERSION:-3.0.2}
+VERSION=${VERSION:-3.1.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
@@ -22,8 +27,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"
@@ -51,6 +56,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# 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
   cmake \
@@ -71,15 +79,22 @@ mv $PKG/usr/share/man $PKG/usr/man
 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 NEWS README* SECURITY \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc
+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
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# Only add capability stuff if not disabled:
+if [ "${SETCAP:-yes}" = "yes" ]; then
+  cat $CWD/setcap.sh >> $PKG/install/doinst.sh
+  # Only allow execution by audio group
+  chown root:audio $PKG/usr/bin/muse3
+  chmod 0750 $PKG/usr/bin/muse3
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/muse/muse.info b/audio/muse/muse.info
index 5694390b40..f408519119 100644
--- a/audio/muse/muse.info
+++ b/audio/muse/muse.info
@@ -1,8 +1,8 @@
 PRGNAM="muse"
-VERSION="3.0.2"
+VERSION="3.1.1"
 HOMEPAGE="http://muse-sequencer.org/"
-DOWNLOAD="https://sourceforge.net/projects/lmuse/files/muse-3.0/muse-3.0.2.tar.gz"
-MD5SUM="6e992f0f9d58adc3a2e2444dece37dfe"
+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/setcap.sh b/audio/muse/setcap.sh
new file mode 100644
index 0000000000..c0ad261d06
--- /dev/null
+++ b/audio/muse/setcap.sh
@@ -0,0 +1 @@
+[ -x /sbin/setcap ] && /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/muse3
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/ncmpc/README b/audio/ncmpc/README
index 0cf1d5eae3..c1fd1052a8 100644
--- a/audio/ncmpc/README
+++ b/audio/ncmpc/README
@@ -1,4 +1,5 @@
-ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects
-to a MPD running on a machine on the local network, and controls this with
-an interface inspired by cplay. If ncmpc is used with lirc and irpty it can
-be used to manage playlists and control MPD with a remote control.
+ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc
+connects to a MPD running on a machine on the local network, and
+controls this with an interface inspired by cplay. If ncmpc is used
+with lirc and irpty it can be used to manage playlists and control MPD
+with a remote control.
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/ngjackspa/README b/audio/ngjackspa/README
index b5a71ae436..b876b5fed5 100644
--- a/audio/ngjackspa/README
+++ b/audio/ngjackspa/README
@@ -1,12 +1,14 @@
 ngjackspa (JACK host for LADSPA plugins)
 
 ngjackspa is a set of simple user interfaces that host a LADSPA plugin,
-providing JACK ports for its audio inputs and outputs, and dynamic setting
-of its control inputs. Additionally, the plugin controls can be exported
-to or controlled by control voltages on standard JACK audio ports.
+providing JACK ports for its audio inputs and outputs, and dynamic
+setting of its control inputs. Additionally, the plugin controls can
+be exported to or controlled by control voltages on standard JACK audio
+ports.
 
-By default, both the Qt and gtkmm user interfaces are built.  To disable 
-one or both of them, set QT=no and/or GTKMM=no in the script's environment.
+By default, both the Qt and gtkmm user interfaces are built.
+To disable one or both of them, set QT=no and/or GTKMM=no in the
+script's environment.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/non/non.SlackBuild b/audio/non/non.SlackBuild
index 5b2ccb5a2c..5198e64f95 100644
--- a/audio/non/non.SlackBuild
+++ b/audio/non/non.SlackBuild
@@ -9,7 +9,7 @@
 # without any warranty.
 
 PRGNAM=non
-VERSION=${VERSION:-20190925}
+VERSION=${VERSION:-20200928}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -52,7 +52,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-git-$VERSION
-tar xvf $CWD/$PRGNAM-git-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-git-$VERSION.tar.bz2
 cd $PRGNAM-git-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/audio/non/non.info b/audio/non/non.info
index 353a6271f2..b517436a49 100644
--- a/audio/non/non.info
+++ b/audio/non/non.info
@@ -1,8 +1,8 @@
 PRGNAM="non"
-VERSION="20190925"
+VERSION="20200928"
 HOMEPAGE="http://non.tuxfamily.org"
-DOWNLOAD="http://slackermedia.info/slackbuilds/non/non-git-20190925.tar.bz2"
-MD5SUM="a4074f3f5b82b0c6cd5168b9a7be04ab"
+DOWNLOAD="http://slackermedia.info/slackbuilds/non/non-git-20200928.tar.bz2"
+MD5SUM="b25f09108c09a885e18637f557ac2e02"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack liblo liblrdf ntk"
diff --git a/audio/ntk/README b/audio/ntk/README
index 68752b4362..0bccba8f9b 100644
--- a/audio/ntk/README
+++ b/audio/ntk/README
@@ -8,5 +8,4 @@ So, install this first, and then build and install Non.
 
 The only official download is available as a git repository. In order
 to standardise this SlackBuild, a snapshot of the git repository as of
-25/09/2019 (commit d958df0) has been posted to slackermedia.info,
-which this SlackBuild uses.
+28/09/2020 has been posted to slackermedia.info.
diff --git a/audio/ntk/ntk.SlackBuild b/audio/ntk/ntk.SlackBuild
index 22a8d6ebc5..c546364f34 100644
--- a/audio/ntk/ntk.SlackBuild
+++ b/audio/ntk/ntk.SlackBuild
@@ -14,7 +14,7 @@ SRCNAM=ntk #comment out if building from git
 #to build from git uncomment this one
 #SRCNAM=non
 
-VERSION=${VERSION:-20190925}
+VERSION=${VERSION:-20200928}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/ntk/ntk.info b/audio/ntk/ntk.info
index ee74266043..54aae783a8 100644
--- a/audio/ntk/ntk.info
+++ b/audio/ntk/ntk.info
@@ -1,10 +1,10 @@
 PRGNAM="ntk"
-VERSION="20190925"
+VERSION="20200928"
 HOMEPAGE="http://non.tuxfamily.org"
-DOWNLOAD="http://slackermedia.info/slackbuilds/ntk/ntk-git-20190925.tar.xz"
-MD5SUM="6d3d94ea56089eac638a1ae6883ddf4c"
+DOWNLOAD="http://slackermedia.info/slackbuilds/ntk/ntk-git-20200928.tar.xz"
+MD5SUM="e19391739aeaf002ee67c4dede363b3e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="klaatu"
-EMAIL="klaatu@member.fsf.org"
\ No newline at end of file
+EMAIL="klaatu@member.fsf.org"
diff --git a/audio/ocp/README b/audio/ocp/README
index 572fd5f3b6..08e94c54e2 100644
--- a/audio/ocp/README
+++ b/audio/ocp/README
@@ -1,3 +1,3 @@
-Open Cubic Player is a music file player. It is derived from Cubic Player 2.0
-which was developed by Niklas Beisert. It can play MOD, IT, S3M, XM and many
-other formats.
+Open Cubic Player is a music file player. It is derived from Cubic
+Player 2.0 which was developed by Niklas Beisert. It can play MOD, IT,
+S3M, XM and many other formats.
diff --git a/audio/ocp/doinst.sh b/audio/ocp/doinst.sh
index 4a25de5e6f..63bf9ce82c 100644
--- a/audio/ocp/doinst.sh
+++ b/audio/ocp/doinst.sh
@@ -8,3 +8,6 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   fi
 fi
 
+if [ -x /usr/bin/install-info ]; then
+  chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/ocp.info.gz 2> /dev/null
+fi
diff --git a/audio/ocp/ocp.SlackBuild b/audio/ocp/ocp.SlackBuild
index 523d4638c8..eeef8745b6 100644
--- a/audio/ocp/ocp.SlackBuild
+++ b/audio/ocp/ocp.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for Open Cubic Player
 #
-# Copyright 2009-2011  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2020  Erik W. Hanson, Minneapolis, MN, 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=ocp
-VERSION=${VERSION:-0.1.21}
+VERSION=${VERSION:-0.2.1}
 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.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,9 +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/0.1.20/0.1.21/g" configure
-sed -i "4592c2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*)" configure
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -81,18 +78,17 @@ CFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --build=$ARCH-slackware-linux
 
-make -j1
+make # -j1
 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
 
-mv $PKG/usr/share/ocp/ultradir $PKG/usr/share/$PRGNAM-$VERSION
-rmdir $PKG/usr/share/ocp
-
 rm -f $PKG/usr/info/dir
 
-mv $PKG/usr/share/doc $PKG/usr
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc/ocp $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/ocp/ocp.info b/audio/ocp/ocp.info
index 73d7280623..2832ca4e7a 100644
--- a/audio/ocp/ocp.info
+++ b/audio/ocp/ocp.info
@@ -1,8 +1,8 @@
 PRGNAM="ocp"
-VERSION="0.1.21"
+VERSION="0.2.1"
 HOMEPAGE="http://stian.cubic.org/project-ocp.php"
-DOWNLOAD="http://downloads.sourceforge.net/opencubicplayer/ocp-0.1.21.tar.bz2"
-MD5SUM="558a6eacfadfd9c60c97a6e9c7f83f47"
+DOWNLOAD="https://stian.cubic.org/ocp/ocp-0.2.1.tar.xz"
+MD5SUM="c50fa1649b4dc3331c13fbe470f147d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/opencore-amr/README b/audio/opencore-amr/README
index fa805bb9be..860f335541 100644
--- a/audio/opencore-amr/README
+++ b/audio/opencore-amr/README
@@ -1,7 +1,8 @@
 OpenCORE Adaptive Multi Rate (AMR) speech codec library implementation.
 
-This library contains an implementation of the 3GPP TS 26.073 specification for
-the Adaptive Multi Rate (AMR) speech codec and an implementation for the
-3GPP TS 26.173 specification for the Adaptive Multi-Rate - Wideband (AMR-WB)
-speech decoder. The implementation is derived from the OpenCORE framework, part
-of the Google Android project.
+This library contains an implementation of the 3GPP TS 26.073
+specification for the Adaptive Multi Rate (AMR) speech codec and an
+implementation for the 3GPP TS 26.173 specification for the Adaptive
+Multi-Rate - Wideband (AMR-WB) speech decoder. The implementation
+is derived from the OpenCORE framework, part of the Google Android
+project.
diff --git a/audio/opusfile/opusfile.SlackBuild b/audio/opusfile/opusfile.SlackBuild
index f771403ff1..761a3806e9 100644
--- a/audio/opusfile/opusfile.SlackBuild
+++ b/audio/opusfile/opusfile.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for opusfile
 
-# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2020 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=opusfile
-VERSION=${VERSION:-0.11}
+VERSION=${VERSION:-0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/opusfile/opusfile.info b/audio/opusfile/opusfile.info
index 5a1d075dc5..8dddaafba7 100644
--- a/audio/opusfile/opusfile.info
+++ b/audio/opusfile/opusfile.info
@@ -1,8 +1,8 @@
 PRGNAM="opusfile"
-VERSION="0.11"
+VERSION="0.12"
 HOMEPAGE="http://www.opus-codec.org"
-DOWNLOAD="https://ftp.mozilla.org/pub/mozilla.org/opus/opusfile-0.11.tar.gz"
-MD5SUM="e1e94a9a663b4ca7a388f367baf1a7e3"
+DOWNLOAD="https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz"
+MD5SUM="45e8c62f6cd413395223c82f06bfa8ec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="opus"
diff --git a/audio/oss/README b/audio/oss/README
index adc7dac315..1c71daae96 100644
--- a/audio/oss/README
+++ b/audio/oss/README
@@ -1,10 +1,12 @@
-The Open Sound System is a set of sound drivers that serve as an alternative 
-to the usual ALSA architecture.
+The Open Sound System is a set of sound drivers that serve as an
+alternative to the usual ALSA architecture.
 
 Among the benefits are:
 * volume levels being settable for each application individually
 * better latency than ALSA in most cases
 
-If your WM/DE supports tray icons, you will have one for the OSS mixer.
+If your WM/DE supports tray icons, you will have one for the OSS
+mixer.
 
-See README.SLACKWARE for post-installation instructions and setup information.
+See README.SLACKWARE for post-installation instructions and setup
+information.
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/pd/README b/audio/pd/README
index 3d94369600..e1d0a970a3 100644
--- a/audio/pd/README
+++ b/audio/pd/README
@@ -1,6 +1,6 @@
-pd is a real-time audio synthesis/processing package.  It is one of the 
-"MUSIC N" family members, open source (BSD style) successor of the MAX 
-branch.  This package contains just the core of Pd; more external objects
-have been written: many of them are in the CVS at SourceForge.
+pd is a real-time audio synthesis/processing package.  It is one of
+the "MUSIC N" family members, open source (BSD style) successor of the
+MAX branch.  This package contains just the core of Pd; more external
+objects have been written: many of them are in the CVS at SourceForge.
 
 Optional dependencies are jack and portmidi.
diff --git a/audio/pd/pd.SlackBuild b/audio/pd/pd.SlackBuild
index 977741b4f6..b2bfd8cefc 100644
--- a/audio/pd/pd.SlackBuild
+++ b/audio/pd/pd.SlackBuild
@@ -16,7 +16,7 @@
 # - correct .desktop Exec (2017)
 
 PRGNAM=pd
-VERSION=${VERSION:-0.48_1}
+VERSION=${VERSION:-0.50_2}
 SRCVERSION=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -82,7 +82,6 @@ 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
 
@@ -93,8 +92,8 @@ mkdir -p $PKG/usr/share/$PRGNAM
 # Change the .desktop to point in correct executable.
 sed "s+Exec=pd+Exec=/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin/$PRGNAM+" $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-convert $TMP/$PRGNAM-$SRCVERSION/src/pd.ico $TMP/${PRGNAM}_48.xpm
-cp $TMP/${PRGNAM}_48-3.xpm $PKG/usr/share/$PRGNAM
+convert $TMP/$PRGNAM-$SRCVERSION/tcl/pd.ico $TMP/${PRGNAM}\_${SRCVERSION}.xpm
+cp $TMP/${PRGNAM}\_${SRCVERSION}-3.xpm $PKG/usr/share/$PRGNAM/${PRGNAM}\_${SRCVERSION}-3.xpm
 
 # copy all header files (for pd_mrpeach)
 cp -p $TMP/$PRGNAM-$SRCVERSION/src/*.h $PKG/usr/include/
@@ -107,8 +106,17 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL.txt README.txt LICENSE.txt src/CHANGELOG.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# native documentation wants this
 ln -s /usr/lib/pd/doc/ $PKG/usr/doc/$PRGNAM-$VERSION/docs
 
+# pd-gui wants this:
+# Error in startup script: couldn't execute "/usr/lib64/pd/tcl/../bin/pd":
+# no such file or directory
+cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/bin/
+# remove bad (temp) link
+rm ./pd
+ln -s ../../../bin/$PRGNAM ./$PRGNAM
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
diff --git a/audio/pd/pd.desktop b/audio/pd/pd.desktop
index 713e8204d0..29cec3cf94 100644
--- a/audio/pd/pd.desktop
+++ b/audio/pd/pd.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=pd
-Icon=/usr/share/pd/pd_48-3.xpm
+Icon=/usr/share/pd/pd_50-3.xpm
 Name=Pure Data
 GenericName=Real-time graphical programming environment for audio, video, and graphical processing
 GenericName[el]=Γ�αφικό πε�ιβάλλον π�ογ�αμματισμο� ήχου, midi και εικόνας.
diff --git a/audio/pd/pd.info b/audio/pd/pd.info
index bd92810088..da3009d83d 100644
--- a/audio/pd/pd.info
+++ b/audio/pd/pd.info
@@ -1,8 +1,8 @@
 PRGNAM="pd"
-VERSION="0.48_1"
+VERSION="0.50_2"
 HOMEPAGE="http://msp.ucsd.edu/software.html"
-DOWNLOAD="http://msp.ucsd.edu/Software/pd-0.48-1.src.tar.gz"
-MD5SUM="8c4deff54b47a10d2f55e363022cc634"
+DOWNLOAD="http://msp.ucsd.edu/Software/pd-0.50-2.src.tar.gz"
+MD5SUM="d7f0115f5c000e3477130d8f80ecf6fa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/pd_mrpeach/README b/audio/pd_mrpeach/README
index 11abca00ae..818c87e0c4 100644
--- a/audio/pd_mrpeach/README
+++ b/audio/pd_mrpeach/README
@@ -1,12 +1,12 @@
 Pure Data externals to work with OSC by mrpeach.
 
-udpsend, udpreceive, tcpsend and tcpreceive are byte-oriented externals similar
-to and based on netsend and netreceive.
+udpsend, udpreceive, tcpsend and tcpreceive are byte-oriented externals
+similar to and based on netsend and netreceive.
 
-Start the slackbuild with ALL=YES to build all the objects. In that case, you
-have more externals, not specific to Open Sound Control.
+Start the slackbuild with ALL=YES to build all the objects. In that
+case, you have more externals, not specific to Open Sound Control.
 
-After installation go to Pure Data > Media > Preferences > Path > New and
-select /usr/lib(64)/pd/extra/mrpeach
+After installation go to Pure Data > Media > Preferences > Path > New
+and select /usr/lib(64)/pd/extra/mrpeach
 
 Or start Pure Data like this: pd -path /usr/lib(64)/pd/extra/mrpeach
diff --git a/audio/pianobar/README b/audio/pianobar/README
index 8127637653..bc77db48e7 100644
--- a/audio/pianobar/README
+++ b/audio/pianobar/README
@@ -1,11 +1,11 @@
 pianobar is a console client for the personalized web radio pandora
 (http://www.pandora.com).
 
-- Play and manage (create, add more music, delete, rename, ...) your stations
+- Play and manage (create, add music, delete, rename, ...) your stations
 - Rate played songs and let pandora explain why they have been selected
 - Show upcoming songs/song history
 - Configure keybindings and text output
-- Remote control and eventcmd interface (send tracks to last.fm, for example)
+- Remote control and eventcmd interface (send tracks to last.fm, e.g.)
 - Proxy support for listeners outside the USA
 
 Included with this SlackBuild is a helper script called pianobarctl that
@@ -14,12 +14,13 @@ this a FIFO must first be created by the user:
 
   mkfifo ~/.config/pianobar/ctl
 
-Please see man pianobar and pianobarctl --help for more information.  The
-documentation also includes a few example scripts you can use with pianobar.
+Please see man pianobar and pianobarctl --help for more information.
+The documentation also includes a few example scripts you can use with
+pianobar.
 
 NOTE:
-If you are getting an error stating your TLS fingerpring is incorrect you need
-to configure pianobar so that it has the correct one.
+If you are getting an error stating your TLS fingerprint is incorrect,
+you need to configure pianobar so that it has the correct one.
 
 You can execute the following script to get a new TLS fingerprint:
 
@@ -30,5 +31,6 @@ Then open your pianobar configuration in your user's home directory
 
   tls_fingerprint = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
-If for some reason you receive an error about the TLS fingerprint again, just
-execute tls_fingerprint.sh again and ammend your user's configuration file.
+If for some reason you receive an error about the TLS fingerprint
+again, just execute tls_fingerprint.sh again and ammend your user's
+configuration file.
diff --git a/audio/pianobar/pianobar.SlackBuild b/audio/pianobar/pianobar.SlackBuild
index 9e12f66a0a..a23fc0fbf8 100644
--- a/audio/pianobar/pianobar.SlackBuild
+++ b/audio/pianobar/pianobar.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for pianobar
 
 # Copyright 2010-2016, Phillip Warner <pc_warner@yahoo.com>
-# Copyright 2017, Brenton Earl <brent@exitstatusone.com>
+# Copyright 2017, 2020, Brenton Earl <brent@exitstatusone.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=pianobar
-VERSION=${VERSION:-2018.06.22}
+VERSION=${VERSION:-2019.01.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/pianobar/pianobar.info b/audio/pianobar/pianobar.info
index 325852b288..0a23e2369f 100644
--- a/audio/pianobar/pianobar.info
+++ b/audio/pianobar/pianobar.info
@@ -1,8 +1,8 @@
 PRGNAM="pianobar"
-VERSION="2018.06.22"
+VERSION="2019.01.25"
 HOMEPAGE="https://6xq.net/pianobar/"
-DOWNLOAD="https://6xq.net/pianobar/pianobar-2018.06.22.tar.bz2"
-MD5SUM="21a69563d06a67695212eaa45ff7d342"
+DOWNLOAD="https://6xq.net/pianobar/pianobar-2019.01.25.tar.bz2"
+MD5SUM="3b202861e515ab493d13b0ae00d54dc0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
diff --git a/audio/playmp3list/README b/audio/playmp3list/README
index f46bbb4751..f4ef3298aa 100644
--- a/audio/playmp3list/README
+++ b/audio/playmp3list/README
@@ -1,10 +1,13 @@
 Playmp3list is a simple MP3 playlist player for Linux.  It is based
-extensively on the mp3blaster code and uses the same mpegsound library.
+extensively on the mp3blaster code and uses the same mpegsound
+library.
 
 Main features:
   o Displays a large scrollable playlist
-  o Browse playlists, directories and 'virtual playlists', even while playing
-  o Fully configurable key mappings and color schemes in a playmp3listrc file
+  o Browse playlists, directories and 'virtual playlists', even while
+    playing
+  o Fully configurable key mappings and color schemes in a
+    playmp3listrc file
   o Real-time toggling of shuffle/repeat modes
   o Instant jumps to one of 10 configurable directories/playlists
   o Standard player controls
diff --git a/audio/podget/README b/audio/podget/README
index 25e3982ea7..223d03e9c1 100644
--- a/audio/podget/README
+++ b/audio/podget/README
@@ -1,9 +1,16 @@
-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.
+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 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 401a3393ee..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,8 +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
@@ -30,7 +36,7 @@
 # - Minor cleanups
 
 PRGNAM=podget
-VERSION=${VERSION:-0.8.6}
+VERSION=${VERSION:-0.8.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,20 +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...
+# 20201103 bkw: upstream added checking code, this had to change some.
+sed -i '/shopt *inherit_errexit/,/shopt *-s *inherit_errexit/s,^,## ,' \
+       $PRGNAM
 
-mv $PKG/usr/share/man $PKG/usr/man
-rm -rf $PKG/usr/share
+# 20201103 bkw: change hardcoded paths
+sed -i \
+  -e "s,share/man,man,g" \
+  -e "s,share/doc/$PRGNAM,doc/$PRGNAM-$VERSION," \
+  Makefile
+
+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/pogo/README b/audio/pogo/README
index 3e24cecc6d..f60086ec3a 100644
--- a/audio/pogo/README
+++ b/audio/pogo/README
@@ -3,9 +3,9 @@ pogo (A simple and fast audio player for Linux)
 Pogo plays your music. Nothing else. It is both fast and easy-to-use.
 The clear interface uses the screen real-estate very efficiently.
 
-Other features include: 
-Fast search on the harddrive and in the playlist, smart album grouping,
-cover display, desktop notifications and no music library.
+Other features include: Fast search on the harddrive and in the
+playlist, smart album grouping, cover display, desktop notifications
+and no music library.
 
-Pogo is a fork of Decibel Audio Player and supports most common audio formats.
-It is written in Python and uses GTK+ and gstreamer.
+Pogo is a fork of Decibel Audio Player and supports most common audio
+formats.  It is written in Python and uses GTK+ and gstreamer.
diff --git a/audio/portmidi/README b/audio/portmidi/README
index 9c6c72b23f..f2660611fc 100644
--- a/audio/portmidi/README
+++ b/audio/portmidi/README
@@ -1,3 +1,3 @@
-PortMidi is a computer library for real time input and output of MIDI data. 
-It is designed to be portable to many different operating systems. 
-PortMidi is part of the PortMusic project.
+PortMidi is a computer library for real time input and output of
+MIDI data.  It is designed to be portable to many different operating
+systems.  PortMidi is part of the PortMusic project.
diff --git a/audio/puddletag/README b/audio/puddletag/README
index 9a221c27cc..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 are visible and
-easily editable.
+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 5cbfd12146..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-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=pulseaudio-ctl
-VERSION=${VERSION:-1.67}
+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 c702f5ff38..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.67"
+VERSION="1.69"
 HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
-DOWNLOAD="https://github.com/graysky2/pulseaudio-ctl/archive/v1.67/pulseaudio-ctl-1.67.tar.gz"
-MD5SUM="2d8fa3fa98d1c5c8fe81e4ef3ced3f46"
+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/python-audiotools/README b/audio/python-audiotools/README
index 710c86e730..9845905e10 100644
--- a/audio/python-audiotools/README
+++ b/audio/python-audiotools/README
@@ -1,12 +1,12 @@
-Python Audio Tools are a collection of audio handling programs which work
-from the command line.  These include programs for CD extraction, track
-conversion from one audio format to another, track renaming and retagging,
-track identification, CD burning from tracks, and more.  It supports
-internationalized track filenames and metadata using Unicode.  It works
-with high-definition, multi-channel audio as well as CD-quality.  Track
-conversion uses multiple CPUs or CPU cores if available to greatly speed
-the transcoding process.  Track metadata can be retrieved from FreeDB or
-FreeDB-compatible servers.
+Python Audio Tools are a collection of audio handling programs which
+work from the command line.  These include programs for CD extraction,
+track conversion from one audio format to another, track renaming and
+retagging, track identification, CD burning from tracks, and more.
+It supports internationalized track filenames and metadata using
+Unicode.  It works with high-definition, multi-channel audio as well
+as CD-quality.  Track conversion uses multiple CPUs or CPU cores if
+available to greatly speed the transcoding process.  Track metadata can
+be retrieved from FreeDB or FreeDB-compatible servers.
 
 Supported audio formats are WAV, AIFF, Sun AU, FLAC, WavPack, MP3, MP2,
 Ogg Vorbis, Ogg Speex, Ogg FLAC, and M4A.
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 6c6757d94b..6fc385a1dc 100644
--- a/audio/qm-vamp-plugins/README
+++ b/audio/qm-vamp-plugins/README
@@ -6,18 +6,13 @@ A set of plugins for feature extraction from audio data, using the Vamp
 plugin format suitable for use in programs such as Sonic Visualiser and
 Sonic Annotator.
 
-This build supports SSE and SSE2 CPU optimizations. By default, the script
-examines your system and enables SSE and/or SSE2 if they're supported. If
-you're building a package for a different system, you can override this
-behaviour via environment variables, like so:
+This build supports SSE and SSE2 CPU optimizations. By default, the
+script examines your system and enables SSE and/or SSE2 if they're
+supported. If you're building a package for a different system, you
+can override this behaviour via environment variables, like so:
 
-SSE=no           # Force disable both SSE and SSE2 (variable SSE2 ignored)
+SSE=no           # Force disable SSE and SSE2 (variable SSE2 ignored)
 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/qmidinet/README b/audio/qmidinet/README
index 2e379acbdf..d7f410ee0c 100644
--- a/audio/qmidinet/README
+++ b/audio/qmidinet/README
@@ -1,7 +1,7 @@
-QmidiNet is a MIDI network gateway application that sends and receives MIDI
-data(ALSA Sequencer) over the network, using UDP/IP multicast.
+QmidiNet is a MIDI network gateway application that sends and receives
+MIDI data(ALSA Sequencer) over the network, using UDP/IP multicast.
 
-Inspired by multimidicast (http://llg.cubic.org/tools) and designed to be
-compatible with ipMIDI for Windows (http://nerds.de).
+Inspired by multimidicast (http://llg.cubic.org/tools) and designed to
+be compatible with ipMIDI for Windows (http://nerds.de).
 
 jack is an optional dependency.
diff --git a/audio/qmmp-plugin-pack-qt5/qmmp-plugin-pack-qt5.SlackBuild b/audio/qmmp-plugin-pack-qt5/qmmp-plugin-pack-qt5.SlackBuild
index e539d516ac..569983bd52 100644
--- a/audio/qmmp-plugin-pack-qt5/qmmp-plugin-pack-qt5.SlackBuild
+++ b/audio/qmmp-plugin-pack-qt5/qmmp-plugin-pack-qt5.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qmmp-plugin-pack-qt5
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/qmmp-plugin-pack-qt5/qmmp-plugin-pack-qt5.info b/audio/qmmp-plugin-pack-qt5/qmmp-plugin-pack-qt5.info
index 307bb939f3..c9ac70ccff 100644
--- a/audio/qmmp-plugin-pack-qt5/qmmp-plugin-pack-qt5.info
+++ b/audio/qmmp-plugin-pack-qt5/qmmp-plugin-pack-qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qmmp-plugin-pack-qt5"
-VERSION="1.3.1"
-HOMEPAGE="http://qmmp.ylsoftware.com/plugins.php"
-DOWNLOAD="http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.3.1.tar.bz2"
-MD5SUM="8d887d991206cdd638f2e50420e4aa72"
+VERSION="1.3.2"
+HOMEPAGE="https://qmmp.ylsoftware.com/plugins.php"
+DOWNLOAD="https://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.3.2.tar.bz2"
+MD5SUM="8bad515b6ee875ec1b73786ecd66980e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qmmp-qt5"
diff --git a/audio/qmmp-plugin-pack/qmmp-plugin-pack.SlackBuild b/audio/qmmp-plugin-pack/qmmp-plugin-pack.SlackBuild
index 74bee132ec..f74dd8ed2a 100644
--- a/audio/qmmp-plugin-pack/qmmp-plugin-pack.SlackBuild
+++ b/audio/qmmp-plugin-pack/qmmp-plugin-pack.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qmmp-plugin-pack
-VERSION=${VERSION:-0.11.3}
+VERSION=${VERSION:-0.12.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/qmmp-plugin-pack/qmmp-plugin-pack.info b/audio/qmmp-plugin-pack/qmmp-plugin-pack.info
index 479f84fe2b..5d0d765042 100644
--- a/audio/qmmp-plugin-pack/qmmp-plugin-pack.info
+++ b/audio/qmmp-plugin-pack/qmmp-plugin-pack.info
@@ -1,8 +1,8 @@
 PRGNAM="qmmp-plugin-pack"
-VERSION="0.11.3"
+VERSION="0.12.2"
 HOMEPAGE="http://qmmp.ylsoftware.com/plugins.php"
-DOWNLOAD="http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-0.11.3.tar.bz2"
-MD5SUM="88984a0c81d4ce5e40f12220633b2ab5"
+DOWNLOAD="http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-0.12.2.tar.bz2"
+MD5SUM="078d061572560591f6bd2b85b002d54d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qmmp"
diff --git a/audio/qmmp-qt5/qmmp-qt5.SlackBuild b/audio/qmmp-qt5/qmmp-qt5.SlackBuild
index fae272ae74..e01dfd9ca8 100644
--- a/audio/qmmp-qt5/qmmp-qt5.SlackBuild
+++ b/audio/qmmp-qt5/qmmp-qt5.SlackBuild
@@ -20,7 +20,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qmmp-qt5
-VERSION=${VERSION:-1.3.6}
+VERSION=${VERSION:-1.3.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/qmmp-qt5/qmmp-qt5.info b/audio/qmmp-qt5/qmmp-qt5.info
index 876a50e974..21362fa73b 100644
--- a/audio/qmmp-qt5/qmmp-qt5.info
+++ b/audio/qmmp-qt5/qmmp-qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qmmp-qt5"
-VERSION="1.3.6"
-HOMEPAGE="http://qmmp.ylsoftware.com/"
-DOWNLOAD="http://qmmp.ylsoftware.com/files/qmmp-1.3.6.tar.bz2"
-MD5SUM="8c0cf52b753762d2999c1178e1414a52"
+VERSION="1.3.7"
+HOMEPAGE="https://qmmp.ylsoftware.com/"
+DOWNLOAD="https://qmmp.ylsoftware.com/files/qmmp-1.3.7.tar.bz2"
+MD5SUM="23f2d2ea40e0c909030f78da3cefe777"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/audio/qmmp/README b/audio/qmmp/README
index a5f38d6c55..af668e1ad8 100644
--- a/audio/qmmp/README
+++ b/audio/qmmp/README
@@ -6,3 +6,5 @@ libmms, libmpcdec, soxr + jack, libmodplug, ffmpeg, faad2,
 libbs2b, libprojectM, and libenca.
 
 You need soxr and jack to enable JACK support.
+
+Untested, another optional package is sid[whatever]
diff --git a/audio/qmmp/qmmp.SlackBuild b/audio/qmmp/qmmp.SlackBuild
index 5262df17ea..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.11.3}
+VERSION=${VERSION:-0.12.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/qmmp/qmmp.info b/audio/qmmp/qmmp.info
index b3ff86431d..64edf7cc7c 100644
--- a/audio/qmmp/qmmp.info
+++ b/audio/qmmp/qmmp.info
@@ -1,8 +1,8 @@
 PRGNAM="qmmp"
-VERSION="0.11.3"
+VERSION="0.12.10"
 HOMEPAGE="http://qmmp.ylsoftware.com/"
-DOWNLOAD="http://qmmp.ylsoftware.com/files/qmmp-0.11.3.tar.bz2"
-MD5SUM="c1ed85e869dd32461f0aa902e9bed85f"
+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/qsynth/qsynth.SlackBuild b/audio/qsynth/qsynth.SlackBuild
index 38017a736f..9c6e48894c 100644
--- a/audio/qsynth/qsynth.SlackBuild
+++ b/audio/qsynth/qsynth.SlackBuild
@@ -3,7 +3,7 @@
 # Written by Michales Michaloudes korgie@gmail.com
 
 PRGNAM=qsynth
-VERSION=${VERSION:-0.3.6}
+VERSION=${VERSION:-0.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/qsynth/qsynth.info b/audio/qsynth/qsynth.info
index 14c99946de..d294b07ceb 100644
--- a/audio/qsynth/qsynth.info
+++ b/audio/qsynth/qsynth.info
@@ -1,10 +1,10 @@
 PRGNAM="qsynth"
-VERSION="0.3.6"
+VERSION="0.6.2"
 HOMEPAGE="http://qsynth.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qsynth/qsynth-0.3.6.tar.gz"
-MD5SUM="3cba3c87463be75ac188ebc3c3023d12"
+DOWNLOAD="http://downloads.sourceforge.net/qsynth/qsynth-0.6.2.tar.gz"
+MD5SUM="9a19ef8b22472376c23568457ddca150"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fluidsynth"
+REQUIRES="fluidsynth qt5"
 MAINTAINER="Michales Michaloudes"
 EMAIL="korgie@gmail.com"
diff --git a/audio/quodlibet/README b/audio/quodlibet/README
index e4ebc59120..a980c853fe 100644
--- a/audio/quodlibet/README
+++ b/audio/quodlibet/README
@@ -14,8 +14,8 @@ The user guide is available online at:
 
 https://quodlibet.readthedocs.io/en/quodlibet-3.9/guide/
 
-To build a user guide for offline use, install Sphinx and sphinx_rtd_theme,
-and run:
+To build a user guide for offline use, install Sphinx and
+sphinx_rtd_theme, and run:
 
 DOCS=yes ./quodlibet.SlackBuild
 
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/rubyripper/README b/audio/rubyripper/README
index f18666b8be..6cf82be1e3 100644
--- a/audio/rubyripper/README
+++ b/audio/rubyripper/README
@@ -1,7 +1,8 @@
-Rubyripper is a secure audio ripper which aims to deliver high quality rips
-from audio cd's to your computer drive. It tries to do so by ripping the same
-track with cdparanoia multiple times and then comparing the results.
-It currently has a gtk2 and a command-line interface.
+Rubyripper is a secure audio ripper which aims to deliver high
+quality rips from audio cd's to your computer drive. It tries to do
+so by ripping the same track with cdparanoia multiple times and then
+comparing the results.  It currently has a gtk2 and a command-line
+interface.
 
 Rubyripper has the optional dependencies:
 
diff --git a/audio/rumor/README b/audio/rumor/README
index bdc0310ba6..ac6313d8b8 100644
--- a/audio/rumor/README
+++ b/audio/rumor/README
@@ -1,3 +1,4 @@
 Rumor is a realtime monophonic (with chords) MIDI keyboard to Lilypond
-converter. It receives MIDI events, quantizes them according to its metronome
-on the fly and outputs handwritten-like corresponding Lilypond notation.
+converter. It receives MIDI events, quantizes them according to
+its metronome on the fly and outputs handwritten-like corresponding
+Lilypond notation.
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/sbagen/README b/audio/sbagen/README
index 2f44f4a5aa..c8e27da632 100644
--- a/audio/sbagen/README
+++ b/audio/sbagen/README
@@ -1,7 +1,7 @@
 A Sequenced Binaural Wave Generator for Linux, Windows and Mac OS X.
-May be used to generate sounds that entrain the brain's waves to oscillate
-at selected frequencies to aid in relaxation, lucid dreaming, meditation,
-clear thought, out-of-body experiences and more.
+May be used to generate sounds that entrain the brain's waves
+to oscillate at selected frequencies to aid in relaxation, lucid
+dreaming, meditation, clear thought, out-of-body experiences and more.
 
 NOTE: SBaGen can run script sequences with mp3 and ogg backgrounds.
 To use this, pass NONFREE=yes option to SlackBuild script (requires
diff --git a/audio/seq24/README b/audio/seq24/README
index aadecf1a4a..f28b62f84a 100644
--- a/audio/seq24/README
+++ b/audio/seq24/README
@@ -1,8 +1,8 @@
 Seq24 is a pattern based midi sequencer with strong live performance
 functions.
 
-It was created to provide a very simple interface for editing and playing
-midi 'loops'.
+It was created to provide a very simple interface for editing and
+playing midi 'loops'.
 
 Future developments of seq24 can be found at
 https://launchpad.net/seq24
diff --git a/audio/sfc/README b/audio/sfc/README
index ecd521a814..7696c735de 100644
--- a/audio/sfc/README
+++ b/audio/sfc/README
@@ -1,8 +1,8 @@
-sfc (SoundFontCombi) is a midi router designed to mix the sounds of your
-sound devices. Up to 8 sounds can be mixed or split. There are  6 MIDI
-out ports and 2 MIDI in ports. Up to six different devices can be used
-to produce combinations of sounds like some synthesizers.
+sfc (SoundFontCombi) is a midi router designed to mix the sounds of
+your sound devices. Up to 8 sounds can be mixed or split. There are 6
+MIDI out ports and 2 MIDI in ports. Up to six different devices can be
+used to produce combinations of sounds like some synthesizers.
 
-The connections with your devices are automated. You can load/save your
-"mixes" in banks of sounds, and change it via Midi Program Change message
-or by the user interface.
+The connections with your devices are automated. You can load/save
+your "mixes" in banks of sounds, and change it via MIDI Program Change
+message or by the user interface.
diff --git a/audio/shell-fm/README b/audio/shell-fm/README
index fdf6eca651..b1243a48ca 100644
--- a/audio/shell-fm/README
+++ b/audio/shell-fm/README
@@ -1,12 +1,14 @@
-shell-fm is a lightweight, console-based player for Last.FM radio streams.
-It's pretty small (the binary is currently a little smaller than 60K, or
-50K when stripped) and it has most features the "official" player has, if
-not even a few more. Additional features are, for example:
+shell-fm is a lightweight, console-based player for Last.FM radio
+streams.  It's pretty small (the binary is currently a little
+smaller than 60K, or 50K when stripped) and it has most features the
+"official" player has, if not even a few more. Additional features
+are, for example:
 
-network interface (control shell-fm remotely) 
-autoban (automatically ban all tracks of an artist you don't like) 
-bookmark stations (quickly jump to bookmarked stations with a single key) 
-... probably more
+- network interface (control shell-fm remotely)
+- autoban (automatically ban all tracks of an artist you don't like)
+- bookmark stations (quickly jump to bookmarked stations with a single
+  key)
+- ... probably more
 
 *NOTE: Last-FM have changed their API so that only PAID subscribers
 can listen to streams in shell-fm.
diff --git a/audio/snd/README b/audio/snd/README
index c30d8d73c7..b7c1bc423e 100644
--- a/audio/snd/README
+++ b/audio/snd/README
@@ -1,7 +1,7 @@
 Snd is a sound editor modelled loosely after Emacs.  It is highly
 programmable, supports a variety of audio and sample file formats,
-includes a complete implementation of Common Lisp Music (CLM), can be
-run sans GUI as a scripting engine, and more.
+includes a complete implementation of Common Lisp Music (CLM), can
+be run sans GUI as a scripting engine, and more.
 
 This SlackBuild configures Snd to use Scheme (s7), ALSA, and Motif.
 But using GTK3 instead of Motif is also easy.
diff --git a/audio/snd/doinst.sh b/audio/snd/doinst.sh
index 5fb28930db..9a8ded3c60 100644
--- a/audio/snd/doinst.sh
+++ b/audio/snd/doinst.sh
@@ -1,3 +1,7 @@
 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/audio/snd/snd.SlackBuild b/audio/snd/snd.SlackBuild
index ccc4f67f11..924179f881 100644
--- a/audio/snd/snd.SlackBuild
+++ b/audio/snd/snd.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# SlackBuild for Snd, 3 December 2019
-# awg <awg@cock.li>
+# SlackBuild for Snd, 5 June 2020
+# E. axillaris <elanus@i2pmail.org>
 # All rights reserved.
 #
 # Permission to use, copy, modify, or distribute this software for any
@@ -16,12 +16,11 @@
 # 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.
-
-## Snd itself remains a copyrighted work.  Please see the file COPYING
-## in the Snd source distribution.
+#
+# Please see the Snd license for more information.
 
 PRGNAM=snd
-VERSION=${VERSION:-19.9}
+VERSION=${VERSION:-20.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/snd/snd.desktop b/audio/snd/snd.desktop
index e1c44d8983..5e4b8c2665 100644
--- a/audio/snd/snd.desktop
+++ b/audio/snd/snd.desktop
@@ -1,11 +1,12 @@
 [Desktop Entry]
-Exec=/usr/bin/snd
+Exec=/usr/bin/snd %F
 Icon=snd_48x48
 Name=Snd
+Type=Application
 GenericName=Snd Editor
 GenericName[fr]=Snd Éditeur
 GenericName[ja]=Snd エディタ
 GenericName[ru]=Snd редактор
-StartupNotify=true
-Type=Application
 Categories=Audio;AudioVideo;
+MimeType=audio/x-wav;audio/x-aiff;audio/x-adpcm;
+StartupNotify=true
diff --git a/audio/snd/snd.info b/audio/snd/snd.info
index 4f74e6440d..72ac7b72b9 100644
--- a/audio/snd/snd.info
+++ b/audio/snd/snd.info
@@ -1,10 +1,10 @@
 PRGNAM="snd"
-VERSION="19.9"
+VERSION="20.3"
 HOMEPAGE="https://ccrma.stanford.edu/software/snd/"
-DOWNLOAD="ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-19.9.tar.gz"
-MD5SUM="7ba9fe1089c1130445ad011da15881cb"
+DOWNLOAD="https://ccrma.stanford.edu/software/snd/snd-20.3.tar.gz"
+MD5SUM="111246d1b8b03d3da4d022d4277319a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="awg"
-EMAIL="awg@cock.li"
+MAINTAINER="E. axillaris"
+EMAIL="elanus@i2pmail.org"
diff --git a/audio/sonic-visualiser/README b/audio/sonic-visualiser/README
index 8382d66f41..43cb4adb39 100644
--- a/audio/sonic-visualiser/README
+++ b/audio/sonic-visualiser/README
@@ -1,9 +1,9 @@
 sonic-visualiser (audio file visualiser)
 
-Sonic Visualiser is an application for viewing and analysing the contents
-of music audio files. The aim of Sonic Visualiser is to be the first
-program you reach for when want to study a musical recording rather than
-simply listen to it.
+Sonic Visualiser is an application for viewing and analysing the
+contents of music audio files. The aim of Sonic Visualiser is to be
+the first program you reach for when want to study a musical recording
+rather than simply listen to it.
 
 Optional dependencies, detected at build time:
 
@@ -15,12 +15,13 @@ recording/playback [*].
 
 liblo - allows remote control of sonic-visualiser via OSC.
 
-Note: PulseAudio seems to work but hasn't been thoroughly tested. If you
-have problems with the other audio I/O backends, try JACK. See File ->
-Preferences -> Audio I/O.
+Note: PulseAudio seems to work but hasn't been thoroughly tested. If
+you have problems with the other audio I/O backends, try JACK. See File
+-> Preferences -> Audio I/O.
 
-[*] When built with jack, 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, or build without JACK.
+[*] When built with jack, 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, or
+build without JACK.
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/soundconverter/README b/audio/soundconverter/README
index 696676415c..1d108bca9c 100644
--- a/audio/soundconverter/README
+++ b/audio/soundconverter/README
@@ -1,11 +1,11 @@
-SoundConverter is the leading audio file converter for the GNOME Desktop.
-It reads anything GStreamer can read (Ogg Vorbis, AAC, MP3, FLAC, WAV,
-AVI, MPEG, MOV, M4A, AC3, DTS, ALAC, MPC, Shorten, APE, SID, MOD, XM,
-S3M, etc...), and writes to Opus, Ogg Vorbis, FLAC, WAV, AAC, and MP3
-files, or use any GNOME Audio Profile. SoundConverter aims to be simple
-to use and very fast. Thanks to its multithreaded design, it will use
-as many cores as possible to speed up the conversion. It can also
-extract the audio from videos.
+SoundConverter is the leading audio file converter for the GNOME
+Desktop.  It reads anything GStreamer can read (Ogg Vorbis, AAC, MP3,
+FLAC, WAV, AVI, MPEG, MOV, M4A, AC3, DTS, ALAC, MPC, Shorten, APE, SID,
+MOD, XM, S3M, etc...), and writes to Opus, Ogg Vorbis, FLAC, WAV, AAC,
+and MP3 files, or use any GNOME Audio Profile. SoundConverter aims to
+be simple to use and very fast. Thanks to its multithreaded design, it
+will use as many cores as possible to speed up the conversion. It can
+also extract the audio from videos.
 
 Optional dependencies for more audio support are gst0-plugins-bad,
 gst0-plugins-ugly, and gst0-ffmpeg.
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/swami/swami-menu-qsort-bug.patch b/audio/swami/swami-menu-qsort-bug.patch
deleted file mode 100644
index f6119e420d..0000000000
--- a/audio/swami/swami-menu-qsort-bug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/swamigui/SwamiguiMenu.c (revision 370)
-+++ src/swamigui/SwamiguiMenu.c (working copy)
-@@ -373,7 +373,7 @@
-   menu = gtk_menu_new ();
- 
-   types = swami_util_get_child_types (IPATCH_TYPE_BASE, &n_types);
--  qsort (types, sizeof (GType), n_types, sort_by_type_name);
-+  qsort (types, n_types, sizeof (GType), sort_by_type_name);
- 
-   for (ptype = types; *ptype; ptype++)
-     {
-
diff --git a/audio/swami/swami.SlackBuild b/audio/swami/swami.SlackBuild
index 0965e52efa..77121c79c6 100644
--- a/audio/swami/swami.SlackBuild
+++ b/audio/swami/swami.SlackBuild
@@ -3,13 +3,13 @@
 # Written by Michales Michaloudes korgie@gmail.com
 
 PRGNAM=swami
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-2.2.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"
@@ -49,22 +49,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-#Solve segfault on Slackware64
-#  Source: https://bugs.launchpad.net/bugs/810569
-patch -p0 < $CWD/swami-menu-qsort-bug.patch
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make -j1
-make -j1 install DESTDIR=$PKG
+cmake \
+	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+	-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
@@ -72,7 +62,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $TMP/$PRGNAM-$VERSION/
 cp -a \
-	ABOUT-NLS CVS-HOWTO NEWS AUTHORS COPYING ChangeLog INSTALL README \
+	ABOUT-NLS NEWS AUTHORS COPYING ChangeLog INSTALL README.md HACKERS TODO.tasks \
 	$PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/audio/swami/swami.info b/audio/swami/swami.info
index b85599b844..837c35d113 100644
--- a/audio/swami/swami.info
+++ b/audio/swami/swami.info
@@ -1,8 +1,8 @@
 PRGNAM="swami"
-VERSION="2.0.0"
+VERSION="2.2.1"
 HOMEPAGE="http://swamiproject.org"
-DOWNLOAD="http://downloads.sourceforge.net/swami/swami-2.0.0.tar.gz"
-MD5SUM="849b40e4a97c4f52faf069006358dd4f"
+DOWNLOAD="https://github.com/swami/swami/archive/v2.2.1/swami-2.2.1.tar.gz"
+MD5SUM="13fff4480db7537e3e042d07ffd2a354"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libgnomecanvas libinstpatch"
diff --git a/audio/swh-plugins-lv2/README b/audio/swh-plugins-lv2/README
index e78e08d483..adf6973802 100644
--- a/audio/swh-plugins-lv2/README
+++ b/audio/swh-plugins-lv2/README
@@ -2,5 +2,5 @@ swh-plugins-lv2 (GPL free software audio plugins for LV2)
 
 For LADSPA versions of these plugins, see swh-plugins.
 
-These plugins work in lv2_jack_host and ardour, but do NOT work in lv2rack
-(attempting to load them will cause lv2rack to segfault).
+These plugins work in lv2_jack_host and ardour, but do NOT work in
+lv2rack (attempting to load them will cause lv2rack to segfault).
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/tagtool/README b/audio/tagtool/README
index 57f5dc64d1..3d98db6fb2 100644
--- a/audio/tagtool/README
+++ b/audio/tagtool/README
@@ -1,6 +1,7 @@
-Audio Tag Tool is a program to manage the information fields in MP3 and Ogg
-Vorbis files, commonly called tags. It is available under the GNU General
-Public Licence (GPL).
-Tag Tool can be used to edit tags one by one, but the most useful features
-are the ability to easily tag or rename hundreds of files at once, in any
-desired format.
+Audio Tag Tool is a program to manage the information fields in MP3
+and Ogg Vorbis files, commonly called tags. It is available under the
+GNU General Public Licence (GPL).
+
+Tag Tool can be used to edit tags one by one, but the most useful
+features are the ability to easily tag or rename hundreds of files at
+once, in any desired format.
diff --git a/audio/tap_plugins/README b/audio/tap_plugins/README
index 8f7fb5c59b..30cfe4e235 100644
--- a/audio/tap_plugins/README
+++ b/audio/tap_plugins/README
@@ -1,9 +1,9 @@
 tap (audio plugins for LADSPA)
 
-Tom's Audio Processing plugins is a selection of LADSPA plugins for audio
-engineering on the Linux platform. Intended for use in a professional
-DAW environment such as Ardour, it includes high quality reverberation,
-echo, eq, limiter & more.
+Tom's Audio Processing plugins is a selection of LADSPA plugins
+for audio engineering on the Linux platform. Intended for use in a
+professional DAW environment such as Ardour, it includes high quality
+reverberation, echo, eq, limiter & more.
 
 This package includes the main tap-plugins distribution, plus the
 tap-plugins-doc and tap-reverbed (TAP Reverb Editor) distributions.
diff --git a/audio/tapiir/tapiir.info b/audio/tapiir/tapiir.info
index 2da9e773c4..37bbbf791b 100644
--- a/audio/tapiir/tapiir.info
+++ b/audio/tapiir/tapiir.info
@@ -1,7 +1,7 @@
 PRGNAM="tapiir"
 VERSION="0.7.3"
 HOMEPAGE="http://ccrma.stanford.edu/planetccrma/man/man1/tapiir.1.html"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/tapiir-0.7.3.tgz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/tapiir-0.7.3.tgz"
 MD5SUM="0746206a69acb7252ff0ffa9af47cd54"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/audio/tauonmb/tauonmb.SlackBuild b/audio/tauonmb/tauonmb.SlackBuild
new file mode 100644
index 0000000000..7580fe0b37
--- /dev/null
+++ b/audio/tauonmb/tauonmb.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for tauonmb
+
+# 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=tauonmb
+VERSION=${VERSION:-6.5.4}
+SRCNAM=TauonMusicBox
+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 {} \;
+
+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
+
+mkdir -p $PKG/usr/share/applications
+cp $CWD/tauonmb.desktop $PKG/usr/share/applications
+
+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
+
+(
+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
+
+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 -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/transcribe/README b/audio/transcribe/README
index c955b085c5..16e32174ad 100644
--- a/audio/transcribe/README
+++ b/audio/transcribe/README
@@ -1,16 +1,18 @@
-The Transcribe! application is an assistant for people who sometimes want
-to work out a piece of music from a recording, in order to write it out,
-or play it themselves, or both. It doesn't do the transcribing for you,
-but it is essentially a specialised player program which is optimised
-for the purpose of transcription. It has many transcription-specific
-features not found on conventional music players.
+The Transcribe! application is an assistant for people who sometimes
+want to work out a piece of music from a recording, in order to
+write it out, or play it themselves, or both. It doesn't do the
+transcribing for you, but it is essentially a specialised player
+program which is optimised for the purpose of transcription. It has
+many transcription-specific features not found on conventional music
+players.
 
-Transcribe! is proprietary software. After installation, Transcribe! will
-be fully functional for a 30-day evaluation period. To buy the software,
-use the site at http://www.seventhstring.com/xscribe/buy.html. The
-Slackware package doesn't need to be changed or updated (just enter the
-license key).
+Transcribe! is proprietary software. After installation, Transcribe!
+will be fully functional for a 30-day evaluation period. To buy the
+software, use the site at http://www.seventhstring.com/xscribe/buy.html.
+The Slackware package doesn't need to be changed or updated (just
+enter the license key).
 
-Note: 8.73 is the last version of Transcribe! that will work on Slackware
-14.2. Please don't ask me to update to newer versions: they require a
-newer glibc than 14.2 has. We'll have to wait until 15.0 is released.
+Note: 8.73 is the last version of Transcribe! that will work on
+Slackware 14.2. Please don't ask me to update to newer versions: they
+require a newer glibc than 14.2 has. We'll have to wait until 15.0 is
+released.
diff --git a/audio/transcribe/transcribe.info b/audio/transcribe/transcribe.info
index 565e18795d..9a03951bc7 100644
--- a/audio/transcribe/transcribe.info
+++ b/audio/transcribe/transcribe.info
@@ -1,9 +1,9 @@
 PRGNAM="transcribe"
 VERSION="8.73"
 HOMEPAGE="http://www.seventhstring.com/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/xscsetup.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/xscsetup.tar.gz"
 MD5SUM="1c4e09cf87671e0c11afc2a089c3367c"
-DOWNLOAD_x86_64="http://urchlay.naptime.net/~urchlay/src/xsc64setup.tar.gz"
+DOWNLOAD_x86_64="https://slackware.uk/~urchlay/src/xsc64setup.tar.gz"
 MD5SUM_x86_64="1d6e705d01938fd69cc6395975fdafe5"
 REQUIRES=""
 MAINTAINER="B. Watson"
diff --git a/audio/tta/README b/audio/tta/README
index cf29c9b902..d47f204917 100644
--- a/audio/tta/README
+++ b/audio/tta/README
@@ -1,9 +1,9 @@
 tta (TTA lossless audio codec)
 
-TTA is a lossless compressor for multichannel 8,16 and 24 bits audio data
-with the ability of password data protection.
-Being 'lossless' means that no data/quality is lost in the compression.
-When when uncompressed, the data will be identical to the original.
+TTA is a lossless compressor for multichannel 8,16 and 24 bits audio
+data with the ability of password data protection.  Being 'lossless'
+means that no data/quality is lost in the compression.  When when
+uncompressed, the data will be identical to the original.
 
 This package contains a full-futured codec library for realtime encoding
 and decoding of True Audio (TTA) files.
diff --git a/audio/twolame/README b/audio/twolame/README
index ff1f1494da..c39e263172 100644
--- a/audio/twolame/README
+++ b/audio/twolame/README
@@ -1,5 +1,4 @@
-TwoLAME is an optimized MPEG Audio Layer 2 (MP2) encoder.
-TwoLAME should be able to be used as a drop-in replacement for
-LAME (a MPEG Layer 3 encoder). The frontend takes very similar
-command line options to LAME, and the backend library has a very
-similar API to LAME.
+TwoLAME is an optimised MP2 (MPEG-1 Audio Layer II) encoder.
+It has a simple command line interface, uses libsndfile to handle a
+wide range of input files, and features its own thread-safe library
+with API similar to LAME (a MP3 encoder).
diff --git a/audio/twolame/twolame.SlackBuild b/audio/twolame/twolame.SlackBuild
index bb53598821..895b099282 100644
--- a/audio/twolame/twolame.SlackBuild
+++ b/audio/twolame/twolame.SlackBuild
@@ -1,29 +1,27 @@
 #!/bin/sh
 
-# Slackware build script for twolame
-
 # Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
+# SlackBuild for TwoLAME, 5 June 2020
+# E. axillaris <elanus@i2pmail.org>
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# Permission to use, copy, modify, or distribute this software for any
+# purpose with or without fee is hereby granted, provided that this
+# notice of copyright and permission appear in all copies.
 #
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
+# 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.
 #
-# 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.
+# Please see the TwoLAME license for more information.
 
 PRGNAM=twolame
-VERSION=${VERSION:-0.3.13}
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -90,7 +88,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/twolame/* $PKG/usr/doc/$PRGNAM-$VERSION/
-cp -a AUTHORS ChangeLog COPYING README* TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -rf $PKG/usr/share
 
diff --git a/audio/twolame/twolame.info b/audio/twolame/twolame.info
index 14a3c4e245..a830a1c777 100644
--- a/audio/twolame/twolame.info
+++ b/audio/twolame/twolame.info
@@ -1,10 +1,10 @@
 PRGNAM="twolame"
-VERSION="0.3.13"
-HOMEPAGE="http://www.twolame.org/"
-DOWNLOAD="http://downloads.sourceforge.net/twolame/twolame-0.3.13.tar.gz"
-MD5SUM="4113d8aa80194459b45b83d4dbde8ddb"
+VERSION="0.4.0"
+HOMEPAGE="https://www.twolame.org/"
+DOWNLOAD="https://github.com/njh/twolame/releases/download/0.4.0/twolame-0.4.0.tar.gz"
+MD5SUM="400c164ed096c7aea82bcf8edcd3f6f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+MAINTAINER="E. axillaris"
+EMAIL="elanus@i2pmail.org"
diff --git a/audio/unsf/README b/audio/unsf/README
index 38c97db2a3..b1c8e9414c 100644
--- a/audio/unsf/README
+++ b/audio/unsf/README
@@ -1,7 +1,7 @@
 unsf (converts SoundFont .sf2 files into GUS-type instrument patches)
 
-UnSF is a tool to convert SoundFont (sf2) files into GUS patches. libunsf
-is a library that is used by UnSF.
+UnSF is a tool to convert SoundFont (sf2) files into GUS
+patches. libunsf is a library that is used by UnSF.
 
 Some reasons you might want to do such a thing are:
 
@@ -12,10 +12,10 @@ Some reasons you might want to do such a thing are:
       banks of instruments by editing GUS config files.
 
     - You need to modify patches by changing amplitude, stripping
-      envelopes, or make other changes that can easily be done by attaching
-      options in config files.
+      envelopes, or make other changes that can easily be done by
+      attaching options in config files.
 
 Note: the set of patches created by unsf will be quite a bit larger
 that the original .sf2 file. As an example, FluidR3_GM.sf2 (from
-fluid-soundfont) is a 142MB file, and it converts to almost 2GB of patches
-(size increased by a factor of 13.5).
+fluid-soundfont) is a 142MB file, and it converts to almost 2GB of
+patches (size increased by a factor of 13.5).
diff --git a/audio/unsf/git2targz.sh b/audio/unsf/git2targz.sh
index 5ef1cd9110..ae5b4d2b34 100644
--- a/audio/unsf/git2targz.sh
+++ b/audio/unsf/git2targz.sh
@@ -44,7 +44,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz
 Update $PRGNAM.info with:
 
 VERSION="$VERSION"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
 MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
 
 Don't forget to upload the new source!
diff --git a/audio/unsf/unsf.info b/audio/unsf/unsf.info
index b8f7b8e75c..a14477cac6 100644
--- a/audio/unsf/unsf.info
+++ b/audio/unsf/unsf.info
@@ -1,7 +1,7 @@
 PRGNAM="unsf"
 VERSION="1.1+git20180608"
 HOMEPAGE="https://github.com/psi29a/unsf"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/unsf-1.1+git20180608.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/unsf-1.1+git20180608.tar.xz"
 MD5SUM="936232090224001eda5248f927f02618"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/vcf_plugins/README b/audio/vcf_plugins/README
index 701361e5a0..5d61ea0313 100644
--- a/audio/vcf_plugins/README
+++ b/audio/vcf_plugins/README
@@ -1,5 +1,5 @@
-LADSPA plugins for audio EQ biquad filters based on the cookbook formulae
-by Robert Bristow-Johnson.
+LADSPA plugins for audio EQ biquad filters based on the cookbook
+formulae by Robert Bristow-Johnson.
 
 The following filters have been implemented:
     * Two low pass filters
diff --git a/audio/vcf_plugins/vcf_plugins.info b/audio/vcf_plugins/vcf_plugins.info
index 06a9168336..388b5c97fc 100644
--- a/audio/vcf_plugins/vcf_plugins.info
+++ b/audio/vcf_plugins/vcf_plugins.info
@@ -1,7 +1,7 @@
 PRGNAM="vcf_plugins"
 VERSION="0.0.5"
 HOMEPAGE="http://web.archive.org/web/20170331170847/http://users.suse.com/~mana/ladspa.html"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/vcf-0.0.5.tar.bz2"
+DOWNLOAD="https://slackware.uk/~urchlay/src/vcf-0.0.5.tar.bz2"
 MD5SUM="7dfbdd040926f925187290c5d12caeae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/volti/README b/audio/volti/README
index bcb57db9a4..0fb34382f3 100644
--- a/audio/volti/README
+++ b/audio/volti/README
@@ -1,3 +1,3 @@
-Volti is a GTK+ application for controlling audio volume from the system
-tray/notification area.  It supports ALSA, multimedia keys on the keyboard,
-and desktop notifications on keys events.
+Volti is a GTK+ application for controlling audio volume from the
+system tray/notification area.  It supports ALSA, multimedia keys on
+the keyboard, and desktop notifications on keys events.
diff --git a/audio/volume.app/README b/audio/volume.app/README
index fefd6b1e97..b61772402f 100644
--- a/audio/volume.app/README
+++ b/audio/volume.app/README
@@ -1,35 +1,37 @@
-==========================================================================
+========================================================================
 Volume.app -- a simple windowmaker volume control dockapp
-==========================================================================
+========================================================================
 
-This is a simple volume control for the AfterStep / BlackBox / Window
-Maker dock. Volume.app is intended to be an extremely simple, efficient, and
-attractive interface to a system's sound mixer.
+This is a simple volume control for the AfterStep / BlackBox /
+Window Maker dock. Volume.app is intended to be an extremely simple,
+efficient, and attractive interface to a system's sound mixer.
 
 Currently, only OSS mixer interface is supported. ALSA mixer can be used
 through ALSA's OSS emulation.
 
-==========================================================================
+========================================================================
 
 NOTE:  The hacks/mods are for "ALSA's OSS emulation" in ALSA systems.
 
-NOTE2: There are two 'mod' files: "config.h.in.mod" and "volume.app.c.mod".
-       If you want to use them, simple rename them to each "original filename"
-       (remove ".mod" on filename).
+NOTE2: There are two 'mod' files: "config.h.in.mod" and
+       "volume.app.c.mod".
+       If you want to use them, simply rename them to each "original
+       filename" (remove ".mod" on filename).
 
        "volume.app.c.mod" is a hack to fix the mute/unmute problem
        for ALSA systems. (It uses "amixer" command as background).
 
        "config.h.in.mod" is just a covenience to set some parameters.
-       eg: If is notified that the app is not running on the right mixer
+       eg: If you notice that the app is not running on the right mixer
           (more than 1 soundcard), you may try to set the default mixer
           before creating the package!
 
-          'cat /proc/asound/oss/sndstat' and search the "Mixers" section.
-          locate the desired 'mixer number' and then modify file
-          "config.h.in.mod" at "DEFAULT_MIXER_DEVICE" parameter.
+          'cat /proc/asound/oss/sndstat' and search the "Mixers"
+          section.  Locate the desired 'mixer number' and then modify
+          file "config.h.in.mod" at "DEFAULT_MIXER_DEVICE" parameter.
 
-          Eg2: if desired mixer is "2", modify "config.h.in.mod" as below:
+          Eg2: if desired mixer is "2", modify "config.h.in.mod"
+          as below:
 
           DEFAULT_MIXER_DEVICE "/dev/mixer"
           ( to )
@@ -38,4 +40,4 @@ NOTE2: There are two 'mod' files: "config.h.in.mod" and "volume.app.c.mod".
         Again, do not forget to rename the file "config.h.in.mod" to
         "config.h.in" before creating the package.
 
-==========================================================================
+========================================================================
diff --git a/audio/volwheel/README b/audio/volwheel/README
index d83966c5da..77199c7400 100644
--- a/audio/volwheel/README
+++ b/audio/volwheel/README
@@ -1,4 +1,4 @@
-VolWheel is a little application which lets you control the sound volume easily
-through a tray icon you can scroll on. It is written in Perl/Gtk2 and works
-both for ALSA and OSS. You can configure it quickly through its configuration
-interface.
+VolWheel is a little application which lets you control the sound
+volume easily through a tray icon you can scroll on. It is written in
+Perl/Gtk2 and works both for ALSA and OSS. You can configure it quickly
+through its configuration interface.
diff --git a/audio/wineasio/README b/audio/wineasio/README
index 9a9aa534aa..9419074d6f 100644
--- a/audio/wineasio/README
+++ b/audio/wineasio/README
@@ -1,16 +1,16 @@
-WineASIO provides an ASIO to JACK driver for WINE. ASIO is the most common
-Windows low-latency driver, so is commonly used in audio workstation
-programs.
+WineASIO provides an ASIO to JACK driver for WINE. ASIO is the most
+common Windows low-latency driver, so is commonly used in audio
+workstation programs.
 
-To build the package, you will need the file "asio.h" from the Steinberg
-ASIO SDK, version 2.1 or greater. This file must be downloaded from
-http://www.steinberg.net/en/company/developer.html and copied to the
-directory containing the SlackBuild.
+To build the package, you will need the file "asio.h" from the
+Steinberg ASIO SDK, version 2.1 or greater. This file must be
+downloaded from http://www.steinberg.net/en/company/developer.html and
+copied to the directory containing the SlackBuild.
 
 After installing the package, each user who will use wineasio must run
 the command "regsvr32 wineasio.dll". This must be done as the user(s),
 not as root. This only needs to be done once per user.
 
 This can't be built on a stock Slackware64 system, since it requires
-32-bit Wine. It may (or may not) be possible to build on a 64-bit multilib
-system; let me know how it goes.
+32-bit Wine. It may (or may not) be possible to build on a 64-bit
+multilib system; let me know how it goes.
diff --git a/audio/xforge/README b/audio/xforge/README
index 30c2549a3f..b9d0d1b52c 100644
--- a/audio/xforge/README
+++ b/audio/xforge/README
@@ -1,4 +1,4 @@
-Xforge is a graphical wave editor for UNIX systems with X11 and Motif. The
-name is derived from popular PC/Windows wave editor Sound Forge, and the
-goal of Xforge project is to provide similar wave editing facilities to
-UNIX world, but as free software.
+Xforge is a graphical wave editor for UNIX systems with X11 and
+Motif. The name is derived from popular PC/Windows wave editor Sound
+Forge, and the goal of Xforge project is to provide similar wave
+editing facilities to UNIX world, but as free software.
diff --git a/audio/xmms-ladspa/README b/audio/xmms-ladspa/README
index 7d4ac9862b..c9b510e684 100644
--- a/audio/xmms-ladspa/README
+++ b/audio/xmms-ladspa/README
@@ -5,9 +5,9 @@ the Linux Audio Developer's Simple Plugin API to your everyday MP3 and
 all-around media player. It's Free Software of course, under the GNU
 General Public License.
 
-Note: the LADSPA plugins from guitarix are incompatible with xmms-ladspa.
-They won't appear in the list of effects, when configuring the plugin
-from within xmms.
+Note: the LADSPA plugins from guitarix are incompatible with
+xmms-ladspa.  They won't appear in the list of effects, when
+configuring the plugin from within xmms.
 
 If xmms segfaults when you try to configure the LADSPA plugin, please
 contact the maintainer of this build.
diff --git a/audio/xmms-scrobbler/README b/audio/xmms-scrobbler/README
index 331c869f28..c51a983f68 100644
--- a/audio/xmms-scrobbler/README
+++ b/audio/xmms-scrobbler/README
@@ -1 +1,2 @@
-XMMS Scrobbler is an xmms plugin that reports your music listening to last.fm.
+XMMS Scrobbler is an xmms plugin that reports your music listening to
+last.fm.
diff --git a/audio/xmms2/README b/audio/xmms2/README
index 1a3fd55f6b..ba3ef8ec70 100644
--- a/audio/xmms2/README
+++ b/audio/xmms2/README
@@ -1,8 +1,8 @@
-XMMS2 is the next generation of XMMS.  The XMMS2 team is committed to
-producing a better music player, while diligently maintaining a robust and
-flexible design.  The goal is to make the system easy for developers to
-maintain and integrate with.  In terms of the listening experience, XMMS2
-makes it possible for anyone to easily manage their music collection and to
-interact with it in a flexible manner.
+XMMS2 is the next generation of XMMS.  The XMMS2 team is committed
+to producing a better music player, while diligently maintaining a
+robust and flexible design.  The goal is to make the system easy for
+developers to maintain and integrate with.  In terms of the listening
+experience, XMMS2 makes it possible for anyone to easily manage their
+music collection and to interact with it in a flexible manner.
 
 ffmpeg is an optional dependency (but it's *BROKEN* ATM)
diff --git a/audio/xmp/README b/audio/xmp/README
index f7bfbf1cd5..084b47f64a 100644
--- a/audio/xmp/README
+++ b/audio/xmp/README
@@ -1,3 +1,3 @@
-The Extended Module Player, or xmp, is a portable command-line module player
-for Unix and Unix-like systems. Xmp plays over 90 mainstream and obscure
-module formats from Amiga, Atari, Acorn, Apple IIgs and PC.
+The Extended Module Player, or xmp, is a portable command-line module
+player for Unix and Unix-like systems. Xmp plays over 90 mainstream and
+obscure module formats from Amiga, Atari, Acorn, Apple IIgs and PC.
diff --git a/audio/yoshimi/yoshimi.SlackBuild b/audio/yoshimi/yoshimi.SlackBuild
index 26508e20c0..15a2c6c924 100644
--- a/audio/yoshimi/yoshimi.SlackBuild
+++ b/audio/yoshimi/yoshimi.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Zbigniew Baniewski, <Zbigniew [dot] Baniewski [at] gmail [dot] com>
 
 PRGNAM=yoshimi
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/yoshimi/yoshimi.info b/audio/yoshimi/yoshimi.info
index a5f3a9463a..7b05c4f8ef 100644
--- a/audio/yoshimi/yoshimi.info
+++ b/audio/yoshimi/yoshimi.info
@@ -1,8 +1,8 @@
 PRGNAM="yoshimi"
-VERSION="1.7.0"
+VERSION="1.7.2"
 HOMEPAGE="http://yoshimi.sourceforge.net/"
-DOWNLOAD="https://github.com/Yoshimi/yoshimi/archive/1.7.0.tar.gz"
-MD5SUM="7e127d891e8c370a53666c9c2ad3be3c"
+DOWNLOAD="https://github.com/Yoshimi/yoshimi/archive/1.7.2/yoshimi-1.7.2.tar.gz"
+MD5SUM="52e55e974604f803312dab64cf3c2f8f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mxml fltk lv2"
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/audio/zynjacku/zynjacku.SlackBuild b/audio/zynjacku/zynjacku.SlackBuild
index d036092620..18e4114f42 100644
--- a/audio/zynjacku/zynjacku.SlackBuild
+++ b/audio/zynjacku/zynjacku.SlackBuild
@@ -53,6 +53,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# In the newer lv2 the pkgconfig file is named differently...
+sed -i "s|lv2core|lv2|" configure
+
 # If LV2_PATH not set, a hard-coded path including /usr/lib/lv2 is used.
 # On x86_64, this is wrong.
 if [ "$LIBDIRSUFFIX" != "" ]; then
diff --git a/business/AssociationSubscribersManager/AssociationSubscribersManager.SlackBuild b/business/AssociationSubscribersManager/AssociationSubscribersManager.SlackBuild
index 2e8803a903..4b2de64643 100644
--- a/business/AssociationSubscribersManager/AssociationSubscribersManager.SlackBuild
+++ b/business/AssociationSubscribersManager/AssociationSubscribersManager.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for Association Subscribers Manager
 #
-# Copyright 2009  Arnaud Dupuis, Asnières sur Seine, France
+# Copyright 2009  Arnaud Dupuis, Asnières sur Seine, France
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/business/AssociationSubscribersManager/README b/business/AssociationSubscribersManager/README
index 7ae0fa7250..a052679d1f 100644
--- a/business/AssociationSubscribersManager/README
+++ b/business/AssociationSubscribersManager/README
@@ -1,5 +1,6 @@
-Association Subscribers Manager is software designed to manage members
-of associations. An "association" can be a club sport, a music club, etc.;
-it is highly customizable. It can manage groups of several thousand
-members. It is written in C++ with Qt 4 as a GUI framework. All
-generated files are in an XML-based format to guarantee interoperability.
+Association Subscribers Manager is software designed to manage
+members of associations. An "association" can be a club sport, a
+music club, etc.; it is highly customizable. It can manage groups
+of several thousand members. It is written in C++ with Qt 4 as a GUI
+framework. All generated files are in an XML-based format to guarantee
+interoperability.
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/maltego/README b/business/maltego/README
index 6f9391c5c2..cfaeea55e3 100644
--- a/business/maltego/README
+++ b/business/maltego/README
@@ -1,7 +1,8 @@
 Maltego is proprietary software used for open-source intelligence and
-forensics, developed by Paterva. Maltego focuses on providing a library of
-transforms for discovery of data from open sources, and visualizing that
-information in a graph format, suitable for link analysis and data mining.
+forensics, developed by Paterva. Maltego focuses on providing a library
+of transforms for discovery of data from open sources, and visualizing
+that information in a graph format, suitable for link analysis and data
+mining.
 
 It is used by security researchers and private investigators.
 
diff --git a/business/openerp-client/README b/business/openerp-client/README
index cf812b3131..e15ce427b2 100644
--- a/business/openerp-client/README
+++ b/business/openerp-client/README
@@ -3,5 +3,5 @@ domains for small to medium businesses; accounting, stock management,
 sales, customer relationship, purchases, project management, etcetera.
 This is the client application.
 
-Note that you will get an error on startup if matplotlib is not installed, 
-but the only functionality lost is presenting graphs.  
+Note that you will get an error on startup if matplotlib is not
+installed, but the only functionality lost is presenting graphs.
diff --git a/business/openerp-server/README b/business/openerp-server/README
index 8920ec03cf..140b3fbecf 100644
--- a/business/openerp-server/README
+++ b/business/openerp-server/README
@@ -1,15 +1,16 @@
 OpenERP is a complete ERP and CRM. The main features are accounting
-(analytic and financial), stock management, sales and purchases management,
-tasks automation, marketing campaigns, help desk, POS, etc. Technical
-features include a distributed server, flexible workflows, an object
-database, a dynamic GUI, customizable reports, and SOAP and XML-RPC
-interfaces.
+(analytic and financial), stock management, sales and purchases
+management, tasks automation, marketing campaigns, help desk,
+POS, etc. Technical features include a distributed server, flexible
+workflows, an object database, a dynamic GUI, customizable reports, and
+SOAP and XML-RPC interfaces.
 
-Before you can use openerp-server, you will have to set up postgresql. All
-you have to do is issue the following command:
+Before you can use openerp-server, you will have to set up
+postgresql. All you have to do is issue the following command:
   createuser -U postgres --no-adduser terp
 
-This will setup OpenERP for the use with postgresql on localhost.  There is
-no need to set a password on localhost. However, if you are going to run
-postgresql on a different server, you will have to run createuser like this:
+This will setup OpenERP for the use with postgresql on localhost.
+There is no need to set a password on localhost. However, if you are
+going to run postgresql on a different server, you will have to run
+createuser like this:
   createuser -U postgres --no-adduser -P terp
diff --git a/business/reckon/README b/business/reckon/README
index 89d98e90fd..c34b6c4062 100644
--- a/business/reckon/README
+++ b/business/reckon/README
@@ -1,8 +1,9 @@
 Reckon automagically converts CSV files for use with the command-line
-accounting tool Ledger. It also helps you to select the correct accounts
-associated with the CSV data using Bayesian machine learning.
+accounting tool Ledger. It also helps you to select the correct
+accounts associated with the CSV data using Bayesian machine learning.
 
-First, login to your bank and export your transaction data as a CSV file.
+First, login to your bank and export your transaction data as a CSV
+file.
 
 To see how the CSV parses:
   reckon -f bank.csv -p
diff --git a/business/stansoft/README b/business/stansoft/README
index 39dc187d62..49faa20204 100644
--- a/business/stansoft/README
+++ b/business/stansoft/README
@@ -1,26 +1,26 @@
 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 private server (VPS) in the
-cloud.
+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 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
 
 NOTES:
-1) After installing the Slackbuild you must run the Stansoft installation
-   script /opt/stansoft/install
+1) After installing the Slackbuild you must run the Stansoft
+   installation script /opt/stansoft/install
 
 2) Installation and setup help can be found in /opt/stansoft/README and
    the manual is located at /opt/stansoft/doc/ssmanual.pdf
 
-3) stansoft and informix are the database administrator account, so please
-   set a strong password for it.
+3) stansoft and informix are the database administrator account, so
+   please set a strong password for it.
diff --git a/business/stansoft/slack-desc b/business/stansoft/slack-desc
index 619c87efb3..dd55e74b4d 100644
--- a/business/stansoft/slack-desc
+++ b/business/stansoft/slack-desc
@@ -11,9 +11,9 @@ stansoft:
 stansoft: Stansoft is Linux financial accounting software for business.
 stansoft: There is no limit on the number of users per installation, which
 stansoft: allows for scalability from small to large companies.
-stansoft: The user interface is ncurses / terminal based to optimize data entry
-stansoft: efficiency. It can be run locally or deployed remotely on a virtual
-stansoft: private server (VPS) in the cloud.
+stansoft: The user interface is ncurses / terminal based to optimize data
+stansoft: entry efficiency. It can be run locally or deployed remotely on
+stansoft: a virtual cloud server.
 stansoft:
 stansoft: After installing the Slackbuild you must run the Stansoft
 stansoft: installation script /opt/stansoft/install
diff --git a/business/stansoft/stansoft.SlackBuild b/business/stansoft/stansoft.SlackBuild
index 0a3848b1da..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.17}
+VERSION=${VERSION:-7.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/business/stansoft/stansoft.info b/business/stansoft/stansoft.info
index 943783b917..ab7d1df48d 100644
--- a/business/stansoft/stansoft.info
+++ b/business/stansoft/stansoft.info
@@ -1,10 +1,10 @@
 PRGNAM="stansoft"
-VERSION="7.16"
+VERSION="7.21"
 HOMEPAGE="http://www.stansoft.org"
-DOWNLOAD="http://download.stansoft.org/files/stansoft-v7.17-x86.tar.bz2"
-MD5SUM="d5247aba1f6d60b879e770b0ecf5aeba"
-DOWNLOAD_x86_64="http://download.stansoft.org/files/stansoft-v7.17-x86_64.tar.bz2"
-MD5SUM_x86_64="d320317b0ae5d73f2356dfc70027d803"
+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/business/tryton/README b/business/tryton/README
index 1232841144..fa013dadd9 100644
--- a/business/tryton/README
+++ b/business/tryton/README
@@ -1,16 +1,17 @@
-Tryton is a complete ERP. The main features are accounting
-(analytic and financial), stock management, sales and purchases management,
-POS, etc. Technical features include a distributed server, flexible workflows,
-an object database, a dynamic GUI, customizable reports, and SOAP and XML-RPC
-interfaces.
+Tryton is a complete ERP. The main features are accounting (analytic
+and financial), stock management, sales and purchases management,
+POS, etc. Technical features include a distributed server, flexible
+workflows, an object database, a dynamic GUI, customizable reports, and
+SOAP and XML-RPC interfaces.
 
-This is the pygtk client for Tryton. Requires trytond available on either
-the same host or available via the network.
+This is the pygtk client for Tryton. Requires trytond available on
+either the same host or available via the network.
 
-If you want to integrate Google Calendar, then install
-GooCalendar (http://code.google.com/p/goocalendar/) - Not available on SBo.
+If you want to integrate Google Calendar, then install GooCalendar
+(http://code.google.com/p/goocalendar/) - Not available on SBo.
 
-Optional is cdecimal (not available in SBo) to replace stock decimal module.
+Optional is cdecimal (not available in SBo) to replace stock decimal
+module.
 
 If you want to install the documentation, optional dependency is Sphinx
 documentation program (development/Sphinx).
diff --git a/business/trytond/README b/business/trytond/README
index e62ca86b55..c1eec1fa35 100644
--- a/business/trytond/README
+++ b/business/trytond/README
@@ -1,22 +1,23 @@
-Tryton is a complete ERP. The main features are accounting
-(analytic and financial), stock management, sales and purchases management,
-POS, etc. Technical features include a distributed server, flexible workflows,
-an object database, a dynamic GUI, customizable reports, and SOAP and XML-RPC
-interfaces.
+Tryton is a complete ERP. The main features are accounting (analytic
+and financial), stock management, sales and purchases management,
+POS, etc. Technical features include a distributed server, flexible
+workflows, an object database, a dynamic GUI, customizable reports, and
+SOAP and XML-RPC interfaces.
 
 To add modules, you will need pip.
 
-Before you can use the tryton server, you will have to set up postgresql. All
-you have to do is issue the following command:
+Before you can use the tryton server, you will have to set up
+postgresql. All you have to do is issue the following command:
   createuser -U postgres --createdb --no-adduser tryton
 
 This will setup trytond for use with postgresql on localhost.  There is
-no need to set a password on localhost. However, if you are going to run
-postgresql on a different server, you will have to run createuser like this:
+no need to set a password on localhost. However, if you are going to
+run postgresql on a different server, you will have to run createuser
+like this:
   createuser -U postgres --createdb --no-adduser -P tryton
 
-After initializing postgres, modify /etc/trytond/trytond.conf to match your
-local setup. After trytond is setup, then you can run
+After initializing postgres, modify /etc/trytond/trytond.conf to match
+your local setup. After trytond is setup, then you can run
     /etc/rc.d/rc.trytond start
 
 If you want to install the documentation, optional dependency is Sphinx
@@ -28,6 +29,6 @@ For a list of modules that can be added to trytond, at cli type:
 then to add module, type:
     pip install trytond_module_name
 
-where trydond_module_name is the name of the module. For example, to add
-the account package, type:
+where trydond_module_name is the name of the module. For example, to
+add the account package, type:
     pip install trytond_account
diff --git a/desktop/9menu/9menu.SlackBuild b/desktop/9menu/9menu.SlackBuild
index 8eb46ce8b5..6c4f268a42 100644
--- a/desktop/9menu/9menu.SlackBuild
+++ b/desktop/9menu/9menu.SlackBuild
@@ -22,6 +22,9 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>.
 
+# 20200708 bkw:
+# - Update for v1.10
+
 # 20180628 bkw:
 # - Take over maintenance.
 # - Use github .tar.gz release. NO WAY am I leaving this:
@@ -30,8 +33,8 @@
 # - Include ChangeLog in doc dir, bump BUILD to 2.
 
 PRGNAM=9menu
-VERSION=${VERSION:-1.9}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.10}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/desktop/9menu/9menu.info b/desktop/9menu/9menu.info
index 5880a6bc3f..30740101e3 100644
--- a/desktop/9menu/9menu.info
+++ b/desktop/9menu/9menu.info
@@ -1,8 +1,8 @@
 PRGNAM="9menu"
-VERSION="1.9"
+VERSION="1.10"
 HOMEPAGE="https://github.com/arnoldrobbins/9menu"
-DOWNLOAD="https://github.com/arnoldrobbins/9menu/archive/9menu-release-1.9/9menu-9menu-release-1.9.tar.gz"
-MD5SUM="9cc267a7b83a85ce1b35518e26e8d721"
+DOWNLOAD="https://github.com/arnoldrobbins/9menu/archive/9menu-release-1.10/9menu-9menu-release-1.10.tar.gz"
+MD5SUM="fb158d07cc52c6676e8ed012122f7430"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/9menu/README b/desktop/9menu/README
index 9fe9857a1c..ce5c66f26c 100644
--- a/desktop/9menu/README
+++ b/desktop/9menu/README
@@ -1,5 +1,5 @@
 9menu (create X menus)
 
-This is 9menu, a simple program that allows you to create X menus from the
-shell, where each menu item will run a command. 9menu is intended for use
-with 9wm, but can be used with any other window manager.
+This is 9menu, a simple program that allows you to create X menus from
+the shell, where each menu item will run a command. 9menu is intended
+for use with 9wm, but can be used with any other window manager.
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/ClipboardViewer/README b/desktop/ClipboardViewer/README
index 4a9fc500c0..4d83bfba12 100644
--- a/desktop/ClipboardViewer/README
+++ b/desktop/ClipboardViewer/README
@@ -1,9 +1,11 @@
-ClipboardViewer is a qui app to display the current gnome clipboard either 
-as text or a picture ( a la OSX ) in a small window.  You can also use it 
-from the command line ( or script ) to print the text on the clipboard to 
-stdout or create a png image file in the current directory.
+ClipboardViewer is a qui app to display the current gnome clipboard
+either as text or a picture ( a la OSX ) in a small window.  You can
+also use it from the command line ( or script ) to print the text
+on the clipboard to stdout or create a png image file in the current
+directory.
 
-A nautilus script to convert the clipboard contents into either a text or a 
-picture clipping is installed in /usr/share/ClipboardViewer/scripts/ - you 
-may want to create a symlink from this script to your own nautilus scripts 
-directory (usually ~/.gnome2/nautilus-scripts/)
+A nautilus script to convert the clipboard contents
+into either a text or a picture clipping is installed in
+/usr/share/ClipboardViewer/scripts/ - you may want to create a symlink
+from this script to your own nautilus scripts directory (usually
+~/.gnome2/nautilus-scripts/)
diff --git a/desktop/LX-Colors-themes/README b/desktop/LX-Colors-themes/README
index 486f2dfc69..310a0efe9b 100644
--- a/desktop/LX-Colors-themes/README
+++ b/desktop/LX-Colors-themes/README
@@ -4,19 +4,20 @@ This is a series of GTK2/GTK3/Openbox themes not only in each of the
 official seven Shiki-Colors color schemes, but there are also five
 different styles available as well:
 
- * Light: Kinda like Elementary (just use Elementary or something similar
-as your Metacity/Unity/Cinnamon/etc. theme)
+ * Light: Kinda like Elementary (just use Elementary or something
+   similar as your Metacity/Unity/Cinnamon/etc. theme)
 
  * Mixed: Like the light version, except with dark menus.
 
  * NeoShiki: A GTK2/3 Shiki-Colors remake. For this style as well as the
-two after it, I have also posted a link to the original Shiki-Colors
-themes so that you can download the Metacity themes, which I have
-designed these themes to seamlessly integrate with.
-
- * Obsidian: Dark, but with a white base and black text for compatibility
-with some websites, plus its also the basis for some of the other color
-variations I have in mind that Ill be creating later.
+   two after it, I have also posted a link to the original Shiki-Colors
+   themes so that you can download the Metacity themes, which I have
+   designed these themes to seamlessly integrate with.
+
+ * Obsidian: Dark, but with a white base and black text for
+   compatibility with some websites, plus its also the basis for some
+   of the other color variations I have in mind that Ill be creating
+   later.
 
  * PitchDark: A true dark variation.
 
diff --git a/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild b/desktop/Qogir-icon-theme/Qogir-icon-theme.SlackBuild
index cb2e23e73b..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:-20200221}
+SRCVER=${SRCVER:-2020-11-22}
+VERSION=${VERSION:-$(echo $SRCVER | tr -d -)}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
 
-SRCVER=${SRCVER:-2020-02-21}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -65,4 +64,11 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/Qogir-icon-theme/Qogir-icon-theme.info b/desktop/Qogir-icon-theme/Qogir-icon-theme.info
index d94dc508ca..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="20200221"
+VERSION="20201122"
 HOMEPAGE="https://github.com/vinceliuice/Qogir-icon-theme"
-DOWNLOAD="https://github.com/vinceliuice/Qogir-icon-theme/archive/2020-02-21/Qogir-icon-theme-2020-02-21.tar.gz"
-MD5SUM="1e42446b6e765c70b3c1192a1fa9d0cd"
+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 3f44005770..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,23 +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 .
-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/icons
 cp -a surfn-icons/$PRGNAM* $PKG/usr/share/icons
-find -L $PKG/usr/share/icons -type f -exec chmod 644 {} \;
-find -L $PKG/usr/share/icons -type f -name '*.sh' -exec chmod 755 {} \;
+find $PKG/usr/share/icons \
+  \( -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
 
@@ -63,4 +68,11 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
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/Zafiro-icons/Zafiro-icons.SlackBuild b/desktop/Zafiro-icons/Zafiro-icons.SlackBuild
index 82daa4f6b3..b29e706017 100644
--- a/desktop/Zafiro-icons/Zafiro-icons.SlackBuild
+++ b/desktop/Zafiro-icons/Zafiro-icons.SlackBuild
@@ -63,4 +63,11 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/adapta-gtk-theme/adapta-gtk-theme.SlackBuild b/desktop/adapta-gtk-theme/adapta-gtk-theme.SlackBuild
index 33b7b3b4dc..15e5724450 100644
--- a/desktop/adapta-gtk-theme/adapta-gtk-theme.SlackBuild
+++ b/desktop/adapta-gtk-theme/adapta-gtk-theme.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for adapta-gtk-theme.
 #
 # Copyright 2016-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+#           2020 Jan Filip Chadima <jfch@jagda.eu"
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -21,7 +22,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=adapta-gtk-theme
-VERSION=${VERSION:-3.93.0.280}
+VERSION=${VERSION:-3.95.0.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/adapta-gtk-theme/adapta-gtk-theme.info b/desktop/adapta-gtk-theme/adapta-gtk-theme.info
index a510e9d630..a7f662bc61 100644
--- a/desktop/adapta-gtk-theme/adapta-gtk-theme.info
+++ b/desktop/adapta-gtk-theme/adapta-gtk-theme.info
@@ -1,10 +1,10 @@
 PRGNAM="adapta-gtk-theme"
-VERSION="3.93.0.280"
+VERSION="3.95.0.11"
 HOMEPAGE="https://github.com/adapta-project/adapta-gtk-theme/"
-DOWNLOAD="https://github.com/adapta-project/adapta-gtk-theme/archive/3.93.0.280/adapta-gtk-theme-3.93.0.280.tar.gz"
-MD5SUM="67cd736c2705897cfa7250960e8d37a7"
+DOWNLOAD="https://github.com/adapta-project/adapta-gtk-theme/archive/3.95.0.11/adapta-gtk-theme-3.95.0.11.tar.gz"
+MD5SUM="5608c26b6169a561fc5a714d1230f561"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="murrine sassc inkscape parallel"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
+MAINTAINER="Jan Filip Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/desktop/aero-mouse-theme/README b/desktop/aero-mouse-theme/README
index 6e5587a41f..d6ef65bc1b 100644
--- a/desktop/aero-mouse-theme/README
+++ b/desktop/aero-mouse-theme/README
@@ -4,4 +4,5 @@ Settings in xfce:
 
 echo "Xcursor.theme: aero" >> ~/.Xresources
 
-xfconf-query --channel xsettings --property /Gtk/CursorThemeName --set aero
+xfconf-query --channel xsettings \
+             --property /Gtk/CursorThemeName --set aero
diff --git a/desktop/afterstep/README b/desktop/afterstep/README
index efc0153479..4f97011553 100644
--- a/desktop/afterstep/README
+++ b/desktop/afterstep/README
@@ -1,7 +1,8 @@
-AfterStep is a window manager for the Unix X Window System.
-Originally based on the look and feel of the NeXTStep interface, it 
-provides end users with a consistent, clean, and elegant desktop. The 
-goal of AfterStep development is to provide for flexibility of desktop 
-configuration, improving aestetics, and efficient use of system resources.
-Some of the distinguishing features of AfterStep compared to other window 
-managers are its low usage of resources, stability, and configurability.
+AfterStep is a window manager for the Unix X Window System.  Originally
+based on the look and feel of the NeXTStep interface, it provides
+end users with a consistent, clean, and elegant desktop. The goal
+of AfterStep development is to provide for flexibility of desktop
+configuration, improving aestetics, and efficient use of system
+resources.  Some of the distinguishing features of AfterStep compared
+to other window managers are its low usage of resources, stability,
+and configurability.
diff --git a/desktop/ambiance-radiance-flat-colors-gtk-theme/README b/desktop/ambiance-radiance-flat-colors-gtk-theme/README
index 4aaa469567..bf26de0951 100644
--- a/desktop/ambiance-radiance-flat-colors-gtk-theme/README
+++ b/desktop/ambiance-radiance-flat-colors-gtk-theme/README
@@ -1,7 +1,8 @@
 ambiance-radiance-flat-colors-gtk-theme (gtk theme)
 
-Ambiance & Radiance Flat is a Modern, Beautiful and Vivid Re-imagination
-of the Ambiance & Radiance Color GTK 2/3 Themes. It features a Modern,
-Clean And "Flat" look in your choice of 13 vibrant colors. Despite it's
-name it is a completely new theme. Not just a simple mod of Ambiance. (We
-wish it was that easy. But we redesigned lots of things.)
+Ambiance & Radiance Flat is a Modern, Beautiful and Vivid
+Re-imagination of the Ambiance & Radiance Color GTK 2/3 Themes. It
+features a Modern, Clean And "Flat" look in your choice of 13 vibrant
+colors. Despite it's name it is a completely new theme. Not just a
+simple mod of Ambiance. (We wish it was that easy. But we redesigned
+lots of things.)
diff --git a/desktop/anki/README b/desktop/anki/README
index 81835b3c80..c12fb2faf3 100644
--- a/desktop/anki/README
+++ b/desktop/anki/README
@@ -5,9 +5,10 @@ amount you learn.
 
 Anyone who needs to remember things in their daily life can benefit
 from Anki. Since it is content-agnostic and supports images, audio,
-videos and scientific markup (via LaTeX), the possibilities are endless.
+videos and scientific markup (via LaTeX), the possibilities are
+endless.
 
-For audio recording support PyAudio built against Python 3 (not currently
-available from SlackBuilds) and lame are required. mpv is recommended for
-video play-back, but mplayer (including in Slackware by default) can be used
-instead.
+For audio recording support PyAudio built against Python 3 (not
+currently available from SlackBuilds) and lame are required. mpv is
+recommended for video play-back, but mplayer (including in Slackware by
+default) can be used instead.
diff --git a/desktop/anki/anki.info b/desktop/anki/anki.info
index b96d19c6db..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-PyQt5 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/arc-icon-theme/arc-icon-theme.SlackBuild b/desktop/arc-icon-theme/arc-icon-theme.SlackBuild
index 2f31ea3c97..9b44a7f52d 100644
--- a/desktop/arc-icon-theme/arc-icon-theme.SlackBuild
+++ b/desktop/arc-icon-theme/arc-icon-theme.SlackBuild
@@ -74,4 +74,11 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/areao43-icon-theme/areao43-icon-theme.SlackBuild b/desktop/areao43-icon-theme/areao43-icon-theme.SlackBuild
index 7faaed76c7..54092c5e6b 100644
--- a/desktop/areao43-icon-theme/areao43-icon-theme.SlackBuild
+++ b/desktop/areao43-icon-theme/areao43-icon-theme.SlackBuild
@@ -60,4 +60,11 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
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 03f65affb4..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.9}
+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 4dab0bfae9..e15315819e 100644
--- a/desktop/autorandr/autorandr.info
+++ b/desktop/autorandr/autorandr.info
@@ -1,8 +1,8 @@
 PRGNAM="autorandr"
-VERSION="1.9"
+VERSION="1.11"
 HOMEPAGE="https://github.com/phillipberndt/autorandr"
-DOWNLOAD="https://github.com/phillipberndt/autorandr/archive/1.9/autorandr-1.9.tar.gz"
-MD5SUM="1d953827db3b119d5f3150bb32660ecd"
+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/autorandr/slack-desc b/desktop/autorandr/slack-desc
index 1fd8b86256..198b77388d 100644
--- a/desktop/autorandr/slack-desc
+++ b/desktop/autorandr/slack-desc
@@ -5,15 +5,15 @@
 # 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------------------------------------------------------|
-appname: autorandr (display configuration manager)
-appname:
-appname: Automatically select a display configuration based on connected
-appname: devices.
-appname:
-appname:
-appname:
-appname:
-appname:
-appname:
-appname: https://github.com/phillipberndt/autorandr
+         |-----handy-ruler------------------------------------------------------|
+autorandr: autorandr (display configuration manager)
+autorandr:
+autorandr: Automatically select a display configuration based on connected
+autorandr: devices.
+autorandr:
+autorandr:
+autorandr:
+autorandr:
+autorandr:
+autorandr:
+autorandr: https://github.com/phillipberndt/autorandr
diff --git a/desktop/avant-window-navigator/README b/desktop/avant-window-navigator/README
index 457505aaf3..23c922b134 100644
--- a/desktop/avant-window-navigator/README
+++ b/desktop/avant-window-navigator/README
@@ -4,9 +4,9 @@ Avant Window Navigator is a dock-like bar which sits at the bottom of
 the screen. It has support for launchers, task lists, and third party
 applets.
 
-In order to handle transparencies that this application makes use of, you
-MUST use a composite desktop manager and, of course, enable compositing.
-Both KDE and XFCE from Slackware distro are composite capable.
+In order to handle transparencies that this application makes use
+of, you MUST use a composite desktop manager and, of course, enable
+compositing.  Both KDE and XFCE from Slackware distro are composite
+capable.
 
-NOTE:
-The prefences applet crashes on startup, this is a known issue.
+NOTE: The prefences applet crashes on startup, this is a known issue.
diff --git a/desktop/awesome-appmenu/README b/desktop/awesome-appmenu/README
index ee760e0562..c54898f2cd 100644
--- a/desktop/awesome-appmenu/README
+++ b/desktop/awesome-appmenu/README
@@ -1,8 +1,8 @@
-awesome-appmenu is a tool to create a menu of installed applications for the
-awesome window manager. It searches for and parses .desktop files to create
-a lua script containing the menu, which can then be used in your awesome WM
-configuration script. It supports icons, and the paths to search for launchers
-and icons, as well as the categories used for grouping applications, are
-fully configurable.
+awesome-appmenu is a tool to create a menu of installed applications
+for the awesome window manager. It searches for and parses .desktop
+files to create a lua script containing the menu, which can then be
+used in your awesome WM configuration script. It supports icons, and
+the paths to search for launchers and icons, as well as the categories
+used for grouping applications, are fully configurable.
 
 Homepage: https://github.com/montagdude/awesome-appmenu
diff --git a/desktop/awoken-icon-theme/README b/desktop/awoken-icon-theme/README
index 8b54a230a8..f7f4bd27f0 100644
--- a/desktop/awoken-icon-theme/README
+++ b/desktop/awoken-icon-theme/README
@@ -15,5 +15,5 @@ Furthermore, inside the package there is a customization script that
 gives the possibility to change between:
 
  - 100^3 colors
- - 123 distributor logos (this number is growing according to the requests)
+ - 123 distributor logos (this number is growing according to requests)
  - 46 folder types
diff --git a/desktop/awoken-icon-theme/awoken-icon-theme.SlackBuild b/desktop/awoken-icon-theme/awoken-icon-theme.SlackBuild
index 03f84329b6..c9b1d2a7bd 100644
--- a/desktop/awoken-icon-theme/awoken-icon-theme.SlackBuild
+++ b/desktop/awoken-icon-theme/awoken-icon-theme.SlackBuild
@@ -60,4 +60,15 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
+# The above doesn't handle spaces in filenames. This isn't a general-purpose
+# solution, but special-case for this build:
+sed -i 's,Google ,Google\\ ,g' $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/bashish/README b/desktop/bashish/README
index 4945115118..80bdf1fc4f 100644
--- a/desktop/bashish/README
+++ b/desktop/bashish/README
@@ -12,19 +12,19 @@ Bashish is great for people who:
 * Want a good looking prompt.
 * Want to configure the apperance of the terminal.
 * Want informative titles based on the command arguments.
-* Need different fonts for different applications - eg. Chinese, Japanese, 
-  OEM Terminal fonts.
-* While many of these features would be simple to implement as aliases or
-  shell scripts, the tricky part where Bashish excels is that it does not
-  affect the enviroment noticeably.
+* Need different fonts for different applications - eg. Chinese,
+  Japanese, OEM Terminal fonts.
+* While many of these features would be simple to implement as aliases
+  or shell scripts, the tricky part where Bashish excels is that it
+  does not affect the enviroment noticeably.
 
-As an example, Bashish provides themes even if the themed application is run 
-in a pipe, this without affecting the pipe at all.
+As an example, Bashish provides themes even if the themed application
+is run in a pipe, this without affecting the pipe at all.
 
 Additionally there is no need to rewrite your aliases or functions since
 Bashish provides theming through shell script wrappers.
 
-To enable Bashish, simply run " bashish ", press ENTER key and hit Ctrl+C
+To enable Bashish, simply run "bashish ", press ENTER key and hit Ctrl+C
 to quit.
 
 To choose another theme, see the theme list with "bashish list" and to
diff --git a/desktop/bmpanel2/README b/desktop/bmpanel2/README
index e7f2a4dea1..f431213a81 100644
--- a/desktop/bmpanel2/README
+++ b/desktop/bmpanel2/README
@@ -1,8 +1,10 @@
 bmpanel2 is a nice NETWM-compatible panel for X11, featuring look and
-feel customization via themes, a bunch of widgets (desktop switcher, 
-taskbar, launchbar, systray, clock, etcetera), pseudo-transparency support,
-small executable size (~80kB), and small memory footprint (about 2-4 MB).
+feel customization via themes, a bunch of widgets (desktop switcher,
+taskbar, launchbar, systray, clock, etcetera), pseudo-transparency
+support, small executable size (~80kB), and small memory footprint
+(about 2-4 MB).
 
 Configuration of bmpanel2 is done via bmpanel2cfg program or by editing
-the ~/.config/bmpanel2/bmpanel2rc file.  Themes can be installed locally
-by placing them in the ~/.local/share/bmpanel2/themes directory.
+the ~/.config/bmpanel2/bmpanel2rc file.  Themes can be installed
+locally by placing them in the ~/.local/share/bmpanel2/themes
+directory.
diff --git a/desktop/boston-icon-theme/boston-icon-theme.SlackBuild b/desktop/boston-icon-theme/boston-icon-theme.SlackBuild
index 800a71b9a4..278060a43c 100644
--- a/desktop/boston-icon-theme/boston-icon-theme.SlackBuild
+++ b/desktop/boston-icon-theme/boston-icon-theme.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for boston-icon-theme
 
-# Copyright 2018 Azure Zanculmarktum <zanculmarktum@gmail.com>
+# Copyright 2018, 2019, 2020 Azure Zanculmarktum <zanculmarktum@gmail.com>
 # 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=boston-icon-theme
-VERSION=${VERSION:-0.1}
+VERSION=${VERSION:-0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=boston_icons_by_diazchris-d98nrpv.zip
-SRCDIR=Boston
+SRCNAM=Boston-Icons-b7a4b17361c4af4c9a440b4d79872e205f40c7db.tar.gz
+SRCDIR=Boston-Icons-b7a4b17361c4af4c9a440b4d79872e205f40c7db
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCDIR
-unzip $CWD/$SRCNAM
+tar xvf $CWD/$SRCNAM
 cd $SRCDIR
 chown -R root:root .
 find -L . \
@@ -73,10 +73,10 @@ find -L . \
    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/icons/Boston
-cp -pR 16x16 22x22 32x32 48x48 scalable index.theme $PKG/usr/share/icons/Boston
+cp -pR 16 48 128 legacy symbolic index.theme $PKG/usr/share/icons/Boston
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -p CHANGELOG LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -p CHANGELOG COPYING LICENSE PATRONS.md README README.md 'THIRD PARTY' $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/boston-icon-theme/boston-icon-theme.info b/desktop/boston-icon-theme/boston-icon-theme.info
index a4895777a6..f8819e93a4 100644
--- a/desktop/boston-icon-theme/boston-icon-theme.info
+++ b/desktop/boston-icon-theme/boston-icon-theme.info
@@ -1,8 +1,8 @@
 PRGNAM="boston-icon-theme"
-VERSION="0.1"
-HOMEPAGE="https://diazchris.deviantart.com/art/Boston-Icons-558741523"
-DOWNLOAD="https://orig00.deviantart.net/6c41/f/2016/322/0/3/boston_icons_by_diazchris-d98nrpv.zip"
-MD5SUM="371f31d0e254e45c0e9e8f8cb2747fbf"
+VERSION="0.6"
+HOMEPAGE="https://github.com/heychrisd/Boston-Icons"
+DOWNLOAD="https://github.com/heychrisd/Boston-Icons/archive/b7a4b17361c4af4c9a440b4d79872e205f40c7db/Boston-Icons-b7a4b17361c4af4c9a440b4d79872e205f40c7db.tar.gz"
+MD5SUM="945037696a09e1d2558f00f15079193c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/breath-gtk-theme/README b/desktop/breath-gtk-theme/README
new file mode 100644
index 0000000000..3c1cd2f588
--- /dev/null
+++ b/desktop/breath-gtk-theme/README
@@ -0,0 +1,2 @@
+Breath is a previous default GTK theme for Manjaro Linux. 
+It is forked from the Breeze GTK theme.
diff --git a/desktop/breath-gtk-theme/breath-gtk-theme.SlackBuild b/desktop/breath-gtk-theme/breath-gtk-theme.SlackBuild
new file mode 100644
index 0000000000..9eeeb58bf8
--- /dev/null
+++ b/desktop/breath-gtk-theme/breath-gtk-theme.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for breath-gtk-theme
+
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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=breath-gtk-theme
+VERSION=${VERSION:-da2706640f457f89de6c26312e391b244ff550b4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=breath-gtk
+
+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/$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  cmake -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \
+        -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+	-DKDE_INSTALL_USE_QT_SYS_PATHS=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 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/desktop/breath-gtk-theme/breath-gtk-theme.info b/desktop/breath-gtk-theme/breath-gtk-theme.info
new file mode 100644
index 0000000000..1630ee7be8
--- /dev/null
+++ b/desktop/breath-gtk-theme/breath-gtk-theme.info
@@ -0,0 +1,10 @@
+PRGNAM="breath-gtk-theme"
+VERSION="da2706640f457f89de6c26312e391b244ff550b4"
+HOMEPAGE="https://gitlab.manjaro.org/artwork/themes/breath-gtk"
+DOWNLOAD="https://gitlab.manjaro.org/artwork/themes/breath-gtk/-/archive/da2706640f457f89de6c26312e391b244ff550b4.tar.gz"
+MD5SUM="a0d510c87a9675d463190075294a08c6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="extra-cmake-modules qt5"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/desktop/breath-gtk-theme/slack-desc b/desktop/breath-gtk-theme/slack-desc
new file mode 100644
index 0000000000..d42c80db6c
--- /dev/null
+++ b/desktop/breath-gtk-theme/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------------------------------------------------------|
+breath-gtk-theme: breath-gtk-theme (Theme for Manjaro Linux)
+breath-gtk-theme:
+breath-gtk-theme: Breath is a previous default GTK theme for Manjaro Linux.
+breath-gtk-theme: It is forked from the Breeze GTK theme.
+breath-gtk-theme:
+breath-gtk-theme:
+breath-gtk-theme:
+breath-gtk-theme:
+breath-gtk-theme:
+breath-gtk-theme:
+breath-gtk-theme:
diff --git a/desktop/buku/buku.SlackBuild b/desktop/buku/buku.SlackBuild
index 054fb385e9..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.3}
+VERSION=${VERSION:-4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/buku/buku.info b/desktop/buku/buku.info
index a26761afb0..f5ff78da4b 100644
--- a/desktop/buku/buku.info
+++ b/desktop/buku/buku.info
@@ -1,10 +1,10 @@
 PRGNAM="buku"
-VERSION="4.3"
+VERSION="4.5"
 HOMEPAGE="https://github.com/jarun/buku"
-DOWNLOAD="https://github.com/jarun/buku/archive/v4.3/buku-4.3.tar.gz"
-MD5SUM="eba8cbd7d31fb2cf0e25c1c8aa7661e3"
+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/README b/desktop/bukubrow/README
index 301563d64f..7f78b10ce8 100644
--- a/desktop/bukubrow/README
+++ b/desktop/bukubrow/README
@@ -1,3 +1,3 @@
 bukubrow - Bukubrow is a WebExtension for Buku, a command-line bookmark
-manager. This is the corresponding host that facilitates interfacing with
-the Buku database via native messaging.
+manager. This is the corresponding host that facilitates interfacing
+with the Buku database via native messaging.
diff --git a/desktop/bukubrow/bukubrow.SlackBuild b/desktop/bukubrow/bukubrow.SlackBuild
index c657e3ffdb..bc663b30dc 100644
--- a/desktop/bukubrow/bukubrow.SlackBuild
+++ b/desktop/bukubrow/bukubrow.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bukubrow
 
-# Copyright 2019 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.0.0}
+VERSION=${VERSION:-5.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -120,7 +120,7 @@ mkdir vendor
       sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
diff --git a/desktop/bukubrow/bukubrow.info b/desktop/bukubrow/bukubrow.info
index 35b0bf66da..ec839c21d5 100644
--- a/desktop/bukubrow/bukubrow.info
+++ b/desktop/bukubrow/bukubrow.info
@@ -1,128 +1,154 @@
 PRGNAM="bukubrow"
-VERSION="5.0.0"
+VERSION="5.2.0"
 HOMEPAGE="https://github.com/SamHH/bukubrow-host"
-DOWNLOAD="https://github.com/SamHH/bukubrow-host/archive/v5.0.0/bukubrow-host-5.0.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/dirs-1.0.5.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 \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fallible-iterator/fallible-iterator-0.1.6.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.13.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.17.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="877e7b395b94e1e2d6e01f8a5d85b4f9 \
-        294a49d3c53865fa7ac5d0ce2f5d5735 \
-        e1efb9a37395a38bd80ccfc911d4a6e8 \
-        46a048c0b8b765bcbdc131e166410510 \
-        5d7155b7fbc0e234c017f418f0dc9d64 \
-        ba6e371a9a197673d52165be88cc3b64 \
-        9589900bcef3f72593483ce5b717fe3c \
-        e5767560aad375059c975285c07022c0 \
-        027635e453eccbfd0a2b02a440e334a6 \
-        e5ff029879cdacd29148cd31da1f0564 \
-        47b86728f2d479bd97148b8da4497027 \
-        097e0d2392a5e65f9471f7af7001940a \
-        135f6d6306e50606f0475ada50c33ce2 \
-        1c8b50f8528dd37df7d984e0e4b61bd5 \
-        701334c674b3fc3ace74045e3a2fae50 \
-        f9f233221c0202b616d6957925c41ac8 \
-        6d780ab18da07be9ed423e7edfbcfd7e \
-        e8e663e88ee02ec47cfb984382cb62ae \
-        da9e0ce1dde4cf138247a142a1342aa8 \
+          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 \
-        d98fb138c4ceda8120332e757c8f65ab \
-        42f81584165177e35c3ab677fe5a3c72 \
-        d281b59288f72c10056097b190d0144e \
-        514a89ff59a9bf0671d7db4812725459 \
-        8a39d8bd95f15af0840d2049f0e78a37 \
-        bbda7e9c572f651774dfdb0006b9f085 \
-        87a9d36f5ebe5eae0c3e8d69d58752e1 \
-        ec258ed7b78c959a921262150d47e001 \
-        0fb98687d43d7ffd5c1aa097a076f1e6 \
-        8cab41822d03dfa674870315308fa392 \
-        7058895bdca83bbda052d66b087f902e \
-        5acfdc8656212bce8df1bcc43db34c3d \
-        c8d655d206cbe48b84a22544d6fc6d15 \
-        7e94bf91e9faf1557da812a3444f23cc \
-        01cb5402c0fd99cebac702b76f2f2669 \
-        d5a91ba6d74914190df5b355f891d6b1 \
-        f02a29bfffacbf545c84f2fc40581b7c \
-        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/cairo-compmgr/README b/desktop/cairo-compmgr/README
index c1252bd208..2651ddef40 100644
--- a/desktop/cairo-compmgr/README
+++ b/desktop/cairo-compmgr/README
@@ -1,14 +1,15 @@
 cairo-compmgr (Drop-in replacement for xcompmgr)
 
-This composite manager uses the cairo library to provide similar effects to
-xcompmgr.  You can use it with any window manager, such as fluxbox, to
-provide transparencies.  xcompmgr was designed as an example program and 
-cairo-compmgr is designed as an actual standalone composite manager.
+This composite manager uses the cairo library to provide similar
+effects to xcompmgr.  You can use it with any window manager, such
+as fluxbox, to provide transparencies.  xcompmgr was designed as an
+example program and cairo-compmgr is designed as an actual standalone
+composite manager.
 
-Warning: this plays a bit weird with fluxbox.  Tabs of grouped windows will
-be drawn under windows if cycling through with alt+tab.  Additionally when a
-sub sub root menu loops back over it self, it will be drawn under the other
-menus.  Other than that, it's an added improvement in visual effects over
-xcompmgr.
+Warning: this plays a bit weird with fluxbox.  Tabs of grouped
+windows will be drawn under windows if cycling through with alt+tab.
+Additionally when a sub sub root menu loops back over it self, it
+will be drawn under the other menus.  Other than that, it's an added
+improvement in visual effects over xcompmgr.
 
 libgtop is an optional dependency.
diff --git a/desktop/clearlooks-phenix-theme/README b/desktop/clearlooks-phenix-theme/README
index 39c950ad19..ab32cac916 100644
--- a/desktop/clearlooks-phenix-theme/README
+++ b/desktop/clearlooks-phenix-theme/README
@@ -1,3 +1,4 @@
-The Clearlooks-Phenix project (formerly known as Clearwaita) aims at creating
-a GTK3 port of Clearlooks, the default theme for Gnome 2.  Style is also
-included for GTK2, Unity and for Metacity, Openbox, and Xfwm4 window managers.
+The Clearlooks-Phenix project (formerly known as Clearwaita) aims at
+creating a GTK3 port of Clearlooks, the default theme for Gnome 2.
+Style is also included for GTK2, Unity and for Metacity, Openbox, and
+Xfwm4 window managers.
diff --git a/desktop/clipmenu/README b/desktop/clipmenu/README
new file mode 100644
index 0000000000..575d13a31e
--- /dev/null
+++ b/desktop/clipmenu/README
@@ -0,0 +1,19 @@
+clipmenu (clipboard management using dmenu)
+
+clipmenu is a simple clipboard manager using dmenu (or rofi with
+CM_LAUNCHER=rofi) and xsel.
+
+This build includes clipnotify, since it's used only by clipmenu.
+
+After installing the package, start clipmenud from your ~/.xinitrc,
+before the line that executes your window manager:
+
+  clipmenud &>/dev/null &
+
+While clipmenud is running, the clipmenu command will bring up a
+dmenu where you can select previously-copied text. If you want to
+bind this command to a keystroke, xbindkeys is highly recommended. In
+~/.xbindkeysrc, use something like:
+
+"clipmenu &"
+  Control+Alt + C
diff --git a/desktop/clipmenu/clipmenu.SlackBuild b/desktop/clipmenu/clipmenu.SlackBuild
new file mode 100644
index 0000000000..b87666bdb1
--- /dev/null
+++ b/desktop/clipmenu/clipmenu.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for clipmenu
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# 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.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+# second tarball, I see no reason to make this a separate build.
+PRGNAM2=clipnotify
+VERSION2=${VERSION2:-1.0.2}
+
+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
+
+# extract both tarballs into our own top-level dir, for ease of cleanup.
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+mkdir -p $PRGNAM
+cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM2-$VERSION2
+tar xvf $CWD/$PRGNAM2-$VERSION2.tar.gz
+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 {} \+
+
+# No compiled code in clipmenu (shell scripts only). Hardcoded paths in
+# Makefile, just bung them in /usr/bin
+cd $PRGNAM-$VERSION
+mkdir -p $PKG/usr/bin
+install -m0755 clipmenu clipmenud clipdel clipctl $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Compiled code in clipnotify stops this from being a noarch package.
+cd $TMP/$PRGNAM/$PRGNAM2-$VERSION2
+make CFLAGS="$SLKCFLAGS"
+mkdir -p $PKG/usr/bin
+install -s -m0755 -oroot -groot $PRGNAM2 $PKG/usr/bin
+
+# Include clipnotify's docs, such as they are
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM2-$VERSION2
+cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM2-$VERSION2
+
+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/clipmenu/clipmenu.info b/desktop/clipmenu/clipmenu.info
new file mode 100644
index 0000000000..06e0cf6450
--- /dev/null
+++ b/desktop/clipmenu/clipmenu.info
@@ -0,0 +1,12 @@
+PRGNAM="clipmenu"
+VERSION="6.2.0"
+HOMEPAGE="https://github.com/cdown/clipmenu/"
+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="ce5284e0ec3f256ffd30d4934e9cdb64 \
+        fd384b9a04576fd55687faf289c3f31a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="xsel dmenu"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/desktop/clipmenu/slack-desc b/desktop/clipmenu/slack-desc
new file mode 100644
index 0000000000..18b5937827
--- /dev/null
+++ b/desktop/clipmenu/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------------------------------------------------------|
+clipmenu: clipmenu (clipboard management using dmenu)
+clipmenu:
+clipmenu: clipmenu is a simple clipboard manager using dmenu (or rofi with
+clipmenu: CM_LAUNCHER=rofi) and xsel.
+clipmenu:
+clipmenu:
+clipmenu:
+clipmenu:
+clipmenu:
+clipmenu:
+clipmenu:
diff --git a/desktop/cmatrix/README b/desktop/cmatrix/README
index fc227d6a04..2742896931 100644
--- a/desktop/cmatrix/README
+++ b/desktop/cmatrix/README
@@ -1,7 +1,7 @@
 cmatrix - console Matrix screensaver
 
-cmatrix creates a ncurses-based scrolling Matrix screen.  The speed, color, 
-scroll mode, and more can be adjusted.  An optional custom Matrix font is 
-included.
+cmatrix creates a ncurses-based scrolling Matrix screen.  The speed,
+color, scroll mode, and more can be adjusted.  An optional custom
+Matrix font is included.
 
 This is an excellent alternative to the stock worms and rain programs.
diff --git a/desktop/compiz-boxmenu/README b/desktop/compiz-boxmenu/README
index 5bed5d1b3d..21326d4b89 100644
--- a/desktop/compiz-boxmenu/README
+++ b/desktop/compiz-boxmenu/README
@@ -1,2 +1,2 @@
-Compiz Boxmenu is a desktop menu for Compiz. It introduces extensive icon
-support, pipeitems, recent document lists, and more!
+Compiz Boxmenu is a desktop menu for Compiz. It introduces extensive
+icon support, pipeitems, recent document lists, and more!
diff --git a/desktop/conky-manager/README b/desktop/conky-manager/README
index abfb081aaa..f7a3b3ca39 100644
--- a/desktop/conky-manager/README
+++ b/desktop/conky-manager/README
@@ -1,5 +1,5 @@
 conky-manager (Conky front-end)
 
 Conky Manager is a graphical front-end for managing Conky config files.
-It provides options to start/stop, browse and edit Conky themes installed
-on the system.
+It provides options to start/stop, browse and edit Conky themes
+installed on the system.
diff --git a/desktop/crystal/README b/desktop/crystal/README
index e1524a6868..b02a6d4b41 100644
--- a/desktop/crystal/README
+++ b/desktop/crystal/README
@@ -1,5 +1,6 @@
-Crystal is a kwin window decoration theme which offers you (pseudo) transparent
-titlebar, buttons and borders.  It also has some little usuability enhancements.
+Crystal is a kwin window decoration theme which offers you (pseudo)
+transparent titlebar, buttons and borders.  It also has some little
+usuability enhancements.
 
 Main features:
 * The style grabs your wallpaper and uses it as the deco background. 
diff --git a/desktop/crystalcursors/README b/desktop/crystalcursors/README
index 817b916e06..5d9a4faba6 100644
--- a/desktop/crystalcursors/README
+++ b/desktop/crystalcursors/README
@@ -17,5 +17,5 @@ we move that index.theme file to the documentation directory as:
 If you want to use it as the default, then you can manually create the 
 /usr/share/icons/default directory and restore the file to its original 
 name in that directory.  Alternatively, you could set the cursor theme 
-with your window manager (which is probably the best option if your window 
-manager supports it).
+with your window manager (which is probably the best option if your
+window manager supports it).
diff --git a/desktop/ctwm/README b/desktop/ctwm/README
index 15e4115493..92a45d58c1 100644
--- a/desktop/ctwm/README
+++ b/desktop/ctwm/README
@@ -2,8 +2,9 @@ CTWM is an extension to twm, originally written by Claude Lecommandeur
 that support multiple virtual screens, and a lot of other goodies.
 
 You can use and manage up to 32 virtual screens called workspaces.
-You swap from one workspace to another by clicking on a button in an
-optional panel of buttons (the workspace manager) or by invoking a function.
+You swap from one workspace to another by clicking on a button in
+an optional panel of buttons (the workspace manager) or by invoking
+a function.
 
 You can custom each workspace by choosing different colors, names
 and pixmaps for the buttons and background root windows.
diff --git a/desktop/cwm-openbsd/README b/desktop/cwm-openbsd/README
index a617254acc..df4b3bf47c 100644
--- a/desktop/cwm-openbsd/README
+++ b/desktop/cwm-openbsd/README
@@ -1,4 +1,5 @@
 cwm-openbsd (Portable version of the OpenBSD cwm window manager).
 
-cwm-openbsd is a window manager for X11 which contains many features that
-concentrate on the efficiency and transparency of window management.
+cwm-openbsd is a window manager for X11 which contains many features
+that concentrate on the efficiency and transparency of window
+management.
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/dbgl-legacy/README b/desktop/dbgl-legacy/README
new file mode 100644
index 0000000000..922338aca1
--- /dev/null
+++ b/desktop/dbgl-legacy/README
@@ -0,0 +1,13 @@
+DBGL serves as a frontend / Graphical User Interface to DOSBox
+(configuration). It tries to make creating DOSBox configuration files
+a little easier by offering a (relatively) simple interface, some
+shortcuts and a little bit of intelligence (DOSBox behavior).
+Once your DOS games are configured in DBGL, it's very easy to setup or
+start them, or alter their configuration or associated DOSBox version.
+
+Notes:
+1. this works with both 'dosbox' and 'dosbox-dev' packages available at
+   SBo, at least one of them must be installed.
+2. this legacy version is the last one that supports 32-bits
+   architecture, if you don't need that you may install package 'dbgl'
+   instead
diff --git a/desktop/dbgl-legacy/dbgl-legacy.SlackBuild b/desktop/dbgl-legacy/dbgl-legacy.SlackBuild
new file mode 100644
index 0000000000..1576122b1d
--- /dev/null
+++ b/desktop/dbgl-legacy/dbgl-legacy.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware build script for dbgl-legacy
+
+# Copyright 2020 Leonardo Citrolo, Italy
+# 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=dbgl-legacy
+VERSION=${VERSION:-0.83}
+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) ;;
+  x86_64) ;;
+       *) echo "$ARCH architecture 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
+tar xvf $CWD/dbgl${VERSION//./}_generic.tar.gz
+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/{dbgl,applications} \
+  $PKG/usr/bin
+cp -a lib templates xsl dbgl dbgl.jar dbgl.png \
+  $PKG/usr/share/dbgl
+
+# Remove unnecessary Arch-related stuff
+if [ "$ARCH" = "x86_64" ]; then
+    rm -f $PKG/usr/share/dbgl/lib/swtlin32.jar
+else
+    rm -f $PKG/usr/share/dbgl/lib/swtlin64.jar
+fi
+
+# Create destop entry
+cat > $PKG/usr/share/applications/dbgl.desktop <<EOF
+[Desktop Entry]
+Type=Application
+Name=DBGL
+GenericName=DOSBox Game Launcher
+Comment=DOSBox Game Launcher
+Icon=/usr/share/dbgl/dbgl.png
+Exec=dbgl
+Path=/usr/share/dbgl
+Categories=Game;
+EOF
+
+# Create launcher
+cat > $PKG/usr/bin/dbgl << EOF
+#!/bin/sh
+
+/usr/share/dbgl/dbgl
+
+EOF
+chmod 755 $PKG/usr/bin/dbgl
+
+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
+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/dbgl-legacy/dbgl-legacy.info b/desktop/dbgl-legacy/dbgl-legacy.info
new file mode 100644
index 0000000000..17285d257c
--- /dev/null
+++ b/desktop/dbgl-legacy/dbgl-legacy.info
@@ -0,0 +1,10 @@
+PRGNAM="dbgl-legacy"
+VERSION="0.83"
+HOMEPAGE="http://members.quicknet.nl/blankendaalr/dbgl/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/dbgl083_generic.tar.gz"
+MD5SUM="89f609cf415f8f64de98407a2084629c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="dosbox openjdk8"
+MAINTAINER="Leo C."
+EMAIL="leoc@gmx.com"
diff --git a/desktop/dbgl-legacy/doinst.sh b/desktop/dbgl-legacy/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/desktop/dbgl-legacy/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/desktop/dbgl-legacy/slack-desc b/desktop/dbgl-legacy/slack-desc
new file mode 100644
index 0000000000..087a4dba4f
--- /dev/null
+++ b/desktop/dbgl-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------------------------------------------------------|
+dbgl-legacy: dbgl-legacy (a Java frontend for DOSBox)
+dbgl-legacy:
+dbgl-legacy: dbgl-legacy serves as a frontend / Graphical User Interface to DOSBox
+dbgl-legacy: (configuration). It tries to make creating DOSBox configuration files
+dbgl-legacy: a little easier by offering a (relatively) simple interface, some
+dbgl-legacy: shortcuts and a little bit of intelligence (DOSBox behavior).
+dbgl-legacy: Once your DOS games are configured in dbgl, it's very easy to setup or
+dbgl-legacy: start them, or alter their configuration or associated DOSBox version.
+dbgl-legacy:
+dbgl-legacy: This legacy version in the last one that supports 32-bits architecture
+dbgl-legacy: Homepage: http://members.quicknet.nl/blankendaalr/dbgl/
diff --git a/desktop/dbgl/README b/desktop/dbgl/README
index 60db979399..c824bd3dd8 100644
--- a/desktop/dbgl/README
+++ b/desktop/dbgl/README
@@ -2,8 +2,11 @@ DBGL serves as a frontend / Graphical User Interface to DOSBox
 (configuration). It tries to make creating DOSBox configuration files
 a little easier by offering a (relatively) simple interface, some
 shortcuts and a little bit of intelligence (DOSBox behavior).
-Once your DOS games are configured in DBGL, its very easy to setup or
+Once your DOS games are configured in DBGL, it's very easy to setup or
 start them, or alter their configuration or associated DOSBox version.
 
-Note: this works with both 'dosbox' and 'dosbox-dev' packages available
-      at SBo, at least one of them must be installed.
+Notes:
+1. this works with both 'dosbox' and 'dosbox-dev' packages available at
+   SBo, at least one of them must be installed.
+2. starting from version 0.90, dbgl supports 64-bits architecture only;
+   if you need 32-bits you should install package 'dbgl-legacy' instead.
diff --git a/desktop/dbgl/dbgl.SlackBuild b/desktop/dbgl/dbgl.SlackBuild
index b61b93fb17..2d184bfbae 100644
--- a/desktop/dbgl/dbgl.SlackBuild
+++ b/desktop/dbgl/dbgl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for dbgl
 
-# Copyright 2018 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,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dbgl
-VERSION=${VERSION:-0.82}
+VERSION=${VERSION:-0.92}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,7 +41,6 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 case "$ARCH" in
-    i?86) ;;
   x86_64) ;;
        *) echo "$ARCH architecture is not supported"; exit 1 ;;
 esac
@@ -54,7 +53,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM${VERSION//./}_generic.tar.gz
+tar xvf $CWD/$PRGNAM${VERSION//./}.tar.gz
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,16 +63,9 @@ find -L . \
 
 mkdir -p $PKG/usr/share/{$PRGNAM,applications} \
   $PKG/usr/bin
-cp -a lib templates xsl $PRGNAM $PRGNAM.jar $PRGNAM.png \
+cp -a db lib templates xsl $PRGNAM $PRGNAM.jar $PRGNAM.png \
   $PKG/usr/share/$PRGNAM
 
-# Remove unnecessary Arch-related stuff
-if [ "$ARCH" = "x86_64" ]; then
-    rm -f $PKG/usr/share/$PRGNAM/lib/swtlin32.jar
-else
-    rm -f $PKG/usr/share/$PRGNAM/lib/swtlin64.jar
-fi
-
 # Create destop entry
 cat > $PKG/usr/share/applications/$PRGNAM.desktop <<EOF
 [Desktop Entry]
diff --git a/desktop/dbgl/dbgl.info b/desktop/dbgl/dbgl.info
index 20fef6d1a3..67a2c00d50 100644
--- a/desktop/dbgl/dbgl.info
+++ b/desktop/dbgl/dbgl.info
@@ -1,10 +1,10 @@
 PRGNAM="dbgl"
-VERSION="0.82"
+VERSION="0.92"
 HOMEPAGE="http://members.quicknet.nl/blankendaalr/dbgl/"
-DOWNLOAD="http://members.quicknet.nl/blankendaalr/dbgl/download/dbgl082_generic.tar.gz"
-MD5SUM="70a9ab95e48687f0ec4593a750b7e755"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="dosbox openjdk7"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="http://members.quicknet.nl/blankendaalr/dbgl/download/dbgl092.tar.gz"
+MD5SUM_x86_64="d1eed3dc1694f1aa3186ff54104d8bd5"
+REQUIRES="dosbox openjdk8"
 MAINTAINER="Leo C."
 EMAIL="leoc@gmx.com"
diff --git a/desktop/dbgl/slack-desc b/desktop/dbgl/slack-desc
index 8a258c6e7b..ae74d71b9a 100644
--- a/desktop/dbgl/slack-desc
+++ b/desktop/dbgl/slack-desc
@@ -12,8 +12,8 @@ dbgl: DBGL serves as a frontend / Graphical User Interface to DOSBox
 dbgl: (configuration). It tries to make creating DOSBox configuration files
 dbgl: a little easier by offering a (relatively) simple interface, some
 dbgl: shortcuts and a little bit of intelligence (DOSBox behavior).
-dbgl: Once your DOS games are configured in DBGL, its very easy to setup or
+dbgl: Once your DOS games are configured in DBGL, it's very easy to setup or
 dbgl: start them, or alter their configuration or associated DOSBox version.
 dbgl:
+dbgl: This supports 64-bits architecture only.
 dbgl: Homepage: http://members.quicknet.nl/blankendaalr/dbgl/
-dbgl:
diff --git a/desktop/devilspie/README b/desktop/devilspie/README
index 749ec9d222..bd3563e9f0 100644
--- a/desktop/devilspie/README
+++ b/desktop/devilspie/README
@@ -1,7 +1,7 @@
 Devil's Pie - A window-matching utility
 
-Devil's Pie can be configured to detect windows as they are created, and 
-match the window to a set of rules. If the window matches the rules, it 
-can perform a series of actions on that window.
+Devil's Pie can be configured to detect windows as they are created,
+and match the window to a set of rules. If the window matches the
+rules, it can perform a series of actions on that window.
 
 Please see the README for more information and examples of use.
diff --git a/desktop/dmenu/README b/desktop/dmenu/README
index 7d645f282c..13da1b346b 100644
--- a/desktop/dmenu/README
+++ b/desktop/dmenu/README
@@ -2,5 +2,5 @@ dmenu - dynamic menu
 
 dmenu is a generic and efficient menu for X.
 
-Note: dmenu now includes a tiny utility called stest that is used to filter
-files.  See its man page for details.
+Note: dmenu now includes a tiny utility called stest that is used to
+filter files.  See its man page for details.
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.SlackBuild b/desktop/dmenu2/dmenu2.SlackBuild
deleted file mode 100644
index 4f1de8103b..0000000000
--- a/desktop/dmenu2/dmenu2.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2014, Simon Bolokanov, 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.
-
-# Симон Болоканов <sbolokanov@abv.bg>
-# dmenu2 v0.2 - init script - 14.09.2014
-
-PRGNAM=dmenu2
-VERSION=${VERSION:-0.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/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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 {} \;
-
-# 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
-
-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
-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/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/draco/README b/desktop/draco/README
index 0a637e956c..843a1ae326 100644
--- a/desktop/draco/README
+++ b/desktop/draco/README
@@ -1,4 +1,5 @@
-Draco is a simple and lightweight desktop environment for Slackware Linux.
-While small still features XDG integration, freedesktop services and integration,
-power and storage management, desktop, panels, multi-monitor support
-and much more. Draco does not include any user applications.
+Draco is a simple and lightweight desktop environment for Slackware
+Linux.  While small still features XDG integration, freedesktop
+services and integration, power and storage management, desktop,
+panels, multi-monitor support and much more. Draco does not include any
+user applications.
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 bf9a9f5acb..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.4.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.5.0}
+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"
@@ -64,7 +58,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -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 c236fb4023..39b0e93474 100644
--- a/desktop/dunst/dunst.info
+++ b/desktop/dunst/dunst.info
@@ -1,10 +1,10 @@
 PRGNAM="dunst"
-VERSION="1.4.1"
+VERSION="1.5.0"
 HOMEPAGE="https://dunst-project.org/"
-DOWNLOAD="https://github.com/dunst-project/dunst/archive/v1.4.1/dunst-1.4.1.tar.gz"
-MD5SUM="ea22e152ae40a1fc8e0e4da5b762ad20"
+DOWNLOAD="https://github.com/dunst-project/dunst/archive/v1.5.0/dunst-1.5.0.tar.gz"
+MD5SUM="e42e7a53741066b137dcb92bb8c22020"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Симонъ С. Болокановъ"
+MAINTAINER="S. S. Bolokanar"
 EMAIL="sbolokanov@abv.bg"
diff --git a/desktop/dzen2/README b/desktop/dzen2/README
index b720a0f5e3..f9ec98482f 100644
--- a/desktop/dzen2/README
+++ b/desktop/dzen2/README
@@ -1,7 +1,10 @@
-Dzen is a general purpose messaging, notification, and menuing application.
+Dzen is a general purpose messaging, notification, and menuing
+application.
 
-Visit the Wiki at http://dzen.geekmode.org/dwiki/doku.php?id=dzen:mainindex
-in order to find scripts and icon packs.
+Visit the Wiki at:
+http://dzen.geekmode.org/dwiki/doku.php?id=dzen:mainindex
+in order to find scripts and icon packs [Note: site is down as of
+2020-08-12].
 
 Modify the SlackBuild if you want XPM and/or Xinerama support.  They
 are disabled by default.
diff --git a/desktop/e16.theme.pack/README b/desktop/e16.theme.pack/README
index ca43c665d8..a384875911 100644
--- a/desktop/e16.theme.pack/README
+++ b/desktop/e16.theme.pack/README
@@ -1,22 +1,22 @@
 Theme Pack for e16, Eterm, audacious, and gkrellm2. If you have any one
-of these applications installed, this will install themes for the
-ones you have installed.
+of these applications installed, this will install themes for the ones
+you have installed.
 
-They go along with your e16 current theme for those applications as well.
-Not all e16 themes, but most of them.
+They go along with your e16 current theme for those applications as
+well.  Not all e16 themes, but most of them.
 
 audacious and gkrellm2 you have to change manually to match e16.
 
 For gkrellm2, the plugins on my slack. They are installed in
-/usr/lib64/gkrellm2, but themes do not work in that directory.
-So, if you have that installed in /usr/lib64/ then it will put the
-themes in /usr/share/gkrellm2/themes, or not at all.
+/usr/lib64/gkrellm2, but themes do not work in that directory.  So, if
+you have that installed in /usr/lib64/ then it will put the themes in
+/usr/share/gkrellm2/themes, or not at all.
 
 If these applicaions are not installed at the time you run this, they
 will not be installed, if you install the applications later, then
 you'll have to run this slackbuild again to get them installed.
 
-The applications, at least one of them have to be installed
-in order for this to install anything.
+The applications, at least one of them have to be installed in order
+for this to install anything.
 
 1.0.3 added plugins for gkrellm2
diff --git a/desktop/e16/README b/desktop/e16/README
index 66e6474b8d..05b3864251 100644
--- a/desktop/e16/README
+++ b/desktop/e16/README
@@ -1,14 +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.
+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 menu-editing packages.
+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
+menu-editing packages.
diff --git a/desktop/e16/e16.SlackBuild b/desktop/e16/e16.SlackBuild
index cfff8afa29..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 . \
diff --git a/desktop/e16/e16.info b/desktop/e16/e16.info
index 54de2ab155..8f67add2c9 100644
--- a/desktop/e16/e16.info
+++ b/desktop/e16/e16.info
@@ -1,10 +1,10 @@
 PRGNAM="e16"
-VERSION="1.0.19"
+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/emerald/README b/desktop/emerald/README
index 96427bd26a..e303166af1 100644
--- a/desktop/emerald/README
+++ b/desktop/emerald/README
@@ -1,6 +1,6 @@
-The Emerald Window Decorator is a custom window decorator shipped with Compiz
-Fusion that allows for theming and full composite window decorations with the
-use of engines.
+The Emerald Window Decorator is a custom window decorator shipped
+with Compiz Fusion that allows for theming and full composite window
+decorations with the use of engines.
 
 PLEASE read the README.Slackware file BEFORE you install any of the
 compiz packages.  The install order is listed below but there are
diff --git a/desktop/enlightenment/enlightenment.SlackBuild b/desktop/enlightenment/enlightenment.SlackBuild
index 5a1b7bb3a2..2c440a7157 100644
--- a/desktop/enlightenment/enlightenment.SlackBuild
+++ b/desktop/enlightenment/enlightenment.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
+
 # Slackware build script for Enlightenment
-# Copyright 2018 Erik Falor <ewfalor@gmail.com>, Logan, Utah, USA
-# All rights reserved.
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Erik Falor | Logan, UT, USA | ewfalor@gmail.com | August 2020
+
+# Previously by Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
 # Originally by Aleksandar Samardzic <asamardzic@gmail.com>
 
 # This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=enlightenment
-VERSION=${VERSION:-0.22.4}
+VERSION=${VERSION:-0.24.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,6 +58,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="AUTHORS COPYING INSTALL NEWS README TODO"
+
 set -e
 
 rm -rf $PKG
@@ -72,19 +75,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 {} \;
 
+meson . build \
+	--prefix=/usr/ \
+	--libdir=/usr/lib${LIBDIRSUFFIX} \
+	-Dsystemd=false \
+	-Dpam=false \
+	-Dbuild-id=$ARCH-slackware-linux
+
 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
+ninja -C build -v
+
+DESTDIR=$PKG ninja -C build install
 
 # Don't clobber config files on upgrade
 mv $PKG/etc/enlightenment/sysactions.conf $PKG/etc/enlightenment/sysactions.conf.new
@@ -93,12 +95,13 @@ mv $PKG/etc/xdg/menus/e-applications.menu $PKG/etc/xdg/menus/e-applications.menu
 # Handle the xinitrc file
 mkdir -p $PKG/etc/X11/xinit
 cat $CWD/xinitrc.enlightenment > $PKG/etc/X11/xinit/xinitrc.enlightenment.new
+chmod +x $PKG/etc/X11/xinit/xinitrc.enlightenment.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 AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/enlightenment/enlightenment.info b/desktop/enlightenment/enlightenment.info
index 0bbd48d1aa..cea8213f10 100644
--- a/desktop/enlightenment/enlightenment.info
+++ b/desktop/enlightenment/enlightenment.info
@@ -1,8 +1,8 @@
 PRGNAM="enlightenment"
-VERSION="0.22.4"
+VERSION="0.24.2"
 HOMEPAGE="https://www.enlightenment.org/"
-DOWNLOAD="https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.4.tar.xz"
-MD5SUM="2444a699b4c995eb83c813aa555ca418"
+DOWNLOAD="https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.2.tar.xz"
+MD5SUM="dffeea99a238c7f68b9e73a51fdf8be0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="efl"
diff --git a/desktop/faba-icon-theme/README b/desktop/faba-icon-theme/README
index 5402bf230e..41b0735225 100644
--- a/desktop/faba-icon-theme/README
+++ b/desktop/faba-icon-theme/README
@@ -1,9 +1,11 @@
 faba-icon-theme (gnome icon theme)
 
-Faba is a modern icon theme with Tango influences. It has been
-designed with simplicity and compliance to standards in mind. Faba's
-purpose is serve as a base icon theme to others (such as Moka Icon Theme).
+Faba is a modern icon theme with Tango influences. It has been designed
+with simplicity and compliance to standards in mind. Faba's purpose is
+serve as a base icon theme to others (such as Moka Icon Theme).
 
-It consists only of system icons: folders, mimetypes, toolbar icons, etc.
+It consists only of system icons: folders, mimetypes, toolbar icons,
+etc.
 
-All variations and supplementary themes for Faba, require this base theme.
+All variations and supplementary themes for Faba, require this base
+theme.
diff --git a/desktop/faba-mono-icons/faba-mono-icons.SlackBuild b/desktop/faba-mono-icons/faba-mono-icons.SlackBuild
index 9ef88aa4bb..1cf7fa136e 100644
--- a/desktop/faba-mono-icons/faba-mono-icons.SlackBuild
+++ b/desktop/faba-mono-icons/faba-mono-icons.SlackBuild
@@ -65,4 +65,11 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/faenza-icon-theme/faenza-icon-theme.SlackBuild b/desktop/faenza-icon-theme/faenza-icon-theme.SlackBuild
index 114991a7f3..49c1d9b4e8 100644
--- a/desktop/faenza-icon-theme/faenza-icon-theme.SlackBuild
+++ b/desktop/faenza-icon-theme/faenza-icon-theme.SlackBuild
@@ -83,4 +83,8 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+# 20200407 bkw: decrease build time from 9:43 to 0:24 on my test system.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/faience-icon-theme/faience-icon-theme.SlackBuild b/desktop/faience-icon-theme/faience-icon-theme.SlackBuild
index 54e1fe129d..15d755321d 100644
--- a/desktop/faience-icon-theme/faience-icon-theme.SlackBuild
+++ b/desktop/faience-icon-theme/faience-icon-theme.SlackBuild
@@ -67,4 +67,11 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/fbmenugen/fbmenugen.SlackBuild b/desktop/fbmenugen/fbmenugen.SlackBuild
index 97e6fe70e7..cfc222527d 100644
--- a/desktop/fbmenugen/fbmenugen.SlackBuild
+++ b/desktop/fbmenugen/fbmenugen.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fbmenugen
-VERSION=${VERSION:-0.84}
+VERSION=${VERSION:-0.85}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/fbmenugen/fbmenugen.info b/desktop/fbmenugen/fbmenugen.info
index f762cc9780..26598bd6bb 100644
--- a/desktop/fbmenugen/fbmenugen.info
+++ b/desktop/fbmenugen/fbmenugen.info
@@ -1,8 +1,8 @@
 PRGNAM="fbmenugen"
-VERSION="0.84"
+VERSION="0.85"
 HOMEPAGE="https://github.com/trizen/fbmenugen"
-DOWNLOAD="https://github.com/trizen/fbmenugen/archive/0.84/fbmenugen-0.84.tar.gz"
-MD5SUM="a6bb1254656c4d31b7c7046a3bc0e699"
+DOWNLOAD="https://github.com/trizen/fbmenugen/archive/0.85/fbmenugen-0.85.tar.gz"
+MD5SUM="8c15dd82fa7bef2b7b2a4951e2a7894b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-data-dump perl-linux-desktop-files perl-gtk2 perl-file-desktopentry"
diff --git a/desktop/ffmpegthumbnailer/README b/desktop/ffmpegthumbnailer/README
index 127d8f1bd4..814e96fe45 100644
--- a/desktop/ffmpegthumbnailer/README
+++ b/desktop/ffmpegthumbnailer/README
@@ -1,4 +1,4 @@
-FFmpegthumbnailer is a lightweight video thumbnailer that can be used by file 
-managers to create thumbnails for your video files.  The thumbnailer uses 
-ffmpeg to decode frames from the video files, so supported videoformats 
-depend on the configuration flags of ffmpeg.  
+FFmpegthumbnailer is a lightweight video thumbnailer that can be
+used by file managers to create thumbnails for your video files.
+The thumbnailer uses ffmpeg to decode frames from the video files, so
+supported videoformats depend on the configuration flags of ffmpeg.
diff --git a/desktop/find-cursor/README b/desktop/find-cursor/README
index 73f1e40b00..50dd4914aa 100644
--- a/desktop/find-cursor/README
+++ b/desktop/find-cursor/README
@@ -1,2 +1,2 @@
-Simple XLib program to highlight the cursor position. This is similar to the
-feature found in Windows XP.
+Simple XLib program to highlight the cursor position. This is similar
+to the feature found in Windows XP.
diff --git a/desktop/find-cursor/find-cursor.SlackBuild b/desktop/find-cursor/find-cursor.SlackBuild
index 90b50e139e..4b10c8e833 100644
--- a/desktop/find-cursor/find-cursor.SlackBuild
+++ b/desktop/find-cursor/find-cursor.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=find-cursor
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/find-cursor/find-cursor.info b/desktop/find-cursor/find-cursor.info
index e8c9cfc01f..6955968536 100644
--- a/desktop/find-cursor/find-cursor.info
+++ b/desktop/find-cursor/find-cursor.info
@@ -1,8 +1,8 @@
 PRGNAM="find-cursor"
-VERSION="1.4"
+VERSION="1.6"
 HOMEPAGE="https://github.com/arp242/find-cursor"
-DOWNLOAD="https://github.com/arp242/find-cursor/archive/v1.4/find-cursor-1.4.tar.gz"
-MD5SUM="72fe16b4a5496646703cdbf207ac3ad9"
+DOWNLOAD="https://github.com/arp242/find-cursor/archive/v1.6/find-cursor-1.6.tar.gz"
+MD5SUM="54e27d152150dcd2eced9ebf4669c40d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/flatpak-builder/README b/desktop/flatpak-builder/README
index 2db2454987..545986f51b 100644
--- a/desktop/flatpak-builder/README
+++ b/desktop/flatpak-builder/README
@@ -2,39 +2,41 @@ Flatpak
 
 Flatpak is the new framework for desktop applications on Linux
 
-Distributing applications on Linux is a pain: different distributions in
-multiple versions, each with their own versions of libraries and packaging
-formats. Flatpak is here to change all that. It allows the same app to be
-installed on different Linux distributions, including different versions. And
-it has been designed from the ground up with security in mind, so that apps
-are isolated from each other and from the host system.
+Distributing applications on Linux is a pain: different distributions
+in multiple versions, each with their own versions of libraries and
+packaging formats. Flatpak is here to change all that. It allows the
+same app to be installed on different Linux distributions, including
+different versions. And it has been designed from the ground up with
+security in mind, so that apps are isolated from each other and from
+the host system.
 
 You can find many apps already available on https://flathub.org/
 
-Apps that require pulse audio (like steam, skype, etc) need PULSE_SERVER
-environment variable to be set. This is not set for most shells in slackware
-by default. One way I found to set this is:
-```
+Apps that require pulse audio (like steam, skype, etc) need
+PULSE_SERVER environment variable to be set. This is not set for most
+shells in slackware by default. One way I found to set this is:
+
 export `xprop -root -notype PULSE_SERVER | tr -d ' '`
-```
 
-Some of the examples from http://flatpak.org/#users are relying on polkit
-helpers, that expect a user in the 'wheel' group to have privileges for, but
-default polkit admin rule for slackware is just the root user.
-So, if you run a command like:
-```
+Some of the examples from http://flatpak.org/#users are relying
+on polkit helpers, that expect a user in the 'wheel' group to have
+privileges for, but default polkit admin rule for slackware is just
+the root user.  So, if you run a command like:
+
 flatpak remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo
-flatpak remote-add --from gnome-apps https://sdk.gnome.org/gnome-apps.flatpakrepo
-```
-as a limited user, you will get a polkit prompt for root's password. This is
-because the default location for establishing these repos is in
-`/var/lib/flatpak` and requires admin privileges.
+flatpak remote-add --from gnome-apps \
+        https://sdk.gnome.org/gnome-apps.flatpakrepo
+
+as a limited user, you will get a polkit prompt for root's
+password. This is because the default location for establishing these
+repos is in `/var/lib/flatpak` and requires admin privileges.
 
-You can optionally add the flag `--user` to flatpak commands, and it will
-instead manage the repos in `~/.local/share/flatpak`.
+You can optionally add the flag `--user` to flatpak commands, and it
+will instead manage the repos in `~/.local/share/flatpak`.
 
 There are examples of flatpak runtimes and applications on their wiki:
 https://github.com/flatpak/flatpak/wiki/Examples
 
-They too have desktop launchers search by desktops like KDE and XFCE, it will
-require a logout, as /etc/profile.d/flatpak.sh will need to be sourced.
+They too have desktop launchers search by desktops like KDE and XFCE,
+it will require a logout, as /etc/profile.d/flatpak.sh will need to
+be sourced.
diff --git a/desktop/flatpak/README b/desktop/flatpak/README
index 26feb68fde..a20dd8636e 100644
--- a/desktop/flatpak/README
+++ b/desktop/flatpak/README
@@ -2,48 +2,52 @@ Flatpak
 
 Flatpak is the new framework for desktop applications on Linux
 
-Distributing applications on Linux is a pain: different distributions in
-multiple versions, each with their own versions of libraries and packaging
-formats. Flatpak is here to change all that. It allows the same app to be
-installed on different Linux distributions, including different versions. And
-it has been designed from the ground up with security in mind, so that apps
-are isolated from each other and from the host system.
+Distributing applications on Linux is a pain: different distributions
+in multiple versions, each with their own versions of libraries and
+packaging formats. Flatpak is here to change all that. It allows the
+same app to be installed on different Linux distributions, including
+different versions. And it has been designed from the ground up with
+security in mind, so that apps are isolated from each other and from
+the host system.
 
 You can find many apps already available on https://flathub.org/
 Add flathub for system and your user's home folder with:
-```
-sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-```
 
+sudo flatpak remote-add --if-not-exists flathub \
+     https://dl.flathub.org/repo/flathub.flatpakrepo
+flatpak --user remote-add --if-not-exists flathub \
+     https://dl.flathub.org/repo/flathub.flatpakrepo
+
+Apps that require pulse audio (like steam, skype, etc) need
+PULSE_SERVER environment variable to be set. This is not set for most
+shells in slackware by default. One way I found to set this is:
 
-Apps that require pulse audio (like steam, skype, etc) need PULSE_SERVER
-environment variable to be set. This is not set for most shells in slackware
-by default. One way I found to set this is:
-```
 export `xprop -root -notype PULSE_SERVER | tr -d ' '`
-```
-A cleaner approach is to run `start-pulseaudio-x11` and then `pax11publish -i`
-so the correct PULSE_SERVER variable is exported. Adding these two commands to
-your ~/.xsession would be useful.
-
-Some of the examples from http://flatpak.org/#users are relying on polkit
-helpers, that expect a user in the 'wheel' group to have privileges for, but
-default polkit admin rule for slackware is just the root user.
-So, if you run a command like:
-```
+
+A cleaner approach is to run `start-pulseaudio-x11` and then
+`pax11publish -i` so the correct PULSE_SERVER variable is
+exported. Adding these two commands to your ~/.xsession would be
+useful.
+
+Some of the examples from http://flatpak.org/#users are relying
+on polkit helpers, that expect a user in the 'wheel' group to have
+privileges for, but default polkit admin rule for slackware is just
+the root user.  So, if you run a command like:
+
 flatpak remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo
-flatpak remote-add --from gnome-apps https://sdk.gnome.org/gnome-apps.flatpakrepo
-```
-as a limited user, you will get a polkit prompt for root's password. This is
-because the default location for establishing these repos is in
-`/var/lib/flatpak` and requires admin privileges.
+flatpak remote-add --from gnome-apps \
+        https://sdk.gnome.org/gnome-apps.flatpakrepo
+
+as a limited user, you will get a polkit prompt for root's
+password. This is because the default location for establishing these
+repos is in `/var/lib/flatpak` and requires admin privileges.
 
-You can optionally add the flag `--user` to flatpak commands, and it will
-instead manage the repos in `~/.local/share/flatpak`.
+You can optionally add the flag `--user` to flatpak commands, and it
+will instead manage the repos in `~/.local/share/flatpak`.
 
 There are examples of flatpak runtimes and applications on their wiki:
 https://github.com/flatpak/flatpak/wiki/Examples
 
-They too have desktop launchers search by desktops like KDE and XFCE, it will
-require a logout, as /etc/profile.d/flatpak.sh will need to be sourced.
+They too have desktop launchers search by desktops like KDE and XFCE,
+it will require a logout, as /etc/profile.d/flatpak.sh will need to
+be sourced.
diff --git a/desktop/flatwoken-icon-theme/flatwoken-icon-theme.SlackBuild b/desktop/flatwoken-icon-theme/flatwoken-icon-theme.SlackBuild
index b8020a6f33..228810688e 100644
--- a/desktop/flatwoken-icon-theme/flatwoken-icon-theme.SlackBuild
+++ b/desktop/flatwoken-icon-theme/flatwoken-icon-theme.SlackBuild
@@ -64,4 +64,11 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/florence/README b/desktop/florence/README
index 18ddac8425..11593e30a9 100644
--- a/desktop/florence/README
+++ b/desktop/florence/README
@@ -1,4 +1,4 @@
 Florence is an extensible scalable virtual keyboard for X11.
 
-For disabled, for broken keyboard or tablet PC. You must be able to use a
-pointing device as a mouse, trackball, touchscreen or opengazer.
+For disabled, for broken keyboard or tablet PC. You must be able to use
+a pointing device as a mouse, trackball, touchscreen or opengazer.
diff --git a/desktop/fvwm-crystal/README b/desktop/fvwm-crystal/README
index 4966700be4..221087798a 100644
--- a/desktop/fvwm-crystal/README
+++ b/desktop/fvwm-crystal/README
@@ -1,11 +1,12 @@
-FVWM-Crystal aims to create an easy to use, powerful desktop environment for
-Linux or other Unix-like operating systems with lots of eye-candy.
+FVWM-Crystal aims to create an easy to use, powerful desktop
+environment for Linux or other Unix-like operating systems with lots
+of eye-candy.
 
-It uses following programs: FVWM as a window manager and "main core", ROX-Filer
-or Nautilus as desktop manager (manages icons on the desktop), gnome-terminal,
-xterm, aterm, mrxvt or urxvt as terminal emulators, MPD, QuodLibet or XMMS as
-music players (there's built-in support for controlling these programs), and
-several other tools for different functions, like setting a wallpaper or making
-screenshots.
+It uses following programs: FVWM as a window manager and "main core",
+ROX-Filer or Nautilus as desktop manager (manages icons on the
+desktop), gnome-terminal, xterm, aterm, mrxvt or urxvt as terminal
+emulators, MPD, QuodLibet or XMMS as music players (there's built-in
+support for controlling these programs), and several other tools for
+different functions, like setting a wallpaper or making screenshots.
 
 Optional dependencies: rox-filer, feh, gdm, stalonetray
diff --git a/desktop/fvwm3/README b/desktop/fvwm3/README
new file mode 100644
index 0000000000..b3b2977903
--- /dev/null
+++ b/desktop/fvwm3/README
@@ -0,0 +1,18 @@
+Fvwm3 is the newest version of the fvwm window manager, the successor to
+fvwm2.
+
+Fvwm3 is a multiple large virtual desktop window manager, originally (a
+looooong time ago!) derived from twm.
+
+Fvwm3 is intended to have a small memory footprint but a rich feature
+set, be extremely customizable and extendible, and have a high degree of
+Motif mwm compatibility.
+
+This package does not conflict with the stock fvwm package.
+
+Manpages for fvwm3 modules were moved as follows:
+FvwmAnimate --> Fvwm3Animate
+FvwmAuto --> Fvwm3Auto
+...
+
+google-go-lang is needed only at build time.
diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild
new file mode 100644
index 0000000000..988122f400
--- /dev/null
+++ b/desktop/fvwm3/fvwm3.SlackBuild
@@ -0,0 +1,165 @@
+#!/bin/sh
+
+# Slackware build script for fvwm3
+
+# Copyright 2020-2021, 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=fvwm3
+VERSION=${VERSION:-1.0.2}
+BUILD=${BUILD:-3}
+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
+
+patch -p1 < $CWD/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
+
+mkdir -p bin/FvwmPrompt/vendor/golang.org/x
+for DEPENDENCY in \
+  abiosoft/ishell/2.0.0 \
+  abiosoft/readline/155bce2042db95a783081fab225e74dd879055b0 \
+  fatih/color/1.9.0 \
+  flynn-archive/go-shlex/3f9db97f856818214da2e1057f8ad84803971cff \
+  mattn/go-colorable/0.1.4 \
+  mattn/go-isatty/0.0.12 \
+  sirupsen/logrus/1.6.0 \
+  golang/sys/12a6c2dcc1e4cb348b57847c73987099e261714b
+do
+  DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)"
+  DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)"
+  DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)"
+  mkdir -p "bin/FvwmPrompt/vendor/github.com/$DEPENDENCY_OWNER"
+  tar xvf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz"
+  if [ "$DEPENDENCY_OWNER" = "golang" ]; then
+    mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" \
+      "bin/FvwmPrompt/vendor/golang.org/x/$DEPENDENCY_NAME"
+  else
+    mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" \
+      "bin/FvwmPrompt/vendor/github.com/$DEPENDENCY_OWNER/$DEPENDENCY_NAME"
+  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 \
+  -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 \
+  --enable-mandoc \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-golang \
+  --program-prefix= \
+  --program-suffix= \
+  --program-transform-name='s/^fvwm-/fvwm3-/' \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+zcat $CWD/startfvwm3.gz > $PKG/usr/bin/startfvwm3
+chmod 755 $PKG/usr/bin/startfvwm3
+
+mkdir -p $PKG/etc/X11/xinit
+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
+
+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 m in $PKG/usr/man/man1/Fvwm* ; do
+  case "$m" in *FvwmPrompt*) continue ;; esac
+  mv $m ${m/Fvwm/Fvwm3}
+done
+
+for m in $PKG/usr/man/man1/fvwm-* ; do
+  mv $m ${m/fvwm-/fvwm3-}
+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
+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/fvwm3/fvwm3.info b/desktop/fvwm3/fvwm3.info
new file mode 100644
index 0000000000..a272b80016
--- /dev/null
+++ b/desktop/fvwm3/fvwm3.info
@@ -0,0 +1,26 @@
+PRGNAM="fvwm3"
+VERSION="1.0.2"
+HOMEPAGE="https://github.com/fvwmorg/fvwm3"
+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 \
+          https://github.com/flynn-archive/go-shlex/archive/3f9db97f856818214da2e1057f8ad84803971cff/go-shlex-3f9db97f856818214da2e1057f8ad84803971cff.tar.gz \
+          https://github.com/mattn/go-colorable/archive/v0.1.4/go-colorable-0.1.4.tar.gz \
+          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="afdf88159cf06486a8a86d3d64b69b18 \
+        3058feb8c64ce23c122c212673a769fc \
+        5f9283762aece4866ec12481c911dc04 \
+        63c08b74df39b3df587594710c13d543 \
+        73c1c839e2866ecfe7ad25aa21dd74d6 \
+        c67b2200da0ec27b69b62afc308b6d0c \
+        56a6121ba7ae8a13dad2925edd9f11b5 \
+        7e9bd1531d38f1994307cc2cd9435cb9 \
+        62bb00c7e07850c8fa836a3614667ded"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+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/slack-desc b/desktop/fvwm3/slack-desc
new file mode 100644
index 0000000000..5c368a484d
--- /dev/null
+++ b/desktop/fvwm3/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------------------------------------------------------|
+fvwm3: fvwm3 (the newest version of the fvwm window manager)
+fvwm3:
+fvwm3: Fvwm3 is a multiple large virtual desktop window manager, originally
+fvwm3: (a looooong time ago!) derived from twm. The successor to fvwm2.
+fvwm3: Fvwm3 is intended to have a small memory footprint but a rich feature
+fvwm3: set, be extremely customizable and extendible, and have a high degree
+fvwm3: of Motif mwm compatibility.
+fvwm3:
+fvwm3: Homepage: https://github.com/fvwmorg/fvwm3
+fvwm3:
+fvwm3:
diff --git a/desktop/fvwm3/startfvwm3.gz b/desktop/fvwm3/startfvwm3.gz
new file mode 100644
index 0000000000..6c1aed5d31
--- /dev/null
+++ b/desktop/fvwm3/startfvwm3.gz
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/fvwm3/xinitrc.fvwm3.gz b/desktop/fvwm3/xinitrc.fvwm3.gz
new file mode 100644
index 0000000000..269016347b
--- /dev/null
+++ b/desktop/fvwm3/xinitrc.fvwm3.gz
diff --git a/desktop/fvwm95/fvwm95-menu.xpm b/desktop/fvwm95/fvwm95-menu.xpm
new file mode 100644
index 0000000000..c55ca54066
--- /dev/null
+++ b/desktop/fvwm95/fvwm95-menu.xpm
@@ -0,0 +1,125 @@
+/* XPM */
+static char * fvwm-menu_xpm[] = {
+"25 118 4 1",
+" 	c None s None",
+".	c white",
+"X	c #c0c0c0",
+"o	c black",
+"                         ",
+"                         ",
+"                         ",
+"                         ",
+"                         ",
+"                         ",
+"                         ",
+"    ...       ....       ",
+"    .XXX    ...XXXX      ",
+"    .XXXo  ..XXXXXXX     ",
+"    .XXXo  .XXXXXXXXX    ",
+"    .XXXo  .XXXXXXXXXo   ",
+"    .XXXo ..XXXXXXXXXX   ",
+"    .XXXo .XXXXoooXXXXo  ",
+"    .XXXo .XXXXo  .XXXo  ",
+"    .XXXo .XXXoo  .XXXo  ",
+"    .XXXo..XXXo   .XXXo  ",
+"    .XXXXXXXXXo   .XXXo  ",
+"    .XXXXXXXXXo  ..XXXo  ",
+"     XXXXXXXXXo   XXXoo  ",
+"      ooooooooo    ooo   ",
+"                         ",
+"                         ",
+"         .......         ",
+"       ...XXXXXXX.       ",
+"      ..XXXXXXXXXXX      ",
+"     ..XXXXXXXXXXXXX     ",
+"    ..XXXXXXXXXXXXXXX    ",
+"    .XXXXXXXXXXXXXXXXo   ",
+"    .XXXXoooXXXooXXXXXo  ",
+"    .XXXoo  .XXo  XXXXo  ",
+"    .XXXo  ..XXX  .XXXo  ",
+"    .XXXX...XXXXo .XXXo  ",
+"     XXXXXXXXXXXo .XXXo  ",
+"     .XXXXXXXXXXXo.XXXo  ",
+"      XXXXXXXXXXoo XXoo  ",
+"       XXXXXXXXXo   oo   ",
+"        XXXXXXooo        ",
+"         oooooo          ",
+"                         ",
+"                         ",
+"         ............    ",
+"        ..XXXXXXXXXXXX   ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"         XXXXoooooooooo  ",
+"          XXXo           ",
+"          .XXX.......    ",
+"         ..XXXXXXXXXXX   ",
+"        ..XXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXoooooooooo  ",
+"         XXXXo           ",
+"        ..XXXX.......    ",
+"        .XXXXXXXXXXXXX   ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"         XXXXXXXXXXXXXo  ",
+"          ooooooooooooo  ",
+"        ..               ",
+"        .XX..            ",
+"        .XXXXX...        ",
+"         XXXXXXXXX...    ",
+"          oXXXXXXXXXXX   ",
+"            ooXXXXXXXXo  ",
+"            ...ooXXXXXo  ",
+"        .....XXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXooo  ",
+"        .XXXXXXXooooo    ",
+"        .XXXXXXXo.       ",
+"         XXXXXXXXXX..    ",
+"          ooXXXXXXXXXX   ",
+"             oooXXXXXXo  ",
+"         .....XXXXXXXXo  ",
+"        ..XXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXoooo  ",
+"        .XXXXXXooooo     ",
+"         XXooooo         ",
+"          oo             ",
+"        ..               ",
+"        .X..             ",
+"        .XXXX..          ",
+"         XXXXXXX.        ",
+"          XXXXXXXX..     ",
+"           oXXXXXXXXX    ",
+"             ooXXXXXXX   ",
+"              ..oXXXXXo  ",
+"           ....XXXXXXXo  ",
+"         ...XXXXXXXXXXo  ",
+"        ..XXXXXXXXXXXXo  ",
+"        .XXXXXXXXXXXXoo  ",
+"        .XXXXXXXXXoooo   ",
+"        .XXXXXXXooo      ",
+"        .XXXXoooo        ",
+"   ...   XXooo           ",
+"   .XXX ..oo             ",
+"   .XXXo.XXX             ",
+"   .XXXo.XXXo            ",
+"   .XXXo.XXXo........    ",
+"   .XXXXXXXXXXXXXXXXXX   ",
+"   .XXXXXXXXXXXXXXXXXXo  ",
+"    XXXXXXXXXXXXXXXXXXo  ",
+"     XXXXXXXXXXXXXXXXXo  ",
+"      XXXXXXXXXXXXXXXXo  ",
+"       ooXXXooooooooooo  ",
+"         XXXo            ",
+"          ooo            ",
+"                         ",
+"                         ",
+"                         ",
+"                         "};
diff --git a/desktop/fvwm95/fvwm95.SlackBuild b/desktop/fvwm95/fvwm95.SlackBuild
index 682021a832..cf80d297d3 100644
--- a/desktop/fvwm95/fvwm95.SlackBuild
+++ b/desktop/fvwm95/fvwm95.SlackBuild
@@ -3,6 +3,8 @@
 # Slackware build script for fvwm95
 
 # Copyright 2014 Tomasz Konojacki <me@xenu.tk>
+# Copyright 2020 Logan Rathbone <poprocks@gmail.com>
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +26,12 @@
 
 PRGNAM=fvwm95
 VERSION=${VERSION:-2.0.43f}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 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 +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"
@@ -109,6 +111,14 @@ cp -a Changelog README GPL INSTALL README.rouat fvwm-StackingOrder.html \
   FvwmTaskBar-plugins.patch.README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# plop the old Slackware <= 10.0 default config into /usr/doc as a little Easter Egg
+cat $CWD/fvwm95rc-slack10_0.in | sed -e "s,@libdir@,/usr/lib${LIBDIRSUFFIX},g" \
+	> $PKG/usr/doc/$PRGNAM-$VERSION/fvwm95rc-slack10_0
+
+# ... this also needs to be there for the Start button to work:
+install -m 644 $CWD/fvwm95-menu.xpm \
+	$PKG/usr/lib${LIBDIRSUFFIX}/X11/pixmaps/fvwm95-menu.xpm
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/desktop/fvwm95/fvwm95.info b/desktop/fvwm95/fvwm95.info
index b2e1f1933a..6864bbe3e8 100644
--- a/desktop/fvwm95/fvwm95.info
+++ b/desktop/fvwm95/fvwm95.info
@@ -6,5 +6,5 @@ MD5SUM="b6d10d18b957f0abfdc46a7f4f040d64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Tomasz Konojacki"
-EMAIL="me@xenu.tk"
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"
diff --git a/desktop/fvwm95/fvwm95rc-slack10_0.in b/desktop/fvwm95/fvwm95rc-slack10_0.in
new file mode 100644
index 0000000000..01f59a4af9
--- /dev/null
+++ b/desktop/fvwm95/fvwm95rc-slack10_0.in
@@ -0,0 +1,825 @@
+#
+# Default system.fvwm95rc for Slackware Linux
+#
+# ...you have found the SBo fvwm95 Easter Egg! This fvwm95rc is slightly
+# modified from the version included with the Slackware 10.0 source tree (the
+# final Slackware release to include fvwm95) in 2020 by Logan Rathbone
+# <poprocks@gmail.com> while hopefully retaining the spirit of the original.
+#
+# If you would like to use this configuration, copy this file to ~/.fvwm95rc
+
+#========================================================================#
+
+#
+# Fonts - one for window titles, another for icons, and another for the menus
+#
+WindowFont	-adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*
+IconFont	fixed
+MenuFont   	-adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
+
+#
+# Set the default window colors. The syntax is:
+#  DefaultColors winforecolor winbackcolor titleforecolor titlebackcolor
+# where:
+#  winbackcolor    is the background (border) color of all windows,
+#                  including the menu windows 
+#  winforecolor    is used for the menu text
+#  titlebackcolor  is the background color used for title bars of 
+#                  non selected windows
+#  titleforecolor  is the color of the title text of non selected windows
+#
+DefaultColors   Black #c3c3c3 #c3c3c3 grey51
+
+#
+# Text and background color for the title bar of the active (selected) window
+#
+HilightColors   White #000080
+
+#
+# Text and background color for the title bar of sticky windows
+#
+StickyColors    grey51 #60c080
+
+# You can also use the Style command to set the colors of individual
+# title bars of some non-selected windows
+
+#Style "*" ForeColor #c3c3c3
+#Style "*" BackColor grey51
+
+#========================================================================#
+
+#
+# Set up the major operating modes
+#
+
+Style "*" ClickToFocus
+# If we use the FvwmTaskBar we don't need the icons :-)
+# Style "..." Icon is also commented below.
+Style "*" NoIcon
+Style "*" MWMFunctions
+Style "*" HintOverride
+Style "*" MWMDecor
+
+OpaqueMoveSize 100
+EdgeScroll 100 100
+EdgeResistance 10000 0
+
+#
+# RandomPlacement prevents user interaction while placing windows:
+#
+Style "*" RandomPlacement
+
+#
+# NoPPosition instructs fvwm to ignore the PPosition field in window 
+# geometry hints. Emacs annoyingly sets PPosition to (0,0)!
+#
+Style "*" NoPPosition
+
+#========================================================================#
+
+#
+# Set the desk top size in units of physical screen size
+#
+DeskTopSize 3x2
+
+#========================================================================#
+
+#
+# Module path and paths to the icons
+# ModulePath is a colon-separated list, just like regular unix PATH
+#
+ModulePath @libdir@/X11/fvwm95/
+PixmapPath @libdir@/X11/pixmaps/
+IconPath   @libdir@/X11/mini-icons/
+
+#========================================================================#
+
+# Set the decoration styles and window options
+# Order is important!!!!
+# If compatible styles are set for a single window in multiple Style
+# commands, then the styles are ORed together. If conflicting styles
+# are set, the last one specified is used.
+
+# These commands should command before any menus or functions are defined,
+# and before the internal pager is started.
+
+#
+# Default border and handle widths
+#
+Style "*" BorderWidth 5, HandleWidth 5
+
+Style "Fvwm*"        NoTitle, Sticky, WindowListSkip
+Style "Fvwm Pager"   StaysOnTop, NoHandles
+Style "FvwmBanner"   StaysOnTop
+Style "FvwmButtons"  NoTitle, NoHandles, Sticky, WindowListSkip,BorderWidth 5
+Style "*lock"        NoTitle, NoHandles, Sticky, WindowListSkip
+Style "xbiff"        NoTitle,            Sticky, WindowListSkip
+
+#
+# Some mini-icons for the title bar
+#
+Style "*"         TitleIcon mini-x2.xpm
+Style "*xterm*"   TitleIcon mini-term.xpm
+Style "rxvt"      TitleIcon mini-term.xpm
+Style "xcalc"     TitleIcon mini-calc.xpm
+Style "xsession"  TitleIcon mini-bx2.xpm
+Style "xv"        TitleIcon mini-xv.xpm
+Style "Netscape"  TitleIcon mini-nscape.xpm
+Style "xmag"      TitleIcon mini-zoom.xpm
+Style "textedit"  TitleIcon mini-edit.xpm
+Style "tkps"      TitleIcon mini-run.xpm
+Style "Ghostview" TitleIcon mini-gv.xpm
+Style "Xcolorsel" TitleIcon mini-colors.xpm
+Style "IDL*"      TitleIcon mini-zoom.xpm
+Style "xeyes"     TitleIcon mini-eyes.xpm
+Style "*fm*"      TitleIcon mini-filemgr.xpm
+# xman resource names
+Style "topBox"    TitleIcon mini-book1.xpm
+Style "help"      TitleIcon mini-book2.xpm
+Style "manualBrowser" TitleIcon mini-book2.xpm
+# xpaint resource names
+Style "xpaint"    TitleIcon mini-paint.xpm
+Style "Canvas"    TitleIcon mini-paint.xpm
+Style "fatbits"   TitleIcon mini-paint.xpm
+Style "filebrowser" TitleIcon mini-paint.xpm
+
+#Style "rxvt"       Icon  term.xpm
+#Style "xterm"      Icon xterm.xpm
+#Style "Appointment" Icon datebook.xpm
+#Style "xcalc"      Icon rcalc.xpm
+#Style "xbiff"      Icon mail1.xpm
+#Style "xmh"        Icon mail1.xpm, StartsOnDesk 2
+#Style "xman"	   Icon xman.xpm
+#Style "xvgr"	   Icon graphs.xpm
+#Style "matlab"	   Icon math4.xpm
+#Style "xmag"	   Icon mag_glass.xpm
+#Style "xgraph"	   Icon graphs.xpm
+#Style "xv"         Icon xview.xpm
+#Style "FvwmButtons"  Icon toolbox.xpm
+#Style "xconsole"   Icon koala.xpm
+#Style "xsession"   Icon koala.xpm
+#Style "textedit"   Icon textedit.xpm
+#Style "gv"  Icon gv.xpm
+
+#========================================================================#
+
+#
+# Stuff to do at start-up
+#
+
+AddToFunc "InitFunction"    "I" Exec xsetroot -solid cyan4 &
+#+                          "I" Module FvwmBanner
++                           "I" Module FvwmButtons
++                           "I" Module FvwmTaskBar
+#+                          "I" Module FvwmPager 0 3
+
+AddToFunc "RestartFunction" "I" Module FvwmButtons
++                           "I" Module FvwmTaskBar
+#+                          "I" Module FvwmPager 0 3
+
+
+#========================================================================#
+
+# Now define some handy complex functions
+
+#
+# This one moves and then raises the window if you drag the mouse,
+# only raises the window if you click, or does a full maximize if 
+# you double click
+#
+AddToFunc "Move-or-Raise" "M" Move
++                         "M" Raise
++                         "C" Raise
++                         "D" Maximize 100 100
+
+#
+# This one moves and then lowers the window if you drag the mouse,
+# only lowers the window if you click, or does a RaiseLower if you double 
+# click
+#
+AddToFunc "Move-or-Lower" "M" Move
++                         "M" Lower
++                         "C" Lower
++                         "D" RaiseLower
+
+#
+# This one moves or (de)iconifies:
+#
+AddToFunc "Move-or-Iconify" "M" Move
++                           "D" Iconify
+
+#
+# This one resizes and then raises the window if you drag the mouse,
+# only raises the window if you click,  or does a RaiseLower if you double 
+# click
+#
+AddToFunc "Resize-or-Raise" "M" Resize
++                           "M" Raise
++                           "C" Raise
++                           "D" RaiseLower
+
+
+#========================================================================#
+
+#
+# Now define the menus - defer bindings until later
+#
+
+# This is for the Start menu of the FvwmTaskBar
+
+DestroyMenu "StartMenu"
+AddToMenu "StartMenu@fvwm95-menu.xpm@^#808080^"
++ "Manual Pages     %mini-book1.xpm%"       Exec    xman &
++ "Magnifying Glass %mini-zoom.xpm%" 	    Exec    xmag &
++ ""                                        Nop 
++ "Accessories%mini-hammer.xpm%"            Popup   Accessories
++ "Applications     %mini-x2.xpm%"          Popup   Applications
++ "File Managers    %mini-filemgr.xpm%"     Popup   Filemanagers
++ "Games            %mini-happy.xpm%"       Popup   Games
++ "Shells           %mini-term.xpm"         Popup   Shells
++ ""                                        Nop 
++ "Lock Screen      %mini-lock.xpm%"        Popup   Screenlock
++ "Screensaver      %mini-display.xpm%"     Popup   Screensaver
++ ""                                        Nop
++ "Refresh Screen   %mini-ray.xpm%"         Refresh
++ ""                                        Nop
++ "Exit Fvwm95      %mini-stop.xpm%"        Popup   Quit-Verify
+
+DestroyMenu "Shells"
+AddToMenu "Shells"
++ "Xterm	(7x14 font)%mini-term.xpm%" 		Exec xterm -sb -sl 500 -j -ls -fn 7x14 -fb 7x14bold -title "Color xterm" &
++ "Large Xterm	(10x20 font)%mini-term.xpm%" 	Exec xterm -sb -sl 500 -j -ls -fn 10x20 &
++ ""					    	Nop
++ "Rxvt	(7x14 font)%mini-term.xpm%"		Exec rxvt -font 7x14 -ls &
++ "Large Rxvt	(10x20 font)%mini-term.xpm%" 	Exec rxvt -font 10x20 -ls &
+
+DestroyMenu "Screensaver"
+AddToMenu "Screensaver"
++ "Blank%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode blank &
++ "Random%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode random &
++ ""				Nop
++ "Ant%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode ant &
++ "Ball%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode ball &
++ "Bat%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode bat &
++ "Blot%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode blot &
++ "Bomb%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode bomb &
++ "Bouboule%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode bouboule &
++ "Bob%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode image -imagefile /usr/X11R6/include/X11/bitmaps/l-bob.xbm -batchcount 7 &
++ "Bounce%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode bounce &
++ "Braid%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode braid &
++ "Bug%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode bug &
++ "Bubble%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode bubble &
++ "Clock%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode clock &
++ "Coral%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode coral &
++ "Crystal%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode crystal &
++ "Daisy%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode daisy &
++ "Dclock%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode dclock &
++ "Deco%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode deco &
++ "Demon%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode demon &
++ "Dilemma%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode dilemma &
++ "Drift%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode drift &
++ "More"                        PopUp ScreenSaver2
+
+DestroyMenu "Screensaver2"
+AddToMenu "Screensaver2"
++ "Eyes%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode eyes &
++ "Fadeplot%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode fadeplot &
++ "Flag%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode flag &
++ "Flame%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode flame &
++ "Forest%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode forest &
++ "Galaxy%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode galaxy &
++ "Geometry%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode geometry &
++ "Grav%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode grav &
++ "Helix%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode helix &
++ "Hop%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode hop   &
++ "Hyper%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode hyper &
++ "Ico%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode ico &
++ "Ifs%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode ifs &
++ "Julia%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode julia &
++ "Kaleid%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode kaleid &
++ "Laser%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode laser &
++ "Life%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode life   &
++ "Life1d%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode life1d &
++ "Life3d%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode life3d &
++ "Lightning%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode lightning &
++ "Lisa%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode lisa &
++ "Lissie%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode lissie &
++ "Loop%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode loop &
++ "More"                        PopUp ScreenSaver3
+
+DestroyMenu "Screensaver3"
+AddToMenu "Screensaver3"
++ "Mandelbrot%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode mandelbrot &
++ "Marquee%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode marquee &
++ "Maze%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode maze &
++ "Mountain%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode mountain &
++ "Munch%mini-bball.xpm%"	Exec xlock -nolock -nice 0 -mode munch &
++ "Nose%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode nose &
++ "Pacman%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode pacman &
++ "Penguin%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode image -imagefile /usr/X11R6/include/X11/bitmaps/l-linux.xbm -batchcount 7 &
++ "Penrose%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode penrose &
++ "Petal%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode petal &
++ "Puzzle%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode puzzle &
++ "Pyro%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode pyro &
++ "Qix%mini-bball.xpm%"   	Exec xlock -nolock -nice 0 -mode qix &
++ "Roll%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode roll &
++ "Rotor%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode rotor &
++ "Shape%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode shape &
++ "Sierpinski%mini-bball.xpm%"  Exec xlock -nolock -nice 0 -mode sierpinski &
++ "Slip%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode slip &
++ "Sphere%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode sphere &
++ "Spiral%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode spiral &
++ "Spline%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode spline &
++ "Star%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode star &
++ "Strange%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode strange &
++ "More"                        PopUp ScreenSaver4
+
+DestroyMenu "Screensaver4"
+AddToMenu "Screensaver4"
++ "Swarm%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode swarm &
++ "Swirl%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode swirl &
++ "Triangle%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode triangle &
++ "Tube%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode tube &
++ "Turtle%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode turtle &
++ "Vines%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode vines &
++ "Voters%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode voters &
++ "Wator%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode wator &
++ "Wire%mini-bball.xpm%"  	Exec xlock -nolock -nice 0 -mode wire &
++ "World%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode world &
++ "Worm%mini-bball.xpm%" 	Exec xlock -nolock -nice 0 -mode worm &
+
+DestroyMenu "Screenlock"
+AddToMenu "Screenlock"
++ "Blank%mini-bball.xpm%" 	Exec xlock -nice 0 -mode blank &
++ "Random%mini-bball.xpm%"	Exec xlock -nice 0 -mode random &
++ ""				Nop
++ "Ant%mini-bball.xpm%"  	Exec xlock -nice 0 -mode ant &
++ "Ball%mini-bball.xpm%"  	Exec xlock -nice 0 -mode ball &
++ "Bat%mini-bball.xpm%"  	Exec xlock -nice 0 -mode bat &
++ "Blot%mini-bball.xpm%"	Exec xlock -nice 0 -mode blot &
++ "Bomb%mini-bball.xpm%"	Exec xlock -nice 0 -mode bomb &
++ "Bouboule%mini-bball.xpm%"	Exec xlock -nice 0 -mode bouboule &
++ "Bob%mini-bball.xpm%"   	Exec xlock -nice 0 -mode image -imagefile /usr/X11R6/include/X11/bitmaps/l-bob.xbm -batchcount 7 &
++ "Bounce%mini-bball.xpm%" 	Exec xlock -nice 0 -mode bounce &
++ "Braid%mini-bball.xpm%" 	Exec xlock -nice 0 -mode braid &
++ "Bug%mini-bball.xpm%"   	Exec xlock -nice 0 -mode bug &
++ "Bubble%mini-bball.xpm%"   	Exec xlock -nice 0 -mode bubble &
++ "Clock%mini-bball.xpm%" 	Exec xlock -nice 0 -mode clock &
++ "Coral%mini-bball.xpm%" 	Exec xlock -nice 0 -mode coral &
++ "Crystal%mini-bball.xpm%" 	Exec xlock -nice 0 -mode crystal &
++ "Daisy%mini-bball.xpm%" 	Exec xlock -nice 0 -mode daisy &
++ "Dclock%mini-bball.xpm%" 	Exec xlock -nice 0 -mode dclock &
++ "Deco%mini-bball.xpm%" 	Exec xlock -nice 0 -mode deco &
++ "Demon%mini-bball.xpm%" 	Exec xlock -nice 0 -mode demon &
++ "Dilemma%mini-bball.xpm%" 	Exec xlock -nice 0 -mode dilemma &
++ "Drift%mini-bball.xpm%" 	Exec xlock -nice 0 -mode drift &
++ "More"                        PopUp Screenlock2
+
+DestroyMenu "Screenlock2"
+AddToMenu "Screenlock2"
++ "Eyes%mini-bball.xpm%" 	Exec xlock -nice 0 -mode eyes &
++ "Fadeplot%mini-bball.xpm%" 	Exec xlock -nice 0 -mode fadeplot &
++ "Flag%mini-bball.xpm%" 	Exec xlock -nice 0 -mode flag &
++ "Flame%mini-bball.xpm%" 	Exec xlock -nice 0 -mode flame &
++ "Forest%mini-bball.xpm%" 	Exec xlock -nice 0 -mode forest &
++ "Galaxy%mini-bball.xpm%" 	Exec xlock -nice 0 -mode galaxy &
++ "Geometry%mini-bball.xpm%" 	Exec xlock -nice 0 -mode geometry &
++ "Grav%mini-bball.xpm%" 	Exec xlock -nice 0 -mode grav &
++ "Helix%mini-bball.xpm%" 	Exec xlock -nice 0 -mode helix &
++ "Hop%mini-bball.xpm%"   	Exec xlock -nice 0 -mode hop   &
++ "Hyper%mini-bball.xpm%" 	Exec xlock -nice 0 -mode hyper &
++ "Ico%mini-bball.xpm%" 	Exec xlock -nice 0 -mode ico &
++ "Ifs%mini-bball.xpm%" 	Exec xlock -nice 0 -mode ifs &
++ "Julia%mini-bball.xpm%" 	Exec xlock -nice 0 -mode julia &
++ "Kaleid%mini-bball.xpm%" 	Exec xlock -nice 0 -mode kaleid &
++ "Laser%mini-bball.xpm%" 	Exec xlock -nice 0 -mode laser &
++ "Life%mini-bball.xpm%"  	Exec xlock -nice 0 -mode life   &
++ "Life1d%mini-bball.xpm%"  	Exec xlock -nice 0 -mode life1d &
++ "Life3d%mini-bball.xpm%"  	Exec xlock -nice 0 -mode life3d &
++ "Lightning%mini-bball.xpm%"  	Exec xlock -nice 0 -mode lightning &
++ "Lisa%mini-bball.xpm%"  	Exec xlock -nice 0 -mode lisa &
++ "Lissie%mini-bball.xpm%"  	Exec xlock -nice 0 -mode lissie &
++ "Loop%mini-bball.xpm%"  	Exec xlock -nice 0 -mode loop &
++ "More"                        PopUp Screenlock3
+
+DestroyMenu "Screenlock3"
+AddToMenu "Screenlock3"
++ "Mandelbrot%mini-bball.xpm%" 	Exec xlock -nice 0 -mode mandelbrot &
++ "Marquee%mini-bball.xpm%"  	Exec xlock -nice 0 -mode marquee &
++ "Maze%mini-bball.xpm%" 	Exec xlock -nice 0 -mode maze &
++ "Mountain%mini-bball.xpm%"	Exec xlock -nice 0 -mode mountain &
++ "Munch%mini-bball.xpm%"	Exec xlock -nice 0 -mode munch &
++ "Nose%mini-bball.xpm%"  	Exec xlock -nice 0 -mode nose &
++ "Pacman%mini-bball.xpm%"  	Exec xlock -nice 0 -mode pacman &
++ "Penguin%mini-bball.xpm%"   	Exec xlock -nice 0 -mode image -imagefile /usr/X11R6/include/X11/bitmaps/l-linux.xbm -batchcount 7 &
++ "Penrose%mini-bball.xpm%"  	Exec xlock -nice 0 -mode penrose &
++ "Petal%mini-bball.xpm%"  	Exec xlock -nice 0 -mode petal &
++ "Puzzle%mini-bball.xpm%"  	Exec xlock -nice 0 -mode puzzle &
++ "Pyro%mini-bball.xpm%"  	Exec xlock -nice 0 -mode pyro &
++ "Qix%mini-bball.xpm%"   	Exec xlock -nice 0 -mode qix &
++ "Roll%mini-bball.xpm%" 	Exec xlock -nice 0 -mode roll &
++ "Rotor%mini-bball.xpm%" 	Exec xlock -nice 0 -mode rotor &
++ "Shape%mini-bball.xpm%" 	Exec xlock -nice 0 -mode shape &
++ "Sierpinski%mini-bball.xpm%"  Exec xlock -nice 0 -mode sierpinski &
++ "Slip%mini-bball.xpm%"  	Exec xlock -nice 0 -mode slip &
++ "Sphere%mini-bball.xpm%" 	Exec xlock -nice 0 -mode sphere &
++ "Spiral%mini-bball.xpm%" 	Exec xlock -nice 0 -mode spiral &
++ "Spline%mini-bball.xpm%" 	Exec xlock -nice 0 -mode spline &
++ "Star%mini-bball.xpm%" 	Exec xlock -nice 0 -mode star &
++ "Strange%mini-bball.xpm%" 	Exec xlock -nice 0 -mode strange &
++ "More"                        PopUp Screenlock4
+
+DestroyMenu "Screenlock4"
+AddToMenu "Screenlock4"
++ "Swarm%mini-bball.xpm%" 	Exec xlock -nice 0 -mode swarm &
++ "Swirl%mini-bball.xpm%" 	Exec xlock -nice 0 -mode swirl &
++ "Triangle%mini-bball.xpm%" 	Exec xlock -nice 0 -mode triangle &
++ "Tube%mini-bball.xpm%" 	Exec xlock -nice 0 -mode tube &
++ "Turtle%mini-bball.xpm%" 	Exec xlock -nice 0 -mode turtle &
++ "Vines%mini-bball.xpm%" 	Exec xlock -nice 0 -mode vines &
++ "Voters%mini-bball.xpm%" 	Exec xlock -nice 0 -mode voters &
++ "Wator%mini-bball.xpm%"  	Exec xlock -nice 0 -mode wator &
++ "Wire%mini-bball.xpm%"  	Exec xlock -nice 0 -mode wire &
++ "World%mini-bball.xpm%" 	Exec xlock -nice 0 -mode world &
++ "Worm%mini-bball.xpm%" 	Exec xlock -nice 0 -mode worm &
+
+DestroyMenu "Games"
+AddToMenu "Games"
++ "Maze%mini-maze.xpm%"         Exec maze &
++ "Spider%mini-espada.xpm%"     Exec spider &
++ "Chess%mini-slon.xpm%"        Exec xboard &
++ "Xlander%mini-xlander.xpm%"   Exec xlander &
++ "Xmahjongg%mini-xmahjongg.xpm%" Exec xmahjongg &
++ "Workman%mini-cdlabel.xpm%"	Exec workman &
++ "" Nop
++ "Amusements"                  Popup Amusements
+
+DestroyMenu "Amusements"
+AddToMenu "Amusements"
+#+ "Xcat%mini-cat.xpm%"   	Exec xcat &
++ "Xeyes%mini-eyes.xpm%"        Exec xeyes &
++ "Xlogo%mini-bx2.xpm%"         Exec xlogo &
++ "Xroach%mini-roach.xpm%"      Exec xroach &
++ "Xsnow%mini-xsnow.xpm%"       Exec xsnow &
++ "Stop Xsnow%mini-stop.xpm%"	Exec killall xsnow &
+
+DestroyMenu "Accessories"
+AddToMenu "Accessories"
++ "Font viewer (xfontsel)%mini-font.xpm%"  Exec xfontsel &
++ "Manual pages%mini-book1.xpm%"        Exec xman &
++ "Magnifying glass%mini-zoom.xpm%"     Exec xmag &
++ "Oclock%mini-clock.xpm%"              Exec oclock &
++ "Running Processes (Top)%mini-run.xpm%"	Exec xterm -font 7x14 -T Top -n Top -e top &
++ "System load%mini-perf.xpm%"          Exec xload &
++ "Xclipboard%mini-clipboard.xpm%" Exec xclipboard &
++ "Xclock%mini-clock.xpm%"              Exec xclock &
+
+DestroyMenu "Applications"
+AddToMenu "Applications"
++ "Emacs%mini-edit.xpm%"        Exec emacs &
++ "NcFTP%mini-ftp.xpm%"         Exec xterm -name NcFtp -T FTP -ls -fn 7x14 -e ncftp &
++ "GIMP%mini-camera.xpm%"       Exec gimp &
++ "Gv%mini-gv.xpm%"		Exec gv &
++ "Gnuplot%mini-zoom.xpm%"      Exec xterm -T "Gnuplot" -name Gnuplot -fn 7x14 -e gnuplot &
++ "Netscape%mini-nscape.xpm%"	Exec netscape &
++ "Pine%mini-mail.xpm%"  	Exec xterm -name Mail -T Mail -ls -fn 7x14 -e pine -i &
++ "Xv%mini-xv.xpm%"		Exec xv &
++ "Xedit%mini-edit.xpm%" 	Exec xedit &
++ "Xfig%mini-xfig.xpm%"         Exec xfig &
++ "Xfractint%mini-fractal.xpm%"	Exec xterm -font 7x14 -e xfractint map=chroma &
++ "Xpaint%mini-paint.xpm%"	Exec xpaint &
++ "Xpdf%mini-pdf.xpm%"          Exec xpdf &
++ "Xxgdb%mini-bug2.xpm%"	Exec xxgdb &
+
+DestroyMenu "Filemanagers"
+AddToMenu "Filemanagers"
++ "TkDesk%mini-desktop.xpm%"	Exec tkdesk &
++ "Xfilemanager%mini-filemgr.xpm%" Exec xfilemanager &
++ "Xfm%mini-filemgr.xpm%"	Exec xfm &
+
+#
+# This menu is invoked as a sub-menu - it allows you to quit,
+# restart, or switch to another WM.
+#
+DestroyMenu "Quit-Verify"
+AddToMenu "Quit-Verify"
++ "Quit fvwm95%mini-exclam.xpm%"        Quit
++ "" 					Nop
++ "Restart Fvwm95%mini-turn.xpm%"	Restart fvwm95
++ "" 					Nop
++ "Start fvwm2%mini-windows.xpm%"	Restart fvwm2
++ "Start mwm%mini-mwm.xpm%"		Restart mwm
++ "Start olvwm%mini-olwm.xpm%"		Restart /usr/openwin/bin/olvwm
++ "Start olwm%mini-olwm.xpm%"		Restart /usr/openwin/bin/olwm
++ "Start twm%mini-twm.xpm%"		Restart twm
+
+#
+# Provides a list of modules to fire off
+#
+DestroyMenu "Module-Popup"
+AddToMenu "Module-Popup"
+#+ "Audio"                               Module FvwmAudio
++ "Banner%mini.fvwm.xpm%"               Module FvwmBanner
++ "Button Bar%mini-ball.xpm%"		Module FvwmButtons
++ "Button Bar (Mini)%mini-ball.xpm%"	Module FvwmButtons MiniButtons
+#+ "Clean-Up%mini-pencil.xpm%"           Module FvwmClean
+#+ "Configure%mini-hammer.xpm%"          Module FvwmConfig
++ "Debug%mini-bug2.xpm%"		Module FvwmDebug
++ "Task bar%mini-exp.xpm%"		Module FvwmTaskBar
++ "Identify%mini-question.xpm%"		Module FvwmIdent
++ "Save Desktop%mini-desktop.xpm%"	Module FvwmSaveDesk
++ "Pager%mini-pager.xpm%"		Module FvwmPager 0 3
++ "Window List%mini-windows.xpm%"	Module FvwmWinList
++ "Talk%mini-exclam.xpm%"		Module FvwmTalk
+
+#
+# This menu will fire up some very common utilities
+#
+DestroyMenu "Utilities"
+AddToMenu "Utilities@utilities-menu.xpm@^white^"
++ "Running Processes (Top)%mini-run.xpm%"	Exec xterm -font 7x14 -T Top -n Top -e top &
++ "Calculator%mini-calc.xpm%"		Exec xcalc &
++ "Manual pages%mini-book1.xpm%" 	Exec xman &
++ "Magnifying glass%mini-zoom.xpm%" 	Exec xmag &
++ "Oclock%mini-clock.xpm%" 		Exec oclock &
++ ""					Nop
++ "Applications%mini-x2.xpm%"		Popup Applications
++ "File Managers%mini-filemgr.xpm%"     Popup Filemanagers
++ "Games%mini-happy.xpm%"		Popup Games
++ "Shells%mini-term.xpm"		Popup Shells
++ ""					Nop
++ "Screensaver%mini-display.xpm%"	Popup Screensaver
++ "Lock Screen%mini-lock.xpm%"		Popup Screenlock
++ ""					Nop
++ "Modules%mini-modules.xpm%"		Popup Module-Popup
++ ""					Nop
++ "Refresh Screen%mini-ray.xpm%"	Refresh
++ ""					Nop
++ "Exit Fvwm95%mini-stop.xpm%"		Popup Quit-Verify
+
+#
+# This defines the most common window operations
+#
+DestroyMenu "Window"
+AddToMenu "Window" "Window Ops" Title
++ "&Move%mini-move.xpm%"        Function Move-or-Raise
++ "&Resize%mini-resize.xpm%"    Function Resize-or-Raise
++ "R&aise%mini-raise.xpm%"      Raise
++ "&Lower%mini-lower.xpm%"      Lower
++ "(De)Iconify"                 Iconify
++ "(Un)Stick"                   Stick
++ "(Un)Maximize%mini-max1.xpm%" Function maximize_func
++ ""                            Nop
++ "Kill%mini-bomb.xpm%"         Destroy
++ "&Close%mini-cross.xpm%"      Delete
++ ""                            Nop
++ "Switch to..."                WindowList
++ "Refresh Screen%mini-ray.xpm%" Refresh
+
+#
+# A trimmed down version of "Window Ops", good for binding to decorations
+#
+AddToMenu "Window-Ops2" "&Restore"        Iconify -1
++                       "&Move"           Move-or-Raise
++                       "&Size"           Resize-or-Raise
++                       "Mi&nimize"       Iconify 1
++                       "Ma&ximize"       Maximize 100 100
++                       ""                Nop
++                       "&Kill"           Destroy
++                       "&Close	Alt+F4"   Delete
+
+#========================================================================#
+
+#
+# One more complex function - couldn't be defined earlier because it used 
+# pop-up menus
+#
+# This creates the "system" menu for the title-bar window-ops
+# pop-up
+#
+AddToFunc "window_ops_func" "C" PopUp Window-Ops2
++              "M" PopUp Window-Ops2
++              "D" Delete  
+
+
+#========================================================================#
+
+#
+# Mouse bindings
+#
+
+# First, for the mouse in the root window
+# Button 1 gives the Utilities menu
+# Button 2 gives the Window Ops menu
+# Button 3 gives the WindowList (like TwmWindows)
+# I use the AnyModifier (A) option for the modifier field, so you can hold down
+# any shift-control-whatever combination you want!
+
+#     Button	Context Modifi 	Function
+Mouse 1		R   	A       Menu "Utilities" Nop
+Mouse 2		R    	A       Menu "Window Ops" Nop
+Mouse 3         R       A       WindowList
+#Mouse 3	R    	A      	Module "winlist" FvwmWinList transient
+
+# Now the title bar buttons
+# Any button in the left title-bar button gives the window ops menu
+# Any button in the first right title-bar button Iconifies the window
+# Any button in the second title-bar button full-maximizes
+# Any button in the third (rightmost) title-bar button closes
+# Note the use of "Mouse 0" for AnyButton.
+
+#     Button	Context Modif 	Function
+Mouse 0		1    	A      	Function "window_ops_func"
+Mouse 1         2       A       Delete
+Mouse 0		4    	A     	Maximize 100 100
+Mouse 0		6    	A     	Iconify
+
+#
+# Now the rest of the frame
+# Here I invoke my complex functions for Move-or-lower, Move-or-raise,
+# and Resize-or-Raise. 
+#
+# Button 1 in the corner pieces, with any modifiers, gives resize or raise
+Mouse 1		F	A	Function "Resize-or-Raise"
+# Button 1 in the title, sides, or icon, w/ any modifiers, gives move or raise
+Mouse 1		TS	A	Function "Move-or-Raise"
+
+# Button 1 in an icons gives move for a drag, de-iconify for a double-click,
+# nothing for a single click
+# Button 2 in an icon, w/ any modifiers, gives de-iconify
+Mouse 1		I	A	Function "Move-or-Iconify"
+Mouse 2		I	A	Iconify
+
+# Button 2 in the corners, sides, or title-bar gives the window ops menu
+Mouse 2		FST	A	Function "window_ops_func"
+
+# Button 3 anywhere in the decoration (except the title-bar buttons)
+# does a raise-lower
+Mouse 3		TSIF	A	RaiseLower
+
+# Button 3 in the window, with the Modifier-1 key (usually alt or diamond)
+# gives Raise-Lower. Used to use control here, but that interferes with xterm
+Mouse 3         W       M       RaiseLower
+
+#========================================================================#
+
+# Now some keyboard shortcuts.
+
+# Arrow Keys
+# press arrow + control anywhere, and scroll by 1 page
+Key Left	A	C	Scroll -100 0
+Key Right	A	C	Scroll +100 +0
+Key Up		A	C	Scroll +0   -100
+Key Down	A	C	Scroll +0   +100
+
+# press arrow + meta key, and scroll by 1/10 of a page
+Key Left	A	M	Scroll -10 +0
+Key Right	A	M	Scroll +10 +0
+Key Up		A	M	Scroll +0   -10
+Key Down	A	M	Scroll +0   +10
+
+# press shift arrow + control anywhere, and move the pointer by 1% of a page
+Key Left	A	SC	CursorMove -1 0
+Key Right	A	SC	CursorMove +1 +0
+Key Up		A	SC	CursorMove +0   -1
+Key Down	A	SC	CursorMove +0   +1
+
+# press shift arrow + meta key, and move the pointer by 1/10 of a page
+Key Left	A	SM	CursorMove -10 +0
+Key Right	A	SM	CursorMove +10 +0
+Key Up		A	SM	CursorMove +0   -10
+Key Down	A	SM	CursorMove +0   +10
+
+# Keyboard accelerators
+Key F1		A	M	Popup "Utilities"
+Key F1		A	M	Popup "Utilities"
+Key F2		A	M	Popup "Window Ops"
+Key F3		A	M	Module "WindowList" FvwmWinList 
+Key F4		A	M	Iconify
+Key F5		A	M	Move
+Key F6		A	M	Resize
+Key F7		A	M	CirculateUp
+Key F8		A	M	CirculateDown
+
+#Page Up/Dapge Down keys are used to scroll by one desktop page
+# in any context, press page up/down + control
+# in root context, just pressing page up/down is OK
+# 
+# I prefer the non-wrapping scroll. These are for example purposes only
+#Key Next	A       C       Scroll 100000 0
+#Key Next	R       N       Scroll 100000 0  
+#Key Prior	A       C       Scroll -100000 0
+#Key Prior	R       N       Scroll -100000 0
+
+Key Tab         A       M       Prev Focus
+Key Tab         A       MS      Next Focus
+
+Key Escape      A       C       WindowList
+
+#========================================================================#
+
+# Definitions used by the modules
+
+#------------------ Pager
+*FvwmPagerBack grey60
+*FvwmPagerFore black
+*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+*FvwmPagerHilight #c3c3c3
+*FvwmPagerGeometry -1-1
+*FvwmPagerLabel 0 Desktop
+*FvwmPagerSmallFont 5x8
+
+#------------------ FvwmButtons
+*FvwmButtonsFore Black
+*FvwmButtonsBack #c3c3c3
+*FvwmButtonsFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+# Geometry - really likes to pick its own size, but giving a position is OK
+*FvwmButtonsGeometry -5-34
+# Layout: specify rows or columns, not both
+*FvwmButtonsRows 1
+
+# Define the buttons to use.....
+*FvwmButtons xclock  NULL  Swallow "xclock" Exec xclock -bg \#c3c3c3 -geometry -1500-1500 -padding 0 &
+#*GoodStuff xcmap   NULL        Swallow "xcmap" xcmap -geometry -1500-1500
+*FvwmButtons (2x1) load NULL     Swallow "xload" Exec nice -16 xload -nolabel -bg grey60 -update 5 -geometry -1500-1500
+*FvwmButtons Netscape nscape.xpm Exec "Netscape" netscape &
+*FvwmButtons xterm   rterm.xpm   Exec    "Color xterm" xterm -ls -sb -fn 7x14 -title "Color xterm" &
+*FvwmButtons xfm     Xfm.xpm     Exec    "Xfm" xfm -title "File Manager" &
+#*FvwmButtons textedit textedit.xpm Exec  "Textedit" textedit &
+*FvwmButtons xcalc   rcalc.xpm   Exec    "Calculator" xcalc &
+*FvwmButtons xv   xv.xpm   Exec    "xv" xv &
+#*FvwmButtons ghostview   gv.xpm      Exec    "ghostview" ghostview &
+#*FvwmButtons netscape nscape.xpm Exec    "Netscape" netscape -geometry 920x650+90+5
+*FvwmButtons kill    rbomb.xpm   Destroy
+#*FvwmButtons (2x1) - whatever    SwallowModule Exec "Desktop" FvwmPager 0 0
+*FvwmButtons (2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0')
+
+#------------------ MiniButtons
+
+Style "MiniButtons"  NoTitle,NoHandles,Sticky,StaysOnTop,WindowListSkip,BorderWidth 0
+
+*MiniButtonsFore Black
+*MiniButtonsBack #c0c0c0
+*MiniButtonsFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+*MiniButtonsGeometry -5+5
+*MiniButtonsRows 1
+*MiniButtonsPadding 1 1
+
+*MiniButtons -   mini-nscape.xpm      Exec    "Netscape" netscape -geometry 790x543+0+0 &
+*MiniButtons -   mini-term.xpm        Exec    "XTerm" xterm -ls -sb -fn 7x14 -title "Color xterm" &
+*MiniButtons -   mini-filemgr.xpm     Exec    "Xfm" xfm -title "File Manager" &
+*MiniButtons -   mini-calc.xpm        Exec    "Calculator" xcalc &
+#*MiniButtons -   mini-gv.xpm          Exec    "ghostview" ghostview &
+*MiniButtons -   mini-xv.xpm          Exec    "xv" xv &
+*MiniButtons -   mini-bomb.xpm        Destroy
+
+#------------------ Identify
+*FvwmIdentBack #000080
+*FvwmIdentFore Yellow
+*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
+
+#------------------ FvwmWinList
+*FvwmWinListBack #c3c3c3
+*FvwmWinListFore Black
+*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+*FvwmWinListAction Click1 Iconify -1,Focus
+*FvwmWinListAction Click2 Iconify
+*FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent
+*FvwmWinListUseSkipList
+*FvwmWinListGeometry +0-1
+        
+#------------------ FvwmTaskBar
+#Style "FvwmTaskBar" NoTitle,BorderWidth 4,HandleWidth 4,Sticky,StaysOnTop,WindowListSkip,CirculateSkip
+# I don't like the taskbar to stay to top, since it covers the bottom
+# part of Netscape in full-screen mode:
+#Style "FvwmTaskBar" NoTitle,BorderWidth 4,HandleWidth 4,Sticky,WindowListSkip,CirculateSkip
+
+*FvwmTaskBarGeometry +0-0
+*FvwmTaskBarFore Black
+*FvwmTaskBarBack #c3c3c3
+*FvwmTaskBarTipsFore black
+#*FvwmTaskBarTipsBack bisque
+*FvwmTaskBarTipsBack #c3c3c3
+*FvwmTaskBarFont -adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
+*FvwmTaskBarSelFont -adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+*FvwmTaskBarAction Click1 Iconify -1,Raise,Focus
+*FvwmTaskBarAction Click2 Iconify
+*FvwmTaskBarAction Click3 Module "FvwmIdent" FvwmIdent
+*FvwmTaskBarUseSkipList
+*FvwmTaskBarAutoStick
+*FvwmTaskBarStartName Start
+*FvwmTaskBarStartMenu StartMenu
+# Just for fun, let's use the Linux penguin for the Start button:
+*FvwmTaskBarStartIcon mini-penguin.xpm
+#*FvwmTaskBarStartIcon mini-exp.xpm
+*FvwmTaskBarShowTips
+*FvwmTaskBarMailProg xterm -e mail
+
+# Show Date in Taskbar (this fixes a Slackware bug that was reported in 2003...
+# better 17 years too late than never ;-)
+*FvwmTaskBarGoodyLoadablePlugins /usr/lib64/X11/fvwm95/plugins
+*FvwmTaskBarGoodyLoadableSymbol ShowDateModuleSymbol
+*FvwmTaskBarGoodyLoadableId .DATE
+*FvwmTaskBarShowDateModuleTip.DATE Date
+*FvwmTaskBarShowDateModuleCommand.DATE Exec xmessage `date`
+*FvwmTaskBarShowDateModuleClockFormat.DATE %H:%M
diff --git a/desktop/fvwm95/xinitrc.fvwm95 b/desktop/fvwm95/xinitrc.fvwm95
index b08bba4339..17a7670ee6 100644
--- a/desktop/fvwm95/xinitrc.fvwm95
+++ b/desktop/fvwm95/xinitrc.fvwm95
@@ -1,29 +1,38 @@
 #!/bin/sh
-# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+# Slackware FVWM95 xinitrc script
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
+# Uncomment this if you would like fvwm95 to launch in a dbus session.
+#dbus_cmd="dbus-launch --exit-with-session"
+
 # merge in defaults and keymaps
 
 if [ -f $sysresources ]; then
-    /usr/bin/xrdb -merge $sysresources
+    xrdb -merge $sysresources
 fi
 
 if [ -f $sysmodmap ]; then
-    /usr/bin/xmodmap $sysmodmap
+    xmodmap $sysmodmap
 fi
 
 if [ -f $userresources ]; then
-    /usr/bin/xrdb -merge $userresources
+    xrdb -merge $userresources
 fi
 
 if [ -f $usermodmap ]; then
-    /usr/bin/xmodmap $usermodmap
+    xmodmap $usermodmap
 fi
 
-# start some nice programs
+# start fvwm95
+
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  ck-launch-session $dbus_cmd /usr/bin/fvwm95
+else
+  $dbus_cmd /usr/bin/fvwm95
+fi
 
-exec /usr/bin/fvwm95
diff --git a/desktop/gkrellm-themes/README b/desktop/gkrellm-themes/README
new file mode 100644
index 0000000000..3ae243863e
--- /dev/null
+++ b/desktop/gkrellm-themes/README
@@ -0,0 +1 @@
+This is the complete collection of GKrellM themes from muhri.net
diff --git a/desktop/gkrellm-themes/gkrellm-themes.SlackBuild b/desktop/gkrellm-themes/gkrellm-themes.SlackBuild
new file mode 100644
index 0000000000..441b24df7d
--- /dev/null
+++ b/desktop/gkrellm-themes/gkrellm-themes.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Slackware build script for gkrellm-themes
+
+# Copyright 2020 Leonardo Citrolo, Italy
+# 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=gkrellm-themes
+VERSION=${VERSION:-20030129}
+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 GKrellM-skins
+tar xvf $CWD/GKrellM-Skins.tar.gz
+cd GKrellM-skins
+
+mkdir -p $PKG/usr/share/gkrellm2/themes
+for FILE in *gz; do
+  tar xf $FILE -C $PKG/usr/share/gkrellm2/themes \
+    --exclude CVS \
+    --exclude "*~" \
+    --exclude "*.swp" \
+    --exclude .xvpics
+done
+
+cd $PKG/usr/share/gkrellm2/themes
+chown -R root:root .
+# remove dangling symlinks
+find -L . -type l -exec rm -fv {} \;
+# fix permissions & unset setuid, setgid and sticky bits (leading double zero is required)
+find . -type d -exec chmod 00755 {} \;
+find . -type f -exec chmod 00644 {} \;
+
+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/desktop/gkrellm-themes/gkrellm-themes.info b/desktop/gkrellm-themes/gkrellm-themes.info
new file mode 100644
index 0000000000..05c18c4be3
--- /dev/null
+++ b/desktop/gkrellm-themes/gkrellm-themes.info
@@ -0,0 +1,10 @@
+PRGNAM="gkrellm-themes"
+VERSION="20030129"
+HOMEPAGE="http://www.muhri.net/gkrellm/"
+DOWNLOAD="http://www.muhri.net/gkrellm/GKrellM-Skins.tar.gz"
+MD5SUM="17c88c10cc320db2036720c90887690a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Leo C."
+EMAIL="leoc@gmx.com"
diff --git a/desktop/gkrellm-themes/slack-desc b/desktop/gkrellm-themes/slack-desc
new file mode 100644
index 0000000000..fb2915b219
--- /dev/null
+++ b/desktop/gkrellm-themes/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------------------------------------------------------|
+gkrellm-themes: gkrellm-themes (Themes for GKrellM from muhri.net)
+gkrellm-themes:
+gkrellm-themes: This is the complete collection of GKrellM themes from muhri.net
+gkrellm-themes:
+gkrellm-themes:
+gkrellm-themes:
+gkrellm-themes:
+gkrellm-themes:
+gkrellm-themes:
+gkrellm-themes: Homepage: http://www.muhri.net/gkrellm/
+gkrellm-themes:
diff --git a/desktop/glabels/README b/desktop/glabels/README
index f1eb7ee213..fc8831c15c 100644
--- a/desktop/glabels/README
+++ b/desktop/glabels/README
@@ -1,11 +1,12 @@
-gLabels is a GNU/Linux program for creating labels and business cards. It is
-designed to work with various laser/ink-jet peel-off label and business card
-sheets that you'll find at most office supply stores. gLabels is free software
-and is distributed under the terms of the GNU General Public License (GPL).
+gLabels is a GNU/Linux program for creating labels and business
+cards. It is designed to work with various laser/ink-jet peel-off
+label and business card sheets that you'll find at most office supply
+stores. gLabels is free software and is distributed under the terms of
+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/desktop/herbe/slack-desc b/desktop/herbe/slack-desc
new file mode 100644
index 0000000000..30dbe3f64e
--- /dev/null
+++ b/desktop/herbe/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------------------------------------------------------|
+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/herbstluftwm/README b/desktop/herbstluftwm/README
index 18b2a347df..2701a10375 100644
--- a/desktop/herbstluftwm/README
+++ b/desktop/herbstluftwm/README
@@ -5,6 +5,6 @@ monitor displays exactly one tag at a time.
 
 Configuration is achieved through bash scripting in the file
 ~/.config/herbstluftwm/autostart.  An example autostart file is located
-in /etc/xdg/herbstluftwm/ along with example scripts for use with the WM.
-Additional examples are available at https://www.herbstluftwm.org/ along
-with detailed documentation.
+in /etc/xdg/herbstluftwm/ along with example scripts for use with the
+WM.  Additional examples are available at https://www.herbstluftwm.org/
+along with detailed documentation.
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 5a3d059fa4..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.17.1}
+VERSION=${VERSION:-4.18.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,6 +66,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/i3-$VERSION.tar.gz
+patch -p0 < $CWD/i3-gaps.patch
 cd i3-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/desktop/i3-gaps/i3-gaps.info b/desktop/i3-gaps/i3-gaps.info
index 792b5bce7d..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.17.1"
+VERSION="4.18.3"
 HOMEPAGE="https://github.com/Airblader/i3"
-DOWNLOAD="https://github.com/Airblader/i3/archive/4.17.1/i3-4.17.1.tar.gz"
-MD5SUM="d58092b0c36e49f3a0bccb873dd8a2a3"
+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
new file mode 100644
index 0000000000..cf23d503d1
--- /dev/null
+++ b/desktop/i3-gaps/i3-gaps.patch
@@ -0,0 +1,23 @@
+--- 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));
+ 
+-#ifndef HAVE_strndup
++#ifndef HAVE_STRNDUP
+ /**
+  * Taken from FreeBSD
+  * Returns a pointer to a new string which is a duplicate of the
+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>
+ 
+-#ifndef HAVE_strndup
++#ifndef HAVE_STRNDUP
+ /*
+  * Taken from FreeBSD
+  * Returns a pointer to a new string which is a duplicate of the
diff --git a/desktop/i3/README b/desktop/i3/README
index 350415f0b3..64c5c1cab6 100644
--- a/desktop/i3/README
+++ b/desktop/i3/README
@@ -3,8 +3,8 @@ i3 is a tiling window manager, completely written from scratch.
 i3 was created because wmii, our favorite window manager at the time,
 didn't provide some features we wanted (multi-monitor done right,
 for example), had some bugs, didn't progress since quite some time and
-wasn't easy to hack at all (source code comments/documentation completely
-lacking). Still, we think the wmii developers and contributors did a
-great job. Thank you for inspiring us to create i3.
+wasn't easy to hack at all (source code comments/documentation
+completely lacking). Still, we think the wmii developers and
+contributors did a great job. Thank you for inspiring us to create i3.
 
 i3status is optional, but useful to provide a system status bar.
diff --git a/desktop/i3/add_HAVE_strndup.diff b/desktop/i3/add_HAVE_strndup.diff
new file mode 100644
index 0000000000..d780aec8d9
--- /dev/null
+++ b/desktop/i3/add_HAVE_strndup.diff
@@ -0,0 +1,11 @@
+--- include/libi3.h	2020-07-26 05:11:37.000000000 -0300
++++ include/libi3.h	2020-09-20 18:15:40.063201808 -0300
+@@ -341,6 +341,8 @@
+  */
+ uint32_t get_colorpixel(const char *hex) __attribute__((const));
+ 
++#define HAVE_strndup  1
++
+ #ifndef HAVE_strndup
+ /**
+  * Taken from FreeBSD
diff --git a/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild
index 5e80e76749..d37335bf75 100644
--- a/desktop/i3/i3.SlackBuild
+++ b/desktop/i3/i3.SlackBuild
@@ -27,7 +27,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=i3
-VERSION=${VERSION:-4.17.1}
+VERSION=${VERSION:-4.18.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,6 +72,10 @@ 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 {} \;
+  
+autoreconf -fi
+
+cat ${CWD}/add_HAVE_strndup.diff | patch -p0 || exit
 
 mkdir -p build
 ( cd build
diff --git a/desktop/i3/i3.info b/desktop/i3/i3.info
index c0a43c3691..261174f738 100644
--- a/desktop/i3/i3.info
+++ b/desktop/i3/i3.info
@@ -1,8 +1,8 @@
 PRGNAM="i3"
-VERSION="4.17.1"
+VERSION="4.18.3"
 HOMEPAGE="https://www.i3wm.org"
-DOWNLOAD="https://i3wm.org/downloads/i3-4.17.1.tar.bz2"
-MD5SUM="e550959e0900087b43fb366c35c2ed8b"
+DOWNLOAD="https://i3wm.org/downloads/i3-4.18.3.tar.bz2"
+MD5SUM="7437afcd40261332ce25de99cd5aa17c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu libev libxkbcommon xcb-util-xrm yajl perl-JSON-XS perl-AnyEvent"
diff --git a/desktop/i3blocks/i3blocks.SlackBuild b/desktop/i3blocks/i3blocks.SlackBuild
index 0dda1d1512..606b4269d2 100644
--- a/desktop/i3blocks/i3blocks.SlackBuild
+++ b/desktop/i3blocks/i3blocks.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for i3blocks
 
 # Copyright 2016 Andre Fernando, Indonesia
+# Copyright 2020 Manuel Argüelles, Panamá City, Panamá
 # 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=i3blocks
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,24 +70,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 {} \;
 
-for i in $CWD/patches/* ; do
-  patch -p0 < $i
-done
-
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
-  make clean all 
-
+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
+
 mv $PKG/etc/i3blocks.conf $PKG/etc/i3blocks.conf.new
 
-mv $PKG/usr/share/man $PKG/usr/man
-rmdir $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 CHANGELOG.md COPYING 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/desktop/i3blocks/i3blocks.info b/desktop/i3blocks/i3blocks.info
index 5db64a401b..e358b48bdd 100644
--- a/desktop/i3blocks/i3blocks.info
+++ b/desktop/i3blocks/i3blocks.info
@@ -1,10 +1,10 @@
 PRGNAM="i3blocks"
-VERSION="1.4"
+VERSION="1.5"
 HOMEPAGE="http://vivien.github.io/i3blocks"
-DOWNLOAD="https://github.com/vivien/i3blocks/releases/download/1.4/i3blocks-1.4.tar.gz"
-MD5SUM="27329578aed80dc716e3391d675967a4"
+DOWNLOAD="https://github.com/vivien/i3blocks/archive/1.5/i3blocks-1.5.tar.gz"
+MD5SUM="5aa965d2c43db72e46c7410ad0685a20"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pandoc"
-MAINTAINER="Andre Fernando"
-EMAIL="ando344@gmail.com"
+REQUIRES=""
+MAINTAINER="Manuel Argüelles"
+EMAIL="manuel.arguelles@gmail.com"
diff --git a/desktop/i3blocks/patches/prefix_usr.patch b/desktop/i3blocks/patches/prefix_usr.patch
deleted file mode 100644
index 0c172cc561..0000000000
--- a/desktop/i3blocks/patches/prefix_usr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2016-12-12 19:18:05.357761324 +0700
-+++ prefix_usr	2016-12-12 19:18:42.467759669 +0700
-@@ -1,7 +1,7 @@
- RELEASE_VERSION = 1.4
- 
- ifndef PREFIX
--  PREFIX=/usr/local
-+  PREFIX=/usr
- endif
- ifndef SYSCONFDIR
-   ifeq ($(PREFIX),/usr)
diff --git a/desktop/i3lock/README b/desktop/i3lock/README
index adf8e935d1..7f1042d031 100644
--- a/desktop/i3lock/README
+++ b/desktop/i3lock/README
@@ -1,7 +1,7 @@
 i3lock is a simple screen locker like slock.
 
-This SlackBuild patches i3lock to not to use PAM, and is as such usable in
-Slackware.
-For verifying the password it uses shadow instead. Because of that, it needs
-suid permissions, but those privileges are dropped as soon as possible.
-The code for this was taken from slock. See the patch and LICENSE-slock.
+This SlackBuild patches i3lock to not to use PAM, and is as such
+usable in Slackware.  For verifying the password it uses shadow
+instead. Because of that, it needs suid permissions, but those
+privileges are dropped as soon as possible.  The code for this was
+taken from slock. See the patch and LICENSE-slock.
diff --git a/desktop/i3minator/README b/desktop/i3minator/README
index 33e1ae02c5..b9fd7dce27 100644
--- a/desktop/i3minator/README
+++ b/desktop/i3minator/README
@@ -1,3 +1,4 @@
 i3minator is a simple "workspace manager" for i3.
 
-It allows to quickly manage workspaces defining windows and their layout.
+It allows to quickly manage workspaces defining windows and their
+layout.
diff --git a/desktop/icewm/README b/desktop/icewm/README
index 5f4f763a9a..be3fd24f98 100644
--- a/desktop/icewm/README
+++ b/desktop/icewm/README
@@ -1,14 +1,16 @@
 IceWM is a window manager for the X Window System.  The goal of IceWM 
 is speed, simplicity, and not getting in the user's way.
 
-Because icewm users are perhaps less likely to use components of other
-desktop environments, the following could be considered a recommendation
-for addition to /etc/sudoers (use visudo(8) to edit it), which will allow
-all members of the "power" group to use icewm's built-in methods for 
-shutdown, reboot, and sleep.
+Because icewm users are perhaps less likely to use components of
+other desktop environments, the following could be considered a
+recommendation for addition to /etc/sudoers (use visudo(8) to edit
+it), which will allow all members of the "power" group to use icewm's
+built-in methods for shutdown, reboot, and sleep.
 
-  Cmnd_Alias    POWERMGMT = /sbin/halt, /sbin/reboot, /sbin/poweroff, /usr/sbin/pm-suspend
-  %power ALL=(ALL) NOPASSWD: POWERMGMT
+Cmnd_Alias POWERMGMT = /sbin/halt, /sbin/reboot, \
+                       /sbin/poweroff, /usr/sbin/pm-suspend
+%power ALL=(ALL) NOPASSWD: POWERMGMT
 
-Some users might wish to have a polkit authentication agent or other things
-invoked at X startup - see /usr/share/icewm/startup for suggestions.
+Some users might wish to have a polkit authentication agent or
+other things invoked at X startup - see /usr/share/icewm/startup for
+suggestions.
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index ddcfa3b0f5..cde8702d8d 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for icewm
 
-# Copyright 2006-2019  Robby Workman  Northport, Alabama, USA
+# Copyright 2006-2020  Robby Workman  Northport, Alabama, 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=icewm
-VERSION=${VERSION:-1.5.5}
+VERSION=${VERSION:-1.6.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.lz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info
index 46e2750188..396edc52fd 100644
--- a/desktop/icewm/icewm.info
+++ b/desktop/icewm/icewm.info
@@ -1,8 +1,8 @@
 PRGNAM="icewm"
-VERSION="1.5.5"
+VERSION="1.6.6"
 HOMEPAGE="https://ice-wm.org/"
-DOWNLOAD="https://github.com/ice-wm/icewm/releases/download/1.5.5/icewm-1.5.5.tar.xz"
-MD5SUM="6eba94a7935a0531d2c14eeb1426aeef"
+DOWNLOAD="https://github.com/ice-wm/icewm/releases/download/1.6.6/icewm-1.6.6.tar.lz"
+MD5SUM="45e772e781a0d71d998367f8f5d8c9b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/icewm/patches/tweak-default-configs.diff b/desktop/icewm/patches/tweak-default-configs.diff
index bd8c10132d..4c51139db0 100644
--- a/desktop/icewm/patches/tweak-default-configs.diff
+++ b/desktop/icewm/patches/tweak-default-configs.diff
@@ -1,41 +1,41 @@
-diff -Nur icewm-1.5.5.orig/lib/keys.in icewm-1.5.5/lib/keys.in
---- icewm-1.5.5.orig/lib/keys.in	2019-06-06 17:42:00.019998596 -0500
-+++ icewm-1.5.5/lib/keys.in	2019-07-27 17:42:43.139090310 -0500
-@@ -13,8 +13,8 @@
- key "Alt+Ctrl+b"			xdg-open about:blank
- key "Alt+Ctrl+s"			xdg-open https://www.google.com
+diff -Nur icewm-1.6.6.orig/lib/keys.in icewm-1.6.6/lib/keys.in
+--- icewm-1.6.6.orig/lib/keys.in	2020-05-29 11:47:00.000000000 -0500
++++ icewm-1.6.6/lib/keys.in	2020-05-30 00:37:31.279645822 -0500
+@@ -12,8 +12,8 @@
+ key "Alt+Ctrl+b"            xdg-open about:blank
+ key "Alt+Ctrl+s"            xdg-open https://www.google.com
  
--key "Super+KP_Subtract"			amixer sset Master 5%-
--key "Super+KP_Add"			amixer sset Master 5%+
-+key "Super+KP_Subtract"			pamixer -d 5
-+key "Super+KP_Add"			pamixer -i 5
+-key "Super+KP_Subtract"     amixer sset Master 5%-
+-key "Super+KP_Add"          amixer sset Master 5%+
++key "Super+KP_Subtract"     pamixer -d 5
++key "Super+KP_Add"          pamixer -i 5
  
  # "Multimedia key" bindings for Xorg. Gather the keycodes of your
  # advanced function keys by watching the output of the xev command whilest
-@@ -23,11 +23,11 @@
+@@ -22,11 +22,11 @@
  # Note: some of them might have unwanted side effects through concurrency with
  # other listeners like systemd for the suspend key events
  #
--# key "XF86Standby"			/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
--# key "XF86Sleep"				/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
--key "XF86AudioLowerVolume"		amixer sset Master 5%-
--key "XF86AudioRaiseVolume"		amixer sset Master 5%+
--key "XF86AudioMute"			amixer sset Master toggle
-+# key "XF86Standby"			/bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
-+# key "XF86Sleep"				/bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
-+key "XF86AudioLowerVolume"		pamixer -d 5
-+key "XF86AudioRaiseVolume"		pamixer -i 5
-+key "XF86AudioMute"			pamixer -t
- key "XF86HomePage"			xdg-open about:blank
- key "XF86Search"			xdg-open https://www.google.com
- key "XF86Eject"				eject
-diff -Nur icewm-1.5.5.orig/src/default.h icewm-1.5.5/src/default.h
---- icewm-1.5.5.orig/src/default.h	2019-06-06 17:42:00.043999061 -0500
-+++ icewm-1.5.5/src/default.h	2019-07-27 17:36:10.134553913 -0500
+-# key "XF86Standby"         /bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
+-# key "XF86Sleep"           /bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
+-key "XF86AudioLowerVolume"  amixer sset Master 5%-
+-key "XF86AudioRaiseVolume"  amixer sset Master 5%+
+-key "XF86AudioMute"         amixer sset Master toggle
++# key "XF86Standby"         /bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
++# key "XF86Sleep"           /bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
++key "XF86AudioLowerVolume"  pamixer -d 5
++key "XF86AudioRaiseVolume"  pamixer -i 5
++key "XF86AudioMute"         pamixer -t
+ key "XF86HomePage"          xdg-open about:blank
+ key "XF86Search"            xdg-open https://www.google.com
+ key "XF86Eject"             eject
+diff -Nur icewm-1.6.6.orig/src/default.h icewm-1.6.6/src/default.h
+--- icewm-1.6.6.orig/src/default.h	2020-05-29 11:47:00.000000000 -0500
++++ icewm-1.6.6/src/default.h	2020-05-30 00:38:53.408234561 -0500
 @@ -184,9 +184,9 @@
+ XSV(const char *, logoutCommand,                0)
  XSV(const char *, logoutCancelCommand,          0)
  #if defined(__linux__)
- // use shell code since those are wrapped through shell in YWindowManager::execAfterFork
 -XSV(const char *, shutdownCommand,              "test -e /run/systemd/system && systemctl poweroff")
 -XSV(const char *, rebootCommand,                "test -e /run/systemd/system && systemctl reboot")
 -XSV(const char *, suspendCommand,               "test -e /run/systemd/system && systemctl suspend")
diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm
index 18d62cfa72..f4ca6237ec 100644
--- a/desktop/icewm/xinitrc.icewm
+++ b/desktop/icewm/xinitrc.icewm
@@ -11,19 +11,19 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 [ -f $userresources ] && /usr/bin/xrdb -merge $userresources
 [ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
 
-# Create default user directory & populate it if it does not already exist
-if [ ! -d $HOME/.icewm ]; then
-  mkdir $HOME/.icewm
-  for FILE in keys menu preferences toolbar winoptions;
-    do cat /usr/share/icewm/$FILE > $HOME/.icewm/$FILE;
-  done
-fi
+# Create default user directory & populate it if needed
+mkdir -p ${HOME}/.icewm
+for FILE in keys menu preferences shutdown startup toolbar winoptions ; do 
+  if [ ! -e ${HOME}/.icewm/${FILE} ]; then
+    cat /usr/share/icewm/${FILE} > ${HOME}/.icewm/${FILE} ;
+  fi
+done
 
 # Start IceWM
 icewmbg &
 icewmtray &
 
-if [ -z "$XDG_SESSION_COOKIE" -a -x /usr/bin/ck-launch-session ]; then
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
   ck-launch-session dbus-launch --exit-with-session icewm-session
 else
   exec icewm-session
diff --git a/desktop/idesk/README b/desktop/idesk/README
index 64137c3a5e..b599ea4476 100644
--- a/desktop/idesk/README
+++ b/desktop/idesk/README
@@ -1,8 +1,9 @@
 idesk (draws desktop icons on X root window)
 
-Idesk is program that draws desktop icons. Each icon will execute a shell
-command on a configurable action. The icons can be moved on the desktop
-by dragging them, and the icons will remember their positions on start-up.
+Idesk is program that draws desktop icons. Each icon will execute a
+shell command on a configurable action. The icons can be moved on the
+desktop by dragging them, and the icons will remember their positions
+on start-up.
 
-Before idesk can be started, it requires a config file in ~/.ideskrc. See
-the README and examples/ in /usr/doc/idesk-$VERSION.
+Before idesk can be started, it requires a config file in
+~/.ideskrc. See the README and examples/ in /usr/doc/idesk-$VERSION.
diff --git a/desktop/imgur-screenshot/imgur-screenshot.SlackBuild b/desktop/imgur-screenshot/imgur-screenshot.SlackBuild
index 28e94d5454..b5eb5375c8 100644
--- a/desktop/imgur-screenshot/imgur-screenshot.SlackBuild
+++ b/desktop/imgur-screenshot/imgur-screenshot.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for imgur-screenshot.
 #
-# Copyright 2016-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-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=imgur-screenshot
-VERSION=${VERSION:-1.7.4}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,10 +55,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 patch -p1 < auto-update.patch
 
 install -d $PKG/usr/bin
-install -D -m755 imgur-screenshot.sh $PKG/usr/bin/imgur-screenshot
+install -D -m755 imgur-screenshot $PKG/usr/bin/imgur-screenshot
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CONTRIBUTING.md LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION/
+cp CONTRIBUTING.md LICENSE.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/desktop/imgur-screenshot/imgur-screenshot.info b/desktop/imgur-screenshot/imgur-screenshot.info
index 0d2066ad09..959b7718f2 100644
--- a/desktop/imgur-screenshot/imgur-screenshot.info
+++ b/desktop/imgur-screenshot/imgur-screenshot.info
@@ -1,10 +1,10 @@
 PRGNAM="imgur-screenshot"
-VERSION="1.7.4"
+VERSION="2.0.0"
 HOMEPAGE="https://github.com/jomo/imgur-screenshot/"
-DOWNLOAD="https://github.com/jomo/imgur-screenshot/archive/v1.7.4/imgur-screenshot-1.7.4.tar.gz"
-MD5SUM="0b024ce051c3da34248d829098deb7fe"
+DOWNLOAD="https://github.com/jomo/imgur-screenshot/archive/v2.0.0/imgur-screenshot-2.0.0.tar.gz"
+MD5SUM="f5909bee4dfc3ff1fc4e2f3b0206de4e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="scrot xclip"
+REQUIRES="jq scrot xclip"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/ion/README b/desktop/ion/README
index a5e4a6e77e..b1661e1aa2 100644
--- a/desktop/ion/README
+++ b/desktop/ion/README
@@ -1,15 +1,15 @@
-Ion is a tiling (no overlapping windows) window manager that also has
-PWM-style tabbed frames which can contain multiple client windows. These
-features help to keep windows organized and to switch quickly between them.
-Ion was designed primarily as an efficient and unobtrusive window manager 
-for users who prefer the keyboard. 
+Ion is a tiling (no overlapping windows) window manager that
+also has PWM-style tabbed frames which can contain multiple client
+windows. These features help to keep windows organized and to switch
+quickly between them.  Ion was designed primarily as an efficient and
+unobtrusive window manager for users who prefer the keyboard.
 
 This is the latest stable release of Ion (3). A pwm3 binary is built
-too, which starts Ion with floating workspaces as the default, thus replacing
-the PWM window manager.
+too, which starts Ion with floating workspaces as the default, thus
+replacing the PWM window manager.
 
-Please note that the author of Ion stopped all development and support for
-this tool - even its web page has been taken offline.
+Please note that the author of Ion stopped all development and support
+for this tool - even its web page has been taken offline.
 
-A community effort started a forked project called "notion", which can be
-found at http://notion.sourceforge.net/
+A community effort started a forked project called "notion", which can
+be found at http://notion.sourceforge.net/
diff --git a/desktop/j4-dmenu-desktop/README b/desktop/j4-dmenu-desktop/README
index 5389503ddf..f3d8ecde09 100644
--- a/desktop/j4-dmenu-desktop/README
+++ b/desktop/j4-dmenu-desktop/README
@@ -5,8 +5,8 @@ is to find .desktop files and offer you a menu to start an application
 using dmenu.
 
 When j4-dmenu-desktop starts an application that runs in a terminal,
-by default it uses i3-sensible-terminal if it's installed on the build
-host, or xterm if not. If you'd rather use a different terminal emulator,
-set TERMINAL in the script's environment. Example:
+by default it uses i3-sensible-terminal if it's installed on the
+build host, or xterm if not. If you'd rather use a different terminal
+emulator, set TERMINAL in the script's environment. Example:
 
 # TERMINAL=urxvt ./j4-dmenu-desktop.SlackBuild
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 6e3aabda52..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.1.0}
+VERSION=${VERSION:-4.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/jgmenu/jgmenu.info b/desktop/jgmenu/jgmenu.info
index e3b23b6a24..a2de36d5f3 100644
--- a/desktop/jgmenu/jgmenu.info
+++ b/desktop/jgmenu/jgmenu.info
@@ -1,8 +1,8 @@
 PRGNAM="jgmenu"
-VERSION="4.1.0"
+VERSION="4.3.0"
 HOMEPAGE="https://www.github.com/johanmalm/jgmenu/"
-DOWNLOAD="https://github.com/johanmalm/jgmenu/archive/v4.1.0/jgmenu-4.1.0.tar.gz"
-MD5SUM="5ad9a93befe87816cf00cdaf264b9ff3"
+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/network/weboob/doinst.sh b/desktop/kdocker/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/network/weboob/doinst.sh
+++ b/desktop/kdocker/doinst.sh
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/desktop/kdocker/slack-desc b/desktop/kdocker/slack-desc
new file mode 100644
index 0000000000..fba8f28304
--- /dev/null
+++ b/desktop/kdocker/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------------------------------------------------------|
+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/keynav/README b/desktop/keynav/README
index bae83be5ba..2cd889a67e 100644
--- a/desktop/keynav/README
+++ b/desktop/keynav/README
@@ -1,12 +1,11 @@
 keynav turns your keyboard into a fast pointer mover.
 
-You select a piece of the screen. The screen is initially wholly selected.
-One move will cut that region by half. A move is a direction: up, down, left,
-and right.
-Once you're done moving, you simply indicate that you want to move. Boom,
-cursor moves.
+You select a piece of the screen. The screen is initially wholly
+selected.  One move will cut that region by half. A move is a
+direction: up, down, left, and right.  Once you're done moving, you
+simply indicate that you want to move. Boom, cursor moves.
 
 keynav is geared towards selecting a piece of the screen very quickly.
-You are selecting a region by cutting the previous region in half. This gives
-you logarithmic scaling. High resolution screens incur about the same number
-of moves to select an area as smaller screens do.
+You are selecting a region by cutting the previous region in half. This
+gives you logarithmic scaling. High resolution screens incur about the
+same number of moves to select an area as smaller screens do.
diff --git a/desktop/kfaenza-icon-theme/kfaenza-icon-theme.SlackBuild b/desktop/kfaenza-icon-theme/kfaenza-icon-theme.SlackBuild
index b5d232a22d..c6767a1b83 100644
--- a/desktop/kfaenza-icon-theme/kfaenza-icon-theme.SlackBuild
+++ b/desktop/kfaenza-icon-theme/kfaenza-icon-theme.SlackBuild
@@ -61,4 +61,11 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/kupfer/kupfer.SlackBuild b/desktop/kupfer/kupfer.SlackBuild
index 8c8c0f2317..8298e218c0 100644
--- a/desktop/kupfer/kupfer.SlackBuild
+++ b/desktop/kupfer/kupfer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kupfer
 
-# Copyright 2018 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,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kupfer
-VERSION=${VERSION:-v319}
+VERSION=${VERSION:-v320}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,8 +40,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -51,12 +52,13 @@ find -L . \
 
 ./waf configure \
   --prefix=/usr \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --no-update-mime
 ./waf build
 ./waf install --destdir=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a README.rst \
+cp -a COPYING README.rst \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cd Documentation
 sed -i 's/rst2html5 /rst2html5.py /' Makefile
diff --git a/desktop/kupfer/kupfer.info b/desktop/kupfer/kupfer.info
index 159866a35f..5b72a72083 100644
--- a/desktop/kupfer/kupfer.info
+++ b/desktop/kupfer/kupfer.info
@@ -1,8 +1,8 @@
 PRGNAM="kupfer"
-VERSION="v319"
+VERSION="v320"
 HOMEPAGE="https://kupferlauncher.github.io/"
-DOWNLOAD="https://github.com/kupferlauncher/kupfer/releases/download/v319/kupfer-v319.tar.xz"
-MD5SUM="e4e383f654257b8fa2f3e7c590c135f9"
+DOWNLOAD="https://github.com/kupferlauncher/kupfer/releases/download/v320/kupfer-v320.tar.gz"
+MD5SUM="0dfebe1a4f27fdb62278dbf4fb5243d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dbus-python3 docutils pygobject3-python3 pyxdg"
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/lemonbar/README b/desktop/lemonbar/README
index aa62ad655a..716d52dbd2 100644
--- a/desktop/lemonbar/README
+++ b/desktop/lemonbar/README
@@ -1,3 +1,4 @@
-lemonbar (formerly known as bar) is a lightweight bar entirely based on XCB.
-Provides full UTF-8 support, basic formatting, RandR, and Xinerama support,
-and EWMH compliance without wasting your precious memory.
+lemonbar (formerly known as bar) is a lightweight bar entirely based
+on XCB.  Provides full UTF-8 support, basic formatting, RandR, and
+Xinerama support, and EWMH compliance without wasting your precious
+memory.
diff --git a/desktop/libqtxdg/README b/desktop/libqtxdg/README
index 1363ee813b..e836319ae9 100644
--- a/desktop/libqtxdg/README
+++ b/desktop/libqtxdg/README
@@ -1,6 +1,7 @@
-libqtxdg is a Qt 5 implementation of freedesktop.org XDG specifications.
+libqtxdg is a Qt 5 implementation of freedesktop.org XDG
+specifications.
 
-The library is able to use GTK+ icon theme caches for faster icon lookup. The
-cache file can be generated with utility gtk-update-icon-cache on a theme
-directory. If the cache is not present, corrupted, or outdated, the normal
-slow lookup is still run.
+The library is able to use GTK+ icon theme caches for faster
+icon lookup. The cache file can be generated with utility
+gtk-update-icon-cache on a theme directory. If the cache is not
+present, corrupted, or outdated, the normal slow lookup is still run.
diff --git a/desktop/lumina/README b/desktop/lumina/README
index a734ed7826..e5d6c1def2 100644
--- a/desktop/lumina/README
+++ b/desktop/lumina/README
@@ -1,7 +1,7 @@
 The Lumina Desktop Environment (Lumina for short) is a lightweight,
-XDG-compliant, BSD-licensed desktop environment that focuses specifically
-on streamlining the ability to get work done while minimizing system
-overhead.
+XDG-compliant, BSD-licensed desktop environment that focuses
+specifically on streamlining the ability to get work done while
+minimizing system overhead.
 
 It is specifically designed for PC-BSD(r) and FreeBSD, but has also
 been ported to many other BSD and Linux operating systems. It is based
diff --git a/desktop/lumina/lumina.SlackBuild b/desktop/lumina/lumina.SlackBuild
index 73a9f16d48..ab2dc77cb1 100644
--- a/desktop/lumina/lumina.SlackBuild
+++ b/desktop/lumina/lumina.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lumina
 
-# 2019, updated by Chris Abela, Malta, <kristofru@gmail.com>
+# 2019, 2020, updated by Chris Abela, Malta, <kristofru@gmail.com>
 # Sasongko Bawono <sasongko262@gmail.com>
 
 # Thanks to :
@@ -28,7 +28,7 @@
 # not, see <https://www.gnu.org/licenses/>.
 
 PRGNAM=lumina
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/lumina/lumina.info b/desktop/lumina/lumina.info
index 967d765fb4..b15daf5095 100644
--- a/desktop/lumina/lumina.info
+++ b/desktop/lumina/lumina.info
@@ -1,8 +1,8 @@
 PRGNAM="lumina"
-VERSION="1.5.0"
+VERSION="1.6.0"
 HOMEPAGE="https://lumina-desktop.org/"
-DOWNLOAD="https://github.com/trueos/lumina/archive/v1.5.0/lumina-1.5.0.tar.gz"
-MD5SUM="cf770b64ab43f239f4f3905b8b8b3b07"
+DOWNLOAD="https://github.com/trueos/lumina/archive/v1.6.0/lumina-1.6.0.tar.gz"
+MD5SUM="5f27df60bc402c919ddff0f50cba2f0c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5-webkit"
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/macopix/README b/desktop/macopix/README
index e37dacb0ee..c76b9ee99d 100644
--- a/desktop/macopix/README
+++ b/desktop/macopix/README
@@ -1,4 +1,6 @@
-MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application.
+MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot
+application.
 
-NOTE: You cannot start MaCoPiX w/o any mascots. Please download at least
-one mascot from http://rosegray.sakura.ne.jp/macopix/dl-e.html#mascot.
+NOTE: You cannot start MaCoPiX w/o any mascots. Please download at
+least one mascot from:
+http://rosegray.sakura.ne.jp/macopix/dl-e.html#mascot
diff --git a/desktop/matrixgl/README b/desktop/matrixgl/README
index 44262ed809..b53bfda63e 100644
--- a/desktop/matrixgl/README
+++ b/desktop/matrixgl/README
@@ -1,3 +1,3 @@
-Matrixgl is a free, open source 3D screensaver based on The Matrix Reloaded.
-It supports widescreen setups, and can be run on Windows, Mac OSX, Linux, BSD,
-and many other Unix based operating systems.
+Matrixgl is a free, open source 3D screensaver based on The Matrix
+Reloaded.  It supports widescreen setups, and can be run on Windows,
+Mac OSX, Linux, BSD, and many other Unix based operating systems.
diff --git a/desktop/meliae-icon-theme/meliae-icon-theme.SlackBuild b/desktop/meliae-icon-theme/meliae-icon-theme.SlackBuild
index 228087b0a3..f1879c6f0f 100644
--- a/desktop/meliae-icon-theme/meliae-icon-theme.SlackBuild
+++ b/desktop/meliae-icon-theme/meliae-icon-theme.SlackBuild
@@ -55,4 +55,11 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/menulibre/README b/desktop/menulibre/README
new file mode 100644
index 0000000000..1ecf1e653f
--- /dev/null
+++ b/desktop/menulibre/README
@@ -0,0 +1,11 @@
+menulibre (advanced FreeDesktop.org compliant menu editor)
+
+menulibre is an advanced menu editor that provides modern features in
+a clean, easy-to-use interface.
+
+It allows you to create or modify launchers, add, remove and adjust
+desktop actions and rearrange menu items.
+
+NOTE: python-distutils-extra needs to be built with python3
+support by passing PYTHON3=yes ./python-distutils-extra.SlackBuild when
+building.
diff --git a/desktop/menulibre/menulibre.SlackBuild b/desktop/menulibre/menulibre.SlackBuild
new file mode 100644
index 0000000000..a7461ba843
--- /dev/null
+++ b/desktop/menulibre/menulibre.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for menulibre
+
+# Copyright 2020 Sasha Abbott sashaa@disroot.org
+#
+# 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.
+
+# Modified by slackbuilds.org
+
+PRGNAM=menulibre
+VERSION=${VERSION:-2.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.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
+
+mv $PKG/usr/share/man $PKG/usr/man
+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 $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/menulibre/menulibre.info b/desktop/menulibre/menulibre.info
new file mode 100644
index 0000000000..8b09acd65e
--- /dev/null
+++ b/desktop/menulibre/menulibre.info
@@ -0,0 +1,10 @@
+PRGNAM="menulibre"
+VERSION="2.2.1"
+HOMEPAGE="https://bluesabre.org/menulibre/"
+DOWNLOAD="https://github.com/bluesabre/menulibre/releases/download/menulibre-2.2.1/menulibre-2.2.1.tar.gz"
+MD5SUM="8460ea844a5998c5f722bccb5ce8627a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 pygobject3-python3 psutil python-distutils-extra gnome-menus"
+MAINTAINER="Sasha Abbott"
+EMAIL="sashaa@disroot.org"
diff --git a/desktop/menulibre/slack-desc b/desktop/menulibre/slack-desc
new file mode 100644
index 0000000000..d963e8be2f
--- /dev/null
+++ b/desktop/menulibre/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------------------------------------------------------|
+menulibre: menulibre (advanced FreeDesktop.org compliant menu editor)
+menulibre:
+menulibre: menulibre is an advanced menu editor that provides modern features
+menulibre: in a clean, easy-to-use interface.
+menulibre:
+menulibre: Website: https://bluesabre.org/MenuLibre/
+menulibre:
+menulibre:
+menulibre:
+menulibre:
+menulibre:
diff --git a/desktop/mimi/README b/desktop/mimi/README
index 18281ef75d..2c5b62240e 100644
--- a/desktop/mimi/README
+++ b/desktop/mimi/README
@@ -1,12 +1,13 @@
-mimi is an improved verision of xdg-open. The original xdg-open works horribly
-without DE environment.
+mimi is an improved verision of xdg-open. The original xdg-open works
+horribly without DE environment.
 
 Note:
 
 This WILL overwrite xdg-open. If you desire to go back to the original
 xdg-open script, be sure to reinstall xdg-utils from Slackware's repo.
 
-You specifically define what applications should be opened by which mime type.
-Simply make a text file at "~/.config/mimi/mime.conf" and edit it to your
-liking. If you don't feel like doing this, mimi will automatically find the
-best suited desktop file for the file. More info on the Github page.
+You specifically define what applications should be opened by which
+mime type.  Simply make a text file at "~/.config/mimi/mime.conf" and
+edit it to your liking. If you don't feel like doing this, mimi will
+automatically find the best suited desktop file for the file. More info
+on the Github page.
diff --git a/desktop/moka-icon-theme/README b/desktop/moka-icon-theme/README
index f00689071e..13f03c3879 100644
--- a/desktop/moka-icon-theme/README
+++ b/desktop/moka-icon-theme/README
@@ -1,6 +1,7 @@
 moka-icon-theme (gnome icon theme)
 
-Moka is a stylized FreeDesktop icon set, created with simplicity in mind.
+Moka is a stylized FreeDesktop icon set, created with simplicity in
+mind.
 
 Moka was created with minimal, flat style, using simple geometry &
 colours. Each icon has been pixel-perfectly-designed and for the best
diff --git a/desktop/moka-icon-theme/slack-desc b/desktop/moka-icon-theme/slack-desc
index ab725c476f..fbff01d9e1 100644
--- a/desktop/moka-icon-theme/slack-desc
+++ b/desktop/moka-icon-theme/slack-desc
@@ -16,3 +16,4 @@ moka-icon-theme: icon set "Faba Icon Theme".
 moka-icon-theme:
 moka-icon-theme: Homepage: https://github.com/snwh/moka-icon-theme
 moka-icon-theme:
+moka-icon-theme:
diff --git a/desktop/moka-minimal/README b/desktop/moka-minimal/README
index 9fceaec4cd..6be584f9a1 100644
--- a/desktop/moka-minimal/README
+++ b/desktop/moka-minimal/README
@@ -5,6 +5,7 @@ Grayscale versions of Moka & Faba icons (already in SlackBuilds).
 Moka inherits Faba, so index.theme modified to inherit Faba-Minimal,
 which inherits gnome, in that order.
 
-This is not dependent on packages 'faba-icon-theme' or 'moka-icon-theme'.
+This is not dependent on packages 'faba-icon-theme' or
+'moka-icon-theme'.
 
 NOTE: p7zip is used only to extract the source.
diff --git a/desktop/moka-themes/README b/desktop/moka-themes/README
index 9d275f5add..29db5fe6d4 100644
--- a/desktop/moka-themes/README
+++ b/desktop/moka-themes/README
@@ -1,6 +1,7 @@
 moka-themes (GTK themes)
 
-Moka is an elegant and minimalistic theme suite for your GNU/Linux desktop.
+Moka is an elegant and minimalistic theme suite for your GNU/Linux
+desktop.
 
 The archive contains a GTK, an Emerald and an Openbox theme.
 
diff --git a/desktop/mousepad/README b/desktop/mousepad/README
index 638dcd5e46..ec574e9a54 100644
--- a/desktop/mousepad/README
+++ b/desktop/mousepad/README
@@ -1,6 +1,6 @@
-Mousepad is a simple, fast and easy-to-use text editor for the
-Xfce desktop environment, based on the Leafpad text editor.
+Mousepad is a simple, fast and easy-to-use text editor for the Xfce
+desktop environment, based on the Leafpad text editor.
 
-Mousepad includes complete support for UTF-8 text,
-the usual cut/copy/paste functionality, font selection support,
-the possibility to display line numbers, drag and drop and printing support. 
+Mousepad includes complete support for UTF-8 text, the usual
+cut/copy/paste functionality, font selection support, the possibility
+to display line numbers, drag and drop and printing support.
diff --git a/desktop/murrine/README b/desktop/murrine/README
index d5fe4d012e..364fca4b4d 100644
--- a/desktop/murrine/README
+++ b/desktop/murrine/README
@@ -1,6 +1,6 @@
 murrine (Gtk2 Cairo Engine)
 
-Murrine is an Italian word meaning colored glass patterns made by Venetian
-glass makers.  Murrine is a gtk2 engine that will make your desktop look
-like a beautiful Murrina (which is the italian singular of Murrine).
-
+Murrine is an Italian word meaning colored glass patterns made by
+Venetian glass makers.  Murrine is a gtk2 engine that will make your
+desktop look like a beautiful Murrina (which is the italian singular
+of Murrine).
diff --git a/desktop/neutral/README b/desktop/neutral/README
index 118def0ea3..91e66de3aa 100644
--- a/desktop/neutral/README
+++ b/desktop/neutral/README
@@ -1,3 +1,3 @@
-Neutral is a  modified and extended jaguarx fork xcursor theme with 
-grayscale animated watch. Looks lika a set of standard black *X cursors, 
-but smoothed and shadowed.
+Neutral is a  modified and extended jaguarx fork xcursor theme with
+grayscale animated watch. Looks lika a set of standard black *X
+cursors, but smoothed and shadowed.
diff --git a/desktop/nitrogen/README b/desktop/nitrogen/README
index 3a7d0fb5b5..9f914c0a13 100644
--- a/desktop/nitrogen/README
+++ b/desktop/nitrogen/README
@@ -1,4 +1,4 @@
-Nitrogen is a background browser and setter for X windows. 
+Nitrogen is a background browser and setter for X windows.
 
 - Multihead and Xinerama aware
 - Recall mode to be used via startup script
@@ -7,4 +7,5 @@ Nitrogen is a background browser and setter for X windows.
 - Command line set modes for script use
 - Inofify monitoring of browse directory
 - Lazy loading of thumbnails conserves memory
-- Can automatically determine best image mode (centered, scaled, or tiled)
+- Can automatically determine best image mode (centered, scaled,
+  or tiled)
diff --git a/desktop/nitrokey-app/README b/desktop/nitrokey-app/README
index 959d1c4357..86bfc0145d 100644
--- a/desktop/nitrokey-app/README
+++ b/desktop/nitrokey-app/README
@@ -1,14 +1,13 @@
-Nitrokey-app is the official open-source desktop application for
-the Nitrokey Pro and Storage security tokens.
+Nitrokey-app is the official open-source desktop application for the
+Nitrokey Pro and Storage security tokens.
 
-It sits on the system tray and allows you to configure TOTP and
-HOTP slots, TOTP interval and change the user/admin PIN for
-the token. Also it provides access to the token's internal
-password vault, so you can save up to 16 password on the token
-itself.
+It sits on the system tray and allows you to configure TOTP and HOTP
+slots, TOTP interval and change the user/admin PIN for the token. Also
+it provides access to the token's internal password vault, so you can
+save up to 16 password on the token itself.
 
 It ships with the udev rule to setup the USB token.
 
-Remove the old nitrokey-app first before atempting to compile, otherwise
-it will try to use the old libnitrokey from your previous installed version
-and not build a new libnitrokey.
+Remove the old nitrokey-app first before atempting to compile,
+otherwise it will try to use the old libnitrokey from your previous
+installed version and not build a new libnitrokey.
diff --git a/desktop/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild b/desktop/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild
index b12e167d67..5b7bbb52b0 100644
--- a/desktop/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild
+++ b/desktop/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild
@@ -59,4 +59,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/numix-icon-theme-circle/numix-icon-theme-circle.info b/desktop/numix-icon-theme-circle/numix-icon-theme-circle.info
index 8c9a2241cb..567cd4094d 100644
--- a/desktop/numix-icon-theme-circle/numix-icon-theme-circle.info
+++ b/desktop/numix-icon-theme-circle/numix-icon-theme-circle.info
@@ -1,5 +1,5 @@
 PRGNAM="numix-icon-theme-circle"
-VERSION="19.12.27"
+VERSION="20191227"
 HOMEPAGE="https://github.com/numixproject/numix-icon-theme-circle/"
 DOWNLOAD="https://github.com/numixproject/numix-icon-theme-circle/archive/19.12.27/numix-icon-theme-circle-19.12.27.tar.gz"
 MD5SUM="1a65e5f8b1b07cdac175bdd0d8eed195"
diff --git a/desktop/numix-icon-theme-square/numix-icon-theme-square.SlackBuild b/desktop/numix-icon-theme-square/numix-icon-theme-square.SlackBuild
index 948814297b..2a1d93251f 100644
--- a/desktop/numix-icon-theme-square/numix-icon-theme-square.SlackBuild
+++ b/desktop/numix-icon-theme-square/numix-icon-theme-square.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 #
-# Slackware build script for numix-icon-theme-square.
+# Slackware build script for numix-icon-theme.
 #
-# Copyright 2016-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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="numix-icon-theme-square"
-VERSION=${VERSION:-20170926}
+VERSION=${VERSION:-20191227}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -34,7 +35,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 CWD=$(pwd)
 
-SRCVER=${SRCVER:-1.0.1+11~201709261930~ubuntu17.10.1}
+SRCVER=${SRCVER:-19.12.27}
 
 set -e
 
@@ -42,7 +43,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/${PRGNAM}_${SRCVER}.tar.xz
+tar xvf $CWD/${PRGNAM}-${SRCVER}.tar.gz
 cd $PRGNAM-$SRCVER
 chown -R root:root .
 
@@ -50,7 +51,7 @@ mkdir -p $PKG/usr/share/icons
 cp -r Numix-Square Numix-Square-Light $PKG/usr/share/icons
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp debian/changelog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -58,4 +59,11 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/numix-icon-theme-square/numix-icon-theme-square.info b/desktop/numix-icon-theme-square/numix-icon-theme-square.info
index b17a6a47ed..d58fdd406e 100644
--- a/desktop/numix-icon-theme-square/numix-icon-theme-square.info
+++ b/desktop/numix-icon-theme-square/numix-icon-theme-square.info
@@ -1,10 +1,10 @@
 PRGNAM="numix-icon-theme-square"
-VERSION="20170926"
-HOMEPAGE="https://github.com/numixproject/numix-icon-theme-square"
-DOWNLOAD="https://launchpad.net/~numix/+archive/ubuntu/ppa/+files/numix-icon-theme-square_1.0.1+11~201709261930~ubuntu17.10.1.tar.xz"
-MD5SUM="8616514e4d40826427db2c529c50d02f"
+VERSION="20191227"
+HOMEPAGE="https://github.com/numixproject/numix-icon-theme-square/"
+DOWNLOAD="https://github.com/numixproject/numix-icon-theme-square/archive/19.12.27/numix-icon-theme-square-19.12.27.tar.gz"
+MD5SUM="ecd5154edb601b4c40a16b44b2030378"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="numix-icon-theme"
-MAINTAINER="Brenton Earl"
-EMAIL="brent@exitstatusone.com"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/desktop/numix-icon-theme/numix-icon-theme.SlackBuild b/desktop/numix-icon-theme/numix-icon-theme.SlackBuild
index c0c2ff4947..bb40155465 100644
--- a/desktop/numix-icon-theme/numix-icon-theme.SlackBuild
+++ b/desktop/numix-icon-theme/numix-icon-theme.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.
 
+# 20200406 bkw: modified by SlackBuilds.org
+
 PRGNAM="numix-icon-theme"
 VERSION=${VERSION:-20200320}
 BUILD=${BUILD:-1}
@@ -58,5 +60,13 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# 20200406 bkw: create doinst.sh. Normally makepkg does this, but it's
+# *painfully* slow and we have over 17,000 symlinks to process. It takes
+# 15 minutes for makepkg to run on my test system. The find command
+# below runs in 1.5 seconds and creates an identical doinst.sh. This is
+# a 1000x speedup.
 cd $PKG
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/numix-icon-theme/numix-icon-theme.info b/desktop/numix-icon-theme/numix-icon-theme.info
index eb4dbc7599..c50e704cd6 100644
--- a/desktop/numix-icon-theme/numix-icon-theme.info
+++ b/desktop/numix-icon-theme/numix-icon-theme.info
@@ -1,5 +1,5 @@
 PRGNAM="numix-icon-theme"
-VERSION="20.03.20"
+VERSION="20200320"
 HOMEPAGE="https://github.com/numixproject/numix-icon-theme/"
 DOWNLOAD="https://github.com/numixproject/numix-icon-theme/archive/20.03.20/numix-icon-theme-20.03.20.tar.gz"
 MD5SUM="6911cabee04cbbc3a555433759efa21d"
diff --git a/desktop/obbrowser/README b/desktop/obbrowser/README
index a7a3c40cdd..811cb25101 100644
--- a/desktop/obbrowser/README
+++ b/desktop/obbrowser/README
@@ -1,6 +1,7 @@
 obbrowser (openbox filesystem browser)
 
-Recursively browse the filesystem through openbox3 pipe menus, with icons.
+Recursively browse the filesystem through openbox3 pipe menus, with
+icons.
 
 Use with obmenu-generator menu scheme (also available on SlackBuilds)
 or default OpenBox menu scheme, otherwise it will be fairly useless.
diff --git a/desktop/obbrowser/obbrowser.SlackBuild b/desktop/obbrowser/obbrowser.SlackBuild
index baf1eb7110..c235cd6c4b 100644
--- a/desktop/obbrowser/obbrowser.SlackBuild
+++ b/desktop/obbrowser/obbrowser.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for obbrowser.
 #
-# Copyright 2015-2019  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=obbrowser
-VERSION=${VERSION:-0.12}
+VERSION=${VERSION:-0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/obbrowser/obbrowser.info b/desktop/obbrowser/obbrowser.info
index 0520b32a65..9fc06c9e69 100644
--- a/desktop/obbrowser/obbrowser.info
+++ b/desktop/obbrowser/obbrowser.info
@@ -1,8 +1,8 @@
 PRGNAM="obbrowser"
-VERSION="0.12"
+VERSION="0.13"
 HOMEPAGE="https://github.com/trizen/obbrowser/"
-DOWNLOAD="https://github.com/trizen/obbrowser/archive/0.12/obbrowser-0.12.tar.gz"
-MD5SUM="05c374440f99a5f93e1ed8ce0564a59c"
+DOWNLOAD="https://github.com/trizen/obbrowser/archive/0.13/obbrowser-0.13.tar.gz"
+MD5SUM="7799e4dbf08b55e45d822e606c6e57a7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-file-mimeinfo perl-data-dump perl-linux-desktop-files perl-gtk2"
diff --git a/desktop/obmenu-generator/obmenu-generator.SlackBuild b/desktop/obmenu-generator/obmenu-generator.SlackBuild
index 31d0633303..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.87}
+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 c381b1209a..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.87"
+VERSION="0.89"
 HOMEPAGE="https://github.com/trizen/obmenu-generator/"
-DOWNLOAD="https://github.com/trizen/obmenu-generator/archive/0.87/obmenu-generator-0.87.tar.gz"
-MD5SUM="cde7bc16687745e0f5a71692a0d93660"
+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/obmenu/README b/desktop/obmenu/README
index 26c3cb7511..29eba594e2 100644
--- a/desktop/obmenu/README
+++ b/desktop/obmenu/README
@@ -1,3 +1,3 @@
-Obmenu is a menu editor designed for openbox. It's easy to use, allowing to
-get the most out of the powerful Openbox menu system, while hiding the xml
-layout from the user.
+Obmenu is a menu editor designed for openbox. It's easy to use,
+allowing you to get the most out of the powerful Openbox menu system,
+while hiding the xml layout from the user.
diff --git a/desktop/obshutdown/README b/desktop/obshutdown/README
index dc508b034c..ee3a86ee3f 100644
--- a/desktop/obshutdown/README
+++ b/desktop/obshutdown/README
@@ -3,11 +3,11 @@ obshutdown (Openbox shutdown manager)
 obshutdown is GTK/Cairo based shutdown box styled for Openbox and other
 window managers.
 
-Config example file found at: /usr/share/obshutdown/example.rc.
+Config example file found at: /usr/share/obshutdown/example.rc
 Copy this file to your $HOME/.config/obshutdown/obshutdown.rc
 
 The themes for obshutdown buttons are: faenza, foom and oxygen.
 
 This package require "openbox" for logout command. Function "suspend"
-requires kernel support. All other options (restart, reboot and hibernate)
-are fully complete.
+requires kernel support. All other options (restart, reboot and
+hibernate) are fully complete.
diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild
index c71bc05f87..9e0819048b 100644
--- a/desktop/openbox/openbox.SlackBuild
+++ b/desktop/openbox/openbox.SlackBuild
@@ -25,6 +25,9 @@
 # Modifications for KDE and GNOME xinitrc scripts and Slackware 12.1
 # KDM session fixes by Phillip Warner <pc_warner@yahoo.com>
 
+# Patch for converting openbox-xdg-autostart from python2 to python3
+# is prepared by Igor Alexandrov <igor.alexandrov@outlook.com>
+
 # Currently maintained by Robby Workman <rw@rlworkman.net>
 
 PRGNAM=openbox
@@ -88,6 +91,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 {} \;
 
+# Convert openbox-xdg-autostart from python2 to python3
+patch -p1 < $CWD/py2-to-py3.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/desktop/openbox/py2-to-py3.patch b/desktop/openbox/py2-to-py3.patch
new file mode 100644
index 0000000000..060013e5d6
--- /dev/null
+++ b/desktop/openbox/py2-to-py3.patch
@@ -0,0 +1,121 @@
+--- a/data/autostart/openbox-xdg-autostart
++++ b/data/autostart/openbox-xdg-autostart
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # openbox-xdg-autostart runs things based on the XDG autostart specification
+ # Copyright (C) 2008       Dana Jansens
+@@ -28,9 +28,9 @@
+     from xdg.DesktopEntry import DesktopEntry
+     from xdg.Exceptions import ParsingError
+ except ImportError:
+-    print
+-    print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed"
+-    print
++    print()
++    print("ERROR:", ME, "requires PyXDG to be installed", file=sys.stderr)
++    print()
+     sys.exit(1)
+ 
+ def main(argv=sys.argv):
+@@ -51,7 +51,7 @@
+             try:
+                 autofile = AutostartFile(path)
+             except ParsingError:
+-                print "Invalid .desktop file: " + path
++                print("Invalid .desktop file: " + path)
+             else:
+                 if not autofile in files:
+                     files.append(autofile)
+@@ -99,9 +99,9 @@
+ 
+     def _alert(self, str, info=False):
+         if info:
+-            print "\t ", str
++            print("\t ", str)
+         else:
+-            print "\t*", str
++            print("\t*", str)
+ 
+     def _showInEnvironment(self, envs, verbose=False):
+         default = not self.de.getOnlyShowIn()
+@@ -146,14 +146,14 @@
+ 
+     def display(self, envs):
+         if self._shouldRun(envs):
+-            print "[*] " + self.de.getName()
++            print("[*] " + self.de.getName())
+         else:
+-            print "[ ] " + self.de.getName()
++            print("[ ] " + self.de.getName())
+         self._alert("File: " + self.path, info=True)
+         if self.de.getExec():
+             self._alert("Executes: " + self.de.getExec(), info=True)
+         self._shouldRun(envs, True)
+-        print
++        print()
+ 
+     def run(self, envs):
+         here = os.getcwd()
+@@ -165,34 +165,34 @@
+         os.chdir(here)
+ 
+ def show_help():
+-    print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..."
+-    print
+-    print "This tool will run xdg autostart .desktop files"
+-    print
+-    print "OPTIONS"
+-    print "  --list        Show a list of the files which would be run"
+-    print "                Files which would be run are marked with an asterix"
+-    print "                symbol [*].  For files which would not be run,"
+-    print "                information is given for why they are excluded"
+-    print "  --help        Show this help and exit"
+-    print "  --version     Show version and copyright information"
+-    print
+-    print "ENVIRONMENT specifies a list of environments for which to run autostart"
+-    print "applications.  If none are specified, only applications which do not "
+-    print "limit themselves to certain environments will be run."
+-    print
+-    print "ENVIRONMENT can be one or more of:"
+-    print "  GNOME         Gnome Desktop"
+-    print "  KDE           KDE Desktop"
+-    print "  ROX           ROX Desktop"
+-    print "  XFCE          XFCE Desktop"
+-    print "  Old           Legacy systems"
+-    print
++    print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...")
++    print()
++    print("This tool will run xdg autostart .desktop files")
++    print()
++    print("OPTIONS")
++    print("  --list        Show a list of the files which would be run")
++    print("                Files which would be run are marked with an asterix")
++    print("                symbol [*].  For files which would not be run,")
++    print("                information is given for why they are excluded")
++    print("  --help        Show this help and exit")
++    print("  --version     Show version and copyright information")
++    print()
++    print("ENVIRONMENT specifies a list of environments for which to run autostart")
++    print("applications.  If none are specified, only applications which do not ")
++    print("limit themselves to certain environments will be run.")
++    print()
++    print("ENVIRONMENT can be one or more of:")
++    print("  GNOME         Gnome Desktop")
++    print("  KDE           KDE Desktop")
++    print("  ROX           ROX Desktop")
++    print("  XFCE          XFCE Desktop")
++    print("  Old           Legacy systems")
++    print()
+ 
+ def show_version():
+-    print ME, VERSION
+-    print "Copyright (c) 2008        Dana Jansens"
+-    print
++    print(ME, VERSION)
++    print("Copyright (c) 2008        Dana Jansens")
++    print()
+ 
+ if __name__ == "__main__":
+         sys.exit(main())
diff --git a/desktop/oranchelo-icon-theme/oranchelo-icon-theme.SlackBuild b/desktop/oranchelo-icon-theme/oranchelo-icon-theme.SlackBuild
index bad0cdfc94..4d0aa66c74 100644
--- a/desktop/oranchelo-icon-theme/oranchelo-icon-theme.SlackBuild
+++ b/desktop/oranchelo-icon-theme/oranchelo-icon-theme.SlackBuild
@@ -62,4 +62,11 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild b/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild
index bce2ad2a94..1cbf14b5a1 100644
--- a/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild
+++ b/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild
@@ -85,4 +85,11 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed -e "s/@THEMES@/$THEMES/" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/parcellite/README b/desktop/parcellite/README
index 7c0ccd5f76..1cc5179c1c 100644
--- a/desktop/parcellite/README
+++ b/desktop/parcellite/README
@@ -1,18 +1,21 @@
-Parcellite is a lightweight GTK+ clipboard manager.  This is a stripped
-down, basic-features-only clipboard manager with a small memory footprint
-for those who like simplicity.
+Parcellite is a lightweight GTK+ clipboard manager.  This is a
+stripped down, basic-features-only clipboard manager with a small
+memory footprint for those who like simplicity.
 
 Parcellite features a clipboard CLI.  Unrecognized options and the
 contents of your standard input get copied to your clipboard.
 See the man page for examples.
 
-Features
-   * Keeps a clipboard history.
-   * Various view options to display items the way you like it.
-   * Daemon mode; guard your clipboard contents when you close applications.
-   * Global hotkeys to display your items quickly.
-   * Perform custom commands using clipboard contents.
+Features:
+ * Keeps a clipboard history.
+ * Various view options to display items the way you like it.
+ * Daemon mode; guard your clipboard contents when you close
+   applications.
+ * Global hotkeys to display your items quickly.
+ * Perform custom commands using clipboard contents.
+
+If you prefer using stock GTK icons (based on your GTK theme) as
+opposed to the new Parcellite icon, then simply run the script like
+this:
 
-If you prefer using stock GTK icons (based on your GTK theme) as opposed to
-the new Parcellite icon, then simply run the script like this:
   NOICON=YES ./parcellite.SlackBuild
diff --git a/desktop/peksystray/README b/desktop/peksystray/README
index f146813230..3e9427e1e3 100644
--- a/desktop/peksystray/README
+++ b/desktop/peksystray/README
@@ -1,9 +1,10 @@
-Peksystray is a small system tray (also called notification tray) designed
-for all the light window managers supporting docking. As more and more
-applications use a small icon in the system tray to provide additonal
-functionalities and information, it becomes useful for everyone to have
-access to them. While "heavy" window managers (Gnome, KDE...) come with a
-systrem tray embedded in the rest of the desktop, lighter window managers
-(WindowMaker, fluxbox...) don't have this feature. Peksystray is a very
-simple and light implementation of a system tray for any window manager
-supporting docking, conforming to the System Tray Freedesktop standard.
+Peksystray is a small system tray (also called notification tray)
+designed for all the light window managers supporting docking. As
+more and more applications use a small icon in the system tray to
+provide additonal functionalities and information, it becomes useful
+for everyone to have access to them. While "heavy" window managers
+(Gnome, KDE...) come with a systrem tray embedded in the rest of the
+desktop, lighter window managers (WindowMaker, fluxbox...) don't have
+this feature. Peksystray is a very simple and light implementation of
+a system tray for any window manager supporting docking, conforming to
+the System Tray Freedesktop standard.
diff --git a/desktop/pekwm/README b/desktop/pekwm/README
index f2413e11ff..fbc42c40f1 100644
--- a/desktop/pekwm/README
+++ b/desktop/pekwm/README
@@ -1,4 +1,5 @@
-The Pek Window Manager a lightweight window manager with tabs based on aewm++.
+The Pek Window Manager is a lightweight window manager with tabs,
+based on aewm++.
 
 - grouping windows in a single frame (tabbed windows);
 - keychains (multi-level keybindings);
diff --git a/desktop/perwindowlayoutd/README b/desktop/perwindowlayoutd/README
index e7a04b696d..ead8975ed8 100644
--- a/desktop/perwindowlayoutd/README
+++ b/desktop/perwindowlayoutd/README
@@ -1,5 +1,5 @@
-Sometimes you want to setup switching keyboard layouts using X server - because
-there is no DE plugin, or it's broken, or lacks needed functionality.  You can
-easily configure X server to switch keyboard layouts, but I could not find way
-of keeping layout for each window separately using only X server.  Hence this
-package.
+Sometimes you want to setup switching keyboard layouts using X server
+- because there is no DE plugin, or it's broken, or lacks needed
+functionality.  You can easily configure X server to switch keyboard
+layouts, but I could not find way of keeping layout for each window
+separately using only X server.  Hence this package.
diff --git a/desktop/pidgin-libnotify/README b/desktop/pidgin-libnotify/README
index 7c69604c32..65cd348321 100644
--- a/desktop/pidgin-libnotify/README
+++ b/desktop/pidgin-libnotify/README
@@ -1,4 +1,4 @@
-This plugin adds a libnotify interface to pidgin, enabling popups much like
-guifications. It has some configuration options, to show popups when a buddy
-signs on, on new messages and on new conversations only.
+This plugin adds a libnotify interface to pidgin, enabling popups much
+like guifications. It has some configuration options, to show popups
+when a buddy signs on, on new messages and on new conversations only.
 Don't forget to enable the plugin in Tools->Plugins.
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/plasma-eyasdp/README b/desktop/plasma-eyasdp/README
index 5fa7e48896..3173d42808 100644
--- a/desktop/plasma-eyasdp/README
+++ b/desktop/plasma-eyasdp/README
@@ -1,2 +1,2 @@
-eYaSDP is a plasmoid that allows to set a number of system buttons in your
-panel or desktop for comfortable and quick access.
+eYaSDP is a plasmoid that allows you to set a number of system buttons
+in your panel or desktop for comfortable and quick access.
diff --git a/desktop/plasma-runner-browsefirefoxbookmarks/README b/desktop/plasma-runner-browsefirefoxbookmarks/README
index 2416220f46..b74b42ac9d 100644
--- a/desktop/plasma-runner-browsefirefoxbookmarks/README
+++ b/desktop/plasma-runner-browsefirefoxbookmarks/README
@@ -1,2 +1,3 @@
-A Plasma Runner that matches Firefox's bookmarks. It provides a configure
-dialog to choose a profile and Firefox's bookmarks folders of interest.
+A Plasma Runner that matches Firefox's bookmarks. It provides a
+configure dialog to choose a profile and Firefox's bookmarks folders
+of interest.
diff --git a/desktop/pspshrink/README b/desktop/pspshrink/README
index 21747234f1..5423081572 100644
--- a/desktop/pspshrink/README
+++ b/desktop/pspshrink/README
@@ -4,5 +4,5 @@ pspshrink it's a GUI for converting PSP game images to .cso format.
 It allows you to shrink your isos to the cso format which is compatible
 with Devhook.
 
-An alternative to pspshrink is "ciso", a command-line tool also available
-on SlackBuilds.org.
+An alternative to pspshrink is "ciso", a command-line tool also
+available on SlackBuilds.org.
diff --git a/desktop/qt5ct/qt5ct.SlackBuild b/desktop/qt5ct/qt5ct.SlackBuild
index 28e8f662e2..6e876c42b6 100644
--- a/desktop/qt5ct/qt5ct.SlackBuild
+++ b/desktop/qt5ct/qt5ct.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qt5ct
 
-# Copyright 2016-2019, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2016-2020, 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=qt5ct
-VERSION=${VERSION:-0.41}
+VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/qt5ct/qt5ct.info b/desktop/qt5ct/qt5ct.info
index 412da031a3..a6dadd0194 100644
--- a/desktop/qt5ct/qt5ct.info
+++ b/desktop/qt5ct/qt5ct.info
@@ -1,8 +1,8 @@
 PRGNAM="qt5ct"
-VERSION="0.41"
+VERSION="1.1"
 HOMEPAGE="http://qt5ct.sourceforge.net"
-DOWNLOAD="http://prdownloads.sourceforge.net/qt5ct/qt5ct-0.41.tar.bz2"
-MD5SUM="604cfb9dabde4b25790774fe8e9fbb2a"
+DOWNLOAD="http://prdownloads.sourceforge.net/qt5ct/qt5ct-1.1.tar.bz2"
+MD5SUM="07681cbcdbc3397278fd253a23198397"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/desktop/qtcurve/README b/desktop/qtcurve/README
index 5d8c2ed4c8..957b589b43 100644
--- a/desktop/qtcurve/README
+++ b/desktop/qtcurve/README
@@ -1,12 +1,12 @@
-qtcurve (a native style engine for Qt and GTK )
+qtcurve (a native style engine for Qt and GTK)
 
 This is a set of widget styles for Qt4 and GTK2 based application.  The
 underlying work is based upon Blue/FreeCurve -  however, *extensive*
 modifications have been made.
 
-This slackbuild only build the QT4 and GTK2 engines with QT5 explicitly
-disabled as this version fails to build with the QT5 version available on SBo
-or the package from Alien.
+This slackbuild only build the QT4 and GTK2 engines with QT5
+explicitly disabled as this version fails to build with the QT5
+version available on SBo or the package from Alien.
 
-It replaces both the QtCurve-KD4 and QtCurve-GTK2 as they have been merged
-into one single source.
+It replaces both the QtCurve-KD4 and QtCurve-GTK2 as they have been
+merged into one single source.
diff --git a/desktop/qtpass/README b/desktop/qtpass/README
index d71dcfee74..b0c70e8736 100644
--- a/desktop/qtpass/README
+++ b/desktop/qtpass/README
@@ -1 +1,2 @@
-QtPass is a multi-platform GUI for pass, the standard unix password manager.
+QtPass is a multi-platform GUI for pass, the standard unix password
+manager.
diff --git a/desktop/ratpoison/README b/desktop/ratpoison/README
index 36c8f4097a..3d63db6104 100644
--- a/desktop/ratpoison/README
+++ b/desktop/ratpoison/README
@@ -1,7 +1,7 @@
 Ratpoison is a simple Window Manager with no fat library dependencies,
-no fancy graphics, no window decorations, and no rodent dependence. It is
-largely modelled after GNU Screen which has done wonders in the virtual
-terminal market.  The screen can be split into non-overlapping frames. All
-windows are kept maximized inside their frames to take full advantage of
-your precious screen real estate.  All interaction with the window manager
-is done through keystrokes.
+no fancy graphics, no window decorations, and no rodent dependence. It
+is largely modelled after GNU Screen which has done wonders in the
+virtual terminal market.  The screen can be split into non-overlapping
+frames. All windows are kept maximized inside their frames to take full
+advantage of your precious screen real estate.  All interaction with
+the window manager is done through keystrokes.
diff --git a/desktop/razercfg/README b/desktop/razercfg/README
index 83aa3a4937..c29b061ca0 100644
--- a/desktop/razercfg/README
+++ b/desktop/razercfg/README
@@ -1,9 +1,9 @@
-This is the next generation Razer device configuration tool bringing the Razer
-gaming experience to the free OpenSource world.
+This is the next generation Razer device configuration tool bringing
+the Razer gaming experience to the free OpenSource world.
 
 This utility is a replacement for the old deathaddercfg tool.
 
-The tool architecture is based on "razerd", which is a background daemon doing
-all of the lowlevel privileged hardware accesses. The user interface tools are
-"razercfg", a commandline tool; and "qrazercfg", a QT4 based graphical device
-configuration tool.
+The tool architecture is based on "razerd", which is a background
+daemon doing all of the lowlevel privileged hardware accesses. The user
+interface tools are "razercfg", a commandline tool; and "qrazercfg",
+a QT4 based graphical device configuration tool.
diff --git a/desktop/razorqt/README b/desktop/razorqt/README
index 38bea80b47..f98034be2c 100644
--- a/desktop/razorqt/README
+++ b/desktop/razorqt/README
@@ -1,13 +1,12 @@
-Razorqt is an advanced, easy-to-use, and fast desktop environment 
-based on Qt technologies. It has been tailored for users who value 
-simplicity, speed, and intuitive interface. Unlike desktop environments, 
-Razorqt also works fine with weak machines.
+Razorqt is an advanced, easy-to-use, and fast desktop environment
+based on Qt technologies. It has been tailored for users who
+value simplicity, speed, and intuitive interface. Unlike desktop
+environments, Razorqt also works fine with weak machines.
 
-Razorqt does not include a window manager.  While it can use fvwm2 or
-kwin (included with Slackware), openbox is most often used by the 
+Razorqt does not include a window manager.  While it can use fvwm2
+or kwin (included with Slackware), openbox is most often used by the
 upstream developers (and the one found most appealing here), so it is
 strongly recommended.
 
-*NOTE*
-This has been superseded by LXQt since some years and it's not
+*NOTE* This has been superseded by LXQt since some years and it's not
 maintained anymore.
diff --git a/desktop/redshift/README b/desktop/redshift/README
index 6b0aadd08d..d81ea7e8de 100644
--- a/desktop/redshift/README
+++ b/desktop/redshift/README
@@ -1,13 +1,13 @@
 redshift (screen colour adjuster)
 
 Redshift adjusts the colour temperature of your screen according to
-your surroundings. This may help your eyes if you are working in
-front of the screen at night.
+your surroundings. This may help your eyes if you are working in front
+of the screen at night.
 
-This package has a dependency on geoclue2, however it will compile the package
-without it if geoclue2 is not present.
+This package has a dependency on geoclue2, however it will compile the
+package without it if geoclue2 is not present.
 
-This package will build against python3 for the gui if python3 is available.
-If not, we use the fedora patch to build the gui with python2. If you want to
-compile using python3 on 14.2, you will need the pyxdg and pygobject3-python3
-packages from SBo.
+This package will build against python3 for the gui if python3 is
+available.  If not, we use the fedora patch to build the gui with
+python2. If you want to compile using python3 on 14.2, you will need
+the pyxdg and pygobject3-python3 packages from SBo.
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/rodent/README b/desktop/rodent/README
index 4b54a9d35c..ed7017936f 100644
--- a/desktop/rodent/README
+++ b/desktop/rodent/README
@@ -1,3 +1,3 @@
-Rodent is fast, small and powerful file manager for the GNU operating system.
-That's one way to look at it. Another way is to call it a graphic shell
-(that's probably more accurate).
+Rodent is fast, small and powerful file manager for the GNU operating
+system.  That's one way to look at it. Another way is to call it a
+graphic shell (that's probably more accurate).
diff --git a/desktop/rofi-calc/README b/desktop/rofi-calc/README
new file mode 100644
index 0000000000..cb82421e4b
--- /dev/null
+++ b/desktop/rofi-calc/README
@@ -0,0 +1,4 @@
+rofi-calc is a rofi plugin that provides a calc modi leveraging
+libqalculate's qalc to parse natural language queries such as
+500 + 25% or 5000 EUR to USD or 150 to hex. It can also solve
+linear equations on the fly. Try 60x + 30 = 50, for instance.
diff --git a/desktop/rofi-calc/rofi-calc.SlackBuild b/desktop/rofi-calc/rofi-calc.SlackBuild
new file mode 100644
index 0000000000..782b35e587
--- /dev/null
+++ b/desktop/rofi-calc/rofi-calc.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for rofi-calc
+
+# 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=rofi-calc
+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 {} \;
+
+autoreconf -i
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --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
+
+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/desktop/rofi-calc/rofi-calc.info b/desktop/rofi-calc/rofi-calc.info
new file mode 100644
index 0000000000..e071e665aa
--- /dev/null
+++ b/desktop/rofi-calc/rofi-calc.info
@@ -0,0 +1,10 @@
+PRGNAM="rofi-calc"
+VERSION="1.7"
+HOMEPAGE="https://github.com/svenstaro/rofi-calc"
+DOWNLOAD="https://github.com/svenstaro/rofi-calc/archive/v1.7/rofi-calc-1.7.tar.gz"
+MD5SUM="88eca66f0f3570362241bb351ba8ba2d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rofi libqalculate"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/desktop/rofi-calc/slack-desc b/desktop/rofi-calc/slack-desc
new file mode 100644
index 0000000000..309c138b2d
--- /dev/null
+++ b/desktop/rofi-calc/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------------------------------------------------------|
+rofi-calc: rofi-calc (display configuration manager)
+rofi-calc:
+rofi-calc: A rofi plugin that uses libqalculate's qalc to parse natural language
+rofi-calc: input and provide results.
+rofi-calc:
+rofi-calc:
+rofi-calc:
+rofi-calc:
+rofi-calc:
+rofi-calc:
+rofi-calc: https://github.com/svenstaro/rofi-calc
diff --git a/desktop/rofi-emoji/README b/desktop/rofi-emoji/README
new file mode 100644
index 0000000000..c5baafbe2b
--- /dev/null
+++ b/desktop/rofi-emoji/README
@@ -0,0 +1,4 @@
+rofi-emoji is a rofi plugin that provides an emoji modi, useful
+for copying emojis into the clipboard.
+
+The symbola-font-ttf or noto-emoji font packages are recommended.
diff --git a/desktop/rofi-emoji/rofi-emoji.SlackBuild b/desktop/rofi-emoji/rofi-emoji.SlackBuild
new file mode 100644
index 0000000000..131e7f9a49
--- /dev/null
+++ b/desktop/rofi-emoji/rofi-emoji.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for rofi-emoji
+
+# 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=rofi-emoji
+VERSION=${VERSION:-2.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 {} \;
+
+autoreconf -i
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md Changelog.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/desktop/rofi-emoji/rofi-emoji.info b/desktop/rofi-emoji/rofi-emoji.info
new file mode 100644
index 0000000000..3f283bde86
--- /dev/null
+++ b/desktop/rofi-emoji/rofi-emoji.info
@@ -0,0 +1,10 @@
+PRGNAM="rofi-emoji"
+VERSION="2.1.2"
+HOMEPAGE="https://github.com/Mange/rofi-emoji"
+DOWNLOAD="https://github.com/Mange/rofi-emoji/archive/v2.1.2/rofi-emoji-2.1.2.tar.gz"
+MD5SUM="8555267d9614351773cc9da62513a08b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rofi xclip xsel"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/desktop/rofi-emoji/slack-desc b/desktop/rofi-emoji/slack-desc
new file mode 100644
index 0000000000..a40dd607f4
--- /dev/null
+++ b/desktop/rofi-emoji/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------------------------------------------------------|
+rofi-emoji: rofi-emoji (rofi emoji plugin)
+rofi-emoji:
+rofi-emoji: An emoji selector plugin for Rofi that copies the selected emoji to
+rofi-emoji: the clipboard.
+rofi-emoji:
+rofi-emoji:
+rofi-emoji:
+rofi-emoji:
+rofi-emoji:
+rofi-emoji:
+rofi-emoji: https://github.com/Mange/rofi-emoji
diff --git a/desktop/rofi-pass/README b/desktop/rofi-pass/README
new file mode 100644
index 0000000000..75cae52299
--- /dev/null
+++ b/desktop/rofi-pass/README
@@ -0,0 +1,4 @@
+A bash script to handle Simple Password Store in a convenient way
+using rofi.
+
+pass-otp is an optional dependency.
diff --git a/desktop/rofi-pass/rofi-pass.SlackBuild b/desktop/rofi-pass/rofi-pass.SlackBuild
new file mode 100644
index 0000000000..ee470a6444
--- /dev/null
+++ b/desktop/rofi-pass/rofi-pass.SlackBuild
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# Slackware build script for rofi-pass
+
+# 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=rofi-pass
+VERSION=${VERSION:-2.0.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/$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=/usr DESTDIR=$PKG
+
+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/desktop/rofi-pass/rofi-pass.info b/desktop/rofi-pass/rofi-pass.info
new file mode 100644
index 0000000000..7fef10a9e5
--- /dev/null
+++ b/desktop/rofi-pass/rofi-pass.info
@@ -0,0 +1,10 @@
+PRGNAM="rofi-pass"
+VERSION="2.0.2"
+HOMEPAGE="https://github.com/carnager/rofi-pass"
+DOWNLOAD="https://github.com/carnager/rofi-pass/archive/2.0.2.tar.gz"
+MD5SUM="f32e96d186bbd32a84e43974628efb9d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rofi password-store xdotool pwgen"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/desktop/rofi-pass/slack-desc b/desktop/rofi-pass/slack-desc
new file mode 100644
index 0000000000..337673cd80
--- /dev/null
+++ b/desktop/rofi-pass/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------------------------------------------------------|
+rofi-pass: rofi-pass (Simple Password Store)
+rofi-pass:
+rofi-pass: A bash script to handle Simple Password Store in a convenient way
+rofi-pass: using rofi.
+rofi-pass:
+rofi-pass:
+rofi-pass:
+rofi-pass:
+rofi-pass:
+rofi-pass:
+rofi-pass: https://github.com/carnager/rofi-pass
diff --git a/desktop/rofi/README b/desktop/rofi/README
index 668481992a..b51a59125e 100644
--- a/desktop/rofi/README
+++ b/desktop/rofi/README
@@ -1,15 +1,17 @@
 Rofi is a window switcher, application launcher and dmenu replacement.
 
-Rofi, like dmenu, will provide the user with a textual list of options where
-one or more can be selected. This can either be running an application,
-selecting a window, or options provided by an external script.
+Rofi, like dmenu, will provide the user with a textual list of options
+where one or more can be selected. This can either be running an
+application, selecting a window, or options provided by an external
+script.
 
-Rofi started as a clone of simpleswitcher, written by Sean Pringle - a popup
-window switcher roughly based on superswitcher. Simpleswitcher laid the
-foundations, and therefore Sean Pringle deserves most of the credit for this
-tool. Rofi (renamed, as it lost the simple property) has been extended with
-extra features, like an application launcher and ssh-launcher, and can act as
-a drop-in dmenu replacement, making it a very versatile tool.
+Rofi started as a clone of simpleswitcher, written by Sean Pringle -
+a popup window switcher roughly based on superswitcher. Simpleswitcher
+laid the foundations, and therefore Sean Pringle deserves most of the
+credit for this tool. Rofi (renamed, as it lost the simple property)
+has been extended with extra features, like an application launcher
+and ssh-launcher, and can act as a drop-in dmenu replacement, making
+it a very versatile tool.
 
 Note:
 If you encounter this this non-fatal error when executing Rofi:
diff --git a/desktop/rofi/rofi.SlackBuild b/desktop/rofi/rofi.SlackBuild
index 92cb8c42d0..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.5.4}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/rofi/rofi.info b/desktop/rofi/rofi.info
index 4d4d8c00b2..eccf31c5f2 100644
--- a/desktop/rofi/rofi.info
+++ b/desktop/rofi/rofi.info
@@ -1,8 +1,8 @@
 PRGNAM="rofi"
-VERSION="1.5.4"
+VERSION="1.6.1"
 HOMEPAGE="https://github.com/DaveDavenport/rofi/"
-DOWNLOAD="https://github.com/davatorium/rofi/releases/download/1.5.4/rofi-1.5.4.tar.xz"
-MD5SUM="e1ec8ebaa1d183e1b9159f22b0d515ac"
+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/rootactions_servicemenu/README b/desktop/rootactions_servicemenu/README
index 98691ee645..ffc3e74fee 100644
--- a/desktop/rootactions_servicemenu/README
+++ b/desktop/rootactions_servicemenu/README
@@ -1,8 +1,10 @@
-Root Actions servicemenu provides a convenient way to perform several actions
-'as root', from the right-click context menu in KDE filemanagers.
+Root Actions servicemenu provides a convenient way to perform
+several actions 'as root', from the right-click context menu in KDE
+filemanagers.
 
 Included in the download are .desktop file versions for KDE3 konqueror,
-KDE3 dolphin, KDE4 (both konqueror and dolphin), and an importable user 
-action xml file for krusader KDE4.  See README in source files for details.
+KDE3 dolphin, KDE4 (both konqueror and dolphin), and an importable
+user action xml file for krusader KDE4.  See README in source files for
+details.
 
 This build script installs the KDE4/Dolphin version.
diff --git a/desktop/salmon/README b/desktop/salmon/README
new file mode 100644
index 0000000000..97bc5d95df
--- /dev/null
+++ b/desktop/salmon/README
@@ -0,0 +1,11 @@
+salmon (afterstep-style load monitor applet)
+
+A resource utilization monitor that can display the current load
+averages, the amount of free or used memory and swap space, memory
+in cache, buffers, and shared, number of processes, the load split
+between user, nice, system, and idle, the uptime, the current local
+time, the current universal time, the name of the local host and the
+phase of the moon.
+
+Although salmon was designed for use with AfterStep and WindowMaker,
+it works fine in other environments.
diff --git a/desktop/salmon/missing.h b/desktop/salmon/missing.h
new file mode 100644
index 0000000000..eab4167d68
--- /dev/null
+++ b/desktop/salmon/missing.h
@@ -0,0 +1,12 @@
+/* headers that should have been included by various salmon
+   source files. */
+#include <time.h>
+#include <ctype.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+/* prototypes for salmon's internal functions. these really
+   should have been included in the source... */
+void get_phase(time_t the_time, char char_buf[20]);
+void open_meminfo(void);
diff --git a/desktop/salmon/salmon.SlackBuild b/desktop/salmon/salmon.SlackBuild
new file mode 100644
index 0000000000..8c2cb82bc8
--- /dev/null
+++ b/desktop/salmon/salmon.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for salmon
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=salmon
+VERSION=${VERSION:-1.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
+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 {} \+
+
+# According to MLanden on IRC (and the man page for gethostname), it's
+# checking for the wrong error.
+sed -i 's,EINPROGRESS,ENAMETOOLONG,' salmon_x.c
+
+# One way to include missing headers and prototypes.
+SLKCFLAGS+=" -include $CWD/missing.h"
+
+# --docdir not supported (or needed).
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+
+# DESTDIR not supported, it's only 2 files, do it manually.
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/doc/$PRGNAM-$VERSION
+install -s -m0755 $PRGNAM $PKG/usr/bin
+gzip -9c < $PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1x.gz
+
+cp -a CHANGES COPYING 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/desktop/salmon/salmon.info b/desktop/salmon/salmon.info
new file mode 100644
index 0000000000..f699b9bd7f
--- /dev/null
+++ b/desktop/salmon/salmon.info
@@ -0,0 +1,10 @@
+PRGNAM="salmon"
+VERSION="1.2.2"
+HOMEPAGE="http://tigr.net/afterstep/download/salmon/README"
+DOWNLOAD="http://tigr.net/afterstep/download/salmon/salmon-1.2.2.tar.gz"
+MD5SUM="02725f0b035463ad089a189f1e7d62ed"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/desktop/salmon/slack-desc b/desktop/salmon/slack-desc
new file mode 100644
index 0000000000..67d18cb3ea
--- /dev/null
+++ b/desktop/salmon/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------------------------------------------------------|
+salmon: salmon (afterstep-style load monitor applet)
+salmon:
+salmon: A resource utilization monitor that can display the current load
+salmon: averages, the amount of free or used memory and swap space, memory
+salmon: in cache, buffers, and shared, number of processes, the load split
+salmon: between user, nice, system, and idle, the uptime, the current local
+salmon: time, the current universal time, the name of the local host and the
+salmon: phase of the moon.
+salmon:
+salmon:
+salmon:
diff --git a/desktop/sawfish/README b/desktop/sawfish/README
index dfe3e7167e..ddbcd4ed41 100644
--- a/desktop/sawfish/README
+++ b/desktop/sawfish/README
@@ -1,7 +1,8 @@
 sawfish (Window Manager)
 
-sawfish is an extensible window manager using a Lisp-based scripting language.
+sawfish is an extensible window manager using a Lisp-based scripting
+language.
 
-Its policy is very minimal compared to most window managers.  aim is
-Its simply to manage windows in the most flexible and attractive manner
-Its possible.
+Its policy is very minimal compared to most window managers. Its aim
+is simply to manage windows in the most flexible and attractive manner
+possible.
diff --git a/desktop/screenfetch/screenfetch.SlackBuild b/desktop/screenfetch/screenfetch.SlackBuild
index 298eda97de..65e62b6eb5 100644
--- a/desktop/screenfetch/screenfetch.SlackBuild
+++ b/desktop/screenfetch/screenfetch.SlackBuild
@@ -4,6 +4,7 @@
 #
 # Copyright 2012-2017  Bojan Popovic, Belgrade, Serbia, <bocke@slackware-srbija.org>.
 # Copyright 2017-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright Jefferson Rocha, Curitiba, Brazil.
 #
 # All rights reserved.
 #
@@ -43,46 +44,44 @@
 #                   Updated changelog formating. Updated tar extraction line
 #                   to eliminate (harmless but annoying) extraction errors.
 # 1.9   27-MAR-2017 Updated for version 3.8.0. Added a manpage.
+# 2.0   20-JUNE-2020 Updated to a new upstream ver. 3.9.1.
+#                    Added Double quotes in variables.
 
-PRGNAM=screenfetch
-VERSION=${VERSION:-3.9.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-DOCS="CHANGELOG COPYING README.mkdn TODO"
-
+PRGNAM="screenfetch"
 SRCNAM="screenFetch"
+VERSION="${VERSION:-3.9.1}"
+BUILD="${BUILD:-1}"
+TAG="${TAG:-_SBo}"
+ARCH="noarch"
+DOCS="CHANGELOG COPYING README.mkdn TODO"
+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/$SRCNAM-$VERSION.tar.gz
-mv $SRCNAM-$VERSION $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf "$PKG"
+mkdir -p "$TMP" "$PKG" "$OUTPUT"
+cd "$TMP"
+rm -rf "$PRGNAM-$VERSION"
+tar xvf "$CWD/$SRCNAM-$VERSION.tar.gz"
+mv "$SRCNAM-$VERSION" "$PRGNAM-$VERSION"
+cd "$PRGNAM-$VERSION"
 
-install -m 755 -D $PRGNAM-dev $PKG/usr/bin/$PRGNAM
+install -m 755 -D "$PRGNAM-dev" "$PKG/usr/bin/$PRGNAM"
 
-mkdir -p $PKG/usr/man/man1
-install -m 644 screenfetch.1 $PKG/usr/man/man1
+mkdir -p "$PKG/usr/man/man1"
+install -m 644 screenfetch.1 "$PKG/usr/man/man1"
 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
 chmod 644 $DOCS; cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat "$CWD/$PRGNAM.SlackBuild" > "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+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}
+cd "$PKG"
+/sbin/makepkg -l y -c n "$OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}"
diff --git a/desktop/screenfetch/screenfetch.info b/desktop/screenfetch/screenfetch.info
index 6264624b80..9b682439be 100644
--- a/desktop/screenfetch/screenfetch.info
+++ b/desktop/screenfetch/screenfetch.info
@@ -6,5 +6,5 @@ MD5SUM="4f7855fe7943d9119d7fde678e43d2d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
+MAINTAINER="Jefferson Rocha"
+EMAIL="root@slackjeff.com.br"
diff --git a/desktop/screenkey/README b/desktop/screenkey/README
index efd4f77578..ffa4a48cdc 100644
--- a/desktop/screenkey/README
+++ b/desktop/screenkey/README
@@ -1,2 +1,2 @@
-Screenkey is a screencast tool to display key strokes on the screen as they are
-typed.
+Screenkey is a screencast tool to display key strokes on the screen as
+they are typed.
diff --git a/desktop/screenkey/screenkey.SlackBuild b/desktop/screenkey/screenkey.SlackBuild
index 13e7f1b4b0..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}
 
@@ -60,8 +60,8 @@ 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
+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 \
@@ -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 3573f47c52..b2e68c86aa 100644
--- a/desktop/screenkey/screenkey.info
+++ b/desktop/screenkey/screenkey.info
@@ -1,10 +1,10 @@
 PRGNAM="screenkey"
-VERSION="0.9"
-HOMEPAGE="https://github.com/wavexx/screenkey"
-DOWNLOAD="https://github.com/wavexx/screenkey/archive/screenkey-0.9/screenkey-screenkey-0.9.tar.gz"
-MD5SUM="254da71581c1e2f5e2bdbb475dc0a721"
+VERSION="1.4"
+HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
+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/doinst.sh b/desktop/simplenote/doinst.sh
index 55ca305770..d8b0d0d87b 100644
--- a/desktop/simplenote/doinst.sh
+++ b/desktop/simplenote/doinst.sh
@@ -8,3 +8,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/desktop/simplenote/simplenote.SlackBuild b/desktop/simplenote/simplenote.SlackBuild
index 0fac5301c6..3948fe1d97 100644
--- a/desktop/simplenote/simplenote.SlackBuild
+++ b/desktop/simplenote/simplenote.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=simplenote
 SRCNAM=Simplenote
-VERSION=${VERSION:-1.15.1}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/simplenote/simplenote.info b/desktop/simplenote/simplenote.info
index f3472eab38..4190057b85 100644
--- a/desktop/simplenote/simplenote.info
+++ b/desktop/simplenote/simplenote.info
@@ -1,10 +1,10 @@
 PRGNAM="simplenote"
-VERSION="1.15.1"
+VERSION="2.1.0"
 HOMEPAGE="https://simplenote.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/Automattic/simplenote-electron/releases/download/v1.15.1/Simplenote-linux-1.15.1-x64.tar.gz"
-MD5SUM_x86_64="b5d805b5e263cd25576b2f9beea16cbb"
+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/spectrwm/README b/desktop/spectrwm/README
index f08dd0c706..40654ba22c 100644
--- a/desktop/spectrwm/README
+++ b/desktop/spectrwm/README
@@ -1,12 +1,24 @@
-Spectrwm is a small dynamic tiling window manager for X11. It tries to stay out
-of the way so that valuable screen real estate can be used for much more
-important stuff. It has sane defaults and does not require one to learn a
-language to do any configuration. It was written by hackers for hackers and it
-strives to be small, compact and fast.
-
-This package installs an example spectrwm.conf, which contains a fair number of
-options and default values. Also, there are example scripts for the bar_action
-configure option, that can be used (perhaps after further customization) on
-Slackware to display CPU, memory, wifi link, battery and X11 keyboard layout.
-Further information about this can be found in the package's documentation
-directory.
+Spectrwm is a small dynamic tiling window manager for X11. It tries
+to stay out of the way so that valuable screen real estate can be
+used for much more important stuff. It has sane defaults and does
+not require one to learn a language to do any configuration. It was
+written by hackers for hackers and it strives to be small, compact
+and fast.
+
+NOTES:
+The installer includes several example files, including:
+* baraction.sh (scripts for the status bar in Linux)
+* spectrwm.conf (a default configuration file)
+* spectrwm_$LANGUAGE.conf (language-specfic keyboard layouts)
+
+All these files can be found in /usr/doc/spectrwm-$VERSION/examples
+
+The installer places a default spectrwm.conf in /etc but spectrwm will
+also look for .spectrwm.conf and .spectrwm_us.conf in $HOME/user/
+
+baraction.sh can go in an executable path which should be named in
+.spectrwm.conf
+
+Finally, dmenu is a soft dependency, and spectrwm will give a warning
+if it's missing. However it's not essential and some users may prefer
+other app launchers.
diff --git a/desktop/spectrwm/doinst.sh b/desktop/spectrwm/doinst.sh
index 365e691611..c0ac6b9cb0 100644
--- a/desktop/spectrwm/doinst.sh
+++ b/desktop/spectrwm/doinst.sh
@@ -1,5 +1,19 @@
+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/X11/xinit/xinitrc.spectrwm.new
+config etc/spectrwm.conf.new
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
-[ -x /sbin/ldconfig ]  &&  /sbin/ldconfig 2>/dev/null
diff --git a/desktop/spectrwm/spectrwm.SlackBuild b/desktop/spectrwm/spectrwm.SlackBuild
index eb50e37bab..34feb88e5f 100644
--- a/desktop/spectrwm/spectrwm.SlackBuild
+++ b/desktop/spectrwm/spectrwm.SlackBuild
@@ -1,32 +1,29 @@
 #!/bin/sh
 
-# Copyright 2020 Andrew Payne, Boston MA <phalange@komputermatrix.com>
+# Copyright 2020 Andrew Payne <phalange@komputermatrix.com>
 # Copyright (c) 2011-2015 LEVAI Daniel
 # 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.
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
+# 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 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 HOLDER 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.
+#
+#  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=spectrwm
-VERSION=${VERSION:-3.3.0}
-UPNAM=SPECTRWM_3_3_0 # changed to allow cd to proper folder
+VERSION=${VERSION:-3.4.1}
+SRCNAM=SPECTRWM_${VERSION//./_}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$UPNAM
-tar xvf $CWD/$PRGNAM-$UPNAM.tar.gz || tar xvf $CWD/$UPNAM.tar.gz
-cd $PRGNAM-$UPNAM
+rm -rf $PRGNAM-$SRCNAM
+tar xvf $CWD/$PRGNAM-$SRCNAM.tar.gz || tar xvf $CWD/$SRCNAM.tar.gz
+cd $PRGNAM-$SRCNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -73,45 +70,54 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cd linux
-  CFLAGS="$SLKCFLAGS" make \
+CFLAGS="$SLKCFLAGS" \
+  make \
     PREFIX=/usr \
     LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-    MANDIR=/usr/man
+    MANDIR=/usr/man \
+    DOCDIR=/usr/doc/spectrwm-${VERSION}
+    SYSCONFDIR=/etc \
+    DATAROOTDIR=/usr \
+    XSESSIONSDIR=/usr/share/applications \
+    PKG_CONFIG=pkg-config \
   make install \
     PREFIX=/usr \
     LIBDIR=/usr/lib${LIBDIRSUFFIX} \
     MANDIR=/usr/man \
+    DOCDIR=/usr/doc/spectrwm-${VERSION} \
+    SYSCONFDIR=/etc \
+    DATAROOTDIR=/usr \
+    XSESSIONSDIR=/usr/share/applications \
+    PKG_CONFIG=pkg-config \
     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
 
+# Remove the symlink to scrotwm
 rm -f $PKG/usr/bin/scrotwm
 
-# Compress the manpages
-( cd $PKG/usr/man; find . -type f -exec gzip -9 {} \; )
+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/examples/keybindings
-install -m0644 -oroot -groot initscreen.sh $CWD/examples/* \
-    $PKG/usr/doc/$PRGNAM-$VERSION/examples/
-cp -a spectrwm.conf $PKG/usr/doc/$PRGNAM-$VERSION/examples/spectrwm_orig.conf
-cp -a spectrwm_*.conf $PKG/usr/doc/$PRGNAM-$VERSION/examples/keybindings/
+# Put an extra copy of the default config with the other example files
+cp -a \
+   spectrwm.conf \
+   $PKG/usr/doc/$PRGNAM-$VERSION/examples
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod 0644 {} \;
-
-# install xinitrc script
-mkdir -p $PKG/etc/X11/xinit
-cat $CWD/xinitrc.$PRGNAM > $PKG/etc/X11/xinit/xinitrc.$PRGNAM
-chmod 0755 $PKG/etc/X11/xinit/xinitrc.$PRGNAM
-
-# desktop integration
-mkdir -m755 -p "${PKG}/usr/share/applications/"
-cp -a linux/spectrwm.desktop "${PKG}/usr/share/applications/"
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# Install xinitrc script
+mkdir -p $PKG/etc/X11/xinit
+cat $CWD/xinitrc.$PRGNAM > $PKG/etc/X11/xinit/xinitrc.$PRGNAM.new
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.$PRGNAM.new
+
+# Make sure new config doesn't stomp the one in /etc
+mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/spectrwm/spectrwm.info b/desktop/spectrwm/spectrwm.info
index 938b7b5dc2..7262e7c190 100644
--- a/desktop/spectrwm/spectrwm.info
+++ b/desktop/spectrwm/spectrwm.info
@@ -1,8 +1,8 @@
 PRGNAM="spectrwm"
-VERSION="3.3.0"
+VERSION="3.4.1"
 HOMEPAGE="https://github.com/conformal/spectrwm/"
-DOWNLOAD="https://github.com/conformal/spectrwm/archive/SPECTRWM_3_3_0.tar.gz"
-MD5SUM="c34de6ca438ebe841f6b749ee9e424d7"
+DOWNLOAD="https://github.com/conformal/spectrwm/archive/SPECTRWM_3_4_1.tar.gz"
+MD5SUM="4eba6fb1e888a3df4918c181b66bdbde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/ssr/README b/desktop/ssr/README
index c2c12e2b81..6d78559a71 100644
--- a/desktop/ssr/README
+++ b/desktop/ssr/README
@@ -1,5 +1,5 @@
-SimpleScreenRecorder is a feature-rich screen recorder for Linux that supports
-X11 and OpenGL.
+SimpleScreenRecorder is a feature-rich screen recorder for Linux that
+supports X11 and OpenGL.
 
 For JACK audio support (requires jack) set JACK=TRUE.
 
diff --git a/desktop/ssr/ssr.SlackBuild b/desktop/ssr/ssr.SlackBuild
index d8014c2e24..498cc54261 100644
--- a/desktop/ssr/ssr.SlackBuild
+++ b/desktop/ssr/ssr.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for ssr
 
-# Copyright 2014-2018 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.3.11}
+VERSION=${VERSION:-0.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -93,7 +93,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.md COPYING notes.txt README.md \
+  AUTHORS.md CHANGELOG.md COPYING notes.txt README.md todo.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/ssr/ssr.info b/desktop/ssr/ssr.info
index c8c92fc596..8efda9a0ef 100644
--- a/desktop/ssr/ssr.info
+++ b/desktop/ssr/ssr.info
@@ -1,8 +1,8 @@
 PRGNAM="ssr"
-VERSION="0.3.11"
-HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder/"
-DOWNLOAD="https://github.com/MaartenBaert/ssr/archive/0.3.11/ssr-0.3.11.tar.gz"
-MD5SUM="035dcd0a73667d27f890c9ad242d4cf0"
+VERSION="0.4.3"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"
+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/stoken/README b/desktop/stoken/README
index 1cf2f0082f..2184fe1799 100644
--- a/desktop/stoken/README
+++ b/desktop/stoken/README
@@ -1,6 +1,8 @@
-stoken is a tokencode generator compatible with RSA SecurID
-128-bit (AES) tokens. The project includes several components:
+stoken is a tokencode generator compatible with RSA SecurID 128-bit
+(AES) tokens. The project includes several components:
 
-- A simple command line interface (CLI) used to manage and manipulate tokens
+- A simple command line interface (CLI) used to manage and manipulate
+  tokens
 - A GTK+ GUI with cut&paste functionality
-- A shared library allowing other software to generate tokencodes on demand
+- A shared library allowing other software to generate tokencodes
+  on demand
diff --git a/desktop/sun/README b/desktop/sun/README
index 75dd31299a..b7adb3ff77 100644
--- a/desktop/sun/README
+++ b/desktop/sun/README
@@ -1,3 +1,3 @@
-SUN (Slackware Update Notifier) is a tray notification applet for informing 
-about package updates in Slackware and CLI tool for monitoring upgraded 
-packages.
+SUN (Slackware Update Notifier) is a tray notification applet
+for informing about package updates in Slackware and CLI tool for
+monitoring upgraded packages.
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/superkey-launch/README b/desktop/superkey-launch/README
index e0ab2eb02c..3a0a2f113c 100644
--- a/desktop/superkey-launch/README
+++ b/desktop/superkey-launch/README
@@ -7,5 +7,6 @@ allowing you to use it for other keyboard shortcuts.
 
 superkey-launch is desktop agnostic.
 
-superkey-launch is a small application that runs in the background as a daemon
-It was forked from xcape by Albin Olsson: https://github.com/alols/xcape
+superkey-launch is a small application that runs in the
+background as a daemon.  It was forked from xcape by Albin Olsson:
+https://github.com/alols/xcape
diff --git a/desktop/sxhkd/README b/desktop/sxhkd/README
index 75a23ed14d..61ed7c8171 100644
--- a/desktop/sxhkd/README
+++ b/desktop/sxhkd/README
@@ -1,7 +1,7 @@
 sxhkd is an X daemon that reacts to input events by executing commands.
 
-Its configuration file is a series of bindings that define the associations
-between the input events and the commands.
+Its configuration file is a series of bindings that define the
+associations between the input events and the commands.
 
-The format of the configuration file supports a simple notation for mapping
-multiple shortcuts to multiple commands in parallel.
+The format of the configuration file supports a simple notation for
+mapping multiple shortcuts to multiple commands in parallel.
diff --git a/desktop/thunar-archive-plugin/README b/desktop/thunar-archive-plugin/README
index f91f054204..288bb4c348 100644
--- a/desktop/thunar-archive-plugin/README
+++ b/desktop/thunar-archive-plugin/README
@@ -1,4 +1,4 @@
-The thunar-archive-plugin is a plugin for the Thunar File Manager, which 
-adds archive operations to the file context menus. Using this plugin you 
-will be able to extract and create archive files from within Thunar with 
-a single click.
+The thunar-archive-plugin is a plugin for the Thunar File Manager,
+which adds archive operations to the file context menus. Using this
+plugin you will be able to extract and create archive files from within
+Thunar with a single click.
diff --git a/desktop/thunar-dropbox/README b/desktop/thunar-dropbox/README
index 23795731f9..7da19c3132 100644
--- a/desktop/thunar-dropbox/README
+++ b/desktop/thunar-dropbox/README
@@ -1 +1,2 @@
-Thunar-dropbox is a Thunar plugin that adds context-menu items from dropbox.
+Thunar-dropbox is a Thunar plugin that adds context-menu items from
+dropbox.
diff --git a/desktop/thunar-media-tags-plugin/README b/desktop/thunar-media-tags-plugin/README
index 32bbad99d7..3be9494fc7 100644
--- a/desktop/thunar-media-tags-plugin/README
+++ b/desktop/thunar-media-tags-plugin/README
@@ -1,3 +1,3 @@
-The thunar-media-tags-plugin is a plugin which adds ID3/OGG tag support to 
-Thunar's bulk rename dialog and the capability to edit those tags from the 
-file Properties dialog.
+The thunar-media-tags-plugin is a plugin which adds ID3/OGG tag support
+to Thunar's bulk rename dialog and the capability to edit those tags
+from the file Properties dialog.
diff --git a/desktop/thunar-thumbnailers/README b/desktop/thunar-thumbnailers/README
index 79dd110257..8ccbc28061 100644
--- a/desktop/thunar-thumbnailers/README
+++ b/desktop/thunar-thumbnailers/README
@@ -1,12 +1,15 @@
-The thunar-thumbnailers project provides additional thumbnailers for use by 
-the Thunar file manager. Thumbnailers are little utilities that run in the 
-background to generate previews for certain file types.
+The thunar-thumbnailers project provides additional thumbnailers for
+use by the Thunar file manager. Thumbnailers are little utilities that
+run in the background to generate previews for certain file types.
 
-After installing this package, each user will need to execute the following 
-command:   /usr/libexec/thunar-vfs-update-thumbnailers-cache-1
+After installing this package, each user will need to execute the
+following command:
 
-Optional dependencies are dcraw (for raw image support) and ffmpegthumbnailer
-(for video file support).  If you wish to enable support for either or both 
-of these, you will need to edit the build script to do so - the required lines
-are commented out. If you choose to compile with dcraw (--enable-raw), you'll 
-also need raw-thumbnailer.
+/usr/libexec/thunar-vfs-update-thumbnailers-cache-1
+
+Optional dependencies are dcraw (for raw image support) and
+ffmpegthumbnailer (for video file support).  If you wish to enable
+support for either or both of these, you will need to edit the
+build script to do so - the required lines are commented out. If
+you choose to compile with dcraw (--enable-raw), you'll also need
+raw-thumbnailer.
diff --git a/desktop/tint2/README b/desktop/tint2/README
index debc87da0d..ccbc2c904d 100644
--- a/desktop/tint2/README
+++ b/desktop/tint2/README
@@ -1,8 +1,8 @@
-tint2 is a simple panel/taskbar intentionally made for openbox3, but should
-also work with other window managers.  It's based off ttm code.
+tint2 is a simple panel/taskbar intentionally made for openbox3, but
+should also work with other window managers.  It's based off ttm code.
 
-The goal is to keep a clean and unintrusive look with lightweight code and
-compliance with freedesktop specifications.
+The goal is to keep a clean and unintrusive look with lightweight code
+and compliance with freedesktop specifications.
 
-On the first run, /etc/xdg/tint2/tint2rc is copied to ~/.config/tint2/tint2rc
-and used as the default configuration.
+On the first run, /etc/xdg/tint2/tint2rc is copied to
+~/.config/tint2/tint2rc and used as the default configuration.
diff --git a/desktop/unsaver/README b/desktop/unsaver/README
new file mode 100644
index 0000000000..61d28e97fd
--- /dev/null
+++ b/desktop/unsaver/README
@@ -0,0 +1,8 @@
+unsaver (deactivate screensaver on joystick or fullscreen activity)
+
+unsaver lets you play games with your joysticks/gamepads and watch
+fullscreen videos without your screensaver activating due to lack of
+keyboard/mouse input.
+
+unsaver should be started from your .xinitrc or whatever X startup
+script your window manager or desktop environment uses.
diff --git a/desktop/unsaver/slack-desc b/desktop/unsaver/slack-desc
new file mode 100644
index 0000000000..21b230b4a7
--- /dev/null
+++ b/desktop/unsaver/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------------------------------------------------------|
+unsaver: unsaver (deactivate screensaver on joystick or fullscreen activity)
+unsaver:
+unsaver: unsaver lets you play games with your joysticks/gamepads and watch
+unsaver: fullscreen videos without your screensaver activating due to lack
+unsaver: of keyboard/mouse input.
+unsaver:
+unsaver: unsaver should be started from your .xinitrc or whatever X
+unsaver: startup script your window manager or desktop environment uses.
+unsaver:
+unsaver:
+unsaver:
diff --git a/desktop/unsaver/unsaver.SlackBuild b/desktop/unsaver/unsaver.SlackBuild
new file mode 100644
index 0000000000..60c237ab9b
--- /dev/null
+++ b/desktop/unsaver/unsaver.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Slackware build script for unsaver
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=unsaver
+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}
+
+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 {} \+
+
+make OPTFLAGS="$SLKCFLAGS" \
+     PREFIX=/usr \
+     MAN1DIR=/usr/man/man1 \
+     DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+     DESTDIR=$PKG \
+     all install
+
+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/unsaver/unsaver.info b/desktop/unsaver/unsaver.info
new file mode 100644
index 0000000000..a9892b71c5
--- /dev/null
+++ b/desktop/unsaver/unsaver.info
@@ -0,0 +1,10 @@
+PRGNAM="unsaver"
+VERSION="0.3.0"
+HOMEPAGE="https://slackware.uk/~urchlay/repos/unsaver/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/unsaver-0.3.0.tar.xz"
+MD5SUM="7a7c20b4e5dd8fcaa32b5b8fabe081bd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/desktop/uwm/README b/desktop/uwm/README
index 92680f7c13..49c98abcb1 100644
--- a/desktop/uwm/README
+++ b/desktop/uwm/README
@@ -1,10 +1,10 @@
-The UDE-Project is creating a new WM which will be a complete GUI in future.
-The project does not use any special GUI-Libraries such as QT or GTK+. It just
-uses the standard Xlibs (both to keep UDE fast and slim and to avoid
-dependencies).
+The UDE-Project is creating a new WM which will be a complete GUI
+in future.  The project does not use any special GUI-Libraries such as
+QT or GTK+. It just uses the standard Xlibs (both to keep UDE fast and
+slim and to avoid dependencies).
 
-UDE has a completely original Look'n'Feel, it's not just another copy of the
-so well known "classical" window management user interface.
+UDE has a completely original Look'n'Feel, it's not just another copy
+of the so well known "classical" window management user interface.
 
 System wide configuration files are in /usr/share/uwm/config/.
 User specific configuration files are in $HOME/.ude/config/.
diff --git a/desktop/vala-panel-appmenu/README b/desktop/vala-panel-appmenu/README
index 8506c81c89..7b3b449aa1 100644
--- a/desktop/vala-panel-appmenu/README
+++ b/desktop/vala-panel-appmenu/README
@@ -7,4 +7,4 @@ Optionaly requires appmenu-qt
 
 For XFCE-Panel, type the following lines into your console: 
 xfconf-query -c xsettings -p /Gtk/ShellShowsMenubar -n -t bool -s true 
-xfconf-query -c xsettings -p /Gtk/ShellShowsAppmenu -n -t bool -s true
\ No newline at end of file
+xfconf-query -c xsettings -p /Gtk/ShellShowsAppmenu -n -t bool -s true
diff --git a/desktop/vertex-maia-icon-theme/README b/desktop/vertex-maia-icon-theme/README
new file mode 100644
index 0000000000..c7e86eaf36
--- /dev/null
+++ b/desktop/vertex-maia-icon-theme/README
@@ -0,0 +1,3 @@
+Vertex Maia icon theme is a previous default Manjaro icon theme.
+It complements the Vertex Maia GTK theme, itself a fork of the 
+Vertex GTK theme.
diff --git a/network/mkvserver_mk2/doinst.sh b/desktop/vertex-maia-icon-theme/doinst.sh
index aea0f894eb..aea0f894eb 100644
--- a/network/mkvserver_mk2/doinst.sh
+++ b/desktop/vertex-maia-icon-theme/doinst.sh
diff --git a/desktop/vertex-maia-icon-theme/slack-desc b/desktop/vertex-maia-icon-theme/slack-desc
new file mode 100644
index 0000000000..38baf81984
--- /dev/null
+++ b/desktop/vertex-maia-icon-theme/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------------------------------------------------------|
+vertex-maia-icon-theme: vertex-maia-icon-theme (Manjaro icon theme)
+vertex-maia-icon-theme:
+vertex-maia-icon-theme: Vertex Maia icon theme is a previous default Manjaro icon theme.
+vertex-maia-icon-theme: It complements the Vertex Maia GTK theme.
+vertex-maia-icon-theme:
+vertex-maia-icon-theme:
+vertex-maia-icon-theme:
+vertex-maia-icon-theme:
+vertex-maia-icon-theme:
+vertex-maia-icon-theme:
+vertex-maia-icon-theme:
diff --git a/desktop/vertex-maia-icon-theme/vertex-maia-icon-theme.SlackBuild b/desktop/vertex-maia-icon-theme/vertex-maia-icon-theme.SlackBuild
new file mode 100644
index 0000000000..97b8a8bf64
--- /dev/null
+++ b/desktop/vertex-maia-icon-theme/vertex-maia-icon-theme.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Slackware build script for vertex-maia-icon-theme
+#
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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="vertex-maia-icon-theme"
+VERSION=${VERSION:-20180118}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="vertex-maia-icon-themes"
+COMMIT=${COMMIT:-31e46d7297a3bc729fbe4f40e75692fe764aed27}
+
+ARCH=noarch
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+CWD=$(pwd)
+
+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 .
+
+mkdir -p $PKG/usr/share/icons
+cp -r Vertex-Maia $PKG/usr/share/icons
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp CREDIT 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
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/vertex-maia-icon-theme/vertex-maia-icon-theme.info b/desktop/vertex-maia-icon-theme/vertex-maia-icon-theme.info
new file mode 100644
index 0000000000..33c869e5bf
--- /dev/null
+++ b/desktop/vertex-maia-icon-theme/vertex-maia-icon-theme.info
@@ -0,0 +1,10 @@
+PRGNAM="vertex-maia-icon-theme"
+VERSION="20180118"
+HOMEPAGE="https://github.com/manjaro/vertex-maia-icon-themes"
+DOWNLOAD="https://github.com/manjaro/vertex-maia-icon-themes/archive/31e46d7/vertex-maia-icon-themes-31e46d7297a3bc729fbe4f40e75692fe764aed27.tar.gz"
+MD5SUM="ec1c982bf82e4fe319c334ef82765356"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/desktop/vertex-maia-themes/README b/desktop/vertex-maia-themes/README
new file mode 100644
index 0000000000..12d1e22b32
--- /dev/null
+++ b/desktop/vertex-maia-themes/README
@@ -0,0 +1,5 @@
+Vertex Maia is a previous default GTK theme for Manjaro Linux. 
+It is forked from the Vertex GTK theme.
+
+This SlackBuild is adapted from the Manjaro PKGBUILD. The patch is 
+downloaded from Manjaro repositories.
diff --git a/desktop/vertex-maia-themes/slack-desc b/desktop/vertex-maia-themes/slack-desc
new file mode 100644
index 0000000000..271bac3561
--- /dev/null
+++ b/desktop/vertex-maia-themes/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------------------------------------------------------|
+vertex-maia-themes: vertex-maia-themes (Theme for Manjaro Linux)
+vertex-maia-themes:
+vertex-maia-themes: Vertex Maia is a previous default GTK theme for Manjaro Linux. 
+vertex-maia-themes: It is forked from the Vertex GTK theme.
+vertex-maia-themes:
+vertex-maia-themes:
+vertex-maia-themes:
+vertex-maia-themes:
+vertex-maia-themes:
+vertex-maia-themes:
+vertex-maia-themes:
diff --git a/desktop/vertex-maia-themes/vertex-maia-themes.SlackBuild b/desktop/vertex-maia-themes/vertex-maia-themes.SlackBuild
new file mode 100644
index 0000000000..4f6d490bd5
--- /dev/null
+++ b/desktop/vertex-maia-themes/vertex-maia-themes.SlackBuild
@@ -0,0 +1,388 @@
+#!/bin/sh
+
+# Slackware build script for vertex-maia-themes
+
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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.
+
+# References (Manjaro PKGBUILD):
+# github.com/manjaro/packages-community/blob/1cdf193952813754edd68463c652e094027ac650/vertex-maia-themes/PKGBUILD
+# Patch:
+# github.com/manjaro/packages-community/blob/1cdf193952813754edd68463c652e094027ac650/vertex-maia-themes/whiskermenu-rabideau.patch
+
+PRGNAM=vertex-maia-themes
+VERSION=${VERSION:-20170128}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+SRCNAM=vertex-theme
+SRCNAM2=vertex-manjaro
+MANJARO_COMMIT=084cd9576d280e306c00d58528375ed9743fa6fb
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+rm -rf $SRCNAM2-$MANJARO_COMMIT
+tar xvf $CWD/$SRCNAM2-$MANJARO_COMMIT.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 {} \;
+
+./autogen.sh --prefix=/usr
+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
+
+##
+## Manjaro theme modifications
+##
+cd extra
+for name in "Chrome" "Firefox" "Vertex-Plank" "Vertex_alt_metacity"; do
+  find "$name" -type f -not -name *~ -exec install -Dm644 '{}' "$PKG/usr/share/themes/{}" \;
+done
+cd ..
+
+echo "This next bit might take a little while..."
+
+cd "$PKG/usr/share/themes"
+rm -r Chrome Firefox/Vertex-Light Vertex{-Plank,_alt_metacity}
+mv Vertex Vertex-Maia
+mv Vertex-Dark Vertex-Maia-Dark
+mv Firefox/Vertex Firefox/Vertex-Maia
+mv Firefox/Vertex-Dark Firefox/Vertex-Maia-Dark
+
+## adjust theme names, default xcursor/icons and authors
+find . -type f -exec sed -i \
+	"s/Vertex/Vertex-Maia/g;s/DMZ-Black/Maia/g;s/gnome/Vertex-Maia/g;s/horst3180/horst3180\/korrode\/oberon\/ManjaroCinnamonFan/g" {} \;
+
+## Shift the hightlight-hue of all image files from blue to maia-greenish
+find . ! -type l -name "*.png" -exec mogrify -modulate 100,100,71 {} \;
+find . ! -type l -name "*.svg" -exec mogrify -background none -modulate 100,100,71 {} \;
+
+## Adjust color values
+find . ! -type l -name "*.css" -exec sed -i \
+	"s/0553ea/1ceab6/g;\
+	s/0d9eff/0dff9e/g;\
+	s/0e5ffa/16a085/g;\
+	s/122237/123722/g;\
+	s/171819/171918/g;\
+	s/1793e5/16a085/g;\
+	s/1c1d1e/1c1e1d/g;\
+	s/1E1E1F/1E1F1E/g;\
+	s/232324/232423/g;\
+	s/244672/247246/g;\
+	s/276ffa/16a085/g;\
+	s/282829/282928/g;\
+	s/284d7d/287d4d/g;\
+	s/29292b/292b29/g;\
+	s/2a5285/2a8552/g;\
+	s/2b2b2c/2b2c2b/g;\
+	s/2b2b2d/2b2d2b/g;\
+	s/2b2c2e/2b2e2c/g;\
+	s/2b5489/2b8954/g;\
+	s/2c578d/2c8d57/g;\
+	s/2c73fb/16a085/g;\
+	s/2e3436/2e3634/g;\
+	s/313132/313231/g;\
+	s/3294d5/32d594/g;\
+	s/3176fb/16a085/g;\
+	s/343436/343634/g;\
+	s/353638/353836/g;\
+	s/37383A/373A38/g;\
+	s/38393b/383b39/g;\
+	s/393A3B/393B3A/g;\
+	s/39689f/399f68/g;\
+	s/3a3b3d/3a3d3b/g;\
+	s/3a6fa9/3aa96f/g;\
+	s/3a73e2/16a085/g;\
+	s/3c3c3e/3c3e3c/g;\
+	s/3c3e40/3c403e/g;\
+	s/3d3e40/3d403e/g;\
+	s/3e5e9d/3e9d5e/g;\
+	s/407cbc/16a085/g;\
+	s/404042/404240/g;\
+	s/4080fb/16a085/g;\
+	s/4080FB/16a085/g;\
+	s/434446/434644/g;\
+	s/4577d6/16a085/g;\
+	s/45a3e7/45e7a3/g;\
+	s/46484a/464a48/g;\
+	s/4a84c1/16a085/g;\
+	s/4a86fb/62fbc8/g;\
+	s/4B4C4E/4B4E4C/g;\
+	s/4b4d50/4b504d/g;\
+	s/4c86f3/16a085/g;\
+	s/4cb1ff/16a085/g;\
+	s/4e86c3/16a085/g;\
+	s/4f5053/4f5350/g;\
+	s/4f5154/4f5451/g;\
+	s/525254/4f5451/g;\
+	s/536272/537262/g;\
+	s/538dfb/16a085/g;\
+	s/548dfb/16a085/g;\
+	s/58585a/585a58/g;\
+	s/59b5fc/59fcb5/g;\
+	s/5A86DB/16a085/g;\
+	s/5d5d5f/5d5f5d/g;\
+	s/5d5e62/5d625e/g;\
+	s/5d93fc/16a085/g;\
+	s/5e6064/5e6460/g;\
+	s/616163/616361/g;\
+	s/616263/616362/g;\
+	s/6193c9/16a085/g;\
+	s/628cdd/77ddbb/g;\
+	s/6496F5/16a085/g;\
+	s/656668/656866/g;\
+	s/6596ca/16a085/g;\
+	s/66bdff/66ffbd/g;\
+	s/6a6a6c/6a6c6a/g;\
+	s/72a1fc/16a085/g;\
+	s/747476/747674/g;\
+	s/77a3f6/16a085/g;\
+	s/78797a/787a79/g;\
+	s/79a6fc/16a085/g;\
+	s/7a7a7b/7a7b7a/g;\
+	s/7c7d7f/7c7f7d/g;\
+	s/7d7e7f/7d7f7e/g;\
+	s/868688/868886/g;\
+	s/88888b/888b88/g;\
+	s/8a8a8b/8a8b8a/g;\
+	s/8a8b8c/8a8c8b/g;\
+	s/949496/949694/g;\
+	s/949596/949695/g;\
+	s/949597/949795/g;\
+	s/99999b/999b99/g;\
+	s/9c9d9e/9c9e9d/g;\
+	s/9cbdfd/16a085/g;\
+	s/9e9e9f/9e9f9e/g;\
+	s/a0c0fd/16a085/g;\
+	s/a4c2fd/16a085/g;\
+	s/a5a5a7/a5a7a5/g;\
+	s/a9a9aa/a9aaa9/g;\
+	s/ababad/abadab/g;\
+	s/B2BDC4/B2C4BD/g;\
+	s/b3ccfd/b3fdde/g;\
+	s/b4b4b6/b4b6b4/g;\
+	s/B9B9BA/B9BAB9/g;\
+	s/bbbbc7/bbc7bb/g;\
+	s/c9c9d2/c9d2c9/g;\
+	s/d0d0da/d0dad0/g;\
+	s/d4e1fb/d4fbe1/g;\
+	s/d4e1fb/d4fbe1/g;\
+	s/d7d7de/d7ded7/g;\
+	s/d9d9e0/d9e0d9/g;\
+	s/d9e6fe/d9fee6/g;\
+	s/dcdce3/dce3dc/g;\
+	s/e2e2e4/e2e4e2/g;\
+	s/e4e4e8/e4e8e4/g;\
+	s/e5e5e9/e5e9e5/g;\
+	s/e7e7ec/e7ece7/g;\
+	s/eaeaed/eaedea/g;\
+	s/eaeaee/eaeeea/g;\
+	s/ebebec/ebeceb/g;\
+	s/ebebef/ebefeb/g;\
+	s/ecf2ff/ecfff2/g;\
+	s/ededf0/edf0ed/g;\
+	s/F3F3F5/F3F5F3/g;\
+	s/f5f5f7/f5f7f5/g;\
+	s/f8f8f9/f8f9f8/g;\
+	s/fafafb/fafbfa/g;\
+	s/fbfbfc/fbfcfb/g;\
+	s/ffffff/f9faf9/g;\
+	s/14, 95, 250/14, 250, 95/g;\
+	s/22, 22, 23/22, 23, 22/g;\
+	s/25, 26, 29/25, 29, 26/g;\
+	s/27, 27, 28/27, 28, 27/g;\
+	s/29, 29, 31/29, 31, 29/g;\
+	s/34, 34, 36/34, 36, 34/g;\
+	s/35, 35, 36/35, 36, 35/g;\
+	s/36, 36, 38/36, 38, 36/g;\
+	s/39, 39, 41/39, 41, 39/g;\
+	s/41, 42, 43/41, 43, 42/g;\
+	s/49, 49, 51/49, 51, 49/g;\
+	s/51, 52, 54/51, 54, 52/g;\
+	s/52, 52, 54/52, 54, 52/g;\
+	s/53, 54, 56/52, 56, 54/g;\
+	s/60, 60, 62/60, 62, 60/g;\
+	s/60, 62, 64/60, 64, 62/g;\
+	s/64, 124, 188/64, 188, 124/g;\
+	s/64, 128, 251/64, 251, 128/g;\
+	s/65, 65, 67/65, 67, 65/g;\
+	s/70, 70, 72/70, 72, 70/g;\
+	s/82, 82, 85/82, 85, 82/g;\
+	s/93, 93, 95/93, 95, 93/g;\
+	s/100, 150, 245/100, 245, 150/g;\
+	s/106, 106, 108/106, 108, 106/g;\
+	s/120, 121, 122/120, 122, 121/g;\
+	s/148, 149, 150/148, 150, 149/g;\
+	s/171, 171, 173/171, 173, 171/g;\
+	s/226, 226, 228/226, 228, 226/g;\
+	s/243, 243, 245/243, 245, 243/g;\
+	s/245, 245, 247/245, 247, 245/g;\
+	s/114, 161, 252/114, 252, 161/g;\
+	s/151516/151615/g;\
+	s/1e1f20/1e201f/g;\
+	s/1f1f20/1f201f/g;\
+	s/202021/202120/g;\
+	s/242426/242624/g;\
+	s/262627/262726/g;\
+	s/28bd8e/16a085/g;\
+	s/2a2a2b/2a2b2a/g;\
+	s/2A2A2B/2A2B2A/g;\
+	s/2B2B2C/2B2C2B/g;\
+	s/2e2e30/2e302e/g;\
+	s/2f3032/2f3230/g;\
+	s/303031/303130/g;\
+	s/303133/303331/g;\
+	s/333436/333634/g;\
+	s/344463/346353/g;\
+	s/353537/353735/g;\
+	s/363738/363837/g;\
+	s/363739/363937/g;\
+	s/37393b/373b39/g;\
+	s/37393B/373B39/g;\
+	s/37455f/375f52/g;\
+	s/3a67bd/16a085/g;\
+	s/3a6cce/16a085/g;\
+	s/3C3E40/3C403E/g;\
+	s/3D5074/3D7463/g;\
+	s/3d73dc/16a085/g;\
+	s/3e78e6/16a085/g;\
+	s/3f3f40/3f403f/g;\
+	s/3f4042/3f4240/g;\
+	s/3f7cf1/16a085/g;\
+	s/414245/414542/g;\
+	s/414345/414543/g;\
+	s/444547/444745/g;\
+	s/454749/454947/g;\
+	s/47494A/474A49/g;\
+	s/4e4f52/4e524f/g;\
+	s/505255/505552/g;\
+	s/54565a/545a56/g;\
+	s/5991fc/59fcc8/g;\
+	s/78787a/787a78/g;\
+	s/7F7F8A/7F8A7F/g;\
+	s/8bb2fd/8bfdd9/g;\
+	s/8f8f91/8f918f/g;\
+	s/9abaf8/81f8d0/g;\
+	s/a3a3a5/a3a5a3/g;\
+	s/A7A7A8/A7A8A7/g;\
+	s/a7a7a9/a7a9a7/g;\
+	s/bababc/babcba/g;\
+	s/cdcdcf/cdcfcd/g;\
+	s/d7d7d9/d7d9d7/g" {} \;
+
+cd Vertex-Maia/gtk-2.0
+sed -i "s/3c3c3e/3c3e3c/g;\
+	s/4080fb/16a085/g;\
+	s/454749/454947/g;\
+	s/F3F3F5/F3F5F3/g;\
+	s/fff\;/f9faf9\;/g;\
+	s/FFF\"/F9FAF9\"/g;\
+	s/FFFFFF/F9FAF9/g" gtkrc
+
+sed -i "s/232324/232423/g;\
+	s/3C3E40/3C403E/g;\
+	s/45474A/454A47/g;\
+	s/F3F3F5/F3F5F3/g;\
+	s/ythickness = 0/xthickness = 1\\n  ythickness = 1/" panel.rc
+
+cd ../../Vertex-Maia-Dark/gtk-2.0
+sed -i "s/2B2B2C/2B2C2B/g;\
+	s/2c2e2f/2c2f2e/g;\
+	s/353638/353836/g;\
+	s/3c3c3e/3c3e3c/g;\
+	s/4080fb/16a085/g;\
+	s/434446/434644/g;\
+	s/454749/454947/g;\
+	s/F3F3F5/F3F5F3/g;\
+	s/ffffff/f9faf9/g;\
+	s/FFF\"/F9FAF9\"/g;\
+	s/FFFFFF/F9FAF9/g" gtkrc
+
+sed -i "s/232324/232423/g;\
+	s/3C3E40/3C403E/g;\
+	s/45474A/454A47/g;\
+	s/F3F3F5/F3F5F3/g;\
+	s/ythickness = 0/xthickness = 1\\n  ythickness = 1/" panel.rc
+
+## add custom items
+cd "$TMP/$SRCNAM2-$MANJARO_COMMIT"
+cp -r images/* "$PKG/usr/share/themes/Vertex-Maia"
+rm -rf $PKG/usr/share/themes/Vertex-Maia-Dark/{gtk-2.0/{Menu,ProgressBar},gtk-3.0/assets,xfwm4}
+cp -r images-dark/* "$PKG/usr/share/themes/Vertex-Maia-Dark"
+cp Firefox/privatebrowsing-mask.png $PKG/usr/share/themes/Firefox/Vertex-Maia/chrome/images
+cp -r Vertex-Maia-Square "$PKG/usr/share/themes"
+
+## add .css for Palemoon
+install -dm755 $PKG/usr/share/themes/Palemoon/Vertex-Maia{,-Dark}/chrome
+cp Palemoon/userChrome.css $PKG/usr/share/themes/Palemoon/Vertex-Maia/chrome/userChrome.css
+cp Palemoon/userChrome-dark.css $PKG/usr/share/themes/Palemoon/Vertex-Maia-Dark/chrome/userChrome.css
+ln -s /usr/share/themes/Firefox/Vertex-Maia-Dark/chrome/userContent.css $PKG/usr/share/themes/Palemoon/Vertex-Maia-Dark/chrome/userContent.css
+ln -s /usr/share/themes/Firefox/Vertex-Maia/chrome/images $PKG/usr/share/themes/Palemoon/Vertex-Maia/chrome/images
+ln -s /usr/share/themes/Firefox/Vertex-Maia-Dark/chrome/images $PKG/usr/share/themes/Palemoon/Vertex-Maia-Dark/chrome/images
+
+## fix corrupt metacity thumbnail
+tee $PKG/usr/share/themes/Vertex-Maia{,-Dark}/metacity-1/thumbnail.png < $TMP/$SRCNAM-$VERSION/common/metacity-1/thumbnail.png >/dev/null
+
+## customization for whiskermenu
+cd $PKG/usr/share/themes/Vertex-Maia
+patch -p1 < $CWD/whiskermenu-rabideau.patch
+
+## add openbox themes
+cd $TMP/$SRCNAM2-$MANJARO_COMMIT
+cp -r Vertex-Maia{,-Dark} $PKG/usr/share/themes
+
+# Finishing the SlackBuild
+cd $TMP/$SRCNAM-$VERSION
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING.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 y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/vertex-maia-themes/vertex-maia-themes.info b/desktop/vertex-maia-themes/vertex-maia-themes.info
new file mode 100644
index 0000000000..e66e3b9fe0
--- /dev/null
+++ b/desktop/vertex-maia-themes/vertex-maia-themes.info
@@ -0,0 +1,12 @@
+PRGNAM="vertex-maia-themes"
+VERSION="20170128"
+HOMEPAGE="https://github.com/oberon-manjaro/vertex-theme"
+DOWNLOAD="https://github.com/horst3180/vertex-theme/archive/20170128/vertex-theme-20170128.tar.gz \
+          https://github.com/manjaro/vertex-manjaro/archive/084cd95/vertex-manjaro-084cd9576d280e306c00d58528375ed9743fa6fb.tar.gz"
+MD5SUM="47b6a180620bf5da7f502d514b3c3300 \
+        e22a7b5ae836f1da6404cc7b0514e785"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="murrine"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/desktop/vertex-maia-themes/whiskermenu-rabideau.patch b/desktop/vertex-maia-themes/whiskermenu-rabideau.patch
new file mode 100644
index 0000000000..84e79c31ec
--- /dev/null
+++ b/desktop/vertex-maia-themes/whiskermenu-rabideau.patch
@@ -0,0 +1,28 @@
+diff -rupN Vertex-Maia.orig/gtk-2.0/gtkrc Vertex-Maia/gtk-2.0/gtkrc
+--- Vertex-Maia.orig/gtk-2.0/gtkrc	2016-04-16 02:17:41.000000000 +0200
++++ Vertex-Maia/gtk-2.0/gtkrc	2016-04-17 16:08:29.546981860 +0200
+@@ -2381,6 +2383,18 @@ style "xfwm-tabwin-button" {
+   bg[SELECTED] = @selected_bg_color
+ }
+ 
++style "darkback" {
++   bg[NORMAL] = "#454947"
++   bg[ACTIVE] = "#1A1A1A"
++   fg[NORMAL] = "#f9f9f9"
++}
++
++style "darktree" {
++   base[PRELIGHT] = "#436E65"
++   text[NORMAL] = "#1A1A1A"
++   text[ACTIVE] = "#ffffff"
++}
++
+ # Chromium
+ style "chrome-gtk-frame" {
+ 
+@@ -2503,3 +2517,5 @@ widget "*libreoffice-toplevel*GtkSpinBut
+ widget_class "*XfdesktopIconView*"                                  style "xfdesktop-icon-view"
+ widget "xfwm4-tabwin*"                                              style "xfwm-tabwin"
+ widget "xfwm4-tabwin*GtkButton*"                                    style "xfwm-tabwin-button"
++widget "whiskermenu-window*"                                        style "darkback"
++widget "whiskermenu-window*TreeView*"                               style "darktree"
diff --git a/desktop/vivacious-colors-gtk-icon-theme/vivacious-colors-gtk-icon-theme.SlackBuild b/desktop/vivacious-colors-gtk-icon-theme/vivacious-colors-gtk-icon-theme.SlackBuild
index b8375d947f..b7cf2faadd 100644
--- a/desktop/vivacious-colors-gtk-icon-theme/vivacious-colors-gtk-icon-theme.SlackBuild
+++ b/desktop/vivacious-colors-gtk-icon-theme/vivacious-colors-gtk-icon-theme.SlackBuild
@@ -62,4 +62,11 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
+# 20200407 bkw: makepkg's symlink search and doinst.sh creation doesn't
+# scale well. This makes the build complete much faster, and create an
+# identical doinst.sh.
+find . -type l \
+  -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \
+  sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/vwm/README b/desktop/vwm/README
index 078c37a8be..557767fccf 100644
--- a/desktop/vwm/README
+++ b/desktop/vwm/README
@@ -1,18 +1,19 @@
 vwm (console based window manager)
 
-Viper Window Manager (VWM) is a lightweight, extensible window manager for
-the console. Originally, VWM was designed to be the reference implementation
-of libviper. In fact, the two projects were initially one before public
-release.
+Viper Window Manager (VWM) is a lightweight, extensible window manager
+for the console. Originally, VWM was designed to be the reference
+implementation of libviper. In fact, the two projects were initially
+one before public release.
 
 From conception, VWM was designed to be both lightweight and ssh
-friendly. Character based line-art compresses very well as do the escape
-sequences which handle cursor manipulation. This makes VWM quite suitable
-for low-bandwidth, remote connectivity over ssh.
+friendly. Character based line-art compresses very well as do the
+escape sequences which handle cursor manipulation. This makes VWM quite
+suitable for low-bandwidth, remote connectivity over ssh.
 
-It is also very easy to extend the functionality of VWM. By following a
-few simple API rules, anyone can create a "native application" which will
-appear on the VWM Main Menu. The mechanism for this is very similar to
-Mozilla-style plugins.
+It is also very easy to extend the functionality of VWM. By following
+a few simple API rules, anyone can create a "native application"
+which will appear on the VWM Main Menu. The mechanism for this is very
+similar to Mozilla-style plugins.
 
-See /usr/doc/vwm-2.0.2/samples/vwmrc for information on customising VWM.
+See /usr/doc/vwm-2.0.2/samples/vwmrc for information on customising
+VWM.
diff --git a/desktop/vwm/vwm.info b/desktop/vwm/vwm.info
index 11b3d5afce..a139a983a0 100644
--- a/desktop/vwm/vwm.info
+++ b/desktop/vwm/vwm.info
@@ -2,7 +2,7 @@ PRGNAM="vwm"
 VERSION="2.1.3"
 HOMEPAGE="http://vwm.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/vwm/vwm-2.1.3.tar.gz \
-          http://urchlay.naptime.net/~urchlay/src/libvterm-20170804.tar.xz"
+          https://slackware.uk/~urchlay/src/libvterm-20170804.tar.xz"
 MD5SUM="2a5c1ecba9db9a6f85f3e3b358136179 \
         d2d6344a67eb011ef7d0307bf3b267e3"
 DOWNLOAD_x86_64=""
diff --git a/desktop/wally/README b/desktop/wally/README
index 2c0cfe0986..374e40b307 100644
--- a/desktop/wally/README
+++ b/desktop/wally/README
@@ -1,7 +1,7 @@
 Wally is a Qt4 wallpaper changer, using multiple sources like files,
-folders, FTP remote folders, Flickr, Yahoo!, Panoramio, Pikeo, Ipernity,
-Photobucket, Buzznet, Picasa, Smugmug and Bing images. Now it's available
-in many languages!!
+folders, FTP remote folders, Flickr, Yahoo!, Panoramio, Pikeo,
+Ipernity, Photobucket, Buzznet, Picasa, Smugmug and Bing images. Now
+it's available in many languages!!
 
 Note: For xfce users, read README.XFCE4 (in source tarball) to activate
 wally.
diff --git a/desktop/weston/README b/desktop/weston/README
index 5c0ccf7dcc..49412fa858 100644
--- a/desktop/weston/README
+++ b/desktop/weston/README
@@ -57,10 +57,10 @@ should enable the one that comes with this SlackBuild:
 	# chmod +x /etc/profile.d/weston.sh
 		(or .csh, depending on your shell)
 
-Once you've logged out and back in as a normal user that has been added to the
-"weston-launch" group from a virtual console,  you should be able to run
-`weston-launch` from that virtual console, and Weston will then launch and run
-directly in that console.
+Once you've logged out and back in as a normal user that has been
+added to the "weston-launch" group from a virtual console,  you should
+be able to run `weston-launch` from that virtual console, and Weston
+will then launch and run directly in that console.
 
 You can use the Ctrl+Alt+Backspace keyboard combination to kill Weston.
 
@@ -68,14 +68,14 @@ You can use the Ctrl+Alt+Backspace keyboard combination to kill Weston.
 PAM
 ---
 
-Ordinarily, PAM is a mandatory dependency for Weston. This SlackBuild of
-Weston is, by default, patched to remove that dependency. If you happen to
-have PAM installed on your system and would like to build Weston with PAM
-support, make sure the USE_PAM variable is set to "true" (nb: nothing else,
-such as "1", "yes", "on", etc. will work) before running the SlackBuild. 
-For example:
+Ordinarily, PAM is a mandatory dependency for Weston. This SlackBuild
+of Weston is, by default, patched to remove that dependency. If you
+happen to have PAM installed on your system and would like to build
+Weston with PAM support, make sure the USE_PAM variable is set to
+"true" (nb: nothing else, such as "1", "yes", "on", etc. will work)
+before running the SlackBuild.  For example:
 
-	# USE_PAM=true ./weston.SlackBuild
+  # USE_PAM=true ./weston.SlackBuild
 
 
 Optional Dependencies
@@ -98,5 +98,6 @@ set the USE_COLORD variable to "true" before running the SlackBuild.
 Known Issues
 ------------
 
-I have not had success getting Weston to launch with the proprietary nvidia
-drivers in use. YMMV. I have had the best luck with the Intel KMS drivers.
+I have not had success getting Weston to launch with the proprietary
+nvidia drivers in use. YMMV. I have had the best luck with the Intel
+KMS drivers.
diff --git a/desktop/weston/weston.SlackBuild b/desktop/weston/weston.SlackBuild
index 676942b4c4..d44a73d774 100644
--- a/desktop/weston/weston.SlackBuild
+++ b/desktop/weston/weston.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Weston
 
-# Copyright 2019 Logan Rathbone <poprocks@gmail.com>
+# Copyright 2019-2020 Logan Rathbone <poprocks@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=weston
 VERSION=${VERSION:-7.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/desktop/weston/weston.info b/desktop/weston/weston.info
index c89169ae19..b9bf225c8f 100644
--- a/desktop/weston/weston.info
+++ b/desktop/weston/weston.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://wayland.freedesktop.org/releases/weston-7.0.0.tar.xz"
 MD5SUM="cbfda483bc2501d0831af3f33c707850"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libinput libwebp libxkbcommon wayland-egl wayland-protocols"
+REQUIRES="libinput libwebp libxkbcommon wayland wayland-protocols"
 MAINTAINER="Logan Rathbone"
 EMAIL="poprocks@gmail.com"
diff --git a/desktop/wmakerconf/README b/desktop/wmakerconf/README
index 4853bb11a7..6be3f64ed9 100644
--- a/desktop/wmakerconf/README
+++ b/desktop/wmakerconf/README
@@ -1,4 +1,5 @@
 WMakerConf (short for Window Maker Configurator) is a configuration
 utility for the Window Maker window manager.
 
-WMakerConf requires WindowMaker to be installed (it's part of Slackware).
+WMakerConf requires WindowMaker to be installed (it's part of
+Slackware).
diff --git a/desktop/wmalauncher/wmalauncher.SlackBuild b/desktop/wmalauncher/wmalauncher.SlackBuild
index c014018b80..65e54ecb4b 100644
--- a/desktop/wmalauncher/wmalauncher.SlackBuild
+++ b/desktop/wmalauncher/wmalauncher.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wmalauncher
-VERSION=${VERSION:-2020.0124}
+VERSION=${VERSION:-2020.0905}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/wmalauncher/wmalauncher.info b/desktop/wmalauncher/wmalauncher.info
index dbaa3e0cf1..ed0e8d5d3a 100644
--- a/desktop/wmalauncher/wmalauncher.info
+++ b/desktop/wmalauncher/wmalauncher.info
@@ -1,8 +1,8 @@
 PRGNAM="wmalauncher"
-VERSION="2020.0124"
+VERSION="2020.0905"
 HOMEPAGE="https://sourceforge.net/projects/wmalauncher/"
-DOWNLOAD="https://sourceforge.net/projects/wmalauncher/files/wmalauncher-2020.0124.tar.gz"
-MD5SUM="8e67cae4c3cdc7b994875eb78e629525"
+DOWNLOAD="https://sourceforge.net/projects/wmalauncher/files/wmalauncher-2020.0905.tar.gz"
+MD5SUM="9e886740e6538369b7265dea26f89866"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"
diff --git a/desktop/wmbattery/README b/desktop/wmbattery/README
index f40c4c6af0..52c42c80d6 100644
--- a/desktop/wmbattery/README
+++ b/desktop/wmbattery/README
@@ -1,4 +1,5 @@
-wmbattery displays the status of your laptop's battery in a small icon. This
-includes if it is plugged in, if the battery is charging, how many minutes
-of battery life remain, battery life remaining (with both a percentage and a
-graph), and battery status (high - green, low - yellow, or critical - red).
+wmbattery displays the status of your laptop's battery in a small
+icon. This includes if it is plugged in, if the battery is charging,
+how many minutes of battery life remain, battery life remaining (with
+both a percentage and a graph), and battery status (high - green, low -
+yellow, or critical - red).
diff --git a/desktop/wmclock/wmclock.info b/desktop/wmclock/wmclock.info
index ced3b6e7ed..e0b347372a 100644
--- a/desktop/wmclock/wmclock.info
+++ b/desktop/wmclock/wmclock.info
@@ -1,7 +1,7 @@
 PRGNAM="wmclock"
 VERSION="1.0.14"
 HOMEPAGE="http://web.archive.org/web/20171115102002/http://www.bluestop.org/wmclock/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/wmclock-1.0.14.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/wmclock-1.0.14.tar.gz"
 MD5SUM="15a83f45e2baabec26b22a2153aa2417"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/desktop/wmcpufreq/README b/desktop/wmcpufreq/README
index 2cccdae348..add88e0441 100644
--- a/desktop/wmcpufreq/README
+++ b/desktop/wmcpufreq/README
@@ -1,8 +1,7 @@
 wmcpufreq is a dock application that shows:
 
-+ the frequency in use between the maximum and minimum;
-+ the driver in green; and
-+ the active governor in red.
++ the frequency in use between the maximum and minimum; + the driver in
+green; and + the active governor in red.
 
-It is possible to set an external application to be executed when clicking on
-the wmcpufreq dock.
+It is possible to set an external application to be executed when
+clicking on the wmcpufreq dock.
diff --git a/desktop/wmctrl/README b/desktop/wmctrl/README
index 353e7107db..91d68435bc 100644
--- a/desktop/wmctrl/README
+++ b/desktop/wmctrl/README
@@ -1,12 +1,13 @@
 wmctrl is a command line tool to interact with an EWMH/NetWM compatible
 X Window Manager.
 
-The wmctrl program is a command line tool to interact with an EWMH / NetWM
-compatible X Window Manager. It provides command line access to almost all 
-of the features defined in the EWMH specification. It's possible to, for 
-example, obtain information about the window manager, get a detailed list
-of desktops and managed windows, switch and resize desktops, change the
-number of desktops, make windows full-screen, always-above, or sticky, and
-activate, close, move, resize, maximize, and minimize them. The command line
-access makes it easy to automate these tasks and execute them from any
-application that is able to run a command in response to some event.
+The wmctrl program is a command line tool to interact with an EWMH /
+NetWM compatible X Window Manager. It provides command line access
+to almost all of the features defined in the EWMH specification. It's
+possible to, for example, obtain information about the window manager,
+get a detailed list of desktops and managed windows, switch and resize
+desktops, change the number of desktops, make windows full-screen,
+always-above, or sticky, and activate, close, move, resize, maximize,
+and minimize them. The command line access makes it easy to automate
+these tasks and execute them from any application that is able to run a
+command in response to some event.
diff --git a/desktop/wmii/README b/desktop/wmii/README
index c39136f7ca..b91a02357b 100644
--- a/desktop/wmii/README
+++ b/desktop/wmii/README
@@ -1,10 +1,11 @@
 wmii - window manager improved 2
 
-wmii is a dynamic window manager for X11. It supports classic and dynamic
-window management with extended keyboard, mouse, and filesystem based remote
-control. It replaces the workspace paradigm with a new tagging approach. Its
-minimalist philosophy attempts to not exceed 10.000 lines of code (including
-all shipped utilities and libraries), to enforce simplicity and clarity.
+wmii is a dynamic window manager for X11. It supports classic and
+dynamic window management with extended keyboard, mouse, and filesystem
+based remote control. It replaces the workspace paradigm with a new
+tagging approach. Its minimalist philosophy attempts to not exceed
+10.000 lines of code (including all shipped utilities and libraries),
+to enforce simplicity and clarity.
 
-If you plan to use plan9port, python or ruby scripting support you should also
-install required interpreters at run time.
+If you plan to use plan9port, python or ruby scripting support you
+should also install required interpreters at run time.
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/wmimagedock/README b/desktop/wmimagedock/README
index 1d88dd73ea..92e93bf6c6 100644
--- a/desktop/wmimagedock/README
+++ b/desktop/wmimagedock/README
@@ -1,8 +1,9 @@
 wmimagedock
 ===========
-This is a WindowMaker dockapp for displaying multiple images of various types.
-Including, png, jpg, gif, xmp using Imlib2. Images change automatically in order
-loaded into list or randomly. Set at a given size. Defaults to 64.
+This is a WindowMaker dockapp for displaying multiple images of
+various types.  Including, png, jpg, gif, xmp using Imlib2. Images
+change automatically in order loaded into list or randomly. Set at a
+given size. Defaults to 64.
 
 Has right and left double click events to execute commands.
 
diff --git a/desktop/wmix/README b/desktop/wmix/README
index 8e9a8d2394..bc30be7d51 100644
--- a/desktop/wmix/README
+++ b/desktop/wmix/README
@@ -1,7 +1,8 @@
 Dockapp mixer for OSS or ALSA.
 
-Allows toggling record source, muting individual channels, adjusting volume and balance,
-all in a compact dockapp size, with TV-like on-screen-display for volume levels.
-Supports mousewheel to adjust current channel volume, and can be controlled remotely
-with SIGUSR1 / SIGUSR2 to adjust the volume, too.
-Can use a configuration file to control some of the features.
+Allows toggling record source, muting individual channels, adjusting
+volume and balance, all in a compact dockapp size, with TV-like
+on-screen-display for volume levels.  Supports mousewheel to adjust
+current channel volume, and can be controlled remotely with SIGUSR1 /
+SIGUSR2 to adjust the volume, too.  Can use a configuration file to
+control some of the features.
diff --git a/desktop/wmix/wmix.SlackBuild b/desktop/wmix/wmix.SlackBuild
index 0786374556..6ef89ca3fa 100644
--- a/desktop/wmix/wmix.SlackBuild
+++ b/desktop/wmix/wmix.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wmix
-VERSION=${VERSION:-3.3}
+VERSION=${VERSION:-3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,6 +83,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+sed -i '/^Categories/s|$|;AudioVideo|' $PKG/usr/share/applications/wmix.desktop
+
 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/wmix/wmix.info b/desktop/wmix/wmix.info
index 98ed6519f6..86a50be23c 100644
--- a/desktop/wmix/wmix.info
+++ b/desktop/wmix/wmix.info
@@ -1,8 +1,8 @@
 PRGNAM="wmix"
-VERSION="3.3"
+VERSION="3.4"
 HOMEPAGE="https://www.dockapps.net/wmix"
-DOWNLOAD="https://www.dockapps.net/download/wmix-3.3.tar.gz"
-MD5SUM="7d1a1ac7952dbcedf8c5e734bec8d54b"
+DOWNLOAD="https://www.dockapps.net/download/wmix-3.4.tar.gz"
+MD5SUM="79bda572e83c9ebdfd4de71b77d2dc6f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/wmname/README b/desktop/wmname/README
index 8963625b4c..bafcb25dbe 100644
--- a/desktop/wmname/README
+++ b/desktop/wmname/README
@@ -1,8 +1,8 @@
 wmname prints/sets the window manager name property of the root window
 similar to how hostname(1) behaves.
 
-wmname is a nice utility to fix problems with JDK versions and other broken
-programs assuming a reparenting window manager for instance.
+wmname is a nice utility to fix problems with JDK versions and other
+broken programs assuming a reparenting window manager for instance.
 
-Run 'wmname' to print the current WM name. Run 'wmname <name>' to set it.
-This is pretty much similiar to hostname(1).
+Run 'wmname' to print the current WM name. Run 'wmname <name>' to
+set it.  This is pretty much similiar to hostname(1).
diff --git a/desktop/wmpinboard/README b/desktop/wmpinboard/README
index 0f2d5e01b1..c4afc8c4ae 100644
--- a/desktop/wmpinboard/README
+++ b/desktop/wmpinboard/README
@@ -1,13 +1,13 @@
-
-wmpinboard is a Window Maker dock applet resembling a miniature pinboard.
+wmpinboard is a Window Maker dock applet resembling a miniature
+pinboard.
 
 It's intended to somewhat relieve heavily littered desktops by allowing
 you to place reminders on a graphical on-screen pinboard rather than
 producing a mess of real notes all around your keyboard.
 
-Besides text, you can add small monochrome sketches to your notes or simply
-encircle or underline words as a means of emphasis, and alarms can be set
-to explicitly remind you of things.
+Besides text, you can add small monochrome sketches to your notes or
+simply encircle or underline words as a means of emphasis, and alarms
+can be set to explicitly remind you of things.
 
 Above all, wmpinboard is animated in redundant ways to make it look even
 more attractive, and themeability provides for a way of adapting its
diff --git a/desktop/wmstickynotes/README b/desktop/wmstickynotes/README
index ad93b98952..2af3c9ff46 100644
--- a/desktop/wmstickynotes/README
+++ b/desktop/wmstickynotes/README
@@ -1,17 +1,18 @@
 wmstickynotes
 -------------
 
-This program is a Window Maker style dockapp which allows you to create note
-windows.
+This program is a Window Maker style dockapp which allows you to
+create note windows.
 
-By default, the notes, along with their position, size, and color,
-are stored in files and will be restored when wmstickynotes is run again.
+By default, the notes, along with their position, size, and color, are
+stored in files and will be restored when wmstickynotes is run again.
 
 USAGE:
-+ Left click the note icon to create a new note with the default color (yellow).
-+ Right click the note icon to get a menu of colors, selecting one of which will
-create a new note of that color.
++ Left click the note icon to create a new note with the default color
+  (yellow).
++ Right click the note icon to get a menu of colors, selecting one of
+  which will create a new note of that color.
 + Click the x in the top right of a note to delete it.
 + Drag the bottom right corner of a note to resize it.
 + Right click a note to get a popup menu where you can change its color,
-cut/paste, etc.
+  cut/paste, etc.
diff --git a/desktop/wmsupermon/README b/desktop/wmsupermon/README
new file mode 100644
index 0000000000..88ea9aa704
--- /dev/null
+++ b/desktop/wmsupermon/README
@@ -0,0 +1,26 @@
+wmsupermon (universal monitoring dockapp for WindowMaker)
+
+wmsupermon is a highly configurable dockapp that can monitor almost any
+system statistic you can think of.
+
+Examples:
+
+ 1. CPU usage
+ 2. disk i/o
+ 3. memory
+ 4. swap
+ 5. filesystems - space utilization
+ 6. network traffic
+ 7. wireless link quality
+ 8. CPU frequency
+ 9. CPU temperature, fan speed, voltages (no lm_sensors required!)
+10. battery status (with actual - not guessed - discharge rate!)
+11. traffic from your router
+12. anything else :)
+
+The dockapp is configured via ~/.wmsupermonrc file, which specifies what
+to monitor and how to present the results.
+
+*** NOTE: Installing this package does NOT create a config file.
+You will have to create one before the dockapp will start. See README
+and example-wmsupermonrc in /usr/doc/wmsupermon-1.2.2 for details.
diff --git a/desktop/wmsupermon/example-wmsupermonrc-cputemponly b/desktop/wmsupermon/example-wmsupermonrc-cputemponly
new file mode 100644
index 0000000000..dd848dbc5a
--- /dev/null
+++ b/desktop/wmsupermon/example-wmsupermonrc-cputemponly
@@ -0,0 +1,8 @@
+[tmp]
+Source = /sys/class/hwmon/hwmon0/temp1_input
+Scale  = 1000
+Range  = 37 .. 70
+
+[[wmsupermon]]
+tmp = number -label
+tmp = graph
diff --git a/desktop/wmsupermon/exampleconfig.diff b/desktop/wmsupermon/exampleconfig.diff
new file mode 100644
index 0000000000..6df959d5ad
--- /dev/null
+++ b/desktop/wmsupermon/exampleconfig.diff
@@ -0,0 +1,18 @@
+diff -Naur dockapps-c2fa6a3/example-wmsupermonrc dockapps-c2fa6a3.patched/example-wmsupermonrc
+--- dockapps-c2fa6a3/example-wmsupermonrc	2016-08-03 20:18:50.000000000 -0400
++++ dockapps-c2fa6a3.patched/example-wmsupermonrc	2020-06-10 02:10:51.872534759 -0400
+@@ -30,11 +30,11 @@
+ Source = /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
+ Scale = 1000
+ 
+-# temperature from the second sensor (cpu temperature on my motherboard)
++# temperature from the first sensor (cpu temperature on my motherboard)
+ [Tem]
+-Source = /sys/bus/i2c/drivers/w83627hf/9191-0290/temp2_input
++Source = /sys/class/hwmon/hwmon0/temp1_input
+ Scale  = 1000
+-Range  = 37 .. 55
++Range  = 37 .. 75
+ 
+ # second fan speed (cpu fan on my motherboard)
+ [fan]
diff --git a/desktop/wmsupermon/slack-desc b/desktop/wmsupermon/slack-desc
new file mode 100644
index 0000000000..a0d85f0b9c
--- /dev/null
+++ b/desktop/wmsupermon/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------------------------------------------------------|
+wmsupermon: wmsupermon (universal monitoring dockapp for WindowMaker)
+wmsupermon:
+wmsupermon: wmsupermon is a highly configurable dockapp that can monitor almost
+wmsupermon: any system statistic you can think of.
+wmsupermon:
+wmsupermon:
+wmsupermon:
+wmsupermon:
+wmsupermon:
+wmsupermon:
+wmsupermon:
diff --git a/desktop/wmsupermon/wmsupermon.SlackBuild b/desktop/wmsupermon/wmsupermon.SlackBuild
new file mode 100644
index 0000000000..8acb0d272d
--- /dev/null
+++ b/desktop/wmsupermon/wmsupermon.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Slackware build script for wmsupermon
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=wmsupermon
+VERSION=${VERSION:-1.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
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+# top-level dir doesn't match tarball filename, so:
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd */
+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 {} \+
+
+# adjust the sensor path in the example config file.
+patch -p1 < $CWD/exampleconfig.diff
+
+# fix the config filename in the README, this caused me some grief.
+sed -i 's,~/\.wmsupermon,&rc,' README
+
+make FLAGS="$SLKCFLAGS"
+mkdir -p $PKG/usr/bin
+install -s -m0755 -oroot -groot $PRGNAM $PKG/usr/bin
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a example-wmsupermonrc COPYING ChangeLog README TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+# include a simpler example config file, which I actually use.
+install -oroot -groot -m0644 $CWD/example-wmsupermonrc-cputemponly $PKGDOC
+
+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/wmsupermon/wmsupermon.info b/desktop/wmsupermon/wmsupermon.info
new file mode 100644
index 0000000000..f2b99a16ba
--- /dev/null
+++ b/desktop/wmsupermon/wmsupermon.info
@@ -0,0 +1,10 @@
+PRGNAM="wmsupermon"
+VERSION="1.2.2"
+HOMEPAGE="https://www.dockapps.net/wmsupermon"
+DOWNLOAD="https://www.dockapps.net/download/wmsupermon-1.2.2.tar.gz"
+MD5SUM="b0cd98755ca35b9c62dae799a9a465ff"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/desktop/wmsysmon/README b/desktop/wmsysmon/README
new file mode 100644
index 0000000000..9857a1bc93
--- /dev/null
+++ b/desktop/wmsysmon/README
@@ -0,0 +1,3 @@
+wmsysmon is a small dock application for use with
+Window Maker (windowmaker.org) to show system information
+on interrupt activity, memory use, swap use, and IO.
diff --git a/desktop/wmsysmon/slack-desc b/desktop/wmsysmon/slack-desc
new file mode 100644
index 0000000000..9b6304ba5d
--- /dev/null
+++ b/desktop/wmsysmon/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------------------------------------------------------|
+wmsysmon: wmsysmon (dockapp to monitor CPU, RAM, swap, uptime, and more)
+wmsysmon:
+wmsysmon: A small dock application for use with Window Maker (windowmaker.org)
+wmsysmon: to show system information on interrupt activity, memory use, swap
+wmsysmon: use, and IO.
+wmsysmon:
+wmsysmon: wmsysmon homepage: http://github.com/voyageur/wmsysmon
+wmsysmon:
+wmsysmon:
+wmsysmon:
+wmsysmon:
diff --git a/desktop/wmsysmon/wmsysmon.SlackBuild b/desktop/wmsysmon/wmsysmon.SlackBuild
new file mode 100644
index 0000000000..c644fc3915
--- /dev/null
+++ b/desktop/wmsysmon/wmsysmon.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for wmsysmon
+
+# Copyright 2020 fondfire (fondfire@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.
+
+# version 1.0 - 2020/03/29
+# - initial creation
+
+PRGNAM=wmsysmon
+VERSION=${VERSION:-0.7.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i456 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i456" ]; then
+  SLKCFLAGS="-O2 -march=i586 -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 $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 {} \;
+
+CFLAGS="$SLKCFLAGS"
+cd src
+mkdir -p $PKG/usr/bin
+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 COPYING ChangeLog 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/desktop/wmsysmon/wmsysmon.info b/desktop/wmsysmon/wmsysmon.info
new file mode 100644
index 0000000000..491e5d122a
--- /dev/null
+++ b/desktop/wmsysmon/wmsysmon.info
@@ -0,0 +1,10 @@
+PRGNAM="wmsysmon"
+VERSION="0.7.8"
+HOMEPAGE="http://github.com/voyageur/wmsysmon"
+DOWNLOAD="http://github.com/voyageur/wmsysmon/archive/0.7.8/wmsysmon-0.7.8.tar.gz"
+MD5SUM="a044b49d21084ed10171973cbb6cbdc8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="fondfire"
+EMAIL="fondfire@gmail.com"
diff --git a/desktop/wmtime/README b/desktop/wmtime/README
index 3b755ef8b6..dd0763c36b 100644
--- a/desktop/wmtime/README
+++ b/desktop/wmtime/README
@@ -3,16 +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/wmtimer/README b/desktop/wmtimer/README
index d5634af7cb..634138c5ef 100644
--- a/desktop/wmtimer/README
+++ b/desktop/wmtimer/README
@@ -1,4 +1,5 @@
 WMTimer is a dockable alarm clock for WindowMaker which can be run in
-alarm, countdown timer, or chronograph mode. In alarm or timer mode, you
-can either execute a command or sound the system bell when the time is
-reached. Wmtimer is configurable through the command line or the GTK GUI.
+alarm, countdown timer, or chronograph mode. In alarm or timer mode,
+you can either execute a command or sound the system bell when the time
+is reached. Wmtimer is configurable through the command line or the
+GTK GUI.
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/wmwebcam/wmwebcam.info b/desktop/wmwebcam/wmwebcam.info
index f5b7913f91..a55708f317 100644
--- a/desktop/wmwebcam/wmwebcam.info
+++ b/desktop/wmwebcam/wmwebcam.info
@@ -1,7 +1,7 @@
 PRGNAM="wmwebcam"
 VERSION="0.3.5"
 HOMEPAGE="https://www.dockapps.net/wmwebcam"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/wmwebcam-0.3.5-fixed.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/wmwebcam-0.3.5-fixed.tar.gz"
 MD5SUM="e0a65c02d9743f38c8639d8035bb13b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/desktop/x-tile/README b/desktop/x-tile/README
index e2ed191294..a7b04f316f 100644
--- a/desktop/x-tile/README
+++ b/desktop/x-tile/README
@@ -1,8 +1,9 @@
-X-tile is an application that allows you to select a number of windows and tile
-them in different ways.
+X-tile is an application that allows you to select a number of windows
+and tile them in different ways.
 
 X-tile works on any X desktop (gnome, kde, xfce, lxde?).
 
-The main features are: many tiling geometries, undo tiling, invert tiling order,
-optional system tray docking and menu, filter to avoid listing some windows,
-filter to check some windows by default, command line interface.
+The main features are: many tiling geometries, undo tiling, invert
+tiling order, optional system tray docking and menu, filter to avoid
+listing some windows, filter to check some windows by default, command
+line interface.
diff --git a/desktop/x-tile/x-tile.SlackBuild b/desktop/x-tile/x-tile.SlackBuild
index 43ce2f6fae..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:-2.6}
+VERSION=${VERSION:-3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,7 +53,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
 
 mv $PKG/usr/share/man $PKG/usr/
 
diff --git a/desktop/x-tile/x-tile.info b/desktop/x-tile/x-tile.info
index d7451b9354..d1a09ce1f9 100644
--- a/desktop/x-tile/x-tile.info
+++ b/desktop/x-tile/x-tile.info
@@ -1,10 +1,10 @@
 PRGNAM="x-tile"
-VERSION="2.6"
+VERSION="3.3"
 HOMEPAGE="http://www.giuspen.com/x-tile/"
-DOWNLOAD="https://github.com/giuspen/x-tile/archive/2.6/x-tile-2.6.tar.gz"
-MD5SUM="12a8375994fb74ea8cfe63b053ddc595"
+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="gnome-python"
+REQUIRES="python3"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"
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/xdg-desktop-portal-gtk/README b/desktop/xdg-desktop-portal-gtk/README
index 60e60ed82c..032d03d210 100644
--- a/desktop/xdg-desktop-portal-gtk/README
+++ b/desktop/xdg-desktop-portal-gtk/README
@@ -1,5 +1,6 @@
 xdg-desktop-portal-gtk
 
-A backend implementation for xdg-desktop-portal that is using GTK+ and various
-pieces of GNOME infrastructure, such as the org.gnome.Shell.Screenshot or
-org.gnome.SessionManager D-Bus interfaces.
+A backend implementation for xdg-desktop-portal that is using
+GTK+ and various pieces of GNOME infrastructure, such as the
+org.gnome.Shell.Screenshot or org.gnome.SessionManager D-Bus
+interfaces.
diff --git a/desktop/xdg-desktop-portal/README b/desktop/xdg-desktop-portal/README
index 3035b1c7ee..ef36f33127 100644
--- a/desktop/xdg-desktop-portal/README
+++ b/desktop/xdg-desktop-portal/README
@@ -1,11 +1,11 @@
 xdg-desktop-portal
 
-A portal frontend service for Flatpak and possibly other desktop containment
-frameworks.
+A portal frontend service for Flatpak and possibly other desktop
+containment frameworks.
 
-xdg-desktop-portal works by exposing a series of D-Bus interfaces known as
-portals under a well-known name (org.freedesktop.portal.Desktop) and object
-path (/org/freedesktop/portal/desktop).
+xdg-desktop-portal works by exposing a series of D-Bus interfaces known
+as portals under a well-known name (org.freedesktop.portal.Desktop) and
+object path (/org/freedesktop/portal/desktop).
 
-The portal interfaces include APIs for file access, opening URIs, printing and
-others.
+The portal interfaces include APIs for file access, opening URIs,
+printing and others.
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/xdm-slackware-theme/README b/desktop/xdm-slackware-theme/README
index 0497ba0235..682ed00bd1 100644
--- a/desktop/xdm-slackware-theme/README
+++ b/desktop/xdm-slackware-theme/README
@@ -1,4 +1,4 @@
-A customizable slackware's theme for the XDM login manager.
+A customizable slackware theme for the XDM login manager.
 
 By default the image C2-Ocean-Side-Sunset-2.jpg is defined as the XDM 
 background image source. This can be changed by passing XDMBGIMG=<img> 
@@ -14,22 +14,23 @@ on the command line, <img> can be one of the following :
   Geminid-Meteor-Shower.jpg         Green-Hills.jpg
   Mars-Olympus-Mons.jpg             Space-Outer-Nature.jpg
 
-Example :
+Example:
 
  $ XDMBGIMG=Green-Hills.jpg ./xdm-slackware-theme.SlackBuild
 
-xdm-slackware-theme optionally requires :
+xdm-slackware-theme optionally requires:
 
-  numlockx (https://slackbuilds.org/repository/14.2/system/numlockx/)
-  compton (https://slackbuilds.org/repository/14.2/desktop/compton/)
-  feh (https://slackbuilds.org/repository/14.2/graphics/feh/)
-  xonclock (https://slackbuilds.org/repository/14.2/desktop/xonclock/)
-  cairo-clock (https://slackbuilds.org/repository/14.2/desktop/cairo-clock/)
-  conky (https://slackbuilds.org/repository/14.2/system/conky/)
+ numlockx (https://slackbuilds.org/repository/14.2/system/numlockx/)
+ compton (https://slackbuilds.org/repository/14.2/desktop/compton/)
+ feh (https://slackbuilds.org/repository/14.2/graphics/feh/)
+ xonclock (https://slackbuilds.org/repository/14.2/desktop/xonclock/)
+ cairo-clock (https://slackbuilds.org/repository/14.2/desktop/cairo-clock/)
+ conky (https://slackbuilds.org/repository/14.2/system/conky/)
 
-Attention, when xdm-slackware-theme is configured with compton support while 
-feh is not installed, compton support is automatically disabled because compton
-is incompatible with imagemagick's display command (used by xdm-slackware-theme
-when feh is not available).
+Attention, when xdm-slackware-theme is configured with compton support
+while feh is not installed, compton support is automatically disabled
+because compton is incompatible with imagemagick's display command
+(used by xdm-slackware-theme when feh is not available).
 
-Full documentation is available at https://xdm-slackware-theme.sourceforge.io/
+Full documentation is available at:
+https://xdm-slackware-theme.sourceforge.io/
diff --git a/desktop/xed/README b/desktop/xed/README
index 1cb20b04b0..2a4350f8bf 100644
--- a/desktop/xed/README
+++ b/desktop/xed/README
@@ -16,7 +16,8 @@ Although new features are always under development, currently xed has:
     * A complete preferences interface
     * Configurable Plugin system, with optional python support
 
-Some of the plugins, packaged and installed with xed include, among others:
+Some of the plugins, packaged and installed with xed include, among
+others:
 
     * Word count
     * Spell checker
@@ -26,5 +27,5 @@ Some of the plugins, packaged and installed with xed include, among others:
     * Insert Date/Time
     * Tag list
 
-xed is released under the GNU General Public License (GPL) version 2, see
-the file 'COPYING' for more information.
+xed is released under the GNU General Public License (GPL) version 2,
+see the file 'COPYING' for more information.
diff --git a/desktop/xfce4-embed-plugin/README b/desktop/xfce4-embed-plugin/README
index a200290736..8ce70ee71c 100644
--- a/desktop/xfce4-embed-plugin/README
+++ b/desktop/xfce4-embed-plugin/README
@@ -1,7 +1,9 @@
-This plugin enables the embedding of arbitrary application windows into the
-Xfce panel. The window is resized into the panel space available, and the
-associated program can be automatically launched if it is not open.
+This plugin enables the embedding of arbitrary application windows
+into the Xfce panel. The window is resized into the panel space
+available, and the associated program can be automatically launched if
+it is not open.
 
-Example uses include embedding an instant messaging buddy list, a mail client's
-new mail ticker, a simple media application, or a fancy clock or timer.
-Combining with Xfce's ability to auto-hide panels can make this very convenient
+Example uses include embedding an instant messaging buddy list, a mail
+client's new mail ticker, a simple media application, or a fancy clock
+or timer.  Combining with Xfce's ability to auto-hide panels can make
+this very convenient
diff --git a/desktop/xfce4-eyes-plugin/README b/desktop/xfce4-eyes-plugin/README
index 08976feb20..2dc0819cae 100644
--- a/desktop/xfce4-eyes-plugin/README
+++ b/desktop/xfce4-eyes-plugin/README
@@ -1 +1,2 @@
-Eyes is a xfce4 panel plugin that adds eyes which watch your every step. Scary!
+Eyes is a xfce4 panel plugin that adds eyes which watch your every
+step. Scary!
diff --git a/desktop/xfce4-genmon-plugin/README b/desktop/xfce4-genmon-plugin/README
index 5388926167..ccae32aa64 100644
--- a/desktop/xfce4-genmon-plugin/README
+++ b/desktop/xfce4-genmon-plugin/README
@@ -1,7 +1,8 @@
 genmon plugin for the Xfce panel
 
-The genmon plugin is a 'generic monitor' plugin that cyclically spawns
-a script or program and captures its output, then displays the resulting 
-string in the panel.  It can be used to display a picture, a bar, tooltip, 
-and/or a button, so it can be used to display various information about 
-the system, such as temperature, processor speed, battery level, etcetera...
+The genmon plugin is a 'generic monitor' plugin that cyclically
+spawns a script or program and captures its output, then displays the
+resulting string in the panel.  It can be used to display a picture,
+a bar, tooltip, and/or a button, so it can be used to display various
+information about the system, such as temperature, processor speed,
+battery level, etcetera...
diff --git a/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild
index 71b9a21c99..cda24ce93d 100644
--- a/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild
+++ b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfce4-timer-plugin
 
-# Copyright 2015 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2015-2020 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=xfce4-timer-plugin
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,14 +73,16 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --enable-static=no \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-debug \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL NEWS 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/xfce4-timer-plugin/xfce4-timer-plugin.info b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info
index 22898cffbf..efe2c606c0 100644
--- a/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info
+++ b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info
@@ -1,8 +1,8 @@
 PRGNAM="xfce4-timer-plugin"
-VERSION="1.0.0"
-HOMEPAGE="https://goodies.xfce.org/"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.0/xfce4-timer-plugin-1.0.0.tar.bz2"
-MD5SUM="bb10a5c0c4025161e647ef80454058ef"
+VERSION="1.6.0"
+HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"
+DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.6/xfce4-timer-plugin-1.6.0.tar.bz2"
+MD5SUM="3be2a4ccfb2af20441b1d25c2cea5f28"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/xfce4-volumed-pulse/README b/desktop/xfce4-volumed-pulse/README
index c319bae9f5..0e27e9aa0a 100644
--- a/desktop/xfce4-volumed-pulse/README
+++ b/desktop/xfce4-volumed-pulse/README
@@ -1,7 +1,7 @@
-This daemon is responsible of making the volume up/down and mute keys of
-the keyboard work automatically, and uses PulseAudio for choosing which
-card/sink/track to act on. It also provides volume change and mute toggle
-notifications if a notification daemon is running.
+This daemon is responsible of making the volume up/down and mute keys
+of the keyboard work automatically, and uses PulseAudio for choosing
+which card/sink/track to act on. It also provides volume change and
+mute toggle notifications if a notification daemon is running.
 
-This is a fork of the original xfce4-volumed to drop GStreamer support and use
-PulseAudio instead.
+This is a fork of the original xfce4-volumed to drop GStreamer support
+and use PulseAudio instead.
diff --git a/desktop/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SlackBuild b/desktop/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SlackBuild
index fa20a0d975..c4ff997e65 100644
--- a/desktop/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SlackBuild
+++ b/desktop/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfce4-wavelan-plugin
 #
-# Copyright 2015-2017 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2015-2017, 2020 Brenton Earl <brent@exitstatusone.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=xfce4-wavelan-plugin
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/xfce4-wavelan-plugin/xfce4-wavelan-plugin.info b/desktop/xfce4-wavelan-plugin/xfce4-wavelan-plugin.info
index 649695c5cc..65ec2f3309 100644
--- a/desktop/xfce4-wavelan-plugin/xfce4-wavelan-plugin.info
+++ b/desktop/xfce4-wavelan-plugin/xfce4-wavelan-plugin.info
@@ -1,8 +1,8 @@
 PRGNAM="xfce4-wavelan-plugin"
-VERSION="0.6.0"
+VERSION="0.6.1"
 HOMEPAGE="https://goodies.xfce.org/"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/xfce4-wavelan-plugin-0.6.0.tar.bz2"
-MD5SUM="b163b22f8543e5e5767a68af35c9028e"
+DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/xfce4-wavelan-plugin-0.6.1.tar.bz2"
+MD5SUM="e4e3d5240297253d242464e77f6145df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/xfce4-whiskermenu-plugin/README b/desktop/xfce4-whiskermenu-plugin/README
index 74cca8bd99..60c50d72a1 100644
--- a/desktop/xfce4-whiskermenu-plugin/README
+++ b/desktop/xfce4-whiskermenu-plugin/README
@@ -1,6 +1,6 @@
-Whisker Menu is an alternate application launcher for Xfce. When you open it
-you are shown a list of applications you have marked as favorites. You can
-browse through all of your installed applications by clicking on the category
-buttons on the side. Top level categories make browsing fast, and simple to
-switch between. Additionally, Whisker Menu keeps a list of the last ten
-applications that you've launched from it.
+Whisker Menu is an alternate application launcher for Xfce. When
+you open it you are shown a list of applications you have marked as
+favorites. You can browse through all of your installed applications by
+clicking on the category buttons on the side. Top level categories make
+browsing fast, and simple to switch between. Additionally, Whisker Menu
+keeps a list of the last ten applications that you've launched from it.
diff --git a/desktop/xkblayout-state/xkblayout-state.SlackBuild b/desktop/xkblayout-state/xkblayout-state.SlackBuild
index 8574ff0aa4..0fe877519f 100644
--- a/desktop/xkblayout-state/xkblayout-state.SlackBuild
+++ b/desktop/xkblayout-state/xkblayout-state.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xkblayout-state
 
-# Copyright 2016-2018, Alexander Verbovetsky, Moscow Russia
+# Copyright 2016-2020, Alexander Verbovetsky, Moscow Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xkblayout-state
-VERSION=${VERSION:-1b_git20180812}
+VERSION=${VERSION:-1b_git20200909}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-HASH=${HASH:-9e3276f3d200ab8ee3f1627c4c6ebfd01d140454}
+HASH=${HASH:-9f9a4fd80bb1a506c039e703305f6d1e26c836c2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/desktop/xkblayout-state/xkblayout-state.info b/desktop/xkblayout-state/xkblayout-state.info
index dcc33a57ef..7c9b7fc38b 100644
--- a/desktop/xkblayout-state/xkblayout-state.info
+++ b/desktop/xkblayout-state/xkblayout-state.info
@@ -1,8 +1,8 @@
 PRGNAM="xkblayout-state"
-VERSION="1b_git20180812"
+VERSION="1b_git20200909"
 HOMEPAGE="https://github.com/nonpop/xkblayout-state/"
-DOWNLOAD="https://github.com/nonpop/xkblayout-state/archive/9e3276f3d200ab8ee3f1627c4c6ebfd01d140454/xkblayout-state-9e3276f3d200ab8ee3f1627c4c6ebfd01d140454.tar.gz"
-MD5SUM="39359481a324fceba9b1406ae7bf6f0a"
+DOWNLOAD="https://github.com/nonpop/xkblayout-state/archive/9f9a4fd80bb1a506c039e703305f6d1e26c836c2/xkblayout-state-9f9a4fd80bb1a506c039e703305f6d1e26c836c2.tar.gz"
+MD5SUM="1a352695514569d5a11e7ef5d153ceed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/xsession/README b/desktop/xsession/README
index de5f311caf..3497f26417 100644
--- a/desktop/xsession/README
+++ b/desktop/xsession/README
@@ -1,27 +1,29 @@
-The xsession program is a session manager.  It is normally executed by your
-~/.xinitrc (or ~/.xsession) script and controls your X Window session.  As
-soon as it is started, xsession launches a window manager and some
-applications of your choice.  At anytime during your session, you may switch
-to another window manager or execute some other applications from the
-xsession menus.
+The xsession program is a session manager.  It is normally executed
+by your ~/.xinitrc (or ~/.xsession) script and controls your X Window
+session.  As soon as it is started, xsession launches a window manager
+and some applications of your choice.  At anytime during your session,
+you may switch to another window manager or execute some other
+applications from the xsession menus.
 
-You may also lock your screen using an independent locker application. The
-window contains a message area which is used to notify the user whenever an
-application or a window manager starts or ends, and also to display all the
-output and error messages of the programs (the applications and the window
-managers) run by xsession.  The console output messages can also be shown
-either in this area or in a second, separate area.
+You may also lock your screen using an independent locker
+application. The window contains a message area which is used to
+notify the user whenever an application or a window manager starts
+or ends, and also to display all the output and error messages of the
+programs (the applications and the window managers) run by xsession.
+The console output messages can also be shown either in this area or
+in a second, separate area.
 
-One useful feature of xsession is the preprocessing of window managers'
-configuration files.  When a window manager is launched, its startup file
-can be filtered through m4(1) or cpp(1).  Some macros are defined (such as
-the host name, screen size and so on) that will help you customize your
-menus and screen layout.  One advantage of this feature is that several
-window managers can share the same startup file: some lines are protected by
-a test on the "WM_NAME" macro, but the other lines are common.  This saves a
-lot of time if you want to maintain the same menu structure for several of
-them.  You can also use "include" statements in your file.
+One useful feature of xsession is the preprocessing of window
+managers' configuration files.  When a window manager is launched, its
+startup file can be filtered through m4(1) or cpp(1).  Some macros are
+defined (such as the host name, screen size and so on) that will help
+you customize your menus and screen layout.  One advantage of this
+feature is that several window managers can share the same startup
+file: some lines are protected by a test on the "WM_NAME" macro, but
+the other lines are common.  This saves a lot of time if you want to
+maintain the same menu structure for several of them.  You can also
+use "include" statements in your file.
 
-Note: This slackbuild builds xsession without sound support.  If you wish to
-have sound support see the Imakefile and INSTALL files within the source
-tarball.
+Note: This slackbuild builds xsession without sound support.  If you
+wish to have sound support see the Imakefile and INSTALL files within
+the source tarball.
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/xtrascreenhacks/README b/desktop/xtrascreenhacks/README
index 1a8b348ce0..86ff2b4b93 100644
--- a/desktop/xtrascreenhacks/README
+++ b/desktop/xtrascreenhacks/README
@@ -1,3 +1,3 @@
-This is a small collection of display modes that are based on and intended to
-be run with the XScreensaver distribution.  An XScreensaver distribution is not
-needed just to compile and view the display modes.
+This is a small collection of display modes that are based on and
+intended to be run with the XScreensaver distribution.  An XScreensaver
+distribution is not needed just to compile and view the display modes.
diff --git a/desktop/xtrlock/README b/desktop/xtrlock/README
index 3f8d924953..c7aa35d611 100644
--- a/desktop/xtrlock/README
+++ b/desktop/xtrlock/README
@@ -1,6 +1,6 @@
 xtrlock (minimal X display lock)
 
-xtrlock is a very minimal X display lock program, which uses nothing
-except the Xlib library. It doesn't obscure the screen, it is completely
-idle while the display is locked and you don't type at it, and it doesn't
-do funny things to the X access control lists.
+xtrlock is a very minimal X display lock program, which uses
+nothing except the Xlib library. It doesn't obscure the screen, it is
+completely idle while the display is locked and you don't type at it,
+and it doesn't do funny things to the X access control lists.
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/desktop/xvkbd/README b/desktop/xvkbd/README
index 16007e0a19..8212db951d 100644
--- a/desktop/xvkbd/README
+++ b/desktop/xvkbd/README
@@ -1,6 +1,6 @@
-xvkbd is a virtual (graphical) keyboard program for X Window System which
-provides facility to enter characters onto other clients (softwares) by
-clicking on a keyboard displayed on the screen. This may be used for systems
-without a hardware keyboard such as kiosk terminals or handheld devices. This
-program also has facility to send characters specified as the command line
-option to another client.
+xvkbd is a virtual (graphical) keyboard program for X Window System
+which provides facility to enter characters onto other clients
+(softwares) by clicking on a keyboard displayed on the screen. This may
+be used for systems without a hardware keyboard such as kiosk terminals
+or handheld devices. This program also has facility to send characters
+specified as the command line option to another client.
diff --git a/desktop/yawp/README b/desktop/yawp/README
index 570eabaff1..9be672bad0 100644
--- a/desktop/yawp/README
+++ b/desktop/yawp/README
@@ -1,7 +1,7 @@
-yaWP (Yet Another Weather Plasmoid) is for the KDE 4.x panel that shows the
-current weather and forecast.  This SlackBuild includes the base plasmoid.
-Additional themes are available at KDE-Look.
+yaWP (Yet Another Weather Plasmoid) is for the KDE 4.x panel that shows
+the current weather and forecast.  This SlackBuild includes the base
+plasmoid.  Additional themes are available at KDE-Look.
 
-yaWP works with several different weather sources.  You can configure it to
-show up to 5 days weather forecast and display the current satellite image.
-It is also possible to keep track of multiple cities.
+yaWP works with several different weather sources.  You can configure
+it to show up to 5 days weather forecast and display the current
+satellite image.  It is also possible to keep track of multiple cities.
diff --git a/development/4th/README b/development/4th/README
index dfdcb3236d..6045bd8dcd 100644
--- a/development/4th/README
+++ b/development/4th/README
@@ -1,7 +1,8 @@
 4tH is basic framework for creating application specific scripting
 languages. It is a library of functions centered around a virtual
-machine, which guarantees high performance, ease of use and low overhead.
+machine, which guarantees high performance, ease of use and low
+overhead.
 
 But in the meanwhile 4tH has acquired a reputation as an educational
-tool. Its simplicity makes it perfectly suited to learn Forth, from which
-it has been derived.
+tool. Its simplicity makes it perfectly suited to learn Forth, from
+which it has been derived.
diff --git a/development/Arduino/README b/development/Arduino/README
index 8127f6239d..d9875985b8 100644
--- a/development/Arduino/README
+++ b/development/Arduino/README
@@ -1,7 +1,9 @@
-The open-source Arduino Software (IDE) makes it easy to write code and upload
-it to the board. It runs on Windows, Mac OS X, and Linux. The environment
-is written in Java and based on Processing and other open-source software.
-This software can be used with any Arduino board.
+The open-source Arduino Software (IDE) makes it easy to write code and
+upload it to the board. It runs on Windows, Mac OS X, and Linux. The
+environment is written in Java and based on Processing and other
+open-source software.  This software can be used with any Arduino
+board.
 
-NOTE: This script compiles everything from source. Compared to the binary
-version, it will take longer and require almost 1GB of free space.
+NOTE: This script compiles everything from source. Compared to the
+binary version, it will take longer and require almost 1GB of free
+space.
diff --git a/development/Bottleneck/README b/development/Bottleneck/README
index d5fcfbca33..a923769876 100644
--- a/development/Bottleneck/README
+++ b/development/Bottleneck/README
@@ -1,5 +1,6 @@
-Bottleneck is a collection of fast NumPy array functions written in Cython.
+Bottleneck is a collection of fast NumPy array functions written in
+Cython.
 
-Optional:
-SciPy : portions of benchmark suite
-tox, virtualenv : run unit tests across multiple python/numpy versions
+Optional dependencies:
+ SciPy: portions of benchmark suite
+ tox, virtualenv: run unit tests across multiple python/numpy versions
diff --git a/development/CImg/CImg.SlackBuild b/development/CImg/CImg.SlackBuild
index a1323ba35e..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.6.7}
+VERSION=${VERSION:-2.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/CImg/CImg.info b/development/CImg/CImg.info
index e657ceef24..a288a35f0e 100644
--- a/development/CImg/CImg.info
+++ b/development/CImg/CImg.info
@@ -1,8 +1,8 @@
 PRGNAM="CImg"
-VERSION="2.6.7"
+VERSION="2.9.6"
 HOMEPAGE="http://cimg.eu/"
-DOWNLOAD="http://cimg.eu/files/CImg_2.6.7.zip"
-MD5SUM="ee609843520daeea0af88e56f4cd8de5"
+DOWNLOAD="http://cimg.eu/files/CImg_2.9.6.zip"
+MD5SUM="8e383752a2a9b1f42da3aac5c4180cf9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/CImg/README b/development/CImg/README
index 5acf206f51..cb8471e8be 100644
--- a/development/CImg/README
+++ b/development/CImg/README
@@ -1,11 +1,13 @@
 The CImg Library is an open-source C++ toolkit for image processing.
 
-It mainly consists in a (big) single header file CImg.h providing a set of
-C++ classes and functions that can be used in your own sources, to load/save,
-manage/process and display generic images. It's actually a very simple
-toolkit for coding image processing stuffs in C++ : Just include the header
-file CImg.h, and you are ready to handle images in your C++ programs.
+It mainly consists in a (big) single header file CImg.h providing a
+set of C++ classes and functions that can be used in your own sources,
+to load/save, manage/process and display generic images. It's actually
+a very simple toolkit for coding image processing stuffs in C++ : Just
+include the header file CImg.h, and you are ready to handle images in
+your C++ programs.
 
-Note: The archives hosted on http://cimg.eu/files/ do not contain the HTML
-documentation.  Please refer to http://cimg.eu/reference/index.html or
-download a copy from https://github.com/dtschump/CImg
+Note: The archives hosted on http://cimg.eu/files/
+do not contain the HTML documentation.  Please refer to
+http://cimg.eu/reference/index.html or download a copy from
+https://github.com/dtschump/CImg
diff --git a/development/CVSTools/README b/development/CVSTools/README
index f8e1939f97..0078197625 100644
--- a/development/CVSTools/README
+++ b/development/CVSTools/README
@@ -1,23 +1,24 @@
-The CVSTools provide a simple project versioning system built upon CVS
-which is used by all PADL software.  These tools are also required to
-build NetInfo for Linux and our commerial software.  The following scripts
-are included in CVSTools:
+The CVSTools provide a simple project versioning system built upon
+CVS which is used by all PADL software.  These tools are also required
+to build NetInfo for Linux and our commerial software.  The following
+scripts are included in CVSTools:
 
-checkpoint
+checkpoint:
 Based on Apple's checkpoint program, this creates Perl program the
-CVSVersionInfo.txt file for a work area (when invoked with -create).  To
-checkpoint (i.e. increment the version number and create a CVS tag) type
-checkpoint with no arguments, or with the new version number as an
-argument.
+CVSVersionInfo.txt file for a work area (when invoked with -create).
+To checkpoint (i.e. increment the version number and create a CVS tag)
+type checkpoint with no arguments, or with the new version number as
+an argument.
 
-cvslib.pl
-Common library functions used by some of these scripts for getting the
-repository and project names.  One can override CVSVersionInfo.txt
-location with the CVSVERSIONDIR environment variable, which is useful for
-nested source trees where one wishes to pull in the top level version info
-for the project name, and the current directory name for the program.
+cvslib.pl:
+Common library functions used by some of these scripts for getting
+the repository and project names.  One can override CVSVersionInfo.txt
+location with the CVSVERSIONDIR environment variable, which is useful
+for nested source trees where one wishes to pull in the top level
+version info for the project name, and the current directory name for
+the program.
 
-tarup
+tarup:
 Executes cvs export and then creates a tarball in
 ~/dist/project-version.tar.gz.
 
diff --git a/development/Coin/README b/development/Coin/README
index 26249a04bd..c6a65bf46d 100644
--- a/development/Coin/README
+++ b/development/Coin/README
@@ -1,14 +1,16 @@
 Coin is a high-level 3D graphics toolkit for developing cross-platform
 real-time 3D visualization and visual simulation software.
 
-Coin is built on OpenGL and uses scene graph data structures to render 3D
-graphics in real-time.  Basic import, rendering, and interaction with a
-3D object can be implemented in just a few lines of code, and programmer
-efficiency is greatly increased compared with programming directly with
-OpenGL.  OpenGL code and Coin code can co-exist in the same application,
-which makes gradual migration from OpenGL to Coin possible.
+Coin is built on OpenGL and uses scene graph data structures to render
+3D graphics in real-time.  Basic import, rendering, and interaction
+with a 3D object can be implemented in just a few lines of code, and
+programmer efficiency is greatly increased compared with programming
+directly with OpenGL.  OpenGL code and Coin code can co-exist in the
+same application, which makes gradual migration from OpenGL to Coin
+possible.
 
-Coin is fully compatible with SGI Open Inventor 2.1, the de facto standard
-for 3D visualization and visual simulation software in the scientific and
-engineering community.  Additional features in Coin include VRML97 support,
-3D sound, 3D textures, and parallel rendering on multiple processors.
+Coin is fully compatible with SGI Open Inventor 2.1, the de facto
+standard for 3D visualization and visual simulation software in the
+scientific and engineering community.  Additional features in Coin
+include VRML97 support, 3D sound, 3D textures, and parallel rendering
+on multiple processors.
diff --git a/development/Editra/README b/development/Editra/README
index 8a501fdb97..377e5ba840 100644
--- a/development/Editra/README
+++ b/development/Editra/README
@@ -1,12 +1,14 @@
-Editra is a multi-platform text editor with an implementation that focuses
-on creating an easy to use nterface and features that aid in code development.
-Currently it supports syntax ighlighting and variety of other useful features
-for over 60 programming languages.
+Editra is a multi-platform text editor with an implementation that
+focuses on creating an easy to use nterface and features that aid in
+code development.  Currently it supports syntax ighlighting and variety
+of other useful features for over 60 programming languages.
 
-Editra is freely available for use under the terms of the wxWindows License.
+Editra is freely available for use under the terms of the wxWindows
+License.
 
-Currently the project is in the alpha development phase but test builds of
-"stable" points are available for download and trial as Windows and Mac OSX
-(Universal) binaries, currently other Unix and Linux based systems will have
-to install from source using the included setup script. Please feel free give
-it a try and to report bugs and request features.
+Currently the project is in the alpha development phase but test builds
+of "stable" points are available for download and trial as Windows and
+Mac OSX (Universal) binaries, currently other Unix and Linux based
+systems will have to install from source using the included setup
+script. Please feel free give it a try and to report bugs and request
+features.
diff --git a/development/Fennel/Fennel.SlackBuild b/development/Fennel/Fennel.SlackBuild
index 2054c2b8cb..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,13 +22,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Fennel
-VERSION=${VERSION:-0.3.2}
+VERSION=${VERSION:-0.8.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
@@ -39,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"
@@ -68,37 +68,35 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-install -D -m 0755 -t $PKG/usr/bin/ fennel fennel-watch.sh
-
-install -D -m 0644 -t $PKG/usr/share/lua/5.1 fennel.lua fennelview.fnl generate.fnl
-install -D -m 0644 fennelview.fnl.lua $PKG/usr/share/lua/5.1/fennelview.lua
-
-# lua 5.2 support.
-if $(lua5.2 -v &> /dev/null); then
-	sed -i '1s|lua.*|lua5.2|' fennel
-
-  install -D -m 0755 fennel $PKG/usr/bin/fennel5.2
-
-  install -D -m 0644 -t $PKG/usr/share/lua/5.2 fennel.lua fennelview.fnl generate.fnl
-  install -D -m 0644 fennelview.fnl.lua $PKG/usr/share/lua/5.2/fennelview.lua
-fi
-
-# lua 5.3 support.
-if $(lua5.3 -v &> /dev/null); then
-	sed -i '1s|lua.*|lua5.3|' fennel
-
-  install -D -m 0755 fennel $PKG/usr/bin/fennel5.3
-
-  install -D -m 0644 -t $PKG/usr/share/lua/5.3 fennel.lua fennelview.fnl generate.fnl
-  install -D -m 0644 fennelview.fnl.lua $PKG/usr/share/lua/5.3/fennelview.lua
-fi
-
-# luajit support.
-if $(luajit -v &> /dev/null); then
-	sed -i '1s|lua.*|luajit|' fennel
-
-  install -D -m 0755 fennel $PKG/usr/bin/fenneljit
-fi
+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 ]; 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
+    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
+      install -D -m 0644 -t $PKG/usr/share/lua/$i fennel.lua fennelview.lua 
+    fi
+  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
@@ -108,7 +106,9 @@ gzip -9 fennel.1
 cp fennel.1.gz $PKG/usr/man/man1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -t $PKG/usr/doc/$PRGNAM-$VERSION api.md changelog.md CONTRIBUTING.md LICENSE lua-primer.md README.md reference.md tutorial.md
+cp -t $PKG/usr/doc/$PRGNAM-$VERSION \
+  api.md changelog.md CODE-OF-CONDUCT.md CONTRIBUTING.md LICENSE lua-primer.md \
+  rationale.md README.md reference.md release-checklist.md setup.md tutorial.md
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/Fennel/Fennel.info b/development/Fennel/Fennel.info
index 8aaa7c8e75..7aa2f32dff 100644
--- a/development/Fennel/Fennel.info
+++ b/development/Fennel/Fennel.info
@@ -1,8 +1,8 @@
 PRGNAM="Fennel"
-VERSION="0.3.2"
+VERSION="0.8.1"
 HOMEPAGE="https://fennel-lang.org/"
-DOWNLOAD="https://github.com/bakpakin/Fennel/archive/0.3.2/Fennel-0.3.2.tar.gz"
-MD5SUM="db324e9f6a1312c08de736b6d7cb42d3"
+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/Fennel/README b/development/Fennel/README
index 06336bb959..c34f0ae83c 100644
--- a/development/Fennel/README
+++ b/development/Fennel/README
@@ -1,19 +1,35 @@
-Fennel is a programming language that brings together the speed, simplicity,
-and reach of Lua with the flexibility of a lisp syntax and macro system.
+Fennel is a programming language that brings together the speed,
+simplicity, and reach of Lua with the flexibility of a lisp syntax and
+macro system.
 
-* Full Lua compatibilty: Easily call any Lua function or library from Fennel and vice-versa.
-* Zero overhead: Compiled code should be just as or more efficient than hand-written Lua.
-* Compile-time macros: Ship compiled code with no runtime dependency on Fennel.
-* Embeddable: Fennel is a one-file library as well as an executable. Embed it in other
-  programs to support runtime extensibility and interactive development.
+* Full Lua compatibilty: Easily call any Lua function or library from
+  Fennel and vice-versa.
+* Zero overhead: Compiled code should be just as or more efficient
+  than hand-written Lua.
+* Compile-time macros: Ship compiled code with no runtime dependency
+  on Fennel.
+* Embeddable: Fennel is a one-file library as well as an
+* executable. Embed it in other programs to support runtime
+* extensibility and interactive development.
 
 Anywhere you can run Lua code, you can run Fennel code.
 
-Optional Dependency:
-* lua52, lua53, luajit
+This require one version of Lua installed (lua, lua52, lua53, luajit):
 Default support for all versions of Lua installed before build.
-After installation there is "fennel5.2", "fennel5.3" and "fenneljit" executable files for the
-equivalent versions of Lua installed.
+To specify which Lua versions:
+  export LUAVER="vers"
 
+"vers" must be one or more of "5.1 5.2 5.3 jit" in the right order
+separated with space.
+
+After installation there are one or more fennel executable files for the
+equivalent versions of Lua.
+
+To install compiled binary versions (experimental, only works with
+lua5.2 or higher):
+
+  export BINARY=yes
+
+Optional dependency:
 * lua-readline
 For history completion
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/GitEye/README b/development/GitEye/README
index 001c6bf70c..2545b1fb2c 100644
--- a/development/GitEye/README
+++ b/development/GitEye/README
@@ -1,4 +1,4 @@
-GitEye is a graphical Git client for Windows, Linux and OSX. It supports
-any Git repository and server. Specific support for GitHub, TeamForge
-and CloudForge is included, but any server can be used as GitEye supports
-all Git protocols.
+GitEye is a graphical Git client for Windows, Linux and OSX. It
+supports any Git repository and server. Specific support for GitHub,
+TeamForge and CloudForge is included, but any server can be used as
+GitEye supports all Git protocols.
diff --git a/development/J-Link/README b/development/J-Link/README
index 7cd3be26cd..79ad906590 100644
--- a/development/J-Link/README
+++ b/development/J-Link/README
@@ -1,16 +1,23 @@
-The J-Link software gives you the USB drivers needed for your system, a number
-of utilities as well as a dynamically linkable library used by most of the IDEs
-and debuggers using J-Link. Also included are a number of sample setup scripts
-for devices needing one as well as documentation.
+The J-Link software gives you the USB drivers needed for your system,
+a number of utilities as well as a dynamically linkable library used
+by most of the IDEs and debuggers using J-Link. Also included are
+a number of sample setup scripts for devices needing one as well as
+documentation.
+
+NOTES:
+1. This SlackBuild is not sbopkg compatible because source download
+   requires licence acceptance (the link provided in .info points to
+   download site) and the source tarball name is different from the
+   resulting package name.
 
-NOTE:
-1. This SlackBuild is not sbopkg compatible because source download requires
-   licence acceptance (the link provided in .info points to download site)
-   and the source tarball name is different from the resulting package name.
 2. This SlackBuild repackages the official J-Link binary package.
-3. The official binary package bundles libedit, which is also available from
-   slackbuilds.org so I decided to go with the one from slackbuilds.org and
-   not with the bundled one. BTW, ldd shows that libedit is not used at all.
+
+3. The official binary package bundles libedit, which is also
+   available from slackbuilds.org so I decided to go with the one from
+   slackbuilds.org and not with the bundled one. BTW, ldd shows that
+   libedit is not used at all.
+
 4. The original udev rules change the device permissions to 0666.
-   This SlackBuild modifies the rules, so that the permissions are 0664 and
-   the group is plugdev. Make sure to make yourself a member of this group.
+   This SlackBuild modifies the rules, so that the permissions are
+   0664 and the group is plugdev. Make sure to make yourself a member
+   of this group.
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/development/Mk4tcl/README b/development/Mk4tcl/README
index 9945ee68e2..8f6a845998 100644
--- a/development/Mk4tcl/README
+++ b/development/Mk4tcl/README
@@ -1,15 +1,16 @@
 Mk4tcl - Tcl binding for Metakit embedded database library
 
-Metakit is an efficient embedded database library with a small footprint.
-It fills the gap between flat-file, relational, object-oriented, and
-tree-structured databases, supporting relational joins, serialization,
-nested structures, and instant schema evolution. There is a C++ API,
-a Python binding called Mk4py, and a Tcl binding called Mk4tcl.
-You can manipulate and exchange data between any of these.
+Metakit is an efficient embedded database library with a small
+footprint.  It fills the gap between flat-file, relational,
+object-oriented, and tree-structured databases, supporting
+relational joins, serialization, nested structures, and instant schema
+evolution. There is a C++ API, a Python binding called Mk4py, and a Tcl
+binding called Mk4tcl.  You can manipulate and exchange data between
+any of these.
 
 Data files are portable. The library has been used on Unix, Windows,
-Macintosh, VMS, and others, spanning a range of 16- to 64-bit architectures,
-from PDA's to S390's.
+Macintosh, VMS, and others, spanning a range of 16- to 64-bit
+architectures, from PDA's to S390's.
 
-Metakit is in use in various commercial projects and products on millions
-of desktops.
+Metakit is in use in various commercial projects and products on
+millions of desktops.
diff --git a/development/MySQL-python/README b/development/MySQL-python/README
index de40ed0a7d..aec45782ee 100644
--- a/development/MySQL-python/README
+++ b/development/MySQL-python/README
@@ -1,10 +1,11 @@
 MySQL-python (Python interface to MySQL)
 
-MySQLdb is an interface to the popular MySQL database server for Python.
-The design goals are:
+MySQLdb is an interface to the popular MySQL database server for
+Python.  The design goals are:
 
     * Compliance with Python database API version 2.0 [PEP-0249]
     * Thread-safety
     * Thread-friendliness (threads will not block each other)
 
-MySQL-3.23 through 5.5 and Python-2.4 through 2.7 are currently supported.
+MySQL-3.23 through 5.5 and Python-2.4 through 2.7 are currently
+supported.
diff --git a/development/OpenHantek6022/OpenHantek6022.SlackBuild b/development/OpenHantek6022/OpenHantek6022.SlackBuild
new file mode 100644
index 0000000000..5466d21986
--- /dev/null
+++ b/development/OpenHantek6022/OpenHantek6022.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for OpenHantek6022
+
+# Copyright 2020, Mauricio Martinez, Mexico
+# 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=OpenHantek6022
+VERSION=${VERSION:-3.1.0}
+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 {} \;
+
+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 ..
+
+install -D -m644 $PKG/lib/udev/rules.d/60-hantek.rules \
+  $PKG/etc/udev/rules.d/60-hantek.rules.new
+rm -rf $PKG/lib
+
+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
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/share/doc/openhantek/$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/OpenHantek6022/OpenHantek6022.info b/development/OpenHantek6022/OpenHantek6022.info
new file mode 100644
index 0000000000..8acc03e7ae
--- /dev/null
+++ b/development/OpenHantek6022/OpenHantek6022.info
@@ -0,0 +1,10 @@
+PRGNAM="OpenHantek6022"
+VERSION="3.1.0"
+HOMEPAGE="http://openhantek.org/"
+DOWNLOAD="https://github.com/OpenHantek/OpenHantek6022/archive/3.1.0/OpenHantek6022-3.1.0.tar.gz"
+MD5SUM="1617f414c92e52f67d4f869c6de94919"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5 pcre2"
+MAINTAINER="Mauricio Martinez"
+EMAIL="eigenfilter@gmail.com"
diff --git a/development/OpenHantek6022/README b/development/OpenHantek6022/README
new file mode 100644
index 0000000000..7196b9cc95
--- /dev/null
+++ b/development/OpenHantek6022/README
@@ -0,0 +1,6 @@
+OpenHantek6022 is a free software for Hantek6022 and compatible
+(Voltcraft/Darkwire/Protek/Acetech) USB digital signal oscilloscopes.
+
+It has started as an alternative to the official Hantek DSO software
+for Linux users.  Nowadays it works under Microsoft Windows and Apple
+Mac OS as well.
diff --git a/development/OpenHantek6022/doinst.sh b/development/OpenHantek6022/doinst.sh
new file mode 100644
index 0000000000..2a8d2defb0
--- /dev/null
+++ b/development/OpenHantek6022/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/udev/rules.d/60-hantek.rules.new
diff --git a/development/OpenHantek6022/slack-desc b/development/OpenHantek6022/slack-desc
new file mode 100644
index 0000000000..e9081cd2e0
--- /dev/null
+++ b/development/OpenHantek6022/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------------------------------------------------------|
+OpenHantek6022: OpenHantek6022 (Free software for Hantek6022 USB oscilloscopes)
+OpenHantek6022:
+OpenHantek6022: Free software for Hantek6022 and compatible (Voltcraft/Darkwire
+OpenHantek6022: /Protek/Acetech) USB digital oscilloscopes. It resembles the typical 
+OpenHantek6022: view of a real hardware oscilloscope, and supports spectrum analysis
+OpenHantek6022: via FFT.
+OpenHantek6022:
+OpenHantek6022: Homepage: http://openhantek.org/
+OpenHantek6022:
+OpenHantek6022:
+OpenHantek6022:
diff --git a/development/Pivy/README b/development/Pivy/README
index a3d8130919..1895159b24 100644
--- a/development/Pivy/README
+++ b/development/Pivy/README
@@ -1,9 +1,9 @@
-Pivy is a Python binding for Coin where the interface is implemented using
-SWIG.
+Pivy is a Python binding for Coin where the interface is implemented
+using SWIG.
 
 Pivy allows:
   * development of Coin applications in Python
   * interactive modification of Coin programs from within the Python
     interpreter at runtime
-  * incorporation of Scripting Nodes into the scene graph which are capable
-    of executing Python code and callback functions
+  * incorporation of Scripting Nodes into the scene graph which are
+    capable of executing Python code and callback functions
diff --git a/development/PythonToolkit/README b/development/PythonToolkit/README
index 2c73d01957..398e22e22d 100644
--- a/development/PythonToolkit/README
+++ b/development/PythonToolkit/README
@@ -1,11 +1,12 @@
 Python Toolkit (ptk) is an interactive environment for python. Based
 around a set of interacting tools it includes an interactive console
-(with support for multiple python interpreters and GUI mainloops), a
-simple python source editor, a python path manager and namespace browser.
+(with support for multiple python interpreters and GUI mainloops),
+a simple python source editor, a python path manager and namespace
+browser.
 
-NOTE: If you are upgrading from previous versions the configuration may
-have changed between versions, this can give strange effects with window
-layouts etc. To fix any problems it is recommended to run:
+NOTE: If you are upgrading from previous versions the configuration
+may have changed between versions, this can give strange effects with
+window layouts etc. To fix any problems it is recommended to run:
 
 PTK --clear_settings
 
diff --git a/development/QtPy/QtPy.SlackBuild b/development/QtPy/QtPy.SlackBuild
new file mode 100644
index 0000000000..6cff9f0c73
--- /dev/null
+++ b/development/QtPy/QtPy.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for QtPy
+
+# 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=QtPy
+VERSION=${VERSION:-1.9.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 {} \;
+
+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.md CHANGELOG.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/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/README b/development/ShellCheck-bin/README
index b3e4214db4..a374ac3e99 100644
--- a/development/ShellCheck-bin/README
+++ b/development/ShellCheck-bin/README
@@ -1,8 +1,8 @@
-ShellCheck is a static analysis tool for shell scripts.  It's licensed under
-the GNU General Public License v3.0.  Information and source code is available
-on the website.
+ShellCheck is a static analysis tool for shell scripts.  It's licensed
+under the GNU General Public License v3.0.  Information and source code
+is available on the website.
 
 This is a repackage of the 64 bit binary supplied by upstream.
 To build ShellCheck from source, see haskell/haskell-ShellCheck.
 
-This binary was compiled on Fri Jun  1 03:48:26 UTC 2018.
+This binary was compiled on Sun Apr  5 01:56:58 UTC 2020.
diff --git a/development/ShellCheck-bin/ShellCheck-bin.SlackBuild b/development/ShellCheck-bin/ShellCheck-bin.SlackBuild
index cd036f10e4..b6cd1f574c 100644
--- a/development/ShellCheck-bin/ShellCheck-bin.SlackBuild
+++ b/development/ShellCheck-bin/ShellCheck-bin.SlackBuild
@@ -23,39 +23,32 @@
 
 PRGNAM=ShellCheck-bin
 BINNAM=shellcheck
-SRCNAM=ShellCheck
-VERSION=${VERSION:-0.6.0}
-SRCVERSION=v${VERSION}
+VERSION=${VERSION:-0.7.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
+  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
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $BINNAM-$SRCVERSION
-tar xvf $CWD/$BINNAM-$SRCVERSION.linux.$ARCH.tar.xz
-cd $BINNAM-$SRCVERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+rm -rf $BINNAM-v$VERSION
+tar xvf $CWD/$BINNAM-v$VERSION.linux.$ARCH.tar.xz
+cd $BINNAM-v$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,8 +57,17 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 install -D -m 0755 $BINNAM $PKG/usr/bin/$BINNAM
-gzip -9 $SRCNAM-$VERSION/$BINNAM.1
-install -D -m 0644 $SRCNAM-$VERSION/$BINNAM.1.gz $PKG/usr/man/man1/$BINNAM.1.gz
+
+# 20200922 bkw: man page originally came from:
+# http://deb.debian.org/debian/pool/main/s/shellcheck/shellcheck_0.7.1-1.debian.tar.xz
+# We can't use the shellcheck source any more, it no longer ships the
+# man page: it now uses pandoc to generate the man page. We don't make
+# this build depend on pandoc because it has 138 (!) dependencies.
+# Since the man page is pretty small, I just extracted it from the
+# Debian package and added it to our git repo.
+
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$BINNAM.1 > $PKG/usr/man/man1/$BINNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/development/ShellCheck-bin/ShellCheck-bin.info b/development/ShellCheck-bin/ShellCheck-bin.info
index bdd3963214..62d1f598e6 100644
--- a/development/ShellCheck-bin/ShellCheck-bin.info
+++ b/development/ShellCheck-bin/ShellCheck-bin.info
@@ -1,12 +1,10 @@
 PRGNAM="ShellCheck-bin"
-VERSION="0.6.0"
+VERSION="0.7.1"
 HOMEPAGE="https://www.shellcheck.net"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://storage.googleapis.com/shellcheck/shellcheck-v0.6.0.linux.x86_64.tar.xz \
-             https://hackage.haskell.org/package/ShellCheck-0.6.0/ShellCheck-0.6.0.tar.gz"
-MD5SUM_x86_64="fdf17479619fd50b909e44b2ad800b76 \
-             570c665dc89d31c5a4e25d52c5790eaf"
+DOWNLOAD_x86_64="https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz"
+MD5SUM_x86_64="76a9225cf936edfff4e8f124097f4215"
 REQUIRES=""
 MAINTAINER="Dave Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/development/ShellCheck-bin/shellcheck.1 b/development/ShellCheck-bin/shellcheck.1
new file mode 100644
index 0000000000..b98de14a65
--- /dev/null
+++ b/development/ShellCheck-bin/shellcheck.1
@@ -0,0 +1,400 @@
+.\" Automatically generated by Pandoc 2.5
+.\"
+.TH "SHELLCHECK" "1" "" "Shell script analysis tool" ""
+.hy
+.SH NAME
+.PP
+shellcheck \- Shell script analysis tool
+.SH SYNOPSIS
+.PP
+\f[B]shellcheck\f[R] [\f[I]OPTIONS\f[R]\&...] \f[I]FILES\f[R]\&...
+.SH DESCRIPTION
+.PP
+ShellCheck is a static analysis and linting tool for sh/bash scripts.
+It\[cq]s mainly focused on handling typical beginner and intermediate
+level syntax errors and pitfalls where the shell just gives a cryptic
+error message or strange behavior, but it also reports on a few more
+advanced issues where corner cases can cause delayed failures.
+.PP
+ShellCheck gives shell specific advice.
+Consider this line:
+.IP
+.nf
+\f[C]
+(( area = 3.14*r*r ))
+\f[R]
+.fi
+.IP \[bu] 2
+For scripts starting with \f[C]#!/bin/sh\f[R] (or when using
+\f[C]\-s sh\f[R]), ShellCheck will warn that \f[C](( .. ))\f[R] is not
+POSIX compliant (similar to checkbashisms).
+.IP \[bu] 2
+For scripts starting with \f[C]#!/bin/bash\f[R] (or using
+\f[C]\-s bash\f[R]), ShellCheck will warn that decimals are not
+supported.
+.IP \[bu] 2
+For scripts starting with \f[C]#!/bin/ksh\f[R] (or using
+\f[C]\-s ksh\f[R]), ShellCheck will not warn at all, as \f[C]ksh\f[R]
+supports decimals in arithmetic contexts.
+.SH OPTIONS
+.TP
+.B \f[B]\-a\f[R],\ \f[B]\[en]check\-sourced\f[R]
+Emit warnings in sourced files.
+Normally, \f[C]shellcheck\f[R] will only warn about issues in the
+specified files.
+With this option, any issues in sourced files will also be reported.
+.TP
+.B \f[B]\-C\f[R][\f[I]WHEN\f[R]],\ \f[B]\[en]color\f[R][=\f[I]WHEN\f[R]]
+For TTY output, enable colors \f[I]always\f[R], \f[I]never\f[R] or
+\f[I]auto\f[R].
+The default is \f[I]auto\f[R].
+\f[B]\[en]color\f[R] without an argument is equivalent to
+\f[B]\[en]color=always\f[R].
+.TP
+.B \f[B]\-i\f[R]\ \f[I]CODE1\f[R][,\f[I]CODE2\f[R]\&...],\ \f[B]\[en]include=\f[R]\f[I]CODE1\f[R][,\f[I]CODE2\f[R]\&...]
+Explicitly include only the specified codes in the report.
+Subsequent \f[B]\-i\f[R] options are cumulative, but all the codes can
+be specified at once, comma\-separated as a single argument.
+Include options override any provided exclude options.
+.TP
+.B \f[B]\-e\f[R]\ \f[I]CODE1\f[R][,\f[I]CODE2\f[R]\&...],\ \f[B]\[en]exclude=\f[R]\f[I]CODE1\f[R][,\f[I]CODE2\f[R]\&...]
+Explicitly exclude the specified codes from the report.
+Subsequent \f[B]\-e\f[R] options are cumulative, but all the codes can
+be specified at once, comma\-separated as a single argument.
+.TP
+.B \f[B]\-f\f[R] \f[I]FORMAT\f[R], \f[B]\[en]format=\f[R]\f[I]FORMAT\f[R]
+Specify the output format of shellcheck, which prints its results in the
+standard output.
+Subsequent \f[B]\-f\f[R] options are ignored, see \f[B]FORMATS\f[R]
+below for more information.
+.TP
+.B \f[B]\[en]list\-optional\f[R]
+Output a list of known optional checks.
+These can be enabled with \f[B]\-o\f[R] flags or \f[B]enable\f[R]
+directives.
+.TP
+.B \f[B]\[en]norc\f[R]
+Don\[cq]t try to look for .shellcheckrc configuration files.
+.TP
+.B \f[B]\-o\f[R]\ \f[I]NAME1\f[R][,\f[I]NAME2\f[R]\&...],\ \f[B]\[en]enable=\f[R]\f[I]NAME1\f[R][,\f[I]NAME2\f[R]\&...]
+Enable optional checks.
+The special name \f[I]all\f[R] enables all of them.
+Subsequent \f[B]\-o\f[R] options accumulate.
+This is equivalent to specifying \f[B]enable\f[R] directives.
+.TP
+.B \f[B]\-P\f[R]\ \f[I]SOURCEPATH\f[R],\ \f[B]\[en]source\-path=\f[R]\f[I]SOURCEPATH\f[R]
+Specify paths to search for sourced files, separated by \f[C]:\f[R] on
+Unix and \f[C];\f[R] on Windows.
+This is equivalent to specifying \f[C]search\-path\f[R] directives.
+.TP
+.B \f[B]\-s\f[R]\ \f[I]shell\f[R],\ \f[B]\[en]shell=\f[R]\f[I]shell\f[R]
+Specify Bourne shell dialect.
+Valid values are \f[I]sh\f[R], \f[I]bash\f[R], \f[I]dash\f[R] and
+\f[I]ksh\f[R].
+The default is to deduce the shell from the file\[cq]s \f[C]shell\f[R]
+directive, shebang, or \f[C].bash/.bats/.dash/.ksh\f[R] extension, in
+that order.
+\f[I]sh\f[R] refers to POSIX \f[C]sh\f[R] (not the system\[cq]s), and
+will warn of portability issues.
+.TP
+.B \f[B]\-S\f[R]\ \f[I]SEVERITY\f[R],\ \f[B]\[en]severity=\f[R]\f[I]severity\f[R]
+Specify minimum severity of errors to consider.
+Valid values in order of severity are \f[I]error\f[R],
+\f[I]warning\f[R], \f[I]info\f[R] and \f[I]style\f[R].
+The default is \f[I]style\f[R].
+.TP
+.B \f[B]\-V\f[R],\ \f[B]\[en]version\f[R]
+Print version information and exit.
+.TP
+.B \f[B]\-W\f[R] \f[I]NUM\f[R],\ \f[B]\[en]wiki\-link\-count=NUM\f[R]
+For TTY output, show \f[I]NUM\f[R] wiki links to more information about
+mentioned warnings.
+Set to 0 to disable them entirely.
+.TP
+.B \f[B]\-x\f[R],\ \f[B]\[en]external\-sources\f[R]
+Follow \f[C]source\f[R] statements even when the file is not specified
+as input.
+By default, \f[C]shellcheck\f[R] will only follow files specified on the
+command line (plus \f[C]/dev/null\f[R]).
+This option allows following any file the script may \f[C]source\f[R].
+.TP
+.B \f[B]FILES\&...\f[R]
+One or more script files to check, or \[lq]\-\[rq] for standard input.
+.SH FORMATS
+.TP
+.B \f[B]tty\f[R]
+Plain text, human readable output.
+This is the default.
+.TP
+.B \f[B]gcc\f[R]
+GCC compatible output.
+Useful for editors that support compiling and showing syntax errors.
+.RS
+.PP
+For example, in Vim,
+\f[C]:set makeprg=shellcheck\[rs] \-f\[rs] gcc\[rs] %\f[R] will allow
+using \f[C]:make\f[R] to check the script, and \f[C]:cnext\f[R] to jump
+to the next error.
+.IP
+.nf
+\f[C]
+<file>:<line>:<column>: <type>: <message>
+\f[R]
+.fi
+.RE
+.TP
+.B \f[B]checkstyle\f[R]
+Checkstyle compatible XML output.
+Supported directly or through plugins by many IDEs and build monitoring
+systems.
+.RS
+.IP
+.nf
+\f[C]
+<?xml version=\[aq]1.0\[aq] encoding=\[aq]UTF\-8\[aq]?>
+<checkstyle version=\[aq]4.3\[aq]>
+  <file name=\[aq]file\[aq]>
+    <error
+      line=\[aq]line\[aq]
+      column=\[aq]column\[aq]
+      severity=\[aq]severity\[aq]
+      message=\[aq]message\[aq]
+      source=\[aq]ShellCheck.SC####\[aq] />
+    ...
+  </file>
+  ...
+</checkstyle>
+\f[R]
+.fi
+.RE
+.TP
+.B \f[B]diff\f[R]
+Auto\-fixes in unified diff format.
+Can be piped to \f[C]git apply\f[R] or \f[C]patch \-p1\f[R] to
+automatically apply fixes.
+.RS
+.IP
+.nf
+\f[C]
+\-\-\- a/test.sh
++++ b/test.sh
+\[at]\[at] \-2,6 +2,6 \[at]\[at]
+ ## Example of a broken script.
+ for f in $(ls *.m3u)
+ do
+\-  grep \-qi hq.*mp3 $f \[rs]
++  grep \-qi hq.*mp3 \[dq]$f\[dq] \[rs]
+     && echo \-e \[aq]Playlist $f contains a HQ file in mp3 format\[aq]
+ done
+\f[R]
+.fi
+.RE
+.TP
+.B \f[B]json1\f[R]
+Json is a popular serialization format that is more suitable for web
+applications.
+ShellCheck\[cq]s json is compact and contains only the bare minimum.
+Tabs are counted as 1 character.
+.RS
+.IP
+.nf
+\f[C]
+{
+  comments: [
+    {
+      \[dq]file\[dq]: \[dq]filename\[dq],
+      \[dq]line\[dq]: lineNumber,
+      \[dq]column\[dq]: columnNumber,
+      \[dq]level\[dq]: \[dq]severitylevel\[dq],
+      \[dq]code\[dq]: errorCode,
+      \[dq]message\[dq]: \[dq]warning message\[dq]
+    },
+    ...
+  ]
+}
+\f[R]
+.fi
+.RE
+.TP
+.B \f[B]json\f[R]
+This is a legacy version of the \f[B]json1\f[R] format.
+It\[cq]s a raw array of comments, and all offsets have a tab stop of 8.
+.TP
+.B \f[B]quiet\f[R]
+Suppress all normal output.
+Exit with zero if no issues are found, otherwise exit with one.
+Stops processing after the first issue.
+.SH DIRECTIVES
+.PP
+ShellCheck directives can be specified as comments in the shell script.
+If they appear before the first command, they are considered file\-wide.
+Otherwise, they apply to the immediately following command or block:
+.IP
+.nf
+\f[C]
+# shellcheck key=value key=value
+command\-or\-structure
+\f[R]
+.fi
+.PP
+For example, to suppress SC2035 about using \f[C]./*.jpg\f[R]:
+.IP
+.nf
+\f[C]
+# shellcheck disable=SC2035
+echo \[dq]Files: \[dq] *.jpg
+\f[R]
+.fi
+.PP
+To tell ShellCheck where to look for an otherwise dynamically determined
+file:
+.IP
+.nf
+\f[C]
+# shellcheck source=./lib.sh
+source \[dq]$(find_install_dir)/lib.sh\[dq]
+\f[R]
+.fi
+.PP
+Here a shell brace group is used to suppress a warning on multiple
+lines:
+.IP
+.nf
+\f[C]
+# shellcheck disable=SC2016
+{
+  echo \[aq]Modifying $PATH\[aq]
+  echo \[aq]PATH=foo:$PATH\[aq] >> \[ti]/.bashrc
+}
+\f[R]
+.fi
+.PP
+Valid keys are:
+.TP
+.B \f[B]disable\f[R]
+Disables a comma separated list of error codes for the following
+command.
+The command can be a simple command like \f[C]echo foo\f[R], or a
+compound command like a function definition, subshell block or loop.
+.TP
+.B \f[B]enable\f[R]
+Enable an optional check by name, as listed with
+\f[B]\[en]list\-optional\f[R].
+Only file\-wide \f[C]enable\f[R] directives are considered.
+.TP
+.B \f[B]source\f[R]
+Overrides the filename included by a \f[C]source\f[R]/\f[C].\f[R]
+statement.
+This can be used to tell shellcheck where to look for a file whose name
+is determined at runtime, or to skip a source by telling it to use
+\f[C]/dev/null\f[R].
+.TP
+.B \f[B]source\-path\f[R]
+Add a directory to the search path for \f[C]source\f[R]/\f[C].\f[R]
+statements (by default, only ShellCheck\[cq]s working directory is
+included).
+Absolute paths will also be rooted in these paths.
+The special path \f[C]SCRIPTDIR\f[R] can be used to specify the
+currently checked script\[cq]s directory, as in
+\f[C]source\-path=SCRIPTDIR\f[R] or
+\f[C]source\-path=SCRIPTDIR/../libs\f[R].
+Multiple paths accumulate, and \f[C]\-P\f[R] takes precedence over them.
+.TP
+.B \f[B]shell\f[R]
+Overrides the shell detected from the shebang.
+This is useful for files meant to be included (and thus lacking a
+shebang), or possibly as a more targeted alternative to `disable=2039'.
+.SH RC FILES
+.PP
+Unless \f[C]\-\-norc\f[R] is used, ShellCheck will look for a file
+\f[C].shellcheckrc\f[R] or \f[C]shellcheckrc\f[R] in the script\[cq]s
+directory and each parent directory.
+If found, it will read \f[C]key=value\f[R] pairs from it and treat them
+as file\-wide directives.
+.PP
+Here is an example \f[C].shellcheckrc\f[R]:
+.IP
+.nf
+\f[C]
+# Look for \[aq]source\[aq]d files relative to the checked script,
+# and also look for absolute paths in /mnt/chroot
+source\-path=SCRIPTDIR
+source\-path=/mnt/chroot
+
+# Turn on warnings for unquoted variables with safe values
+enable=quote\-safe\-variables
+
+# Turn on warnings for unassigned uppercase variables
+enable=check\-unassigned\-uppercase
+
+# Allow [ ! \-z foo ] instead of suggesting \-n
+disable=SC2236
+\f[R]
+.fi
+.PP
+If no \f[C].shellcheckrc\f[R] is found in any of the parent directories,
+ShellCheck will look in \f[C]\[ti]/.shellcheckrc\f[R] followed by the
+XDG config directory (usually \f[C]\[ti]/.config/shellcheckrc\f[R]) on
+Unix, or \f[C]%APPDATA%/shellcheckrc\f[R] on Windows.
+Only the first file found will be used.
+.PP
+Note for Snap users: the Snap sandbox disallows access to hidden files.
+Use \f[C]shellcheckrc\f[R] without the dot instead.
+.PP
+Note for Docker users: ShellCheck will only be able to look for files
+that are mounted in the container, so \f[C]\[ti]/.shellcheckrc\f[R] will
+not be read.
+.SH ENVIRONMENT VARIABLES
+.PP
+The environment variable \f[C]SHELLCHECK_OPTS\f[R] can be set with
+default flags:
+.IP
+.nf
+\f[C]
+export SHELLCHECK_OPTS=\[aq]\-\-shell=bash \-\-exclude=SC2016\[aq]
+\f[R]
+.fi
+.PP
+Its value will be split on spaces and prepended to the command line on
+each invocation.
+.SH RETURN VALUES
+.PP
+ShellCheck uses the following exit codes:
+.IP \[bu] 2
+0: All files successfully scanned with no issues.
+.IP \[bu] 2
+1: All files successfully scanned with some issues.
+.IP \[bu] 2
+2: Some files could not be processed (e.g.\ file not found).
+.IP \[bu] 2
+3: ShellCheck was invoked with bad syntax (e.g.\ unknown flag).
+.IP \[bu] 2
+4: ShellCheck was invoked with bad options (e.g.\ unknown formatter).
+.SH LOCALE
+.PP
+This version of ShellCheck is only available in English.
+All files are leniently decoded as UTF\-8, with a fallback of
+ISO\-8859\-1 for invalid sequences.
+\f[C]LC_CTYPE\f[R] is respected for output, and defaults to UTF\-8 for
+locales where encoding is unspecified (such as the \f[C]C\f[R] locale).
+.PP
+Windows users seeing
+\f[C]commitBuffer: invalid argument (invalid character)\f[R] should set
+their terminal to use UTF\-8 with \f[C]chcp 65001\f[R].
+.SH AUTHORS
+.PP
+ShellCheck is developed and maintained by Vidar Holen, with assistance
+from a long list of wonderful contributors.
+.SH REPORTING BUGS
+.PP
+Bugs and issues can be reported on GitHub:
+.PP
+https://github.com/koalaman/shellcheck/issues
+.SH COPYRIGHT
+.PP
+Copyright 2012\-2019, Vidar Holen and contributors.
+Licensed under the GNU General Public License version 3 or later, see
+https://gnu.org/licenses/gpl.html
+.SH SEE ALSO
+.PP
+sh(1) bash(1)
diff --git a/development/Sphinx/README b/development/Sphinx/README
index 367981ce68..cfd397e4f1 100644
--- a/development/Sphinx/README
+++ b/development/Sphinx/README
@@ -1,15 +1,15 @@
-Sphinx is a tool that translates a set of reStructuredText source files into
-various output formats, including HTML, ePub, LaTeX and plain text. Sphinx was
-originally created for the Python documentation, but it has excellent
-facilities for the documentation of software projects in a range of languages.
+Sphinx is a tool that translates a set of reStructuredText
+source files into various output formats, including HTML, ePub,
+LaTeX and plain text. Sphinx was originally created for the Python
+documentation, but it has excellent facilities for the documentation
+of software projects in a range of languages.
 
-All Sphinx dependencies must be built with Python 3 support and since there are
-many different way of providing this, the following packages require special
-build instructions not captured in REQUIRES:
+All Sphinx dependencies must be built with Python 3 support and since
+there are many different way of providing this, the following packages
+require special build instructions not captured in REQUIRES:
 - python/python-urllib3: install python/python3 first
-- python-idna: install python/python3 first
+- python/idna: install python/python3 first
 - 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 638398a269..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:-2.4.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 7be4f3d1e9..9e04dda7b4 100644
--- a/development/Sphinx/Sphinx.info
+++ b/development/Sphinx/Sphinx.info
@@ -1,10 +1,10 @@
 PRGNAM="Sphinx"
-VERSION="2.4.3"
+VERSION="3.5.4"
 HOMEPAGE="http://www.sphinx-doc.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-2.4.3.tar.gz"
-MD5SUM="5d1c845e061566e80e6a92c84ad37c3f"
+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/WebStorm/README b/development/WebStorm/README
index b1049bfad6..0c23363f76 100644
--- a/development/WebStorm/README
+++ b/development/WebStorm/README
@@ -1,2 +1,3 @@
-WebStorm is a lightweight yet powerful IDE, perfectly equipped for complex
-client-side development and server-side development with Node.js.
+WebStorm is a lightweight yet powerful IDE, perfectly equipped for
+complex client-side development and server-side development with
+Node.js.
diff --git a/development/adms/README b/development/adms/README
index 06f8f88d79..3d3575173f 100644
--- a/development/adms/README
+++ b/development/adms/README
@@ -1,6 +1,7 @@
 ADMS is a code generator for the Verilog-AMS language
 
-ADMS is a code generator that converts electrical compact device models specified
-in high-level description language into ready-to-compile C code for the API of spice
-simulators. Based on transformations specified in XML language, ADMS transforms
-Verilog-AMS code into other target languages.
+ADMS is a code generator that converts electrical compact
+device models specified in high-level description language into
+ready-to-compile C code for the API of spice simulators. Based on
+transformations specified in XML language, ADMS transforms Verilog-AMS
+code into other target languages.
diff --git a/development/adms/adms.SlackBuild b/development/adms/adms.SlackBuild
index 05b077f979..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.
 #
@@ -24,10 +24,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=adms
-VERSION=${VERSION:-2.3.6}
+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 \
@@ -73,7 +72,6 @@ find -L . \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --enable-maintainer-mode \
   --prefix=/usr \
   --mandir=/usr/man \
   --disable-static \
diff --git a/development/adms/adms.info b/development/adms/adms.info
index a9c1fe2813..6a8d509b15 100644
--- a/development/adms/adms.info
+++ b/development/adms/adms.info
@@ -1,8 +1,8 @@
 PRGNAM="adms"
-VERSION="2.3.6"
+VERSION="2.3.7"
 HOMEPAGE="http://sourceforge.net/projects/mot-adms/"
-DOWNLOAD="https://github.com/Qucs/ADMS/archive/release-2.3.6/adms-2.3.6.tar.gz"
-MD5SUM="c1710234c7716894fd7f85696a38d9d0"
+DOWNLOAD="https://github.com/Qucs/ADMS/releases/download/release-2.3.7/adms-2.3.7.tar.gz"
+MD5SUM="4b089f863e2d07df502bc5eff82bff7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-xml-libxml"
diff --git a/development/adms/slack-desc b/development/adms/slack-desc
index dba02003ae..df7cdc3af3 100644
--- a/development/adms/slack-desc
+++ b/development/adms/slack-desc
@@ -13,7 +13,7 @@ adms: models specified in high-level description language into ready-to-
 adms: compile C code for the API of spice simulators. Based on 
 adms: transformations specified in XML language, adms transforms
 adms: Verilog-AMS code into other target languages.
-adms: 
+adms:
 adms:
 adms:
 adms:
diff --git a/development/adoptopenjdk-openj9/LICENSE b/development/adoptopenjdk-openj9/LICENSE
new file mode 100644
index 0000000000..9a044f3f67
--- /dev/null
+++ b/development/adoptopenjdk-openj9/LICENSE
@@ -0,0 +1,7 @@
+Copyright 2018 Sukma Wardana <sukma.wardana>
+
+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.
diff --git a/development/adoptopenjdk-openj9/README b/development/adoptopenjdk-openj9/README
new file mode 100644
index 0000000000..c484d92dbe
--- /dev/null
+++ b/development/adoptopenjdk-openj9/README
@@ -0,0 +1,12 @@
+This is a SlackBuild to repackage OpenJDK binary from AdoptOpenJDK
+community with OpenJ9 JVM.
+
+Before installing this package please consider any other jdk's / jre's
+that you have already installed as they may cause conflicts with the
+PATH, JAVA_HOME and MANPATH variables.
+
+After installing the package you will need to logout / reboot your
+machine as it will add files to the /etc/profile.d folder.
+
+To enable JavaFX / OpenJFX support currently you need to add
+IcedTea-Web.
diff --git a/development/adoptopenjdk-openj9/adoptopenjdk-openj9.SlackBuild b/development/adoptopenjdk-openj9/adoptopenjdk-openj9.SlackBuild
new file mode 100644
index 0000000000..aa83d24ed8
--- /dev/null
+++ b/development/adoptopenjdk-openj9/adoptopenjdk-openj9.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Slackware build script for adoptopenjdk
+
+# Copyright 2018 Sukma Wardana <sukma.wardana@mail.com>
+#
+# 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.
+
+PRGNAM=adoptopenjdk-openj9
+SRCNAM=jdk
+VERSION=${VERSION:-14.0.1+7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+MAINVER=${VERSION%%.*}
+MAJORVER=${VERSION%+*}
+MINORVER=${VERSION#*+}
+J9VER=0.20.0
+
+TARNAM=OpenJDK${MAINVER}U-jdk_x64_linux_openj9_${MAJORVER}_${MINORVER}_openj9-${J9VER}.tar.gz
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=${TMP}/package-${PRGNAM}
+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
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  echo "$ARCH port is not supported"
+  exit -1
+fi
+
+JDK_HOME=/usr/lib${LIBDIRSUFFIX}/${SRCNAM}-${VERSION}
+
+set -e
+
+rm -rf ${PKG}
+mkdir -p ${TMP} ${PKG} ${OUTPUT}
+
+mkdir -p $PKG/$JDK_HOME $PKG/usr/{bin,man}
+# Extract start from sub-directory 1 level beneath
+cd $PKG/$JDK_HOME
+tar -xvzf ${CWD}/${TARNAM} --strip-components=1
+cp -a man/man1/ $PKG/usr/man/man1
+
+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 {} \;
+
+# Define whether or not a symlink to libjvm.so library must
+# be created into /usr/lib${LIBDIRSUFFIX}. Can be set to "yes"
+# or "no". Default to "yes".
+if [ "${CREATE_LIBJVM_SYMLINK:-yes}" = "yes" ]; then
+  # Important Note:
+  # --------------
+  # This will create symlink under /usr/lib${LIBDIRSUFFIX}
+  cd ${PKG}/usr/lib${LIBDIRSUFFIX}
+    ln -sf $JDK_HOME/lib/libjawt.so
+    ln -sf $JDK_HOME/lib/server/libjvm.so
+    ln -sf $JDK_HOME/lib/libjava.so
+    ln -sf $JDK_HOME/lib/libawt.so
+    ln -sf $JDK_HOME/lib/libawt_xawt.so
+    ln -sf $JDK_HOME/lib/libverify.so
+  cd -
+fi
+
+# Add profile scripts.
+mkdir -p $PKG/etc/profile.d
+for script in $(ls "${CWD}/profile.d/${PRGNAM}"*) ; do
+  # Modifying the LIBDIRSUFFIX and VERSION using Stream Editor (sed)
+  sed -e "s;lib/${SRCNAM};lib${LIBDIRSUFFIX}/${SRCNAM};" -e "s;@VERSION@;${VERSION};" \
+    < $script \
+    > ${PKG}/etc/profile.d/$(basename ${script})
+  chmod 755 ${PKG}/etc/profile.d/*
+done
+
+mkdir -p $PKG/usr/doc/$SRCNAM-$VERSION
+cp -a release legal/ $PKG/usr/doc/$SRCNAM-$VERSION || true
+cat $CWD/$(basename $0) > $PKG/usr/doc/$SRCNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$SRCNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+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 -rf $PKG/usr/lib64/jdk-14.0.1+7/{man,legal}
+
+mkdir -p ${PKG}/install
+cat ${CWD}/slack-desc > ${PKG}/install/slack-desc
+
+(
+  cd $PKG
+    find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+      xargs strip --strip-unneeded 2> /dev/null
+    find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+      xargs strip --strip-unneeded 2> /dev/null
+)
+
+cd ${PKG}
+/sbin/makepkg -l y -c n ${OUTPUT}/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}
diff --git a/development/adoptopenjdk-openj9/adoptopenjdk-openj9.info b/development/adoptopenjdk-openj9/adoptopenjdk-openj9.info
new file mode 100644
index 0000000000..0fb132672e
--- /dev/null
+++ b/development/adoptopenjdk-openj9/adoptopenjdk-openj9.info
@@ -0,0 +1,10 @@
+PRGNAM="adoptopenjdk-openj9"
+VERSION="14.0.1+7"
+HOMEPAGE="https://adoptopenjdk.net"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1+7_openj9-0.20.0/OpenJDK14U-jdk_x64_linux_openj9_14.0.1_7_openj9-0.20.0.tar.gz"
+MD5SUM_x86_64="ec7cd7e0df40ba2a4af8869abc4e31a2"
+REQUIRES=""
+MAINTAINER="Sukma Wardana"
+EMAIL="sukma.wardana@mail.com"
diff --git a/development/adoptopenjdk-openj9/profile.d/adoptopenjdk-openj9.csh b/development/adoptopenjdk-openj9/profile.d/adoptopenjdk-openj9.csh
new file mode 100644
index 0000000000..142da8e492
--- /dev/null
+++ b/development/adoptopenjdk-openj9/profile.d/adoptopenjdk-openj9.csh
@@ -0,0 +1,4 @@
+#!/bin/csh
+setenv JAVA_HOME /usr/local/lib/jdk-@VERSION@
+setenv MANPATH ${MANPATH}:${JAVA_HOME}/man
+setenv PATH ${PATH}:${JAVA_HOME}/bin
diff --git a/development/adoptopenjdk-openj9/profile.d/adoptopenjdk-openj9.sh b/development/adoptopenjdk-openj9/profile.d/adoptopenjdk-openj9.sh
new file mode 100644
index 0000000000..e85e66de71
--- /dev/null
+++ b/development/adoptopenjdk-openj9/profile.d/adoptopenjdk-openj9.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export JAVA_HOME=/usr/local/lib/jdk-@VERSION@
+export MANPATH="${MANPATH}:${JAVA_HOME}/man"
+export PATH="${PATH}:${JAVA_HOME}/bin"
diff --git a/development/adoptopenjdk-openj9/slack-desc b/development/adoptopenjdk-openj9/slack-desc
new file mode 100644
index 0000000000..26a8dd2c68
--- /dev/null
+++ b/development/adoptopenjdk-openj9/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------------------------------------------------------|
+adoptopenjdk-openj9: adoptopenjdk-openj9 (Open Implementation of JDK)
+adoptopenjdk-openj9:
+adoptopenjdk-openj9: AdoptOpenJDK is a community of Java User Group (JUG) members, Java
+adoptopenjdk-openj9: developers and vendors who are advocates of OpenJDK. Providing rock-
+adoptopenjdk-openj9: solid binaries which utilising existing OpenJDK test suites.
+adoptopenjdk-openj9:
+adoptopenjdk-openj9:
+adoptopenjdk-openj9:
+adoptopenjdk-openj9:
+adoptopenjdk-openj9:
+adoptopenjdk-openj9: Homepage: https://adoptopenjdk.net
diff --git a/development/adoptopenjdk/README b/development/adoptopenjdk/README
index c7b412e765..518cd3b816 100644
--- a/development/adoptopenjdk/README
+++ b/development/adoptopenjdk/README
@@ -1,11 +1,12 @@
 This is a SlackBuild to repackage OpenJDK 11 binary from AdoptOpenJDK
 community with HotSpot JVM.
 
-Before installing this package please consider any other jdk's / jre's that
-you have already installed as they may cause conflicts with the PATH, JAVA_HOME
-and MANPATH variables.
+Before installing this package please consider any other jdk's / jre's
+that you have already installed as they may cause conflicts with the
+PATH, JAVA_HOME and MANPATH variables.
 
-After installing the package you will need to logout / reboot your machine
-as it will add files to the /etc/profile.d folder.
+After installing the package you will need to logout / reboot your
+machine as it will add files to the /etc/profile.d folder.
 
-To enable JavaFX / OpenJFX support currently you need to add IcedTea-Web.
+To enable JavaFX / OpenJFX support currently you need to add
+IcedTea-Web.
diff --git a/development/afl/README b/development/afl/README
index 66692da46c..d4615ca919 100644
--- a/development/afl/README
+++ b/development/afl/README
@@ -3,10 +3,10 @@ afl (security-oriented fuzzer)
 American fuzzy lop is a security-oriented fuzzer that employs a
 novel type of compile-time instrumentation and genetic algorithms to
 automatically discover clean, interesting test cases that trigger new
-internal states in the targeted binary. This substantially improves the
-functional coverage for the fuzzed code. The compact synthesized corpora
-produced by the tool are also useful for seeding other, more labor-
-or resource-intensive testing regimes down the road.
+internal states in the targeted binary. This substantially improves
+the functional coverage for the fuzzed code. The compact synthesized
+corpora produced by the tool are also useful for seeding other, more
+labor- or resource-intensive testing regimes down the road.
 
 To use afl with binary-only code (no source available), a custom qemu
 wrapper is used (afl-qemu-trace). This does NOT require a system-wide
@@ -17,5 +17,5 @@ https://download.qemu-project.org/qemu-2.10.0.tar.xz
 
 Save the file in the same directory as the afl.SlackBuild script.
 
-If binary-only support is not needed, don't download the qemu source. This
-will speed up the build quite a bit.
+If binary-only support is not needed, don't download the qemu
+source. This will speed up the build quite a bit.
diff --git a/development/alloy/README b/development/alloy/README
index 6d1e763ac2..49ec15f20b 100644
--- a/development/alloy/README
+++ b/development/alloy/README
@@ -1,3 +1,4 @@
-Alloy is a lightweight modelling language for software design. It is amenable
-to a fully automatic analysis, using the Alloy Analyzer, and provides a
-visualizer for making sense of solutions and counterexamples it finds.
+Alloy is a lightweight modelling language for software design. It is
+amenable to a fully automatic analysis, using the Alloy Analyzer, and
+provides a visualizer for making sense of solutions and counterexamples
+it finds.
diff --git a/development/amazon-corretto/README b/development/amazon-corretto/README
index cfc1fba1c4..541fc0d99f 100644
--- a/development/amazon-corretto/README
+++ b/development/amazon-corretto/README
@@ -1,5 +1,6 @@
-This is a SlackBuild that will repackage Amazon Corretto into a package 
-that can be easily installed, upgraded, or removed using Slackware's native
-package management tools.
+This is a SlackBuild that will repackage Amazon Corretto into a package
+that can be easily installed, upgraded, or removed using Slackware's
+native package management tools.
 
-This will also package the JRE so you will not need a separate JRE build.
+This will also package the JRE so you will not need a separate JRE
+build.
diff --git a/development/amd-app-sdk/README b/development/amd-app-sdk/README
index b9ed70838d..4dc9264d72 100644
--- a/development/amd-app-sdk/README
+++ b/development/amd-app-sdk/README
@@ -1,7 +1,7 @@
-AMD APP (formerly ATI Stream) technology is a set of advanced hardware and
-software technologies that enable AMD graphics processing cores (GPU),
-working in concert with the system's x86 cores (CPU), to accelerate many
-applications beyond just graphics.
+AMD APP (formerly ATI Stream) technology is a set of advanced hardware
+and software technologies that enable AMD graphics processing cores
+(GPU), working in concert with the system's x86 cores (CPU), to
+accelerate many applications beyond just graphics.
 
 This is AMD's implementation of OpenCL on top of Radeon hardware. You'll
 need a compatible card and recent Catalyst drivers. See 
@@ -10,12 +10,13 @@ for a complete list of requirements.
 
 NOTES:
 
-1) The download links point to an EULA page that you have to accept in order
-   to download the files
+1) The download links point to an EULA page that you have to accept in 
+   order to download the files
 2) This package is compatible only with x86 and x86_64 architectures.
-3) By default, samples are not included in the final package. If you'd like
-   to include them, use the SAMPLES environment variable:
-#SAMPLES=yes ./amd-app-sdk.SlackBuild
+3) By default, samples are not included in the final package. If you'd
+   like to include them, use the SAMPLES environment variable:
+
+   SAMPLES=yes ./amd-app-sdk.SlackBuild
 
 Please read the README.SLACKWARE file for further information about this
 package setup.
diff --git a/development/android-studio/README b/development/android-studio/README
index 3033d4ce2e..302f523d3e 100644
--- a/development/android-studio/README
+++ b/development/android-studio/README
@@ -1,17 +1,16 @@
 Android Studio Integrated Development Environment (IDE)
 
-Android Studio is the official integrated development environment for Google's
-Android operating system, built on JetBrains' IntelliJ IDEA software and
-designed specifically for Android development. It is available for download on
-Windows, macOS and Linux based operating systems. It is a replacement for the
-Eclipse Android Development Tools as primary IDE for native Android
-application development.
+Android Studio is the official integrated development environment
+for Google's Android operating system, built on JetBrains' IntelliJ
+IDEA software and designed specifically for Android development. It
+is available for download on Windows, macOS and Linux based operating
+systems. It is a replacement for the Eclipse Android Development Tools
+as primary IDE for native Android application development.
 
 NOTE:
   ****
-  YOU MUST AGREE TO GOOGLE'S DOWNLOAD AGREEMENT BEFORE YOU CAN DOWNLOAD
-  ANDROID STUDIO BINARY PACKAGE FROM THEM.  THIS MEANS THAT YOU HAVE TO USE
-  SOME SORT OF WEB BROWSER, E.G. FIREFOX, TO DOWNLOAD IT. LINKS, WGET, ET AL
-  WILL NOT WORK
+  YOU MUST AGREE TO GOOGLE'S DOWNLOAD AGREEMENT BEFORE YOU CAN
+  DOWNLOAD ANDROID STUDIO BINARY PACKAGE FROM THEM.  THIS MEANS THAT
+  YOU HAVE TO USE SOME SORT OF WEB BROWSER, E.G. FIREFOX, TO DOWNLOAD
+  IT. LINKS, WGET, ET AL WILL NOT WORK
   ****
-
diff --git a/development/anjuta/README b/development/anjuta/README
index 8feba760f7..680d70471c 100644
--- a/development/anjuta/README
+++ b/development/anjuta/README
@@ -1,8 +1,9 @@
-Anjuta DevStudio is a versatile software development studio featuring 
-a number of advanced programming facilities including project management, 
-application wizard, interactive debugger, source editor, version control, 
-GUI designer, profiler and many more tools. It focuses on providing simple 
-and usable user interface, yet powerful for efficient development. 
+Anjuta DevStudio is a versatile software development studio featuring a
+number of advanced programming facilities including project management,
+application wizard, interactive debugger, source editor, version
+control, GUI designer, profiler and many more tools. It focuses on
+providing simple and usable user interface, yet powerful for efficient
+development.
 
 vala and graphviz are optional dependencies.
 
diff --git a/development/apache-ant/README b/development/apache-ant/README
index c033ccc4a3..3236ae09c9 100644
--- a/development/apache-ant/README
+++ b/development/apache-ant/README
@@ -1,14 +1,15 @@
 Apache Ant is a Java-based build tool - like make, but without make's
 wrinkles. :-)
 
-Ant is extended using Java classes. The configuration files are XML-based,
-calling out a target tree where tasks get executed. Each task is run by an
-object that implements a Task interface.
+Ant is extended using Java classes. The configuration files are
+XML-based, calling out a target tree where tasks get executed. Each
+task is run by an object that implements a Task interface.
 
-This package is using upstream's recommendation of ANT_HOME=/usr/share/ant
+This package is using upstream's recommendation of
+ANT_HOME=/usr/share/ant
 
-apache-ant uses `javac` and friends to compile java projects.
-If you use the stock 'gcc-java' package, then you will need to export the
+apache-ant uses `javac` and friends to compile java projects.  If you
+use the stock 'gcc-java' package, then you will need to export the
 JAVA_HOME environment variable, and make it point to the Java5 run-time
 provided by the GNU Compiler Collection, e.g.:
 
diff --git a/development/apache-jmeter/README b/development/apache-jmeter/README
index 6317b03271..abeb36fab4 100644
--- a/development/apache-jmeter/README
+++ b/development/apache-jmeter/README
@@ -1,10 +1,11 @@
 Apache JMeter is a Java-based load testing tool.
 
-JMeter is pure Java application designed to load test functional behavior
-and measure performance. It was originally designed for testing web 
-applications but has since expanded to other test functions. 
+JMeter is pure Java application designed to load test functional
+behavior and measure performance. It was originally designed for
+testing web applications but has since expanded to other test
+functions.
 
-The directory /usr/share/jmeter/bin contains additional scripts for 
+The directory /usr/share/jmeter/bin contains additional scripts for
 managing JMeter.
 
 Set API_DOCS=yes to include the full documentation. This will make the
diff --git a/development/apache-jmeter/apache-jmeter.SlackBuild b/development/apache-jmeter/apache-jmeter.SlackBuild
index 488b33784e..f1bd3274a9 100644
--- a/development/apache-jmeter/apache-jmeter.SlackBuild
+++ b/development/apache-jmeter/apache-jmeter.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for apache-jmeter
 # Original author: Benjamin Trigona-Harany
-# Copyright 2016-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.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=apache-jmeter
-VERSION=${VERSION:-5.1.1}
+VERSION=${VERSION:-5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/apache-jmeter/apache-jmeter.info b/development/apache-jmeter/apache-jmeter.info
index c9aebe7015..1a91d9da8e 100644
--- a/development/apache-jmeter/apache-jmeter.info
+++ b/development/apache-jmeter/apache-jmeter.info
@@ -1,8 +1,8 @@
 PRGNAM="apache-jmeter"
-VERSION="5.1.1"
+VERSION="5.3"
 HOMEPAGE="http://jmeter.apache.org/"
-DOWNLOAD="https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-5.1.1.tgz"
-MD5SUM="197b71d7f3691a4347300cda83099965"
+DOWNLOAD="https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-5.3.tgz"
+MD5SUM="ed6efb9685b196d4395662488a712c5b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
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/apitrace/README b/development/apitrace/README
deleted file mode 100644
index afa1ac47a7..0000000000
--- a/development/apitrace/README
+++ /dev/null
@@ -1,11 +0,0 @@
-apitrace consists of a set of tools to:
-
-    trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs calls to a file;
-
-    replay OpenGL and OpenGL ES calls from a file;
-
-    inspect OpenGL state at any call while retracing;
-
-    visualize and edit trace files.
-
-qt5 is an optional dependency to build the gui.
diff --git a/development/apitrace/apitrace.SlackBuild b/development/apitrace/apitrace.SlackBuild
deleted file mode 100644
index d5f42568ce..0000000000
--- a/development/apitrace/apitrace.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for apitrace
-
-# Copyright 2015-2017, 2019 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=apitrace
-VERSION=${VERSION:-8.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 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DDOC_INSTALL_DIR=doc/$PRGNAM-$VERSION \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -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/development/apitrace/apitrace.info b/development/apitrace/apitrace.info
deleted file mode 100644
index 5b816f7696..0000000000
--- a/development/apitrace/apitrace.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="apitrace"
-VERSION="8.0"
-HOMEPAGE="https://apitrace.github.io/"
-DOWNLOAD="https://github.com/apitrace/apitrace/archive/8.0/apitrace-8.0.tar.gz"
-MD5SUM="87e917879342b17f6076ddc65abc9503"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/development/arduino/README b/development/arduino/README
index 42e0e0921a..6d4e9b8d59 100644
--- a/development/arduino/README
+++ b/development/arduino/README
@@ -1,6 +1,7 @@
-The open-source Arduino Software (IDE) makes it easy to write code and upload
-it to the board. It runs on Windows, Mac OS X, and Linux. The environment
-is written in Java and based on Processing and other open-source software.
-This software can be used with any Arduino board.
+The open-source Arduino Software (IDE) makes it easy to write code and
+upload it to the board. It runs on Windows, Mac OS X, and Linux. The
+environment is written in Java and based on Processing and other
+open-source software.  This software can be used with any Arduino
+board.
 
 NOTE: This script repackages binary release provided by the upstream.
diff --git a/development/arm-binutils/README b/development/arm-binutils/README
index 66a5b3d422..f998a9cc7d 100644
--- a/development/arm-binutils/README
+++ b/development/arm-binutils/README
@@ -1,2 +1,2 @@
-This package contains cross compiling version of GNU binutils, which can be
-used to assemble and link binaries for the ARM platform.
+This package contains cross compiling version of GNU binutils, which
+can be used to assemble and link binaries for the ARM platform.
diff --git a/development/arm-binutils/arm-binutils.SlackBuild b/development/arm-binutils/arm-binutils.SlackBuild
index 727d920f08..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.32}
+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 \
@@ -91,7 +92,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-multilib \
   --disable-nls \
   --disable-werror \
-  --disable-libssp \
   --with-system-zlib \
   --with-gnu-as \
   --with-gnu-ld
diff --git a/development/arm-binutils/arm-binutils.info b/development/arm-binutils/arm-binutils.info
index 3253b166e2..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.32"
+VERSION="2.35"
 HOMEPAGE="http://www.gnu.org/software/binutils"
-DOWNLOAD="https://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz"
-MD5SUM="0d174cdaf85721c5723bf52355be41e6"
+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-binutils/configure_options.txt b/development/arm-binutils/configure_options.txt
index abfded647a..7fadcab56a 100644
--- a/development/arm-binutils/configure_options.txt
+++ b/development/arm-binutils/configure_options.txt
@@ -120,6 +120,8 @@ Optional Packages:
   --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-debuginfod       Enable debuginfo lookups with debuginfod
+                          (auto/yes/no)
   --with-mpc=PATH         specify prefix directory for installed MPC package.
                           Equivalent to --with-mpc-include=PATH/include plus
                           --with-mpc-lib=PATH/lib
@@ -140,6 +142,9 @@ Optional Packages:
   --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
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/README b/development/asl/README
index b44b3c43f3..fb95769c32 100644
--- a/development/asl/README
+++ b/development/asl/README
@@ -1,10 +1,11 @@
 asl (portable macro cross assembler)
 
-ASL is a portable macro cross assembler for a variety of microprocessors
-and microcontrollers. Though it is mainly targeted at embedded processors
-and single-board computers, there are also CPU families in the target
-list that are used in workstations and PCs. For a full list of targets,
-see: http://john.ccac.rwth-aachen.de:8000/as/as_EN.html#sect_1_2_
+ASL is a portable macro cross assembler for a variety of
+microprocessors and microcontrollers. Though it is mainly
+targeted at embedded processors and single-board computers,
+there are also CPU families in the target list that are used
+in workstations and PCs. For a full list of targets, see:
+http://john.ccac.rwth-aachen.de:8000/as/as_EN.html#sect_1_2_
 
 Note: The source downloaded is a snapshot. There hasn't been an ASL
 release since 1999, although development snapshots are still released
@@ -18,8 +19,9 @@ its log and error messages. By default, ISO-8859-1 is used.
 TESTS=no - Don't run ASL's test suite. This should only be used on slow
 systems to save building time.
 
-DOCTYPES - ASL's documentation can be installed as HTML, PDF, PostScript,
-and/or plain text. DOCTYPES is a space-separated list of formats, which
-may include any of: html pdf ps txt. The default is "html". If you plan
-to print a copy of the docs, you might want e.g. DOCTYPES="html pdf".
-All formats are installed to /usr/doc/asl-$VERSION/, as usual.
+DOCTYPES - ASL's documentation can be installed as HTML, PDF,
+PostScript, and/or plain text. DOCTYPES is a space-separated
+list of formats, which may include any of: html pdf ps txt. The
+default is "html". If you plan to print a copy of the docs, you
+might want e.g. DOCTYPES="html pdf".  All formats are installed to
+/usr/doc/asl-$VERSION/, as usual.
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/asm6809/README b/development/asm6809/README
index c60f922458..2f5fac0e4d 100644
--- a/development/asm6809/README
+++ b/development/asm6809/README
@@ -2,7 +2,8 @@ asm6809 is a portable cross assembler targeting the Motorola 6809 and
 Hitachi 6309.
 
 Features arbitrarily complex expressions (with most C-style operators
-available), forward references, macro expansion and conditional assembly.
+available), forward references, macro expansion and conditional
+assembly.
 
-Output formats are: Raw binary, DragonDOS binary, CoCo RS-DOS (or "DECB")
-binary, Motorola SREC, Intel HEX.
+Output formats are: Raw binary, DragonDOS binary, CoCo RS-DOS (or
+"DECB") binary, Motorola SREC, Intel HEX.
diff --git a/development/astyle/README b/development/astyle/README
index 1bac5991ae..ca67a8daca 100644
--- a/development/astyle/README
+++ b/development/astyle/README
@@ -1,8 +1,8 @@
 astyle (Artistic Style code beautifier)
 
-Artistic Style is a code indenter, beautifier and formatter for C, C++, C#,
-and Java. It can be used from the command-line or linked into other programs.
-Complete documentation is included.
+Artistic Style is a code indenter, beautifier and formatter for C, C++,
+C#, and Java. It can be used from the command-line or linked into other
+programs.  Complete documentation is included.
 
-The optional shared library is not installed by the package.  If it is needed
-for another project, please contact the maintainer.
+The optional shared library is not installed by the package.  If it is
+needed for another project, please contact the maintainer.
diff --git a/development/atasm/README b/development/atasm/README
index 844b0ec16f..5a818ce548 100644
--- a/development/atasm/README
+++ b/development/atasm/README
@@ -1,10 +1,11 @@
 atasm (a mostly mac/65 compatible cross-assembler)
 
-ATasm is a 6502 command-line cross-assembler that is compatible with the
-original Mac/65 macroassembler released by OSS software. Code development
-can now be performed using modern editors and compiles with lightning
-speed.
+ATasm is a 6502 command-line cross-assembler that is compatible with
+the original Mac/65 macroassembler released by OSS software. Code
+development can now be performed using modern editors and compiles with
+lightning speed.
 
-This build has been updated for version 1.07d (the last beta release),
-but it's still possible to build 1.06 (last stable release) by downloading
-the 1.06 source and setting VERSION=1.06 in the environment.
+This build has been updated for version 1.07d (the last beta
+release), but it's still possible to build 1.06 (last stable release)
+by downloading the 1.06 source and setting VERSION=1.06 in the
+environment.
diff --git a/development/atom/atom.SlackBuild b/development/atom/atom.SlackBuild
index e3ec41c08a..84e747cdb6 100644
--- a/development/atom/atom.SlackBuild
+++ b/development/atom/atom.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=atom
-VERSION=${VERSION:-1.40.1}
+VERSION=${VERSION:-1.50.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/atom/atom.info b/development/atom/atom.info
index 438d7f5554..bdfaa22a63 100644
--- a/development/atom/atom.info
+++ b/development/atom/atom.info
@@ -1,8 +1,8 @@
 PRGNAM="atom"
-VERSION="1.40.1"
+VERSION="1.50.0"
 HOMEPAGE="https://atom.io/"
-DOWNLOAD="https://github.com/atom/atom/archive/v1.40.1/atom-1.40.1.tar.gz"
-MD5SUM="2210894cc0b342954593a19d68f682c0"
+DOWNLOAD="https://github.com/atom/atom/archive/v1.50.0/atom-1.50.0.tar.gz"
+MD5SUM="d02081ca1c02726f0ae4e72bd27e5139"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nodejs"
diff --git a/development/avr-binutils/README b/development/avr-binutils/README
index e63bb7277c..3b0d6efe67 100644
--- a/development/avr-binutils/README
+++ b/development/avr-binutils/README
@@ -1,6 +1,6 @@
-This package contains cross compiling version of GNU binutils, which can be
-used to assemble and link binaries for the AVR platform.
+This package contains cross compiling version of GNU binutils, which
+can be used to assemble and link binaries for the AVR platform.
 
-It includes a patch to make 'avr-size' report how much memory (RAM and flash)
-is taken up by the binary image on the target processor.
+It includes a patch to make 'avr-size' report how much memory (RAM
+and flash) is taken up by the binary image on the target processor.
 (obtained from https://bugs.archlinux.org/task/32504).
diff --git a/development/avr8-gnu-toolchain/README b/development/avr8-gnu-toolchain/README
index 7793f3e019..75fea75a6d 100644
--- a/development/avr8-gnu-toolchain/README
+++ b/development/avr8-gnu-toolchain/README
@@ -1,6 +1,6 @@
 Atmel AVR Toolchain is a collection of tools/libraries used to create
-applications for AVR microcontrollers. This collection includes compiler,
-assembler, linker and Standard C & math libraries.
+applications for AVR microcontrollers. This collection includes
+compiler, assembler, linker and Standard C & math libraries.
 
 This script builds a Slackware package from the official binary
 distributed by Atmel. The source code is available at:
diff --git a/development/avra/avra.SlackBuild b/development/avra/avra.SlackBuild
index d27a24622e..5272fdacce 100644
--- a/development/avra/avra.SlackBuild
+++ b/development/avra/avra.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=avra
-VERSION=${VERSION:-1.4.1}
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,10 +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 {} \;
 
-sed -i 's|^PREFIX = /usr/local|PREFIX = /usr|' Makefile
 
-make
-make install DESTDIR=$PKG
+make PREFIX=/usr
+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
@@ -84,7 +83,6 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/include/avra
 mv examples $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
diff --git a/development/avra/avra.info b/development/avra/avra.info
index 2fffe47e19..4034d6d09b 100644
--- a/development/avra/avra.info
+++ b/development/avra/avra.info
@@ -1,8 +1,8 @@
 PRGNAM="avra"
-VERSION="1.4.1"
-HOMEPAGE="https://github.com/hsoft/avra"
-DOWNLOAD="https://github.com/hsoft/avra/archive/1.4.1/avra-1.4.1.tar.gz"
-MD5SUM="bef646ae1caa123a57655fa62440ee94"
+VERSION="1.4.2"
+HOMEPAGE="https://github.com/Ro5bert/avra"
+DOWNLOAD="https://github.com/Ro5bert/avra/archive/1.4.2/avra-1.4.2.tar.gz"
+MD5SUM="fc246de350344cc2db0d2a1f1c8008ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/avrdude/README b/development/avrdude/README
index e6d1e7ce48..6a08c3b670 100644
--- a/development/avrdude/README
+++ b/development/avrdude/README
@@ -1,3 +1,3 @@
-Avrdude is an open source utility to download/upload/manipulate the ROM and
-EEPROM contents of AVR microcontrollers using the in-system programming
-technique (ISP).
+Avrdude is an open source utility to download/upload/manipulate the
+ROM and EEPROM contents of AVR microcontrollers using the in-system
+programming technique (ISP).
diff --git a/development/bakefile/README b/development/bakefile/README
index 7c5164d201..8c56bfe8f4 100644
--- a/development/bakefile/README
+++ b/development/bakefile/README
@@ -1,9 +1,9 @@
-Bakefile is cross-platform, cross-compiler native makefiles generator. 
-It takes compiler-independent description of build tasks as input and 
-generates native makefile (autoconf's Makefile.in, Visual C++ project, 
+Bakefile is cross-platform, cross-compiler native makefiles generator.
+It takes compiler-independent description of build tasks as input and
+generates native makefile (autoconf's Makefile.in, Visual C++ project,
 bcc makefile etc.).
 
-Bakefile's task is to generate native makefiles, so that people can keep 
-using their favorite tools. There are other cross-platform make solutions, 
-but they either aren't native and require the user to use unfamiliar tools 
-(Boost.Build) or they are too limited (qmake). 
+Bakefile's task is to generate native makefiles, so that people can
+keep using their favorite tools. There are other cross-platform make
+solutions, but they either aren't native and require the user to use
+unfamiliar tools (Boost.Build) or they are too limited (qmake).
diff --git a/development/bas55/README b/development/bas55/README
index 88f0e1656e..f740f48136 100644
--- a/development/bas55/README
+++ b/development/bas55/README
@@ -1,7 +1,8 @@
 bas55 (ECMA-55 Minimal BASIC System)
 
-bas55 is an implementation of the the Minimal BASIC programming language as
-defined by the ECMA 55 standard.  It provides an interpreter and an editor
-with line renumbering capabilities.
+bas55 is an implementation of the the Minimal BASIC programming
+language as defined by the ECMA 55 standard.  It provides an
+interpreter and an editor with line renumbering capabilities.
 
-For enhanced editing support, pass LIBEDIT=yes to the SlackBuild. This requires "libedit".
+For enhanced editing support, pass LIBEDIT=yes to the SlackBuild. This
+requires "libedit".
diff --git a/development/bas55/bas55.SlackBuild b/development/bas55/bas55.SlackBuild
index ae25bba205..c4f9a9b643 100644
--- a/development/bas55/bas55.SlackBuild
+++ b/development/bas55/bas55.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bas55
 
-# Copyright 2018 Jorge Giner Cordero
+# Copyright 2020 Jorge Giner Cordero
 # 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=bas55
-VERSION=${VERSION:-1.17}
+VERSION=${VERSION:-1.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/bas55/bas55.info b/development/bas55/bas55.info
index e6f344f8b9..6c2ae00a39 100644
--- a/development/bas55/bas55.info
+++ b/development/bas55/bas55.info
@@ -1,8 +1,8 @@
 PRGNAM="bas55"
-VERSION="1.17"
+VERSION="1.18"
 HOMEPAGE="https://jorgicor.niobe.org/bas55"
-DOWNLOAD="https://jorgicor.niobe.org/bas55/bas55-1.17.tar.gz"
-MD5SUM="3069a4471436852f789da6dd88e69220"
+DOWNLOAD="https://jorgicor.niobe.org/bas55/bas55-1.18.tar.gz"
+MD5SUM="ab17610a5686c1215f043d9e32673f5a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/bashdb/README b/development/bashdb/README
index 5cba21da87..b3f1cf5dba 100644
--- a/development/bashdb/README
+++ b/development/bashdb/README
@@ -1,5 +1,7 @@
-The BASH Debugger Project contains the most comprehensive source-code debugger
-for bash that has been written. It has a similar command interface as gdb.
+The BASH Debugger Project contains the most comprehensive source-code
+debugger for bash that has been written. It has a similar command
+interface as gdb.
 
-Read the INSTALL file in the source directory for instructions if you wish to
-enable readarray support. readarray speeds up initial loading of large scripts.
+Read the INSTALL file in the source directory for instructions if you
+wish to enable readarray support. readarray speeds up initial loading
+of large scripts.
diff --git a/development/beav/README b/development/beav/README
index 11ad72b194..76a9afd8db 100644
--- a/development/beav/README
+++ b/development/beav/README
@@ -2,14 +2,15 @@ beav (curses-based binary/hex editor)
 
 BEAV (Binary Editor And Viewer), is a full featured binary file
 editor. Just about any operation that you could want to do to a binary
-file is possible with BEAV. You can insert or delete in the middle of a
-file thereby changing it's size. You can edit multiple files in multiple
-windows and cut and paste between them. You can display and edit data in
-hex, octal, decimal, binary, ascii, or ebcdic formats. You can display
-data in byte, word, or long word formats in either Intel or Motorola byte
-ordering. You can send the formatted display mode to a file or printer.
+file is possible with BEAV. You can insert or delete in the middle
+of a file thereby changing it's size. You can edit multiple files in
+multiple windows and cut and paste between them. You can display and
+edit data in hex, octal, decimal, binary, ascii, or ebcdic formats. You
+can display data in byte, word, or long word formats in either Intel
+or Motorola byte ordering. You can send the formatted display mode to a
+file or printer.
 
 This build of beav includes a patch to support moving around the file
-with the arrow keys on most terminals, without having to create a custom
-.beavrc. The original key bindings are still active, if you're already
-used to them.
+with the arrow keys on most terminals, without having to create a
+custom .beavrc. The original key bindings are still active, if you're
+already used to them.
diff --git a/development/bed/README b/development/bed/README
index 58a7b6e8ba..7f3733508f 100644
--- a/development/bed/README
+++ b/development/bed/README
@@ -1,19 +1,21 @@
 bed (ncurses-based adjustable data format binary/hex editor)
 
 Bed is a binary editor that supports editing/viewing data in a wide
-variety of formats, including ASCII, unsigned and signed integers, float,
-bit-flags, bit-fields, labels, EBCDIC and time_t. Different sizes and
-byte orderings are possible. Data types can be used in structures. Other
-data formats, filters and procedures can be defined in plugins.
+variety of formats, including ASCII, unsigned and signed integers,
+float, bit-flags, bit-fields, labels, EBCDIC and time_t. Different
+sizes and byte orderings are possible. Data types can be used in
+structures. Other data formats, filters and procedures can be defined
+in plugins.
 
 Optional dependencies: hyperscan and/or re2. These are autodetected at
 build time. bed uses these for faster regular expressions searches.
 
 Notes:
 
-- bed starts up in Ascii input mode. Press F7 to switch to "Digit-Hex" entry
-  mode. If this doesn't work, see the next note.
+- bed starts up in ASCII input mode. Press F7 to switch to "Digit-Hex"
+  entry mode. If this doesn't work, see the next note.
 
 - bed makes extensive use of Meta key combinations and the F-keys.
-  It's pretty sensitive to the terminal type and $TERM setting being used.
-  See README_SBo.txt if you have trouble with the keyboard commands.
+  It's pretty sensitive to the terminal type and $TERM setting being
+  used. See README_SBo.txt if you have trouble with the keyboard
+  commands.
diff --git a/development/bed/bed.info b/development/bed/bed.info
index 2af6b39925..e74bbaad0d 100644
--- a/development/bed/bed.info
+++ b/development/bed/bed.info
@@ -1,7 +1,7 @@
 PRGNAM="bed"
 VERSION="3.0.0"
 HOMEPAGE="http://web.archive.org/web/20191229144155/https://www.dse.nl/~bed/download.html"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/bed-3.0.0.src.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/bed-3.0.0.src.tar.xz"
 MD5SUM="cd2f49434d673bd4f124b6cb1d1a1dbd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/bfg/bfg.SlackBuild b/development/bfg/bfg.SlackBuild
index 719241ecb0..45cb3d522a 100644
--- a/development/bfg/bfg.SlackBuild
+++ b/development/bfg/bfg.SlackBuild
@@ -1,9 +1,10 @@
 #!/bin/sh
 
 # Slackware build script for bfg
-
+#
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-
+# Copyright 2017,2020  Jason Graham <jgraham@compukix.net> MD, USA
+#
 # 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 2 of the License, or
@@ -23,7 +24,7 @@
 # not, see <http://www.gnu.org/licenses/>.
 
 PRGNAM=bfg
-VERSION=${VERSION:-1.12.15}
+VERSION=${VERSION:-1.13.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/bfg/bfg.info b/development/bfg/bfg.info
index 93ebf5110f..25f501ac0b 100644
--- a/development/bfg/bfg.info
+++ b/development/bfg/bfg.info
@@ -1,10 +1,10 @@
 PRGNAM="bfg"
-VERSION="1.12.15"
+VERSION="1.13.0"
 HOMEPAGE="https://rtyley.github.io/bfg-repo-cleaner/"
-DOWNLOAD="http://repo1.maven.org/maven2/com/madgag/bfg/1.12.15/bfg-1.12.15.jar"
-MD5SUM="60b564fa4d8b0f177424dbb269af02df"
+DOWNLOAD="https://repo1.maven.org/maven2/com/madgag/bfg/1.13.0/bfg-1.13.0.jar"
+MD5SUM="f437b07a4651c8b549703940de6ce1d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
 MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/development/bigloo/README b/development/bigloo/README
index 44b12bb2d5..bbc2e43a2f 100644
--- a/development/bigloo/README
+++ b/development/bigloo/README
@@ -1,4 +1,5 @@
-Bigloo is a Scheme implementation devoted to one goal: enabling Scheme based
-programming style where C(++) is usually required.  Bigloo attempts to make
-Scheme practical by offering features usually presented by traditional
-programming languages but not offered by Scheme and functional programming.
+Bigloo is a Scheme implementation devoted to one goal: enabling
+Scheme based programming style where C(++) is usually required.
+Bigloo attempts to make Scheme practical by offering features usually
+presented by traditional programming languages but not offered by
+Scheme and functional programming.
diff --git a/development/blassic/README b/development/blassic/README
index 50567086c8..7fbf9b80c9 100644
--- a/development/blassic/README
+++ b/development/blassic/README
@@ -20,6 +20,7 @@ build is for the last stable release, 0.10.3. However, there was a
 known issues. If you want to try this version, you can build it
 with this script:
 
-- Download the source: http://urchlay.naptime.net/~urchlay/src/blassic-0.11.0.20100121.tgz
+- Download the source:
+  https://slackware.uk/~urchlay/src/blassic-0.11.0.20100121.tgz
 - Check its md5sum. Should be ee81716bc75bd5d3405cb6dc8ef34615.
 - Run the script with VERSION=0.11.0.20100121 in the environment.
diff --git a/development/blassic/blassic.info b/development/blassic/blassic.info
index 812681eda2..f7996f9114 100644
--- a/development/blassic/blassic.info
+++ b/development/blassic/blassic.info
@@ -1,7 +1,7 @@
 PRGNAM="blassic"
 VERSION="0.10.3"
 HOMEPAGE="http://web.archive.org/web/20180320150223/http://blassic.net/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/blassic-0.10.3.tgz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/blassic-0.10.3.tgz"
 MD5SUM="d9188387a84d2e5dd8b2cbef1704de3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/bless/README b/development/bless/README
index 1b7ad457f2..f2c4d6788a 100644
--- a/development/bless/README
+++ b/development/bless/README
@@ -3,6 +3,7 @@ bless (GUI hex editor)
 bless is a full featured hexadecimal editor, written in C#, using Gtk#
 for the user interface.
 
-Its purpose is to edit files as a sequence of bytes, allowing read/write,
-search, pattern finding, efficient query-replace, multi-tabbing,
-customized data-views, plug�ins, and many other features.
+Its purpose is to edit files as a sequence of bytes, allowing
+read/write, search, pattern finding, efficient query-replace,
+multi-tabbing, customized data-views, plug�ins, and many other
+features.
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/README b/development/bpython/README
index 584378d5d1..c62aab2615 100644
--- a/development/bpython/README
+++ b/development/bpython/README
@@ -1,3 +1,4 @@
-bpython is a fancy curses interface to the Python interactive interpreter.
+bpython is a fancy curses interface to the Python interactive
+interpreter.
 
 NOTE: Install python3 first before installing all other requirements.
diff --git a/development/bpython/bpython.SlackBuild b/development/bpython/bpython.SlackBuild
index 0be41bd9d2..fd6df0794a 100644
--- a/development/bpython/bpython.SlackBuild
+++ b/development/bpython/bpython.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bpython
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # Written by vvoody <vvoodywang@gmail.com>
 # All rights reserved.
 #
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bpython
-VERSION=${VERSION:-0.18}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.21}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -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 6613d6b524..e5abedf937 100644
--- a/development/bpython/bpython.info
+++ b/development/bpython/bpython.info
@@ -1,10 +1,10 @@
 PRGNAM="bpython"
-VERSION="0.18"
+VERSION="0.21"
 HOMEPAGE="https://bpython-interpreter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/cc/af/4ebe98f22713b4d66d57b85d6f3f4d12e7ea208d967df24bf2f666bf0f74/bpython-0.18.tar.gz"
-MD5SUM="a150a9ff3383013da1156dda4b44280d"
+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/brackets/README b/development/brackets/README
index ec012379cd..9004a2d6ec 100644
--- a/development/brackets/README
+++ b/development/brackets/README
@@ -4,6 +4,7 @@ developers.
 Google Chrome or Chromium is currently required to use the live preview
 function, Firefox support is planned for the future.
 
-As of version 1.0, the Extract bundle is now included, more details here:
+As of version 1.0, the Extract bundle is now included, more details
+here:
 
 http://blog.brackets.io/2014/11/04/brackets-1-0-and-extract-for-brackets-preview-now-available/
diff --git a/development/brotli/README b/development/brotli/README
index f99e98ef93..760d7f0b48 100644
--- a/development/brotli/README
+++ b/development/brotli/README
@@ -1,6 +1,7 @@
-Brotli is a generic-purpose lossless compression algorithm that compresses data
-using a combination of a modern variant of the LZ77 algorithm, Huffman coding
-and 2nd order context modeling, with a compression ratio comparable to the best
-currently available general-purpose compression methods.
+Brotli is a generic-purpose lossless compression algorithm that
+compresses data using a combination of a modern variant of the
+LZ77 algorithm, Huffman coding and 2nd order context modeling,
+with a compression ratio comparable to the best currently available
+general-purpose compression methods.
 
 This SlackBuild will also install the Python modules.
diff --git a/development/brotli/brotli.SlackBuild b/development/brotli/brotli.SlackBuild
index df478c71da..fdcd22418d 100644
--- a/development/brotli/brotli.SlackBuild
+++ b/development/brotli/brotli.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for brotli
 
-# Copyright 2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2018-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=brotli
-VERSION=${VERSION:-1.0.7}
+VERSION=${VERSION:-1.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/brotli/brotli.info b/development/brotli/brotli.info
index f19b6ab380..72f57150b8 100644
--- a/development/brotli/brotli.info
+++ b/development/brotli/brotli.info
@@ -1,8 +1,8 @@
 PRGNAM="brotli"
-VERSION="1.0.7"
+VERSION="1.0.9"
 HOMEPAGE="https://github.com/google/brotli/"
-DOWNLOAD="https://github.com/google/brotli/archive/v1.0.7/brotli-1.0.7.tar.gz"
-MD5SUM="7b6edd4f2128f22794d0ca28c53898a5"
+DOWNLOAD="https://github.com/google/brotli/archive/v1.0.9/brotli-1.0.9.tar.gz"
+MD5SUM="c2274f0c7af8470ad514637c35bcee7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/bsdiff/README b/development/bsdiff/README
index 482944aace..33119f0569 100644
--- a/development/bsdiff/README
+++ b/development/bsdiff/README
@@ -1,24 +1,27 @@
 bsdiff (binary diff/patch utility)
 
-bsdiff and bspatch are tools for building and applying patches to binary
-files. By using suffix sorting (specifically, Larsson and Sadakane's qsufsort)
-and taking advantage of how executable files change, bsdiff routinely produces
-binary patches 50-80% smaller than those produced by Xdelta, and 15% smaller
-than those produced by .RTPatch (a $2750/seat commercial patch tool).
+bsdiff and bspatch are tools for building and applying patches to
+binary files. By using suffix sorting (specifically, Larsson and
+Sadakane's qsufsort) and taking advantage of how executable files
+change, bsdiff routinely produces binary patches 50-80% smaller than
+those produced by Xdelta, and 15% smaller than those produced by
+.RTPatch (a $2750/seat commercial patch tool).
 
-These programs were originally named bdiff and bpatch, but the large number of
-other programs using those names lead to confusion; I'm not sure if the "bs"
-in refers to "binary software" (because bsdiff produces exceptionally small
-patches for executable files) or "bytewise subtraction" (which is the key to
-how well it performs). Feel free to offer other suggestions.
+These programs were originally named bdiff and bpatch, but
+the large number of other programs using those names lead to
+confusion; I'm not sure if the "bs" in refers to "binary software"
+(because bsdiff produces exceptionally small patches for executable
+files) or "bytewise subtraction" (which is the key to how well it
+performs). Feel free to offer other suggestions.
 
-bsdiff is quite memory-hungry. It requires max(17*n,9*n+m)+O(1)  bytes of
-memory, where n is the size of the old file and m  is the size of the new
-file. bspatch requires n+m+O(1) bytes.
+bsdiff is quite memory-hungry. It requires max(17*n,9*n+m)+O(1) bytes
+of memory, where n is the size of the old file and m is the size of
+the new file. bspatch requires n+m+O(1) bytes.
 
-bsdiff runs in O((n+m) log n) time; on a 200MHz Pentium Pro, building a binary
-patch for a 4MB file takes about 90 seconds. bspatch runs in O(n+m) time; on
-the same machine, applying that patch takes about two seconds.
+bsdiff runs in O((n+m) log n) time; on a 200MHz Pentium Pro, building
+a binary patch for a 4MB file takes about 90 seconds. bspatch runs in
+O(n+m) time; on the same machine, applying that patch takes about two
+seconds.
 
-Providing that off_t is defined properly, bsdiff and bspatch support files of
-up to 2^61-1 = 2Ei-1 bytes.
+Providing that off_t is defined properly, bsdiff and bspatch support
+files of up to 2^61-1 = 2Ei-1 bytes.
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 bdb5afe50f..2e4493bf3f 100644
--- a/development/byacc/byacc.SlackBuild
+++ b/development/byacc/byacc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for byacc
 
-# Copyright 2015-2019 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:-20191125}
+VERSION=${VERSION:-20210328}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/byacc/byacc.info b/development/byacc/byacc.info
index c0eac38c24..2e553f5cd3 100644
--- a/development/byacc/byacc.info
+++ b/development/byacc/byacc.info
@@ -1,8 +1,8 @@
 PRGNAM="byacc"
-VERSION="20191125"
+VERSION="20210328"
 HOMEPAGE="http://invisible-island.net/byacc/"
 DOWNLOAD="http://invisible-island.net/datafiles/release/byacc.tar.gz"
-MD5SUM="6745a4fbf0723c4c9280fc3e568b3d1b"
+MD5SUM="a31940c74254f6b4cc51155322f58651"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/cargo-vendor/README b/development/cargo-vendor/README
deleted file mode 100644
index 51b8ca81ee..0000000000
--- a/development/cargo-vendor/README
+++ /dev/null
@@ -1,6 +0,0 @@
-cargo-vendor - Cargo subcommand to vendor crates.io dependencies
-
-This is a Cargo subcommand which vendors all crates.io dependencies into a
-local directory using Cargo's support for source replacement.
-
-cargo-vendor is helpful for packaging applications which use cargo (rust).
diff --git a/development/cargo-vendor/cargo-vendor.SlackBuild b/development/cargo-vendor/cargo-vendor.SlackBuild
deleted file mode 100644
index eaf37417e1..0000000000
--- a/development/cargo-vendor/cargo-vendor.SlackBuild
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for cargo-vendor
-
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
-# 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=cargo-vendor
-VERSION=${VERSION:-0.1.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
-
-  if [ "$ARCH" = "i586" ]; then
-    if rustc -Vv | grep host | grep i686 > /dev/null ; then
-      ARCH=i686
-    fi
-  fi
-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=""
-  CARGOTARGET="--target i586-unknown-linux-gnu"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  CARGOTARGET="--target i686-unknown-linux-gnu"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  CARGOTARGET="--target x86_64-unknown-linux-gnu"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-  CARGOTARGET=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-src-$VERSION
-tar xvf $CWD/$PRGNAM-src-$VERSION.tar.gz
-cd $PRGNAM-src-$VERSION
-
-# build offline
-# configuration tells cargo to use the configured directory
-# for dependencies intead of downloading from crates.io
-mkdir .cargo
-cat << EOF >> .cargo/config
-[source.crates-io]
-registry = 'https://github.com/rust-lang/crates.io-index'
-replace-with = 'vendored-sources'
-
-[source.vendored-sources]
-directory = '$(pwd)/vendor'
-EOF
-
-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 case "$ARCH" in i?86) true ;; *) false ;; esac ; then
-  # error: failed to run custom build command for `openssl-sys v0.9.17`
-  # process didn't exit successfully: `/tmp/SBo/cargo-vendor-0.1.12/target/release/build/openssl-sys-1001b6424b340fb9/build-script-build` (exit code: 101)
-  # --- stdout
-  # cargo:rerun-if-env-changed=OPENSSL_LIB_DIR
-  # cargo:rerun-if-env-changed=OPENSSL_INCLUDE_DIR
-  # cargo:rerun-if-env-changed=OPENSSL_DIR
-  # run pkg_config fail: "Cross compilation detected. Use PKG_CONFIG_ALLOW_CROSS=1 to override"
-  export PKG_CONFIG_ALLOW_CROSS=1
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-cargo build --release $CARGOTARGET
-
-mkdir -p $PKG/usr/bin/
-
-find target -name cargo-vendor -exec install -m 755 {} $PKG/usr/bin/cargo-vendor \;
-
-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-APACHE 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
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/cargo-vendor/cargo-vendor.info b/development/cargo-vendor/cargo-vendor.info
deleted file mode 100644
index c922e9cc31..0000000000
--- a/development/cargo-vendor/cargo-vendor.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="cargo-vendor"
-VERSION="0.1.23"
-HOMEPAGE="https://github.com/alexcrichton/cargo-vendor"
-DOWNLOAD="https://github.com/alexcrichton/cargo-vendor/releases/download/0.1.23/cargo-vendor-src-0.1.23.tar.gz"
-MD5SUM="4c35b8f917b42c6fc600292d9779a84c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/development/cargo-vendor/slack-desc b/development/cargo-vendor/slack-desc
deleted file mode 100644
index 46ef9dc5c9..0000000000
--- a/development/cargo-vendor/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------------------------------------------------------|
-cargo-vendor: cargo-vendor (Cargo subcommand to vendor crates.io dependencies)
-cargo-vendor:
-cargo-vendor: This is a Cargo subcommand which vendors all crates.io dependencies
-cargo-vendor: into a local directory using Cargo's support for source replacement.
-cargo-vendor:
-cargo-vendor: https://github.com/alexcrichton/cargo-vendor
-cargo-vendor:
-cargo-vendor:
-cargo-vendor:
-cargo-vendor:
-cargo-vendor:
diff --git a/development/cc65/README b/development/cc65/README
index 9c046f4d84..25ceacb8dd 100644
--- a/development/cc65/README
+++ b/development/cc65/README
@@ -4,10 +4,12 @@ cc65 is a complete cross development package for 65(C)02 systems,
 including a powerful macro assembler, a C compiler, linker, librarian
 and several other tools.
 
-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.
+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 8086be58f3..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="http://urchlay.naptime.net/~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/ccl/README b/development/ccl/README
index a7af48bb2f..748a6af28d 100644
--- a/development/ccl/README
+++ b/development/ccl/README
@@ -19,4 +19,4 @@ applications to use low-memory addresses.  For details see
 http://trac.clozure.com/ccl/wiki/PlatformNotes
 
 To make ccl usable before a reboot, execute the command below;
-# /sbin/sysctl vm.mmap_min_addr=4096
\ No newline at end of file
+# /sbin/sysctl vm.mmap_min_addr=4096
diff --git a/development/cf-cli/README b/development/cf-cli/README
index d03f7ad042..d143b87ebe 100644
--- a/development/cf-cli/README
+++ b/development/cf-cli/README
@@ -3,4 +3,5 @@ cf-cli (Cloud Foundry command-line interface)
 The cf CLI is the official command line client for Cloud Foundry.
 
 Cloud Foundry is an open-source cloud platform that lets anyone deploy
-network apps or services and make them available to the world in a few minutes.
+network apps or services and make them available to the world in a few
+minutes.
diff --git a/development/cf-cli/cf-cli.SlackBuild b/development/cf-cli/cf-cli.SlackBuild
index 863c43a9b5..574548bc8e 100644
--- a/development/cf-cli/cf-cli.SlackBuild
+++ b/development/cf-cli/cf-cli.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 BIN=cf
-PRGNAM=$BIN-cli
-VERSION=${VERSION:-6.50.0}
+PRGNAM=cf-cli
+VERSION=${VERSION:-7.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,10 +46,11 @@ if [ "$ARCH" = "i486" ]; then
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  mv $CWD/${BIN}7-cli\_$VERSION\_linux\_$ARCH.tgz $CWD/$PRGNAM\_$VERSION\_linux\_$ARCH.tgz
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  mv $CWD/$PRGNAM\_$VERSION\_linux\_x86-64.tgz $CWD/$PRGNAM\_$VERSION\_linux\_$ARCH.tgz
+  mv $CWD/${BIN}7-cli\_$VERSION\_linux\_x86-64.tgz $CWD/$PRGNAM\_$VERSION\_linux\_$ARCH.tgz
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -71,10 +72,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 {} \;
 
+mv ${BIN}7 $PKG/usr/bin/.
 mv $BIN $PKG/usr/bin/.
 
 find -L $PKG -type d -exec chmod 755 {} \;
-chmod 755 $PKG/usr/bin/*
+chmod 755 $PKG/usr/bin/${BIN}7
+chmod 755 $PKG/usr/bin/$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/development/cf-cli/cf-cli.info b/development/cf-cli/cf-cli.info
index d100f28e46..74c32a232c 100644
--- a/development/cf-cli/cf-cli.info
+++ b/development/cf-cli/cf-cli.info
@@ -1,10 +1,10 @@
 PRGNAM="cf-cli"
-VERSION="6.50.0"
+VERSION="7.1.0"
 HOMEPAGE="https://docs.cloudfoundry.org/cf-cli"
-DOWNLOAD="https://s3-us-west-1.amazonaws.com/cf-cli-releases/releases/v6.50.0/cf-cli_6.50.0_linux_i686.tgz"
-MD5SUM="ece120a4ac7aef7bbbded7b9b48ef5a5"
-DOWNLOAD_x86_64="https://s3-us-west-1.amazonaws.com/cf-cli-releases/releases/v6.50.0/cf-cli_6.50.0_linux_x86-64.tgz"
-MD5SUM_x86_64="e4afd63ebcf24d8219641ca223665740"
+DOWNLOAD="https://s3-us-west-1.amazonaws.com/v7-cf-cli-releases/releases/v7.1.0/cf7-cli_7.1.0_linux_i686.tgz"
+MD5SUM="7a04d791161f6cd5e8565dae64f8ef6c"
+DOWNLOAD_x86_64="https://s3-us-west-1.amazonaws.com/v7-cf-cli-releases/releases/v7.1.0/cf7-cli_7.1.0_linux_x86-64.tgz"
+MD5SUM_x86_64="05b5a4e37f347556be97444e27ad01ac"
 REQUIRES=""
 MAINTAINER="Dmitrii Sosedov"
 EMAIL="d.sosedov@gmail.com"
diff --git a/development/cf-cli/slack-desc b/development/cf-cli/slack-desc
index 93fbff0d9e..6c3425b673 100644
--- a/development/cf-cli/slack-desc
+++ b/development/cf-cli/slack-desc
@@ -15,5 +15,5 @@ cf-cli: deploy network apps or services and make them available to the world
 cf-cli: in a few minutes.
 cf-cli:
 cf-cli: Homepage: https://docs.cloudfoundry.org/cf-cli
-cf-cli: Release date: Mar 3, 2020
+cf-cli: Release date: Sep 9, 2020
 cf-cli:
diff --git a/development/cgdb/README b/development/cgdb/README
index 4a84d18a93..35585fa2f5 100644
--- a/development/cgdb/README
+++ b/development/cgdb/README
@@ -1,7 +1,9 @@
-CGDB is a curses (terminal-based) interface to the GNU Debugger (GDB). Its goal
-is to be lightweight and responsive; not encumbered with unnecessary features.
+CGDB is a curses (terminal-based) interface to the GNU Debugger
+(GDB). Its goal is to be lightweight and responsive; not encumbered
+with unnecessary features.
 
-The primary feature of CGDB is the constant presence of a source display, 
-updated as the program executes, to help keep you focused while debugging. 
-The interface is inspired by the classic Unix text editor, vi. Those familiar 
-with vi (or vim) should feel right at home using CGDB.
+The primary feature of CGDB is the constant presence of a source
+display, updated as the program executes, to help keep you focused
+while debugging.  The interface is inspired by the classic Unix text
+editor, vi. Those familiar with vi (or vim) should feel right at home
+using CGDB.
diff --git a/development/cgit/cgit.SlackBuild b/development/cgit/cgit.SlackBuild
index 040717424f..8d01a98c50 100644
--- a/development/cgit/cgit.SlackBuild
+++ b/development/cgit/cgit.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cgit
-VERSION=${VERSION:-1.2.2}
+VERSION=${VERSION:-1.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,7 +56,7 @@ else
 fi
 
 CGIT_VERSION=${CGIT_VERSION:-v$VERSION}
-GIT_VERSION=${GIT_VERSION:-2.25.0}
+GIT_VERSION=${GIT_VERSION:-2.26.2}
 
 DOCS="cgitrc.5.txt COPYING README $CWD/config/cgitrc.sample \
       $CWD/config/cgit-lighttpd.conf $CWD/config/cgit-httpd.conf \
diff --git a/development/cgit/cgit.info b/development/cgit/cgit.info
index 2df4246bf0..1c624026b9 100644
--- a/development/cgit/cgit.info
+++ b/development/cgit/cgit.info
@@ -1,10 +1,10 @@
 PRGNAM="cgit"
-VERSION="1.2.2"
+VERSION="1.2.3"
 HOMEPAGE="https://git.zx2c4.com/cgit/about/"
-DOWNLOAD="https://git.zx2c4.com/cgit/snapshot/cgit-1.2.2.tar.xz \
-          https://www.kernel.org/pub/software/scm/git/git-2.25.0.tar.xz"
-MD5SUM="0b7b5e1a84faee046014706e18740be5 \
-        eab5cdee7c478c0804346d8835e314c9"
+DOWNLOAD="https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz \
+          https://www.kernel.org/pub/software/scm/git/git-2.26.2.tar.xz"
+MD5SUM="2d44ca575a8770fae48139c18dac6986 \
+        f9a832256032e711973dd7be4981ab4c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/cgit/config/cgit-httpd.conf b/development/cgit/config/cgit-httpd.conf
index 4d713503be..4b757ea049 100644
--- a/development/cgit/config/cgit-httpd.conf
+++ b/development/cgit/config/cgit-httpd.conf
@@ -1,43 +1,62 @@
-# sample folder and virtual host configurations for httpd.
+# Sample folder and virtual host configurations for httpd.
 # edit, move it to /etc/httpd/extra and include it in
 # /etc/httpd/httpd.conf with a line
 #
-# Include /etc/httpd/extra/cgit-httpd.conf
+# Include /etc/httpd/extra/cgit.conf
 #
 # uncomment also the line
 #
 # AddHandler cgi-script .cgi
+#
+# and enable mod_cgi (or mod_cgid, depending on your apache
+# configuration)
+
+## Version 1: cgit in a /cgit subdirectory of the main host
+## This will need the following 3 lines in your /etc/cgitrc
+##
+## virtual-root=/cgit/
+## css=/static/cgit.css
+## logo=/static/cgit.png
+##
+#Alias /static/cgit.css "@DOCROOT@/cgi-bin/cgit.css"
+#Alias /static/cgit.png "@DOCROOT@/cgi-bin/cgit.png"
+#ScriptAlias /cgit/ "@DOCROOT@/cgi-bin/cgit.cgi/"
+#RedirectMatch ^/cgit$ /cgit/
+#<Directory "@DOCROOT@/cgi-bin/">
+#   AllowOverride None
+#   Options ExecCGI FollowSymlinks
+#   Require all granted
+#</Directory>
 
-<Directory @DOCROOT@/cgi-bin>
-    AllowOverride None
-    Require all granted
-</Directory>
-
-## Version 1 (default): under /cgi-bin/cgit.cgi address
-#ScriptAlias /cgi-bin/cgit.cgi @DOCROOT@/cgi-bin/cgit.cgi
-#Alias /cgit/ @DOCROOT@/cgi-bin/
-#<Location /cgit/cgit.cgi>
-#    Options FollowSymlinks ExecCGI
-#    Require all granted
-#</Location>
-#RewriteEngine on
-#RewriteCond %{REQUEST_FILENAME} !-f
-#RewriteCond %{REQUEST_FILENAME} !-d
-#RewriteRule ^/cgit/(.*)$ /cgit/cgit.cgi?url=$1 [L,QSA]
-
-# Version 2: cgit as a handler to whole vhost:
+# Version 2: cgit as a handler to whole vhost
+# Thanks to Robby Workman for this elegant example
 <VirtualHost *:80>
-     ServerName cgit.my.domain
+     ServerName cgit.yourdomain.ltd
+     
+     Options FollowSymlinks
+
      SetEnv CGIT_CONFIG /etc/cgitrc
-     Options FollowSymlinks ExecCGI
-     DirectoryIndex cgit.cgi
+
      DocumentRoot @DOCROOT@/cgi-bin
+
+     <Directory @DOCROOT@/cgi-bin>
+          AllowOverride None
+          Require all granted
+          DirectoryIndex cgit.cgi
+     </Directory>
+
+     Alias /cgit.css @DOCROOT@/cgi-bin/cgit.css
+     Alias /cgit.png @DOCROOT@/cgi-bin/cgit.png
+     Alias /favicon.ico @DOCROOT@/cgi-bin/favicon.ico
+     Alias /robots.txt @DOCROOT@/cgi-bin/robots.txt
+     Alias / @DOCROOT@/cgi-bin/cgit.cgi/
+
      <Location />
           Options ExecCGI
           Require all granted
      </Location>
-     RewriteEngine on
-     RewriteCond %{REQUEST_FILENAME} !-f
-     RewriteCond %{REQUEST_FILENAME} !-d
-     RewriteRule ^(.*)$ /cgit.cgi?url=$1 [L,QSA]
+
+     <Files cgit.cgi>
+          SetHandler cgi-script
+     </Files>
 </VirtualHost>
diff --git a/development/cgit/config/cgitrc.sample b/development/cgit/config/cgitrc.sample
index cd23168d04..31d7708333 100644
--- a/development/cgit/config/cgitrc.sample
+++ b/development/cgit/config/cgitrc.sample
@@ -8,11 +8,13 @@ virtual-root=/
 snapshots=tar.gz
 branch-sort=age
 # for this to work you have to build cgit against lua
-# and install luacrypto too
+# and install luacrypto too.
+# you wull have also to add email-gravatar-sbo-additions.css
+# at the bottom of your installed cgit.css
 email-filter=lua:/usr/share/cgit/filters/email-gravatar-sbo.lua
 
-#css=/static/cgit.css
-#logo=/static/cgit.png
+#css=/cgit.css
+#logo=/cgit.png
 
 # repository specific data
 repo.url=slackbuilds
diff --git a/development/check/README b/development/check/README
index 62590662e5..747690696b 100644
--- a/development/check/README
+++ b/development/check/README
@@ -1,7 +1,8 @@
-Check is a unit test framework for C.  It features a simple interface for
-defining unit tests, putting little in the way of the developer.  Tests are
-run in a separate address space, so Check can catch both assertion failures
-and code errors that cause segmentation faults or other signals.  The output
-from unit tests can be used within source code editors and IDEs.
+Check is a unit test framework for C.  It features a simple interface
+for defining unit tests, putting little in the way of the developer.
+Tests are run in a separate address space, so Check can catch both
+assertion failures and code errors that cause segmentation faults or
+other signals.  The output from unit tests can be used within source
+code editors and IDEs.
 
 See the project's home page for more information, including a tutorial.
diff --git a/development/check/check.SlackBuild b/development/check/check.SlackBuild
index 8bca239852..ea8d7b0495 100644
--- a/development/check/check.SlackBuild
+++ b/development/check/check.SlackBuild
@@ -25,7 +25,7 @@
 # Modified by Eugene M., <damagedone at gmx dot com>
 
 PRGNAM=check
-VERSION=${VERSION:-0.14.0}
+VERSION=${VERSION:-0.15.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,6 +78,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
@@ -89,8 +91,9 @@ 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
 
-rm -f $PKG/usr/info/dir
-rm -rf $PKG/usr/share/doc
+rm -rf $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+rm -rf $PKG/usr/share/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL NEWS README THANKS TODO \
diff --git a/development/check/check.info b/development/check/check.info
index f5fd97b835..71e1e8222b 100644
--- a/development/check/check.info
+++ b/development/check/check.info
@@ -1,8 +1,8 @@
 PRGNAM="check"
-VERSION="0.14.0"
+VERSION="0.15.2"
 HOMEPAGE="https://libcheck.github.io/check/"
-DOWNLOAD="https://github.com/libcheck/check/releases/download/0.14.0/check-0.14.0.tar.gz"
-MD5SUM="270e82a445be6026040267a5e11cc94b"
+DOWNLOAD="https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz"
+MD5SUM="50fcafcecde5a380415b12e9c574e0b2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/chibi-scheme/README b/development/chibi-scheme/README
index 09e3f6c736..ba088ff07d 100644
--- a/development/chibi-scheme/README
+++ b/development/chibi-scheme/README
@@ -1,14 +1,14 @@
 Minimal Scheme Implementation for use as an Extension Language
 
-Chibi-Scheme is a very small library intended for use as an extension and
-scripting language in C programs. In addition to support for lightweight
-VM-based threads, each VM itself runs in an isolated heap allowing multiple
-VMs to run simultaneously in different OS threads.
+Chibi-Scheme is a very small library intended for use as an extension
+and scripting language in C programs. In addition to support for
+lightweight VM-based threads, each VM itself runs in an isolated heap
+allowing multiple VMs to run simultaneously in different OS threads.
 
-The default repl language contains all bindings from R7RS small, available
-explicitly as the (scheme small) library. The language is built in layers,
-however - see the manual for instructions on compiling with fewer features or
-requesting a smaller language on startup.
+The default repl language contains all bindings from R7RS small,
+available explicitly as the (scheme small) library. The language is
+built in layers, however - see the manual for instructions on compiling
+with fewer features or requesting a smaller language on startup.
 
-Chibi-Scheme is known to work on 32 and 64-bit Linux, FreeBSD and OS X, Plan
-9, Windows (using Cygwin), iOS, Android, ARM and Emscripten.
+Chibi-Scheme is known to work on 32 and 64-bit Linux, FreeBSD and OS X,
+Plan 9, Windows (using Cygwin), iOS, Android, ARM and Emscripten.
diff --git a/development/chibi-scheme/chibi-scheme.SlackBuild b/development/chibi-scheme/chibi-scheme.SlackBuild
index a9ab5dee53..e93576733d 100644
--- a/development/chibi-scheme/chibi-scheme.SlackBuild
+++ b/development/chibi-scheme/chibi-scheme.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for chibi-scheme
 
-# Copyright 2018 Erik Falor, Utah, USA
+# Copyright 2020 Erik Falor, Utah, 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='chibi-scheme'
-VERSION=${VERSION:-0.8}
+VERSION=${VERSION:-0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/chibi-scheme/chibi-scheme.info b/development/chibi-scheme/chibi-scheme.info
index b66a9484f6..44312c1f6a 100644
--- a/development/chibi-scheme/chibi-scheme.info
+++ b/development/chibi-scheme/chibi-scheme.info
@@ -1,8 +1,8 @@
 PRGNAM="chibi-scheme"
-VERSION="0.8"
+VERSION="0.9"
 HOMEPAGE="https://github.com/ashinn/chibi-scheme"
-DOWNLOAD="https://github.com/ashinn/chibi-scheme/archive/0.8/chibi-scheme-0.8.tar.gz"
-MD5SUM="67b913d446a75360ea9076222b1a15ba"
+DOWNLOAD="https://github.com/ashinn/chibi-scheme/archive/0.9/chibi-scheme-0.9.tar.gz"
+MD5SUM="7b29119e96f2290449347cc8f4be69f4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/cloc/README b/development/cloc/README
index 33fca87e42..e2722e5114 100644
--- a/development/cloc/README
+++ b/development/cloc/README
@@ -1,4 +1,4 @@
 cloc (Count Lines of Code)
 
-cloc counts blank lines, comment lines, and physical lines of source code
-in many programming languages.
+cloc counts blank lines, comment lines, and physical lines of source
+code in many programming languages.
diff --git a/development/cloc/cloc.SlackBuild b/development/cloc/cloc.SlackBuild
index d5e09ad7d2..2e559dbd98 100644
--- a/development/cloc/cloc.SlackBuild
+++ b/development/cloc/cloc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cloc
 
-# Copyright 2017-2019  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2020  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=cloc
-VERSION=${VERSION:-1.84}
+VERSION=${VERSION:-1.88}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/cloc/cloc.info b/development/cloc/cloc.info
index 13bec19f78..19a14f4331 100644
--- a/development/cloc/cloc.info
+++ b/development/cloc/cloc.info
@@ -1,8 +1,8 @@
 PRGNAM="cloc"
-VERSION="1.84"
+VERSION="1.88"
 HOMEPAGE="https://github.com/AlDanial/cloc/"
-DOWNLOAD="https://github.com/AlDanial/cloc/archive/1.84/cloc-1.84.tar.gz"
-MD5SUM="cc861ae7ca86dcb48f58995beb2a5703"
+DOWNLOAD="https://github.com/AlDanial/cloc/archive/1.88/cloc-1.88.tar.gz"
+MD5SUM="659fb28c7ca7f65fd5e38e8ff517442e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Algorithm-Diff perl-Regexp-Common perl-parallel-forkmanager"
diff --git a/development/cmake-202x/README b/development/cmake-202x/README
new file mode 100644
index 0000000000..824be89155
--- /dev/null
+++ b/development/cmake-202x/README
@@ -0,0 +1,14 @@
+cmake-202x (cross-platform, open-source make system)
+
+CMake is used to control the software process using simple platform
+and compiler independent configuration files. CMake generates
+native makefiles and workspaces that can be used in the
+compiler environment of your choice.
+
+This version of cmake is much newer than the version included in
+Slackware 14.2. It installs to /opt, so it won't conflict with the
+OS-provided cmake package.
+
+See README_SBo.txt for directions on using this version of cmake with
+your own SlackBuild scripts, or to develop/maintain software that
+needs a newer cmake.
diff --git a/development/cmake-202x/README_SBo.txt b/development/cmake-202x/README_SBo.txt
new file mode 100644
index 0000000000..e1531c1172
--- /dev/null
+++ b/development/cmake-202x/README_SBo.txt
@@ -0,0 +1,35 @@
+The main purpose for cmake-202x is to allow SlackBuild scripts to
+build software that needs a cmake newer than the version that ships
+with Slackware 14.2.
+
+If you're writing a new SlackBuild or updating an old one, and you're
+using cmake.template, but you get an error complaining that CMake is
+too old, here's how to use this:
+
+1. Change the "cmake" command in your SlackBuild to
+   /opt/cmake-202x/bin/cmake. In context, it will look like:
+
+   mkdir -p build
+   cd build
+     export "PATH=/opt/cmake-202x/bin:$PATH"
+     cmake \
+       -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+       -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+   ...etc, etc.
+
+2. Add cmake-202x to the REQUIRES in your .info file.
+
+That's it. Your SlackBuild shouldn't need any other changes. If you
+want to look at a complete SlackBuild script that uses cmake-202x,
+see academic/bibletime.
+
+Note: If you're using cmake interactively (developing software outside
+the context of SlackBuild scripts), there are a couple of things you
+might want to add to your .bash_profile to make things smoother:
+
+  export PATH=/opt/cmake-202x/bin:$PATH
+  export MANPATH=/opt/cmake-202x/man:$MANPATH
+
+Then when you type "cmake", you'll get the new version. Also "man
+cmake" will show the man page for the new version. You *don't* need
+this stuff in a SlackBuild script!
diff --git a/development/cmake-202x/cmake-202x.SlackBuild b/development/cmake-202x/cmake-202x.SlackBuild
new file mode 100644
index 0000000000..fdc060f793
--- /dev/null
+++ b/development/cmake-202x/cmake-202x.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+############################################################
+# NOTE: Remove this from the repo when 15.0 ships!         #
+# Also remove cmake-202x from REQUIRES in all .info files! #
+############################################################
+
+# Slackware build script for cmake-202x
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# This build exists because the cmake in Slackware 14.2 is too old,
+# and can't be upgraded. This installs cmake under /opt, where it
+# won't conflict with anything. README explains how to use it in your
+# SlackBuild.
+
+# cmake.manpages.tar.lz comes from Slackware, courtesy of Pat V. Since
+# 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.19.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 $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 {} \+
+
+PREFIX=${PREFIX:-/opt/$PRGNAM}
+PKGPREFIX=$PKG/$PREFIX
+
+# The --system-* and --no-system-* stuff is intended to use system
+# versions of libraries that ship with core Slackware, and bundled
+# (non-system) libs for everything that isn't in core, *even* if
+# it's available on SBo. This will prevent SBo upgrades from randomly
+# breaking things.
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./bootstrap \
+  --system-curl \
+  --system-expat \
+  --no-system-jsoncpp \
+  --system-zlib \
+  --system-bzip2 \
+  --system-liblzma \
+  --no-system-nghttp2 \
+  --no-system-zstd \
+  --system-libarchive \
+  --no-system-librhash \
+  --no-system-libuv \
+  --prefix=$PREFIX
+
+make
+make install/strip DESTDIR=$PKG
+
+# To avoid a dependency on Sphinx (which has *26 dependencies* of its own),
+# use Pat's prebuilt man pages.
+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?/*.?
+
+# Nothing in the doc dir but licenses. Move it to where users expect
+# to find it.
+mkdir -p $PKG/usr/doc
+mv $PKGPREFIX/doc/$SRCNAM-* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKGPREFIX/doc
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README_SBo.txt > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
+
+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/cmake-202x/cmake-202x.info b/development/cmake-202x/cmake-202x.info
new file mode 100644
index 0000000000..46a74f7389
--- /dev/null
+++ b/development/cmake-202x/cmake-202x.info
@@ -0,0 +1,12 @@
+PRGNAM="cmake-202x"
+VERSION="3.19.6"
+HOMEPAGE="https://cmake.org/"
+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=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/cmake-202x/slack-desc b/development/cmake-202x/slack-desc
new file mode 100644
index 0000000000..fe365b638b
--- /dev/null
+++ b/development/cmake-202x/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------------------------------------------------------|
+cmake-202x: cmake-202x (cross-platform, open-source make system)
+cmake-202x:
+cmake-202x: CMake is used to control the software process using simple platform
+cmake-202x: and compiler independent configuration files. CMake generates
+cmake-202x: native makefiles and workspaces that can be used in the
+cmake-202x: compiler environment of your choice.
+cmake-202x:
+cmake-202x: This version of cmake is much newer than the version included in
+cmake-202x: Slackware 14.2. It installs to /opt, so it won't conflict with the
+cmake-202x: OS-provided cmake package.
+cmake-202x:
diff --git a/development/cmocka/cmocka.SlackBuild b/development/cmocka/cmocka.SlackBuild
index 9696e5e988..e5366a71bd 100644
--- a/development/cmocka/cmocka.SlackBuild
+++ b/development/cmocka/cmocka.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cmocka
 
-# Copyright 2014 Manuel Argüelles
+# Copyright 2020, Manuel Argüelles, Panamá City, Panamá
 # 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=cmocka
-VERSION=${VERSION:-1.1.3}
+VERSION=${VERSION:-1.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/cmocka/cmocka.info b/development/cmocka/cmocka.info
index b39065ce71..a9e312cb0a 100644
--- a/development/cmocka/cmocka.info
+++ b/development/cmocka/cmocka.info
@@ -1,8 +1,8 @@
 PRGNAM="cmocka"
-VERSION="1.1.3"
+VERSION="1.1.5"
 HOMEPAGE="https://cmocka.org/"
-DOWNLOAD="https://cmocka.org/files/1.1/cmocka-1.1.3.tar.xz"
-MD5SUM="789b927cf2cefa613eb9a3cb4b1858fa"
+DOWNLOAD="https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz"
+MD5SUM="91f95cd5db88b9b120d191b18d367193"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/codeblocks/README b/development/codeblocks/README
index 8ccc933ab5..11da1dea51 100644
--- a/development/codeblocks/README
+++ b/development/codeblocks/README
@@ -4,14 +4,14 @@ fully configurable. Finally, an IDE with all the features you need,
 having a consistent look, feel and operation across platforms.
 
 Built around a plugin framework, Code::Blocks can be extended with
-plugins. Any kind of functionality can be added by installing/coding
-a plugin. For instance, compiling and debugging functionality is already
+plugins. Any kind of functionality can be added by installing/coding a
+plugin. For instance, compiling and debugging functionality is already
 provided by plugins!
 
 N.B:
-a) The path for codeblocks plugins is now /usr/lib{,64}/codeblocks/plugins.
+a) The path for plugins is now /usr/lib{,64}/codeblocks/plugins.
    Take care if upgrading from a previous version and you have already
    installed additional plugins (you might need to reinstall them).
-b) All contrib-plugins are disabled by default. Please invoke the script with
+b) All contrib-plugins are disabled by default. Invoke the script with
       $ PLUGINS=yes ./codeblocks.SlackBuild
    in order to enable all contrib-plugins in your build.
diff --git a/development/codeblocks/codeblocks.SlackBuild b/development/codeblocks/codeblocks.SlackBuild
index fc0adcd9cf..2aca276704 100644
--- a/development/codeblocks/codeblocks.SlackBuild
+++ b/development/codeblocks/codeblocks.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for codeblocks
 
-# Copyright 2018 Antonio Leal Lisbon, Portugal
+# Copyright 2020 Antonio Leal Lisbon, Portugal
 # 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=codeblocks
-VERSION=${VERSION:-17.12}
+VERSION=${VERSION:-20.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION.release
-tar xvf $CWD/$PRGNAM\_$VERSION.tar.xz
+tar xJf $CWD/$PRGNAM\-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/development/codeblocks/codeblocks.info b/development/codeblocks/codeblocks.info
index 999830858e..9017ef212b 100644
--- a/development/codeblocks/codeblocks.info
+++ b/development/codeblocks/codeblocks.info
@@ -1,10 +1,10 @@
 PRGNAM="codeblocks"
-VERSION="17.12"
+VERSION="20.03"
 HOMEPAGE="http://www.codeblocks.org/"
-DOWNLOAD="https://downloads.sourceforge.net/project/codeblocks/Sources/17.12/codeblocks_17.12.tar.xz"
-MD5SUM="e7fb4fcf099fffe944b48af113944a81"
+DOWNLOAD="http://sourceforge.net/projects/codeblocks/files/Sources/20.03/codeblocks-20.03.tar.xz"
+MD5SUM="1b7ad8f346a4d2bdb51e983075731947"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxPython"
+REQUIRES="wxGTK3"
 MAINTAINER="antonioleal"
 EMAIL="antonioleal@yahoo.com"
diff --git a/development/codelite/codelite.SlackBuild b/development/codelite/codelite.SlackBuild
index 9276d43317..984450a374 100644
--- a/development/codelite/codelite.SlackBuild
+++ b/development/codelite/codelite.SlackBuild
@@ -5,13 +5,13 @@
 # Written by Wainamoinen <wainamoinen@gmail.com>
 
 PRGNAM=codelite
-VERSION=${VERSION:-13.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-15.0}
+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 +22,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"
@@ -42,7 +42,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/${VERSION}.tar.gz
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz
 cd $PRGNAM-${VERSION}
 chown -R root:root .
 find -L . \
diff --git a/development/codelite/codelite.info b/development/codelite/codelite.info
index aaa262d09b..c01b8a1ba5 100644
--- a/development/codelite/codelite.info
+++ b/development/codelite/codelite.info
@@ -1,8 +1,8 @@
 PRGNAM="codelite"
-VERSION="13.0"
+VERSION="15.0"
 HOMEPAGE="http://www.codelite.org/"
-DOWNLOAD="https://github.com/eranif/codelite/archive/13.0.tar.gz"
-MD5SUM="2f5251a0b5d6e1bc0d1bdc6ea7aa830b"
+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/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.SlackBuild b/development/colordiff/colordiff.SlackBuild
index 5b2d031aaf..4bd46a5bd2 100644
--- a/development/colordiff/colordiff.SlackBuild
+++ b/development/colordiff/colordiff.SlackBuild
@@ -25,7 +25,7 @@
 # not, see <http://www.gnu.org/licenses/>.
 
 PRGNAM=colordiff
-VERSION=${VERSION:-1.0.18}
+VERSION=${VERSION:-1.0.19}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -55,6 +55,7 @@ install -m 644 colordiffrc $PKG/etc/colordiffrc.new
 install -m 755 colordiff.pl $PKG/usr/bin/colordiff
 install -m 755 cdiff.sh $PKG/usr/bin/cdiff
 gzip -9c colordiff.1 > $PKG/usr/man/man1/colordiff.1.gz
+gzip -9c cdiff.1 > $PKG/usr/man/man1/cdiff.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a BUGS CHANGES COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/colordiff/colordiff.info b/development/colordiff/colordiff.info
index d7c9e2b1a7..9e1e849744 100644
--- a/development/colordiff/colordiff.info
+++ b/development/colordiff/colordiff.info
@@ -1,10 +1,10 @@
 PRGNAM="colordiff"
-VERSION="1.0.18"
+VERSION="1.0.19"
 HOMEPAGE="https://www.colordiff.org/"
-DOWNLOAD="https://www.colordiff.org/colordiff-1.0.18.tar.gz"
-MD5SUM="07658f09a44f30a3b5c1cea9c132baed"
+DOWNLOAD="https://www.colordiff.org/colordiff-1.0.19.tar.gz"
+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/complexity/README b/development/complexity/README
index 8bc8a7b261..492fcd062a 100644
--- a/development/complexity/README
+++ b/development/complexity/README
@@ -6,6 +6,6 @@ Complexity scans your C source code to help you:
 * Get an idea of how much effort may be required to understand that code
 * Get an idea of the effort required to test a code base
 * Provide a reminder to yourself. You may see what you've written as
-  obvious, but others may not. It is useful to have a hint about what code may
-  seem harder to understand by others, and then decide if some rework may be in
-  order.
+  obvious, but others may not. It is useful to have a hint about what
+  code may seem harder to understand by others, and then decide if
+  some rework may be in order.
diff --git a/development/composer/composer.SlackBuild b/development/composer/composer.SlackBuild
index 8f894de6b0..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.1}
+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 84037f2877..3cfcf27e2d 100644
--- a/development/composer/composer.info
+++ b/development/composer/composer.info
@@ -1,8 +1,8 @@
 PRGNAM="composer"
-VERSION="1.10.1"
+VERSION="2.0.11"
 HOMEPAGE="https://getcomposer.org/"
-DOWNLOAD="https://getcomposer.org/download/1.10.1/composer.phar"
-MD5SUM="870f6a553ed48facfa184c8d6fe4223f"
+DOWNLOAD="https://getcomposer.org/download/2.0.11/composer.phar"
+MD5SUM="1f62c4a4b3b22762ff4c9adcfd7ca4b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/cpan2tgz/README b/development/cpan2tgz/README
index cf8955cf0a..e82068bb72 100644
--- a/development/cpan2tgz/README
+++ b/development/cpan2tgz/README
@@ -1,2 +1,3 @@
-cpan2tgz is an utility to create Slackware packages from CPAN Perl module 
-distributions. It was created by Jason Woodward, the author of slapt-get.
+cpan2tgz is an utility to create Slackware packages from CPAN Perl
+module distributions. It was created by Jason Woodward, the author of
+slapt-get.
diff --git a/development/cppcheck/README b/development/cppcheck/README
index f9741d43c0..00b1accd63 100644
--- a/development/cppcheck/README
+++ b/development/cppcheck/README
@@ -1,7 +1,7 @@
-Cppcheck is a static analysis tool for C/C++ code. Unlike C/C++ compilers
-and many other analysis tools, it doesn't detect syntax errors.  Cppcheck
-only detects the types of bugs that the compilers normally fail to detect.
-The goal is to have no false positives.
+Cppcheck is a static analysis tool for C/C++ code. Unlike C/C++
+compilers and many other analysis tools, it doesn't detect syntax
+errors.  Cppcheck only detects the types of bugs that the compilers
+normally fail to detect.  The goal is to have no false positives.
 
 To supplement Cppcheck, it is recommended that you enable as many
 compiler warnings as possible.  For the GCC compiler, take a look
diff --git a/development/cppunit/README b/development/cppunit/README
index 1b55f72a26..861144ba26 100644
--- a/development/cppunit/README
+++ b/development/cppunit/README
@@ -1,10 +1,10 @@
 CppUnit is a C++ unit testing framework.
 
-Starting with version 1.14.0, cppunit may require that your tests be compiled
-with a C++11-conforming compiler (e.g. by adding the -std=c++11 flag to g++).
-Since this is not yet the default for g++, if you intend on using cppunit with
-projects that do not yet mandate C++11, then you may want to stick with an
-older version.
+Starting with version 1.14.0, cppunit may require that your tests
+be compiled with a C++11-conforming compiler (e.g. by adding the
+-std=c++11 flag to g++).  Since this is not yet the default for g++,
+if you intend on using cppunit with projects that do not yet mandate
+C++11, then you may want to stick with an older version.
 
 graphviz is an optional dependency.  It will be used when creating the
 Doxygen documentation if found.
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/crosstool-ng/README b/development/crosstool-ng/README
index bad9b8aef9..11f5c0d75a 100644
--- a/development/crosstool-ng/README
+++ b/development/crosstool-ng/README
@@ -1,4 +1,5 @@
-crosstool-NG aims at building toolchains. Toolchains are an essential component
-in a software development project. It will compile, assemble and link the code
-that is being developed. Some pieces of the toolchain will eventually end up in
-the resulting binary/ies: static libraries are but an example.
+crosstool-NG aims at building toolchains. Toolchains are an essential
+component in a software development project. It will compile, assemble
+and link the code that is being developed. Some pieces of the toolchain
+will eventually end up in the resulting binary/ies: static libraries
+are but an example.
diff --git a/development/crystal-lang/README b/development/crystal-lang/README
new file mode 100644
index 0000000000..4d5f14564f
--- /dev/null
+++ b/development/crystal-lang/README
@@ -0,0 +1,4 @@
+Crystal
+
+Crystal is a Ruby-like statically type-checked programming language
+that compiles into efficient native code.
diff --git a/development/crystal-lang/crystal-lang.SlackBuild b/development/crystal-lang/crystal-lang.SlackBuild
new file mode 100644
index 0000000000..947ae0bb9c
--- /dev/null
+++ b/development/crystal-lang/crystal-lang.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for crystal-lang
+
+# Copyright 2020 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=crystal-lang
+BIN=crystal
+VERSION=${VERSION:-0.34.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    x86_64) ARCH=x86_64 ;;
+         *) ARCH=i686 ;;
+  esac
+fi
+
+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" = "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 $PKG/usr $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$BIN-$VERSION-$BUILD-linux-$ARCH.tar.gz
+mv $BIN-$VERSION-$BUILD $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 {} \;
+
+chmod 755 {bin,lib,share}
+
+mv {bin,lib,share} $PKG/usr/
+
+find -L $PKG -type d -exec chmod 755 {} \;
+chmod 755 $PKG/usr/{bin,lib,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
+
+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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.info > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.info
+
+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/crystal-lang/crystal-lang.info b/development/crystal-lang/crystal-lang.info
new file mode 100644
index 0000000000..6f26708672
--- /dev/null
+++ b/development/crystal-lang/crystal-lang.info
@@ -0,0 +1,10 @@
+PRGNAM="crystal-lang"
+VERSION="0.34.0"
+HOMEPAGE="https://crystal-lang.org"
+DOWNLOAD="https://github.com/crystal-lang/crystal/releases/download/0.34.0/crystal-0.34.0-1-linux-i686.tar.gz"
+MD5SUM="aea6f6377c96e7795d5581a5a1c51516"
+DOWNLOAD_x86_64="https://github.com/crystal-lang/crystal/releases/download/0.34.0/crystal-0.34.0-1-linux-x86_64.tar.gz"
+MD5SUM_x86_64="4971d4a620497ca1de3617ec279bd877"
+REQUIRES=""
+MAINTAINER="Dmitrii Sosedov"
+EMAIL="d.sosedov@gmail.com"
diff --git a/development/crystal-lang/slack-desc b/development/crystal-lang/slack-desc
new file mode 100644
index 0000000000..2b1928500c
--- /dev/null
+++ b/development/crystal-lang/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------------------------------------------------------|
+crystal-lang: crystal-lang (a Ruby-like programming language)
+crystal-lang:
+crystal-lang: Crystal is a Ruby-like statically type-checked programming language 
+crystal-lang: that compiles into efficient native code.
+crystal-lang:
+crystal-lang:
+crystal-lang:
+crystal-lang:
+crystal-lang: Homepage: https://crystal-lang.org
+crystal-lang: Release date: April 6, 2020
+crystal-lang:
diff --git a/development/cudatoolkit/README b/development/cudatoolkit/README
index 22c80bb678..50f1c78bd9 100644
--- a/development/cudatoolkit/README
+++ b/development/cudatoolkit/README
@@ -3,7 +3,7 @@ enables dramatic increases in computing performance by harnessing the
 power of the GPU.
 
 NOTE:
-- the binary file to download is 1,4 Gb;
-- the temporary package file will need 3,5 Gb;
-- the final package will be around 1 Gb (2,2 Gb when installed).
+- the binary file to download is 2,8 Gb;
+- the temporary package file will need 7 Gb;
+- the final package will be around 2 Gb (3 Gb when installed).
 Be sure to have enough free space before building this.
diff --git a/development/cudatoolkit/cudatoolkit.SlackBuild b/development/cudatoolkit/cudatoolkit.SlackBuild
index d70047400b..f6b3a86266 100644
--- a/development/cudatoolkit/cudatoolkit.SlackBuild
+++ b/development/cudatoolkit/cudatoolkit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CUDA Toolkit
 
-# Copyright 2017 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# Copyright 2020 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,8 @@
 
 PRGNAM=cudatoolkit
 FILENAME=cuda
-VERSION=${VERSION:-8.0.61}
+VERSION=${VERSION:-10.2.89}
+DRIVER=${DRIVER:-440.33.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,54 +56,94 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 
-chmod +x $CWD/$FILENAME\_$VERSION\_375.26\_linux-run
-$CWD/$FILENAME\_$VERSION\_375.26\_linux-run -extract=$TMP
-$TMP/$FILENAME-linux64*-$VERSION-*.run -noprompt -nosymlink -prefix=$TMP/$PRGNAM-$VERSION
+chmod +x $CWD/$FILENAME\_$VERSION\_$DRIVER\_linux.run
+sh $CWD/$FILENAME\_$VERSION\_$DRIVER\_linux.run --target $PRGNAM-$VERSION --noexec
 
-cd $PRGNAM-$VERSION
-chown -R root:root .
+mkdir -p $PKG/usr/share
+cd $PRGNAM-$VERSION/builds
+cp -r cuda-toolkit "$PKG/usr/share/cuda"
+cp -r cublas/include/* "$PKG/usr/share/cuda/include/"
+mkdir -p $PKG/usr/lib64
+cp -r cublas/lib64/* "$PKG/usr/lib$LIBDIRSUFFIX/"
+cp -r cuda-samples "$PKG/usr/share/cuda/samples"
 
-# Move the docs to our standard location first
-mkdir -p $PKG/usr/man
-mv doc/man $PKG/usr/
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf doc
+# Define compilers for CUDA to use.
+# This allows us to use older versions of GCC if we have to.
+# ln -s /usr/bin/gcc-8 "${PKG}/usr/share/cuda/bin/gcc"
+# ln -s /usr/bin/g++-8 "${PKG}/usr/share/cuda/bin/g++"
 
+# Put man in the standard place
+mv $PKG/usr/share/cuda/doc/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
 
-# Now move everything else
-mkdir -p $PKG/usr/share/cuda
-mv * $PKG/usr/share/cuda/
+# Put doc in the standard place
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/cuda/doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $PKG/usr/share/cuda/doc
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Create soname links.
+find cuda-toolkit/targets -type f -name '*.so*' ! -path '*stubs/*' -print0 | while read -rd $'\0' _lib; do
+  _base=${_lib%.so.*}
+  _current_soname=$(basename ${_lib%.*})
+  while [[ $_current_soname != $(basename $_base) ]]; do
+    ln -sf ${_lib##*/} ${PKG}/usr/share/cuda/lib$LIBDIRSUFFIX/$_current_soname
+    _current_soname=${_current_soname%.*}
+  done
+done
+
+# Install profile and ld.so.config files
+install -Dm755 "${CWD}/files/cuda.sh" "${PKG}/etc/profile.d/cuda.sh"
+install -Dm755 "${CWD}/files/cuda.csh" "${PKG}/etc/profile.d/cuda.csh"
+
+# Install pkgconfig files
+mkdir -p "$PKG"/usr/lib${LIBDIRSUFFIX}/pkgconfig
+cp "${CWD}"/files/*.pc "${PKG}"/usr/lib${LIBDIRSUFFIX}/pkgconfig
+
+# Remove included copy of java and link to system java 8
+rm -fr  "${PKG}/usr/share/cuda/jre"
+sed 's|../jre/bin/java|/usr/bin/java|g' \
+  -i "${PKG}/usr/share/cuda/libnsight/nsight.ini" \
+  -i "${PKG}/usr/share/cuda/libnvvp/nvvp.ini"
+
+# Allow newer compilers to work.
+# See https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
+# for official requirements
+sed -i "/.*unsupported GNU version.*/d" "${PKG}"/usr/share/cuda/targets/x86_64-linux/include/crt/host_config.h
+sed -i "/.*unsupported clang version.*/d" "${PKG}"/usr/share/cuda/targets/x86_64-linux/include/crt/host_config.h
+
+# Fix Makefile paths to CUDA
+for f in $(find "$PKG"/usr/share/cuda -name Makefile); do
+  sed -i "s|/usr/local/cuda|/usr/share/cuda|g" "$f"
+done
 
 # Put libraries in the standard place
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-mv $PKG/usr/share/cuda/lib${LIBDIRSUFFIX} $PKG/usr
+mv -fn $PKG/usr/share/cuda/targets/x86_64-linux/lib/* $PKG/usr/lib${LIBDIRSUFFIX}/
+rm -rf $PKG/usr/share/cuda/targets/x86_64-linux/lib
 cd $PKG/usr/share/cuda
 ln -sf ../../lib${LIBDIRSUFFIX} lib${LIBDIRSUFFIX}
 
-mkdir -p $PKG/etc/profile.d
-cp $CWD/files/${FILENAME}* $PKG/etc/profile.d
-chmod +x $PKG/etc/profile.d/*
+# Register application  NVVP and NSIGHT 
 mkdir -p $PKG/usr/share/applications
 cp $CWD/files/*.desktop $PKG/usr/share/applications
 
 # Put include in the standard place
-mkdir -p $PKG/usr/include/cuda
-mv $PKG/usr/share/cuda/include/* $PKG/usr/include/cuda
-rm -rf $PKG/usr/share/cuda/include
+mkdir -p $PKG/usr/include
+mv -fn $PKG/usr/share/cuda/targets/x86_64-linux/include/* $PKG/usr/include/
+rm -rf $PKG/usr/share/cuda/targets/x86_64-linux/include
 cd $PKG/usr/share/cuda/
-ln -sf ../../include/cuda include
+ln -sf ../../include include
+
+rm -rf $PKG/usr/share/cuda/targets
 
 # These are already in the nvidia-driver package
 rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libOpenCL.s*
 
-# install samples
-$TMP/$FILENAME-samples*-$VERSION-*.run -noprompt -prefix=$PKG/usr/doc/$PRGNAM-$VERSION/NVIDIA_CUDA-8.0_Samples -cudaprefix=/usr/share/cuda
-
 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 -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/cudatoolkit/cudatoolkit.info b/development/cudatoolkit/cudatoolkit.info
index 5404a11343..a2048453cb 100644
--- a/development/cudatoolkit/cudatoolkit.info
+++ b/development/cudatoolkit/cudatoolkit.info
@@ -1,10 +1,10 @@
 PRGNAM="cudatoolkit"
-VERSION="8.0.61"
-HOMEPAGE="http://www.nvidia.com/object/cuda_home_new.html"
+VERSION="10.2.89"
+HOMEPAGE="https://developer.nvidia.com/cuda-toolkit"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"
-MD5SUM_x86_64="33e1bd980e91af4e55f3ef835c103f9b"
-REQUIRES="nvidia-driver jdk"
+DOWNLOAD_x86_64="http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run"
+MD5SUM_x86_64="3d816c583759efa8567a92c1a2af90db"
+REQUIRES="nvidia-driver openjdk8"
 MAINTAINER="Giorgio Peron"
 EMAIL="giorgio.peron@gmail.com"
diff --git a/development/cudatoolkit/doinst.sh b/development/cudatoolkit/doinst.sh
new file mode 100644
index 0000000000..ec40b576fe
--- /dev/null
+++ b/development/cudatoolkit/doinst.sh
@@ -0,0 +1,3 @@
+# install GCC 6 and link the compiler in cuda bin folder
+ln -sf usr/bin/gcc-6 usr/share/cuda/bin/gcc 
+ln -sf usr/bin/g++-6 usr/share/cuda/bin/g++
diff --git a/development/cudatoolkit/files/accinj64.pc b/development/cudatoolkit/files/accinj64.pc
new file mode 100644
index 0000000000..66736ef996
--- /dev/null
+++ b/development/cudatoolkit/files/accinj64.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: accinj64
+Description: OpenACC 64-bit Injection Library
+Version: 10.2
+Libs: -L${libdir} -laccinj64
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/cublas.pc b/development/cudatoolkit/files/cublas.pc
new file mode 100644
index 0000000000..43d12d8c8d
--- /dev/null
+++ b/development/cudatoolkit/files/cublas.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: cublas
+Description: CUDA BLAS Library
+Version: 10.2
+Libs: -L${libdir} -lcublas
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/cuda.pc b/development/cudatoolkit/files/cuda.pc
new file mode 100644
index 0000000000..c932f5b0b4
--- /dev/null
+++ b/development/cudatoolkit/files/cuda.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: cuda
+Description: CUDA Driver Library
+Version: 10.2
+Libs: -L${libdir} -lcuda
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/cudart.pc b/development/cudatoolkit/files/cudart.pc
new file mode 100644
index 0000000000..a7ccc2d563
--- /dev/null
+++ b/development/cudatoolkit/files/cudart.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: cudart
+Description: CUDA Runtime Library
+Version: 10.2
+Libs: -L${libdir} -lcudart
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/cufft.pc b/development/cudatoolkit/files/cufft.pc
new file mode 100644
index 0000000000..7d7aa9809d
--- /dev/null
+++ b/development/cudatoolkit/files/cufft.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: cufft
+Description: CUDA Fast Fourier Transform
+Version: 10.2
+Libs: -L${libdir} -lcufft
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/cufftw.pc b/development/cudatoolkit/files/cufftw.pc
new file mode 100644
index 0000000000..66e5895855
--- /dev/null
+++ b/development/cudatoolkit/files/cufftw.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: cufftw
+Description: CUDA Fast Fourier Transform Wide
+Version: 10.2
+Libs: -L${libdir} -lcufftw
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/cuinj64.pc b/development/cudatoolkit/files/cuinj64.pc
new file mode 100644
index 0000000000..c397c3e47f
--- /dev/null
+++ b/development/cudatoolkit/files/cuinj64.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: cuinj64
+Description: CUDA 64-bit Injection Library
+Version: 10.2
+Libs: -L${libdir} -lcuinj64
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/curand.pc b/development/cudatoolkit/files/curand.pc
new file mode 100644
index 0000000000..11038f0576
--- /dev/null
+++ b/development/cudatoolkit/files/curand.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: curand
+Description: CUDA Random Number Generation Library
+Version: 10.2
+Libs: -L${libdir} -lcurand
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/cusolver.pc b/development/cudatoolkit/files/cusolver.pc
new file mode 100644
index 0000000000..9b8917cdc6
--- /dev/null
+++ b/development/cudatoolkit/files/cusolver.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: cusolver
+Description: A LAPACK-like library on dense and sparse linear algebra
+Version: 10.2
+Libs: -L${libdir} -lcusolver
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/cusparse.pc b/development/cudatoolkit/files/cusparse.pc
new file mode 100644
index 0000000000..4ca0495ed8
--- /dev/null
+++ b/development/cudatoolkit/files/cusparse.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: cusparse
+Description: CUDA Sparse Matrix Library
+Version: 10.2
+Libs: -L${libdir} -lcusparse
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppc.pc b/development/cudatoolkit/files/nppc.pc
new file mode 100644
index 0000000000..bc817e73db
--- /dev/null
+++ b/development/cudatoolkit/files/nppc.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppc
+Description: NVIDIA Performance Primitives - Core
+Version: 10.2
+Libs: -L${libdir} -lnppc
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppi.pc b/development/cudatoolkit/files/nppi.pc
new file mode 100644
index 0000000000..5999377817
--- /dev/null
+++ b/development/cudatoolkit/files/nppi.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppi
+Description: NVIDIA Performance Primitives - Image Processing
+Version: 10.2
+Libs: -L${libdir} -lnppi
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppial.pc b/development/cudatoolkit/files/nppial.pc
new file mode 100644
index 0000000000..d85bdd0f34
--- /dev/null
+++ b/development/cudatoolkit/files/nppial.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppial
+Description: NVIDIA Performance Primitives - Image Processing - Arithmetic and Logic
+Version: 10.2
+Libs: -L${libdir} -lnppial
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppicc.pc b/development/cudatoolkit/files/nppicc.pc
new file mode 100644
index 0000000000..4c4a9070f2
--- /dev/null
+++ b/development/cudatoolkit/files/nppicc.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppicc
+Description: NVIDIA Performance Primitives - Image Processing - Color Conversion
+Version: 10.2
+Libs: -L${libdir} -lnppicc
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppicom.pc b/development/cudatoolkit/files/nppicom.pc
new file mode 100644
index 0000000000..c81f47c5b5
--- /dev/null
+++ b/development/cudatoolkit/files/nppicom.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppicom
+Description: NVIDIA Performance Primitives - Image Processing - Compression
+Version: 10.2
+Libs: -L${libdir} -lnppicom
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppidei.pc b/development/cudatoolkit/files/nppidei.pc
new file mode 100644
index 0000000000..c4451075fd
--- /dev/null
+++ b/development/cudatoolkit/files/nppidei.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppidei
+Description: NVIDIA Performance Primitives - Image Processing - DEI
+Version: 10.2
+Libs: -L${libdir} -lnppidei
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppif.pc b/development/cudatoolkit/files/nppif.pc
new file mode 100644
index 0000000000..70a4a0d516
--- /dev/null
+++ b/development/cudatoolkit/files/nppif.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppif
+Description: NVIDIA Performance Primitives - Image Processing - Filters
+Version: 10.2
+Libs: -L${libdir} -lnppif
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppig.pc b/development/cudatoolkit/files/nppig.pc
new file mode 100644
index 0000000000..0d36270644
--- /dev/null
+++ b/development/cudatoolkit/files/nppig.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppig
+Description: NVIDIA Performance Primitives - Image Processing - Geometry
+Version: 10.2
+Libs: -L${libdir} -lnppig
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppim.pc b/development/cudatoolkit/files/nppim.pc
new file mode 100644
index 0000000000..9441dd7652
--- /dev/null
+++ b/development/cudatoolkit/files/nppim.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppim
+Description: NVIDIA Performance Primitives - Image Processing - Morphological
+Version: 10.2
+Libs: -L${libdir} -lnppim
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppist.pc b/development/cudatoolkit/files/nppist.pc
new file mode 100644
index 0000000000..6dcb15ad47
--- /dev/null
+++ b/development/cudatoolkit/files/nppist.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppist
+Description: NVIDIA Performance Primitives - Image Processing - Statistic and Linear
+Version: 10.2
+Libs: -L${libdir} -lnppist
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppisu.pc b/development/cudatoolkit/files/nppisu.pc
new file mode 100644
index 0000000000..226bbc11d6
--- /dev/null
+++ b/development/cudatoolkit/files/nppisu.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppisu
+Description: NVIDIA Performance Primitives - Image Processing - Support and Data Exchange
+Version: 10.2
+Libs: -L${libdir} -lnppisu
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nppitc.pc b/development/cudatoolkit/files/nppitc.pc
new file mode 100644
index 0000000000..427e6a9f2c
--- /dev/null
+++ b/development/cudatoolkit/files/nppitc.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nppitc
+Description: NVIDIA Performance Primitives - Image Processing - Threshold and Compare
+Version: 10.2
+Libs: -L${libdir} -lnppitc
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/npps.pc b/development/cudatoolkit/files/npps.pc
new file mode 100644
index 0000000000..34bc109a05
--- /dev/null
+++ b/development/cudatoolkit/files/npps.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: npps
+Description: NVIDIA Performance Primitives - Signal Processing
+Version: 10.2
+Libs: -L${libdir} -lnpps
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nvToolsExt.pc b/development/cudatoolkit/files/nvToolsExt.pc
new file mode 100644
index 0000000000..a7d6bad314
--- /dev/null
+++ b/development/cudatoolkit/files/nvToolsExt.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nvToolsExt
+Description: NVIDIA Tools Extension
+Version: 10.2
+Libs: -L${libdir} -lnvToolsExt
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nvgraph.pc b/development/cudatoolkit/files/nvgraph.pc
new file mode 100644
index 0000000000..7f150d4d44
--- /dev/null
+++ b/development/cudatoolkit/files/nvgraph.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nvgraph
+Description: NVIDIA Accelerated Graph Analytics
+Version: 10.2
+Libs: -L${libdir} -lnvgraph
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nvidia-ml.pc b/development/cudatoolkit/files/nvidia-ml.pc
new file mode 100644
index 0000000000..7e1490492d
--- /dev/null
+++ b/development/cudatoolkit/files/nvidia-ml.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nvidia-ml
+Description: NVML
+Version: 10.2
+Libs: -L${libdir}/stubs -lnvidia-ml
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nvjpeg.pc b/development/cudatoolkit/files/nvjpeg.pc
new file mode 100644
index 0000000000..a9aebee783
--- /dev/null
+++ b/development/cudatoolkit/files/nvjpeg.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nvjpeg
+Description: NVIDIA JPEG Library
+Version: 10.2
+Libs: -L${libdir} -lnvjpeg
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/files/nvrtc.pc b/development/cudatoolkit/files/nvrtc.pc
new file mode 100644
index 0000000000..26057d8d6f
--- /dev/null
+++ b/development/cudatoolkit/files/nvrtc.pc
@@ -0,0 +1,9 @@
+cudaroot=/usr/share/cuda
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: nvrtc
+Description: A runtime compilation library for CUDA C++
+Version: 10.2
+Libs: -L${libdir} -lnvrtc
+Cflags: -I${includedir}
diff --git a/development/cudatoolkit/slack-desc b/development/cudatoolkit/slack-desc
index 59f746aa7b..8bd73744be 100644
--- a/development/cudatoolkit/slack-desc
+++ b/development/cudatoolkit/slack-desc
@@ -12,7 +12,7 @@ cudatoolkit: CUDA is NVIDIA's parallel computing architecture. It enables dramat
 cudatoolkit: increases in computing performance by harnessing the power of
 cudatoolkit: the GPU.
 cudatoolkit:
-cudatoolkit: Homepage http://www.nvidia.com/object/cuda_home_new.html
+cudatoolkit: Homepage https://developer.nvidia.com/cuda-toolkit
 cudatoolkit:
 cudatoolkit:
 cudatoolkit:
diff --git a/development/cudnn/README b/development/cudnn/README
index 097b80517b..d49d4ed0b1 100644
--- a/development/cudnn/README
+++ b/development/cudnn/README
@@ -1,12 +1,13 @@
-The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated
-library of primitives for deep neural networks. cuDNN provides highly tuned
-implementations for standard routines such as forward and backward convolution,
-pooling, normalization, and activation layers. cuDNN is part of the NVIDIA
-Deep Learning SDK.
+The NVIDIA CUDA Deep Neural Network library (cuDNN) is a
+GPU-accelerated library of primitives for deep neural networks. cuDNN
+provides highly tuned implementations for standard routines such
+as forward and backward convolution, pooling, normalization, and
+activation layers. cuDNN is part of the NVIDIA Deep Learning SDK.
 
-You will need to register for NVIDIA developer account to download the source.
+You will need to register for NVIDIA developer account to download the
+source.
 
-Make sure you create the CUDA_HOME environment variable and add it to your
-~/.bashrc. The default should be
+Make sure you create the CUDA_HOME environment variable and add it to
+your ~/.bashrc. The default should be
 
 CUDA_HOME=/usr/share/cuda
diff --git a/development/cunit/README b/development/cunit/README
index b4f954b6af..ff4bbe0358 100644
--- a/development/cunit/README
+++ b/development/cunit/README
@@ -1,8 +1,9 @@
-CUnit is a lightweight system for writing, administering, and running unit
-tests in C. It provides C programmers a basic testing functionality with a
-flexible variety of user interfaces.
+CUnit is a lightweight system for writing, administering, and
+running unit tests in C. It provides C programmers a basic testing
+functionality with a flexible variety of user interfaces.
 
-CUnit is built as a static library which is linked with the user's testing
-code. It uses a simple framework for building test structures, and provides
-a rich set of assertions for testing common data types. In addition, several
-different interfaces are provided for running tests and reporting results.
+CUnit is built as a static library which is linked with the user's
+testing code. It uses a simple framework for building test structures,
+and provides a rich set of assertions for testing common data types. In
+addition, several different interfaces are provided for running tests
+and reporting results.
diff --git a/development/cvsd/README b/development/cvsd/README
index 248327f3cf..38629b60e2 100644
--- a/development/cvsd/README
+++ b/development/cvsd/README
@@ -1,21 +1,23 @@
-cvsd is a wrapper program for cvs in pserver mode. it will run 'cvs pserver'
-under a special uid/gid in a chroot jail.
+cvsd is a wrapper program for cvs in pserver mode. it will run 'cvs
+pserver' under a special uid/gid in a chroot jail.
 
-cvsd is run as a daemon and is controlled through a configuration file. It is
-relatively easy to configure and provides tools for easy setting up a chroot
-jail.
+cvsd is run as a daemon and is controlled through a configuration
+file. It is relatively easy to configure and provides tools for easy
+setting up a chroot jail.
 
-This server can be useful if you want to run a public cvs pserver. You should
-however be aware of the security limitations of running a cvs pserver. If you
-want any kind of authentication you should really consider using secure shell
-as a secure authentication mechanism and transport. Passwords used in cvs
-pserver are transmitted in plain text.
+This server can be useful if you want to run a public cvs pserver. You
+should however be aware of the security limitations of running a cvs
+pserver. If you want any kind of authentication you should really
+consider using secure shell as a secure authentication mechanism and
+transport. Passwords used in cvs pserver are transmitted in plain
+text.
 
-This wrapper adds a layer of security to the cvs server. cvs is a very
-powerful tool and is capable of running scripts and other things. Running cvs
-in a chroot jail it is possible to limit the amount of "damage" cvs can do if
-it is exploited. It is generally a good idea to run cvsd without any write
-permissions to any directory on the system.
+This wrapper adds a layer of security to the cvs server. cvs is
+a very powerful tool and is capable of running scripts and other
+things. Running cvs in a chroot jail it is possible to limit the
+amount of "damage" cvs can do if it is exploited. It is generally a
+good idea to run cvsd without any write permissions to any directory
+on the system.
 
 Features of cvsd include:
  * running in chroot jail
diff --git a/development/cvsps/README b/development/cvsps/README
index b36ac600c7..9abdd4a9bf 100644
--- a/development/cvsps/README
+++ b/development/cvsps/README
@@ -1,7 +1,7 @@
 CVSps is a program for generating 'patchset' information from a CVS
-repository.  A patchset in this case is defined as a set of changes made
-to a collection of files, and all committed at the same time (using a
-single 'cvs commit' command).  This information is valuable to seeing the
-big picture of the evolution of a cvs project. While cvs tracks revision
-information, it is often difficult to see what changes were committed
-'atomically' to the repository.
+repository.  A patchset in this case is defined as a set of changes
+made to a collection of files, and all committed at the same time
+(using a single 'cvs commit' command).  This information is valuable
+to seeing the big picture of the evolution of a cvs project. While cvs
+tracks revision information, it is often difficult to see what changes
+were committed 'atomically' to the repository.
diff --git a/development/cxxtest/README b/development/cxxtest/README
index 4b843b0dd6..d967a25489 100644
--- a/development/cxxtest/README
+++ b/development/cxxtest/README
@@ -1,7 +1,8 @@
-CxxTest is a unit testing framework for C++ that is similar in spirit to JUnit,
-CppUnit, and xUnit.  CxxTest is easy to use because it does not require
-precompiling a CxxTest testing library, it employs no advanced features of C++
-(e.g. RTTI) and it supports a very flexible form of test discovery.
+CxxTest is a unit testing framework for C++ that is similar in spirit
+to JUnit, CppUnit, and xUnit.  CxxTest is easy to use because it does
+not require precompiling a CxxTest testing library, it employs no
+advanced features of C++ (e.g. RTTI) and it supports a very flexible
+form of test discovery.
 
-Package ply is an optional runtime dependency: it's needed for the FOG C++
-parser.
+Package ply is an optional runtime dependency: it's needed for the FOG
+C++ parser.
diff --git a/development/d-tools/README b/development/d-tools/README
index 79c8ee33c1..7d717f9900 100644
--- a/development/d-tools/README
+++ b/development/d-tools/README
@@ -1,4 +1,5 @@
-This package provides ancillary tools for the D programming language compiler.
+This package provides ancillary tools for the D programming language
+compiler.
 
 The following tools are included:
 
@@ -9,6 +10,6 @@ The following tools are included:
 * D-Scanner - Swiss-army knife for D source code.
 * DCD - Auto-complete program.
 
-By default DMD is used to build all tools but you can build them with GDC as
-well. DMD is not required in this case. Specify $DC variable for that:
-DC=gdc ./d-tools.SlackBuild
+By default DMD is used to build all tools but you can build them with
+GDC as well. DMD is not required in this case. Specify $DC variable
+for that: DC=gdc ./d-tools.SlackBuild
diff --git a/development/d-tools/d-tools.SlackBuild b/development/d-tools/d-tools.SlackBuild
index 32fb71b61d..5b72f32ab2 100644
--- a/development/d-tools/d-tools.SlackBuild
+++ b/development/d-tools/d-tools.SlackBuild
@@ -23,13 +23,13 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=d-tools
-VERSION=${VERSION:-2.091.0}
+VERSION=${VERSION:-2.096.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-DUB_VERSION=${DUB_VERSION:-1.20.0}
-DSCANNER_VERSION=${DSCANNER_VERSION:-0.8.0}
-DCD_VERSION=${DCD_VERSION:-0.12.0}
+DUB_VERSION=${DUB_VERSION:-1.25.0}
+DSCANNER_VERSION=${DSCANNER_VERSION:-0.11.0}
+DCD_VERSION=${DCD_VERSION:-0.13.1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -77,7 +77,7 @@ chmod -R u+w,go-w,a+rX-st .
 case "$DC" in
   *gdc) sh build-gdc.sh
         ;;
-     *) sh build.sh
+     *) dmd -run build.d
         ;;
 esac
 
diff --git a/development/d-tools/d-tools.info b/development/d-tools/d-tools.info
index d2424b0508..3dc632fad4 100644
--- a/development/d-tools/d-tools.info
+++ b/development/d-tools/d-tools.info
@@ -1,14 +1,14 @@
 PRGNAM="d-tools"
-VERSION="2.091.0"
+VERSION="2.096.0"
 HOMEPAGE="https://dlang.org"
-DOWNLOAD="https://download.dlackware.com/hosted-sources/d-tools/dub-1.20.0.tar.gz \
-          https://download.dlackware.com/hosted-sources/d-tools/tools-2.091.0.tar.gz \
-          https://download.dlackware.com/hosted-sources/d-tools/D-Scanner-0.8.0.tar.xz \
-          https://download.dlackware.com/hosted-sources/d-tools/DCD-0.12.0.tar.xz"
-MD5SUM="03af2915b9baf46d146a02f43adf48b3 \
-        b2ba3dfa2770af0c8bc5a30ac8f45620 \
-        fe2353c753abe28e2845ebfe2aaea155 \
-        6cc83a7c73c0d827bf4b43cbd1fc89c0"
+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="60d031ed0e2054d721e44aea33bd0ca4 \
+        00852d0d9aba131b990baeb025fbdf38 \
+        59426567074ca0505fd394b599e0879d \
+        3eebf17739f25c511c9957ade050bbe9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmd"
diff --git a/development/dart-sdk/dart-sdk.SlackBuild b/development/dart-sdk/dart-sdk.SlackBuild
index 8c4f63fcc2..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.7.2}
+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 4d2b5a9773..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.7.2"
+VERSION="2.10.4"
 HOMEPAGE="https://www.dartlang.org/"
-DOWNLOAD="https://storage.googleapis.com/dart-archive/channels/stable/release/2.7.2/sdk/dartsdk-linux-ia32-release.zip \
-https://storage.googleapis.com/dart-archive/channels/stable/release/2.7.2/api-docs/dartdocs-gen-api.zip"
-MD5SUM="1027036991c3f62e35796945f086600d \
-	a9d8fad024ddf2fcdb4d3c6cb3d2a8f0"
-DOWNLOAD_x86_64="https://storage.googleapis.com/dart-archive/channels/stable/release/2.7.2/sdk/dartsdk-linux-x64-release.zip \
-https://storage.googleapis.com/dart-archive/channels/stable/release/2.7.2/api-docs/dartdocs-gen-api.zip"
-MD5SUM_x86_64="cd184471ee8f470dc9bb07937c66339a \
-	       a9d8fad024ddf2fcdb4d3c6cb3d2a8f0"
+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/dasht/README b/development/dasht/README
index bb82859643..64b197d9ec 100644
--- a/development/dasht/README
+++ b/development/dasht/README
@@ -1,10 +1,12 @@
-dasht is a collection of shell scripts for searching, browsing, and managing API
-documentation (in the form of 150+ offline documentation sets, courtesy of Dash
-for OS X) all from the comfort of your own terminal!
+dasht is a collection of shell scripts for searching, browsing, and
+managing API documentation (in the form of 150+ offline documentation
+sets, courtesy of Dash for OS X) all from the comfort of your own
+terminal!
 
-The name "dasht" is a portmanteau of Dash and the letter "t", for terminal.
-Etymologically, "dasht" is Persian for plain, as in an flat expanse of land,
-which aptly characterizes the terminal environment where everything is text.
+The name "dasht" is a portmanteau of Dash and the letter "t", for
+terminal.  Etymologically, "dasht" is Persian for plain, as in an flat
+expanse of land, which aptly characterizes the terminal environment
+where everything is text.
 
 Optional dependencies:
 * w3m to display dasht(1) search results
diff --git a/development/dasht/dasht.SlackBuild b/development/dasht/dasht.SlackBuild
index c9a707a2b7..20233e8b92 100644
--- a/development/dasht/dasht.SlackBuild
+++ b/development/dasht/dasht.SlackBuild
@@ -22,13 +22,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dasht
-VERSION=${VERSION:-2.3.0}
+VERSION=${VERSION:-2.4.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
@@ -39,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"
@@ -63,10 +63,10 @@ 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 {} \;
+ \( -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 {} \;
 
 install -m 755 -d $PKG/usr/bin
 install -m 755 -d $PKG/usr/share/zsh/site-functions
@@ -81,7 +81,7 @@ gzip -9 man/man1/*
 cp -a man/man1/*.gz $PKG/usr/man/man1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md VERSION.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md VERSION.md $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/dasht/dasht.info b/development/dasht/dasht.info
index 88393bc588..8bd40b76ce 100644
--- a/development/dasht/dasht.info
+++ b/development/dasht/dasht.info
@@ -1,8 +1,8 @@
 PRGNAM="dasht"
-VERSION="2.3.0"
+VERSION="2.4.0"
 HOMEPAGE="https://github.com/sunaku/dasht"
-DOWNLOAD="https://github.com/sunaku/dasht/archive/v2.3.0/dasht-2.3.0.tar.gz"
-MD5SUM="88dcb1ea365d856400459a7f7c371a57"
+DOWNLOAD="https://github.com/sunaku/dasht/archive/v2.4.0/dasht-2.4.0.tar.gz"
+MD5SUM="330000c18d8819968c833d149221b4dc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/dasht/slack-desc b/development/dasht/slack-desc
index 2eff4a3b3e..56a92965c7 100644
--- a/development/dasht/slack-desc
+++ b/development/dasht/slack-desc
@@ -13,9 +13,7 @@ dasht: managing API documentation (in the form of 150+ offline documentation
 dasht: sets, courtesy of Dash for OS X) all from the comfort of your own
 dasht: terminal!
 dasht:
-dasht: The name "dasht" is a portmanteau of Dash and the letter "t", for
-dasht: terminal.  Etymologically, "dasht" is Persian for plain, as in an flat
-dasht: expanse of land, which aptly characterizes the terminal environment
-dasht: where everything is text.
-dasht:
 dasht: Homepage: https://github.com/sunaku/dasht
+dasht:
+dasht:
+dasht:
diff --git a/development/dbeaver-ce/dbeaver-ce.SlackBuild b/development/dbeaver-ce/dbeaver-ce.SlackBuild
index c936dfcf53..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 2019 Joielechong <juansspy@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:-6.3.0}
+VERSION=${VERSION:-21.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,12 +65,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 {} \;
 
+DESKTOPPATH=/usr/share/dbeaver/
+NEWDESKTOPPATH=/opt/$PRGNAM/
+
+# Rewrite paths in .desktop file
+mv ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop.orig
+sed "s~$DESKTOPPATH~$NEWDESKTOPPATH~" ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop.orig > ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop
+rm ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop.orig
 
 # Add dbeaver to KDE/GNOME/XFCE menu
-install -D -m 644 ${CWD}/${ORIGINAL_PRGNAM}.desktop \
+install -D -m 644 ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.desktop \
   ${PKG}/usr/share/applications/${PRGNAM}.desktop
 
-install -D -m 644 ${CWD}/${ORIGINAL_PRGNAM}.png ${PKG}/usr/share/pixmaps/${PRGNAM}.png
+install -D -m 644 ${NEWDESTDIR}/${ORIGINAL_PRGNAM}.png ${PKG}/usr/share/pixmaps/${ORIGINAL_PRGNAM}.png
 
 mkdir -p $PKG/usr/bin
 cat << EOF > $PKG/usr/bin/$PRGNAM
diff --git a/development/dbeaver-ce/dbeaver-ce.info b/development/dbeaver-ce/dbeaver-ce.info
index 4d70c51f1f..f1e4573e1b 100644
--- a/development/dbeaver-ce/dbeaver-ce.info
+++ b/development/dbeaver-ce/dbeaver-ce.info
@@ -1,10 +1,10 @@
 PRGNAM="dbeaver-ce"
-VERSION="6.3.0"
+VERSION="21.0.0"
 HOMEPAGE="https://dbeaver.io"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://dbeaver.io/files/6.3.0/dbeaver-ce-6.3.0-linux.gtk.x86_64.tar.gz"
-MD5SUM_x86_64="aeaa8ca8962b8f89e7209a971423e1fd"
+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/dbeaver/README b/development/dbeaver/README
deleted file mode 100644
index c85eba615f..0000000000
--- a/development/dbeaver/README
+++ /dev/null
@@ -1,10 +0,0 @@
-dbeaver (a universal database tool)
-
-DBeaver is free and open source (GPL) universal database tool for
-developers and database administrators.
-
-Usability is the main goal of this project. It is multiplatform.
-Based on opensource framework and allows writing of various
-extensions (plugins).
-
-It supports any database having a JDBC driver.
diff --git a/development/dbeaver/dbeaver.SlackBuild b/development/dbeaver/dbeaver.SlackBuild
deleted file mode 100644
index e591dfb9ab..0000000000
--- a/development/dbeaver/dbeaver.SlackBuild
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dbeaver
-
-# Copyright 2014 Antonio Hernández Blas <hba.nihilismus@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=dbeaver
-VERSION=${VERSION:-3.5.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=${ARCH:-$(uname -m)}
-case "$ARCH" in
-    i?86) ARCH=i586; SRCARCH=x86 ;;
-  x86_64) SRCARCH=x86_64 ;;
-       *) echo "$ARCH is not supported"; exit 1 ;;
-esac
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-
-SRCNAM=dbeaver-ee
-SRCVER=$VERSION-linux.gtk.$SRCARCH
-DESTDIR=$PKG/opt/$PRGNAM
-
-mkdir -p $DESTDIR
-cd $DESTDIR
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
-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
-cat << EOF > $PKG/usr/bin/$PRGNAM
-#!/bin/sh
-cd \$HOME
-/opt/$PRGNAM/$PRGNAM \$@
-EOF
-chmod 0755 $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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  $DESTDIR/readme.txt $DESTDIR/licenses/* \
-  $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/dbeaver/dbeaver.info b/development/dbeaver/dbeaver.info
deleted file mode 100644
index 31a4a955e6..0000000000
--- a/development/dbeaver/dbeaver.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dbeaver"
-VERSION="3.5.8"
-HOMEPAGE="https://dbeaver.jkiss.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/dbeaver-ee-3.5.8-linux.gtk.x86.tar.gz"
-MD5SUM="8a18c465e1759e19045079272c16f033"
-DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/dbeaver-ee-3.5.8-linux.gtk.x86_64.tar.gz"
-MD5SUM_x86_64="781c64ce59b5ad647608024bf4334a4a"
-REQUIRES="jdk"
-MAINTAINER="Antonio Hernández Blas"
-EMAIL="hba.nihilismus@gmail.com"
diff --git a/development/dbeaver/slack-desc b/development/dbeaver/slack-desc
deleted file mode 100644
index d641485ebe..0000000000
--- a/development/dbeaver/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------------------------------------------------------|
-dbeaver: dbeaver (a universal database tool)
-dbeaver:
-dbeaver: DBeaver is free and open source (GPL) universal database tool for
-dbeaver: developers and database administrators.
-dbeaver:
-dbeaver: Usability is the main goal of this project. It is multiplatform.
-dbeaver: Based on opensource framework and allows writing of various
-dbeaver: extensions (plugins).
-dbeaver:
-dbeaver: It supports any database having a JDBC driver.
-dbeaver: Homepage: https://dbeaver.jkiss.org
diff --git a/development/decklink-sdk/README b/development/decklink-sdk/README
index a4ace3c447..d3e7e871bc 100644
--- a/development/decklink-sdk/README
+++ b/development/decklink-sdk/README
@@ -4,7 +4,8 @@ Editing/Design and Paint PCI cards, including samples and example code.
 There is no direct download link for the source zip file which must be
 downloaded via the Blackmagic Design web site at:
     https://www.blackmagicdesign.com/support
-It requires registration and agreeement to the usage license conditions.
-In the "Latest Downloads" column of the support web page, scroll to find the
-"Desktop Video X.Y.Z SDK" section (where X.Y.Z is the required version) and
-press the "Linux" button; then follow the instructions to download.
+It requires registration and agreeement to the usage license
+conditions.  In the "Latest Downloads" column of the support web page,
+scroll to find the "Desktop Video X.Y.Z SDK" section (where X.Y.Z is
+the required version) and press the "Linux" button; then follow the
+instructions to download.
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/dejagnu/README b/development/dejagnu/README
index ace1e25a09..0b0e55f860 100644
--- a/development/dejagnu/README
+++ b/development/dejagnu/README
@@ -1,7 +1,7 @@
-DejaGnu is a framework for testing other programs. Its purpose is to
-provide a single front end for all tests. Think of it as a custom library
-of Tcl procedures crafted to support writing a test harness. A test
-harness is the testing infrastructure that is created to support a
-specific program or tool. Each program can have multiple testsuites, all
-supported by a single test harness. DejaGnu is written in Expect, which in
-turn uses Tcl -- Tool command language.
+DejaGnu is a framework for testing other programs. Its purpose is
+to provide a single front end for all tests. Think of it as a custom
+library of Tcl procedures crafted to support writing a test harness. A
+test harness is the testing infrastructure that is created to support
+a specific program or tool. Each program can have multiple testsuites,
+all supported by a single test harness. DejaGnu is written in Expect,
+which in turn uses Tcl -- Tool command language.
diff --git a/development/dhex/README b/development/dhex/README
index c4df483519..8378785c59 100644
--- a/development/dhex/README
+++ b/development/dhex/README
@@ -4,4 +4,4 @@ DHEX is a more than just another hex editor: It includes a diff
 mode, which can be used to easily and conveniently compare two binary
 files. Since it is based on ncurses and is themeable, it can run on any
 number of systems and scenarios. With its utilization of search logs,
-it is possible to track changes in different iterations of files easily.
\ No newline at end of file
+it is possible to track changes in different iterations of files easily.
diff --git a/development/diakonos/README b/development/diakonos/README
index 3b814bb9f7..affaf230c8 100644
--- a/development/diakonos/README
+++ b/development/diakonos/README
@@ -1,8 +1,9 @@
-Diakonos is a customizable, usable console-based text editor written in Ruby.
-It has been made with the intention of being easier to configure and use than
-emacs, more powerful than pico and nano, and not as cryptic as vi or ex.
+Diakonos is a customizable, usable console-based text editor written
+in Ruby.  It has been made with the intention of being easier to
+configure and use than emacs, more powerful than pico and nano, and
+not as cryptic as vi or ex.
 
-Features
+Features:
     * scripting in any language
     * macro recording and playback
     * multi-element clipboard
diff --git a/development/diffuse/README b/development/diffuse/README
index 1d3c9e8dba..4c69f76d75 100644
--- a/development/diffuse/README
+++ b/development/diffuse/README
@@ -1,8 +1,9 @@
-Diffuse is a graphical tool for merging and comparing text files.  Diffuse is
-able to compare an arbitrary number of files side-by-side and gives users the
-ability to manually adjust line matching and directly edit files.  Diffuse can
-also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,
-Monotone, RCS, Subversion, and SVK repositories for comparison and merging.
+Diffuse is a graphical tool for merging and comparing text files.
+Diffuse is able to compare an arbitrary number of files side-by-side
+and gives users the ability to manually adjust line matching and
+directly edit files.  Diffuse can also retrieve revisions of files
+from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion,
+and SVK repositories for comparison and merging.
 
 Some key features of Diffuse:
 - ability to compare and merge an arbitrary number of files side-by-side
@@ -14,6 +15,3 @@ Some key features of Diffuse:
 - Unicode support
 - unlimited undo
 - easy keyboard navigation
-
-
-
diff --git a/development/dis6502/README b/development/dis6502/README
index 006bfd5fc0..5e3fd01970 100644
--- a/development/dis6502/README
+++ b/development/dis6502/README
@@ -2,8 +2,9 @@ dis6502 (flow-tracing disassembler for 6502)
 
 dis6502 is a 6502 disassembler that supports Atari 8-bit and Commodore
 executables, as well as raw memory dumps. It attempts to separate code
-sections from data by tracing the flow of execution, and supports a config
-file for manually defining code sections that aren't reached by the trace.
+sections from data by tracing the flow of execution, and supports a
+config file for manually defining code sections that aren't reached by
+the trace.
 
 Note: This is NOT the dis6502 from AtariMax. Although the name is the
 same, AtariMax's disassembler is completely different (for one thing,
diff --git a/development/dkms/dkms.SlackBuild b/development/dkms/dkms.SlackBuild
index 1fd609d530..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-2019 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.1}
+VERSION=${VERSION:-2.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/dkms/dkms.info b/development/dkms/dkms.info
index 10f54c65ae..63007f72d8 100644
--- a/development/dkms/dkms.info
+++ b/development/dkms/dkms.info
@@ -1,8 +1,8 @@
 PRGNAM="dkms"
-VERSION="2.8.1"
+VERSION="2.8.4"
 HOMEPAGE="https://github.com/dell/dkms"
-DOWNLOAD="https://github.com/dell/dkms/archive/v2.8.1/dkms-2.8.1.tar.gz"
-MD5SUM="8b6385674c3cb22e5079ef786aacf695"
+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/README b/development/dmd/README
index 13e7d11395..954442db46 100644
--- a/development/dmd/README
+++ b/development/dmd/README
@@ -1,5 +1,5 @@
 Official reference D compiler.
 
-D is a general-purpose programming language with static typing, systems-level
-access, and C-like syntax. It combines efficiency, control and modeling power
-with safety and programmer productivity.
+D is a general-purpose programming language with static typing,
+systems-level access, and C-like syntax. It combines efficiency,
+control and modeling power with safety and programmer productivity.
diff --git a/development/dmd/dmd.SlackBuild b/development/dmd/dmd.SlackBuild
index 4608263a6d..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.091.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 117ec2ab95..17f35a5b09 100644
--- a/development/dmd/dmd.info
+++ b/development/dmd/dmd.info
@@ -1,10 +1,10 @@
 PRGNAM="dmd"
-VERSION="2.091.0"
+VERSION="2.096.0"
 HOMEPAGE="https://dlang.org"
-DOWNLOAD="http://downloads.dlang.org/releases/2.x/2.091.0/dmd.2.091.0.linux.tar.xz"
-MD5SUM="9a8dd19fdba1e8cc6d135c3663d7e969"
+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/docutils/README b/development/docutils/README
index 1160a389f0..f782f52b93 100644
--- a/development/docutils/README
+++ b/development/docutils/README
@@ -2,5 +2,5 @@ Docutils (Python Documentation Utilities)
 
 Docutils is a modular system for processing documentation into useful
 formats, such as HTML, XML, and LaTeX. For input Docutils supports
-reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext
-markup syntax.
+reStructuredText, an easy-to-read, what-you-see-is-what-you-get
+plaintext markup syntax.
diff --git a/development/dotnet-runtime/README b/development/dotnet-runtime/README
index 867bb5c20e..d5f36f17a7 100644
--- a/development/dotnet-runtime/README
+++ b/development/dotnet-runtime/README
@@ -1,7 +1,8 @@
 .NET Core is an open-source, general-purpose development platform
-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.
+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 .NET application.
-If you want to build apps, install .NET Core SDK (dotnet-sdk), which contais this runtime too.
+If you want to build apps, install .NET Core SDK (dotnet-sdk), which
+contains this runtime too.
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 b2e4333eab..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.2}
+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 ea3e34a383..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.2"
+VERSION="3.1.13"
 HOMEPAGE="https://dotnet.microsoft.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.visualstudio.microsoft.com/download/pr/38269fba-9fdb-4723-a14c-067cc316827d/53e4161da346d70404375fb8804ee91a/dotnet-runtime-3.1.2-linux-x64.tar.gz"
-MD5SUM_x86_64="1b90ee98380fa3889d54ce2b13fc970e"
+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-runtime/slack-desc b/development/dotnet-runtime/slack-desc
index eabecf6429..1a9e103999 100644
--- a/development/dotnet-runtime/slack-desc
+++ b/development/dotnet-runtime/slack-desc
@@ -8,10 +8,10 @@
               |-----handy-ruler------------------------------------------------------|
 dotnet-runtime: dotnet-runtime (Runtime for .NET Core applications)
 dotnet-runtime:
-dotnet-runtime: .NET Core is an open-source, general-purpose development platform 
-dotnet-runtime: maintained by Microsoft and the .NET community on GitHub. It's 
+dotnet-runtime: .NET Core is an open-source, general-purpose development platform
+dotnet-runtime: maintained by Microsoft and the .NET community on GitHub. It's
 dotnet-runtime: cross-platform (supporting Windows, macOS, and Linux) and can be used
-dotnet-runtime: to build device, cloud, and IoT applications. This package contains 
+dotnet-runtime: to build device, cloud, and IoT applications. This package contains
 dotnet-runtime: everything you need to run a .NET application. If you want to build
 dotnet-runtime: apps, install dotnet-sdk, which contains this runtime too.
 dotnet-runtime:
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 a55c59ac5d..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.200}
+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 3eb69b5460..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.200"
+VERSION="3.1.407"
 HOMEPAGE="https://dotnet.microsoft.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.visualstudio.microsoft.com/download/pr/daec2daf-b458-4ae1-9046-b8ba09b5fb49/733e2d73b41640d6e6bdf1cc6b9ef03b/dotnet-sdk-3.1.200-linux-x64.tar.gz"
-MD5SUM_x86_64="c2f0b603a55d965096970871cb8f8607"
+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/dte/dte.SlackBuild b/development/dte/dte.SlackBuild
index 9c7492cedf..1dda720864 100644
--- a/development/dte/dte.SlackBuild
+++ b/development/dte/dte.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dte
-VERSION=${VERSION:-1.8.2}
+VERSION=${VERSION:-1.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/dte/dte.info b/development/dte/dte.info
index ccef3b075c..568a797aab 100644
--- a/development/dte/dte.info
+++ b/development/dte/dte.info
@@ -1,8 +1,8 @@
 PRGNAM="dte"
-VERSION="1.8.2"
+VERSION="1.9.1"
 HOMEPAGE="https://craigbarnes.gitlab.io/dte"
-DOWNLOAD="https://craigbarnes.gitlab.io/dist/dte/dte-1.8.2.tar.gz"
-MD5SUM="e2b76d811812c533c544602478f7d1f3"
+DOWNLOAD="https://craigbarnes.gitlab.io/dist/dte/dte-1.9.1.tar.gz"
+MD5SUM="000eb36d075742417458a1a184b169ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/dwarf/README b/development/dwarf/README
deleted file mode 100644
index 7c976c45bd..0000000000
--- a/development/dwarf/README
+++ /dev/null
@@ -1,10 +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.SlackBuild b/development/dwarf/dwarf.SlackBuild
deleted file mode 100644
index 97bd5c4aa5..0000000000
--- a/development/dwarf/dwarf.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dwarf
-
-# Copyright 2015-2019 Eugene Wissner Dachau, Germany
-# 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=dwarf
-VERSION=${VERSION:-20190529}
-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/libdwarf-$VERSION.tar.gz
-cd libdwarf-$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="-I/usr/include/libelf $SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --enable-shared \
-  --build=$ARCH-slackware-linux
-
-cd libdwarf
-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
-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/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/dwarf/slack-desc b/development/dwarf/slack-desc
deleted file mode 100644
index 5a22cf812c..0000000000
--- a/development/dwarf/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------------------------------------------------------|
-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:
diff --git a/development/dwz/README b/development/dwz/README
new file mode 100644
index 0000000000..7a677ec267
--- /dev/null
+++ b/development/dwz/README
@@ -0,0 +1,15 @@
+dwz is a dwarf compressor
+
+DWARF optimization and duplicate removal tool
+
+dwz is a program that attempts to optimize DWARF debugging
+information contained in ELF shared libraries and ELF executables for
+size, by replacing DWARF information representation with equivalent
+smaller representation where possible and by reducing the amount of
+duplication using techniques from DWARF standard appendix E -
+creating DW_TAG_partial_unit compilation units (CUs) for duplicated
+information and using DW_TAG_imported_unit to import it into each CU
+that needs it.
+
+sourcecode licence is GPL2. see COPYING and COPYING.RUNTIME for more
+details.
diff --git a/development/dwz/dwz.SlackBuild b/development/dwz/dwz.SlackBuild
new file mode 100644
index 0000000000..8a19847c9c
--- /dev/null
+++ b/development/dwz/dwz.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for the dwz
+
+# Copyright 2020 Tim Dickson, dickson.tim@googlemail.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.
+
+#download from mirrors.kernel.org/sourceware/dwx/releases/
+PRGNAM=dwz
+VERSION=${VERSION:-0.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
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+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 {} \;
+
+# Fix man installation path (the original works due to a link in slackware from /usr/share/man
+# to /usr/man , but we may as well install it in the right place)
+sed -i 's_^mandir.*_mandir = /usr/man_g' Makefile
+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
+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/dwz/dwz.info b/development/dwz/dwz.info
new file mode 100644
index 0000000000..f79e5a1950
--- /dev/null
+++ b/development/dwz/dwz.info
@@ -0,0 +1,10 @@
+PRGNAM="dwz"
+VERSION="0.14"
+HOMEPAGE="https://sourceware.org/git/?p=dwz.git;a=summary"
+DOWNLOAD="http://mirrors.kernel.org/sourceware/dwz/releases/dwz-0.14.tar.xz"
+MD5SUM="1f1225898bd40d63041d54454fcda5b6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
diff --git a/development/dwz/slack-desc b/development/dwz/slack-desc
new file mode 100644
index 0000000000..1120b63aeb
--- /dev/null
+++ b/development/dwz/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------------------------------------------------------|
+dwz: dwz (a dwarf compressor)
+dwz:
+dwz: DWARF optimization and duplicate removal tool
+dwz: dwz is a program that attempts to optimize DWARF debugging
+dwz: information contained in ELF shared libraries and ELF executables for
+dwz: size, by replacing DWARF information representation with equivalent
+dwz: smaller representation where possible and by reducing the amount of
+dwz: duplication using techniques from DWARF standard appendix E -
+dwz: creating DW_TAG_partial_unit compilation units (CUs) for duplicated
+dwz: information and using DW_TAG_imported_unit to import it into each CU
+dwz: that needs it. see https://sourceware.org/git/?p=dwz.git;a=summary
diff --git a/development/eagle/README b/development/eagle/README
index 3cefddac16..2e9da555e3 100644
--- a/development/eagle/README
+++ b/development/eagle/README
@@ -1,21 +1,22 @@
-EAGLE is an easy to use, yet powerful tool for designing printed circuit
-boards (PCBs). The name EAGLE is an acronym, which stands for Easily
-Applicable Graphical Layout Editor. The program consists of three main
-modules (Layout Editor, Schematic Editor and Autorouter), which are
-embedded in a single user interface.
+EAGLE is an easy to use, yet powerful tool for designing printed
+circuit boards (PCBs). The name EAGLE is an acronym, which stands for
+Easily Applicable Graphical Layout Editor. The program consists of
+three main modules (Layout Editor, Schematic Editor and Autorouter),
+which are embedded in a single user interface.
 
-If EAGLE prompts for a license key the first time it is run, you can select
-EAGLE Express option to run EAGLE as a free version or purchase a license to
-unlock advanced features.
+If EAGLE prompts for a license key the first time it is run, you can
+select EAGLE Express option to run EAGLE as a free version or purchase
+a license to unlock advanced features.
 
-After the key is accepted, you may wish to change the permission of
-/opt/eagle-VERSION/bin/eagle.key so that it is no longer world-writable:
+After the key is accepted, you may wish to change the permission
+of /opt/eagle-VERSION/bin/eagle.key so that it is no longer
+world-writable:
 
   # chmod 0644 /opt/eagle-<version>/bin/eagle.key
 
-This script installs the English documentation by default. Starting from
-version 5.10.0, German and (some) Chinese documentation is included as well.
-To select them, run this script as:
+This script installs the English documentation by default. Starting
+from version 5.10.0, German and (some) Chinese documentation is
+included as well.  To select them, run this script as:
 
   # DOC_LANG=<xx> ./eagle.SlackBuild
 
diff --git a/development/eclim/README b/development/eclim/README
index 9bc3aca83a..86b549b422 100644
--- a/development/eclim/README
+++ b/development/eclim/README
@@ -1,8 +1,8 @@
 eclim - The power of Eclipse in your favourite editor.
 
-Eclim provides the ability to access Eclipse code editing features via the
-command line or a local network connection, allowing those features to be
-integrated with your favourite editor.
+Eclim provides the ability to access Eclipse code editing features via
+the command line or a local network connection, allowing those features
+to be integrated with your favourite editor.
 
 This package builds against eclipse-java, but can also be built against
 eclipse-jee or eclipse-cpp instead. In that case, pass the eclipse home
diff --git a/development/eclipse-php/README b/development/eclipse-php/README
index 6e65655c66..4e15e24c15 100644
--- a/development/eclipse-php/README
+++ b/development/eclipse-php/README
@@ -1,5 +1,6 @@
-The essential tools for any PHP developer, including a PHP language support,
-Git client, Mylyn and editors for JavaScript, HTML, CSS and XML.
+The essential tools for any PHP developer, including a PHP language
+support, Git client, Mylyn and editors for JavaScript, HTML, CSS and
+XML.
 
 This package includes:
 
@@ -12,7 +13,7 @@ This package includes:
 UPGRADING:
 **********
 if you find an error during Eclipse initialization, check
-this two files:
+these two files:
 
 /opt/eclipse-php/configuration/config.ini
 /opt/eclipse-php/eclipse.ini
diff --git a/development/eclipse-platform/README b/development/eclipse-platform/README
new file mode 100644
index 0000000000..d1c747f35b
--- /dev/null
+++ b/development/eclipse-platform/README
@@ -0,0 +1,7 @@
+eclipse-platform (Eclipse IDE)
+
+A minimal Eclipse installation suitable for complete per-user
+customization with the built-in Eclipse package manager
+
+Homepage:
+https://www.eclipse.org/
diff --git a/development/eclipse-platform/doinst.sh b/development/eclipse-platform/doinst.sh
new file mode 100644
index 0000000000..d7c029786b
--- /dev/null
+++ b/development/eclipse-platform/doinst.sh
@@ -0,0 +1,20 @@
+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
+}
+
+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
+
+config opt/eclipse-platform/configuration/config.ini.new
+config opt/eclipse-platform/eclipse.ini.new
diff --git a/development/eclipse-platform/eclipse-platform.SlackBuild b/development/eclipse-platform/eclipse-platform.SlackBuild
new file mode 100644
index 0000000000..fa87427857
--- /dev/null
+++ b/development/eclipse-platform/eclipse-platform.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Slackware build script for eclipse-platform
+
+# Copyright 2020, 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=eclipse-platform
+VERSION=${VERSION:-4.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
+fi
+
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH is not supported for $PRGNAM-$VERSION"
+  exit 1
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+SRCNAM=eclipse
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+tar xvf $CWD/$PRGNAM-$VERSION-linux-gtk-$ARCH.tar.?z*
+
+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 . -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 {opt,usr/{bin,doc/$PRGNAM-$VERSION}}
+mv $SRCNAM opt/$PRGNAM
+
+mv opt/$PRGNAM/configuration/config.ini opt/$PRGNAM/configuration/config.ini.new
+mv opt/$PRGNAM/eclipse.ini opt/$PRGNAM/eclipse.ini.new
+
+ln -s ../../opt/$PRGNAM/$SRCNAM usr/bin/$PRGNAM
+ln -s ../../../opt/$PRGNAM/readme/readme_eclipse.html usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+install -D -m 0644 $CWD/$PRGNAM.desktop usr/share/applications/$PRGNAM.desktop
+install -D -m 0644 "$(find . -name '*eclipse48.png')" usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p install
+cat $CWD/slack-desc > install/slack-desc
+cat $CWD/doinst.sh > install/doinst.sh
+
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/eclipse-platform/eclipse-platform.desktop b/development/eclipse-platform/eclipse-platform.desktop
new file mode 100644
index 0000000000..225de5bc8d
--- /dev/null
+++ b/development/eclipse-platform/eclipse-platform.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Exec=eclipse-platform
+Name=Eclipse IDE
+GenericName=Eclipse IDE
+Icon=eclipse-platform
+StartupNotify=true
+Categories=Development;
diff --git a/development/eclipse-platform/eclipse-platform.info b/development/eclipse-platform/eclipse-platform.info
new file mode 100644
index 0000000000..d1f4913090
--- /dev/null
+++ b/development/eclipse-platform/eclipse-platform.info
@@ -0,0 +1,10 @@
+PRGNAM="eclipse-platform"
+VERSION="4.19"
+HOMEPAGE="https://www.eclipse.org/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+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/eclipse-platform/slack-desc b/development/eclipse-platform/slack-desc
new file mode 100644
index 0000000000..327a2fd802
--- /dev/null
+++ b/development/eclipse-platform/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------------------------------------------------------|
+eclipse-platform: eclipse-platform (Eclipse IDE)
+eclipse-platform:
+eclipse-platform: A minimal Eclipse installation suitable for complete per-user
+eclipse-platform: customization with the built-in Eclipse package manager
+eclipse-platform:
+eclipse-platform: Homepage:
+eclipse-platform: https://www.eclipse.org/
+eclipse-platform:
+eclipse-platform:
+eclipse-platform:
+eclipse-platform:
diff --git a/development/edb-debugger/README b/development/edb-debugger/README
index 4dfdbd11fc..c371cc4240 100644
--- a/development/edb-debugger/README
+++ b/development/edb-debugger/README
@@ -1,5 +1,6 @@
-edb (Evan's Debugger) is a graphical, Qt4-based debugger similar to OllyDbg,
-written on top of the ptrace API. It is built on a plugin-based architecture.
+edb (Evan's Debugger) is a graphical, Qt4-based debugger similar
+to OllyDbg, written on top of the ptrace API. It is built on a
+plugin-based architecture.
 
 Its features include:
 
@@ -12,8 +13,8 @@ Its features include:
 * Basic instruction analysis
 * View/Dump memory regions
 * Effective address inspection
-* The data dump view is tabbed, allowing you to have several views of memory
-  open at the same time and quickly switch between them.
+* The data dump view is tabbed, allowing you to have several views
+  of memory open at the same time and quickly switch between them.
 * Importing and generation of symbol maps
 
 * Plugins:
diff --git a/development/egypt/README b/development/egypt/README
index 1b8590add9..8b5b3fca5c 100644
--- a/development/egypt/README
+++ b/development/egypt/README
@@ -1,5 +1,6 @@
-Egypt is a simple tool for creating call graphs of C programs. Egypt neither
-analyzes source code nor lays out graphs. Instead, it leaves the source code
-analysis to GCC and the graph layout to Graphviz, both of which are better at
-their respective jobs than egypt itself could ever hope to be. Egypt is simply a
-very small Perl script that glues these existing tools together.
+Egypt is a simple tool for creating call graphs of C programs. Egypt
+neither analyzes source code nor lays out graphs. Instead, it leaves
+the source code analysis to GCC and the graph layout to Graphviz, both
+of which are better at their respective jobs than egypt itself could
+ever hope to be. Egypt is simply a very small Perl script that glues
+these existing tools together.
diff --git a/development/electron/electron.SlackBuild b/development/electron/electron.SlackBuild
index 7eca2a8239..acc4416a96 100644
--- a/development/electron/electron.SlackBuild
+++ b/development/electron/electron.SlackBuild
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=electron
-VERSION=${VERSION:-1.4.16}
+VERSION=${VERSION:-10.0.0_beta.1}
+SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,11 +57,10 @@ 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-v$VERSION-linux-$PKG_ARCH.zip
-tar xvf $CWD/node-v$VERSION.tar.gz
+rm -rf $PRGNAM-$SRCVER
+mkdir $PRGNAM-$SRCVER
+cd $PRGNAM-$SRCVER
+unzip $CWD/$PRGNAM-v$SRCVER-linux-$PKG_ARCH.zip
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -80,15 +80,10 @@ cp -a *.bin *.pak *.so $PRGNAM icudtl.dat version locales resources \
   ln -sf ../share/$PRGNAM/$PRGNAM ${PRGNAM}
 )
 
-# Install node headers
-mkdir -p $PKG/usr/share/$PRGNAM/node
-cp -a node-v$VERSION/* $PKG/usr/share/$PRGNAM/node
-
 # Install prebuilt version for build binary apps
 if [ "${INSTALL_ZIP:-no}" != no ]; then
   mkdir -p $PKG/usr/share/$PRGNAM/release
-  cp $CWD/$PRGNAM-v$VERSION-linux-$PKG_ARCH.zip $PKG/usr/share/$PRGNAM/release
-  cp $CWD/SHASUMS256.txt $PKG/usr/share/$PRGNAM/release
+  cp $CWD/$PRGNAM-v$SRCVER-linux-$PKG_ARCH.zip $PKG/usr/share/$PRGNAM/release
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/electron/electron.info b/development/electron/electron.info
index 66fb23c5f5..6074f2b12f 100644
--- a/development/electron/electron.info
+++ b/development/electron/electron.info
@@ -1,18 +1,10 @@
 PRGNAM="electron"
-VERSION="1.4.16"
+VERSION="10.0.0_beta.1"
 HOMEPAGE="https://electron.atom.io/"
-DOWNLOAD="https://github.com/electron/electron/releases/download/v1.4.16/electron-v1.4.16-linux-ia32.zip \
-          https://atom.io/download/atom-shell/v1.4.16/node-v1.4.16.tar.gz \
-          https://github.com/electron/electron/releases/download/v1.4.16/SHASUMS256.txt"
-MD5SUM="652fa09cd457f76b315ec5caba4a1c9f \
-        4966fe03ea2e9c6df6e96d2f230084b5 \
-        b5e47dfdaeab4029eb5762d93593f390"
-DOWNLOAD_x86_64="https://github.com/electron/electron/releases/download/v1.4.16/electron-v1.4.16-linux-x64.zip \
-        https://atom.io/download/atom-shell/v1.4.16/node-v1.4.16.tar.gz \
-        https://github.com/electron/electron/releases/download/v1.4.16/SHASUMS256.txt"
-MD5SUM_x86_64="ad3616c2e2f26eeac8acab3108ef0d8b \
-        4966fe03ea2e9c6df6e96d2f230084b5 \
-        b5e47dfdaeab4029eb5762d93593f390"
+DOWNLOAD="https://github.com/electron/electron/releases/download/v10.0.0-beta.1/electron-v10.0.0-beta.1-linux-ia32.zip"
+MD5SUM="1fb8f937c6ddf47cb6c5b6b2cfc04433"
+DOWNLOAD_x86_64="https://github.com/electron/electron/releases/download/v10.0.0-beta.1/electron-v10.0.0-beta.1-linux-x64.zip"
+MD5SUM_x86_64="277eed276bbbd25ec492f8646fe78048"
 REQUIRES=""
 MAINTAINER="DhabyX"
 EMAIL="slack.dhabyx@gmail.com"
diff --git a/development/energia/README b/development/energia/README
index 7092e5ce87..7d1963f934 100644
--- a/development/energia/README
+++ b/development/energia/README
@@ -13,16 +13,17 @@ with designers and artists in mind to encourage a community where both
 beginners and experts from around the world share ideas, knowledge and
 their collective experience.
 
-The Energia team adopts the philosophy of learning by doing and strives to
-make it easy to work directly with the hardware. Professional engineers,
-entrepreneurs, makers, and students can all benefit from the ease of
-use Energia brings to the microcontroller.
+The Energia team adopts the philosophy of learning by doing and strives
+to make it easy to work directly with the hardware. Professional
+engineers, entrepreneurs, makers, and students can all benefit from the
+ease of use Energia brings to the microcontroller.
 
-Energia started out to bring the Wiring and Arduino framework to the Texas
-Instruments MSP430 LaunchPad. Texas Instruments offers a MSP430, TM4C,
-C2000, and CC3200 LaunchPad. The LaunchPad is a low-cost microcontroller
-board that is made by Texas Instruments. The latest release of Energia
-supports the majority of the LaunchPad product offerings.
+Energia started out to bring the Wiring and Arduino framework to
+the Texas Instruments MSP430 LaunchPad. Texas Instruments offers a
+MSP430, TM4C, C2000, and CC3200 LaunchPad. The LaunchPad is a low-cost
+microcontroller board that is made by Texas Instruments. The latest
+release of Energia supports the majority of the LaunchPad product
+offerings.
 
 Together with Energia, LaunchPad can be used to develop interactive
 objects, taking inputs from a variety of switches or sensors, and
diff --git a/development/enki/README b/development/enki/README
index 4856365d61..d94ea152ab 100644
--- a/development/enki/README
+++ b/development/enki/README
@@ -1,7 +1,7 @@
 Enki is a text editor for programmers. It is:
 
     User friendly. Intuitive interface. Works out of the box. You don't
-    have to read a lot of docs
+    have to read a lot of docs.
 
     Hacker friendly. Work as quickly as possible. You don't need your
     mouse for coding.
@@ -9,7 +9,8 @@ Enki is a text editor for programmers. It is:
     Lighweight. Some IDEs show splashscreen. Enki will never do it. It
     just starts quickly.
 
-    Advanced. You invent software. An editor helps you to do a routine job.
+    Advanced. You invent software. An editor helps you to do a routine
+    job.
 
     Extensible. Operating systems are designed for running
     applications. Enki is designed for running plugins.
diff --git a/development/envytools/README b/development/envytools/README
index 9f8ddcec61..a60e326b96 100644
--- a/development/envytools/README
+++ b/development/envytools/README
@@ -3,11 +3,15 @@ Tools for people envious of nvidia's blob driver.
 Contents:
 
 * docs: plain-text documentation of the GPUs, nVidia binary driver, and
-the tools (in-sync HTML version at http://envytools.rtfd.org)
-* envydis: Disassembler and assembler for various ISAs found on nvidia GPUs
-* rnn: Tools and libraries for the rules-ng-ng XML register database format
-* rnndb: rnn database of nvidia MMIO registers, FIFO methods, and memory structures.
-* nvbios: Tools to decode the card description structures found in nvidia VBIOS
+  the tools (in-sync HTML version at http://envytools.rtfd.org)
+* envydis: Disassembler and assembler for various ISAs found on nvidia
+  GPUs
+* rnn: Tools and libraries for the rules-ng-ng XML register database
+  format
+* rnndb: rnn database of nvidia MMIO registers, FIFO methods, and
+  memory structures.
+* nvbios: Tools to decode the card description structures found in
+  nvidia VBIOS
 * nva: Tools to directly access the GPU registers
 * vstream: Tools to decode and encode raw video bitstreams
 * vdpow: A tool aiding in VP3 reverse engineering
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/README b/development/eovim/README
index 0fc7a3cf28..4eed822fa4 100644
--- a/development/eovim/README
+++ b/development/eovim/README
@@ -1,6 +1,8 @@
-Eovim is a client for Neovim written using the Enlightenment Foundation Library.
+Eovim is a client for Neovim written using the Enlightenment Foundation
+Library.
 
 Eovim is written in plain C, with the amazing EFL, adding value to the
-text-only neovim with a minimal runtime overhead. If you don't like the
-externalized UI, it can be turned off, or changed via themes. Eovim also
-provides its own plugin system, so the UI can be modified directly from neovim.
+text-only neovim with a minimal runtime overhead. If you don't like
+the externalized UI, it can be turned off, or changed via themes. Eovim
+also provides its own plugin system, so the UI can be modified directly
+from neovim.
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/epydoc/README b/development/epydoc/README
index 22bc8650bf..3ccc56eea2 100644
--- a/development/epydoc/README
+++ b/development/epydoc/README
@@ -1,6 +1,7 @@
 Epydoc is a tool for generating API documentation for Python modules,
-based on their docstrings. For an example of epydoc's output, see the API
-documentation for epydoc itself (html, pdf). A lightweight markup language
-called epytext can be used to format docstrings, and to add information
-about specific fields, such as parameters and instance variables. Epydoc also
-understands docstrings written in reStructuredText, Javadoc, and plaintext.
+based on their docstrings. For an example of epydoc's output, see
+the API documentation for epydoc itself (html, pdf). A lightweight
+markup language called epytext can be used to format docstrings,
+and to add information about specific fields, such as parameters and
+instance variables. Epydoc also understands docstrings written in
+reStructuredText, Javadoc, and plaintext.
diff --git a/development/eric/README b/development/eric/README
index c7f1329639..4b128584f2 100644
--- a/development/eric/README
+++ b/development/eric/README
@@ -1,7 +1,8 @@
-Eric is a full featured Python and Ruby editor and IDE, written in python. It
-is based on the cross platform Qt gui toolkit, integrating the highly flexible
-Scintilla editor control. It is designed to be usable as everdays' quick and
-dirty editor as well as being usable as a professional project management tool
-integrating many advanced features Python offers the professional coder. eric4
-includes a plugin system, which allows easy extension of the IDE functionality
-with plugins downloadable from the net.
+Eric is a full featured Python and Ruby editor and IDE, written in
+python. It is based on the cross platform Qt gui toolkit, integrating
+the highly flexible Scintilla editor control. It is designed to be
+usable as everdays' quick and dirty editor as well as being usable as a
+professional project management tool integrating many advanced features
+Python offers the professional coder. eric4 includes a plugin system,
+which allows easy extension of the IDE functionality with plugins
+downloadable from the net.
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/flawfinder/README b/development/flawfinder/README
index 75c5d18494..d5c1a02cb4 100644
--- a/development/flawfinder/README
+++ b/development/flawfinder/README
@@ -1,4 +1,4 @@
-Flawfinder is a program that examines source code and reports possible 
-security weaknesses ("flaws") sorted by risk level. It's very useful for 
-quickly finding and removing at least some potential security problems 
-before a program is widely released to the public.
+Flawfinder is a program that examines source code and reports possible
+security weaknesses ("flaws") sorted by risk level. It's very useful
+for quickly finding and removing at least some potential security
+problems before a program is widely released to the public.
diff --git a/development/flow/README b/development/flow/README
index 1d46febfd4..f5138eec45 100644
--- a/development/flow/README
+++ b/development/flow/README
@@ -8,14 +8,15 @@ program that are dynamic in nature can easily bypass the type checker
 so you can mix statically typed code with dynamic code.
 
 Flow also supports a highly expressive type language. Flow types can
-express much more fine-grained distinctions than traditional type systems.
-For example, Flow helps you catch errors involving null, unlike most
-type systems.
+express much more fine-grained distinctions than traditional type
+systems.  For example, Flow helps you catch errors involving null,
+unlike most type systems.
 
 NOTE:
 
-Flow does not support 32-bit systems, but there is a commented out patch
-included here that will allow it to build. Note that although `flow`
-will compile and run on a 32-bit system with this patch, it will not pass
-the built-in tests. The patch is included in the hopes that someone brave
-enough will investigate this and help upstream deliver 32-bit support.
+Flow does not support 32-bit systems, but there is a commented out
+patch included here that will allow it to build. Note that although
+`flow` will compile and run on a 32-bit system with this patch, it will
+not pass the built-in tests. The patch is included in the hopes that
+someone brave enough will investigate this and help upstream deliver
+32-bit support.
diff --git a/development/fly/README b/development/fly/README
index da0dc24d27..7e45693506 100644
--- a/development/fly/README
+++ b/development/fly/README
@@ -2,5 +2,6 @@ fly
 
 fly is a command-line tool for Concourse administration.
 
-Concourse is an automation system written in Go. It is most commonly used for CI/CD,
-and is built to scale to any kind of automation pipeline, from simple to complex.
+Concourse is an automation system written in Go. It is most commonly
+used for CI/CD, and is built to scale to any kind of automation
+pipeline, from simple to complex.
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 b72e504d4d..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
 
 ------------------------------------------------------------------------
 
@@ -66,10 +67,10 @@ the check-in timestamp is used as the version string.  For example, the
 package name could be "fossil-20200320T040201-x86_64-1_SBo.tgz".
 
 To download the latest trunk development version of Fossil, type:
-$ wget http://fossil-scm.org/home/tarball/fossil-src.tar.gz
+$ wget https://fossil-scm.org/home/tarball/fossil-src.tar.gz
 
 To download a specific version of Fossil, type:
-$ wget http://fossil-scm.org/home/tarball/$VERSION/fossil-src.tar.gz
+$ wget https://fossil-scm.org/home/tarball/$VERSION/fossil-src.tar.gz
 
-For more information on the allowable $VERSION formats, see:
-http://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki
+For more information about the allowable $VERSION formats, see:
+https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki
diff --git a/development/fossil/fossil.SlackBuild b/development/fossil/fossil.SlackBuild
index 26f0537af5..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.10}
+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 825bd1a893..eaa464d81d 100644
--- a/development/fossil/fossil.info
+++ b/development/fossil/fossil.info
@@ -1,8 +1,8 @@
 PRGNAM="fossil"
-VERSION="2.10"
+VERSION="2.14"
 HOMEPAGE="https://fossil-scm.org/"
-DOWNLOAD="https://fossil-scm.org/home/uv/fossil-src-2.10.tar.gz"
-MD5SUM="6749ddea8924ef590ed3279713f397fd"
+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/fpc/README b/development/fpc/README
index 66c1c3b148..f92e75fa8c 100644
--- a/development/fpc/README
+++ b/development/fpc/README
@@ -1,9 +1,9 @@
-Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional Pascal compiler.
-It is available for different processors: Intel x86, Amd64/x86_64, PowerPC,
-PowerPC64, Sparc, ARM. The discontinued 1.0 version also supports the
-Motorola 680x0. The following operating systems are supported: Linux, FreeBSD,
-Mac OS X/Darwin, DOS, Win32, Win64, WinCE, OS/2, Netware (libc and classic)
-and MorphOS.
+Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional Pascal
+compiler.  It is available for different processors: Intel x86,
+Amd64/x86_64, PowerPC, PowerPC64, Sparc, ARM. The discontinued 1.0
+version also supports the Motorola 680x0. The following operating
+systems are supported: Linux, FreeBSD, Mac OS X/Darwin, DOS, Win32,
+Win64, WinCE, OS/2, Netware (libc and classic) and MorphOS.
 
-NOTE:
-This package conflict with ptop as both install ptop binary in /usr/bin.
+NOTE: This package conflicts with ptop, as both install a ptop binary
+in /usr/bin.
diff --git a/development/freetds/README b/development/freetds/README
index d3801a6834..b62ce42d58 100644
--- a/development/freetds/README
+++ b/development/freetds/README
@@ -1,7 +1,8 @@
 FreeTDS (free implementation of the Tabular Data Stream protocol)
 
-FreeTDS is a free implementation of Sybase's db-lib, ct-lib, and ODBC libraries.
-FreeTDS builds and runs on every flavor of unix-like systems we've heard of, as
-well as Win32 (with or without Cygwin), VMS, and Mac OS X. Failure to build on
-your system is probably considered a bug. It has C language bindings, and works
-also with Perl and PHP, among others.
+FreeTDS is a free implementation of Sybase's db-lib, ct-lib, and
+ODBC libraries.  FreeTDS builds and runs on every flavor of unix-like
+systems we've heard of, as well as Win32 (with or without Cygwin), VMS,
+and Mac OS X. Failure to build on your system is probably considered
+a bug. It has C language bindings, and works also with Perl and PHP,
+among others.
diff --git a/development/frobtads/README b/development/frobtads/README
index 8e0cc2c75b..1f85d5a3b2 100644
--- a/development/frobtads/README
+++ b/development/frobtads/README
@@ -8,8 +8,9 @@ compilers for both TADS 2 and 3.
 The latest text-only TADS features are supported, including colored text
 and backgrounds, TADS 3 banner windows, and timed input.
 
-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) 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/
 
 Package includes:
 
diff --git a/development/fsharp/README b/development/fsharp/README
index f8c5bdef09..2c0b2cfab1 100644
--- a/development/fsharp/README
+++ b/development/fsharp/README
@@ -1,3 +1,3 @@
-F# is a mature, open source, cross-platform, functional-first programming
-language.  It empowers users and organizations to tackle complex computing
-problems with simple, maintainable and robust code.
+F# is a mature, open source, cross-platform, functional-first
+programming language.  It empowers users and organizations to tackle
+complex computing problems with simple, maintainable and robust code.
diff --git a/development/ftnchek/README b/development/ftnchek/README
index a5b2be5cfa..6b1166f254 100644
--- a/development/ftnchek/README
+++ b/development/ftnchek/README
@@ -1,8 +1,9 @@
 ftnchek (a static analyzer for Fortran 77 programs)
 
-ftnchek (short for Fortran checker) is designed to detect certain errors
-in a Fortran program that a compiler usually does not.
+ftnchek (short for Fortran checker) is designed to detect certain
+errors in a Fortran program that a compiler usually does not.
 
-ftnchek is not primarily intended to detect syntax errors. Its purpose is
-to assist the user in finding semantic errors. Semantic errors are legal
-in the Fortran language but are wasteful or may cause incorrect operation.
+ftnchek is not primarily intended to detect syntax errors. Its purpose
+is to assist the user in finding semantic errors. Semantic errors are
+legal in the Fortran language but are wasteful or may cause incorrect
+operation.
diff --git a/development/gambas3/README b/development/gambas3/README
index 0d63fa9df3..bdcd0affcd 100644
--- a/development/gambas3/README
+++ b/development/gambas3/README
@@ -5,14 +5,14 @@ ODBC and SQLite databases, pilot applications with D-Bus, translate
 your program into any language, create network applications easily,
 make 3D OpenGL applications, make CGI web applications, and so on.
 
-alure, gtkglext, imlib2, unixODBC, sqlite2, postgresql, sdl2_image,
-sdl2_ttf, sdl2_mixer, translate-shell and qt5-webkit are optional
+alure, gtkglext, imlib2, unixODBC, sqlite2, postgresql, SDL2_image,
+SDL2_ttf, SDL2_mixer, translate-shell and qt5-webkit are optional
 dependencies.
 
 Note: You should uninstall any present version of gambas before
 creating this package. To enable JIT please install llvm from extra.
 
-It can create slackware packages of your programs, but bear in mind
-that the install location is fixed as /usr/bin
+The Gambas ide can create slackware packages of your gambas programs,
+but bear in mind that the install location is fixed as /usr/bin
 
 note: installing llvm from slackware/extra is recommended.
diff --git a/development/gambas3/gambas3.SlackBuild b/development/gambas3/gambas3.SlackBuild
index c8326112f1..0c045bc004 100644
--- a/development/gambas3/gambas3.SlackBuild
+++ b/development/gambas3/gambas3.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for Gambas 3
 
+# updates since version 3.11.2 Copyright 2018-2020 Tim Dickson dickson.tim@googlemail.com
 # Copyright 2012-2015  Fridrich von Stauffenberg <cancellor2@gmail.com>
 # All rights reserved.
 #
@@ -22,11 +23,9 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# updates since version 3.11.2 Copyright 2018/9/2020 Tim Dickson dickson.tim@googlemail.com
-
 PRGNAM=gambas3
 SRCNAM=gambas
-VERSION=${VERSION:-3.14.3}
+VERSION=${VERSION:-3.15.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,7 +83,13 @@ LLVM_CONFIG=llvm-config \
   $qt5
 
 make
-make -j1 install-strip DESTDIR=$PKG XDG_UTILS=""
+make -j1 install DESTDIR=$PKG XDG_UTILS=""
+
+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 {} \;
 
 mkdir -p $PKG/usr/share/icons/hicolor/{scalable/apps,48x48/apps,64x64/mimetypes}
 cp -a app/desktop/$PRGNAM.svg $PKG/usr/share/icons/hicolor/scalable/apps
diff --git a/development/gambas3/gambas3.info b/development/gambas3/gambas3.info
index 82c161834c..696eca2bbc 100644
--- a/development/gambas3/gambas3.info
+++ b/development/gambas3/gambas3.info
@@ -1,10 +1,10 @@
 PRGNAM="gambas3"
-VERSION="3.14.3"
+VERSION="3.15.2"
 HOMEPAGE="http://gambas.sourceforge.net"
-DOWNLOAD="https://gitlab.com/gambas/gambas/-/archive/3.14.3/gambas-3.14.3.tar.bz2"
-MD5SUM="734b5f0bcd750e5727027b62a5545a56"
+DOWNLOAD="https://gitlab.com/gambas/gambas/-/archive/3.15.2/gambas-3.15.2.tar.bz2"
+MD5SUM="f5ec25ef9b3097593fb189171a4f2b8b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="%README%"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"
diff --git a/development/gcc-d/README b/development/gcc-d/README
index 0d3985f0fd..09bb108754 100644
--- a/development/gcc-d/README
+++ b/development/gcc-d/README
@@ -1,12 +1,12 @@
 This is GDC (GNU D Compiler), the D frontend for GCC.
 
-D is a general-purpose programming language with static typing, systems-level
-access, and C-like syntax. With the D Programming Language, write fast, read
-fast, and run fast.
+D is a general-purpose programming language with static typing,
+systems-level access, and C-like syntax. With the D Programming
+Language, write fast, read fast, and run fast.
 
-This package provides GCC 8 with C, C++ and D. It doesn't conflict with GCC 5
-shipped by Slackware.
+This package provides GCC 8 with C, C++ and D. It doesn't conflict with
+GCC 5 shipped by Slackware.
 
-Since GCC is built several times to bootstrap the D frontend written in D with
-an older C++-version, be sure you have about 9 GB of disk space in your
-temporary directory.
+Since GCC is built several times to bootstrap the D frontend written in
+D with an older C++-version, be sure you have about 9 GB of disk space
+in your temporary directory.
diff --git a/development/gcclegacy494/README b/development/gcclegacy494/README
index 54df65a6ff..df52926ff9 100644
--- a/development/gcclegacy494/README
+++ b/development/gcclegacy494/README
@@ -1,9 +1,8 @@
-The GNU Compiler Collection includes front ends for C, C++, Objective-C,
-Fortran, Ada, and Go, as well as libraries for these languages
-(libstdc++,...). GCC was originally written as the compiler for the GNU
-operating system. The GNU system was developed to be 100% free software, free
-in the sense that it respects the user's freedom.
+The GNU Compiler Collection includes front ends for C, C++,
+Objective-C, Fortran, Ada, and Go, as well as libraries for these
+languages (libstdc++,...). GCC was originally written as the compiler
+for the GNU operating system. The GNU system was developed to be 100%
+free software, free in the sense that it respects the user's freedom.
 
-
-This script only compiles the GNU C, and C++ front ends. This script was
-written with the intention to compile a better PaleMoon.
+This script only compiles the GNU C, and C++ front ends. This script
+was written with the intention to compile a better PaleMoon.
diff --git a/development/gede/gede.SlackBuild b/development/gede/gede.SlackBuild
index b4f89ab1be..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.1}
+VERSION=${VERSION:-2.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/gede/gede.info b/development/gede/gede.info
index 2ee6b1368c..de179024cf 100644
--- a/development/gede/gede.info
+++ b/development/gede/gede.info
@@ -1,10 +1,10 @@
 PRGNAM="gede"
-VERSION="2.15.4"
-HOMEPAGE="http://acidron.com/gede/"
-DOWNLOAD="http://gede.acidron.com/uploads/source/gede-2.16.1.tar.xz"
-MD5SUM="4164e7180687117abfe62b1509ad03bb"
+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/README b/development/gedit/README
index 5d9ef71924..d3d0133d5d 100644
--- a/development/gedit/README
+++ b/development/gedit/README
@@ -1,3 +1,3 @@
-gedit is the official text editor of the GNOME desktop environment. While
-aiming at simplicity and ease of use, gedit is a powerful general purpose
-text editor.
+gedit is the official text editor of the GNOME desktop
+environment. While aiming at simplicity and ease of use, gedit is a
+powerful general purpose text editor.
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/gengetopt/README b/development/gengetopt/README
index 574e80ad1c..c753424279 100644
--- a/development/gengetopt/README
+++ b/development/gengetopt/README
@@ -1 +1,2 @@
-Gengetopt is a tool to write command line option parsing code for C programs.
+Gengetopt is a tool to write command line option parsing code for C
+programs.
diff --git a/development/gforth/README b/development/gforth/README
index 7baf268f5e..e619ec80bf 100644
--- a/development/gforth/README
+++ b/development/gforth/README
@@ -1,7 +1,7 @@
 GNU Forth interpreter that is ANSI compliant.
 
-NOTE: If you Compile or otherwise install the Ffcall package, GForth will
-also have the ability to call libraries of C software. Ffcall must be
-installed first in order for GForth to detect this, however.
-However, GForth can run on its own without Ffcall. For this reason, Ffcall
-is not listed as a dependency.
+NOTE: If you Compile or otherwise install the Ffcall package, GForth
+will also have the ability to call libraries of C software. Ffcall
+must be installed first in order for GForth to detect this, however.
+However, GForth can run on its own without Ffcall. For this reason,
+Ffcall is not listed as a dependency.
diff --git a/development/ghex/README b/development/ghex/README
new file mode 100644
index 0000000000..0bb79b17b4
--- /dev/null
+++ b/development/ghex/README
@@ -0,0 +1,17 @@
+ghex (hex editor with GTK+3 GUI)
+
+GHex allows the user to load data from any file, view and edit it in
+either hex or ASCII. Useful for debugging problems with object code
+or encodings. Also used by kids who cheat at computer games, by adding
+score or lives to saved games.
+
+Optional dependency: yelp. Required for viewing the built-in help
+(Help->Contents, or F1 key). Alternatively, an HTML version of the
+help is included in /usr/doc/ghex-$VERSION/html/index.html for your
+perusal (in English only, though).
+
+Note: Trying to copy/paste arbitrary binary data into or out of
+ghex isn't going to work very well, because modern GTK+ insists the
+copy buffer has to be UTF-8 encoded Unicode. The result is lots
+of "\Uffffffff" (meaning "Invalid UTF-8") rather than the binary
+data. There's nothing we can do to fix this without major surgery.
diff --git a/development/ghex/doinst.sh b/development/ghex/doinst.sh
new file mode 100644
index 0000000000..9b26fbab9d
--- /dev/null
+++ b/development/ghex/doinst.sh
@@ -0,0 +1,16 @@
+
+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
+
+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/development/ghex/ghex.1 b/development/ghex/ghex.1
new file mode 100644
index 0000000000..c30b0d8c13
--- /dev/null
+++ b/development/ghex/ghex.1
@@ -0,0 +1,85 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\"
+.\" $Id: ghex.1,v 1.1 2001/04/14 19:41:50 epg Exp $
+.\"
+.\" 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 GHEX 1 "April 14, 2001"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+ghex \- A GNOME Hex Editor
+.SH SYNOPSIS
+.B ghex
+.RI [ options ] " files" ...
+.SH DESCRIPTION
+This manual page documents briefly the
+.B ghex
+command.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+Instead, it has documentation in the GNOME help system.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBghex\fP allows the user to load data from any file, view and
+edit it in either hex or ascii. A must for anyone playing games
+that use non-ascii format for saving.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+
+Usage: ghex [OPTION...]
+
+GNOME options
+  --disable-sound             Disable sound server usage
+  --enable-sound              Enable sound server usage
+  --espeaker=HOSTNAME:PORT    Host:port on which the sound server to use is
+                              running
+  --version
+
+Help options
+  -?, --help                  Show this help message
+  --usage                     Display brief usage message
+
+GTK options
+  --gdk-debug=FLAGS           Gdk debugging flags to set
+  --gdk-no-debug=FLAGS        Gdk debugging flags to unset
+  --display=DISPLAY           X display to use
+  --sync                      Make X calls synchronous
+  --no-xshm                   Don't use X shared memory extension
+  --name=NAME                 Program name as used by the window manager
+  --class=CLASS               Program class as used by the window manager
+  --gxid_host=HOST
+  --gxid_port=PORT
+  --xim-preedit=STYLE
+  --xim-status=STYLE
+  --gtk-debug=FLAGS           Gtk+ debugging flags to set
+  --gtk-no-debug=FLAGS        Gtk+ debugging flags to unset
+  --g-fatal-warnings          Make all warnings fatal
+  --gtk-module=MODULE         Load an additional Gtk module
+
+GNOME GUI options
+  --disable-crash-dialog
+
+Session management options
+  --sm-client-id=ID           Specify session management ID
+  --sm-config-prefix=PREFIX   Specify prefix of saved configuration
+  --sm-disable                Disable connection to session manager
+
+.SH AUTHOR
+This manual page was written by Eric Gillespie, Jr. <epg@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/development/ghex/ghex.SlackBuild b/development/ghex/ghex.SlackBuild
new file mode 100644
index 0000000000..5dbc89696d
--- /dev/null
+++ b/development/ghex/ghex.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for ghex
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Although upstream describes this as "a hex editor for GNOME", it has
+# no gnome dependencies (just GTK3). Previous versions (2.x) did depend
+# on gnome so I never wanted to package them...
+
+PRGNAM=ghex
+VERSION=${VERSION:-3.18.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.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 {} \+
+
+# Fix the .docbook help files so they work with 14.2's docbook,
+# and so they don't cause docbook2html to connect to a remote site.
+# DTD may have to change for some future Slackware release.
+DTD="/usr/share/xml/docbook/xml-dtd-4.5/docbookx.dtd"
+sed -i \
+    -e '/<xi:include.*legal/s,.*,\&legal;,' \
+    -e '/docbookx.dtd/a  <!ENTITY legal SYSTEM "legal.xml">' \
+    -e 's,"http://www\.oasis.*dtd","'$DTD'",' \
+    help/*/index.docbook
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+meson \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --strip \
+  build
+
+DESTDIR="$PKG" ninja -C build install
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING* HACKING NEWS README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+# Generate the HTML help, for those who don't want to install yelp.
+docbook2html -u -o $PKGDOC/html/ $PKG/usr/share/help/C/$PRGNAM/index.docbook
+ln -s ../../../share/help/C/$PRGNAM/figures $PKGDOC/html/
+
+# Man page is fairly useless, include it anyway (from Debian).
+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
+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/ghex/ghex.info b/development/ghex/ghex.info
new file mode 100644
index 0000000000..c9d8b0daaa
--- /dev/null
+++ b/development/ghex/ghex.info
@@ -0,0 +1,10 @@
+PRGNAM="ghex"
+VERSION="3.18.4"
+HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/ghex/3.18/ghex-3.18.4.tar.xz"
+MD5SUM="7e6ed808766bc18285bdc6999bdf0f15"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="meson"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/ghex/slack-desc b/development/ghex/slack-desc
new file mode 100644
index 0000000000..b22591eec1
--- /dev/null
+++ b/development/ghex/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------------------------------------------------------|
+ghex: ghex (hex editor with GTK+3 GUI)
+ghex:
+ghex: GHex allows the user to load data from any file, view and edit it
+ghex: in either hex or ASCII. Useful for debugging problems with object
+ghex: code or encodings. Also used by kids who cheat at computer games,
+ghex: by adding score or lives to saved games.
+ghex:
+ghex:
+ghex:
+ghex:
+ghex:
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/development/git-extras/slack-desc b/development/git-extras/slack-desc
new file mode 100644
index 0000000000..eb1886f9de
--- /dev/null
+++ b/development/git-extras/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-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 fe79acc0f0..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.10.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 152f3552e6..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.10.0"
+VERSION="2.13.3"
 HOMEPAGE="https://git-lfs.github.com/"
-DOWNLOAD="https://github.com/git-lfs/git-lfs/releases/download/v2.10.0/git-lfs-linux-386-v2.10.0.tar.gz"
-MD5SUM="2eb8faedb74e3c2ac442962bbad75bc7"
-DOWNLOAD_x86_64="https://github.com/git-lfs/git-lfs/releases/download/v2.10.0/git-lfs-linux-amd64-v2.10.0.tar.gz"
-MD5SUM_x86_64="6c9dbcc1f15e53708bac34508bb445ac"
+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/README b/development/github-cli/README
new file mode 100644
index 0000000000..530e9f73ae
--- /dev/null
+++ b/development/github-cli/README
@@ -0,0 +1,5 @@
+github-cli (GitHub command line interface)
+
+gh is GitHub on the command line. It brings pull requests,
+issues, and other GitHub concepts to the terminal next to where
+you are already working with git and your code.
diff --git a/development/github-cli/github-cli.SlackBuild b/development/github-cli/github-cli.SlackBuild
new file mode 100644
index 0000000000..23f8f601f6
--- /dev/null
+++ b/development/github-cli/github-cli.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# Slackware build script for GitHub CLI
+
+# 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=github-cli
+DEBNAM=gh
+VERSION=${VERSION:-1.8.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+    ARCH=$( uname -m )
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+    DEBARCH="amd64"
+else
+    DEBARCH="386"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${DEBNAM}_${VERSION}_linux_$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/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
+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/github-cli/github-cli.info b/development/github-cli/github-cli.info
new file mode 100644
index 0000000000..6d99a6809d
--- /dev/null
+++ b/development/github-cli/github-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="github-cli"
+VERSION="1.8.1"
+HOMEPAGE="https://cli.github.com/"
+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="slackbuilds@dscp.org"
diff --git a/development/github-cli/slack-desc b/development/github-cli/slack-desc
new file mode 100644
index 0000000000..8fdfdc024c
--- /dev/null
+++ b/development/github-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------------------------------------------------------|
+github-cli: github-cli (GitHub command line interface)
+github-cli:
+github-cli: gh is GitHub on the command line. It brings pull requests,
+github-cli: issues, and other GitHub concepts to the terminal next to where
+github-cli: you are already working with git and your code.
+github-cli:
+github-cli: Homepage: https://cli.github.com/
+github-cli:
+github-cli:
+github-cli:
+github-cli:
diff --git a/development/global/global.SlackBuild b/development/global/global.SlackBuild
index 04794a306d..ae898c300f 100644
--- a/development/global/global.SlackBuild
+++ b/development/global/global.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=global
-VERSION=${VERSION:-6.6.3}
+VERSION=${VERSION:-6.6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/global/global.info b/development/global/global.info
index 8359b6243d..b68f43fff7 100644
--- a/development/global/global.info
+++ b/development/global/global.info
@@ -1,8 +1,8 @@
 PRGNAM="global"
-VERSION="6.6.3"
+VERSION="6.6.5"
 HOMEPAGE="http://www.gnu.org/software/global/"
-DOWNLOAD="http://tamacom.com/global/global-6.6.3.tar.gz"
-MD5SUM="a784c2d13ddaccd31bcd131f11cd419f"
+DOWNLOAD="http://tamacom.com/global/global-6.6.5.tar.gz"
+MD5SUM="b2322035783fd4499dfa80ddd2d36763"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/gnats/README b/development/gnats/README
index f6e166e168..49f3767af4 100644
--- a/development/gnats/README
+++ b/development/gnats/README
@@ -1,5 +1,5 @@
-GNU GNATS is a set of tools for tracking bugs reported by users to a central
-site. It allows problem report management and communication with users via
-various means. GNATS stores all the information about problem reports in its
-databases and provides tools for querying, editing, and maintenance of the
-databases.
+GNU GNATS is a set of tools for tracking bugs reported by users to a
+central site. It allows problem report management and communication
+with users via various means. GNATS stores all the information about
+problem reports in its databases and provides tools for querying,
+editing, and maintenance of the databases.
diff --git a/development/gnome-inform7/README b/development/gnome-inform7/README
index fff2ac7f76..1b54d0dc92 100644
--- a/development/gnome-inform7/README
+++ b/development/gnome-inform7/README
@@ -1,9 +1,10 @@
-Inform is a design system for interactive fiction based on natural language.
-It is a radical reinvention of the way interactive fiction is designed, guided
-by contemporary work in semantics and by the practical experience of some of
-the world's best known writers of IF.
+Inform is a design system for interactive fiction based on natural
+language.  It is a radical reinvention of the way interactive fiction
+is designed, guided by contemporary work in semantics and by the
+practical experience of some of the world's best known writers of IF.
 
-This includes both the "gnome-inform7" IDE and the "i7" command-line shell.
+This includes both the "gnome-inform7" IDE and the "i7" command-line
+shell.
 
 For the dependencies, gst-plugins-bad needs to be built with libmodplug
 support.
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/gnustep-startup/README b/development/gnustep-startup/README
index 181a1baca1..71077859cf 100644
--- a/development/gnustep-startup/README
+++ b/development/gnustep-startup/README
@@ -1,8 +1,8 @@
-GNUstep is a free, object-oriented, cross-platform development environment
-that strives for simplicity and elegance.  GNUstep is based on and completely
-compatible with the OpenStep specification developed by NeXT (now Apple
-Computer Inc.) as well as implementing the extensions added by Apple in the
-form of Cocoa.
+GNUstep is a free, object-oriented, cross-platform development
+environment that strives for simplicity and elegance.  GNUstep is
+based on and completely compatible with the OpenStep specification
+developed by NeXT (now Apple Computer Inc.) as well as implementing
+the extensions added by Apple in the form of Cocoa.
 
 The GNUstep Startup package combines all four core packages (Make, Base,
 GUI and Backend), plus ffcall.
@@ -10,7 +10,6 @@ GUI and Backend), plus ffcall.
 This is the message after compiling from source, because the files 
 are then put in a package you will miss it:
 
-
 ---------------------------------------------------------
 
 Installation Finished
diff --git a/development/golang-googlecode-gonet/README b/development/golang-googlecode-gonet/README
index e5a52df2bf..241dfff7f4 100644
--- a/development/golang-googlecode-gonet/README
+++ b/development/golang-googlecode-gonet/README
@@ -3,4 +3,5 @@ golang-googlecode-gonet
 Provides import path of code.google.com/p/go.net for the Go programming
 language. This is a source only library.
 
-To compile using this library, include "/usr/share/gocode" in your GOPATH
+To compile using this library, include "/usr/share/gocode" in your
+GOPATH
diff --git a/development/golang-googlecode-gotools/README b/development/golang-googlecode-gotools/README
index 4b08597ffd..555d3340ec 100644
--- a/development/golang-googlecode-gotools/README
+++ b/development/golang-googlecode-gotools/README
@@ -1,8 +1,8 @@
 golang-googlecode-gotools
 
-Provides a couple of tools for working with the Go programming language. Like
-godoc, a code vetting analysis utility and others.
+Provides a couple of tools for working with the Go programming
+language. Like godoc, a code vetting analysis utility and others.
 
-This also provides the import path of code.google.com/p/go.tools for the Go
-programming language. These libraries are source only.
-To compile using the libraries, include "/usr/share/gocode" in your GOPATH
+This also provides the import path of code.google.com/p/go.tools for
+the Go programming language. These libraries are source only.  To
+compile using the libraries, include "/usr/share/gocode" in your GOPATH
diff --git a/development/google-appengine-gosdk/README b/development/google-appengine-gosdk/README
index 0289cca91a..205d62aa80 100644
--- a/development/google-appengine-gosdk/README
+++ b/development/google-appengine-gosdk/README
@@ -1,45 +1,52 @@
 Google App Engine Go Language SDK
 
-The Go SDK's includes a web server application that simulates the AppEngine
-environment, including a local version of the datastore, Google Accounts, and
-the ability to fetch URLs and send email directly from your computer using the
-App Engine APIs. The Go SDK uses slightly modified versions of the development
-tools from the Python SDK, and will run on any Intel-based Mac OS X or Linux
-computer with Python 2.5.
+The Go SDK's includes a web server application that simulates the
+AppEngine environment, including a local version of the datastore,
+Google Accounts, and the ability to fetch URLs and send email directly
+from your computer using the App Engine APIs. The Go SDK uses slightly
+modified versions of the development tools from the Python SDK, and
+will run on any Intel-based Mac OS X or Linux computer with Python
+2.5.
 
 Homepage: http://code.google.com/appengine
 
-Alternate download site - Project site: http://code.google.com/p/googleappengine
+Alternate download site: http://code.google.com/p/googleappengine
 
-NOTE: There are some minor limitations to the Go SDK for App Engine vs the full
-blown Go Language SDK, but for most part this package can be used to develop and
-compile stand-alone Go programs as well.  See The Go Programming Language Blog,
-Tuesday, May 10, 2011, Go and Google Appengine at
-http://blog.golang.org/2011/05/go-and-google-app-engine.html for more details.
+NOTE: There are some minor limitations to the Go SDK for
+App Engine vs the full blown Go Language SDK, but for
+most part this package can be used to develop and compile
+stand-alone Go programs as well.  See The Go Programming
+Language Blog, Tuesday, May 10, 2011, Go and Google Appengine at
+http://blog.golang.org/2011/05/go-and-google-app-engine.html for more
+details.
 
-WARNING: This SlackBuild puts the Google Appengine Go SDK tools onto your PATH
-using the script gae.sh (or gae.csh) in /etc/profile.d that is sourced by
-/etc/profile (or /etc/csh.login).  If you also install the Google Appengine
-Python SDK then the gae.sh (and gae.csh) scripts will clash and you'll be left
-with a gae.sh.new (and gae.csh.new) file in /etc/profile.d.
+WARNING: This SlackBuild puts the Google Appengine Go SDK tools onto
+your PATH using the script gae.sh (or gae.csh) in /etc/profile.d that
+is sourced by /etc/profile (or /etc/csh.login).  If you also install
+the Google Appengine Python SDK then the gae.sh (and gae.csh) scripts
+will clash and you'll be left with a gae.sh.new (and gae.csh.new) file
+in /etc/profile.d.
 
 THIS IS INTENTIONAL!!!
 
-This is because Google's Go and Python SDK's for Appengine contain Python
-scripts with the same names that are different: you cannot use, for example, the
-appcfg.py or dev_appserver.py from one SDK on apps written with the other SDK!
-
-It is up to you to sort out this mess and decide which - if any - SDK's tools
-you want on the PATH and which you'll call with the full path.  I had written
-some wrapper scripts (inspired by Google's own gomake script) that work around
-this issue; but I felt this solution was more appropriate for Slackware and
-absolved me of the responsability of untangling Google's mess!
-
-AND ANOTHER WARNING: If you also install the Google Go language SlackBuild
-you'll have another clash since the Appengine Go SDK contains a subset of the Go
-language SDK; it has some of the same tools and relies on the same environment
-variables (in particular GOROOT). So you need decide if you want to keep the Go
-Appengine on your PATH or the Go Language (via /etc/profile.d/go.sh and
+This is because Google's Go and Python SDK's for Appengine contain
+Python scripts with the same names that are different: you cannot use,
+for example, the appcfg.py or dev_appserver.py from one SDK on apps
+written with the other SDK!
+
+It is up to you to sort out this mess and decide which - if any -
+SDK's tools you want on the PATH and which you'll call with the
+full path.  I had written some wrapper scripts (inspired by Google's
+own gomake script) that work around this issue; but I felt this
+solution was more appropriate for Slackware and absolved me of the
+responsability of untangling Google's mess!
+
+AND ANOTHER WARNING: If you also install the Google Go language
+SlackBuild you'll have another clash since the Appengine Go SDK
+contains a subset of the Go language SDK; it has some of the same
+tools and relies on the same environment variables (in particular
+GOROOT). So you need decide if you want to keep the Go Appengine
+on your PATH or the Go Language (via /etc/profile.d/go.sh and
 /etc/profile.d/go.csh).
 
 Sorry, but I don't write 'em - I just build 'em!
diff --git a/development/google-appengine-pysdk/README b/development/google-appengine-pysdk/README
index 2857c0dfbd..846052cbd4 100644
--- a/development/google-appengine-pysdk/README
+++ b/development/google-appengine-pysdk/README
@@ -1,8 +1,9 @@
 google-appengine-pysdk (Google Appengine Python SDK)
 
-The Python SDK includes a web server application that simulates the App Engine
-environment, including a local version of the datastore, Google Accounts, and
-the ability to fetch URLs and send email directly from your computer using the
-App Engine APIs. The Python SDK runs on any computer with Python 2.5 or 2.7, and
-versions are available for Windows, Mac OS X and Linux. (The Python SDK is not
-compatible with Python 3).
+The Python SDK includes a web server application that simulates the
+App Engine environment, including a local version of the datastore,
+Google Accounts, and the ability to fetch URLs and send email directly
+from your computer using the App Engine APIs. The Python SDK runs on
+any computer with Python 2.5 or 2.7, and versions are available for
+Windows, Mac OS X and Linux. (The Python SDK is not compatible with
+Python 3).
diff --git a/development/google-go-lang/README b/development/google-go-lang/README
index cc9bd19d5b..0663187522 100644
--- a/development/google-go-lang/README
+++ b/development/google-go-lang/README
@@ -1,55 +1,58 @@
-The Go programming language is an open source project to make programmers more
-productive. Go is expressive, concise, clean, and efficient. Its concurrency
-mechanisms make it easy to write programs that get the most out of multicore and
-networked machines, while its novel type system enables flexible and modular
-program construction. Go compiles quickly to machine code yet has the
-convenience of garbage collection and the power of run-time reflection. It's a
-fast, statically typed, compiled language that feels like a dynamically typed,
-interpreted language.
+The Go programming language is an open source project to make
+programmers more productive. Go is expressive, concise, clean,
+and efficient. Its concurrency mechanisms make it easy to write
+programs that get the most out of multicore and networked machines,
+while its novel type system enables flexible and modular program
+construction. Go compiles quickly to machine code yet has the
+convenience of garbage collection and the power of run-time
+reflection. It's a fast, statically typed, compiled language that
+feels like a dynamically typed, interpreted language.
 
 The tools are added to the path by putting go.sh and go.csh files in
-/etc/profile.d and letting the system's /etc/profile or /etc/csh.login pick it
-up.  If you want to add any of Go's environment variables you can add them
-there.
+/etc/profile.d and letting the system's /etc/profile or /etc/csh.login
+pick it up.  If you want to add any of Go's environment variables you
+can add them there.
 
-Also, to easily setup a user-independent path for Go libraries to be installed
-to and used, is the GOPATH environment variable. This variable can be colon
-delimited. For example, once installing the built google-go-lang package, then
-set in your user's ~/.bashrc something like:
+Also, to easily setup a user-independent path for Go libraries to
+be installed to and used, is the GOPATH environment variable. This
+variable can be colon delimited. For example, once installing the
+built google-go-lang package, then set in your user's ~/.bashrc
+something like:
 
   export GOPATH="$HOME"
 
-Then, you'll be able to use the `go` command to install an additional library
-that will not need root permission and will be in the compiler's path.
-Like so:
+Then, you'll be able to use the `go` command to install an additional
+library that will not need root permission and will be in the
+compiler's path.  Like so:
 
   go get golang.org/x/tools/cmd/godoc
 
-Now in ~/src you'll have this source code checked-out, and a binary built at
-~/bin/godoc
+Now in ~/src you'll have this source code checked-out, and a binary
+built at ~/bin/godoc
 
-Since the golang idiom is very `go get'able as a limited user, installed
-libraries from slackbuilds.org are located outside of GOROOT (which is only for
-golang standard library), in /usr/share/gocode
-By not setting a system-wide GOPATH defaulting to this location, then it is up
-to the user of whether to include this system path as well, like:
+Since the golang idiom is very `go get'able as a limited user,
+installed libraries from slackbuilds.org are located outside of GOROOT
+(which is only for golang standard library), in /usr/share/gocode By
+not setting a system-wide GOPATH defaulting to this location, then
+it is up to the user of whether to include this system path as well,
+like:
 
   export GOPATH="$HOME:/usr/share/gocode"
 
-This system source directory is primarly only for buildtime of slackbuilds.
+This system source directory is primarly only for buildtime of
+slackbuilds.
 
-This is because `go get' iterates through the paths provided, looking for
-matching imports. If a match is not found, then is cloned to the first path
-provided.  You would not want this to be a system path, as to need root
-privilege to clone source.
+This is because `go get' iterates through the paths provided, looking
+for matching imports. If a match is not found, then is cloned to the
+first path provided.  You would not want this to be a system path, as
+to need root privilege to clone source.
 
-As of go1.2, the 'go doc ...' command has been relocated to the go.tools
-library (golang-googlecode-gotools), which provide `godoc`.
+As of go1.2, the 'go doc ...' command has been relocated to the
+go.tools library (golang-googlecode-gotools), which provide `godoc`.
 
-As of go1.5, shared libraries are now supported. The flags to use linking are
-available for `go get`, `go install` and `go build`.
+As of go1.5, shared libraries are now supported. The flags to use
+linking are available for `go get`, `go install` and `go build`.
 To learn more see `go help buildmode`.
 
-
-To elect to run the buildtime tests of this package, provide the environment
-variable RUN_TEST=true at build time.
+To elect to run the buildtime tests of this package, provide the
+environment variable RUN_TEST=true at build time.
diff --git a/development/google-go-lang/google-go-lang.SlackBuild b/development/google-go-lang/google-go-lang.SlackBuild
index 4153014785..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.8}
+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 980bfec4a0..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.8"
+VERSION="1.16.3"
 HOMEPAGE="http://golang.org"
-DOWNLOAD="https://storage.googleapis.com/golang/go1.13.8.src.tar.gz"
-MD5SUM="984c244563f2d2f48103e8d6db8a8308"
+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/google-webdesigner/google-webdesigner.SlackBuild b/development/google-webdesigner/google-webdesigner.SlackBuild
index 37d64f63ba..f60f6d228a 100644
--- a/development/google-webdesigner/google-webdesigner.SlackBuild
+++ b/development/google-webdesigner/google-webdesigner.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for google-webdesigner
 
-# Copyright 2014-2019 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
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=google-webdesigner
-VERSION=${VERSION:-7.1.0.1122}
+VERSION=${VERSION:-8.0.3.0603}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=x86_64
diff --git a/development/google-webdesigner/google-webdesigner.info b/development/google-webdesigner/google-webdesigner.info
index b17c9d0961..5d59e2ece4 100644
--- a/development/google-webdesigner/google-webdesigner.info
+++ b/development/google-webdesigner/google-webdesigner.info
@@ -1,10 +1,10 @@
 PRGNAM="google-webdesigner"
-VERSION="7.1.0.1122"
+VERSION="8.0.3.0603"
 HOMEPAGE="https://www.google.com/webdesigner/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
 DOWNLOAD_x86_64="https://dl.google.com/linux/direct/google-webdesigner_current_amd64.deb"
-MD5SUM_x86_64="2bfb5ecd5cd7e1ae616ccc7b50c57ee4"
+MD5SUM_x86_64="774edc94d2999f95bdeaf7dbf6ee0ae6"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/development/gprolog/gprolog.SlackBuild b/development/gprolog/gprolog.SlackBuild
index 4cf6f816e8..1cdd7d829f 100644
--- a/development/gprolog/gprolog.SlackBuild
+++ b/development/gprolog/gprolog.SlackBuild
@@ -2,10 +2,11 @@
 
 # Slackware build script for gprolog
 # Written by Eugene Suter (easuter@gmail.com)
-# updated for version 1.4.4
+# Updated by Erik Falor (ewfalor@gmail.com) for version 1.4.5
+# Copyright 2020
 
 PRGNAM=gprolog
-VERSION=${VERSION:-1.4.4}
+VERSION=${VERSION:-1.4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/gprolog/gprolog.info b/development/gprolog/gprolog.info
index 214c68ea10..81b7fc9ce8 100644
--- a/development/gprolog/gprolog.info
+++ b/development/gprolog/gprolog.info
@@ -1,8 +1,8 @@
 PRGNAM="gprolog"
-VERSION="1.4.4"
+VERSION="1.4.5"
 HOMEPAGE="http://www.gprolog.org/"
-DOWNLOAD="http://gprolog.org/gprolog-1.4.4.tar.gz"
-MD5SUM="37009da471e5217ff637ad1c516448c8"
+DOWNLOAD="http://gprolog.org/gprolog-1.4.5.tar.gz"
+MD5SUM="7757de718e47e284544be96994300408"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/gradle/README b/development/gradle/README
index 7bcb2b0b68..107c948334 100644
--- a/development/gradle/README
+++ b/development/gradle/README
@@ -7,7 +7,8 @@ static websites, generated documentation or indeed anything else.
 Gradle combines the power and flexibility of Ant with the dependency
 management and conventions of Maven into a more effective way to build.
 
-Powered by a Groovy DSL and packed with innovation, Gradle provides a
-declarative way to describe all kinds of builds through sensible defaults.
-Gradle is quickly becoming the build system of choice for many open source
-projects, leading edge enterprises and legacy automation challenges.
+Powered by a Groovy DSL and packed with innovation, Gradle provides
+a declarative way to describe all kinds of builds through sensible
+defaults.  Gradle is quickly becoming the build system of choice
+for many open source projects, leading edge enterprises and legacy
+automation challenges.
diff --git a/development/groovy/README b/development/groovy/README
index a65361a29a..558dcae3ac 100644
--- a/development/groovy/README
+++ b/development/groovy/README
@@ -1,13 +1,13 @@
 Groovy is a dynamic language for the Java platform.
 
 This sets GROOVY_HOME=/usr/<libdir>/groovy and PATH to include
-/usr/<libdir>/groovy/bin. This SlackBuild provides one for
-sh and one for csh. You can logout and login again or simply run:
+/usr/<libdir>/groovy/bin. This SlackBuild provides one for sh and one
+for csh. You can logout and login again or simply run:
 
 # source /etc/profile.d/groovy.sh
 
-The installation is like Java Runtime/SDK, in that it places everything by
-default in /usr/<libdir>/groovy.
+The installation is like Java Runtime/SDK, in that it places everything
+by default in /usr/<libdir>/groovy.
 
-The lib directory is set dependent upon the package architecture: /usr/lib
-on x86 and /usr/lib64 on x86_64.
+The lib directory is set dependent upon the package architecture:
+/usr/lib on x86 and /usr/lib64 on x86_64.
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/gtkextra/README b/development/gtkextra/README
index 697305e12c..1feeefc879 100644
--- a/development/gtkextra/README
+++ b/development/gtkextra/README
@@ -1,3 +1,4 @@
-GtkExtra is a useful set of widgets for creating GUI's for the Xwindows
-system using GTK+. You can use it complementary to GTK+ and it is written
-in C. It is also Free Software and released under the LGPL license.
+GtkExtra is a useful set of widgets for creating GUIs for the X Window
+System using GTK+. You can use it complementary to GTK+ and it is
+written in C. It is also Free Software and released under the LGPL
+license.
diff --git a/development/henplus/README b/development/henplus/README
index b729af19a7..0ad1640ff7 100644
--- a/development/henplus/README
+++ b/development/henplus/README
@@ -1 +1,2 @@
-HenPlus is a SQL shell that can handle multiple open sessions in parallel.
+HenPlus is a SQL shell that can handle multiple open sessions in
+parallel.
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/hexinator/README b/development/hexinator/README
index b4682e0472..99a2bc5b09 100644
--- a/development/hexinator/README
+++ b/development/hexinator/README
@@ -3,16 +3,16 @@ hexinator (proprietary graphical hex editor with many features)
 This is the free/demo version of hexinator from https://hexinator.com/.
 
 hexinator is a powerful hex editor and reverse-engineering tool with
-many advanced features. It's commercial, closed source software. The demo
-version will function as the full version for a 14-day evaluation period,
-with an option to extend it for another 14 days. After that, only the
-basic hex editing functions will work. To purchase the full version,
-see the web site.
+many advanced features. It's commercial, closed source software. The
+demo version will function as the full version for a 14-day evaluation
+period, with an option to extend it for another 14 days. After that,
+only the basic hex editing functions will work. To purchase the full
+version, see the web site.
 
 Be aware that hexinator 'phones home' to www.synalysis.net. It uses an
-encrypted connection, so it's uncertain exactly what data it's sending to
-the server. If this seems like a major security/privacy concern to you,
-you should not install this software.
+encrypted connection, so it's uncertain exactly what data it's sending
+to the server. If this seems like a major security/privacy concern to
+you, you should not install this software.
 
 Notes for 32-bit users:
 
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 99d324c7e4..2467669770 100644
--- a/development/hhvm/README
+++ b/development/hhvm/README
@@ -1,7 +1,7 @@
-HHVM is an open-source virtual machine designed for executing
-programs written in Hack and PHP. HHVM uses a just-in-time (JIT)
-compilation approach to achieve superior performance while maintaining
-the development flexibility that PHP provides.
+HHVM is an open-source virtual machine designed for executing programs
+written in Hack and PHP. HHVM uses a just-in-time (JIT) compilation
+approach to achieve superior performance while maintaining the
+development flexibility that PHP provides.
 
 Hack is a programming language for HHVM. Hack reconciles the fast
 development cycle of a dynamically typed language with the discipline
@@ -29,25 +29,31 @@ your rc.d scripts:
       /etc/rc.d/rc.hhvm stop
    fi
 
-HHVM ships an integrated web server, proxygen, which listens on port 9000
-(though you can configure proxygen to make use of a different port):
-https://docs.hhvm.com/hhvm/basic-usage/proxygen.
+HHVM ships an integrated web server, proxygen, which listens on port
+9000 (though you can configure proxygen to make use of a different
+port): https://docs.hhvm.com/hhvm/basic-usage/proxygen.
+
+Alternatively to reverse proxy, FastCGI is available, which uses Unix
+sockets by default. If your web server isn't Apache make sure it has
+write access to the socket file. You can create a new group and add
+your web server user to this group or just use the main group of your
+web server and start HHVM as following:
 
-Alternatively to reverse proxy, FastCGI is available, which uses Unix sockets
-by default. If your web server isn't Apache make sure it has write access to
-the socket file. You can create a new group and add your web server user to
-this group or just use the main group of your web server and start HHVM as
-following:
    hhvm_GROUP=apache /etc/rc.d/rc.hhvm start
+
 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:
 
-Basically you create an empty .hhconfig file in the root dir of your project:
    touch .hhconfig
+
 and run:
+
    hh_client
 
 Happy Hacking!
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/highlight/README b/development/highlight/README
index 683b68d13b..4afbb5de61 100644
--- a/development/highlight/README
+++ b/development/highlight/README
@@ -1,6 +1,6 @@
-Highlight is a universal converter from source code to HTML, XHTML, RTF,
-TeX, LaTeX, and XML. (X)HTML output is formatted by Cascading Style Sheets.
-It supports more than 100 programming languages, and includes 40
-highlighting color themes. It's possible to easily enhance the parsing
-database. The converter includes some features to provide a consistent
-layout of the input code.
+Highlight is a universal converter from source code to HTML, XHTML,
+RTF, TeX, LaTeX, and XML. (X)HTML output is formatted by Cascading
+Style Sheets.  It supports more than 100 programming languages, and
+includes 40 highlighting color themes. It's possible to easily enhance
+the parsing database. The converter includes some features to provide a
+consistent layout of the input code.
diff --git a/development/hopper/hopper.SlackBuild b/development/hopper/hopper.SlackBuild
index f9dcd1385e..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.18}
+VERSION=${VERSION:-4.7.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/hopper/hopper.info b/development/hopper/hopper.info
index 1fad6d267a..3364b501c9 100644
--- a/development/hopper/hopper.info
+++ b/development/hopper/hopper.info
@@ -1,10 +1,10 @@
 PRGNAM="hopper"
-VERSION="4.5.18"
+VERSION="4.7.3"
 HOMEPAGE="https://www.hopperapp.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-4.5.18-Linux.pkg.tar.xz"
-MD5SUM_x86_64="8788bd3b0eab5c9ba5a718fcdde50ed3"
+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/ht/README b/development/ht/README
deleted file mode 100644
index 3d9d2bea15..0000000000
--- a/development/ht/README
+++ /dev/null
@@ -1,13 +0,0 @@
-HT is a file viewer, editor and analyzer for text, binary, and
-(especially) executable files.
-
-Features:
-  File formats supported:
-  - COFF/XCOFF32, ELF, LE,MZ, NE, PE32/64, Java class, MachO
-  - X-Box executable (XBE), Flat and PEF.
-
-  Code & Data Analyzer:
-  - Finds branch sources and destinations recursively
-  - Finds procedures entries
-  - Creates labels based on this information
-  and so on.
diff --git a/development/ht/ht.SlackBuild b/development/ht/ht.SlackBuild
deleted file mode 100644
index 3f74a25e5e..0000000000
--- a/development/ht/ht.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ht.
-
-# Copyright 2018 Davidson Francis, Minas Gerais, Brazil.
-# 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=ht
-VERSION=${VERSION:-2.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.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 {} \;
-
-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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog doc/ht.html README KNOWNBUGS 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/development/ht/ht.info b/development/ht/ht.info
deleted file mode 100644
index 7a1cc2a402..0000000000
--- a/development/ht/ht.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ht"
-VERSION="2.1.0"
-HOMEPAGE="http://hte.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/hte/files/ht-source/ht-2.1.0.tar.bz2"
-MD5SUM="09b2a4461d75e9cd03af1cd67fadc1ec"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Davidson Francis"
-EMAIL="davidsondfgl@gmail.com"
diff --git a/development/ht/slack-desc b/development/ht/slack-desc
deleted file mode 100644
index f6daca9db4..0000000000
--- a/development/ht/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------------------------------------------------------|
-ht: ht (file viewer, analyzer for text, binary and executable files)
-ht:
-ht: HT is a file viewer, editor and analyzer for text, binary, and
-ht: (especially) executable files.
-ht:
-ht: Homepage: http://hte.sourceforge.net/index.html
-ht:
-ht:
-ht:
-ht:
-ht:
diff --git a/development/hugo/README b/development/hugo/README
index b07a0f4ca2..13a15c6e49 100644
--- a/development/hugo/README
+++ b/development/hugo/README
@@ -5,7 +5,7 @@ website.
 
 Hugo relies on Markdown files with front matter for metadata, and you
 can run Hugo from any directory. This works well for shared hosts and
-other systems where you don't have a privileged account.
+other systems where you don’t have a privileged account.
 
 Hugo renders a typical website of moderate size in a fraction of a
 second. A good rule of thumb is that each piece of content renders in
@@ -14,8 +14,5 @@ around 1 millisecond.
 Hugo is designed to work well for any kind of website including blogs,
 tumbles, and docs.
 
-Please note, Hugo is under active development and its features set may
-change from one release to the next.
-
-This Slackbuild simply installs the Hugo binary in /usr/bin for easier
-upgrades.
+Notes:
+This Slackbuild installs the Hugo binary in /opt
diff --git a/development/hugo/hugo.SlackBuild b/development/hugo/hugo.SlackBuild
index 058145a4fd..3782959858 100644
--- a/development/hugo/hugo.SlackBuild
+++ b/development/hugo/hugo.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for hugo
 
+# Copyright 2020-2021 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2018-2019 Donald Cooley South Haven, IN USA
 # All rights reserved.
 #
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hugo
-VERSION=${VERSION:-0.60.1}
+VERSION=${VERSION:-0.82.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,8 +66,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 {} \;
 
-mkdir -p $PKG/usr/bin/
-cp hugo $PKG/usr/bin/hugo
+mkdir -p $PKG/{usr/bin,opt/$PRGNAM}
+  cp -a * $PKG/opt/$PRGNAM
+  ln -s /opt/$PRGNAM/hugo $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/development/hugo/hugo.info b/development/hugo/hugo.info
index 2406ea0b48..ce0a606a2e 100644
--- a/development/hugo/hugo.info
+++ b/development/hugo/hugo.info
@@ -1,10 +1,10 @@
 PRGNAM="hugo"
-VERSION="0.60.1"
+VERSION="0.82.0"
 HOMEPAGE="https://gohugo.io"
-DOWNLOAD="https://github.com/gohugoio/hugo/releases/download/v0.60.1/hugo_0.60.1_Linux-32bit.tar.gz"
-MD5SUM="f0e5f789af46be298f141541a537a453"
-DOWNLOAD_x86_64="https://github.com/gohugoio/hugo/releases/download/v0.60.1/hugo_0.60.1_Linux-64bit.tar.gz"
-MD5SUM_x86_64="876c51da7649fc0dc4b907136b54b45c"
+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="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/development/hugo/slack-desc b/development/hugo/slack-desc
index c1f14fb1e4..f7eafa6a28 100644
--- a/development/hugo/slack-desc
+++ b/development/hugo/slack-desc
@@ -10,10 +10,10 @@ hugo: hugo (static HTML and CSS website generator written in Go)
 hugo:
 hugo: Hugo is a static HTML and CSS website generator written in Go. It is
 hugo: optimized for speed, ease of use, and configurability. Hugo takes a
-hugo: directory with content and templates and renders them into a full HTML
-hugo: website.
-hugo: Hugo relies on Markdown files with front matter for metadata, and you
-hugo: can run Hugo from any directory. This works well for shared hosts and
-hugo: other systems where you don't have a privileged account.
+hugo: directory with content and templates and renders them into a full
+hugo: HTML website.
+hugo:
 hugo: Homepage: https://gohugo.io
 hugo:
+hugo:
+hugo:
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/development/icdiff/slack-desc b/development/icdiff/slack-desc
new file mode 100644
index 0000000000..30f23d20c0
--- /dev/null
+++ b/development/icdiff/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------------------------------------------------------|
+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/icecream/README b/development/icecream/README
index 50daacb2d4..d95ce6adf9 100644
--- a/development/icecream/README
+++ b/development/icecream/README
@@ -1,12 +1,14 @@
-Icecream is a distributed compile system. It allows parallel compiling by
-distributing the compile jobs to several nodes of a compile network running the
-icecc daemon. The icecc scheduler routes the jobs and provides status and
-statistics information to the icecc monitor. Each compile node can accept one
-or more compile jobs depending on the number of processors and the settings of
-the daemon. Link jobs and other jobs which cannot be distributed are executed
-locally on the node where the compilation is started.
-Note that upon installation of the resulting package, all your software
-will be compiled by icecream by default.
+Icecream is a distributed compile system. It allows parallel compiling
+by distributing the compile jobs to several nodes of a compile network
+running the icecc daemon. The icecc scheduler routes the jobs and
+provides status and statistics information to the icecc monitor. Each
+compile node can accept one or more compile jobs depending on the
+number of processors and the settings of the daemon. Link jobs and
+other jobs which cannot be distributed are executed locally on the
+node where the compilation is started.
+
+Note that upon installation of the resulting package, all your
+software will be compiled by icecream by default.
 
 For information on how to use icecream in combination with ccache see
 https://github.com/icecc/icecream#how-to-combine-icecream-with-ccache
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/idea/README b/development/idea/README
index 23196b3771..6c6d1b356c 100644
--- a/development/idea/README
+++ b/development/idea/README
@@ -1,11 +1,12 @@
-IntelliJ IDEA Community Edition is the open source version of IntelliJ IDEA,
-a premier IDE (Integrated Development Environment) for Java, Groovy and 
-other programming languages such as Scala or Clojure.
+IntelliJ IDEA Community Edition is the open source version of IntelliJ
+IDEA, a premier IDE (Integrated Development Environment) for Java,
+Groovy and other programming languages such as Scala or Clojure.
 
 JetBrains leverages the open source effort on JetBrains.org to build
 commercial products such as IntelliJ IDEA Ultimate, which includes many
 Java EE, Web development and deployment-related features that are not
-available in IntelliJ IDEA Community Edition. JetBrains also builds different
-specific products such as RubyMine, WebStorm, PhpStorm, PyCharm, AppCode and
-MPS, which serve the needs of different developer communities. These 
-products are also built on top of the open source IntelliJ Platform.
+available in IntelliJ IDEA Community Edition. JetBrains also builds
+different specific products such as RubyMine, WebStorm, PhpStorm,
+PyCharm, AppCode and MPS, which serve the needs of different developer
+communities. These products are also built on top of the open source
+IntelliJ Platform.
diff --git a/development/idea/idea.SlackBuild b/development/idea/idea.SlackBuild
index 0e554e3afc..ab7789cad6 100644
--- a/development/idea/idea.SlackBuild
+++ b/development/idea/idea.SlackBuild
@@ -6,7 +6,7 @@
 
 PRGNAM=idea
 ARCNAM=ideaIC
-VERSION=${VERSION:-2019.2.1}
+VERSION=${VERSION:-2020.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=${ARCH:-noarch}
@@ -21,7 +21,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG/opt/ $OUTPUT
 cd $PKG/opt/
-tar xvf $CWD/$ARCNAM-$VERSION-no-jbr.tar.*z
+tar xvf $CWD/$ARCNAM-$VERSION.tar.*z
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/development/idea/idea.info b/development/idea/idea.info
index ebcdd849ef..062fad7fc6 100644
--- a/development/idea/idea.info
+++ b/development/idea/idea.info
@@ -1,8 +1,8 @@
 PRGNAM="idea"
-VERSION="2019.2.1"
+VERSION="2020.2"
 HOMEPAGE="http://www.jetbrains.com/idea/"
-DOWNLOAD="https://download.jetbrains.com/idea/ideaIC-2019.2.1-no-jbr.tar.gz"
-MD5SUM="dde4aa0777a6cbfd24a8ba190430aa41"
+DOWNLOAD="https://download.jetbrains.com/idea/ideaIC-2020.2.tar.gz"
+MD5SUM="57f70ced0fd644be9521b138ba6596c6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/development/idlex/README b/development/idlex/README
index 19c2680e94..3145929a60 100644
--- a/development/idlex/README
+++ b/development/idlex/README
@@ -1,10 +1,10 @@
-IdleX is a collection of over twenty extensions and plugins that provide 
-additional functionality to IDLE, a Python IDE provided in the standard 
-library. It transforms IDLE into a more useful tool for academic research 
-and development as well as exploratory programming.
+IdleX is a collection of over twenty extensions and plugins that
+provide additional functionality to IDLE, a Python IDE provided in
+the standard library. It transforms IDLE into a more useful tool for
+academic research and development as well as exploratory programming.
 IdleX runs with Python 2.6, 2.7, and 3.x.
 
-If you want to build this for use with Python 3.x (needs the
-optional dependency python3) pass the script PYTHON3=yes, like:
+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 ./idlex.SlackBuild
diff --git a/development/inform/README b/development/inform/README
index 7ae88007b7..8eaa8177c2 100644
--- a/development/inform/README
+++ b/development/inform/README
@@ -1,24 +1,25 @@
 inform (interactive fiction compiler)
 
 Inform 6 is version 6 of Inform, an interactive fiction programming
-language created by Graham Nelson. Inform 6 made its debut on April 30th,
-1996, and it continues to be one of the most popular IF development
-systems even after the introduction of Inform 7 in 2006. Inform 6,
-like all other versions of Inform, compiles to code not only for the
-Z-machine, the same virtual machine used by Infocom, but also for the
-more powerful and flexible virtual machine called Glulx.
+language created by Graham Nelson. Inform 6 made its debut on
+April 30th, 1996, and it continues to be one of the most popular
+IF development systems even after the introduction of Inform 7 in
+2006. Inform 6, like all other versions of Inform, compiles to code
+not only for the Z-machine, the same virtual machine used by Infocom,
+but also for the more powerful and flexible virtual machine called
+Glulx.
 
-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.
+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.
 
-Related packages: you'll want a Z-Code interpreter to try out your creations.
-Install one of: fizmo, frotz, zoom.
+Related packages: you'll want a Z-Code interpreter to try out your
+creations. Install one of: fizmo, frotz, zoom.
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 3c024c27fd..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="http://urchlay.naptime.net/~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/jam/README b/development/jam/README
index 3709eb4521..1dedafc9b3 100644
--- a/development/jam/README
+++ b/development/jam/README
@@ -1,8 +1,8 @@
 Jam - Make(1) Redux
 
-Jam is a program construction tool, like make(1). Jam recursively builds
-target files from source files, using dependency information and updating
-actions expressed in the Jambase file, which is written in jam's own
-interpreted language. The default Jambase is compiled into jam and
-provides a boilerplate for common use, relying on a user-provide file
-"Jamfile" to enumerate actual targets and sources.
+Jam is a program construction tool, like make(1). Jam recursively
+builds target files from source files, using dependency information
+and updating actions expressed in the Jambase file, which is written
+in jam's own interpreted language. The default Jambase is compiled
+into jam and provides a boilerplate for common use, relying on a
+user-provide file "Jamfile" to enumerate actual targets and sources.
diff --git a/development/jasspa/README b/development/jasspa/README
index a43db5f68f..01ca6921bd 100644
--- a/development/jasspa/README
+++ b/development/jasspa/README
@@ -4,25 +4,25 @@ Jasspa's MicroEmacs is an Emacs editor biased towards UNIX users,
 working across platforms by providing a consistent interface under
 UNIX, Microsoft Windows 3.1/'95/'98/NT/2K/XP and DOS operating systems.
 It features syntax highlighling, folding, multiple undo/redo, macro
-languge, organizer, mailer, calendar, multiple frames and windows and
-much more See it's internal help for full list of features.
+languge, organizer, mailer, calendar, multiple frames and windows, and
+much more. See its internal help for full list of features.
 
 Jasspa is a descendant of the original microemacs, with a lot of
 additions.
 
 About the slackbuild script:
-  - The official way to build jasspa is to use the script named 'build'
-    from the source distribution which autodetects a few things, so I use
-    this script, but if I use this script I have to patch linux2.gmk
-    and linux26.gmk.
+- The official way to build jasspa is to use the script named 'build'
+  from the source distribution which autodetects a few things, so I use
+  this script, but if I use this script I have to patch linux2.gmk
+  and linux26.gmk.
 
-  - there is a special version called nanoemacs (ne) which is a small
-    macro-less minimal version, only useful for extremly minimal
-    installations, so I do not provide a build variant for it, because I
-    think it is not so useful.
+- There is a special version called nanoemacs (ne) which is a small
+  macro-less minimal version, only useful for extremly minimal
+  installations, so I do not provide a build variant for it, because I
+  think it is not so useful.
 
-  - Note, that while the package contains an updated macros collection
-    from 2009.10.17, the version is 091011. This is intentional, the
-    macros collection contains some minor fixes, but according to
-    http://www.jasspa.com/downsrc.html: "The official baseline for 2009
-    is 2009.10.11 ...", so the VERSION is 091011.
+- Note, that while the package contains an updated macros collection
+  from 2009.10.17, the version is 091011. This is intentional, the
+  macros collection contains some minor fixes, but according to
+  http://www.jasspa.com/downsrc.html: "The official baseline for 2009
+  is 2009.10.11 ...", so the VERSION is 091011.
diff --git a/development/jdk/README b/development/jdk/README
index 7cacdc914e..251409ef35 100644
--- a/development/jdk/README
+++ b/development/jdk/README
@@ -6,13 +6,13 @@ This will also package JRE so you will not need a separate JRE build.
 
 The mozilla plugin is no longer activated by default.
 
-*************************************************************************
-* YOU MUST AGREE TO ORACLE'S DOWNLOAD AGREEMENT AND REGISTER AN ACCOUNT *
-* WITH ORACLE BEFORE YOU CAN DOWNLOAD THE JDK BINARY PACKAGE FROM THEM. *
-* THIS MEANS THAT YOU HAVE TO USE SOME SORT OF WEB BROWSER, E.G.        *
-* FIREFOX, TO DOWNLOAD IT.  LINKS, WGET, ET AL WILL NOT WORK.           *
-*************************************************************************
+************************************************************************
+* YOU MUST AGREE TO ORACLE'S DOWNLOAD AGREEMENT AND REGISTER AN        *
+* ACCOUNT WITH ORACLE BEFORE YOU CAN DOWNLOAD THE JDK BINARY PACKAGE   *
+* FROM THEM.  THIS MEANS THAT YOU HAVE TO USE SOME SORT OF WEB         *
+* BROWSER, E.G. FIREFOX, TO DOWNLOAD IT.  LINKS, WGET, ET AL WILL      *
+* NOT WORK.                                                            *
+************************************************************************
 
 You might be able to download the necessary parts from here:
 https://java.com/en/download/linux_manual.jsp
-
diff --git a/development/jdk/jdk.SlackBuild b/development/jdk/jdk.SlackBuild
index 03cacd2a97..2d7b58d793 100644
--- a/development/jdk/jdk.SlackBuild
+++ b/development/jdk/jdk.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jdk
-VERSION=${VERSION:-8u231}
+VERSION=${VERSION:-8u251}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/jdk/jdk.info b/development/jdk/jdk.info
index c6acf8dd8a..ef09c17b72 100644
--- a/development/jdk/jdk.info
+++ b/development/jdk/jdk.info
@@ -1,10 +1,10 @@
 PRGNAM="jdk"
-VERSION="8u231"
+VERSION="8u251"
 HOMEPAGE="https://www.oracle.com/technetwork/java/javase/downloads/index.html"
-DOWNLOAD="https://download.oracle.com/otn/java/jdk/8u231-b11/5b13a193868b4bf28bcb45c792fce896/jdk-8u231-linux-i586.tar.gz"
-MD5SUM="127300ce1ad76c3ef751b029103f399a"
-DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/8u231-b11/5b13a193868b4bf28bcb45c792fce896/jdk-8u231-linux-x64.tar.gz"
-MD5SUM_x86_64="c1fef2e714be761773ee0fc2be5dd78e"
+DOWNLOAD="https://download.oracle.com/otn/java/jdk/8u251-b08/3d5a2bb8f8d4428bbe94aed7ec7ae784/jdk-8u251-linux-i586.tar.gz"
+MD5SUM="ca32e950891fe711691fcc5e4e4053a6"
+DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/8u251-b08/3d5a2bb8f8d4428bbe94aed7ec7ae784/jdk-8u251-linux-x64.tar.gz"
+MD5SUM_x86_64="becc86d9870fe5f48ca30c520c4b7ab8"
 REQUIRES=""
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/development/jdk11/README b/development/jdk11/README
index 13748cb75b..3664b00f6c 100644
--- a/development/jdk11/README
+++ b/development/jdk11/README
@@ -1,21 +1,20 @@
 jdk11 (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.
+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/
+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
+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/technetwork/java/javase/downloads/jdk11-downloads-5066655.html
+https://www.oracle.com/java/technologies/javase-jdk11-downloads.html
 
-After installation you will need to log out from the system and log in back
-for environment variables get updated.
+After installation you will need to log out from the system and log in
+back for environment variables get updated.
diff --git a/development/jdk11/jdk11.SlackBuild b/development/jdk11/jdk11.SlackBuild
index bc52b2f43b..97d9ce17a1 100644
--- a/development/jdk11/jdk11.SlackBuild
+++ b/development/jdk11/jdk11.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jdk11
 
-# Copyright 2019 2020 Igor Alexandrov <igora.vault@gmail.com>
+# Copyright 2019, 2020 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=jdk11
-VERSION=${VERSION:-11.0.6}
+VERSION=${VERSION:-11.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,6 +35,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+set -e
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -44,11 +46,9 @@ if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
   echo "$ARCH port is not supported"
-  exit -1
+  exit 1
 fi
 
-set -e
-
 rm -rf $PKG
 mkdir -p $TMP $OUTPUT \
          $PKG/{install,etc/profile.d,usr/{lib${LIBDIRSUFFIX},doc/$PRGNAM-$VERSION}}
@@ -103,4 +103,3 @@ 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/jdk11/jdk11.info b/development/jdk11/jdk11.info
index 0f96197cb1..9b846810c8 100644
--- a/development/jdk11/jdk11.info
+++ b/development/jdk11/jdk11.info
@@ -1,10 +1,10 @@
 PRGNAM="jdk11"
-VERSION="11.0.6"
+VERSION="11.0.8"
 HOMEPAGE="https://www.oracle.com/technetwork/java/javase/downloads/index.html"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/11.0.6+8/90eb79fb590d45c8971362673c5ab495/jdk-11.0.6_linux-x64_bin.tar.gz"
-MD5SUM_x86_64="a1c006e67657892168532af68a89230f"
+DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/11.0.8%2B10/dc5cf74f97104e8eac863698146a7ac3/jdk-11.0.8_linux-x64_bin.tar.gz"
+MD5SUM_x86_64="db2f0b99ded108c4f549464ae7812826"
 REQUIRES=""
 MAINTAINER="Igor Alexandrov"
-EMAIL="igora.vault@gmail.com"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/development/jdk12/README b/development/jdk12/README
index bdb78d50f5..8442f1f13f 100644
--- a/development/jdk12/README
+++ b/development/jdk12/README
@@ -1,21 +1,24 @@
 jdk12 (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.
+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/
+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
+WARNING: These older versions of the JRE and JDK are provided to help
+developers debug issues in older systems. They are not updated with the
+latest security patches and are not recommended for use in production.
 
-https://www.oracle.com/technetwork/java/javase/downloads/jdk12-downloads-5295953.html
+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
 
-After installation you will need to log out from the system and log in back
-for environment variables get updated.
+https://www.oracle.com/java/technologies/javase/jdk12-archive-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/jdk12/jdk12.SlackBuild b/development/jdk12/jdk12.SlackBuild
index e63ce2d459..697308a566 100644
--- a/development/jdk12/jdk12.SlackBuild
+++ b/development/jdk12/jdk12.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jdk12
 
-# Copyright 2019 Igor Alexandrov <igor.s.alexandrov@gmail.com>
+# Copyright 2019, 2020 Igor Alexandrov <igor.alexandrov@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -35,6 +35,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+set -e
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -44,11 +46,9 @@ if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
   echo "$ARCH port is not supported"
-  exit -1
+  exit 1
 fi
 
-set -e
-
 rm -rf $PKG
 mkdir -p $TMP $OUTPUT \
          $PKG/{install,etc/profile.d,usr/{lib${LIBDIRSUFFIX},doc/$PRGNAM-$VERSION}}
@@ -102,4 +102,3 @@ 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/jdk12/jdk12.info b/development/jdk12/jdk12.info
index 6ca6c35f29..0da1dd603e 100644
--- a/development/jdk12/jdk12.info
+++ b/development/jdk12/jdk12.info
@@ -3,8 +3,8 @@ VERSION="12.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/12.0.2+10/e482c34c86bd4bf8b56c0b35558996b9/jdk-12.0.2_linux-x64_bin.tar.gz"
+DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/12.0.2+10/e482c34c86bd4bf8b56c0b35558996b9/jdk-12.0.2_linux-x64_bin.tar.gz"
 MD5SUM_x86_64="d1527af940a4d73050ff1d5c7942782d"
 REQUIRES="%README%"
 MAINTAINER="Igor Alexandrov"
-EMAIL="igor.s.alexandrov@gmail.com"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/development/jdk13/README b/development/jdk13/README
index 6d3e2dd1b1..f6f902ab70 100644
--- a/development/jdk13/README
+++ b/development/jdk13/README
@@ -1,19 +1,24 @@
+jdk13 (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.
+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/
 
-More details:
-https://developer.oracle.com/java/
+WARNING: These older versions of the JRE and JDK are provided to help
+developers debug issues in older systems. They are not updated with the
+latest security patches and are not recommended for use in production.
 
-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
+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/technetwork/java/javase/downloads/jdk13-downloads-5672538.html
+https://www.oracle.com/java/technologies/javase/jdk13-archive-downloads.html
 
-After installation you will need to log out from the system and log in back
-for environment variables get updated.
+After installation you will need to log out from the system and log in
+back for environment variables get updated.
diff --git a/development/jdk13/jdk13.SlackBuild b/development/jdk13/jdk13.SlackBuild
index d914c5c2a2..b8f220ee59 100644
--- a/development/jdk13/jdk13.SlackBuild
+++ b/development/jdk13/jdk13.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jdk13
 
-# Copyright 2019 2020 Igor Alexandrov <igora.vault@gmail.com>
+# Copyright 2019, 2020 Igor Alexandrov <igor.alexandrov@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -35,6 +35,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+set -e
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -46,8 +48,6 @@ if [ "$ARCH" != "x86_64" ]; then
 fi
 LIBDIRSUFFIX=64
 
-set -e
-
 rm -rf $PKG
 mkdir -p $TMP $OUTPUT \
          $PKG/{install,etc/profile.d,usr/{bin,lib${LIBDIRSUFFIX},doc/$PRGNAM-$VERSION,man/man1}}
diff --git a/development/jdk13/jdk13.info b/development/jdk13/jdk13.info
index b98e96c4ec..e986ef747c 100644
--- a/development/jdk13/jdk13.info
+++ b/development/jdk13/jdk13.info
@@ -3,8 +3,8 @@ VERSION="13.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/13.0.2+8/d4173c853231432d94f001e99d882ca7/jdk-13.0.2_linux-x64_bin.tar.gz"
+DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/13.0.2+8/d4173c853231432d94f001e99d882ca7/jdk-13.0.2_linux-x64_bin.tar.gz"
 MD5SUM_x86_64="d9cd84b90be7130094b1cae31b352abe"
 REQUIRES=""
 MAINTAINER="Igor Alexandrov"
-EMAIL="igora.vault@gmail.com"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/development/jdk14/README b/development/jdk14/README
new file mode 100644
index 0000000000..eaf2da7f60
--- /dev/null
+++ b/development/jdk14/README
@@ -0,0 +1,26 @@
+jdk14 (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/
+
+WARNING: These older versions of the JRE and JDK are provided to
+help developers debug issues in older systems. They are not updated
+with the latest security patches and are not recommended for use in
+production.
+
+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-jdk14-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/jdk14/jdk14.SlackBuild b/development/jdk14/jdk14.SlackBuild
new file mode 100644
index 0000000000..65848416a5
--- /dev/null
+++ b/development/jdk14/jdk14.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for jdk14
+
+# Copyright 2019, 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=jdk14
+VERSION=${VERSION:-14.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
+
+set -e
+
+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/libverify.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/jdk14/jdk14.info b/development/jdk14/jdk14.info
new file mode 100644
index 0000000000..5882224171
--- /dev/null
+++ b/development/jdk14/jdk14.info
@@ -0,0 +1,10 @@
+PRGNAM="jdk14"
+VERSION="14.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/14.0.2+12/205943a0976c4ed48cb16f1043c5c647/jdk-14.0.2_linux-x64e_bin.tar.gz"
+MD5SUM_x86_64="9319a0ec39aa84ae15e0bd87701d8b29"
+REQUIRES=""
+MAINTAINER="Igor Alexandrov"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/development/jdk14/slack-desc b/development/jdk14/slack-desc
new file mode 100644
index 0000000000..bed66c759f
--- /dev/null
+++ b/development/jdk14/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------------------------------------------------------|
+jdk14: jdk14 (Java Platform Standard Edition Development Kit)
+jdk14:
+jdk14: The Java Platform Standard Edition Development Kit (JDK) includes
+jdk14: both the runtime environment (Java virtual machine,
+jdk14: the Java platform classes and supporting files) and development tools
+jdk14: (compilers, debuggers, tool libraries and other tools).
+jdk14: The JDK is a development environment for building applications,
+jdk14: applets and components that can be deployed with the
+jdk14: Java Platform Standard Edition Runtime Environment.
+jdk14:
+jdk14: https://developer.oracle.com/java/
diff --git a/development/jdk15/README b/development/jdk15/README
new file mode 100644
index 0000000000..bf20d11788
--- /dev/null
+++ b/development/jdk15/README
@@ -0,0 +1,21 @@
+jdk15 (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-jdk15-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/jdk15/jdk15.SlackBuild b/development/jdk15/jdk15.SlackBuild
new file mode 100644
index 0000000000..a0ad846bce
--- /dev/null
+++ b/development/jdk15/jdk15.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for jdk15
+
+# 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=jdk15
+VERSION=${VERSION:-15.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
+
+set -e
+
+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/jdk15/jdk15.info b/development/jdk15/jdk15.info
new file mode 100644
index 0000000000..f3c330c0bd
--- /dev/null
+++ b/development/jdk15/jdk15.info
@@ -0,0 +1,10 @@
+PRGNAM="jdk15"
+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.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/jdk15/slack-desc b/development/jdk15/slack-desc
new file mode 100644
index 0000000000..661dd74c05
--- /dev/null
+++ b/development/jdk15/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------------------------------------------------------|
+jdk15: jdk15 (Java Platform Standard Edition Development Kit)
+jdk15:
+jdk15: The Java Platform Standard Edition Development Kit (JDK) includes
+jdk15: both the runtime environment (Java virtual machine,
+jdk15: the Java platform classes and supporting files) and development tools
+jdk15: (compilers, debuggers, tool libraries and other tools).
+jdk15: The JDK is a development environment for building applications,
+jdk15: applets and components that can be deployed with the
+jdk15: Java Platform Standard Edition Runtime Environment.
+jdk15:
+jdk15: https://developer.oracle.com/java/
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/jsmin/README b/development/jsmin/README
index 0fb3858bb2..89eb64a577 100644
--- a/development/jsmin/README
+++ b/development/jsmin/README
@@ -1,6 +1,7 @@
 JSMin, The JavaScript Minifier
 
 JSMin is a filter that removes comments and unnecessary whitespace from
-JavaScript files. It typically reduces filesize by half, resulting in faster
-downloads. It also encourages a more expressive programming style because it
-eliminates the download cost of clean, literate self-documentation.
+JavaScript files. It typically reduces filesize by half, resulting in
+faster downloads. It also encourages a more expressive programming
+style because it eliminates the download cost of clean, literate
+self-documentation.
diff --git a/development/julia/README b/development/julia/README
index c7b459a760..26f4451762 100644
--- a/development/julia/README
+++ b/development/julia/README
@@ -22,10 +22,12 @@ types, which can also be user-defined.
 
 A Summary of Features:
 
-  * Multiple dispatch: providing ability to define function behavior across
-    many combinations of argument types
-  * Dynamic type system: types for documentation, optimization, and dispatch
-  * Good performance, approaching that of statically-compiled languages like C
+  * Multiple dispatch: providing ability to define function behavior
+    across many combinations of argument types
+  * Dynamic type system: types for documentation, optimization, and
+    dispatch
+  * Good performance, approaching that of statically-compiled languages
+    like C
   * Built-in package manager
   * Lisp-like macros and other metaprogramming facilities
   * Call Python functions: use the PyCall package
diff --git a/development/julius/README b/development/julius/README
index f7868b4a3f..a45341c751 100644
--- a/development/julius/README
+++ b/development/julius/README
@@ -1,12 +1,13 @@
-"Julius" is a high-performance, two-pass large vocabulary continuous speech 
-recognition (LVCSR) decoder software for speech-related researchers and 
-developers. Based on word N-gram and context-dependent HMM, it can perform 
-almost real-time decoding on most current PCs in 60k word dictation task. 
-Major search techniques are fully incorporated such as tree lexicon, N-gram 
-factoring, cross-word context dependency handling, enveloped beam search, 
-Gaussian pruning, Gaussian selection, etc. Besides search efficiency, it 
-is also modularized carefully to be independent from model structures, and 
-various HMM types are supported such as shared-state triphones and 
-tied-mixture models, with any number of mixtures, states, or phones. 
-Standard formats are adopted to cope with other free modeling toolkit such 
-as HTK, CMU-Cam SLM toolkit, etc.
+"Julius" is a high-performance, two-pass large vocabulary continuous
+speech recognition (LVCSR) decoder software for speech-related
+researchers and developers. Based on word N-gram and context-dependent
+HMM, it can perform almost real-time decoding on most current
+PCs in 60k word dictation task.  Major search techniques are fully
+incorporated such as tree lexicon, N-gram factoring, cross-word context
+dependency handling, enveloped beam search, Gaussian pruning, Gaussian
+selection, etc. Besides search efficiency, it is also modularized
+carefully to be independent from model structures, and various HMM
+types are supported such as shared-state triphones and tied-mixture
+models, with any number of mixtures, states, or phones.  Standard
+formats are adopted to cope with other free modeling toolkit such as
+HTK, CMU-Cam SLM toolkit, etc.
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-ipyleaflet/README b/development/jupyter-ipyleaflet/README
index b30c4befb2..64fad34924 100644
--- a/development/jupyter-ipyleaflet/README
+++ b/development/jupyter-ipyleaflet/README
@@ -1,4 +1,4 @@
-jupyter-ipyleaflet is a Jupyter-Leaflet bridge enabling interactive maps in the
-Jupyter notebook.
+jupyter-ipyleaflet is a Jupyter-Leaflet bridge enabling interactive
+maps in the Jupyter notebook.
 
 All dependencies must be built with support for Python 3.
diff --git a/development/jupyter-ipywidgets/README b/development/jupyter-ipywidgets/README
index c90c30b9a4..2bfcbc1286 100644
--- a/development/jupyter-ipywidgets/README
+++ b/development/jupyter-ipywidgets/README
@@ -1,2 +1,2 @@
-ipywidgets are interactive HTML widgets for Jupyter notebooks and the IPython
-kernel.
+ipywidgets are interactive HTML widgets for Jupyter notebooks and the
+IPython kernel.
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/development/jupyter-nbclient/jupyter-nbclient.SlackBuild b/development/jupyter-nbclient/jupyter-nbclient.SlackBuild
new file mode 100644
index 0000000000..f4cbda1cb4
--- /dev/null
+++ b/development/jupyter-nbclient/jupyter-nbclient.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for jupyter-nbclient
+
+# 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=jupyter-nbclient
+VERSION=${VERSION:-0.5.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=nbclient
+
+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 {} \;
+
+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 CONTRIBUTING.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 y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
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/README b/development/jupyter-nbconvert/README
index 326c2f9b56..4170c385ad 100644
--- a/development/jupyter-nbconvert/README
+++ b/development/jupyter-nbconvert/README
@@ -1,6 +1,6 @@
-The nbconvert tool, jupyter nbconvert, converts notebooks to various other
-formats via Jinja templates. The nbconvert tool allows you to convert an .ipynb
-notebook file into various static formats including:
+The nbconvert tool, jupyter nbconvert, converts notebooks to various
+other formats via Jinja templates. The nbconvert tool allows you to
+convert an .ipynb notebook file into various static formats including:
  * HTML
  * LaTeX
  * PDF
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/README b/development/jupyter-nbdime/README
index 9ce701916f..afc1c3e48c 100644
--- a/development/jupyter-nbdime/README
+++ b/development/jupyter-nbdime/README
@@ -1,9 +1,9 @@
 nbdime provides tools for diffing and merging of Jupyter Notebooks.
 
- * nbdiff compare notebooks in a terminal-friendly way
- * nbmerge three-way merge of notebooks with automatic conflict resolution
- * nbdiff-web shows you a rich rendered diff of notebooks
- * nbmerge-web gives you a web-based three-way merge tool for notebooks
- * nbshow present a single notebook in a terminal-friendly way
+ * nbdiff: compare notebooks in a terminal-friendly way
+ * nbmerge: 3-way merge of notebooks with automatic conflict resolution
+ * nbdiff-web: shows you a rich rendered diff of notebooks
+ * nbmerge-web: gives you a web-based three-way merge tool for notebooks
+ * nbshow: presents a single notebook in a terminal-friendly way
 
 All dependencies must be built with support for Python 3.
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/README b/development/jupyter-nbformat/README
index dfa9db520f..5f5f809b07 100644
--- a/development/jupyter-nbformat/README
+++ b/development/jupyter-nbformat/README
@@ -1,2 +1,2 @@
-jupyter-nbformat contains the base implementation of the Jupyter Notebook
-format, and Python APIs for working with notebooks.
+jupyter-nbformat contains the base implementation of the Jupyter
+Notebook format, and Python APIs for working with notebooks.
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/README b/development/jupyter-notebook/README
index 02b8ec5480..e11ee1682d 100644
--- a/development/jupyter-notebook/README
+++ b/development/jupyter-notebook/README
@@ -1,5 +1,5 @@
-Jupyter notebook is a language-agnostic HTML notebook application for Project
-Jupyter.
+Jupyter notebook is a language-agnostic HTML notebook application for
+Project Jupyter.
 
 Jupyter kernels are needed for the notebook to be fully functional. The
 following kernels are currently available as SlackBuilds:
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/README b/development/jupyter-qtconsole/README
index 5daba3c8f0..a574221d82 100644
--- a/development/jupyter-qtconsole/README
+++ b/development/jupyter-qtconsole/README
@@ -1,7 +1,8 @@
-jupyter-qtconsole provides a rich Qt-based console for working with Jupyter
-kernels, supporting rich media output, session export, and more.
+jupyter-qtconsole provides a rich Qt-based console for working with
+Jupyter kernels, supporting rich media output, session export, and
+more.
 
-The Qt console is a very lightweight application that largely feels like a
-terminal, but provides a number of enhancements only possible in a GUI, such as
-inline figures, proper multiline editing with syntax highlighting, graphical
-calltips, and more.
+The Qt console is a very lightweight application that largely feels
+like a terminal, but provides a number of enhancements only possible
+in a GUI, such as inline figures, proper multiline editing with syntax
+highlighting, graphical calltips, and more.
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-widgetsnbextension/README b/development/jupyter-widgetsnbextension/README
index 80164a8904..daf1622dec 100644
--- a/development/jupyter-widgetsnbextension/README
+++ b/development/jupyter-widgetsnbextension/README
@@ -1,2 +1,2 @@
-The jupyter-widgetsnbextension package provides interactive HTML widgets for
-Jupyter notebooks.
+The jupyter-widgetsnbextension package provides interactive HTML
+widgets for Jupyter notebooks.
diff --git a/development/jupyter_client/README b/development/jupyter_client/README
index 9a671539dc..21fe6bf3de 100644
--- a/development/jupyter_client/README
+++ b/development/jupyter_client/README
@@ -1,2 +1,3 @@
-jupyter_client contains the reference implementation of the Jupyter protocol.
-It also provides client and kernel management APIs for working with kernels.
+jupyter_client contains the reference implementation of the Jupyter
+protocol.  It also provides client and kernel management APIs for
+working with kernels.
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/README b/development/jupyter_console/README
index 317fa54e8c..f86ae356ed 100644
--- a/development/jupyter_console/README
+++ b/development/jupyter_console/README
@@ -1,2 +1,2 @@
-A terminal-based console frontend for Jupyter kernels, including non-Python
-kernels such as IJulia and IRKernel.
+A terminal-based console frontend for Jupyter kernels, including
+non-Python kernels such as IJulia and IRKernel.
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/README b/development/jupyter_core/README
index 0760bba3fa..a08b26947f 100644
--- a/development/jupyter_core/README
+++ b/development/jupyter_core/README
@@ -1,2 +1,2 @@
-The Jupyter core contains the base application classes and configuration used
-by other Jupyter projects.
+The Jupyter core contains the base application classes and
+configuration used by other Jupyter projects.
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/kconfig-frontends/README b/development/kconfig-frontends/README
index 68d2e2bcca..faa908abc2 100644
--- a/development/kconfig-frontends/README
+++ b/development/kconfig-frontends/README
@@ -1,12 +1,12 @@
-kconfig-frontends project aims at centralising the effort of keeping an
-up-to-date, out of the Linux source tree, packaging of the kconfig
+kconfig-frontends project aims at centralising the effort of keeping
+an up-to-date, out of the Linux source tree, packaging of the kconfig
 infrastructure, ready for use by third party projects.
 
 The configuration language used by the Linux kernel, known as kconfig,
 has gained some traction in the community, due to its advantages:
  * simple syntax and grammar
- * limited, yet adequate, option types: boolean and tristates, integers and
-   strings
- * simple, yet efficient, organisation of options: indentation, sub-menus,
-   radio-like choices
+ * limited, yet adequate, option types: boolean and tristates, integers
+   and strings
+ * simple, yet efficient, organisation of options: indentation,
+   sub-menus, radio-like choices
  * direct and reverse dependencies
diff --git a/development/kdiff3/README b/development/kdiff3/README
index 5cfbd27567..fec26dc27f 100644
--- a/development/kdiff3/README
+++ b/development/kdiff3/README
@@ -10,8 +10,9 @@ KDiff3 is a program that
     * Manual alignment of lines,
     * Automatic merging of version control history ($Log$),
     * and has an intuitive graphical user interface.
-    * Windows-Explorer integration Diff-Ext-for-KDiff3 - shell extension 
-      included in installer (originally by Sergey Zorin: see also Diff Ext)
+    * Windows-Explorer integration Diff-Ext-for-KDiff3 - shell
+      extension included in installer (originally by Sergey Zorin;
+      see also Diff Ext)
     * Read what else is special in a short abstract (PDF).
 
 
diff --git a/development/kicad-footprints/README b/development/kicad-footprints/README
index 8511f8ce74..bc26bd46bd 100644
--- a/development/kicad-footprints/README
+++ b/development/kicad-footprints/README
@@ -1 +1 @@
-Additional KiCad footprints.
\ No newline at end of file
+Additional KiCad footprints.
diff --git a/development/kicad-footprints/kicad-footprints.SlackBuild b/development/kicad-footprints/kicad-footprints.SlackBuild
index 7074ece785..36a3831948 100644
--- a/development/kicad-footprints/kicad-footprints.SlackBuild
+++ b/development/kicad-footprints/kicad-footprints.SlackBuild
@@ -26,14 +26,12 @@
 # Revision date: 2019-12-12
 
 PRGNAM=kicad-footprints
-VERSION=${VERSION:-5.1.5}
+VERSION=${VERSION:-5.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH="noarch"
 
-KICAD_VERSION=${KICAD_VERSION:-5.1.5}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -70,4 +68,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:-tgz}
\ No newline at end of file
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/kicad-footprints/kicad-footprints.info b/development/kicad-footprints/kicad-footprints.info
index 6b14ee8693..4131119497 100644
--- a/development/kicad-footprints/kicad-footprints.info
+++ b/development/kicad-footprints/kicad-footprints.info
@@ -1,8 +1,8 @@
 PRGNAM="kicad-footprints"
-VERSION="5.1.5"
+VERSION="5.1.6"
 HOMEPAGE="http://kicad-pcb.org/"
-DOWNLOAD="https://github.com/KiCad/kicad-footprints/archive/5.1.5/kicad-footprints-5.1.5.tar.gz"
-MD5SUM="7722484abaf84a78dadc925070a07f7f"
+DOWNLOAD="https://github.com/KiCad/kicad-footprints/archive/5.1.6/kicad-footprints-5.1.6.tar.gz"
+MD5SUM="6f5df88bfda6ffc309c6a82381f0611d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/kicad-packages3D/README b/development/kicad-packages3D/README
index 90505b636a..5a234db090 100644
--- a/development/kicad-packages3D/README
+++ b/development/kicad-packages3D/README
@@ -1 +1 @@
-KiCad additional 3D packages.
\ No newline at end of file
+KiCad additional 3D packages.
diff --git a/development/kicad-packages3D/kicad-packages3D.SlackBuild b/development/kicad-packages3D/kicad-packages3D.SlackBuild
index 6bbaf10027..390b69764a 100644
--- a/development/kicad-packages3D/kicad-packages3D.SlackBuild
+++ b/development/kicad-packages3D/kicad-packages3D.SlackBuild
@@ -26,14 +26,12 @@
 # Revision date: 2019-12-12
 
 PRGNAM=kicad-packages3D
-VERSION=${VERSION:-5.1.5}
+VERSION=${VERSION:-5.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH="noarch"
 
-KICAD_VERSION=${KICAD_VERSION:-5.1.5}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -70,4 +68,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:-tgz}
\ No newline at end of file
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/kicad-packages3D/kicad-packages3D.info b/development/kicad-packages3D/kicad-packages3D.info
index 460f2b1c98..353930ab77 100644
--- a/development/kicad-packages3D/kicad-packages3D.info
+++ b/development/kicad-packages3D/kicad-packages3D.info
@@ -1,8 +1,8 @@
 PRGNAM="kicad-packages3D"
-VERSION="5.1.5"
+VERSION="5.1.6"
 HOMEPAGE="http://kicad-pcb.org/"
-DOWNLOAD="https://github.com/KiCad/kicad-packages3D/archive/5.1.5/kicad-packages3D-5.1.5.tar.gz"
-MD5SUM="13ec0aeb37f90c5f6385ce3948cce778"
+DOWNLOAD="https://github.com/KiCad/kicad-packages3D/archive/5.1.6/kicad-packages3D-5.1.6.tar.gz"
+MD5SUM="f7bc330a4538d543972d63f1ce2e44a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/kicad-symbols/README b/development/kicad-symbols/README
index cfa555cca1..3a60c84146 100644
--- a/development/kicad-symbols/README
+++ b/development/kicad-symbols/README
@@ -1 +1 @@
-KiCad additional symbols.
\ No newline at end of file
+KiCad additional symbols.
diff --git a/development/kicad-symbols/kicad-symbols.SlackBuild b/development/kicad-symbols/kicad-symbols.SlackBuild
index 2c497b732b..c61b7cbfff 100644
--- a/development/kicad-symbols/kicad-symbols.SlackBuild
+++ b/development/kicad-symbols/kicad-symbols.SlackBuild
@@ -26,14 +26,12 @@
 # Revision date: 2019-12-12
 
 PRGNAM=kicad-symbols
-VERSION=${VERSION:-5.1.5}
+VERSION=${VERSION:-5.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH="noarch"
 
-KICAD_VERSION=${KICAD_VERSION:-5.1.5}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -70,4 +68,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:-tgz}
\ No newline at end of file
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/kicad-symbols/kicad-symbols.info b/development/kicad-symbols/kicad-symbols.info
index 82273587d6..67d9d0a7ee 100644
--- a/development/kicad-symbols/kicad-symbols.info
+++ b/development/kicad-symbols/kicad-symbols.info
@@ -1,8 +1,8 @@
 PRGNAM="kicad-symbols"
-VERSION="5.1.5"
+VERSION="5.1.6"
 HOMEPAGE="http://kicad-pcb.org/"
-DOWNLOAD="https://github.com/KiCad/kicad-symbols/archive/5.1.5/kicad-symbols-5.1.5.tar.gz"
-MD5SUM="943175449bd7a5e2733a16e896786da4"
+DOWNLOAD="https://github.com/KiCad/kicad-symbols/archive/5.1.6/kicad-symbols-5.1.6.tar.gz"
+MD5SUM="436e5436ec3b7025a2a099eb97c81ae7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/kicad-templates/README b/development/kicad-templates/README
index aa39119733..a0d8d80602 100644
--- a/development/kicad-templates/README
+++ b/development/kicad-templates/README
@@ -1 +1 @@
-KiCad additional templates.
\ No newline at end of file
+KiCad additional templates.
diff --git a/development/kicad-templates/kicad-templates.SlackBuild b/development/kicad-templates/kicad-templates.SlackBuild
index 870af5676e..99c9b69736 100644
--- a/development/kicad-templates/kicad-templates.SlackBuild
+++ b/development/kicad-templates/kicad-templates.SlackBuild
@@ -26,14 +26,12 @@
 # Revision date: 2019-12-12
 
 PRGNAM=kicad-templates
-VERSION=${VERSION:-5.1.5}
+VERSION=${VERSION:-5.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH="noarch"
 
-KICAD_VERSION=${KICAD_VERSION:-5.1.5}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -70,4 +68,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:-tgz}
\ No newline at end of file
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/kicad-templates/kicad-templates.info b/development/kicad-templates/kicad-templates.info
index 36bc46cd00..aa0e5d44a6 100644
--- a/development/kicad-templates/kicad-templates.info
+++ b/development/kicad-templates/kicad-templates.info
@@ -1,8 +1,8 @@
 PRGNAM="kicad-templates"
-VERSION="5.1.5"
+VERSION="5.1.6"
 HOMEPAGE="http://kicad-pcb.org/"
-DOWNLOAD="https://github.com/KiCad/kicad-templates/archive/5.1.5/kicad-templates-5.1.5.tar.gz"
-MD5SUM="948e75ae5cf2dd8ced504d18f7271cff"
+DOWNLOAD="https://github.com/KiCad/kicad-templates/archive/5.1.6/kicad-templates-5.1.6.tar.gz"
+MD5SUM="e04291d285520ebc33bcd5670a9c6c43"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/kicad-templates/slack-desc b/development/kicad-templates/slack-desc
index ce17df853e..0754681b94 100644
--- a/development/kicad-templates/slack-desc
+++ b/development/kicad-templates/slack-desc
@@ -16,4 +16,4 @@ kicad-templates:
 kicad-templates:
 kicad-templates:
 kicad-templates:
-kicad-templates:
\ No newline at end of file
+kicad-templates:
diff --git a/development/kicad/README b/development/kicad/README
index 2a2a2ba8e0..08f2238f63 100644
--- a/development/kicad/README
+++ b/development/kicad/README
@@ -1,7 +1,7 @@
-The KiCad project aims at creating a portable, cross-platform, Free/Libre/
-Open-Source EDA Suite, capable of schematic and printed circuit board
-design.  The suite consist of a project manager, schematic editor,
-netlist converter, pcb designer and a gerber viewer.
+The KiCad project aims at creating a portable, cross-platform,
+Free/Libre/Open-Source EDA Suite, capable of schematic and printed
+circuit board design.  The suite consists of a project manager,
+schematic editor, netlist converter, pcb designer and a gerber viewer.
 
 There are separate SlackBuilds for the libraries and additional
 documentation: kicad-library and kicad-doc.
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/README b/development/kotlin/README
index 423d838431..ea7b28bc40 100644
--- a/development/kotlin/README
+++ b/development/kotlin/README
@@ -1,3 +1,4 @@
-Statically typed programming language for modern multiplatform applications.
+Statically typed programming language for modern multiplatform
+applications.
 
 This script will package kotlin compiler only, not the complete IDE.
diff --git a/development/kotlin/kotlin.SlackBuild b/development/kotlin/kotlin.SlackBuild
index 1c8145bdb9..cbb1fbde88 100644
--- a/development/kotlin/kotlin.SlackBuild
+++ b/development/kotlin/kotlin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kotlin
 
-# 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 @@
 
 PRGNAM=kotlin
 SRCNAM=kotlin-compiler
-VERSION=${VERSION:-1.3.71}
+VERSION=${VERSION:-1.4.32}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/kotlin/kotlin.info b/development/kotlin/kotlin.info
index 2902b4d56d..847ab7b8ec 100644
--- a/development/kotlin/kotlin.info
+++ b/development/kotlin/kotlin.info
@@ -1,8 +1,8 @@
 PRGNAM="kotlin"
-VERSION="1.3.71"
+VERSION="1.4.32"
 HOMEPAGE="https://kotlinlang.org/"
-DOWNLOAD="https://github.com/JetBrains/kotlin/releases/download/v1.3.71/kotlin-compiler-1.3.71.zip"
-MD5SUM="a963cd78aa527db81ada1f21a576358f"
+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/lcov/README b/development/lcov/README
index 6c01ad2a10..117ab8ed86 100644
--- a/development/lcov/README
+++ b/development/lcov/README
@@ -1,5 +1,5 @@
-LCOV is a graphical front-end for GCC's coverage testing tool gcov.  It
-collects gcov data for multiple source files and creates HTML pages containing
-the source code annotated with coverage information.  It also adds overview
-pages for easy navigation within the file structure.  LCOV supports statement,
-function and branch coverage measurement.
+LCOV is a graphical front-end for GCC's coverage testing tool gcov.
+It collects gcov data for multiple source files and creates HTML pages
+containing the source code annotated with coverage information.  It
+also adds overview pages for easy navigation within the file structure.
+LCOV supports statement, function and branch coverage measurement.
diff --git a/development/ldns/README b/development/ldns/README
index 8105fdac5c..81cabd91f4 100644
--- a/development/ldns/README
+++ b/development/ldns/README
@@ -1,4 +1,4 @@
-The goal of ldns is to simplify DNS programming; it supports recent RFCs 
-like the DNSSEC documents, and allows developers to easily create software 
-conforming to current RFCs and experimental software for current Internet 
-Drafts.  
+The goal of ldns is to simplify DNS programming; it supports recent
+RFCs like the DNSSEC documents, and allows developers to easily create
+software conforming to current RFCs and experimental software for
+current Internet Drafts.
diff --git a/development/lepton-eda/lepton-eda.SlackBuild b/development/lepton-eda/lepton-eda.SlackBuild
index f95612fd9e..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.10}
+VERSION=${VERSION:-1.9.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,13 +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 {} \;
 
-# apply patches:
-#
-for p in $CWD/patches/*
-do
-    patch --verbose -p1 < $p
-done
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/development/lepton-eda/lepton-eda.info b/development/lepton-eda/lepton-eda.info
index de6f4b9fc4..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.10"
+VERSION="1.9.14"
 HOMEPAGE="https://github.com/lepton-eda/lepton-eda"
-DOWNLOAD="https://github.com/lepton-eda/lepton-eda/releases/download/1.9.10-20200319/lepton-eda-1.9.10.tar.gz"
-MD5SUM="50a3c953552f8493337d46caade57270"
+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/lepton-eda/patches/lepton-upcfg.in.patch b/development/lepton-eda/patches/lepton-upcfg.in.patch
deleted file mode 100644
index 30b38fa685..0000000000
--- a/development/lepton-eda/patches/lepton-upcfg.in.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/utils/scripts/lepton-upcfg.in b/utils/scripts/lepton-upcfg.in
-index 8d9b45943..601ae188d 100644
---- a/utils/scripts/lepton-upcfg.in
-+++ b/utils/scripts/lepton-upcfg.in
-@@ -219,7 +219,13 @@ Lepton EDA homepage: <~a>
-   )
- 
- 
--  ( upcfg-log "ii: upgrading config in [~a]...~%" (config-file-path cfg-id) )
-+  ( upcfg-log
-+    "ii: upgrading config in [~a]...~%"
-+    ( if cfg-id
-+      ( config-file-path cfg-id ) ; if
-+      ( list-ref files 0 )        ; else
-+    )
-+  )
- 
-   ( if ( null? files )
-     ( or (config-upgrade cfg-id #:copy copy #:overwrite overwrite) (failure) ) ; if
diff --git a/development/lepton-eda/slack-desc b/development/lepton-eda/slack-desc
index cf8d11f645..a8c2311662 100644
--- a/development/lepton-eda/slack-desc
+++ b/development/lepton-eda/slack-desc
@@ -8,12 +8,12 @@
           |-----handy-ruler------------------------------------------------------|
 lepton-eda: lepton-eda (Lepton Electronic Design Automation)
 lepton-eda:
-lepton-eda: The Lepton EDA suite provides schematic capture, netlisting, bill
-lepton-eda: of materials generation, and many other features. It was forked
-lepton-eda: from the gEDA/gaf suite in late 2016. It's in active development
-lepton-eda: and well supported.
+lepton-eda: Lepton EDA is a suite of free software tools for designing
+lepton-eda: electronics. It provides schematic capture, netlisting into
+lepton-eda: over 30 netlist formats, and many other features.
+lepton-eda: It was forked from the gEDA/gaf suite in late 2016 by most
+lepton-eda: of its active developers at that time.
+lepton-eda: It's in active development and well supported.
 lepton-eda:
 lepton-eda: Homepage: https://github.com/lepton-eda/lepton-eda
 lepton-eda:
-lepton-eda:
-lepton-eda:
diff --git a/development/libb2/libb2.SlackBuild b/development/libb2/libb2.SlackBuild
index 2cdf97a740..3da3d9272f 100644
--- a/development/libb2/libb2.SlackBuild
+++ b/development/libb2/libb2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libb2
 
-# Copyright Manuel Argüelles
+# Copyright 2020, Manuel Argüelles, Panamá City, Panamá
 # 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=libb2
-VERSION=${VERSION:-0.98}
+VERSION=${VERSION:-0.98.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -91,7 +91,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 LICENSE 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/development/libb2/libb2.info b/development/libb2/libb2.info
index 218c426344..dee46470ae 100644
--- a/development/libb2/libb2.info
+++ b/development/libb2/libb2.info
@@ -1,8 +1,8 @@
 PRGNAM="libb2"
-VERSION="0.98"
+VERSION="0.98.1"
 HOMEPAGE="https://blake2.net/"
-DOWNLOAD="https://blake2.net/libb2-0.98.tar.gz"
-MD5SUM="bb263f6b04e982e3d488797b5ce7dc26"
+DOWNLOAD="https://github.com/BLAKE2/libb2/archive/v0.98.1/libb2-0.98.1.tar.gz"
+MD5SUM="5ebe2eec2deeb9aedabd58d9cf91d92f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/libxdg-basedir/libxdg-basedir.SlackBuild b/development/libxdg-basedir/libxdg-basedir.SlackBuild
deleted file mode 100644
index 191ff86dab..0000000000
--- a/development/libxdg-basedir/libxdg-basedir.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libxdg-basedir
-
-# Copyright 2013 Heiko Rosemann Germany
-# 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.
-
-# Modified by the SlackBuilds.org project
-
-PRGNAM=libxdg-basedir
-VERSION=${VERSION:-1.2.0}
-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/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --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
-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/liquibase/README b/development/liquibase/README
index 17e3ccaf38..39cbdf75d8 100644
--- a/development/liquibase/README
+++ b/development/liquibase/README
@@ -1,9 +1,9 @@
 Liquibase - source control for your database
 
-Liquibase is an open source database-independent library for tracking, managing
-and applying database schema changes.
+Liquibase is an open source database-independent library for tracking,
+managing and applying database schema changes.
 
-See README.SLACKWARE for information on how to make JDBC drivers available to
-liquibase.
+See README.SLACKWARE for information on how to make JDBC drivers
+available to liquibase.
 
 This requires a Java runtime (jdk or JRE) to run.
diff --git a/development/logisim/README b/development/logisim/README
index d4fdecfb8b..0fcb264936 100644
--- a/development/logisim/README
+++ b/development/logisim/README
@@ -1,32 +1,33 @@
-Logisim is an educational tool for designing and simulating digital logic
-circuits.
+Logisim is an educational tool for designing and simulating digital
+logic circuits.
 
 Features:
 
 * It is free! (Logisim is open-source (GPL).)
 
-* It runs on any machine supporting Java 1.4 or later; special versions are
-  released for MacOS X and Windows. The cross-platform nature is important
-  for students who have a variety of home/dorm computer systems.
+* It runs on any machine supporting Java 1.4 or later; special
+  versions are released for MacOS X and Windows. The cross-platform
+  nature is important for students who have a variety of home/dorm
+  computer systems.
 
-* The drawing interface is based on an intuitive toolbar. Color-coded wires
-  aid in simulating and debugging a circuit.
+* The drawing interface is based on an intuitive toolbar. Color-coded
+  wires aid in simulating and debugging a circuit.
 
 * The wiring tool draws horizontal and vertical wires, automatically
   connecting to components and to other wires. It's very easy to draw
   circuits!
 
-* Completed circuits can be saved into a file, exported to a GIF file, or
-  printed on a printer.
+* Completed circuits can be saved into a file, exported to a GIF file,
+  or printed on a printer.
 
-* Circuit layouts can be used as "subcircuits" of other circuits, allowing
-  for hierarchical circuit design.
+* Circuit layouts can be used as "subcircuits" of other circuits,
+  allowing for hierarchical circuit design.
 
 * Included circuit components include inputs and outputs, gates,
   multiplexers, arithmetic circuits, flip-flops, and RAM memory.
 
-* The included "combinational analysis" module allows for conversion between
-  circuits, truth tables, and Boolean expressions.
+* The included "combinational analysis" module allows for conversion
+  between circuits, truth tables, and Boolean expressions.
 
-NOTE: The development of this project is suspended
+NOTE: The development of this project is suspended. See:
 http://www.cburch.com/logisim/retire-note.html
diff --git a/development/love-legacy072/love-legacy072.info b/development/love-legacy072/love-legacy072.info
index a203cf966d..b32a275a49 100644
--- a/development/love-legacy072/love-legacy072.info
+++ b/development/love-legacy072/love-legacy072.info
@@ -1,7 +1,7 @@
 PRGNAM="love-legacy072"
 VERSION="0.7.2"
 HOMEPAGE="http://love2d.org"
-DOWNLOAD="https://bitbucket.org/rude/love/downloads/love-0.7.2-linux-src.tar.gz"
+DOWNLOAD="https://github.com/love2d/love/releases/download/0.7.2/love-0.7.2-linux-src.tar.gz"
 MD5SUM="c3e678606bb9a870c31168e85b269e7e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/love-legacy080/love-legacy080.info b/development/love-legacy080/love-legacy080.info
index a20bf93e4d..d00894b050 100644
--- a/development/love-legacy080/love-legacy080.info
+++ b/development/love-legacy080/love-legacy080.info
@@ -1,7 +1,7 @@
 PRGNAM="love-legacy080"
 VERSION="0.8.0"
 HOMEPAGE="http://love2d.org"
-DOWNLOAD="https://bitbucket.org/rude/love/downloads/love-0.8.0-linux-src.tar.gz"
+DOWNLOAD="https://github.com/love2d/love/releases/download/0.8.0/love-0.8.0-linux-src.tar.gz"
 MD5SUM="9db9c32585fc7c7da3eba7e438783099"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/love/README b/development/love/README
index 5246813416..777ae48e9c 100644
--- a/development/love/README
+++ b/development/love/README
@@ -1 +1,3 @@
+love (Lua 2D game development framework)
+
 LOVE is a framework for developing 2D games in Lua.
diff --git a/development/love/love.SlackBuild b/development/love/love.SlackBuild
index b16066ae9e..5a27d64858 100644
--- a/development/love/love.SlackBuild
+++ b/development/love/love.SlackBuild
@@ -3,9 +3,16 @@
 # Slackware build script for LÖVE
 
 # Written by Dugan Chen (thedoogster [at] gmail [dot] com)
+# Now maintained by B. Watson <yalhcru@gmail.com>.
+# Original version had no license; modified version licensed under the
+# WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20200415 bkw:
+# - take over maintenance
+# - update for v11.3
 
 PRGNAM=love
-VERSION=${VERSION:-11.1}
+VERSION=${VERSION:-11.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -45,11 +52,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION-linux-src.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,13 +68,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --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
+make install-strip DESTDIR=$PKG
+gzip $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a changes.txt license.txt readme.md $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/love/love.info b/development/love/love.info
index 055972cab6..b6d3697f27 100644
--- a/development/love/love.info
+++ b/development/love/love.info
@@ -1,10 +1,10 @@
 PRGNAM="love"
-VERSION="11.1"
+VERSION="11.3"
 HOMEPAGE="http://love2d.org"
-DOWNLOAD="https://bitbucket.org/rude/love/downloads/love-11.1-linux-src.tar.gz"
-MD5SUM="c8506ec22bc62e491818b81b8eb016aa"
+DOWNLOAD="https://bitbucket.org/rude/love/downloads/love-11.3-linux-src.tar.gz"
+MD5SUM="21fb1630b1edfe7b0699bc10abe2d9a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL SDL2 libmodplug luajit physfs"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/development/luajit/README b/development/luajit/README
index dff3753145..2abcd923af 100644
--- a/development/luajit/README
+++ b/development/luajit/README
@@ -1 +1,2 @@
-LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.
+LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming
+language.
diff --git a/development/lwtools/README b/development/lwtools/README
index 7edda0e737..cad76b335b 100644
--- a/development/lwtools/README
+++ b/development/lwtools/README
@@ -1,4 +1,5 @@
-LWTOOLS is a set of cross-development tools for the Motorola 6809 and Hitachi
-6309 microprocessors.  It supports assembling to raw binaries, CoCo LOADM
-binaries, and a proprietary object file format for later linking.  It also
-supports macros and file inclusion among other things.
+LWTOOLS is a set of cross-development tools for the Motorola 6809 and
+Hitachi 6309 microprocessors.  It supports assembling to raw binaries,
+CoCo LOADM binaries, and a proprietary object file format for later
+linking.  It also supports macros and file inclusion among other
+things.
diff --git a/development/mads/README b/development/mads/README
index 68bf67acce..52ce5d7461 100644
--- a/development/mads/README
+++ b/development/mads/README
@@ -1,16 +1,17 @@
 mads (cross assembler for 6502, targetting the Atari 8-bit)
 
-MADS is oriented toward users of QA, XASM, and FA. The syntax is borrowed
-from QA, some macro commands and syntax come from XASM, and SpartaDOS X
-(SDX) syntax is inherited from FA. Additional characters are allowed in
-label names. Also added are support for the 65816 CPU, macros, procedures,
-splitting across virtual memory banks, and nested label names.
+MADS is oriented toward users of QA, XASM, and FA. The syntax is
+borrowed from QA, some macro commands and syntax come from XASM, and
+SpartaDOS X (SDX) syntax is inherited from FA. Additional characters
+are allowed in label names. Also added are support for the 65816 CPU,
+macros, procedures, splitting across virtual memory banks, and nested
+label names.
 
 /usr/doc/mads-$VERSION/examples has a lot of sample code that's well
 worth looking at. The DOS/Windows package of MADS ships with various
 executables in examples/compression. These are not included in the
-package. "Squash", "deflate", and "rle" ship with source, so you can
-compile these yourself if you need them. "Exomizer", "lz4", and "pucrunch"
-exist on SlackBuilds.org, in the system/ category.
+package. "Squash", "deflate", and "rle" ship with source, so you
+can compile these yourself if you need them. "Exomizer", "lz4", and
+"pucrunch" exist on SlackBuilds.org, in the system/ category.
 
 Syntax highlighting for the vim and scite editors is included.
diff --git a/development/maude/README b/development/maude/README
index c75ddb5a0f..a4fec96e3a 100644
--- a/development/maude/README
+++ b/development/maude/README
@@ -15,4 +15,4 @@ you may:
  
  - export the variable to the environment, then run maude
    $ export MAUDE_LIB=/usr/share/maude/
-   $ maude
\ No newline at end of file
+   $ maude
diff --git a/development/mawk/README b/development/mawk/README
index 2c3bcc4003..fbf82b010d 100644
--- a/development/mawk/README
+++ b/development/mawk/README
@@ -1,8 +1,9 @@
 mawk (fast awk implementation)
 
-mawk (Mike's AWK) is an interpreter for the AWK Programming Language. It's
-a very fast AWK implementation based on a bytecode interpreter. Originally
-written by Mike Brennan, mawk is currently maintained by Thomas E. Dickey.
+mawk (Mike's AWK) is an interpreter for the AWK Programming
+Language. It's a very fast AWK implementation based on a bytecode
+interpreter. Originally written by Mike Brennan, mawk is currently
+maintained by Thomas E. Dickey.
 
 The AWK language is useful for manipulation of data files, text
 retrieval and processing, and for prototyping and experimenting with
@@ -32,11 +33,14 @@ regular expression engine:
 If you require the glibc engine, export BUILTIN_REGEX=no in the script's
 environment.
 
-The default version in the .info file is 1.3.4, which is a stable release
-from 2009. If you'd like to (or need to) build one of the newer 'snapshot'
-releases, get the source from ftp://ftp.invisible-island.net/mawk/
-and export VERSION in the environment. Notice the filenames look like
-e.g. "mawk-1.3.4-20171017.tgz". Slackware version numbers can't contain
-the hyphen, so use an underscore instead. Example:
+The default version in the .info file is 1.3.4, which is a stable
+release from 2009. If you'd like to (or need to) build one of the newer
+'snapshot' releases, get the source from:
+
+ftp://ftp.invisible-island.net/mawk/
+
+...and export VERSION in the environment. Notice the filenames look
+like e.g. "mawk-1.3.4-20171017.tgz". Slackware version numbers can't
+contain the hyphen, so use an underscore instead. Example:
 
 # export "VERSION=1.3.4_20171017"
diff --git a/development/mcrl2/README b/development/mcrl2/README
index 29abd169e9..a6e39d196a 100644
--- a/development/mcrl2/README
+++ b/development/mcrl2/README
@@ -1,5 +1,5 @@
 mCRL2 stands for micro Common Representation Language 2. It is a
 specification language that can be used to specify and analyse the
-behaviour of distributed systems and protocols and is the successor to
-mCRL. Using its accompanying toolset systems can be analysed and verified
-automatically.
+behaviour of distributed systems and protocols and is the successor
+to mCRL. Using its accompanying toolset systems can be analysed and
+verified automatically.
diff --git a/development/mcu8051ide/README b/development/mcu8051ide/README
index 85ca2c6221..9659af514c 100644
--- a/development/mcu8051ide/README
+++ b/development/mcu8051ide/README
@@ -1,5 +1,5 @@
-MCU 8051 IDE is an integrated development environment for microcontrollers
-based on 8051.
+MCU 8051 IDE is an integrated development environment for
+microcontrollers based on 8051.
 
 Supported programming languages are C and assembly. It has its own
 assembler and support for 2 external assemblers. For C language it uses
@@ -8,8 +8,9 @@ SDCC compiler.
 This program is intended for Linux systems, other POSIX systems and
 Microsoft(r) Windows(r) system.
 
-This IDE contains simulator, source code editor, assembler, HW programmer
-and much other tools. Simulator supports over 79 MCU primarily from Atmel.
+This IDE contains simulator, source code editor, assembler, HW
+programmer and much other tools. Simulator supports over 79 MCU
+primarily from Atmel.
 
 HW programmer supports 8 ISP programmable MCUs from Atmel (AT89Sxx,
 AT89LSxx). There is also support for simple hardware simulation (like
diff --git a/development/medit/README b/development/medit/README
index 6d8d37d41c..66a291038d 100644
--- a/development/medit/README
+++ b/development/medit/README
@@ -1,3 +1,3 @@
-medit - it started originally as a simple built-in editor component in GGAP,
-it grew up to a real text editor. The intention now is to make it a useful 
-programming and around-programming text editor.
+medit - it started originally as a simple built-in editor component in
+GGAP, it grew up to a real text editor. The intention now is to make it
+a useful programming and around-programming text editor.
diff --git a/development/meld/README b/development/meld/README
index 4d9d7587ca..8098259afb 100644
--- a/development/meld/README
+++ b/development/meld/README
@@ -1,8 +1,9 @@
 Meld is a visual diff and merge tool.
 
-You can compare two or three files and edit them in place
-(diffs update dynamically). You can compare two or three folders and launch
-file comparisons. You can browse and view a working copy from popular version
-control systems such such as CVS, Subversion, Bazaar-ng and Mercurial.
+You can compare two or three files and edit them in place (diffs
+update dynamically). You can compare two or three folders and launch
+file comparisons. You can browse and view a working copy from popular
+version control systems such such as CVS, Subversion, Bazaar-ng and
+Mercurial.
 
 Optional dependency: pygtksourceview (for syntax highlighting)
diff --git a/development/meld3/README b/development/meld3/README
index 2403b2406d..f28888da0c 100644
--- a/development/meld3/README
+++ b/development/meld3/README
@@ -1,9 +1,10 @@
 Meld is a visual diff and merge tool.
 
-You can compare two or three files and edit them in place
-(diffs update dynamically). You can compare two or three folders and launch
-file comparisons. You can browse and view a working copy from popular version
-control systems such such as CVS, Subversion, Bazaar-ng and Mercurial.
+You can compare two or three files and edit them in place (diffs
+update dynamically). You can compare two or three folders and launch
+file comparisons. You can browse and view a working copy from popular
+version control systems such such as CVS, Subversion, Bazaar-ng and
+Mercurial.
 
 This one uses GTK+3 instead of GTK+2.
 
diff --git a/development/memchan/README b/development/memchan/README
index 06eb283f67..ca531e7d93 100644
--- a/development/memchan/README
+++ b/development/memchan/README
@@ -1,5 +1,6 @@
-Memchan provides several new channel types for in-memory channels and the
-appropriate commands for their creation. They are useful to transfer large
-amounts of data between procedures or interpreters, and additionally
-provide an easy interface to on-the-fly generation of code or data
-too. No need to [set] or [append] to a string, just do a simple [puts].
+Memchan provides several new channel types for in-memory channels
+and the appropriate commands for their creation. They are useful to
+transfer large amounts of data between procedures or interpreters, and
+additionally provide an easy interface to on-the-fly generation of code
+or data too. No need to [set] or [append] to a string, just do a simple
+[puts].
diff --git a/development/menhir/README b/development/menhir/README
index c23cf7d8a3..3e017c74e1 100644
--- a/development/menhir/README
+++ b/development/menhir/README
@@ -1,2 +1,3 @@
 Menhir is a LR(1) parser generator for the OCaml programming language.
-That is, Menhir compiles LR(1) grammar specifications down to OCaml code.
+That is, Menhir compiles LR(1) grammar specifications down to OCaml
+code.
diff --git a/development/meson/meson.SlackBuild b/development/meson/meson.SlackBuild
index 79b6a73eb6..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.52.1}
+VERSION=${VERSION:-0.57.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/meson/meson.info b/development/meson/meson.info
index ec493ba95e..3e5dddd794 100644
--- a/development/meson/meson.info
+++ b/development/meson/meson.info
@@ -1,8 +1,8 @@
 PRGNAM="meson"
-VERSION="0.52.1"
+VERSION="0.57.1"
 HOMEPAGE="http://mesonbuild.com"
-DOWNLOAD="https://github.com/mesonbuild/meson/releases/download/0.52.1/meson-0.52.1.tar.gz"
-MD5SUM="a5f0c99567d772508f649a28ded7f8ad"
+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/mg-troglobit/LICENSE b/development/mg-troglobit/LICENSE
deleted file mode 100644
index 572f5a4214..0000000000
--- a/development/mg-troglobit/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Marco Marini
-
-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.
diff --git a/development/mg-troglobit/README.md b/development/mg-troglobit/README.md
deleted file mode 100644
index 94d65b41c6..0000000000
--- a/development/mg-troglobit/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# mg-troglobit.SlackBuild
-
-A SlackBuild for Joachim Nilsson (troglobit)'s fork of OpenBSD Mg (https://github.com/troglobit/mg)
-
-The usage is the very same of https://slackbuilds.org/howto/
-
-Get the Mg source code here: https://github.com/troglobit/mg/releases/download/v3.3/mg-3.3.tar.gz
-
-![Mg-troglobit on Slackware 14.0](https://i.postimg.cc/htfV3k6x/mg33.png "Mg-troglobit on Slackware 14.0")
diff --git a/development/mg-troglobit/mg-troglobit.SlackBuild b/development/mg-troglobit/mg-troglobit.SlackBuild
index 6690f0b458..e3e5d6e67c 100644
--- a/development/mg-troglobit/mg-troglobit.SlackBuild
+++ b/development/mg-troglobit/mg-troglobit.SlackBuild
@@ -1,11 +1,31 @@
 #!/bin/sh -e
 
-# Slackware build script for Joachim Nilsson (troglobit)'s fork of OpenBSD Mg
-# saidone@saidone.org revision date 2019/12/12
-# license (of this script and its accessories, not that of the application it will package): see LICENSE
+# Slackware build script for Joachim Wiberg (troglobit)'s fork of OpenBSD Mg
+# saidone@saidone.org revision date 2020/08/24
+#
+# Copyright (c) 2019 Marco Marini
+#
+# 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.
 
 PRGNAM=mg-troglobit
-VERSION=${VERSION:-3.3}
+SRCNAM=${PRGNAM%-*}
+VERSION=${VERSION:-3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,10 +61,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM/troglobit/}$VERSION.tar.gz
-mv ${PRGNAM/troglobit/}$VERSION $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -79,7 +98,9 @@ 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
 
-rm $PKG/usr/doc/$PRGNAM-$VERSION/*.md
+gzip -9 $PKG/usr/doc/$PRGNAM-$VERSION/tutorial
+
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/{*.md,.mg}
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/mg-troglobit/mg-troglobit.info b/development/mg-troglobit/mg-troglobit.info
index d77119f2df..86f5bd334b 100644
--- a/development/mg-troglobit/mg-troglobit.info
+++ b/development/mg-troglobit/mg-troglobit.info
@@ -1,8 +1,8 @@
 PRGNAM="mg-troglobit"
-VERSION="3.3"
+VERSION="3.4"
 HOMEPAGE="https://github.com/troglobit/mg"
-DOWNLOAD="https://github.com/troglobit/mg/releases/download/v3.3/mg-3.3.tar.gz"
-MD5SUM="5812cf804068cef687d8e2fe0346f7bc"
+DOWNLOAD="https://github.com/troglobit/mg/releases/download/v3.4/mg-3.4.tar.gz"
+MD5SUM="6b79855d54770bcb23e5457ebde8296c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/mg-troglobit/slack-desc b/development/mg-troglobit/slack-desc
index cb2766f037..fbe74ece67 100644
--- a/development/mg-troglobit/slack-desc
+++ b/development/mg-troglobit/slack-desc
@@ -11,9 +11,9 @@ mg-troglobit:
 mg-troglobit: The intention is to be a small, fast, and portable Emacs-like editor
 mg-troglobit: for users who cannot, or do not want to, run the real Emacs for one
 mg-troglobit: reason or another.
-mg-troglobit: 
+mg-troglobit:
 mg-troglobit: Compatibility with GNU Emacs is key for Mg, separating it from other
 mg-troglobit: ErsatzEmacs clones, because there should never be any reason to learn
 mg-troglobit: more than one Emacs flavor.
-mg-troglobit: 
+mg-troglobit:
 mg-troglobit: homepage: https://github.com/troglobit/mg
diff --git a/development/minikube/README b/development/minikube/README
index 1e7a86107c..ab22eab510 100644
--- a/development/minikube/README
+++ b/development/minikube/README
@@ -2,8 +2,9 @@ minikube
 
 Local Kubernetes, focused on application development & education
 
-As of today bare-metal runs are only supported on systemd enabled systems.
-You will need either docker (experimental) or virtualbox to run minikube VMs.
+As of today bare-metal runs are only supported on systemd enabled
+systems.  You will need either docker, virtualbox or podman
+(experimental) to run minikube VMs.
 
 Depending on the driver of choice run it as either:
 
@@ -13,6 +14,11 @@ or
 
   minikube start --driver=virtualbox
 
+or (experimental)
+
+  minikube start --driver=podman --container-runtime=cri-o
+
 as a non-root user.
 
-kubectl is required to administer your cluster but is not required for the installation.
+kubectl is required to administer your cluster but is not required for
+the installation.
diff --git a/development/minikube/minikube.SlackBuild b/development/minikube/minikube.SlackBuild
index 6c5673986f..bec7c01047 100644
--- a/development/minikube/minikube.SlackBuild
+++ b/development/minikube/minikube.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=minikube
-VERSION=${VERSION:-1.8.2}
+VERSION=${VERSION:-1.13.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/minikube/minikube.info b/development/minikube/minikube.info
index 3127946643..e7547c3888 100644
--- a/development/minikube/minikube.info
+++ b/development/minikube/minikube.info
@@ -1,10 +1,10 @@
 PRGNAM="minikube"
-VERSION="1.8.2"
+VERSION="1.13.0"
 HOMEPAGE="https://minikube.sigs.k8s.io"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM="UNSUPPORTED"
-DOWNLOAD_x86_64="https://github.com/kubernetes/minikube/releases/download/v1.8.2/minikube-linux-amd64"
-MD5SUM_x86_64="1dab178f002f58fad4e314a1a74015e6"
+DOWNLOAD_x86_64="https://github.com/kubernetes/minikube/releases/download/v1.13.0/minikube-linux-amd64"
+MD5SUM_x86_64="eca78bf9f8f653fd2c8301da12a51aa0"
 REQUIRES=""
 MAINTAINER="Dmitrii Sosedov"
 EMAIL="d.sosedov@gmail.com"
diff --git a/development/minikube/slack-desc b/development/minikube/slack-desc
index 1d3af5e446..2b391c34d2 100644
--- a/development/minikube/slack-desc
+++ b/development/minikube/slack-desc
@@ -11,7 +11,7 @@ minikube:
 minikube: Local Kubernetes, focused on application development & education
 minikube:
 minikube: Homepage: https://minikube.sigs.k8s.io/
-minikube: Release date: Mar 13, 2020
+minikube: Release date: Sep 3, 2020
 minikube:
 minikube:
 minikube:
diff --git a/development/mit-scheme/README b/development/mit-scheme/README
index 09c75a6223..0d0a722081 100644
--- a/development/mit-scheme/README
+++ b/development/mit-scheme/README
@@ -1,4 +1,18 @@
 MIT/GNU Scheme is an implementation of the Scheme programming language,
 providing an interpreter, compiler, source-code debugger, integrated
-Emacs-like editor, and a large runtime library. MIT/GNU Scheme is best suited
-to programming large applications with a rapid development cycle.
+Emacs-like editor, and a large runtime library. MIT/GNU Scheme is best
+suited to programming large applications with a rapid development cycle.
+
+The following build options are available:
+
+  X11=yes|no          Enable support for x11 (default: yes)
+  EDWIN=yes|no        Enable support for the Edwin editor (default: yes)
+  IMAIL=yes|no        Enable support for the Imail mail reader (default:
+                      no), implies Edwin support
+  DOCS=yes|no         Include html and pdf documentation (default: no),
+                      requires texlive
+
+where each build option may be passed to the slackbuild. Example of
+disabling x11 and enabling documentation support:
+
+  X11=no DOCS=yes sh ./mit-scheme.SlackBuild
diff --git a/development/mit-scheme/doinst.sh b/development/mit-scheme/doinst.sh
index f3605d4eeb..9670c925ff 100644
--- a/development/mit-scheme/doinst.sh
+++ b/development/mit-scheme/doinst.sh
@@ -1,3 +1,7 @@
-if [ -x /usr/bin/install-info ]; then
-  chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/blah.gz 2> /dev/null
-fi
+info_install() {
+  INFO="$1"
+  if [ -x /usr/bin/install-info ]; then
+    chroot . /usr/bin/install-info --info-dir=/usr/info $INFO 2> /dev/null
+  fi
+}
+
diff --git a/development/mit-scheme/mit-scheme.SlackBuild b/development/mit-scheme/mit-scheme.SlackBuild
index a3b01c355b..99d541306f 100644
--- a/development/mit-scheme/mit-scheme.SlackBuild
+++ b/development/mit-scheme/mit-scheme.SlackBuild
@@ -2,9 +2,10 @@
 
 # Slackware build script for mit-scheme
 # Originally by Jockey S. Kyd (jockey dot kyd at gmail dot com)
-
+#
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-
+# Copyright (C) 2018,2020 Jason Graham <jgraham@compukix.net>, USA
+#
 # 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 2 of the License, or
@@ -25,7 +26,7 @@
 
 
 PRGNAM=mit-scheme
-VERSION=${VERSION:-9.2}
+VERSION=${VERSION:-10.1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,6 +60,16 @@ else
   exit 1
 fi
 
+X11=${X11:-yes}
+EDWIN=${EDWIN:-yes}
+IMAIL=${IMAIL:-yes}
+DOCS=${DOCS:-no}
+
+# Sanitize build settings and set additional flags
+[ "$X11" != "yes" ] && X11="no" || WITH_X="--with-x"
+[ "$EDWIN" != "yes" ] && EDWIN="no"
+[ "$IMAIL" != "yes" ] && IMAIL="no"
+
 set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -74,43 +85,57 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cd src
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib$LIBDIRSUFFIX \
-    --build=$ARCH-slackware-linux
-
-  make
-  make install DESTDIR=$PKG
-cd ..
+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 \
+      --enable-default-plugins=no \
+      --enable-x11=${X11} \
+      --enable-edwin=${EDWIN} \
+      --enable-imail=${IMAIL} \
+      $WITH_X
+make
+make install DESTDIR=$PKG
+
+cd ../doc
+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 \
+      --build=$ARCH-slackware-linux \
+      --htmldir=/usr/doc/$PRGNAM-$VERSION/html \
+      --pdfdir=/usr/doc/$PRGNAM-$VERSION/pdf \
+      --enable-html=${DOCS} \
+      --enable-pdf=${DOCS} \
+      --enable-ps=no
+
+    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/man/man1
-cp -a doc/scheme.1 $PKG/usr/man/man1/mit-scheme.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
 
-# take prebuilt info doc rather than build them by ourselves
-mkdir -p $PKG/usr/info
-tar xvf $CWD/$PRGNAM-$VERSION-doc-info.tar.gz
-install -o root -g root -m 644 $PRGNAM-$VERSION/doc/*.info $PKG/usr/info
+rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
-# ditto for html ones
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-tar xvf $CWD/$PRGNAM-$VERSION-doc-html.tar.gz \
-  -C $PKG/usr/doc/$PRGNAM-$VERSION/html \
-  --strip-components=2
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/html
-
-# ditto for pdf ones
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pdf
-tar xvf $CWD/$PRGNAM-$VERSION-doc-pdf.tar.gz
-install -o root -g root -m 644 $PRGNAM-$VERSION/doc/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION/pdf
-
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a changelog.txt src/COPYING src/README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -119,4 +144,6 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+for i in usr/info/*.info*; do echo "info_install /$i" >> $PKG/install/doinst.sh; done
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/mit-scheme/mit-scheme.info b/development/mit-scheme/mit-scheme.info
index c8b623aaf8..94ff1e3bd7 100644
--- a/development/mit-scheme/mit-scheme.info
+++ b/development/mit-scheme/mit-scheme.info
@@ -1,22 +1,10 @@
 PRGNAM="mit-scheme"
-VERSION="9.2"
+VERSION="10.1.11"
 HOMEPAGE="http://www.gnu.org/software/mit-scheme/"
-DOWNLOAD="http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/9.2/mit-scheme-9.2-i386.tar.gz \
-          http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/9.2/mit-scheme-9.2-doc-html.tar.gz \
-          http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/9.2/mit-scheme-9.2-doc-info.tar.gz \
-          http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/9.2/mit-scheme-9.2-doc-pdf.tar.gz"
-MD5SUM="b80458f85b9521bdfb0620edc89e3e61 \
-        a605fd061ec7419f01f7ce18bd4f8dc1 \
-        fc49f8169484c358cdae9cfd511b65d2 \
-        db43ff41a3bb0b5e4e13de7a83c13b0d"
-DOWNLOAD_x86_64="http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/9.2/mit-scheme-9.2-x86-64.tar.gz \
-                 http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/9.2/mit-scheme-9.2-doc-html.tar.gz \
-                 http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/9.2/mit-scheme-9.2-doc-info.tar.gz \
-                 http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/9.2/mit-scheme-9.2-doc-pdf.tar.gz"
-MD5SUM_x86_64="9fcc6c156e53efeb0560996551fa0a57 \
-               a605fd061ec7419f01f7ce18bd4f8dc1 \
-               fc49f8169484c358cdae9cfd511b65d2 \
-               db43ff41a3bb0b5e4e13de7a83c13b0d"
+DOWNLOAD="http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/10.1.11/mit-scheme-10.1.11-i386.tar.gz"
+MD5SUM="3881681eaaea80f765ebd28bd91f62b4"
+DOWNLOAD_x86_64="https://ftp.gnu.org/gnu/mit-scheme/stable.pkg/10.1.11/mit-scheme-10.1.11-x86-64.tar.gz"
+MD5SUM_x86_64="301453a99b6af9b521dd69d33ca8a547"
 REQUIRES=""
 MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/development/mlr/mlr.SlackBuild b/development/mlr/mlr.SlackBuild
index 03e0b00569..90c8164734 100644
--- a/development/mlr/mlr.SlackBuild
+++ b/development/mlr/mlr.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Slackware build script for mlr
+# Slackware build script for miller
+# http://johnkerl.org/miller
 
-# Copyright 2017 Erik Falor, Utah, USA
+# Copyright 2020 Erik Falor, Utah, USA
 # 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=mlr
-VERSION=${VERSION:-5.2.2}
+VERSION=${VERSION:-5.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/mlr/mlr.info b/development/mlr/mlr.info
index 2a9c52744a..cf1063e563 100644
--- a/development/mlr/mlr.info
+++ b/development/mlr/mlr.info
@@ -1,8 +1,8 @@
 PRGNAM="mlr"
-VERSION="5.2.2"
+VERSION="5.8.0"
 HOMEPAGE="http://johnkerl.org/miller/doc"
-DOWNLOAD="https://github.com/johnkerl/miller/releases/download/v5.2.2/mlr-5.2.2.tar.gz"
-MD5SUM="5ce1727e043fd5135ca7bf3d6e78caea"
+DOWNLOAD="https://github.com/johnkerl/miller/releases/download/v5.8.0/mlr-5.8.0.tar.gz"
+MD5SUM="c57bac2fe25ebec56de3264e6a731316"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/mongodb-compass/README b/development/mongodb-compass/README
index 2630e8d6e0..57c8b93178 100644
--- a/development/mongodb-compass/README
+++ b/development/mongodb-compass/README
@@ -2,9 +2,10 @@ MongoDB Compass
 
 The Easiest Way to Explore and Manipulate Your MongoDB Data.
 
-The GUI for MongoDB. Visually explore your data. Run ad hoc queries in seconds.
-Interact with your data with full CRUD functionality. View and optimize your
-query performance. Available on Linux, Mac, or Windows. Compass empowers you to
-make smarter decisions about indexing, document validation, and more.
+The GUI for MongoDB. Visually explore your data. Run ad hoc queries in
+seconds.  Interact with your data with full CRUD functionality. View
+and optimize your query performance. Available on Linux, Mac, or
+Windows. Compass empowers you to make smarter decisions about indexing,
+document validation, and more.
 
 MongoDB Compass is available only for x86_64 platform.
diff --git a/development/mongodb-compass/mongodb-compass.SlackBuild b/development/mongodb-compass/mongodb-compass.SlackBuild
index 2443cf3f6a..82bebb3939 100644
--- a/development/mongodb-compass/mongodb-compass.SlackBuild
+++ b/development/mongodb-compass/mongodb-compass.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for mongodb-compass
 
 # Copyright 2017 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright 2020-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # 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=mongodb-compass
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.26.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,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 55cd8f4932..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.6.2"
+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.6.2.x86_64.rpm"
-MD5SUM_x86_64="a8efc97e68d304bc50a0b6c1203f964d"
+DOWNLOAD_x86_64="https://downloads.mongodb.com/compass/mongodb-compass-1.26.1.x86_64.rpm"
+MD5SUM_x86_64="c7f6b0f5c516e2442718ec55d82e4d07"
 REQUIRES=""
-MAINTAINER="Giuseppe Di Terlizzi"
-EMAIL="giuseppe.diterlizzi@gmail.com"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/development/mono-addins/README b/development/mono-addins/README
index a1ba96043d..8675647ee3 100644
--- a/development/mono-addins/README
+++ b/development/mono-addins/README
@@ -1,9 +1,10 @@
 Mono.Addins is a framework for creating extensible applications, and for
 creating libraries which extend those applications.
 
-Mono.Addins has been designed to be easy to use and useful for a wide range
-of applications: from simple applications with small extensibility needs,
-to complex applications which need support for large add-in structures.
+Mono.Addins has been designed to be easy to use and useful for a
+wide range of applications: from simple applications with small
+extensibility needs, to complex applications which need support for
+large add-in structures.
 
-This new framework intends to set an standard for building extensible
+This new framework intends to set a standard for building extensible
 applications and add-ins in Mono.
diff --git a/development/mono-addins/mono-addins.SlackBuild b/development/mono-addins/mono-addins.SlackBuild
index e220e55f7e..e6708dbc73 100644
--- a/development/mono-addins/mono-addins.SlackBuild
+++ b/development/mono-addins/mono-addins.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Mono.Addins
 
-# Written by André Barboza <bmg.andre@gmail.com>
+# Written by André Barboza <bmg.andre@gmail.com>
 
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
diff --git a/development/mono-basic/README b/development/mono-basic/README
index d8cb327d9b..1ffa8d8d53 100644
--- a/development/mono-basic/README
+++ b/development/mono-basic/README
@@ -1,6 +1,7 @@
 A Native compiler for Visual Basic.NET support in Mono.
-Having a native compiler for Visual Basic not only allows developers that
-wish to completely develop a Mono supported platform, but also allows
-applications that depend on the CodeDOM (ASP.NET for example) to be
-developed using Visual Basic. Something that before the availability of the
-compiler was not possible.
+
+Having a native compiler for Visual Basic not only allows developers
+that wish to completely develop a Mono supported platform, but also
+allows applications that depend on the CodeDOM (ASP.NET for example)
+to be developed using Visual Basic. Something that before the
+availability of the compiler was not possible.
diff --git a/development/mono-debugger/mono-debugger.SlackBuild b/development/mono-debugger/mono-debugger.SlackBuild
index 8644d67d18..0db9e8cb59 100644
--- a/development/mono-debugger/mono-debugger.SlackBuild
+++ b/development/mono-debugger/mono-debugger.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Mono Debugger
 
-# Written by André Barboza <bmg.andre@gmail.com>
+# Written by André Barboza <bmg.andre@gmail.com>
 
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
diff --git a/development/mono/README b/development/mono/README
index 407949725f..e8f1d719d4 100644
--- a/development/mono/README
+++ b/development/mono/README
@@ -1,9 +1,9 @@
-Mono is a software platform designed to allow developers to easily create
-cross platform applications.  It is an open source implementation of
-Microsoft's .Net Framework based on the ECMA standards for C# and the Common
-Language Runtime.  We feel that by embracing a successful, standardized
-software platform, we can lower the barriers to producing great applications
-for Linux.
+Mono is a software platform designed to allow developers to
+easily create cross platform applications.  It is an open source
+implementation of Microsoft's .Net Framework based on the ECMA
+standards for C# and the Common Language Runtime.  We feel that by
+embracing a successful, standardized software platform, we can lower
+the barriers to producing great applications for Linux.
 
 Note:
  - Mono build relies on a working Mono C# compiler to compile itself
diff --git a/development/mrustc/README b/development/mrustc/README
index d26467c96d..d539994b67 100644
--- a/development/mrustc/README
+++ b/development/mrustc/README
@@ -1,13 +1,4 @@
 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
+This project is an attempt at creating a simple rust compiler in C++,
+with the ultimate goal of being a separate re-implementation.
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/mtasc/README b/development/mtasc/README
index 698933b136..78ad82c4fc 100644
--- a/development/mtasc/README
+++ b/development/mtasc/README
@@ -1,3 +1,4 @@
-MTASC is an free software ActionScript 2.0 compiler developed by Motion-Twin 
-Technologies.  Motion-Twin no longer releases updates to MTASC though. 
-This project is a community fork of MTASC with new improvements.
+MTASC is an free software ActionScript 2.0 compiler developed by
+Motion-Twin Technologies.  Motion-Twin no longer releases updates
+to MTASC though.  This project is a community fork of MTASC with new
+improvements.
diff --git a/development/mysql-workbench/README b/development/mysql-workbench/README
index 8a3181ae40..6acb10bc12 100644
--- a/development/mysql-workbench/README
+++ b/development/mysql-workbench/README
@@ -1,7 +1,8 @@
-MySQL Workbench is a cross-platform, visual database design tool developed
-by MySQL.  It is the highly anticipated successor application of the
-DBDesigner4 project.  MySQL Workbench is available as a native GUI tool
-on Windows, Linux, and OS X in different editions.
+MySQL Workbench is a cross-platform, visual database design
+tool developed by MySQL.  It is the highly anticipated successor
+application of the DBDesigner4 project.  MySQL Workbench is available
+as a native GUI tool on Windows, Linux, and OS X in different
+editions.
 
 MySQL Workbench provides DBAs and developers an integrated tools
 environment for:
@@ -13,5 +14,5 @@ You need to allow MySQL to accept incoming connections from outside:
 Remove or comment this line:  SKIP="--skip-networking"  and then do:
 /etc/rc.d/rc.mysqld restart
 
-Note: MySQL Workbench will be built against Python 2.7 even when Python 3.x
-is installed on your system
+Note: MySQL Workbench will be built against Python 2.7 even when
+Python 3.x is installed on your system
diff --git a/development/nchexedit/nchexedit.info b/development/nchexedit/nchexedit.info
index 09b6bf659b..29cfa1ad79 100644
--- a/development/nchexedit/nchexedit.info
+++ b/development/nchexedit/nchexedit.info
@@ -2,7 +2,7 @@ PRGNAM="nchexedit"
 VERSION="0.9.7_5"
 HOMEPAGE="http://www.rogoyski.com/adam/programs/hexedit/"
 DOWNLOAD="http://www.rogoyski.com/adam/programs/hexedit/hexedit-0.9.7.tar.gz \
-          http://urchlay.naptime.net/~urchlay/src/ncurses-hexedit_0.9.7+orig-5.debian.tar.xz"
+          https://slackware.uk/~urchlay/src/ncurses-hexedit_0.9.7+orig-5.debian.tar.xz"
 MD5SUM="2658b81ab1bd0813c0117e9459071c13 \
         7fb8575f4709067a06895ca2fdc9712a"
 DOWNLOAD_x86_64=""
diff --git a/development/neovim-qt/neovim-qt.SlackBuild b/development/neovim-qt/neovim-qt.SlackBuild
index 5cc925b96a..7db592bf85 100644
--- a/development/neovim-qt/neovim-qt.SlackBuild
+++ b/development/neovim-qt/neovim-qt.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for neovim-qt
 
-# 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=neovim-qt
-VERSION=${VERSION:-0.2.15}
+VERSION=${VERSION:-0.2.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/neovim-qt/neovim-qt.info b/development/neovim-qt/neovim-qt.info
index f956e85566..32dc863fd7 100644
--- a/development/neovim-qt/neovim-qt.info
+++ b/development/neovim-qt/neovim-qt.info
@@ -1,8 +1,8 @@
 PRGNAM="neovim-qt"
-VERSION="0.2.15"
+VERSION="0.2.16.1"
 HOMEPAGE="https://github.com/equalsraf/neovim-qt"
-DOWNLOAD="https://github.com/equalsraf/neovim-qt/archive/v0.2.15/neovim-qt-0.2.15.tar.gz"
-MD5SUM="18de373ae92141f16fdb636e86356060"
+DOWNLOAD="https://github.com/equalsraf/neovim-qt/archive/v0.2.16.1/neovim-qt-0.2.16.1.tar.gz"
+MD5SUM="92db4d57a11b51d47d31ef2ae6c75ff9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="neovim qt5"
diff --git a/development/neovim-remote/README b/development/neovim-remote/README
new file mode 100644
index 0000000000..b2d9c28ded
--- /dev/null
+++ b/development/neovim-remote/README
@@ -0,0 +1,3 @@
+Control nvim processes using "nvr" commandline tool.
+
+Dependencies should be built with python3 support.
diff --git a/development/neovim-remote/doinst.sh b/development/neovim-remote/doinst.sh
new file mode 100644
index 0000000000..fc3cdc8518
--- /dev/null
+++ b/development/neovim-remote/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/bash_completion.d/neovim-remote.new
diff --git a/development/neovim-remote/neovim-remote.SlackBuild b/development/neovim-remote/neovim-remote.SlackBuild
new file mode 100644
index 0000000000..ff6e203f8f
--- /dev/null
+++ b/development/neovim-remote/neovim-remote.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for neovim-remote
+
+# 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=neovim-remote
+VERSION=${VERSION:-2.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 {} \;
+
+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/etc/bash_completion.d
+cp contrib/completion.bash $PKG/etc/bash_completion.d/neovim-remote.new
+
+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
+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/neovim-remote/neovim-remote.info b/development/neovim-remote/neovim-remote.info
new file mode 100644
index 0000000000..2e84053d0d
--- /dev/null
+++ b/development/neovim-remote/neovim-remote.info
@@ -0,0 +1,10 @@
+PRGNAM="neovim-remote"
+VERSION="2.4.0"
+HOMEPAGE="https://github.com/mhinz/neovim-remote"
+DOWNLOAD="https://github.com/mhinz/neovim-remote/archive/v2.4.0/neovim-remote-2.4.0.tar.gz"
+MD5SUM="c49c70b8f4725bf69aed152db62d593c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 python-neovim psutil"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/development/neovim-remote/slack-desc b/development/neovim-remote/slack-desc
new file mode 100644
index 0000000000..acf453de55
--- /dev/null
+++ b/development/neovim-remote/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------------------------------------------------------|
+neovim-remote: neovim-remote (remote control for neovim)
+neovim-remote:
+neovim-remote: Control nvim processes using "nvr" commandline tool.
+neovim-remote:
+neovim-remote:
+neovim-remote: Homepage: https://github.com/mhinz/neovim-remote
+neovim-remote:
+neovim-remote:
+neovim-remote:
+neovim-remote:
+neovim-remote:
diff --git a/development/neovim/neovim.SlackBuild b/development/neovim/neovim.SlackBuild
index df9d04ab82..56a824ddf4 100644
--- a/development/neovim/neovim.SlackBuild
+++ b/development/neovim/neovim.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for neovim
 
-# Copyright 2014-2019 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=neovim
-VERSION=${VERSION:-0.4.3}
+VERSION=${VERSION:-0.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/neovim/neovim.info b/development/neovim/neovim.info
index f69da2ae11..cea4790883 100644
--- a/development/neovim/neovim.info
+++ b/development/neovim/neovim.info
@@ -1,8 +1,8 @@
 PRGNAM="neovim"
-VERSION="0.4.3"
-HOMEPAGE="http://neovim.org/"
-DOWNLOAD="https://github.com/neovim/neovim/archive/v0.4.3/neovim-0.4.3.tar.gz"
-MD5SUM="f95f06420887748a0524c26d83039fc8"
+VERSION="0.4.4"
+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=""
 MD5SUM_x86_64=""
 REQUIRES="msgpack-c lua-mpack lua-lpeg lua-luv libtermkey libvterm"
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/newlisp/README b/development/newlisp/README
index b387d20798..47af4b1ab5 100644
--- a/development/newlisp/README
+++ b/development/newlisp/README
@@ -1,4 +1,4 @@
-newLISP is a Lisp-like, general-purpose scripting language. It has all the
-magic of traditional Lisp but is easier to learn and use.  newLISP is
-friendly, fast, and small. Most of the functions you will ever need are
-already built in. newLISP runs on most operating systems.
+newLISP is a Lisp-like, general-purpose scripting language. It has all
+the magic of traditional Lisp but is easier to learn and use.  newLISP
+is friendly, fast, and small. Most of the functions you will ever need
+are already built in. newLISP runs on most operating systems.
diff --git a/development/nim/README b/development/nim/README
new file mode 100644
index 0000000000..200ddf6389
--- /dev/null
+++ b/development/nim/README
@@ -0,0 +1,3 @@
+Nim is a statically typed compiled systems programming language. It
+combines successful concepts from mature languages like Python, Ada
+and Modula.
diff --git a/development/nim/doinst.sh b/development/nim/doinst.sh
new file mode 100644
index 0000000000..f10f578c2d
--- /dev/null
+++ b/development/nim/doinst.sh
@@ -0,0 +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
+}
+
+preserve_perms etc/nim/nim.cfg.new
+preserve_perms etc/nim/nimdoc.cfg.new
+preserve_perms etc/nim/nimdoc.tex.cfg.new
diff --git a/development/nim/nim.SlackBuild b/development/nim/nim.SlackBuild
new file mode 100644
index 0000000000..edaf238c7b
--- /dev/null
+++ b/development/nim/nim.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackware build script for nim
+
+# Maintained 2020-2021 by 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=nim
+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}
+GUI=${GUI:-yes}
+PGADMIN=${PGADMIN:-no}
+
+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 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 {} \;
+
+COMP_FLAGS="$SLKCFLAGS" \
+./build.sh
+
+bin/nim c -d:release koch
+./koch tools -d:release
+
+./install.sh pkg
+
+mkdir -p $PKG/usr
+mv pkg/nim/bin $PKG/usr/
+for fn in nimble nimsuggest nimgrep; do cp bin/$fn $PKG/usr/bin/; done
+
+mkdir -p $PKG/usr/lib
+mv pkg/nim/lib $PKG/usr/lib/nim
+mv pkg/nim/compiler $PKG/usr/lib/nim/
+mv pkg/nim/compiler.nimble $PKG/usr/lib/nim/compiler/
+
+mkdir -p $PKG/usr/include
+mv $PKG/usr/lib/nim/*.h $PKG/usr/include/
+
+mkdir -p $PKG/etc/nim
+mv pkg/nim/config/nim.cfg $PKG/etc/nim/nim.cfg.new
+mv pkg/nim/config/nimdoc.cfg $PKG/etc/nim/nimdoc.cfg.new
+mv pkg/nim/config/nimdoc.tex.cfg $PKG/etc/nim/nimdoc.tex.cfg.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 \
+  copying.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/development/nim/nim.info b/development/nim/nim.info
new file mode 100644
index 0000000000..1ef0efeef1
--- /dev/null
+++ b/development/nim/nim.info
@@ -0,0 +1,10 @@
+PRGNAM="nim"
+VERSION="1.4.6"
+HOMEPAGE="https://nim-lang.org"
+DOWNLOAD="https://nim-lang.org/download/nim-1.4.6.tar.xz"
+MD5SUM="5bbafd6a3ebd17497886add4e967b028"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/development/nim/slack-desc b/development/nim/slack-desc
new file mode 100644
index 0000000000..f86ae92ca0
--- /dev/null
+++ b/development/nim/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------------------------------------------------------|
+nim: nim (programming language)
+nim:
+nim: Nim is a statically typed compiled systems programming language. It
+nim: combines successful concepts from mature languages like Python, Ada
+nim: and Modula.
+nim:
+nim:
+nim:
+nim:
+nim:
+nim:
diff --git a/development/ninja/README b/development/ninja/README
index 4881393f6e..6f1c62d7da 100644
--- a/development/ninja/README
+++ b/development/ninja/README
@@ -1,4 +1,4 @@
-Ninja is a small build system with a focus on speed.  It differs from other
-build systems in two major respects: it is designed to have its input files
-generated by a higher-level build system, and it is designed to run builds as
-fast as possible.
+Ninja is a small build system with a focus on speed.  It differs from
+other build systems in two major respects: it is designed to have
+its input files generated by a higher-level build system, and it is
+designed to run builds as fast as possible.
diff --git a/development/ninja/ninja.SlackBuild b/development/ninja/ninja.SlackBuild
index 1dda766002..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.0}
+VERSION=${VERSION:-1.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/ninja/ninja.info b/development/ninja/ninja.info
index efd76d698f..dcc1d0d2aa 100644
--- a/development/ninja/ninja.info
+++ b/development/ninja/ninja.info
@@ -1,8 +1,8 @@
 PRGNAM="ninja"
-VERSION="1.10.0"
+VERSION="1.10.2"
 HOMEPAGE="https://ninja-build.org/"
-DOWNLOAD="https://github.com/ninja-build/ninja/archive/v1.10.0/ninja-1.10.0.tar.gz"
-MD5SUM="cf1d964113a171da42a8940e7607e71a"
+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/README b/development/nodejs/README
index f89ae30fcb..19aa105720 100644
--- a/development/nodejs/README
+++ b/development/nodejs/README
@@ -3,3 +3,6 @@ Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine.
 Node.js uses an event-driven, non-blocking I/O model that makes it
 lightweight and efficient. Node.js' package ecosystem, npm, is the
 largest ecosystem of open source libraries in the world.
+
+NOTE: This version uses an internal OpenSSL version instead of
+the one provided in Slackware package.
diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild
index 20e59bf7f6..25f6b8c67d 100644
--- a/development/nodejs/nodejs.SlackBuild
+++ b/development/nodejs/nodejs.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=nodejs
 SRCNAM=node
-VERSION=${VERSION:-8.16.0}
+VERSION=${VERSION:-12.22.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,8 +84,7 @@ sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" deps/npm/lib/npm.js
 sed -i "s|math.h|cmath|" src/node_crypto.cc
 ./configure \
   --prefix=/usr \
-  --shared-zlib \
-  --shared-openssl
+  --shared-zlib
 
 make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
 make install DESTDIR=$PKG
diff --git a/development/nodejs/nodejs.info b/development/nodejs/nodejs.info
index 4b7854e768..99a8d8f722 100644
--- a/development/nodejs/nodejs.info
+++ b/development/nodejs/nodejs.info
@@ -1,8 +1,8 @@
 PRGNAM="nodejs"
-VERSION="8.16.0"
+VERSION="12.22.1"
 HOMEPAGE="https://nodejs.org/"
-DOWNLOAD="https://nodejs.org/dist/v8.16.0/node-v8.16.0.tar.xz"
-MD5SUM="3c340a1599aa60bd920dc7e153bc1e4a"
+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/noweb/README b/development/noweb/README
index 7d65d5dbe8..6b0d117489 100644
--- a/development/noweb/README
+++ b/development/noweb/README
@@ -1,5 +1,5 @@
 noweb is a simple, extensible tool for literate programming.  It is
-designed to meet the needs of literate programmers while remaining as
-simple as possible.  Its primary advantages are simplicity, extensibility,
-and language-independence -- especially noticeable when compared with
-other literate-programming tools.
+designed to meet the needs of literate programmers while remaining
+as simple as possible.  Its primary advantages are simplicity,
+extensibility, and language-independence -- especially noticeable when
+compared with other literate-programming tools.
diff --git a/development/nsis/README b/development/nsis/README
index 7cc754ac5f..ffdbfd5de9 100644
--- a/development/nsis/README
+++ b/development/nsis/README
@@ -1,5 +1,6 @@
-NSIS (Nullsoft Scriptable Install System) is a professional open source system
-to create Windows installers.  It is designed to be as small and flexible as
-possible and is therefore very suitable for internet distribution. 
+NSIS (Nullsoft Scriptable Install System) is a professional open source
+system to create Windows installers.  It is designed to be as small
+and flexible as possible and is therefore very suitable for internet
+distribution.
 
 NOTE: This won't build on x86_64.
diff --git a/development/numpy-legacy/README b/development/numpy-legacy/README
index 0d3993e366..582c0ae544 100644
--- a/development/numpy-legacy/README
+++ b/development/numpy-legacy/README
@@ -2,34 +2,35 @@ NumPy is a general-purpose array-processing package designed to
 efficiently manipulate large multi-dimensional arrays of arbitrary
 records without sacrificing too much speed for small multi-dimensional
 arrays.  NumPy is built on the Numeric code base and adds features
-introduced by numarray as well as an extended C-API and the ability to
-create arrays of arbitrary type which also makes NumPy suitable for
+introduced by numarray as well as an extended C-API and the ability
+to create arrays of arbitrary type which also makes NumPy suitable for
 interfacing with general-purpose data-base applications.
 
 There are also basic facilities for discrete fourier transform, basic
 linear algebra and random number generation.
 
-If you need to build numpy for debugging, set DEBUG=y. If you use software
-which is having problems with numpy's new relaxed strides checking, set
-NPY_RSC=0.
+If you need to build numpy for debugging, set DEBUG=y. If you use
+software which is having problems with numpy's new relaxed strides
+checking, set NPY_RSC=0.
 
-It is highly recommended to install libraries implementing BLAS and LAPACK
-before installing numpy. You may choose between:
+It is highly recommended to install libraries implementing BLAS and
+LAPACK before installing numpy. You may choose between:
    a) BLAS and LAPACK (reference but unoptimized and thus slow)
    b) OpenBLAS (optimized, provides LAPACK too)
    c) ATLAS and LAPACK (optimized), good to read README.ATLAS
 All these are available on SlackBuilds.org.
 
-If you want to use the UMFPACK library instead of SuperLU to solve unsymmetric
-sparse linear systems, then run this Slackbuild with NO_UMFPACK set to "no"
-and then install scikit-umfpack on top of scipy. In this context, UMFPACK is an
-optional dependency for numpy. Nevertheless, note that presently scikit-umfpack
-is not available on SlackBuilds.org while its dependencies are.
+If you want to use the UMFPACK library instead of SuperLU to solve
+unsymmetric sparse linear systems, then run this Slackbuild with
+NO_UMFPACK set to "no" and then install scikit-umfpack on top of
+scipy. In this context, UMFPACK is an optional dependency for
+numpy. Nevertheless, note that presently scikit-umfpack is not
+available on SlackBuilds.org while its dependencies are.
 
 NOTE: If you use this SlackBuild, numpy will run with the python version
-      provided by Slackware Linux, which is presently 2.7.xx. If you'd like to
-      use python 3.x then you have to install numpy with the numpy-legacy3
-      SlackBuild.
+      provided by Slackware Linux, which is presently 2.7.xx. If you'd
+      like to use python 3.x then you have to install numpy with the
+      numpy-legacy3 SlackBuild.
 
 IMPORTANT: This version, 1.8.2, is the latest to include the oldnumeric
            and numarray compatibility modules. Starting with version
diff --git a/development/numpy-legacy3/README b/development/numpy-legacy3/README
index 345660ee8e..c13af7d039 100644
--- a/development/numpy-legacy3/README
+++ b/development/numpy-legacy3/README
@@ -9,27 +9,28 @@ interfacing with general-purpose data-base applications.
 There are also basic facilities for discrete fourier transform, basic
 linear algebra and random number generation.
 
-If you need to build numpy for debugging, set DEBUG=y. If you use software
-which is having problems with numpy's new relaxed strides checking, set
-NPY_RSC=0.
+If you need to build numpy for debugging, set DEBUG=y. If you use
+software which is having problems with numpy's new relaxed strides
+checking, set NPY_RSC=0.
 
-It is highly recommended to install libraries implementing BLAS and LAPACK
-before installing numpy. You may choose between:
+It is highly recommended to install libraries implementing BLAS and
+LAPACK before installing numpy. You may choose between:
    a) BLAS and LAPACK (reference but unoptimized and thus slow)
    b) OpenBLAS (optimized, provides LAPACK too)
    c) ATLAS and LAPACK (optimized), good to read README.ATLAS
 All these are available on SlackBuilds.org.
 
-If you want to use the UMFPACK library instead of SuperLU to solve unsymmetric
-sparse linear systems, then run this Slackbuild with NO_UMFPACK set to "no"
-and then install scikit-umfpack on top of scipy. In this context, UMFPACK is an
-optional dependency for numpy. Nevertheless, note that presently scikit-umfpack
-is not available on SlackBuilds.org while its dependencies are.
+If you want to use the UMFPACK library instead of SuperLU to solve
+unsymmetric sparse linear systems, then run this Slackbuild with
+NO_UMFPACK set to "no" and then install scikit-umfpack on top of
+scipy. In this context, UMFPACK is an optional dependency for
+numpy. Nevertheless, note that presently scikit-umfpack is not
+available on SlackBuilds.org while its dependencies are.
 
-NOTE: If you use this SlackBuild numpy will run with the python 3 version
-      installed on your system. If you'd like to use python 2.7.xx as
-      provided by Slackware Linux then you have to install it with the
-      numpy-legacy SlackBuild.
+NOTE: If you use this SlackBuild numpy will run with the python 3
+      version installed on your system. If you'd like to use python
+      2.7.xx as provided by Slackware Linux then you have to install
+      it with the numpy-legacy SlackBuild.
 
 IMPORTANT: This version, 1.8.2, is the latest to include the oldnumeric
            and numarray compatibility modules. Starting with version
diff --git a/development/numpy/README b/development/numpy/README
index 194190812c..4c367a1508 100644
--- a/development/numpy/README
+++ b/development/numpy/README
@@ -1,39 +1,41 @@
-NumPy is a general-purpose array-processing package designed to efficiently
-manipulate large multi-dimensional arrays of arbitrary records without
-sacrificing too much speed for small multi-dimensional arrays.  NumPy is built
-on the Numeric code base and adds features introduced by numarray as well as an
-extended C-API and the ability to create arrays of arbitrary type which also
-makes NumPy suitable for interfacing with general-purpose data-base
-applications.
+NumPy is a general-purpose array-processing package designed to
+efficiently manipulate large multi-dimensional arrays of arbitrary
+records without sacrificing too much speed for small multi-dimensional
+arrays.  NumPy is built on the Numeric code base and adds features
+introduced by numarray as well as an extended C-API and the ability
+to create arrays of arbitrary type which also makes NumPy suitable for
+interfacing with general-purpose data-base applications.
 
-There are also basic facilities for discrete fourier transform, basic linear
-algebra and random number generation.
+There are also basic facilities for discrete fourier transform, basic
+linear algebra and random number generation.
 
-If you need to build numpy for debugging, set DEBUG=y. If you use software
-which is having problems with numpy's new relaxed strides checking, set
-NPY_RSC=0.
+If you need to build numpy for debugging, set DEBUG=y. If you use
+software which is having problems with numpy's new relaxed strides
+checking, set NPY_RSC=0.
 
-It is highly recommended to install libraries implementing BLAS and LAPACK
-before installing numpy. You may choose between:
+It is highly recommended to install libraries implementing BLAS and
+LAPACK before installing numpy. You may choose between:
    a) blas and lapack (reference but unoptimized and thus slow)
    b) OpenBLAS (optimized, provides LAPACK too)
    c) atlas and lapack (optimized), good to read README.ATLAS
 All these are available on SlackBuilds.org.
 
-If you want to use the UMFPACK library instead of SuperLU to solve unsymmetric
-sparse linear systems, then run this Slackbuild with NO_UMFPACK set to "no"
-and then install scikit-umfpack on top of scipy. In this context, umfpack is an
-optional dependency for numpy. Nevertheless, note that presently scikit-umfpack
-is not available on SlackBuilds.org.
+If you want to use the UMFPACK library instead of SuperLU to solve
+unsymmetric sparse linear systems, then run this Slackbuild with
+NO_UMFPACK set to "no" and then install scikit-umfpack on top of
+scipy. In this context, umfpack is an optional dependency for
+numpy. Nevertheless, note that presently scikit-umfpack is not
+available on SlackBuilds.org.
 
 NOTE: If you use this SlackBuild, numpy will run with the python version
-      provided by Slackware Linux, which is presently 2.7.xx. If you'd like to
-      use python 3.x then you have to install the numpy3 SlackBuild.
+      provided by Slackware Linux, which is presently 2.7.xx. If
+      you'd like to use python 3.x then you have to install the numpy3
+      SlackBuild.
 
 IMPORTANT: The version installed by this SlackBuild does NOT include the
-           oldnumeric and numarray compatibility modules since starting with
-           version 1.9.0 these modules got removed by the numpy developers.
-           If you need these compatibility modules please consider the
-           numpy-legacy SlackBuild.
-           THUS: This SlackBuild conflicts with the numpy-legacy SlackBuild
-                 which installs versions < 1.9.0!
+           oldnumeric and numarray compatibility modules since
+           starting with version 1.9.0 these modules got removed by
+           the numpy developers.  If you need these compatibility
+           modules please consider the numpy-legacy SlackBuild.
+           THUS: This SlackBuild conflicts with the numpy-legacy
+                 SlackBuild which installs versions < 1.9.0!
diff --git a/development/numpy3/README b/development/numpy3/README
index 6e1aebbb83..539b941b3b 100644
--- a/development/numpy3/README
+++ b/development/numpy3/README
@@ -9,30 +9,31 @@ interfacing with general-purpose data-base applications.
 There are also basic facilities for discrete fourier transform, basic
 linear algebra and random number generation.
 
-If you need to build numpy for debugging, set DEBUG=y. If you use software
-which is having problems with numpy's new relaxed strides checking, set
-NPY_RSC=0.
+If you need to build numpy for debugging, set DEBUG=y. If you use
+software which is having problems with numpy's new relaxed strides
+checking, set NPY_RSC=0.
 
-It is highly recommended to install libraries implementing BLAS and LAPACK
-before installing numpy. You may choose between:
+It is highly recommended to install libraries implementing BLAS and
+LAPACK before installing numpy. You may choose between:
    a) BLAS and LAPACK (reference but unoptimized and thus slow)
    b) OpenBLAS (optimized, provides LAPACK too)
    c) ATLAS and LAPACK (optimized), good to read README.ATLAS
 All these are available on SlackBuilds.org.
 
-If you want to use the UMFPACK library instead of SuperLU to solve unsymmetric
-sparse linear systems, then run this Slackbuild with NO_UMFPACK set to "no"
-and then install scikit-umfpack on top of scipy. In this context, UMFPACK is an
-optional dependency for numpy. Nevertheless, note that presently scikit-umfpack
-is not available on SlackBuilds.org while its dependencies are.
+If you want to use the UMFPACK library instead of SuperLU to solve
+unsymmetric sparse linear systems, then run this Slackbuild with
+NO_UMFPACK set to "no" and then install scikit-umfpack on top of
+scipy. In this context, UMFPACK is an optional dependency for
+numpy. Nevertheless, note that presently scikit-umfpack is not
+available on SlackBuilds.org while its dependencies are.
 
 IMPORTANT: The version installed by this SlackBuild does NOT include the
-           oldnumeric and numarray compatibility modules since starting with
-           version 1.9.0 these modules got removed by the numpy developers.
-           If you need these compatibility modules please consider the
-           numpy-legacy SlackBuild.
-           THUS: This SlackBuild conflicts with the numpy-legacy SlackBuild
-                 which installs versions < 1.9.0!
+           oldnumeric and numarray compatibility modules since
+           starting with version 1.9.0 these modules got removed by
+           the numpy developers.  If you need these compatibility
+           modules please consider the numpy-legacy SlackBuild.
+           THUS: This SlackBuild conflicts with the numpy-legacy
+                 SlackBuild which installs versions < 1.9.0!
 
 This numpy3 SlackBuild creates bindings for python3 and can be installed
 without conflict alongside the standard numpy SlackBuild.
diff --git a/development/nvi/README b/development/nvi/README
index b44e27d365..899221cc55 100644
--- a/development/nvi/README
+++ b/development/nvi/README
@@ -1,5 +1,7 @@
 Nvi is an implementation of the ex/vi text editor.
-Nvi supports all the historic ex/vi features except for open mode and the 
-lisp edit option (it has a fully implemented underlying ex mode). Some 
-additional features are: extended regular expressions, infinite undo, and 
-multiple edit buffers.  Nvi has a very small memory footprint.
+
+Nvi supports all the historic ex/vi features except for open mode
+and the lisp edit option (it has a fully implemented underlying ex
+mode). Some additional features are: extended regular expressions,
+infinite undo, and multiple edit buffers.  Nvi has a very small memory
+footprint.
diff --git a/development/obcpl/README b/development/obcpl/README
index 0549dd6812..f3248d3c85 100644
--- a/development/obcpl/README
+++ b/development/obcpl/README
@@ -3,12 +3,12 @@ obcpl (BCPL compiler)
 This is an x86 (IA-32) port of the "classic" old BCPL compiler (around
 1980) from the Tripos Research Group at Cambridge University.
 
-As a real, working computer language implementation, that can be studied,
-modified, and played with, this old BCPL compiler has a good deal to
-recommend it. The compiler frontend consists of only about 2000 lines
-of BCPL code, and (as supplied here) compiles to a static (fully-linked)
-x86 binary that is less than 36000 bytes in size.
+As a real, working computer language implementation, that can be
+studied, modified, and played with, this old BCPL compiler has a good
+deal to recommend it. The compiler frontend consists of only about
+2000 lines of BCPL code, and (as supplied here) compiles to a static
+(fully-linked) x86 binary that is less than 36000 bytes in size.
 
 x86_64 note: obcpl doesn't require multilib on Slackware64. It only
-generates 32-bit x86 code, but the binaries it creates are 100% statically
-linked, and will run fine on Slackware64 without multlib.
+generates 32-bit x86 code, but the binaries it creates are 100%
+statically linked, and will run fine on Slackware64 without multlib.
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/obnc-libext/README b/development/obnc-libext/README
index d76b71bb75..95d6720c9a 100644
--- a/development/obnc-libext/README
+++ b/development/obnc-libext/README
@@ -1,10 +1,10 @@
 obnc-libext (Extended Library for OBNC)
 
-This package complements the basic libraries bundled with OBNC (the Oberon
-compiler obnc) with modules for accessing command line arguments and
-evironment variables, printing to the standard error stream and converting
-numbers to strings and viceversa.
+This package complements the basic libraries bundled with OBNC (the
+Oberon compiler obnc) with modules for accessing command line arguments
+and evironment variables, printing to the standard error stream and
+converting numbers to strings and viceversa.
 
-Be sure to update the compiler package (obnc) before updating this library
-package, as it usually needs the latest compiler features in order to
-compile.
+Be sure to update the compiler package (obnc) before updating this
+library package, as it usually needs the latest compiler features in
+order to compile.
diff --git a/development/ocaml/README b/development/ocaml/README
index bcdfc9020f..277b5ad939 100644
--- a/development/ocaml/README
+++ b/development/ocaml/README
@@ -1,9 +1,9 @@
-Caml is a general-purpose programming language, designed with program
-safety and reliability in mind. It is very expressive, yet easy to learn
-and use.  Caml supports functional, imperative, and object-oriented
-programming styles.  The Objective Caml system is the main implementation
-of the Caml language.  It features a powerful module system and a
-full-fledged object-oriented layer.  It comes with a native-code
-compiler that supports numerous architectures, for high performance;
-a bytecode compiler, for increased portability; and an interactive loop,
-for experimentation and rapid development.
+Caml is a general-purpose programming language, designed with
+program safety and reliability in mind. It is very expressive,
+yet easy to learn and use.  Caml supports functional, imperative,
+and object-oriented programming styles.  The Objective Caml system is
+the main implementation of the Caml language.  It features a powerful
+module system and a full-fledged object-oriented layer.  It comes with
+a native-code compiler that supports numerous architectures, for high
+performance; a bytecode compiler, for increased portability; and an
+interactive loop, for experimentation and rapid development.
diff --git a/development/octant/README b/development/octant/README
new file mode 100644
index 0000000000..4e502db653
--- /dev/null
+++ b/development/octant/README
@@ -0,0 +1,14 @@
+octant (a web interface for Kubernetes)
+
+A web-based, highly extensible platform for developers to better
+understand the complexity of Kubernetes clusters.
+
+Octant is a tool for developers to understand how applications run on
+a Kubernetes cluster.  It aims to be part of the developer's toolkit
+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
new file mode 100644
index 0000000000..ea576b1111
--- /dev/null
+++ b/development/octant/octant.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for octant
+
+# 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=octant
+VERSION=${VERSION:-0.17.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" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  echo "Not supported"
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $PKG/usr $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM\_$VERSION\_Linux-64bit.tar.gz
+mv $PRGNAM\_$VERSION\_Linux-64bit $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+mkdir -p bin
+mv $PRGNAM bin
+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 755 bin
+
+mv bin $PKG/usr/
+
+find -L $PKG -type d -exec chmod 755 {} \;
+chmod 755 $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/doc/$PRGNAM-$VERSION
+mv README.md $PKG/usr/doc/$PRGNAM-$VERSION/.
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.info > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.info
+
+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/octant/octant.info b/development/octant/octant.info
new file mode 100644
index 0000000000..1ef5586441
--- /dev/null
+++ b/development/octant/octant.info
@@ -0,0 +1,10 @@
+PRGNAM="octant"
+VERSION="0.17.0"
+HOMEPAGE="https://octant.dev"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM="UNSUPPORTED"
+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
new file mode 100644
index 0000000000..31e9bb74fe
--- /dev/null
+++ b/development/octant/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------------------------------------------------------|
+octant: octant (a web interface for Kubernetes)
+octant:
+octant: A web-based, highly extensible platform for developers to better 
+octant: understand the complexity of Kubernetes clusters.
+octant:
+octant:
+octant:
+octant:
+octant: Homepage: https://octant.dev
+octant: Release date: Feb 16, 2021
+octant:
diff --git a/development/ola/README b/development/ola/README
index 1bbb264a49..65b2bbb76e 100644
--- a/development/ola/README
+++ b/development/ola/README
@@ -1,10 +1,10 @@
-The Open Lighting Architecture (OLA) provides a plugin framework for 
-distributing DMX512 control signals on Mac and Linux. It provides C++ 
-and Python libraries which abstract away the underlying DMX over IP 
-protocol or DMX interface. See http://opendmx.net/index.php/OLA for 
-more information. 
+The Open Lighting Architecture (OLA) provides a plugin framework for
+distributing DMX512 control signals on Mac and Linux. It provides C++
+and Python libraries which abstract away the underlying DMX over IP
+protocol or DMX interface. See http://opendmx.net/index.php/OLA for
+more information.
 
-The build script can optionally disable python bindings and/or enable the 
-embedded http server.  WITH_PYTHON=no will disable the python bindings,
-and WITH_HTTP=yes will enable the embedded http server (in which case
-libmicrohttp also be required).
+The build script can optionally disable python bindings and/or enable
+the embedded http server.  WITH_PYTHON=no will disable the python
+bindings, and WITH_HTTP=yes will enable the embedded http server (in
+which case libmicrohttp also be required).
diff --git a/development/omake/README b/development/omake/README
index 227bd9bb1f..a5e5495154 100644
--- a/development/omake/README
+++ b/development/omake/README
@@ -1,5 +1,6 @@
-OMake is a build system designed for scalability and portability. It uses
-a syntax similar to make utilities you may have used, but it features many
-additional enhancements.
+OMake is a build system designed for scalability and portability. It
+uses a syntax similar to make utilities you may have used, but it
+features many additional enhancements.
 
-OMake requires ocaml and ocaml-findlib, also available from SlackBuilds.org
+OMake requires ocaml and ocaml-findlib, also available from
+SlackBuilds.org
diff --git a/development/omniORBpy/README b/development/omniORBpy/README
index 1e210703c5..358e920789 100644
--- a/development/omniORBpy/README
+++ b/development/omniORBpy/README
@@ -1,9 +1,9 @@
 omniORBpy is a robust high-performance CORBA ORB for Python.
 
-The bindings adhere to the standard IDL to Python mapping which you
-may find at
+The bindings adhere to the standard IDL to Python mapping which you may
+find at
 
 http://www.omg.org/technology/documents/formal/python_language_mapping.htm
 
-omniORBpy makes use of the C++ omniORB library. omniORBpy version
-4.2.x can only be used with omniORB 4.2.x.
+omniORBpy makes use of the C++ omniORB library. omniORBpy version 4.2.x
+can only be used with omniORB 4.2.x.
diff --git a/development/openjdk6/README b/development/openjdk6/README
index 482c5ce070..de460f15d0 100644
--- a/development/openjdk6/README
+++ b/development/openjdk6/README
@@ -1,17 +1,17 @@
-OpenJDK 6 is an open source implementation of version 6 of the
-Java Development Kit, Standard Edition. It includes tools for developing,
+OpenJDK 6 is an open source implementation of version 6 of the Java
+Development Kit, Standard Edition. It includes tools for developing,
 testing, and running programs written in Java.
 
 apache-ant is a required dependency and you have to install it before
 you build openjdk6. However, you do not need to install Oracle's jdk,
 since it's only a runtime dependency of apache-ant.
 
-Before installing this package please consider any other jdk's/jre's that you
-have already installed as they may cause conflicts with the PATH, JAVA_HOME
-and MANPATH variables.
+Before installing this package please consider any other jdk's/jre's
+that you have already installed as they may cause conflicts with the
+PATH, JAVA_HOME and MANPATH variables.
 
-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
@@ -28,5 +28,5 @@ If you get an error like
 Internal compiler error: java.lang.NullPointerException at
 org.eclipse.jdt.internal.compiler.ReadManager.run(ReadManager.java:166)
 
-simply run the build again. This happens early so it shouldn't be that of a
-problem. At least 1 out of 5 runs so far have always succeded.
+simply run the build again. This happens early so it shouldn't be that
+of a problem. At least 1 out of 5 runs so far have always succeded.
diff --git a/development/openjdk7/README b/development/openjdk7/README
index bbb3cb612b..c0a5183f10 100644
--- a/development/openjdk7/README
+++ b/development/openjdk7/README
@@ -1,5 +1,5 @@
-OpenJDK 7 is an open source implementation of version 7 of the
-Java Development Kit, Standard Edition. It includes tools for developing,
+OpenJDK 7 is an open source implementation of version 7 of the Java
+Development Kit, Standard Edition. It includes tools for developing,
 testing, and running programs written in Java.
 
 apache-ant is a required dependency and you have to install it before
@@ -10,8 +10,8 @@ Before installing this package please consider any other jdk's/jre's
 that you have already installed as they may cause conflicts with the
 PATH, JAVA_HOME and MANPATH variables.
 
-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
@@ -28,5 +28,5 @@ If you get an error like
 Internal compiler error: java.lang.NullPointerException at
 org.eclipse.jdt.internal.compiler.ReadManager.run(ReadManager.java:166)
 
-simply run the build again. This happens early so it shouldn't be that of a
-problem. At least 1 out of 5 runs so far have always succeded.
+simply run the build again. This happens early so it shouldn't be that
+of a problem. At least 1 out of 5 runs so far have always succeded.
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 fe655c3c77..8258e18166 100644
--- a/development/openjdk8/README
+++ b/development/openjdk8/README
@@ -1,11 +1,11 @@
-OpenJDK 8 is an open source implementation of version 8 of the
-Java Development Kit, Standard Edition. It includes tools for developing,
+OpenJDK 8 is an open source implementation of version 8 of the Java
+Development Kit, Standard Edition. It includes tools for developing,
 testing, and running programs written in Java.
 
-Before installing this package please consider any other jdk's/jre's 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.)
+Before installing this package please consider any other jdk's/jre's
+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.
@@ -28,5 +28,5 @@ If you get an error like
 Internal compiler error: java.lang.NullPointerException at
 org.eclipse.jdt.internal.compiler.ReadManager.run(ReadManager.java:166)
 
-simply run the build again. This happens early so it shouldn't be that of a
-problem. At least 1 out of 5 runs so far have always succeded.
+simply run the build again. This happens early so it shouldn't be that
+of a problem. At least 1 out of 5 runs so far have always succeded.
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/openocd/README b/development/openocd/README
index 376dd703ad..bcbd4bce8a 100644
--- a/development/openocd/README
+++ b/development/openocd/README
@@ -1,9 +1,10 @@
-OpenOCD is an on-chip debugging, in-system programming and boundary-scan
-testing tool for ARM systems. The debugger uses an IEEE 1149-1
-compliant JTAG TAP bus master to access on-chip debug functionality available
-on ARM based microcontrollers or system-on-chip solutions.
+OpenOCD is an on-chip debugging, in-system programming and
+boundary-scan testing tool for ARM systems. The debugger uses an
+IEEE 1149-1 compliant JTAG TAP bus master to access on-chip debug
+functionality available on ARM based microcontrollers or system-on-chip
+solutions.
 
-User interaction is realized through a telnet command line interface, a
-gdb (the GNU debugger) remote protocol server.
+User interaction is realized through a telnet command line interface,
+a gdb (the GNU debugger) remote protocol server.
 
 OpenOCD supports many different types of JTAG interfaces/programmers.
diff --git a/development/osc/README b/development/osc/README
index 8e8dbbf924..4a808fcf13 100644
--- a/development/osc/README
+++ b/development/osc/README
@@ -4,6 +4,6 @@ service, and it can be used to edit metadata, query about build
 results, and do virtually everything (and more) accessible from the web
 interface.
 
-On first run, osc will prompt you for your OpenSUSE Build Service credentials,
-and store them plaintext in ~/.oscrc.  Guard the file and filesystem
-appropriately.
+On first run, osc will prompt you for your OpenSUSE Build Service
+credentials, and store them plaintext in ~/.oscrc.  Guard the file and
+filesystem appropriately.
diff --git a/development/p4/README b/development/p4/README
index 91871734d4..38521a2133 100644
--- a/development/p4/README
+++ b/development/p4/README
@@ -1,7 +1,7 @@
 This is the command line client for the Perforce change control system.
 
-For a graphical Perforce client, see the "p4v" Slackbuild. For the Perforce
-server, see the "p4d" Slackbuild.
+For a graphical Perforce client, see the "p4v" Slackbuild. For the
+Perforce server, see the "p4d" Slackbuild.
 
 For an excellent introduction to Perforce, check out:
 https://www.perforce.com/perforce/doc.current/manuals/intro/index.html
diff --git a/development/p4d/README b/development/p4d/README
index 3177bbebac..0e51191a53 100644
--- a/development/p4d/README
+++ b/development/p4d/README
@@ -1,6 +1,6 @@
 This is the Perforce Helix server, a commercial version control system.
 
-You only need this p4d package to host your own server, or to use the DVCS
-features of Perforce. If you just need a Perforce client to connect to a
-server someone else hosts, use the "p4" (command line) or "p4v" (GUI)
-Slackbuild instead.
+You only need this p4d package to host your own server, or to use
+the DVCS features of Perforce. If you just need a Perforce client to
+connect to a server someone else hosts, use the "p4" (command line) or
+"p4v" (GUI) Slackbuild instead.
diff --git a/development/p4v/README b/development/p4v/README
index 15afcd1b29..60de5c4341 100644
--- a/development/p4v/README
+++ b/development/p4v/README
@@ -1,9 +1,9 @@
-P4V, the Perforce Visual Client, provides quick and easy access to versioned
-files through a graphical interface that is consistent across multiple
-operating systems. 
+P4V, the Perforce Visual Client, provides quick and easy access to
+versioned files through a graphical interface that is consistent across
+multiple operating systems.
 
-P4V represents the files in a project in the same 
-file/folder hierarchy employed by the native operating system. File state 
-information indicates which file versions are currently on the user's 
-workstation and on the Perforce Server. 
+P4V represents the files in a project in the same file/folder hierarchy
+employed by the native operating system. File state information
+indicates which file versions are currently on the user's workstation
+and on the Perforce Server.
 
diff --git a/development/pandas/README b/development/pandas/README
index 0d6bcfa32b..20171901fa 100644
--- a/development/pandas/README
+++ b/development/pandas/README
@@ -1,9 +1,11 @@
-Pandas is an open source, BSD-licensed library providing high-performance,
-easy-to-use data structures and data analysis tools for the Python programming
-language.
+Pandas is an open source, BSD-licensed library providing
+high-performance, easy-to-use data structures and data analysis tools
+for the Python programming language.
 
 Recommended Dependencies:
-numexpr: for accelerating certain numerical operations. numexpr uses multiple
-         cores as well as smart chunking and caching to achieve large speedups
-bottleneck: for accelerating certain types of nan evaluations. bottleneck uses
-            specialized cython routines to achieve large speedups.
+numexpr: for accelerating certain numerical operations. numexpr uses
+         multiple cores as well as smart chunking and caching to achieve
+         large speedups
+bottleneck: for accelerating certain types of NaN evaluations.
+            bottleneck uses specialized cython routines to achieve
+            large speedups.
diff --git a/development/pcc/README b/development/pcc/README
index 37a36505d5..121124f12c 100644
--- a/development/pcc/README
+++ b/development/pcc/README
@@ -4,7 +4,7 @@ code and 80% of the backend code has been rewritten.
 
 Build options (environment variables):
 TLS - Enable thread local storage? Default=no, export TLS=yes to enable.
-CC - Compiler to use. Default is to look for pcc, gcc, clang (in that order).
+CC - Compiler to use. Default: look for pcc, gcc, clang (in that order).
 
 This build is for the 1.1.0 release of pcc. The 1.0 release no longer
 works on modern Slackware versions (newer than 13.37). The old pcc
@@ -13,8 +13,9 @@ libraries so no separate pcc-libs is needed (or exists).
 
 Optional step: To bootstrap pcc, first remove any old versions of pcc
 (and pcc-libs, if present), then build and install pcc twice (without
-setting CC). The first time, pcc will be built with gcc. The second time,
-it will be built with itself.
+setting CC). The first time, pcc will be built with gcc. The second
+time, it will be built with itself.
 
-Note: pcc is a C compiler only. There is experimental, incomplete support
-for C++ and Fortran 77 in the pcc codebase, but neither is usable yet.
+Note: pcc is a C compiler only. There is experimental, incomplete
+support for C++ and Fortran 77 in the pcc codebase, but neither is
+usable yet.
diff --git a/development/pd-psql/README b/development/pd-psql/README
index 9cf60e6eb8..08136131a1 100644
--- a/development/pd-psql/README
+++ b/development/pd-psql/README
@@ -1,5 +1,5 @@
-psql allows you to send SQL messages to a PostgreSQL database from Pd and
-retrieve the results.
+psql allows you to send SQL messages to a PostgreSQL database from Pd
+and retrieve the results.
 
 Please check the README file after installation.
 
diff --git a/development/peg/README b/development/peg/README
index 2b7f65e353..699a3f0848 100644
--- a/development/peg/README
+++ b/development/peg/README
@@ -1,2 +1,2 @@
-peg and leg are utilities to generate recursive descent parsers from parsing
-expression grammars (PEGs).
+peg and leg are utilities to generate recursive descent parsers from
+parsing expression grammars (PEGs).
diff --git a/development/perf/README b/development/perf/README
index 28fa61b406..1ec21e6c9e 100644
--- a/development/perf/README
+++ b/development/perf/README
@@ -1,10 +1,25 @@
 perf is a userspace interface to the kernel's perf events. Performance
-counters are CPU hardware registers that count hardware events 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.
+counters are CPU hardware registers that count hardware events
+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.
 
 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 ea6dc3c3dc..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
-VERSION=${VERSION:-4.4.190}
+
+# 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 c5ce02f80d..014af45032 100644
--- a/development/perf/perf.info
+++ b/development/perf/perf.info
@@ -1,7 +1,7 @@
 PRGNAM="perf"
-VERSION="4.4.190"
+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/perl-shtags/README b/development/perl-shtags/README
index 03f2173d64..61c63f5a92 100644
--- a/development/perl-shtags/README
+++ b/development/perl-shtags/README
@@ -1,17 +1,17 @@
 shtags.pl is a script to generate tag files for shell and perl scripts.
 
 USAGE: shtags.pl [-kvwVx] [-t <file>] <files>
-    -t <file>   Name of tags file to create. (default is 'tags')
-    -s <shell>  Name of the shell language in the script
-    -v          Include variable definitions.
-                (variables mentioned at the start of a line)
-    -V          Print version information.
-    -w          Suppress "duplicate tag" warnings.
-    -x          Explicitly create a new tags file. Normally tags are merged.
-    <files>     List of files to scan for tags.
+ -t <file>  Name of tags file to create. (default is 'tags')
+ -s <shell> Name of the shell language in the script
+ -v         Include variable definitions.
+            (variables mentioned at the start of a line)
+ -V         Print version information.
+ -w         Suppress "duplicate tag" warnings.
+ -x         Explicitly create a new tags file. Normally tags are merged.
+ <files>    List of files to scan for tags.
 
-This is an update to the one that comes with vim, modified to use Getopt::Std
-rather than the older getopts.pl that came with perl4.
+This is an update to the one that comes with vim, modified to use
+Getopt::Std rather than the older getopts.pl that came with perl4.
 
 Supported script types:
 
diff --git a/development/pforth/README b/development/pforth/README
index 3ae8f5a119..b7ad5b0438 100644
--- a/development/pforth/README
+++ b/development/pforth/README
@@ -1,7 +1,7 @@
-PForth is a  public domain, portable ANS Forth based on a kernel written in
-in ANSI 'C'. This makes it easy to port pForth to multiple platforms. So
-far, pForth has run on Macs, PCs, SUNs, Amigas, Linux, BeOS, Nokia
-Communicator, SGI Indys, 3DO ARM systems, 3DO PowerPC systems, WebTV
-systems, Hitachi SH4, OpenTV prototypes, Compaq Ipaq 3970, Sharp LH79520
-ARM processor, Ciena Systems networking hardware, and some internal
-projects at Lucent.
+PForth is a  public domain, portable ANS Forth based on a kernel
+written in in ANSI 'C'. This makes it easy to port pForth to multiple
+platforms. So far, pForth has run on Macs, PCs, SUNs, Amigas, Linux,
+BeOS, Nokia Communicator, SGI Indys, 3DO ARM systems, 3DO PowerPC
+systems, WebTV systems, Hitachi SH4, OpenTV prototypes, Compaq Ipaq
+3970, Sharp LH79520 ARM processor, Ciena Systems networking hardware,
+and some internal projects at Lucent.
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 40f297c331..cbcd1c0e2d 100644
--- a/development/pkgconf/pkgconf.SlackBuild
+++ b/development/pkgconf/pkgconf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pkgconf
 
-# 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=pkgconf
-VERSION=${VERSION:-1.6.3}
+VERSION=${VERSION:-1.7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -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} \
@@ -89,6 +90,7 @@ make
 make install DESTDIR=$PKG
 
 ( cd $PKG/usr/bin; ln -sf $PRGNAM pkg-config )
+( cd $PKG/usr/man/man1; ln -s $PRGNAM.1 pkg-config.1 )
 
 if [ "$ARCH" = x86_64 ]; then
   if [ -f /usr/lib/libgcc_s.so ]; then
@@ -102,7 +104,9 @@ fi
 
 platform=slackware-linux-gnu
 
-# adapted from fedora
+mkdir -p $PKG/usr/share/pkgconfig/personality.d
+
+# adapted from fedora and arch
 eval "set -- $arch"
 for i do
   case "$i" in
@@ -115,8 +119,8 @@ for i do
       -e "s|@PKGCONF_SYSLIBDIR@|/usr/local/lib$libdir:/lib$libdir:/usr/lib$libdir|" \
       -e "s|@PKGCONF_SYSINCDIR@|/usr/local/include:/usr/include|" \
       < $CWD/platform-pkg-config.in \
-      > $PKG/usr/bin/$i-$platform-pkg-config
-  chmod 0755 $PKG/usr/bin/$i-$platform-pkg-config
+      > $PKG/usr/share/pkgconfig/personality.d/$i-$platform.personality
+  ( cd $PKG/usr/bin; ln -s $PRGNAM $i-$platform-pkg-config )
 done
 
 if [ "$DEBUG" = 0 ]; then
diff --git a/development/pkgconf/pkgconf.info b/development/pkgconf/pkgconf.info
index 8731cf19ea..7d3ac2aea2 100644
--- a/development/pkgconf/pkgconf.info
+++ b/development/pkgconf/pkgconf.info
@@ -1,8 +1,8 @@
 PRGNAM="pkgconf"
-VERSION="1.6.3"
+VERSION="1.7.4"
 HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
-DOWNLOAD="https://distfiles.dereferenced.org/pkgconf/pkgconf-1.6.3.tar.xz"
-MD5SUM="f93fb1be95a5cb62e43c219c82b5791a"
+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/pkgconf/platform-pkg-config.in b/development/pkgconf/platform-pkg-config.in
index 1cc5917d5e..ffb18eb38a 100644
--- a/development/pkgconf/platform-pkg-config.in
+++ b/development/pkgconf/platform-pkg-config.in
@@ -1,14 +1,8 @@
-#!/bin/sh
-
-# Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config
+# pkgconf personality to behave as a platform-specific version of pkg-config
 # Platform: @TARGET_PLATFORM@
 
-PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}"
-PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}"
-PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}"
-
-export PKG_CONFIG_LIBDIR
-export PKG_CONFIG_SYSTEM_LIBRARY_PATH
-export PKG_CONFIG_SYSTEM_INCLUDE_PATH
-
-exec pkgconf "$@"
+Triplet: @TARGET_PLATFORM@
+SysrootDir: /
+DefaultSearchPaths: @PKGCONF_LIBDIRS@
+SystemIncludePaths: @PKGCONF_SYSINCDIR@
+SystemLibraryPaths: @PKGCONF_SYSLIBDIR@
diff --git a/development/pkgdiff/README b/development/pkgdiff/README
index 5f8f4a9d67..9531324395 100644
--- a/development/pkgdiff/README
+++ b/development/pkgdiff/README
@@ -1,11 +1,13 @@
 pkgdiff (visualize changes in tgz/rpm/deb/etc archives)
 
 Package Changes Analyzer (pkgdiff) - a tool for visualizing changes in
-Linux software packages (RPM, DEB, TAR.GZ, etc). The tool is intended for
-Linux maintainers who are interested in ensuring compatibility of old and
-new versions of packages. It's useful for both source and binary packages.
+Linux software packages (RPM, DEB, TAR.GZ, etc). The tool is intended
+for Linux maintainers who are interested in ensuring compatibility
+of old and new versions of packages. It's useful for both source and
+binary packages.
 
-The tool can compare directories as well (with the help of the -d option).
+The tool can compare directories as well (with the help of the -d
+option).
 
 Sample report:
 https://abi-laboratory.pro/tracker/package_diff/libssh/0.6.5/0.7.0/report.html
diff --git a/development/poedit/README b/development/poedit/README
index 1bafe69c0e..490dd860d9 100644
--- a/development/poedit/README
+++ b/development/poedit/README
@@ -1,7 +1,7 @@
-Poedit is cross-platform gettext catalogs (.po files) editor. 
+Poedit is cross-platform gettext catalogs (.po files) editor.
 
-It aims to provide more convenient approach to editing catalogs than 
+It aims to provide more convenient approach to editing catalogs than
 launching vi and editing the file by hand.
 
-NOTE:
-poedit 2.0 will require newer boost (1.60+), so it works only in -current.
+NOTE: poedit 2.0 will require newer boost (1.60+), so it works only in
+-current.
diff --git a/development/postman/postman.SlackBuild b/development/postman/postman.SlackBuild
index 0401058164..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.14.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 587c22bf95..f2c339dac9 100644
--- a/development/postman/postman.info
+++ b/development/postman/postman.info
@@ -1,10 +1,10 @@
 PRGNAM="postman"
-VERSION="7.14.0"
+VERSION="8.2.1"
 HOMEPAGE="https://www.getpostman.com"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://dl.pstmn.io/download/version/7.14.0/linux64"
-MD5SUM_x86_64="dc00dbe1117ba65158eaf0ec3e80b776"
+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/postman/slack-desc b/development/postman/slack-desc
index a8ac3c36a0..7e9a4acf07 100644
--- a/development/postman/slack-desc
+++ b/development/postman/slack-desc
@@ -5,15 +5,15 @@
 # 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------------------------------------------------------|
+   |-----handy-ruler------------------------------------------------------|
 postman: postman (Build, test, and document your APIs faster)
-postman: Postman makes API development faster, easier, and better.
+postman:
 postman: Postman features include:
-postman: * Powerful, simple to use GUI
-postman: * Saved history of API requests
+postman: * Powerful, simple to use GUI with saved history of API requests
 postman: * Unlimited collections, environments, tests, and sharing
 postman: * Automated testing with collection runner
 postman: * Web-viewable, detailed API documentation
 postman: * Flexible API monitoring, for uptime, performance, and accuracy
-postman: * Mock servers, to support split-stack development
+postman:
 postman: Website: https://www.getpostman.com
+postman:
diff --git a/development/processing/README b/development/processing/README
index 007ed45d12..297a702d49 100644
--- a/development/processing/README
+++ b/development/processing/README
@@ -1,8 +1,8 @@
-Processing is a programming language, development environment, and online
-community that since 2001 has promoted software literacy within the visual
-arts. Initially created to serve as a software sketchbook and to teach
-fundamentals of computer programming within a visual context, Processing
-quickly developed into a tool for creating finished professional work as well.
+Processing is a programming language, development environment, and
+online community that since 2001 has promoted software literacy
+within the visual arts. Initially created to serve as a software
+sketchbook and to teach fundamentals of computer programming within a
+visual context, Processing quickly developed into a tool for creating
+finished professional work as well.
 
-
-as of 3.5.4 processing no longer supports 32 bit
+As of 3.5.4, processing no longer supports 32-bit.
diff --git a/development/psycopg2/psycopg2.SlackBuild b/development/psycopg2/psycopg2.SlackBuild
index bf54c96b27..7080044d70 100644
--- a/development/psycopg2/psycopg2.SlackBuild
+++ b/development/psycopg2/psycopg2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for psycopg2
 
-# Copyright (c) 2018-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright (c) 2018-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad>
 # Copyright (c) 2010-2011, 2013 Carlos Corbacho <carlos@strangeworlds.co.uk>
 # All rights reserved.
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=psycopg2
-VERSION=${VERSION:-2.8.4}
+VERSION=${VERSION:-2.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/psycopg2/psycopg2.info b/development/psycopg2/psycopg2.info
index d92e28bc8c..bc71a8673a 100644
--- a/development/psycopg2/psycopg2.info
+++ b/development/psycopg2/psycopg2.info
@@ -1,8 +1,8 @@
 PRGNAM="psycopg2"
-VERSION="2.8.4"
+VERSION="2.8.6"
 HOMEPAGE="http://initd.org/psycopg/"
-DOWNLOAD="http://initd.org/psycopg/tarballs/PSYCOPG-2-8/psycopg2-2.8.4.tar.gz"
-MD5SUM="dbb5a67dd57cfa905de37ab9678a92f6"
+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 7db47bcdf6..f0002fd902 100644
--- a/development/pycharm/pycharm.SlackBuild
+++ b/development/pycharm/pycharm.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=pycharm
 EDITION=community
-VERSION=${VERSION:-2019.3.3}
+VERSION=${VERSION:-2020.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/pycharm/pycharm.info b/development/pycharm/pycharm.info
index 7b16c84e26..b08a1d5088 100644
--- a/development/pycharm/pycharm.info
+++ b/development/pycharm/pycharm.info
@@ -1,8 +1,8 @@
 PRGNAM="pycharm"
-VERSION="2019.3.3"
+VERSION="2020.3.1"
 HOMEPAGE="https://www.jetbrains.com/pycharm/"
-DOWNLOAD="https://download.jetbrains.com/python/pycharm-community-2019.3.3.tar.gz"
-MD5SUM="c146b22111320c5b09915ba712abb813"
+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/pylint/README b/development/pylint/README
index 5938089428..4605ed6cfe 100644
--- a/development/pylint/README
+++ b/development/pylint/README
@@ -1,9 +1,11 @@
-Pylint is a python tool that checks if a module satisfies a coding standard.
-Pylint can be seen as another PyChecker since nearly all tests you can do with
-PyChecker can also be done with Pylint. But Pylint offers some more features,
-like checking line-code's length, checking if variable names are well-formed
-according to your coding standard, or checking if declared interfaces are truly
-implemented, and much more (see the complete check list).
+Pylint is a python tool that checks if a module satisfies a coding
+standard.  Pylint can be seen as another PyChecker since nearly all
+tests you can do with PyChecker can also be done with Pylint. But
+Pylint offers some more features, like checking line-code's length,
+checking if variable names are well-formed according to your coding
+standard, or checking if declared interfaces are truly implemented, and
+much more (see the complete check list).
 
-The big advantage with Pylint is that it is highly configurable, customizable,
-and you can easily write a small plugin to add a personal feature.
+The big advantage with Pylint is that it is highly configurable,
+customizable, and you can easily write a small plugin to add a personal
+feature.
diff --git a/development/qbs/qbs.SlackBuild b/development/qbs/qbs.SlackBuild
index 727b5d2a42..4ee06c4422 100644
--- a/development/qbs/qbs.SlackBuild
+++ b/development/qbs/qbs.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Qbs
 
 # Copyright 2014-2017 Nikos Giotis <nikos.giotis@mail.com>
-# Copyright 2019 Andrzej Telszewski, Szczecin
+# Copyright 2020 Andrzej Telszewski, Szczecin
 # 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=qbs
-VERSION=${VERSION:-1.13.1}
+VERSION=${VERSION:-1.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,42 +55,50 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ -x /usr/bin/qbs ]; then
+set -e
+
+if which qbs &>/dev/null; then
+  echo "Found \"qbs\" in PATH."
   echo "Please remove any previous Qbs installations before continuing."
+
   exit 1
 fi
 
-set -e
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-src-$VERSION.tar.gz
 mv $PRGNAM-src-$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 \
-  -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 -R a-st,u+rwX,go-w+rX .
+
+# Fix for missing *projectgeneratormanager.h*.
 
 patch -p0 < $CWD/corelib-tools.pri.patch
 
 # Adjust docs location.
+
 sed -i "s|share/doc/qbs|doc/qbs-$VERSION|g" doc/doc.pri
 
-qmake-qt5 qbs.pro \
-  QMAKE_CXXFLAGS="$SLKCFLAGS" \
-  QBS_INSTALL_PREFIX=/usr \
-  QBS_LIBRARY_DIRNAME=lib$LIBDIRSUFFIX \
+qmake-qt5 qbs.pro                         \
+  QMAKE_CXXFLAGS="$SLKCFLAGS"             \
+  QBS_INSTALL_PREFIX=/usr                 \
+  QBS_LIBRARY_DIRNAME=lib$LIBDIRSUFFIX    \
   CONFIG+=qbs_enable_project_file_updates
 
 make
 make install INSTALL_ROOT=$PKG
-make docs
-make install_docs INSTALL_ROOT=$PKG
+
+if which qdoc-qt5 &>/dev/null; then
+  make docs
+  make install_docs INSTALL_ROOT=$PKG
+else
+  echo "qdoc-qt5 not found in PATH.  Docs won't be built nor installed."
+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
@@ -101,8 +109,8 @@ gzip -9 $PKG/usr/man/man1/qbs.1
 rm -r $PKG/usr/share/man
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LGPL_EXCEPTION.txt LICENSE.GPL3-EXCEPT LICENSE.{LGPLv21,LGPLv3} README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md LGPL_EXCEPTION.txt LICENSE.GPL3-EXCEPT \
+  LICENSE.{LGPLv21,LGPLv3} README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/share/applications
diff --git a/development/qbs/qbs.info b/development/qbs/qbs.info
index 24646c531c..e11e59a55e 100644
--- a/development/qbs/qbs.info
+++ b/development/qbs/qbs.info
@@ -1,8 +1,8 @@
 PRGNAM="qbs"
-VERSION="1.13.1"
+VERSION="1.16.0"
 HOMEPAGE="https://wiki.qt.io/Qbs"
-DOWNLOAD="https://download.qt.io/official_releases/qbs/1.13.1/qbs-src-1.13.1.tar.gz"
-MD5SUM="979d41ad62fa769d4d3081c6778521b8"
+DOWNLOAD="https://download.qt.io/official_releases/qbs/1.16.0/qbs-src-1.16.0.tar.gz"
+MD5SUM="1981b1625328d8bf16a5552213d6912a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/development/qconf/README b/development/qconf/README
index c15f0019c9..1d414b6de8 100644
--- a/development/qconf/README
+++ b/development/qconf/README
@@ -2,9 +2,9 @@ QConf allows you to have a nice configure script for your qmake-based
 project.  It is intended for developers who don't need (or want) to use
 the more complex GNU autotools.
 
-Scripts generated by QConf are meant for unix.  This means it should only
-be used with projects based on Qt/X11, Qt/Mac, or Qt/Embedded.  No effort
-has been made in supporting Qt/Windows based projects (yet).
+Scripts generated by QConf are meant for unix.  This means it should
+only be used with projects based on Qt/X11, Qt/Mac, or Qt/Embedded.
+No effort has been made in supporting Qt/Windows based projects (yet).
 
 NOTE: QConf is a Qt 4 program as of version 1.2.  However, it can still
   generate configure scripts for Qt 3 apps.  See below for information.
diff --git a/development/qt-creator-llvm/qt-creator-llvm.SlackBuild b/development/qt-creator-llvm/qt-creator-llvm.SlackBuild
index c51fe65ec6..1228b7ceab 100644
--- a/development/qt-creator-llvm/qt-creator-llvm.SlackBuild
+++ b/development/qt-creator-llvm/qt-creator-llvm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for LLVM/Clang tools for Qt Creator
 
-# Copyright 2019 Andrzej Telszewski, Szczecin
+# Copyright 2020 Andrzej Telszewski, Szczecin
 # 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=qt-creator-llvm
-VERSION=${VERSION:-7.0_4a75f114}
+VERSION=${VERSION:-8.0_c47ba33}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,90 +56,135 @@ fi
 
 set -e
 
+build_install_cmake_tmp()
+{
+  CMAKE_VERSION=3.17.1
+
+  mkdir cmake-tmp
+  pushd cmake-tmp
+
+  tar xvf $CWD/cmake-${CMAKE_VERSION}.tar.gz
+  cd cmake-${CMAKE_VERSION}
+
+  mkdir build
+  cd build
+
+  CMAKE_INSTALL_ROOT=$(pwd)
+
+  CFLAGS="${SLKCFLAGS}"   \
+  CXXFLAGS="${SLKCFLAGS}" \
+  ../configure            \
+    --prefix=/usr         \
+    --system-curl         \
+    --system-expat        \
+    --no-system-jsoncpp   \
+    --system-zlib         \
+    --system-bzip2        \
+    --system-libarchive
+
+  make || make -j1
+  make install DESTDIR=${CMAKE_INSTALL_ROOT}
+
+  # Favour the CMake version we just built.
+
+  export PATH=${CMAKE_INSTALL_ROOT}/usr/bin:${PATH}
+
+  # Return to caller's working dir.
+
+  popd
+
+  # Clean up the environment.
+
+  unset CMAKE_INSTALL_ROOT
+  unset CMAKE_VERSION
+
+  # Debug info.
+
+  printf "\nPATH: %s\nwhich cmake: %s\n%s\n\n"    \
+         "${PATH}" "$(which cmake)"               \
+         "$($(which cmake) --version | head -n1)"
+}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
+mv clang-tools-extra clang/tools/extra
+mv clang llvm/tools/clang
+
+cd llvm
+
 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 {} \;
-
-# Exceptionally, copy the docs before the build starts.
-# This can save you quite some time in a case of a missing doc file.
+chmod -R a-st,u+rwX,go-w+rX .
+
+# Exceptionally, copy docs before the build starts.  This can save quite
+# some script development time should one of the files be missing.
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{clang,clang-tools-extra,clazy}
+mkdir -p $PKG/install
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
 cp -a CODE_OWNERS.TXT CREDITS.TXT LICENSE.TXT README.txt RELEASE_TESTERS.TXT \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a tools/clang/{CODE_OWNERS.TXT,LICENSE.TXT,README.txt} \
-  $PKG/usr/doc/$PRGNAM-$VERSION/clang
-cp -a tools/clang/tools/extra/{CODE_OWNERS.TXT,LICENSE.TXT,README.txt} \
-  $PKG/usr/doc/$PRGNAM-$VERSION/clang-tools-extra
-cp -a tools/clang/tools/extra/clazy/{COPYING-LGPL2.txt,Changelog,HOWTO,README.md} \
-  $PKG/usr/doc/$PRGNAM-$VERSION/clazy
+
+( cd tools/clang
+  cp -a CODE_OWNERS.TXT LICENSE.TXT NOTES.txt README.txt                \
+    $PKG/usr/doc/$PRGNAM-$VERSION/clang
+  cp -a tools/extra/{CODE_OWNERS.TXT,LICENSE.TXT,README.txt}            \
+    $PKG/usr/doc/$PRGNAM-$VERSION/clang-tools-extra
+  cp -a tools/extra/clazy/{COPYING-LGPL2.txt,Changelog,HOWTO,README.md} \
+    $PKG/usr/doc/$PRGNAM-$VERSION/clazy
+)
+
+# Newer version of CMake than in Slackware 14.2 is needed to build LLVM/Clang.
+# Build and install that newer version in temp path.
+
+build_install_cmake_tmp
+
+# Build LLVM/Clang proper.
 
 mkdir -p build
 cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  cmake                                                 \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS"                 \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS"               \
     -DCMAKE_INSTALL_PREFIX=/usr/libexec/qtcreator/clang \
-    -DLLVM_LIBDIR_SUFFIX= \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLLVM_BUILD_LLVM_DYLIB=ON \
-    -DLLVM_LINK_LLVM_DYLIB=ON \
-    -DLLVM_ENABLE_RTTI=ON \
-    -DLLVM_ENABLE_ASSERTIONS=OFF \
+    -DLLVM_LIBDIR_SUFFIX=                               \
+    -DCMAKE_BUILD_TYPE=Release                          \
+    -DLLVM_BUILD_LLVM_DYLIB=ON                          \
+    -DLLVM_LINK_LLVM_DYLIB=ON                           \
+    -DLLVM_ENABLE_RTTI=ON                               \
+    -DLLVM_ENABLE_ASSERTIONS=OFF                        \
     ..
   make
   make install DESTDIR=$PKG
 cd ..
 
-# Determine "clang" binary version.
-VERSION_CLANG=$( echo $VERSION | cut -f1 -d_ )
+# Remove uneeded components (reduce package size).
 
-if ! [ -x $PKG/usr/libexec/qtcreator/clang/bin/clang-$VERSION_CLANG ]; then
-  VERSION_CLANG=$( echo $VERSION_CLANG | cut -f1 -d. )
-fi
-
-if ! [ -x $PKG/usr/libexec/qtcreator/clang/bin/clang-$VERSION_CLANG ]; then
-  VERSION_CLANG=
-
-  echo "error: Unable to determine \"clang\" binary version."
-  exit 1
-fi
-
-# Remove unnecessary components (reduce package size).
-
-find $PKG/usr/libexec/qtcreator/clang/bin -mindepth 1 -not \( \
-  -name clang -o -name clang-$VERSION_CLANG -o -name llvm-config \) \
+find $PKG/usr/libexec/qtcreator/clang/bin -mindepth 1 -not          \
+  \( -name clang  -o -name clang-[0-9]\*    -o -name clang-tidy -o  \
+     -name clangd -o -name clazy-standalone -o -name llvm-config \) \
   -exec rm {} \;
 
-# FIXME: Find patience to find out which libs are required by Qt Creator
-#        and then remove the unnecessary ones.
-#find $PKG/usr/libexec/qtcreator/clang/lib -name \*.a -not \( \
-#  -name libclangTooling.a -o -name libclangIndex.a -o -name libclangFrontend.a -o \
-#  -name libclangParse.a -o -name libclangSerialization.a -o -name libclangSema.a -o \
-#  -name libclangEdit.a -o -name libclangAnalysis.a -o -name libclangDriver.a -o \
-#  -name libclangDynamicASTMatchers.a -o -name libclangASTMatchers.a -o \
-#  -name libclangToolingCore.a -o -name libclangAST.a -o -name libclangLex.a -o \
-#  -name libclangBasic.a \) \
-#  -exec rm {} \;
-
 rm -rf $PKG/usr/libexec/qtcreator/clang/libexec
 rm -rf $PKG/usr/libexec/qtcreator/clang/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
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# _clazy_ has troubles finding _libLLVM-8.so_. Help it.
+# NOTE: Run _patchelf_ only after running _strip_, otherwise stripping breaks
+# the binary. See https://github.com/probonopd/linuxdeployqt/issues/29
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+patchelf --set-rpath /usr/libexec/qtcreator/clang/lib   \
+  $PKG/usr/libexec/qtcreator/clang/bin/clazy-standalone
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/qt-creator-llvm/qt-creator-llvm.info b/development/qt-creator-llvm/qt-creator-llvm.info
index 5639ba6785..407280cca0 100644
--- a/development/qt-creator-llvm/qt-creator-llvm.info
+++ b/development/qt-creator-llvm/qt-creator-llvm.info
@@ -1,10 +1,12 @@
 PRGNAM="qt-creator-llvm"
-VERSION="7.0_4a75f114"
-HOMEPAGE="https://code.qt.io/cgit/clang/llvm.git/"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/qt-creator-llvm/qt-creator-llvm-7.0_4a75f114.tar.gz"
-MD5SUM="5ad42628b0219433010ac2f1fbb5791d"
+VERSION="8.0_c47ba33"
+HOMEPAGE="https://code.qt.io/cgit/clang/llvm-project.git/"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/qt-creator-llvm/qt-creator-llvm-8.0_c47ba33.tar.gz \
+          https://github.com/Kitware/CMake/releases/download/v3.17.1/cmake-3.17.1.tar.gz"
+MD5SUM="36f76ea4a550cdd48884841861b1812c \
+        958959aa5e0338144eed7320e9b48561"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="patchelf"
 MAINTAINER="Andrzej Telszewski"
 EMAIL="atelszewski@gmail.com"
diff --git a/development/qt-creator-llvm/slack-desc b/development/qt-creator-llvm/slack-desc
index 10201134d4..87de86c9c1 100644
--- a/development/qt-creator-llvm/slack-desc
+++ b/development/qt-creator-llvm/slack-desc
@@ -13,7 +13,7 @@ qt-creator-llvm: in order to extend Qt Creator's functionality.
 qt-creator-llvm: Some of the Qt Creator's tools enabled by this package are:
 qt-creator-llvm: Clang Code Model, Clang-Tidy, Clazy and Clang Static Analyzer.
 qt-creator-llvm:
-qt-creator-llvm: Homepage: https://code.qt.io/cgit/clang/llvm.git/
+qt-creator-llvm: Homepage: https://code.qt.io/cgit/clang/llvm-project.git/
 qt-creator-llvm:
 qt-creator-llvm:
 qt-creator-llvm:
diff --git a/development/qt-creator/add-mime-types.patch b/development/qt-creator/add-mime-types.patch
new file mode 100644
index 0000000000..77229b48c3
--- /dev/null
+++ b/development/qt-creator/add-mime-types.patch
@@ -0,0 +1,16 @@
+--- share/applications/org.qt-project.qtcreator.desktop	2020-03-27 04:34:53.000000000 +0100
++++ share/applications/org.qt-project.qtcreator.desktop	2020-04-10 18:27:44.756614495 +0200
+@@ -2,11 +2,10 @@
+ Type=Application
+ Exec=qtcreator %F
+ Name=Qt Creator
+-GenericName=C++ IDE for developing Qt applications
++GenericName=C/C++ and Qt IDE
+ X-KDE-StartupNotify=true
+ Icon=QtProject-qtcreator
+ StartupWMClass=qtcreator
+ Terminal=false
+ Categories=Development;IDE;Qt;
+-MimeType= text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;
+-
++MimeType=text/x-csrc;text/x-c++src;text/x-c++hdr;text/x-xsrc;text/x-python;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;
diff --git a/development/qt-creator/qt-creator.SlackBuild b/development/qt-creator/qt-creator.SlackBuild
index e088f2281f..32a65255dc 100644
--- a/development/qt-creator/qt-creator.SlackBuild
+++ b/development/qt-creator/qt-creator.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Qt Creator
 
 # Copyright 2016 Andre Barboza, Belo Horizonte - Brazil
-# Copyright 2019 Andrzej Telszewski, Szczecin
+# Copyright 2020 Andrzej Telszewski, Szczecin
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 # VERSION=4.2.0_rc1 or VERSION=4.2.0_beta1 (note the underscore).
 
 PRGNAM=qt-creator
-VERSION=${VERSION:-4.9.2}
+VERSION=${VERSION:-4.12.3}
 SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -64,52 +64,66 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+
 rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-opensource-src-$SRCVER.tar.gz
 mv $PRGNAM-opensource-src-$SRCVER $PRGNAM-$SRCVER
 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 {} \;
+chmod -R a-st,u+rwX,go-w+rX .
 
 # Adjust docs location.
-sed -i "s|share/doc/qtcreator|doc/$PRGNAM-$VERSION|g" qtcreator.pri
-sed -i "s|share/doc/qtcreator|doc/$PRGNAM-$VERSION|g" doc/api/qtcreator-documentation.qdoc
-sed -i "s|share/doc/qtcreator|doc/$PRGNAM-$VERSION|g" src/plugins/coreplugin/icore.cpp
+
+sed -i "s|share/doc/qtcreator|doc/$PRGNAM-$VERSION|g"  qtcreator.pri
+sed -i "s|share/doc/qtcreator|doc/$PRGNAM-$VERSION|g"  doc/qtcreatordev/src/qtcreator-documentation.qdoc
+sed -i "s|share/doc/\${IDE_ID}|doc/$PRGNAM-$VERSION|g" cmake/QtCreatorAPI.cmake
 
 # LLVM/Clang can be used to extend Qt Creator functionality.
-if [ "${USE_LLVM:-no}" = yes -o "${CODE_MODEL:-no}" = "yes" ]; then
+
+if [ "${USE_LLVM:-no}" = yes ] || [ "${CODE_MODEL:-no}" = "yes" ]; then
   LLVM_INSTALL_ROOT=/usr/libexec/qtcreator/clang
   QMAKE_LFLAGS=-L${LLVM_INSTALL_ROOT}/lib
+  export QTC_ENABLE_CLANG_LIBTOOLING=1
 
-  if [ ! -x $LLVM_INSTALL_ROOT/bin/clang ]; then
+  if [ ! -x ${LLVM_INSTALL_ROOT}/bin/clang ]; then
     echo "error: You must install \"qt-creator-llvm\" package in order to"
     echo "error: use LLVM/Clang tools integration."
+
     exit 1
   fi
 fi
 
+# -Wunguarded-availability-new is not supported.
+
 patch -p0 < $CWD/remove-w-error-unguarded-availability-new.patch
 
+# Tell DEs that Qt Creator supports some more MIME types.
+
+patch -p0 < $CWD/add-mime-types.patch
+
 # Fix for https://lists.qt-project.org/pipermail/qt-creator/2019-May/008050.html
+
 QMAKE_LFLAGS="$QMAKE_LFLAGS -L/usr/lib$LIBDIRSUFFIX"
 
-qmake-qt5 -r qtcreator.pro \
-  QMAKE_CXXFLAGS="$SLKCFLAGS" \
-  QMAKE_LFLAGS="$QMAKE_LFLAGS" \
-  QTC_PREFIX=/usr \
-  IDE_LIBRARY_BASENAME=lib$LIBDIRSUFFIX \
-  LLVM_INSTALL_DIR=$LLVM_INSTALL_ROOT \
-  QBS_INSTALL_DIR=/usr \
+qmake-qt5 -r qtcreator.pro                 \
+  QMAKE_CXXFLAGS="$SLKCFLAGS"              \
+  QMAKE_LFLAGS="$QMAKE_LFLAGS"             \
+  QTC_PREFIX=/usr                          \
+  IDE_LIBRARY_BASENAME=lib$LIBDIRSUFFIX    \
+  LLVM_INSTALL_DIR=$LLVM_INSTALL_ROOT      \
+  QBS_INSTALL_DIR=/usr                     \
   DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES
 
 make
 make install INSTALL_ROOT=$PKG
-make docs
-make install_docs INSTALL_ROOT=$PKG
+
+if which qdoc-qt5 &>/dev/null; then
+  make docs
+  make install_docs INSTALL_ROOT=$PKG
+else
+  echo "qdoc-qt5 not found.  Docs won't be built nor installed."
+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/development/qt-creator/qt-creator.info b/development/qt-creator/qt-creator.info
index 34613ce23d..f0d73d1dae 100644
--- a/development/qt-creator/qt-creator.info
+++ b/development/qt-creator/qt-creator.info
@@ -1,8 +1,8 @@
 PRGNAM="qt-creator"
-VERSION="4.9.2"
+VERSION="4.12.3"
 HOMEPAGE="https://wiki.qt.io/Qt_Creator"
-DOWNLOAD="https://download.qt.io/official_releases/qtcreator/4.9/4.9.2/qt-creator-opensource-src-4.9.2.tar.gz"
-MD5SUM="c226740c66cb7cb231180d4cbe572cbd"
+DOWNLOAD="https://download.qt.io/official_releases/qtcreator/4.12/4.12.3/qt-creator-opensource-src-4.12.3.tar.gz"
+MD5SUM="7ee294ef4316875a355c43f62918e13f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qbs"
diff --git a/development/qt-creator/qt-creator.xml b/development/qt-creator/qt-creator.xml
index 4ab39909e0..37b0695fe6 100644
--- a/development/qt-creator/qt-creator.xml
+++ b/development/qt-creator/qt-creator.xml
@@ -3,7 +3,10 @@
     <mime-type type="application/x-qt-creator">
         <sub-class-of type="text/plain"/>
         <comment>Qt Creator Project</comment>
+        <glob pattern="*.creator"/>
         <glob pattern="*.pro"/>
+        <glob pattern="*.pyproject"/>
+        <glob pattern="*.pyqtc"/>
         <glob pattern="*.qbs"/>
     </mime-type>
 </mime-info>
diff --git a/development/qt-creator2/README b/development/qt-creator2/README
index 4ba206ee88..8c18f1ba1c 100644
--- a/development/qt-creator2/README
+++ b/development/qt-creator2/README
@@ -1,15 +1,16 @@
 Qt Creator 2 is a Cross-Platform Qt IDE.
 
-The goal of Qt Creator is to provide a cross-platform, complete Integrated
-Development Environment (IDE) to develop Qt projects.
+The goal of Qt Creator is to provide a cross-platform, complete
+Integrated Development Environment (IDE) to develop Qt projects.
 
-NOTE1: This package conflicts with qt-creator: install only one of the two.
+NOTE1: This package conflicts with qt-creator: install only one of
+       the two.
 
-NOTE2: QmlDesigner needs Qt Private Headers. If you have intent to build the
-QmlDesigner you need to specify the Qt source location. Besides, it is
-required to apply all patches from Slackware tree and run configure.
-Note that configure process takes some time to finish due qmake compile
-process.
+NOTE2: QmlDesigner needs Qt Private Headers. If you intend to build the
+       QmlDesigner you need to specify the Qt source location. Besides,
+       it is required to apply all patches from Slackware tree and run
+       configure. Note that the configure process takes some time to
+       finish due to the qmake compile process.
 
 Follow these steps to prepare source tree:
 1 - Copy Qt SlackBuild directory from Slackware source tree to /tmp;
diff --git a/development/quilt/README b/development/quilt/README
index 6e2ed8bc23..e993fcb5e6 100644
--- a/development/quilt/README
+++ b/development/quilt/README
@@ -1,8 +1,11 @@
-These scripts allow to manage a series of patches by keeping track of the
-changes each patch makes.  Patches can be applied, un-applied, refreshed, etc.
+These scripts allow to manage a series of patches by keeping track
+of the changes each patch makes.  Patches can be applied, un-applied,
+refreshed, etc.
 
-The key philosophical concept is that your primary output is patches - not ".c"
-files, not ".h" files, but patches, so patches are the first-class object here.
+The key philosophical concept is that your primary output is patches
+- not ".c" files, not ".h" files, but patches, so patches are the
+first-class object here.
 
-Quilt was originally based on Andrew Morton's patch scripts published on the
-linux kernel mailing list a while ago, but were heavily modified since then.
+Quilt was originally based on Andrew Morton's patch scripts published
+on the linux kernel mailing list a while ago, but were heavily modified
+since then.
diff --git a/development/racer/README b/development/racer/README
index 8614f48dfe..1fdcc6b0e4 100644
--- a/development/racer/README
+++ b/development/racer/README
@@ -1 +1,6 @@
 racer - Rust Code Completion utility
+
+This requires rust nightly installed through rustup. Before running this
+slackbuild, you should install the nightly from 2021-03-26 by running:
+
+  rustup toolchain install --profile minimal nightly-2021-03-26
diff --git a/development/racer/racer.SlackBuild b/development/racer/racer.SlackBuild
index ff8b181330..2509869dcc 100644
--- a/development/racer/racer.SlackBuild
+++ b/development/racer/racer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for racer
 
-# Copyright 2017-2018 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.0.14}
+VERSION=${VERSION:-2.1.45}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -91,65 +91,13 @@ mkdir vendor
 (
   cd vendor
 
-  for dependency in aho-corasick=0.6.4 \
-                    ansi_term=0.11.0 \
-                    atty=0.2.8 \
-                    bitflags=0.7.0 \
-                    bitflags=1.0.1 \
-                    cfg-if=0.1.2 \
-                    clap=2.31.1 \
-                    clippy=0.0.103 \
-                    clippy_lints=0.0.103 \
-                    env_logger=0.5.5 \
-                    fuchsia-zircon-sys=0.3.3 \
-                    fuchsia-zircon=0.3.3 \
-                    humantime=1.1.1 \
-                    kernel32-sys=0.2.2 \
-                    lazy_static=1.0.0 \
-                    libc=0.2.39 \
-                    log=0.3.9 \
-                    log=0.4.1 \
-                    matches=0.1.6 \
-                    memchr=2.0.1 \
-                    nom=1.2.4 \
-                    quick-error=1.2.1 \
-                    quine-mc_cluskey=0.2.4 \
-                    rand=0.4.2 \
-                    redox_syscall=0.1.37 \
-                    redox_termios=0.1.1 \
-                    regex-syntax=0.3.9 \
-                    regex-syntax=0.5.3 \
-                    regex=0.2.10 \
-                    rustc-serialize=0.3.24 \
-                    semver=0.2.3 \
-                    serde=1.0.36 \
-                    strsim=0.7.0 \
-                    syntex_errors=0.52.0 \
-                    syntex_pos=0.52.0 \
-                    syntex_syntax=0.52.0 \
-                    term=0.4.6 \
-                    termcolor=0.3.5 \
-                    termion=1.5.1 \
-                    textwrap=0.9.0 \
-                    thread_local=0.3.5 \
-                    toml=0.1.30 \
-                    toml=0.4.5 \
-                    ucd-util=0.1.1 \
-                    unicode-normalization=0.1.5 \
-                    unicode-width=0.1.4 \
-                    unicode-xid=0.0.3 \
-                    unreachable=1.0.0 \
-                    utf8-ranges=1.0.0 \
-                    vec_map=0.8.0 \
-                    void=1.0.2 \
-                    winapi-build=0.1.1 \
-                    winapi-i686-pc-windows-gnu=0.4.0 \
-                    winapi-x86_64-pc-windows-gnu=0.4.0 \
-                    winapi=0.2.8 \
-                    winapi=0.3.4 \
-                    wincolor=0.1.6; do
-    dep="$(echo "$dependency" | cut -d= -f1)"
-    ver="$(echo "$dependency" | cut -d= -f2)"
+  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
 
     tar xvf $CWD/$dep-$ver.crate
 
@@ -171,7 +119,7 @@ mkdir vendor
       sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -182,11 +130,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 {} \;
 
+(
+  mkdir rustup-bin
+  cd rustup-bin
+  ln -s /usr/bin/rustup rustc
+)
+
+PATH="$(pwd)/rustup-bin:$PATH" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-cargo build --release $CARGOTARGET
+rustup run nightly-2021-03-26 cargo build --release $CARGOTARGET
+
+mkdir -p $PKG/usr/bin/
 
-mkdir -p $PKG/usr/bin
 find target -name racer -exec install -m 755 {} $PKG/usr/bin/racer \;
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/racer/racer.info b/development/racer/racer.info
index f6b4a4f372..7ad975f0c4 100644
--- a/development/racer/racer.info
+++ b/development/racer/racer.info
@@ -1,124 +1,244 @@
 PRGNAM="racer"
-VERSION="2.0.14"
+VERSION="2.1.45"
 HOMEPAGE="https://github.com/racer-rust/racer"
-DOWNLOAD="https://github.com/racer-rust/racer/archive/2.0.14/racer-2.0.14.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.6.4.crate \
+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 \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.31.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clippy/clippy-0.0.103.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clippy_lints/clippy_lints-0.0.103.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.5.5.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/humantime/humantime-1.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.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.39.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.0.1.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/quick-error/quick-error-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quine-mc_cluskey/quine-mc_cluskey-0.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.37.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.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-0.2.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-serialize/rustc-serialize-0.3.24.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.36.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/syntex_errors/syntex_errors-0.52.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syntex_pos/syntex_pos-0.52.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syntex_syntax/syntex_syntax-0.52.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/term/term-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-0.3.5.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.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/toml/toml-0.1.30.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/toml/toml-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-util/ucd-util-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unreachable/unreachable-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8-ranges/utf8-ranges-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.0.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/winapi-build/winapi-build-0.1.1.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.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.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.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.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.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/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 \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.10.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/humantime/humantime-2.0.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/indexmap/indexmap-1.5.2.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/instant/instant-0.1.7.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/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/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.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.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.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_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 \
+          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.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_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.17.crate \
+          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-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.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/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.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.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 \
+          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.1.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/termize/termize-0.1.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/thread_local/thread_local-1.0.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tracing-attributes/tracing-attributes-0.1.11.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tracing-core/tracing-core-0.1.15.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/tracing/tracing-0.1.19.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/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.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.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wincolor/wincolor-0.1.6.crate"
-MD5SUM="3bca609e168a2e880a45d2ad330eef01 \
-        dc002296e6ad12db95323d1701577750 \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate"
+MD5SUM="7201bddba167326a18f329796d070ee8 \
+        abc51f82118d86e83165ba87e2521e96 \
+        f26a43d3bcc31a6e0a6fa649e32b04c3 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
-        cede4f38b0902d2603b633a1010e7744 \
-        1dd9b755c91f0f7bb401e393a9ed69f2 \
-        d0d74804bb99fb6eaa3fad914784a8e0 \
-        a71478e7dbff428e4fa0a328dc4a2712 \
-        03bb386901b255c98eb0b6c540eb05fa \
-        3a62ae7bd9253e3429971305ed30bd0c \
-        24e5845ca69d4e0b9c6d5cc9429e25a9 \
-        17f4f38c21b1173446ef9b38ae2f96bf \
-        54cfab480b7a5f7302eadf44129d3f4b \
-        dd7c80c2d04d2e9ceba82826cf69764d \
-        0bb37c61bb7fffabbd71cd7b71c3100a \
-        9d033cc2daa6924420a4a89e6705773f \
-        542ea120138168270e3d4ea0a818e776 \
-        12870c13599691d84101af047ec8a9bd \
-        33f0dff2bb670d9307fea18d579b5494 \
-        750b637fe2d66d7bb013070508b769b2 \
-        91f355db69eb1b80980ef8a7436fbc2b \
-        5acbda15de2f57f6a3e78381277c9cdd \
-        3796b5abe0f8c5f3a9e9441c5757a52c \
-        d36ee15aaf2387da23574e6c5e38cbbe \
-        f95d3d91c4918126f2b48437d727e34d \
-        ab9ef75ff3abb4f6ff815bcd3818c20a \
-        93135fb41acfd8936bbf7247747d290a \
-        01cb5402c0fd99cebac702b76f2f2669 \
-        797f26b635bbc56fdf5ef1cc3883f259 \
-        689411a0165fe2a410e2ce33e1372f69 \
-        af93faaf829cc2cc5e5485b360664339 \
-        5e4ad69737043efed21e99c959727ef5 \
-        037152747ebc4f7551849e3c42bb0d05 \
-        7e8bdbef4fab6e6c289cf2397c271c47 \
-        fbb6473579065c9fe4dc3d48c5d5d8a5 \
-        b47486154910884415a0283747d56034 \
-        949b92ea5f77eb28197011ae46350e7c \
-        3bfc5ab53922960dd26ca985201d5de0 \
-        7d90c0c571f120a84cd64ab606bb375c \
-        00190eb853935c70bce8e5e619d1caf6 \
-        de04800c89d374b8a843f91d26fa05ad \
-        a0835ac79b982eba961bf48aa332e8e5 \
-        0aa5698256ca166727e6fd4bea38a6a4 \
-        40f1e861fef39de7ee5c66057eabdbb4 \
-        1cdd77072a038841e8f2b44e1e2766de \
-        5a31b770d7063a98028d2b3de67e7a7a \
-        c658f9f53055b9326b7fb214acc9858a \
-        4576769468adf019f6500d3a84b7f68c \
-        8250ed5fcea1d6415fc1fe7088bffd8f \
-        b390278bbea483da591b1bc026be5fa2 \
-        7293a4349a42c9b7ef8866cca981ed83 \
-        8b65613d99e7251fb8ff5ccafdf70cc3 \
-        689203efc084fc0f1d1f74f5d354ae75 \
-        c900e7dbce808ff8ced375077b17a163 \
+        38a5278571eefda86428a8ebfc1cedc2 \
+        142cb4b9a653e56e56311f0c883b8582 \
+        7c6515c4b7f4c7723a3c6d1f07acc261 \
+        6799c26a7eacaf8e58d3e45c6c5add89 \
+        c7fbaf61245dc847237ab7c72b3ee9ea \
+        547dbf225c61b70c81f74f79a83affc9 \
+        882dbbc613a93f64c3709b0a2bd0d6dc \
+        74634128440dbc3766bda76fdf0aaa05 \
+        135f6d6306e50606f0475ada50c33ce2 \
+        f48ac29c2c56d6476450dab08af8eb4f \
+        e0a69519ad697a923799407d8b01f7e5 \
+        897911f15f349a357899045e6b0c04e0 \
+        49b4b022e9fa4cc60376a79ecb39d04f \
+        836bbd6315ea443caf33fe3394ea4991 \
+        ff67cf2eb9668167782b8012d3b48e7b \
+        6f6a2da3625c871ad764dad18af0b97b \
+        493a2f042d86baa5c6bac75202c64554 \
+        82241b59d4b793d862900b62220cf05a \
+        25e033b68503b1eb640318d93b08ccc2 \
+        081ed755ceb8e0b7c78cffde40fd084d \
+        65cd30f86e785b77fd82e0693d126e26 \
+        c3ec5977ecc0f6244ef3be87f5325e72 \
+        de1228e571c94ef53ec4c21db57279ab \
+        9927498754f34d2c215da2319a5ad7e8 \
+        334b652e896801bf9fe7ef698b92bf32 \
+        bb2582cae7b3d837f5da1df153001db5 \
+        361bd9fd6988aa4ac291c63336fb29c3 \
+        109549b7b02ac35510fc7eba0cd0cccd \
+        8a4c1319b7ee6d5b4b13faa2dcff0f3e \
+        493f4bd45cf2a6c3963f66f58884f622 \
+        04a84513cdad48c92d8363d627904227 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        09c2a456bd4064675a0c53ca70f5eea1 \
+        ed2d6dbb4c04586444e1aef9d4b27d90 \
+        f4fb30c478bff7ea5e52563db8608abc \
+        61e508ca2eee543023c5e1ba777e5ede \
+        b5cf10e268e8a3bee2de8a734104245e \
+        fbc0f8f5473906bf26a1931703490034 \
+        f7c887063254436e24f201308ee5324d \
+        124ec4f35274a0e9c1a4ef3dc0958643 \
+        bdb38691302aeb63500e053919f5f0f7 \
+        cad5d756bde12e98d82fc950fc9a0dc9 \
+        09931e9b99240bb850c9e9c9ccb22668 \
+        653e04baa68a4484b3b839c19221e474 \
+        e8a7d203e73b7ab9cd3f6769fe4a1479 \
+        158c5ffb9d075be2a8fa088ae3e0915c \
+        378a6671eaefcc86d472ed11b01a756c \
+        7c4bfd315ee9de1c1b2f2d56163567cf \
+        cd6039ff311cf275ebc82ee4dea96ad1 \
+        f6cebca4a4b7dbc6be9e00472b398549 \
+        3181dca31efe33cbed29a45d0ec67848 \
+        2d2578337a3ff53dce9b46fb5bf7102c \
+        66d1cb32dce999907409f636f004b884 \
+        0a80ed36a125ac3cdfa09f8707055873 \
+        a0f55fda89c0f97784edb18f4c253a49 \
+        b269356e8646f3184a0e8d52a58cee69 \
+        8dc2aa474c2cba342120ade9e98de066 \
+        04031b2ff0f95e8fb3c09d2d1d3b3b77 \
+        d970b77df4375ae08279d6ce61600ad7 \
+        526f5ebac8d794185afbc71959c5c968 \
+        7344a18f4a154b52182a0bdedcbae55d \
+        a4e900032fe89e98b454f016fb2268a2 \
+        ff94c9dbeef610b214ac6c67371a8d95 \
+        ef6fa83414ee321e1058a3620c03c36b \
+        844404fdd038353b75b5d46434286caa \
+        3e259fbf017176701c03e6f8e8bbb2d4 \
+        29cc4bd77ef7ffcecb03640a656b52a0 \
+        0fdf2c5d5eeaadd312b1194734f05bf8 \
+        61abfe25e14d5ed5d74412785930ae0c \
+        2581075a2cf7cbedc22db0b6083342d2 \
+        ac7161e0a3f224841b316abb654f0386 \
+        0a9890eb881047ad52b88a3baa74fd51 \
+        201cfcd9690cc8f015c33ac961b6f884 \
+        5fd8f94c1ddd7589af335bc0176d397d \
+        fe62029e251f255d3a874c50d3608154 \
+        16a98d2d4805043be084c8273e237fae \
+        86e158a128526d235a5664970567fd3f \
+        9d62f77c4ea52aca7b8b82dd5dac3a1e \
+        7b1261ea730a9314bc9bcdf4a379bf98 \
+        8ed219c6cc2c684abc2197c32ce40e01 \
+        dbf4b8881aa463eff6fb5aec5f1abb46 \
+        9436ca5c7881b6e8f3caae39515498df \
+        fc60e4ecd18db5e582b9e7dd19dd62e4 \
+        b4a0a98a54439a5a37952c8879187ee3 \
+        9f340031dada0fc1168826e25c283e56 \
+        5134162b34de0aa912c0d64754ca8370 \
+        b05bc089853d7c61da615700fe443778 \
+        e7a85771ce04ac56299f6a16d85e5f73 \
+        1169ca455e0ed1ad583914fde79b9bce \
+        e1b37f2526a1f0eed9c0bda62b8095ba \
+        a986c51d8a91f91704da0c440295640d \
+        f7eea874be0ac423bd5d97e2ba9228a5 \
+        781d4ccf5d04c98fa02af207a9639249 \
+        8a227260b1b37a3672254267d22cb1e6 \
+        bd5f9d9900731be1a4e4df05db231991 \
+        bb3ae104a9fa1b31568cc98c920a4653 \
+        62e883807a65ebe1ba9d0e555d703339 \
+        43b5447f0726665d42ed52a6ce73ef49 \
+        a8de006fe0c7e373c560dd51599287a8 \
+        a5dd75e77c7324f5c1d2d372c990d0a7 \
+        04343a1a4c847486609808bd3f34d640 \
+        fce66eec81098f8c8b4842c027593e12 \
+        1b356956a58e63469c2b64724760f8be \
+        55927226b06f62ccbd2890269d68c2fd \
+        3d394ff298f20e04de3ce053ab63ccc7 \
+        0f65fd26370e1fd67c8e8812cabea574 \
+        e628ca8adb2b572bffb210f014656b6f \
+        0eedbc32447f40b3045d6de3910b5415 \
+        8b01b016a9b6deebc1b43f296057efb5 \
+        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
         db96b50050277bf05a3c68534bbb9586 \
+        f1d4ff6943e35dc03ead31cca71edb30 \
         09de9d01e7331ff3da11f58be8bef0df \
-        b44489eb4799c4fabac3fceb48de54f7 \
-        670bacc92edb4f63537d2fcce4368948 \
-        fdce33cdeb332d676dd87383c502da19"
+        ce68e06a2cd4f180747cf169fc388a95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="rustup"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/development/racket/README b/development/racket/README
index fe94786696..7bcfe02e1c 100644
--- a/development/racket/README
+++ b/development/racket/README
@@ -1,7 +1,14 @@
-Racket (formerly named PLT Scheme) is a general purpose, multi-paradigm 
-programming language in the Lisp/Scheme family. One of its design goals is to 
-serve as a platform for language creation, design, and implementation. The 
-language is used in a variety of contexts such as scripting, general-purpose 
-programming, computer science education, and research. (source: Wikipedia)
+Racket (formerly named PLT Scheme) is a general purpose, multi-paradigm
+programming language in the Lisp/Scheme family. One of its design
+goals is to serve as a platform for language creation, design, and
+implementation. The language is used in a variety of contexts such as
+scripting, general-purpose programming, computer science education, and
+research. (source: Wikipedia)
 
 racket is the command line version, drracket is the GUI-version
+
+This SlackBuild uses the src + built packages distribution. It builds
+faster as it contains platform-independent bytecode. If you wish to
+build from pure source code can be downloaded from the racket site:
+
+https://download.racket-lang.org/
diff --git a/development/racket/racket.SlackBuild b/development/racket/racket.SlackBuild
index e9bb528a37..a424d46f76 100644
--- a/development/racket/racket.SlackBuild
+++ b/development/racket/racket.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for racket
 
 # Copyright 2013-2014 Markus Hutmacher, Germany <mailing@markhu.de>
+# Copyright 2020 Jeff Parent, US <jeff+SBo@sh0.xyz>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=racket
-VERSION=${VERSION:-6.4}
-SUFFIX=src    # suffix of the UNIX sourcepackage
+VERSION=${VERSION:-7.9}
+SUFFIX=src-builtpkgs    # suffix of the UNIX sourcepackage
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,10 +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 {} \;
 
-# https://github.com/racket/racket/issues/1222
-# http://copr-dist-git.fedorainfracloud.org/cgit/bthomas/racket/racket.git/plain/xform-errors-converting-fix.patch
-patch -p1 < $CWD/xform-errors-converting-fix.patch
-
 mkdir src/build
 cd src/build
 
diff --git a/development/racket/racket.info b/development/racket/racket.info
index 58d3934c70..0b7cfc47e5 100644
--- a/development/racket/racket.info
+++ b/development/racket/racket.info
@@ -1,10 +1,10 @@
 PRGNAM="racket"
-VERSION="6.4"
+VERSION="7.9"
 HOMEPAGE="http://racket-lang.org/"
-DOWNLOAD="http://mirror.informatik.uni-tuebingen.de/mirror/racket/6.4/racket-6.4-src.tgz"
-MD5SUM="9938340227b3f31843dc87cb17ec21c5"
+DOWNLOAD="https://mirror.racket-lang.org/installers/7.9/racket-7.9-src-builtpkgs.tgz"
+MD5SUM="be3b9ba2b5b5fb04b48cc6d2942f26a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Markus Hutmacher"
-EMAIL="mailing@markhu.de"
+MAINTAINER="Jeff Parent"
+EMAIL="jeff+SBo@sh0.xyz"
diff --git a/development/racket/xform-errors-converting-fix.patch b/development/racket/xform-errors-converting-fix.patch
deleted file mode 100644
index 687d653f4e..0000000000
--- a/development/racket/xform-errors-converting-fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur racket-6.3/src/racket/src/bool.c my-racket-6.3/src/racket/src/bool.c
---- racket-6.3/src/racket/src/bool.c	2015-10-16 17:00:55.000000000 -0400
-+++ my-racket-6.3/src/racket/src/bool.c	2016-01-23 12:04:20.710628127 -0500
-@@ -202,6 +202,9 @@
-   return SAME_OBJ(obj1, obj2);
- }
- 
-+#ifdef MZ_XFORM
-+START_XFORM_SKIP;
-+#endif
- #ifdef MZ_LONG_DOUBLE
- XFORM_NONGCING static MZ_INLINE int mz_long_double_eqv(long_double a, long_double b)
- {
-@@ -239,6 +242,10 @@
- # endif
- }
- #endif
-+
-+#ifdef MZ_XFORM
-+START_XFORM_SKIP;
-+#endif
- XFORM_NONGCING static MZ_INLINE int double_eqv(double a, double b)
- {
- # ifndef NAN_EQUALS_ANYTHING
-@@ -419,6 +426,9 @@
- 
-  return -1;
- }
-+#ifdef MZ_XFORM
-+END_XFORM_SKIP;
-+#endif
- 
- int is_slow_equal (Scheme_Object *obj1, Scheme_Object *obj2)
- {
-diff -Naur racket-6.3/src/racket/src/number.c my-racket-6.3/src/racket/src/number.c
---- racket-6.3/src/racket/src/number.c	2015-10-16 17:00:55.000000000 -0400
-+++ my-racket-6.3/src/racket/src/number.c	2016-01-23 12:05:08.076767488 -0500
-@@ -1917,6 +1917,9 @@
-   return (is_rational(argv[0]) ? scheme_true : scheme_false);
- }
- 
-+#ifdef MZ_XFORM
-+START_XFORM_SKIP;
-+#endif
- XFORM_NONGCING static int double_is_integer(double d)
- {
- # ifdef NAN_EQUALS_ANYTHING
-@@ -1943,6 +1946,9 @@
- 
-   return 0;
- }
-+#ifdef MZ_XFORM
-+END_XFORM_SKIP;
-+#endif
- 
- 
- static Scheme_Object *
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/re2c/re2c.SlackBuild b/development/re2c/re2c.SlackBuild
index 62ed7ff0ae..dd71e03f81 100644
--- a/development/re2c/re2c.SlackBuild
+++ b/development/re2c/re2c.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=re2c
-VERSION=${VERSION:-1.3}
+VERSION=${VERSION:-2.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,12 +80,10 @@ CXXFLAGS="$SLKCFLAGS" \
  --prefix=/usr \
  --mandir=/usr/man \
  --libdir=/usr/lib${LIBDIRSUFFIX} \
- --docdir=/usr/doc/$PRGNAM-$VERSION
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --enable-golang
 
 make
-# in order to regenerate scanner.cc file
-rm -f scanner.cc
-
 make install-strip DESTDIR=$PKG
 
 # compress man pages
diff --git a/development/re2c/re2c.info b/development/re2c/re2c.info
index e539cb6a48..848f86a773 100644
--- a/development/re2c/re2c.info
+++ b/development/re2c/re2c.info
@@ -1,8 +1,8 @@
 PRGNAM="re2c"
-VERSION="1.3"
+VERSION="2.0.3"
 HOMEPAGE="http://re2c.org/"
-DOWNLOAD="https://github.com/skvadrik/re2c/releases/download/1.3/re2c-1.3.tar.xz"
-MD5SUM="03a0579eb69ee949889a63cad91223b9"
+DOWNLOAD="https://github.com/skvadrik/re2c/releases/download/2.0.3/re2c-2.0.3.tar.xz"
+MD5SUM="2e0bd0ecbd20bf15a4648111f14a4f0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/redo/README b/development/redo/README
new file mode 100644
index 0000000000..2c84e9d306
--- /dev/null
+++ b/development/redo/README
@@ -0,0 +1,8 @@
+redo - a recursive, general-purpose build system
+
+redo is a competitor to the long-lived, but sadly imperfect make
+program.  Unlike other such competitors, redo captures the essential
+simplicity and flexibility of make, while avoiding its flaws. It manages
+to do this while being simultaneously simpler than make, more flexible
+than make, and more powerful than make, without sacrificing performance
+- a rare combination of features.
diff --git a/development/redo/redo.SlackBuild b/development/redo/redo.SlackBuild
new file mode 100644
index 0000000000..8dbc926e1e
--- /dev/null
+++ b/development/redo/redo.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Slackware build script for redo
+
+# Copyright 2019 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=redo
+VERSION=${VERSION:-0.42c}
+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-$PRGNAM-$VERSION
+
+DESTDIR=$PKG \
+PREFIX=/usr \
+MANDIR=$PKG/usr/man \
+DOCDIR=$PKG/usr/doc \
+  ./do 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
+
+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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/redo/redo.info b/development/redo/redo.info
new file mode 100644
index 0000000000..548e345cef
--- /dev/null
+++ b/development/redo/redo.info
@@ -0,0 +1,10 @@
+PRGNAM="redo"
+VERSION="0.42c"
+HOMEPAGE="https://redo.readthedocs.io"
+DOWNLOAD="https://github.com/apenwarr/redo/archive/redo-0.42c.tar.gz"
+MD5SUM="8f46244d6e2760c089c8efac521f639a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="Markdown BeautifulSoup"
+MAINTAINER="Jeff Parent"
+EMAIL="jeff+SBo@sh0.xyz"
diff --git a/development/redo/slack-desc b/development/redo/slack-desc
new file mode 100644
index 0000000000..2c0f39c0ca
--- /dev/null
+++ b/development/redo/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------------------------------------------------------|
+redo: redo (a recursive build system)
+redo:
+redo: redo is a competitor to the long-lived, but sadly imperfect make
+redo: program. Unlike other such competitors, redo captures the essential
+redo: simplicity and flexibility of make, while avoiding its flaws. It
+redo: manages to do this while being simultaneously simpler than make, more
+redo: flexible  than make, and more powerful than make, without sacrificing
+redo: performance, a rare combination of features.
+redo:
+redo: https://redo.readthedocs.io
+redo:
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/regexxer/README b/development/regexxer/README
index 7b684b67f2..6d9b9cf333 100644
--- a/development/regexxer/README
+++ b/development/regexxer/README
@@ -1,7 +1,9 @@
-Regexxer is a nifty search/replace tool for the desktop user.  It features
-recursive search through directory trees and Perl-style regular expressions
-(using libpcre).
+Regexxer is a nifty search/replace tool for the desktop user.
+It features recursive search through directory trees and Perl-style
+regular expressions (using libpcre).
+
 The primary audience of this tool are Linux/Unix users who are tired of
 typing find/grep/sed/awk/perl command lines.
+
 The user interface is similar to the project-wide search/replace
 dialog in the Sniff+ IDE, but regexxer aims to surpass it.
diff --git a/development/regina-rexx/README b/development/regina-rexx/README
index 5fbfb1271e..0f6f8c3f7f 100644
--- a/development/regina-rexx/README
+++ b/development/regina-rexx/README
@@ -13,16 +13,16 @@ To create the normal dynamic version just do this:
 
 Or to create a static version of the rexx binary executable do this:
 
-  1) The Slackware 14.2 ncurses package is built without static libraries.
-     This prevents the static build of regina-rexx from loading properly.
-     In this case:
-    a) Modify the ncurses.SlackBuild and change the "--without-normal"
-                                          option to "--with-normal"
-    b) Rebuild and reinstall the ncurses package.
-
+ 1) The Slackware 14.2 ncurses package is built without static libs.
+    This prevents the static build of regina-rexx from loading properly.
+    In this case:
+   a) Modify the ncurses.SlackBuild and change the "--without-normal"
+                                         option to "--with-normal"
+   b) Rebuild and reinstall the ncurses package.
    2) FLAVOR=static sh regina-rexx.SlackBuild
 
-After installation of the package, a startup script for the rxstack is created:
-  /etc/rc.d/rc.rxstack
+After installation of the package, a startup script for the rxstack is
+created: /etc/rc.d/rc.rxstack
 
-If this needs to run, then it could be started from the /etc/rc.d/rc.local file.
+If this needs to run, then it could be started from the
+/etc/rc.d/rc.local file.
diff --git a/development/regina-rexx/regina-rexx.SlackBuild b/development/regina-rexx/regina-rexx.SlackBuild
index 03e294d8f8..eff7d560d7 100644
--- a/development/regina-rexx/regina-rexx.SlackBuild
+++ b/development/regina-rexx/regina-rexx.SlackBuild
@@ -4,14 +4,11 @@
 # Written by Diogo Leal (diogo@diogoleal.com)
 
 PRGNAM=regina-rexx
-VERSION=${VERSION:-3.9.1}
-DOCVERSION=${DOCVERSION:-3.9.1}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-3.9.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 FLAVOR=${FLAVOR:-dynamic}  # set FLAVOR=static for a rexx static binary.
 
-SRCNAM=Regina-REXX
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -34,16 +31,18 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
-set -x
 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 . \
@@ -79,10 +78,12 @@ rm -f $PKG/etc/rxstack
 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
-install -m0644 $CWD/regutil.pdf         $PKG/usr/doc/$PRGNAM-$VERSION/regutil-$DOCVERSION.pdf
-install -m0644 $CWD/regina.pdf          $PKG/usr/doc/$PRGNAM-$VERSION/regina-$DOCVERSION.pdf
-install -m0644 README* HACKERS.txt      $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p                                $PKG/usr/doc/$PRGNAM-$VERSION/
+install -m0644 doc/regina.pdf           $PKG/usr/doc/$PRGNAM-$VERSION/regina-$VERSION.pdf
+install -m0644 doc/regutil.pdf          $PKG/usr/doc/$PRGNAM-$VERSION/regutil-$VERSION.pdf
+install -m0644 regutil/README           $PKG/usr/doc/$PRGNAM-$VERSION/README.regutil
+install -m0644 BUGS COPYING-LIB HACKERS.txt INSTALL README* TODO \
+                                        $PKG/usr/doc/$PRGNAM-$VERSION
 install -m0644 $CWD/README              $PKG/usr/doc/$PRGNAM-$VERSION/README.slackware
 install -m0644 $CWD/$PRGNAM.SlackBuild  $PKG/usr/doc/$PRGNAM-$VERSION
 
diff --git a/development/regina-rexx/regina-rexx.info b/development/regina-rexx/regina-rexx.info
index 25689c3dbf..3383bcc505 100644
--- a/development/regina-rexx/regina-rexx.info
+++ b/development/regina-rexx/regina-rexx.info
@@ -1,12 +1,8 @@
 PRGNAM="regina-rexx"
-VERSION="3.9.1"
+VERSION="3.9.3"
 HOMEPAGE="http://regina-rexx.sourceforge.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/Regina-REXX-3.9.1.tar.gz \
-          http://ponce.cc/slackware/sources/repo/regina.pdf \
-          http://ponce.cc/slackware/sources/repo/regutil.pdf"
-MD5SUM="ead9355e9207567bb45ce015fed700b4 \
-        f6b591d6986395c3db47a92712ee53f6 \
-        a31a31f235520dbee857cf87e0dc4db8"
+DOWNLOAD="http://downloads.sourceforge.net/regina-rexx/regina-rexx-3.9.3.tar.gz"
+MD5SUM="9631f4a8859fb44f7e76f80682e76494"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/rmac/rmac.info b/development/rmac/rmac.info
index 2bbf953b6e..2ad2328bd2 100644
--- a/development/rmac/rmac.info
+++ b/development/rmac/rmac.info
@@ -1,8 +1,8 @@
 PRGNAM="rmac"
 VERSION="1.13.5_20180603"
 HOMEPAGE="http://atariage.com/forums/topic/264842-rmac-the-grandchild-of-madmac-assembler-finally-gets-6502-support/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/rmac-1.13.5_20180603.tar.xz \
-          http://urchlay.naptime.net/~urchlay/src/madmac-examples.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/rmac-1.13.5_20180603.tar.xz \
+          https://slackware.uk/~urchlay/src/madmac-examples.tar.xz"
 MD5SUM="b42fb292daf2f20147bead7dc9fe607d \
         3d6dff2b72815935c322c91277ea5074"
 DOWNLOAD_x86_64=""
diff --git a/development/robotframework/README b/development/robotframework/README
index e31dff8446..82582b87c6 100644
--- a/development/robotframework/README
+++ b/development/robotframework/README
@@ -1,6 +1,9 @@
-Robot Framework is a generic test automation framework for acceptance testing
-and acceptance test-driven development (ATDD).  It has easy-to-use tabular
-test data syntax and it utilizes the keyword-driven 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.
+Robot Framework is a generic test automation framework for acceptance
+testing and acceptance test-driven development (ATDD).  It has
+easy-to-use tabular test data syntax and it utilizes the keyword-driven
+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 a662be129b..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.1.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.txt 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 6cef901103..4cd3b84b57 100644
--- a/development/robotframework/robotframework.info
+++ b/development/robotframework/robotframework.info
@@ -1,8 +1,8 @@
 PRGNAM="robotframework"
-VERSION="3.1.2"
-HOMEPAGE="http://robotframework.org/"
-DOWNLOAD="https://github.com/robotframework/robotframework/archive/v3.1.2/robotframework-3.1.2.tar.gz"
-MD5SUM="c0cb80128bc86ffc35ee6d254ca40a76"
+VERSION="4.0.1"
+HOMEPAGE="https://robotframework.org/"
+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/rtags/README b/development/rtags/README
index 223097b1a1..5408d6e067 100644
--- a/development/rtags/README
+++ b/development/rtags/README
@@ -1,4 +1,5 @@
-RTags is a client/server application that indexes C/C++ code and keeps a
-persistent file-based database of references, declarations, definitions,
-symbolnames etc.  There's also limited support for ObjC/ObjC++.  It allows
-you to find symbols by name (including nested class and namespace scope).
+RTags is a client/server application that indexes C/C++ code and
+keeps a persistent file-based database of references, declarations,
+definitions, symbolnames etc.  There's also limited support for
+ObjC/ObjC++.  It allows you to find symbols by name (including nested
+class and namespace scope).
diff --git a/development/ruff/README b/development/ruff/README
index c5eacaf826..da52ca8ff2 100644
--- a/development/ruff/README
+++ b/development/ruff/README
@@ -1,12 +1,13 @@
-Ruff! (Runtime function formatter) is a documentation generation system for
-programs written in the Tcl programming language. Ruff! is included with
-Woof! but can be used independently of it. Ruff! uses runtime introspection
-in conjunction with comment analysis to generate reference manuals for Tcl
-programs.
+Ruff! (Runtime function formatter) is a documentation generation
+system for programs written in the Tcl programming language. Ruff! is
+included with Woof! but can be used independently of it. Ruff! uses
+runtime introspection in conjunction with comment analysis to generate
+reference manuals for Tcl programs.
 
 In comparison with source code based documentation generators, Ruff!
-produces documentation that not only requires less effort from the
-programmer, but is also more complete, more accurate and more maintainable.
+produces documentation that not only requires less effort from
+the programmer, but is also more complete, more accurate and more
+maintainable.
 
-Ruff! is covered by a liberal BSD open-source license that permits use for
-any purpose.
+Ruff! is covered by a liberal BSD open-source license that permits use
+for any purpose.
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/README b/development/rustup/README
index 3f09ade329..f8dce7775c 100644
--- a/development/rustup/README
+++ b/development/rustup/README
@@ -1,12 +1,14 @@
 rustup - The Rust toolchain installer
 
-To use the versions of rust installed through rustup, you'll need to add links
-to the rustup binary on your path before the system rust.
+If you want to use the versions of rust installed through rustup by
+default for everything, you'll need to add links to the rustup binary
+on your path before the system rust.
 
 You are free to choose where, but here is an example for a single user:
 
 mkdir -p $HOME/.rustup/shims
-for lnk in cargo cargo-fmt rls rustc rustdoc rustfmt rust-gdb rust-lldb ; do
+for lnk in cargo cargo-fmt rls rustc rustdoc rustfmt rust-gdb rust-lldb
+do
   (
     cd $HOME/.rustup/shims
     ln -s /usr/bin/rustup $lnk
diff --git a/development/rustup/offline_build.diff.gz b/development/rustup/offline_build.diff.gz
new file mode 100644
index 0000000000..f85a13afbd
--- /dev/null
+++ b/development/rustup/offline_build.diff.gz
diff --git a/development/rustup/rustup.SlackBuild b/development/rustup/rustup.SlackBuild
index 31af7cc25e..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.18.3}
+VERSION=${VERSION:-1.23.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,10 +69,12 @@ 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 intead of downloading from crates.io
-mkdir .cargo
+mkdir -p .cargo
 cat << EOF >> .cargo/config
 [source.crates-io]
 registry = 'https://github.com/rust-lang/crates.io-index'
@@ -90,12 +92,17 @@ mkdir vendor
   grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
     sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
     awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
-    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+    grep 'source=' | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
 
     ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
     dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
 
-    tar xvf $CWD/$dep-$ver.crate
+    if [ "$dep" = "home" ] ; then
+      tar xvf "$CWD/home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz"
+      mv home-a243ee2fbee6022c57d56f5aa79aefe194eabe53 home-0.5.3
+    else
+      tar xvf $CWD/$dep-$ver.crate
+    fi
 
     touch $dep-$ver/.cargo-ok
 
@@ -112,10 +119,14 @@ mkdir vendor
       printf "    },\n"
       printf '    "package": "'
 
-      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+      if [ "$dep" = "home" ] ; then
+        printf "%s\"\\n" "479b7f48df1046b51085dcc214350c0ca7a303d91ca17944c0977fb72cf6bbac"
+      else
+        sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+      fi
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
diff --git a/development/rustup/rustup.info b/development/rustup/rustup.info
index c2cbadb7eb..3dcd5b8abd 100644
--- a/development/rustup/rustup.info
+++ b/development/rustup/rustup.info
@@ -1,438 +1,546 @@
 PRGNAM="rustup"
-VERSION="1.18.3"
+VERSION="1.23.1"
 HOMEPAGE="https://github.com/rust-lang/rustup"
-DOWNLOAD="https://github.com/rust-lang/rustup/archive/1.18.3/rustup-1.18.3.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.3.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/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/autocfg/autocfg-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace-sys/backtrace-sys-0.1.28.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.15.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/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/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.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-padding/block-padding-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/build_const/build_const-0.2.1.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/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.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.4.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.36.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.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/cookie/cookie-0.11.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cookie_store/cookie_store-0.5.1.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/core-foundation-0.6.4.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/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.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.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/crc/crc-1.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.7.1.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.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/curl-sys/curl-sys-0.4.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/curl/curl-0.4.21.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/digest/digest-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-1.0.5.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/encoding_rs/encoding_rs-0.8.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_proxy/env_proxy-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/error-chain/error-chain-0.12.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 \
+          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.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.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.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.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.7.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/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-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/futures-cpupool/futures-cpupool-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures/futures-0.1.26.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/generic-array/generic-array-0.12.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/git-testament-derive/git-testament-derive-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/git-testament/git-testament-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/h2/h2-0.1.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/http/http-0.1.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/httparse/httparse-1.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper-tls/hyper-tls-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper/hyper-0.12.28.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/indexmap/indexmap-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/iovec/iovec-0.1.2.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/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/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.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/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.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.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.3.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.54.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/lock_api/lock_api-0.1.5.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/lzma-sys/lzma-sys-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/markdown/markdown-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/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.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/memchr/memchr-0.1.11.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/mime/mime-0.3.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/mime_guess/mime_guess-2.0.0-alpha.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz-sys/miniz-sys-0.1.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide_c_api/miniz_oxide_c_api-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.16.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.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.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/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/numtoa/numtoa-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/opaque-debug/opaque-debug-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/opener/opener-0.4.0.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.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-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.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.2.1+1.1.1b.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.45.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl/openssl-0.10.21.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/owning_ref/owning_ref-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.4.0.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/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/pipeline/pipeline-0.5.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.29.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/publicsuffix/publicsuffix-1.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.12.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/rand-0.6.5.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_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_hc/rand_hc-0.1.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/rdrand/rdrand-0.4.0.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/redox_users/redox_users-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.3.9.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-0.1.80.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/remove_dir_all/remove_dir_all-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/reqwest/reqwest-0.9.16.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.14.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-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/schannel/schannel-0.1.15.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/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/security-framework-sys/security-framework-sys-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework/security-framework-0.3.1.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.91.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.91.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.39.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_urlencoded/serde_urlencoded-0.5.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha2/sha2-0.8.0.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/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/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.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/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/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.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/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.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/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-0.6.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/socket2/socket2-0.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/socks/socks-0.3.2.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/string/string-0.1.3.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.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.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.33.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/tar/tar-0.4.26.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/tempfile/tempfile-3.0.7.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.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.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/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/thread-id/thread-id-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.2.7.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/threadpool/threadpool-1.7.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/tokio-current-thread/tokio-current-thread-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-executor/tokio-executor-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-io/tokio-io-0.1.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-reactor/tokio-reactor-0.1.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-sync/tokio-sync-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-tcp/tokio-tcp-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-threadpool/tokio-threadpool-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-timer/tokio-timer-0.2.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-trace-core/tokio-trace-core-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio/tokio-0.1.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/toml/toml-0.5.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/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.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.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/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/typenum/typenum-1.10.0.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/unicase/unicase-1.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicase/unicase-2.4.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.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/unicode-xid/unicode-xid-0.1.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/utf8-ranges/utf8-ranges-0.1.3.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/uuid/uuid-0.7.4.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/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/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 \
+          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.1.5.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.2.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/want/want-0.0.6.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.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.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.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winreg/winreg-0.6.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/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-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"
-MD5SUM="90641bc5f0f36273711112f7356e81de \
-        94e5e4da83397101dcac50eba7f31787 \
-        df727d9f2986c9874bec190bbc9f0021 \
-        cb23a78f4c35abcb2d8d1394645674fe \
+          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.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="5882392f38a484979844026f91ecc4ba \
+        936439213c803e7cc32c7910466952e3 \
+        c9d0c8f38c6686e47c29fe9b409c25c2 \
+        7d46c68f1cff11aa717a1ebfaa71de44 \
+        427c1b0430ebe6f922502c69af35f9cf \
+        3b072746a74f009f3fa885ad7462c9d5 \
+        d00e12a7f092ab591790a9a5323f72c0 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
-        e1efb9a37395a38bd80ccfc911d4a6e8 \
-        46a048c0b8b765bcbdc131e166410510 \
-        5d7155b7fbc0e234c017f418f0dc9d64 \
-        59f345457ff5690527e5a9a863856a75 \
-        b94bcb41f342404852b7d763700fb6fe \
-        65f648bb3e813868fd21daac4fd1fcdf \
-        9ed1fef898024a6aaf3e3878cd83c103 \
-        e5767560aad375059c975285c07022c0 \
-        027635e453eccbfd0a2b02a440e334a6 \
+        fcab7f32ed3f030f616273151cc71a8f \
+        042f9fe2e3b5ac9d381f00cf2251d279 \
+        142cb4b9a653e56e56311f0c883b8582 \
+        898079c1c795b5aa847169137918c7bc \
+        c6443ec8d007c729ba5482008d0c864d \
+        a83ece347af514b01043c64ba6c93f6e \
+        600137b12b6b717eec0f376bc6680540 \
+        fb5d5c306d1dd0ecd2613b8ade78af61 \
+        6799c26a7eacaf8e58d3e45c6c5add89 \
         a885637c56c780044d778f18420687cc \
-        f1c972c827ad1fb0a3d0e2461942930d \
-        39ef2c15a85f895d18ca6088a7a6d0bd \
+        c7fbaf61245dc847237ab7c72b3ee9ea \
+        7f380a16b8239e8344e16ebd99abdf94 \
+        7690faa1a56f87225d241f0289f56c4b \
+        95414d4f9c612bbe8a061dd2ff0bc519 \
+        3518756a1af12a80e9c872091cdec5d5 \
+        1692a6f6682375ffd30ca15230bb44f4 \
+        5a075b6490fe21776e47653dd664658b \
+        7f74a18288dd952887eb53f90404ea23 \
         4bd3c3b61fe602e6078615a491e5050a \
-        e5ff029879cdacd29148cd31da1f0564 \
+        e502e6c6b0dca9c1ae2d99e92b26f645 \
         1d02fa9f0fca9470a24a05e7c155993d \
-        b63fc66943d4294132bd1153aef7b493 \
-        0cd2bb93a82da2e4ca526b40ae8b341e \
-        ed2b1c5fd000f926c2aedb0c3bd1d199 \
-        135f6d6306e50606f0475ada50c33ce2 \
-        1c8b50f8528dd37df7d984e0e4b61bd5 \
-        701334c674b3fc3ace74045e3a2fae50 \
-        52c7070c4c96b99bfb6087b942c8146d \
-        c7fc86fc69f54f2eb203adea9f813bb5 \
-        6a97194aa07f7993298563f012b05a73 \
-        ee7b2dc49246abc5b91ed9feccbde82f \
+        d123f33f646e37ca5b825ea6eb2dd150 \
+        83d091be0ca74e645cbd0e6b0ac6a918 \
+        87343079a03b28726b323c5c40c9167c \
+        f4a2a1134c7dc7f54161f6c003e69098 \
+        882dbbc613a93f64c3709b0a2bd0d6dc \
+        74634128440dbc3766bda76fdf0aaa05 \
+        1581b390d17f6e73a43ffc8a7b009e57 \
+        6020ef596fbfe810a0071b72aa72795d \
+        bc79e0eb364df515a33755ac9a581cfd \
+        a5062f2992a4d2b79952f4fa4c4582fa \
+        9754db1eb3e8b15807f05a3540d2ab39 \
+        f0682cfdc40af509c98f46f6350c1ba5 \
+        e0a69519ad697a923799407d8b01f7e5 \
+        e3907f1e3ff298226c57ba1e7cb5263b \
         3c153e21729b743f5127dec47670de17 \
-        c07d2bd46a0fb313b00d1241e6024527 \
-        73df5c13aa900288c9b4dd3a607dea4d \
-        d01af9a3605a069d945a0dd3fcaa2313 \
-        7c90c5d981a715d9863d6bfcc984d6ed \
-        7b9ff702e267c8908dd0cbf0ba018715 \
-        f60d047a5fe045e3ec0a99a0ff581ea9 \
-        610838415f2d612332865ee8098e75c4 \
-        0972c68e5e5fc1fca89d4738d0ef61f1 \
-        f9f233221c0202b616d6957925c41ac8 \
-        b5c83d38a90566cce432ca48643d1f1f \
-        5d49b7d2daebecaf57fb00d37d9fed92 \
-        ce4215be7c26d1b46a696d3674f1a9c2 \
-        ebce8cd5762f9f56fb76bb3aa0cefac5 \
-        6d780ab18da07be9ed423e7edfbcfd7e \
-        e8e663e88ee02ec47cfb984382cb62ae \
+        093c5099d3cef0f418550fe28788d34d \
+        897911f15f349a357899045e6b0c04e0 \
+        49b4b022e9fa4cc60376a79ecb39d04f \
+        ff67cf2eb9668167782b8012d3b48e7b \
+        543431d800b35ee976e9d4c46a92e0b9 \
+        41438ce28ee3293a54857d3965de9ca8 \
+        ce71db4e5a1aa04f76867418fe657107 \
+        a42201f337a8d7cd51aae9e5ecad91f0 \
+        b1c8b47b8fc9077b6a6aadc47c819115 \
+        5663ea952316dfff411bc1ef78c1979d \
+        a9045fa57c1e4ed702e51da973b658cb \
+        2ff8927b9cc3e6bcec18745859808751 \
+        fe3f95491007d600a82efb1a7f52e6cd \
+        b00352aced738d455145117157604783 \
+        493a2f042d86baa5c6bac75202c64554 \
+        cb752f0454c59d6effa9409f18a9a9b7 \
+        30b0b5e6c6f6081f52fc5a1dddcfe4e1 \
+        76a70864a76f97183625654fb0802d99 \
+        049fc47f174d16dd6e3146989465d915 \
+        b4e2b229c362ad0dd313ff631816d5db \
+        f5f31a119d0ddf7457de89d87b07f3ba \
+        249636a8c8e57527d0e72ae772df5acd \
+        da699c4c8e4c153cbdb9fb0ef3fb3056 \
         1aef0dd636d3ef234e4f035fc26c0069 \
-        8ce853df145c78eb74c16f684b1e3b56 \
-        75921f600f249787a5de588658c85ece \
-        b0fd8ad50f5e64c71f0daf8af79ca952 \
+        b27f43a2e95dbc4f309b5b94b60e837d \
+        14cfb04bc2786abe846e99276c1e604c \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
         667e86b8b8d96ab4e9605627ce7dcc9a \
         78c898fdaa3968e23904bf8538c4a271 \
-        27260b46db6b9ac40318143d70a80ba3 \
         54cfab480b7a5f7302eadf44129d3f4b \
         dd7c80c2d04d2e9ceba82826cf69764d \
-        c9a5f223bcdf318649575cc13c85e833 \
-        dca7fdfe746bf3bde623c7ce94e81b11 \
-        4e65a8da18c52fe601d822459675a98a \
-        5289760b2c508632f44f9f6d98934e74 \
-        b27b6e0f3f7ce8972c7f597e80575a6a \
-        41028a90b23907255640ba53b08aba4e \
-        9e976704867490a0ce96826b66094afa \
-        919a832a1a1e2ab1d3ef41b044da7726 \
-        5c92c07cc40df116fcec89478da839e5 \
-        e0b6c65f276ac092accac24a5562d49c \
-        89cabfcb37602a7b200b1a9cd660ee2e \
-        c9b94299d56f5895ec0e6d5cbe1aa7d9 \
-        e3c41d159635384c1fcacb375d490ec1 \
-        a5143958be2dfd4f34d4634973c12da2 \
+        5bf449f34f747327ed2de59e39b01a20 \
+        733e0c71f1002aef9b9058df0da73da9 \
+        dd0607248e69dbdf0fa8b203a38dc9af \
+        719821cd3e8f92f01542fd1a1095d6e0 \
+        20cbf784cca49e4a942c11155f0cf156 \
+        001d06128d687db6abd19399e64096d8 \
+        36eef9a2238eb2761186d39369a2dd57 \
+        fa0d41f7776fc2b927ef01d0296f7c52 \
+        62cea631e104f992003b1b312d975750 \
+        916a6c827f4f0f64b7652bebf67d82e1 \
+        65cd30f86e785b77fd82e0693d126e26 \
+        704babd757a22f163230a36fa5474890 \
+        e3ac3f5ba49f6eee65b033f549f5abf1 \
+        c5d606afb4249cd8c668d410e9b5f054 \
+        07d4cad96f7bab84c2ec1a29ea0f2bc2 \
+        37b2d7478688c6a9b1f86fbde3f17a19 \
+        58285dfb5134c5df5503066a20dc9d2c \
+        553b325a602b701eb7eaef228e69d0f2 \
+        139e82145454c3890131417576dd0b97 \
+        0181369fc9db8aa137e427c1f4559b4f \
+        1c9eb415ab7f61e8ed5087ad88038878 \
+        2399dfc187794c0016997cc48327d6a7 \
+        76a32998a25cedabfc01b591b5aff211 \
+        8644302a0971f0a59c5a10332869f533 \
+        02ce273a6067ae7f984c13585eab9f47 \
+        fe77a3f609b6fd8d5b08f3b2ef14d2ad \
+        54ac4c56d9ec2800b8428020f24be67c \
+        bb43d4a3ffb3066ac416c9bae771b001 \
+        f1c40b9836035b69e464df711a1d2950 \
+        4da5fc847652b5abf716369930b6dd0a \
+        396bc88987f4bc192f975d94cdf326c7 \
+        95bc414a57e9b5cf0b13be83a64a7334 \
+        dd9ddd25c1fd24dae39d732389c7350f \
         9d033cc2daa6924420a4a89e6705773f \
-        1c9fee8f180b6f3402849983a45bbd6d \
-        09c2a456bd4064675a0c53ca70f5eea1 \
-        2c69391ab2d137625a5ab389ae94ba26 \
-        8a79353ba205d0a86f695053dd4d15be \
-        ac6a4d0d3c5cd5718800d285c2da55c5 \
-        cc65f96341390c0f60f5216e829486e7 \
-        c3b10be0bf10f5a668ff3a0a25ec759e \
-        af84efb6ea1292cd632476eb6b1a94fd \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        7aef65438636d8662cd61e77c42c28f0 \
+        5b23904f9579d1efd0e914257517eeb5 \
+        e5768043e447a7423f030c1394440502 \
+        f50d2e280b4a3491fffda43b90982544 \
+        71ac456d8737d5cbe37872a0744336f8 \
+        47580fad08273a52e998f84ef404912e \
         7916dcd738a8fa6a2798754c20d6e146 \
-        6a8e1bfad0f908afae0d0ca9941bd411 \
-        514a89ff59a9bf0671d7db4812725459 \
-        43452a6296aea71bef32661bee169d21 \
-        a9c3db3cda3abcbbe63cb948df033270 \
-        e23d7a443ddc88c3c6ad88b4736e6b76 \
-        764157a1118378c8df6162d4ebb0253d \
-        fe33a1d480c7fa982798121af1b52560 \
-        e14545924532043c93b0b66d373c03f7 \
-        1950db46cfb941645fd663b5f4ca9047 \
+        b5cf10e268e8a3bee2de8a734104245e \
+        fbc0f8f5473906bf26a1931703490034 \
+        124ec4f35274a0e9c1a4ef3dc0958643 \
+        5d9532411dde9442741983efd0961351 \
+        a362e890dd0dfe51ecd95a4a1be6e28c \
+        f7bde0c2e5fd9542f7ccb5e6fc40eb04 \
+        c291ac2f4465c030c058a7c1bc595783 \
+        e820082de1cf13e1111d2acbae898fcc \
         a82e0b9efe7f6385071c9fd9b3bccfa3 \
-        13bbe3e6bc0cf7e6e5e877d7c2587ab4 \
-        2ab09fa67b2a6b3b33eb15d8f23814ec \
-        8a39d8bd95f15af0840d2049f0e78a37 \
-        4092ed5c67c6ff1c6a7bcf463bc40a53 \
-        cbdebc326641fcab42bc92a113548740 \
-        9fc51e79791f918b643e3802a2e0e88f \
-        bbda7e9c572f651774dfdb0006b9f085 \
-        2634784d064bef711305527bf840e662 \
-        ee54f6ee732e7650ff8749d85aee0910 \
+        98731fbefe42841dce239a8e8064431d \
+        437a18bacffd4e141cd4ed3c6a16a448 \
+        92bcd45a654d9e24c86f3465c6387c47 \
+        120eca90d4b29e71b33e2527fb9ff8a2 \
+        6b1db46a36bc0dc590270d2c952d30c4 \
+        709d9cbdd5462dacdd1439c19e036df6 \
+        759816fe5b617674ae5dee83e3c3e6e2 \
+        05d11031bec5456993601f9f660b37fb \
+        2daa59d0efd38e9b5fbb2658b080eaa1 \
+        c36d452e37c73b1e99f40bae18cddfdb \
+        26abbfd602eaf92956306a4a2d5f1555 \
+        a37a5b604bc2fd746aaa12623bab6154 \
+        797752fea1f2c8b458cf7383b61433c9 \
+        653e04baa68a4484b3b839c19221e474 \
+        ceef2a7834bdaa9fb2226366aa729591 \
         0fb8f799f959c69991d54556c5457068 \
-        4b4a0da29798cca1a2c72cc81e6bea2d \
-        6b879e525c96eb1beb75fefbeac77501 \
-        6c882921e4cdb031bc6f1ea0fc714ba3 \
-        992a7f71deab703f19c419d3a4303b55 \
-        e0493a4c121cded246f611c435dce2b7 \
-        f59fef46e6ebc8bfcca5bd8c05e23089 \
-        8a5fc6ba84f3ac8a7e43ecb99322866c \
-        b8db92fd9b5ab0acb0e107e2663e29ce \
-        208dec586f410e1e0f73922920496c17 \
-        c9b8a4037f18a98c6c48e91ad0337aad \
-        9f78b722429cc2f34dfab91ba302cae6 \
-        6ee5c12c25f9ef371ac4f3fa8546b9af \
-        87a9d36f5ebe5eae0c3e8d69d58752e1 \
-        e4a04143cd86e36da8e0bd91598f6f4e \
-        1bb61ce18a58596fae07f8f22b09ffdd \
-        54694fe2ab822610b6ee4ccc048752eb \
-        9e99a37f8c37bb953732ef46ac2b12a1 \
-        793627c8c18012ad77cb3e81fa4c2195 \
-        3ab5a79607a4d260bf61cd99dc82ab05 \
-        8cab41822d03dfa674870315308fa392 \
-        7058895bdca83bbda052d66b087f902e \
-        28b1e6d15e1ba8cf3a2e953ce7fcd3de \
-        74b15f1928431937f14ed91fdc12b542 \
-        2255d3d9a603e177985602a7df1c5bbc \
-        5acfdc8656212bce8df1bcc43db34c3d \
-        f9e08a49715c401602243230b28d86f0 \
-        7826deb76941fc36c2391951bd65ba47 \
-        c8d655d206cbe48b84a22544d6fc6d15 \
-        14fab6ea3c2c94779d3c50dd2dffd10e \
-        01cb5402c0fd99cebac702b76f2f2669 \
-        d5a91ba6d74914190df5b355f891d6b1 \
-        797f26b635bbc56fdf5ef1cc3883f259 \
-        4ee4b798e15d09f65c6e66c7d3c503fd \
-        c76d9e4def697bf23faf4d2b79aac458 \
-        9d1baf9d7576dd51ecd02dcc76810678 \
-        09422dcb1cd6e3c30598296d2d3d4798 \
-        426b835d26f867014dff5257bd3eb5a7 \
-        77a4e43c398988b04f9de89e6905c0dd \
-        4d101ab24d14c54937c5f45ece8fad5f \
-        7d4f84f72195bbdddcf9dc0d8e78e21d \
-        6bccc3d52555a67d135ee83a4f7ffade \
-        ca86bd23ecb6fed99d42f56646cbb23c \
-        b492e0a70603c3903a44ec5cabd3ba21 \
-        500e5bb7d9b5a8882e2e961012391a58 \
-        dad6b55e158861f8c4e199d498efe162 \
-        3ef5c635367a7b730e87f4630a165396 \
-        0866d83901a03ba059b6bf926d1b0e5d \
-        8b4d8c7b6e3a060d365bc1ad650929fa \
-        64111c20b69aa1532fb66b70c4660b55 \
-        b85b8d20e0cd78c273a811a692b953e2 \
-        291828b6d76cf2438a38d7d9b7e0ac62 \
-        499034935525a3fe9e30152ce1577967 \
-        38115ee5d37c60d207bfa49715c0759b \
-        ed8a006aabb7a174f4c78a0460a4d5cb \
-        85e4e64ebc6bd76f1b9ff5be147a918d \
+        57230f576c93046e708d3afcff7ac682 \
+        48067cc7d8ace5851af5f3ea557fee17 \
+        589eb9c74cd6b5fc5098c6fd6fb62647 \
+        cdc38b4d2a7a460942eff8d4c1056037 \
+        f490982aceabdbd515348f63e638a782 \
+        37cf6acd1c3259eefeba636e4cc9b365 \
+        43e97206d08bfd1a23b2ed01fba95c69 \
+        0cf1fcdb3e8eab7001792f4916516fc2 \
+        222d8ac7246a639ff9858d12cbb40e54 \
+        3ad0a5f352fb5c7e193506202d882a31 \
+        585d3da3270d0e62a4ce54c7276cf5f6 \
+        9ccf1278c6126b1df7dbc717394cca8c \
+        3e5a1385aee77fb5fbf4129528084870 \
+        07c75fec267864bcbb800ca7709ceae2 \
+        448bc61aee07661464d98da7660e9a1d \
+        6e13d1e2274baa18cf4522279dd6721a \
+        55421a32e9d74018f1f0e94ba6e3702f \
+        733815b52a600ff8b7d3998aa79e03d6 \
+        0736e4f76f4f8f0a29563b0608ca3974 \
+        9f289f970967e3b2a31b2eb7220eedd8 \
+        63b29211eef9ccee0b0401d423db0efd \
+        66d1cb32dce999907409f636f004b884 \
+        0a80ed36a125ac3cdfa09f8707055873 \
+        a0f55fda89c0f97784edb18f4c253a49 \
+        b269356e8646f3184a0e8d52a58cee69 \
+        bdce8d6ae27394b8e0334d7b1152582b \
+        5ceb2f0194476fd7a5f603646690a29e \
+        3cc3a4bd5861ca93d7c0d19129334703 \
+        c0e4e83c5ae5f75f410559f7ab3d39fa \
+        a9ba533889383bc3cb9999ec7dc06a5c \
+        0538d1da369f3e3f0412aa4d735c1b61 \
+        51eb242fd079afc9400f147e7d11c0b4 \
+        00b10c492d7db25f5b35bb8678ac8416 \
+        6b894f9d89fc01cf34d29be641bc8165 \
+        1a9c01bcae65d16b4c0d86b94feaff37 \
+        77e2941b1ce8d056c64f3e19f51841a1 \
+        600892c4fc94a822b3b4c2a67c2994dd \
+        92b8a0995da03e23755c7dbe14bf585b \
+        a69721c73263cd2040e1a5f120b03a6f \
+        994b165f971ecfc09dc13fca8d394691 \
+        2d8d8b377d144f5e32b4f65a69eb0b24 \
+        f505a218806e44b2369671089d65e839 \
+        b4a0a98a54439a5a37952c8879187ee3 \
+        1024ac462fe90a1d7882a6911bd70604 \
+        9e0c7fedb6287e5090bab920da5c1d09 \
+        62cde3def3d803cca1b9f289dc8a706b \
+        d2cc4e584ed64165fc56d2c9081eb3ee \
+        00abb3f999c030c8af5aa0d54f776ac9 \
+        622e004624817a6eca1813fbdbebd14c \
+        ec28f372c4d58457baac31b017b83ab9 \
+        48d4ca11f30e1976378c7f84854db36a \
+        b1cace2e0c87bbbf5753996e28016787 \
+        63e6e7a51fcd87f35d8bcd765f063ec6 \
+        000c9031f679bf9c392dafa59c134199 \
+        de374287376044dd32adb628b56c97e9 \
+        e766dc347b780066e0a9ce26a8c12041 \
+        3f735228da6e466b5c2cd73e73ca3830 \
         c7bfa89e6da163f1474bb3787987bb12 \
-        decf47fcc527d6ff7315570be2a9de0f \
-        f8940031ec32d380377b08b094eb0e8b \
-        c9570976b1ecb0f6ae98793f3920ad56 \
-        a986c51d8a91f91704da0c440295640d \
-        2ce7755c99b3af8a17c00e4dd6ff1a5e \
+        51cdbc77f4b359baa519c19e32abe0a0 \
+        891d3003b44db446e06eb128b86d6437 \
+        422ea23fbfe5bff61f519d960647ebf8 \
+        15268348667e153a9d7a67112a71073f \
+        82d98dc87dc8503400aa095f5aa70f13 \
         781d4ccf5d04c98fa02af207a9639249 \
-        e53898d536ec57c255ad26fd803f5df2 \
-        223c65f7cbcd9c94eeeb062fd767807c \
-        d155c08de6c18bd55639ffed629894b9 \
-        1242ad4e8398d5ee0b3386e74a5bcb0b \
-        918b2d65f7489e154483e3d6e54118a0 \
-        f15d12fc7a434eabcd28b5dbb7eac979 \
+        90253ab52670a0551a533eb78a1f6b10 \
+        25328253cc37e62ee63c6b2c88589862 \
+        6de09edb5f593f009ed5b6f021ca3bef \
+        09f09b3f56045183393726a31d8a0192 \
+        afc6a60faadff5a3b18fcdd64edb38f5 \
+        121d3ebcac6f4b6687ddb2f733effac2 \
+        bb3ae104a9fa1b31568cc98c920a4653 \
         019b9ca883a71e25e109e49d8cf779d1 \
-        9f1f6e2fe9afbbcc351a7430962a7571 \
         a8de006fe0c7e373c560dd51599287a8 \
-        cbd02f4b3f041a51789a0a22163e482c \
-        228d6ac2570bd4b88b0cc2a7729b493e \
-        baaa166f66e90e94b76b7418afd5df90 \
-        46b105da65c6ae0f3ef9a62a065937fd \
-        3d311d2cedf2d3d7b11b32baf470b178 \
-        251ef183d295fcca2e12916b5e4c9a2a \
-        f08d17df13435fa069b3fdcdee43198b \
-        c2712f3e0a504af9658ddd7136b77001 \
-        bd3cc5578f8d9047f075df5924194750 \
-        90883afc933804b8144054542b7f5357 \
-        cd6bb0c1e31cfb1d299c891af6c5327a \
-        0aa3eae381d31b2cb5e6561e097bb266 \
-        5a8e5b83853bbb506b564cbf934be857 \
-        378042ee355b37af27d8fc4e0ca610a2 \
-        7d2f6997e901580ecc397dd417309116 \
-        229fd0b5ee5661e2e3d9d3c5ca39b01c \
-        6514dcb2766ebd1ed2c6dd77a851d53e \
+        ec26f649159c08967f00cfd69ef10fbd \
+        cb4f342515e66eca045baf40471a1697 \
+        a5dd75e77c7324f5c1d2d372c990d0a7 \
+        192229a7b481a4becf170d8a34528739 \
+        c6c50e4feea5f4cc4e1fb3c7e88606a5 \
+        253a33d4577293cbeb852f14069b4a84 \
+        578f4f7d98bd4079c8cffb1de0d5f228 \
+        a6ee95c895582a773a5ee6aa7251581a \
+        bf41c63b7f486045605d856c0658d31b \
+        4d130fad86abe7c08cddf9275e031bd6 \
+        81bf25626c453f06c8e5f74c9ec1edcd \
+        3a8b96cbb6a0e4b3e7e9a915f5825e33 \
+        522b61f7089aae98faebc744712d608b \
+        86d9b65cfee7b9715c7d30504f7e7769 \
+        e876964c7b83db85fb7897bee7ad0f45 \
         0c869ecf1f365d9eb5e39e6a65771b64 \
-        8c243967473d6a14ee401073c9c9b83b \
-        d34a9f507f3ecf7d93c07deb74f1cd7c \
-        f316454c1928e03f6459d7eac04d2168 \
-        efe755cdb3d22d67bcc79ec27f020cf4 \
+        3760ecacb9e0b3b9451fbf8c4571e909 \
+        55927226b06f62ccbd2890269d68c2fd \
+        6cae4969689ecc3b4b4c31a9fb9539a6 \
+        36cbce768155bdac8934efa262d75fe3 \
         f403bbb812ce1a2d9270d9159cf9e8d3 \
-        60eec117e8efaa29b898e43319da2b05 \
-        d7c493ca4f84a7d50b53646421a37487 \
-        5aaf04f9a94a6450e3e4963ddd62b92d \
-        32f0ced8a8881d2c0572b879bf15b91e \
-        075bda329483078c4a57eb6988c6a31a \
-        9c27232c12abb96c68e10e21f2012639 \
-        3b7922f1cc713b0505a6808ad3539095 \
-        e75c0721667b6bc86472ecf7b286d9fc \
-        0eedbc32447f40b3045d6de3910b5415 \
+        c3be058b692f0e9b25a3219b7b5d940c \
+        4272c279b06b88f8b0ffce7109348e27 \
+        a51c43692084979295641a7ffba4b297 \
+        81821d39675a1f584546b9920e5d6b5d \
+        bff823ec07c5fbcc3e425c9c9e4b38a6 \
+        333b4ba3f64c35b6f89b521e8d64548b \
         f48add3d6234e8b9829fa5364509f425 \
+        8b01b016a9b6deebc1b43f296057efb5 \
         6708629acf3d2ecb7404e43255d2df85 \
-        446adaad11d5f90ee0621f08552e0ce9 \
-        81f13975c311618ccbf154a95b67da50 \
+        1092a4a24e80f8856efc71af51a06114 \
+        e334c03160b1e0989c2a71ca55f631fc \
+        a312b55a428f827a91097d1d8497b02b \
+        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
+        ea64dab9222df04ce5694b58ca6ca8b1 \
+        2f8537446ddddc988a6c6f7e638e9302 \
+        d51510d846405b6f50b28e7f4adceee3 \
+        cea2ab386e9cfc2f526693246f944eef \
+        106e83bfd35eb2b8c5ab24219bcc09d5 \
+        cba9ec74557028e2750e2cd633799db5 \
+        c9437ccb4ff091ea4b284e2269255ca7 \
         c900e7dbce808ff8ced375077b17a163 \
         db96b50050277bf05a3c68534bbb9586 \
-        4724370f3179d1ab61f3fd8fa60a2368 \
+        b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
         b44489eb4799c4fabac3fceb48de54f7 \
-        38569b37293d94fc57b6e1449a1c38aa \
-        448a52d21aa942ce2f146425dd810b17 \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        87296707bae851dfed096d30ae254334 \
         38346bab0933c9eb1e36d22fe4220ba7 \
+        00fe128ed361d7cb74d94c97664c3ead \
         5f4fb35a401a86e42e8f99f32848e36e \
-        472e49200cc7c092f99f95464646a3bc"
+        472e49200cc7c092f99f95464646a3bc \
+        12c058b0b34101fb084536ba8298d85d \
+        9f2ecb349c4d62c36b34e250f66d8e31 \
+        fea3d050662a6dd36f4a22aade3594f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/rustup/slack-desc b/development/rustup/slack-desc
index cf2894d763..ce48d3fb62 100644
--- a/development/rustup/slack-desc
+++ b/development/rustup/slack-desc
@@ -12,7 +12,7 @@ rustup: rustup installs The Rust Programming Language from the official
 rustup: release channels, enabling you to easily switch between stable,
 rustup: beta, and nightly compilers and keep them updated.
 rustup:
-rustup: https://github.com/rust-lang/rustup.rs
+rustup: https://github.com/rust-lang/rustup
 rustup:
 rustup:
 rustup:
diff --git a/development/s51dude/README b/development/s51dude/README
index 602c382318..693757b556 100644
--- a/development/s51dude/README
+++ b/development/s51dude/README
@@ -1,9 +1,10 @@
-s51dude is an In-System programming tool specifically designed to be
-used with the usbtinyisp board and the Atmel's 8051 family of micrcontrollers.
+s51dude is an In-System programming tool specifically designed to
+be used with the usbtinyisp board and the Atmel's 8051 family of
+micrcontrollers.
 
-This program is intended to cover the need of the 8051 developer who wants
-to program the devices with computers without parallel or serial port. The
-only alternative left is to use the USB port.
-That is when you will need s51dude.
+This program is intended to cover the need of the 8051 developer who
+wants to program the devices with computers without parallel or serial
+port. The only alternative left is to use the USB port.  That is when
+you will need s51dude.
 
 It's written in C.
diff --git a/development/sam/README b/development/sam/README
index 2b8c5e4fd5..e8d0f25425 100644
--- a/development/sam/README
+++ b/development/sam/README
@@ -1,6 +1,6 @@
 sam -- a fork of the standard text editor for Plan 9 from Bell Labs
 
 sam is a text editor originally written for the Blit graphical terminal
-connected to a machine running 9th Edition Research Unix. It contained many
-useful innovations, the most famous of which was its use of structural regular
-expressions.
+connected to a machine running 9th Edition Research Unix. It contained
+many useful innovations, the most famous of which was its use of
+structural regular expressions.
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 932125a34b..8d505c095f 100644
--- a/development/samurai/samurai.SlackBuild
+++ b/development/samurai/samurai.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for samurai
 
-# Copyright 2018-2019 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.0}
+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 2078a6be1f..0ed81df68c 100644
--- a/development/samurai/samurai.info
+++ b/development/samurai/samurai.info
@@ -1,8 +1,8 @@
 PRGNAM="samurai"
-VERSION="1.0"
+VERSION="1.2"
 HOMEPAGE="https://github.com/michaelforney/samurai"
-DOWNLOAD="https://github.com/michaelforney/samurai/releases/download/1.0/samurai-1.0.tar.gz"
-MD5SUM="5480fe0d7d805fb0ff1bef867d0d762f"
+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 9dd7647909..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.1}
+VERSION=${VERSION:-2.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/sbcl/sbcl.info b/development/sbcl/sbcl.info
index 3e9b42a8d8..13978ef814 100644
--- a/development/sbcl/sbcl.info
+++ b/development/sbcl/sbcl.info
@@ -1,8 +1,8 @@
 PRGNAM="sbcl"
-VERSION="2.0.1"
+VERSION="2.1.3"
 HOMEPAGE="http://www.sbcl.org/"
-DOWNLOAD="http://downloads.sourceforge.net/sbcl/sbcl-2.0.1-source.tar.bz2"
-MD5SUM="6aec0476f6e6f324edc29c6b07d78001"
+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/README b/development/scala/README
index 5b455c545c..c1baafe8c2 100644
--- a/development/scala/README
+++ b/development/scala/README
@@ -1,12 +1,12 @@
-Scala is a functional object-oriented programming language
-compiling to JVM byte code.
+Scala is a functional object-oriented programming language compiling to
+JVM byte code.
 
-This is a binary repackaging of the distribution from the Scala home-page. 
-It sets SCALA_HOME=/usr/lib/scala, MANPATH to include /usr/lib/scala/man,
-and PATH to include /usr/lib/scala/bin.
+This is a binary repackaging of the distribution from the Scala
+home-page.  It sets SCALA_HOME=/usr/lib/scala, MANPATH to include
+/usr/lib/scala/man, and PATH to include /usr/lib/scala/bin.
 
-The installation is like Java Runtime/SDK, in that it places everything by
-default in /usr/lib/scala - including manpages and documentation.
+The installation is like Java Runtime/SDK, in that it places everything
+by default in /usr/lib/scala - including manpages and documentation.
 
 The lib directory is set dependent upon the package architecture:
 /usr/lib on x86 and /usr/lib64 on x86_64.
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/README b/development/sdcc/README
index 9b80f85b51..17bf5e4510 100644
--- a/development/sdcc/README
+++ b/development/sdcc/README
@@ -1,11 +1,13 @@
-SDCC is a retargettable, optimizing Standard C (ANSI C89, ISO C99, ISO C11)
-compiler suite that targets the Intel MCS51 based microprocessors (8031, 8032,
-8051, 8052, etc.), Maxim (formerly Dallas) DS80C390 variants, Freescale
-(formerly Motorola) HC08 based (hc08, s08), Zilog Z80 based MCUs (z80, z180,
-gbz80, Rabbit 2000/3000, Rabbit 3000A, TLCS-90), Padauk (pdk14, pdk15) and
-STMicroelectronics STM8.  Work is in progress on supporting the Padauk (pdk13),
-Microchip PIC16 and PIC18 targets.  It can be retargeted for other
-microprocessors.
+SDCC is a retargettable, optimizing Standard C (ANSI C89, ISO C99, ISO
+C11) compiler suite that targets the Intel MCS51 based microprocessors
+(8031, 8032, 8051, 8052, etc.), Maxim (formerly Dallas) DS80C390
+variants, Freescale (formerly Motorola) HC08 based (hc08, s08), Zilog
+Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit 3000A,
+TLCS-90), Padauk (pdk14, pdk15) and STMicroelectronics STM8.  Work is
+in progress on supporting the Padauk (pdk13), Microchip PIC16 and
+PIC18 targets.  It can be retargeted for other microprocessors.
 
-By default, this will build sdcc without pic support.  If you want that, install
-gputils and run the script as follows:  ENABLE_PIC=y sh ./sdcc.SlackBuild
+By default, this will build sdcc without pic support.  If you want
+that, install gputils and run the script as follows:
+
+ENABLE_PIC=y sh ./sdcc.SlackBuild
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/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/shed/README b/development/shed/README
index dadfeb246b..dc44a7ed31 100644
--- a/development/shed/README
+++ b/development/shed/README
@@ -1,4 +1,4 @@
-Shed is a hex editor written for unix/linux using ncurses, with a friendly
-pico-style interface. Shows data in ascii, hex, dec, oct and binary, and
-allows editing in all of these bases. Features also include searching and
-dumping.
+Shed is a hex editor written for unix/linux using ncurses, with a
+friendly pico-style interface. Shows data in ascii, hex, dec, oct and
+binary, and allows editing in all of these bases. Features also include
+searching and dumping.
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/slack-desc b/development/slibtool/slack-desc
index 5406416ad1..6f7b20034d 100644
--- a/development/slibtool/slack-desc
+++ b/development/slibtool/slack-desc
@@ -12,7 +12,7 @@ slibtool: slibtool is an independent reimplementation of the widely used
 slibtool: libtool, written in C. slibtool is designed to be a clean, fast,
 slibtool: easy-to-use written in C.
 slibtool:
-slibtool: Homepage: https://midipix.org/
+slibtool: Homepage: https://git.foss21.org/slibtool
 slibtool:
 slibtool:
 slibtool:
diff --git a/development/slibtool/slibtool.SlackBuild b/development/slibtool/slibtool.SlackBuild
index 5f0e4abdfa..a42787ec18 100644
--- a/development/slibtool/slibtool.SlackBuild
+++ b/development/slibtool/slibtool.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for slibtool
 
-# Copyright 2017-2018 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.28}
+VERSION=${VERSION:-0.5.33}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,24 +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 {} \;
 
-[ "${DEBUG:=0}" != 0 ] && \
+[ "${DEBUG:=0}" = 0 ] ||
   SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0 -g/')"
 
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --disable-static \
-  --enable-shared \
-  --pkgdurl='https://slackbuilds.org/apps/slibtool/' \
-  --build=$ARCH-slackware-linux
+(
+  mkdir -p build
+  cd build
 
-make
-make install DESTDIR=$PKG
+  CFLAGS="$SLKCFLAGS" \
+  ../configure \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --disable-static \
+    --enable-shared \
+    --pkgdurl='https://slackbuilds.org/apps/slibtool/' \
+    --build=$ARCH-slackware-linux
+
+  make
+  make install DESTDIR=$PKG
+)
 
 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
+  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
diff --git a/development/slibtool/slibtool.info b/development/slibtool/slibtool.info
index 7e43d934ad..fe4bd36888 100644
--- a/development/slibtool/slibtool.info
+++ b/development/slibtool/slibtool.info
@@ -1,8 +1,8 @@
 PRGNAM="slibtool"
-VERSION="0.5.28"
-HOMEPAGE="https://midipix.org/"
-DOWNLOAD="https://midipix.org/dl/slibtool/slibtool-0.5.28.tar.xz"
-MD5SUM="883be5442b95bcc954cc0c82023d9e7f"
+VERSION="0.5.33"
+HOMEPAGE="https://git.foss21.org/slibtool"
+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/smalltalk/README b/development/smalltalk/README
index ab6a1183aa..fb684438bc 100644
--- a/development/smalltalk/README
+++ b/development/smalltalk/README
@@ -1,4 +1,4 @@
-GNU Smalltalk is a free implementation of the Smalltalk-80 language.  It
-runs on most POSIX compatible operating systems (including GNU/Linux, of
-course), as well as under Windows. Smalltalk is a dynamic object-oriented
-language, well-versed to scripting tasks.
+GNU Smalltalk is a free implementation of the Smalltalk-80 language.
+It runs on most POSIX compatible operating systems (including
+GNU/Linux, of course), as well as under Windows. Smalltalk is a dynamic
+object-oriented language, well-versed to scripting tasks.
diff --git a/development/smartsvn/README b/development/smartsvn/README
index 8b93627b02..202a22e744 100644
--- a/development/smartsvn/README
+++ b/development/smartsvn/README
@@ -1,4 +1,5 @@
 SmartSVN is a commercial desktop svn client.
 
-SmartSVN starts with free evaluation mode for the Professional edition for
-30 days and, if not registered, will continue in the free Foundation edition.
+SmartSVN starts with free evaluation mode for the Professional
+edition for 30 days and, if not registered, will continue in the free
+Foundation edition.
diff --git a/development/snack/README b/development/snack/README
index 2f4425e0f7..a7313f98b8 100644
--- a/development/snack/README
+++ b/development/snack/README
@@ -2,10 +2,11 @@ The Snack sound extension adds commands to play and record audio.
 Snack supports in-memory sound objects, file based audio, and
 streaming audio, with background audio processing. It handles
 fileformats such as AIFF, AU, MP3, NIST/Sphere, and WAV.
-Snack is extensible; new commands and sound file formats can
-be added using the Snack C-library. Snack also does sound visualization,
-e.g. waveforms and spectrograms. The visualization canvas item types update
-in real time and can output postscript. Works with Tcl 8.0.3 and later,
-as well as is stubs enabled. Works with the Tcl plug-in.
+
+Snack is extensible; new commands and sound file formats can be
+added using the Snack C-library. Snack also does sound visualization,
+e.g. waveforms and spectrograms. The visualization canvas item types
+update in real time and can output postscript. Works with Tcl 8.0.3
+and later, as well as is stubs enabled. Works with the Tcl plug-in.
 
 Platforms: HP-UX, Irix, Linux, Solaris, Windows 95/98/NT/2000/XP.
diff --git a/development/snappy/73.patch b/development/snappy/73.patch
new file mode 100644
index 0000000000..20f7bfada6
--- /dev/null
+++ b/development/snappy/73.patch
@@ -0,0 +1,23 @@
+From 89342ecf34894461cc64c9cbe3f8bc0d18df5073 Mon Sep 17 00:00:00 2001
+From: "liangyukun.lyk" <lyk19961210@gmail.com>
+Date: Mon, 27 Aug 2018 18:08:46 +0800
+Subject: [PATCH] fix cmake build error
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 41a2124..2a822dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,6 +145,9 @@ if(SNAPPY_BUILD_TESTS)
+   target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
+   target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
+ 
++  if(HAVE_GTEST)
++    target_link_libraries(snappy_unittest gtest)
++  endif(HAVE_GTEST)
+   if(HAVE_LIBZ)
+     target_link_libraries(snappy_unittest z)
+   endif(HAVE_LIBZ)
diff --git a/development/snappy/README b/development/snappy/README
index 0d694cb59e..01f12d35f0 100644
--- a/development/snappy/README
+++ b/development/snappy/README
@@ -1,21 +1,23 @@
-Snappy is a compression/decompression library. It does not aim for maximum
-compression, or compatibility with any other compression library; instead,
-it aims for very high speeds and reasonable compression. For instance,
-compared to the fastest mode of zlib, Snappy is an order of magnitude faster
-for most inputs, but the resulting compressed files are anywhere from 20% to
-100% bigger. (For more information, see "Performance", below.)
+Snappy is a compression/decompression library. It does not aim for
+maximum compression, or compatibility with any other compression
+library; instead, it aims for very high speeds and reasonable
+compression. For instance, compared to the fastest mode of zlib,
+Snappy is an order of magnitude faster for most inputs, but the
+resulting compressed files are anywhere from 20% to 100% bigger. (For
+more information, see "Performance", below.)
 
 Snappy has the following properties:
 
-* Fast: Compression speeds at 250 MB/sec and beyond, with no assembler code.
-See "Performance" below.
-* Stable: Over the last few years, Snappy has compressed and decompressed
-petabytes of data in Google's production environment. The Snappy bitstream
-format is stable and will not change between versions.
-* Robust: The Snappy decompressor is designed not to crash in the face of
-corrupted or malicious input.
-* Free and open source software: Snappy is licensed under a BSD-type license.
-For more information, see the included COPYING file.
+* Fast: Compression speeds at 250 MB/sec and beyond, with no assembler
+  code.  See "Performance" below.
+* Stable: Over the last few years, Snappy has compressed and
+  decompressed petabytes of data in Google's production environment. The
+  Snappy bitstream format is stable and will not change between
+  versions.
+* Robust: The Snappy decompressor is designed not to crash in the face
+  of corrupted or malicious input.
+* Free and open source software: Snappy is licensed under a BSD-type
+  license.  For more information, see the included COPYING file.
 
 Snappy has previously been called "Zippy" in some Google presentations
 and the like.
diff --git a/development/snappy/snappy.SlackBuild b/development/snappy/snappy.SlackBuild
index fcaa12847c..dfdae90c56 100644
--- a/development/snappy/snappy.SlackBuild
+++ b/development/snappy/snappy.SlackBuild
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # Slackware build script for Snappy
-# Written by Mário Antunes (mariolpantunes@gmail.com)
+# Written by Mário Antunes (mariolpantunes@gmail.com)
 
 PRGNAM=snappy
 VERSION=${VERSION:-1.1.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -52,6 +52,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 {} \;
 
+# Fix build with gtest installed
+patch -p1 < $CWD/73.patch
+
 mkdir -p build
 cd build
 cmake \
diff --git a/development/source-highlight/README b/development/source-highlight/README
index 6f34ffa6a7..a4813ef344 100644
--- a/development/source-highlight/README
+++ b/development/source-highlight/README
@@ -1,20 +1,22 @@
 GNU Source-highlight
 
-This program, given a source file, produces a document with syntax highlighting.
-It also provides a C++ highlight library.
+This program, given a source file, produces a document with syntax
+highlighting. It also provides a C++ highlight library.
 
-Source-highlight reads source language specifications dynamically, thus it can
-be  easily  extended  (without  recompiling  the  sources)  for  handling  new
-languages. It also reads output format specifications dynamically, and thus it
-can  be  easily  extended  (without  recompiling the sources) for handling new
-output formats. The syntax for these specifications is quite easy (take a look
-at the manual).
+Source-highlight reads source language specifications dynamically,
+thus it can be easily extended (without recompiling the sources) for
+handling new languages. It also reads output format specifications
+dynamically, and thus it can be easily extended (without recompiling
+the sources) for handling new output formats. The syntax for these
+specifications is quite easy (take a look at the manual).
 
-Source-highlight is a command line program, and it can also be used as a CGI.
+Source-highlight is a command line program, and it can also be used as
+a CGI.
 
-Notice  that  source-highlight  can also be used as a formatter (i.e., without
-highlighting): you  can,  for instance, format a txt file in HTML (and it will
-take care of translating special characters, such as, <, >, &).
+Notice that source-highlight can also be used as a formatter (i.e.,
+without highlighting): you can, for instance, format a txt file in
+HTML (and it will take care of translating special characters, such
+as, <, >, &).
 
 A common example:
   less /usr/src/linux/kernel/panic.c
diff --git a/development/sourcenav/README b/development/sourcenav/README
index 6da1e61239..9663c48374 100644
--- a/development/sourcenav/README
+++ b/development/sourcenav/README
@@ -1,11 +1,12 @@
-Source Navigator NG is a source code analysis tool. With it, you can edit your
-source code, display relationships between classes and functions and members,
-and display call trees.
+Source Navigator NG is a source code analysis tool. With it, you
+can edit your source code, display relationships between classes and
+functions and members, and display call trees.
 
 You can navigate your source code and easily get to declarations or
-implementations of functions, variables and macros (commonly called "symbols")
-which helps you discovering and mapping unknown source code for enhancement or
-maintenance tasks.
+implementations of functions, variables and macros (commonly called
+"symbols") which helps you discovering and mapping unknown source code
+for enhancement or maintenance tasks.
 
-source navigator NG is free software and released under the GPL v2. It is based
-upon the old source navigator and strives to improve usability and performance.
\ No newline at end of file
+source navigator NG is free software and released under the GPL
+v2. It is based upon the old source navigator and strives to improve
+usability and performance.
diff --git a/development/spin/README b/development/spin/README
index 07fe9ae328..4634fd9118 100644
--- a/development/spin/README
+++ b/development/spin/README
@@ -1,4 +1,9 @@
-Spin is a popular open-source software tool, used by thousands of people
-worldwide, that can be used for the formal verification of distributed
-software systems. In April 2002 the tool was awarded the prestigious System
-Software Award for 2001 by the ACM.
+Spin is a popular open-source software tool, used by thousands of
+people worldwide, that can be used for the formal verification of
+distributed software systems. In April 2002 the tool was awarded the
+prestigious System Software Award for 2001 by the ACM.
+
+By default the ispin GUI will not be installed. This may be overridden
+by building with:
+
+`GUI=yes ./spin.SlackBuild`
diff --git a/development/spin/slack-desc b/development/spin/slack-desc
index 6301a1b0b5..021f1d0662 100644
--- a/development/spin/slack-desc
+++ b/development/spin/slack-desc
@@ -13,7 +13,7 @@ spin: people worldwide, that can be used for the formal verification of
 spin: distributed software systems. In April 2002 the tool was awarded the
 spin: prestigious System Software Award for 2001 by the ACM.
 spin:
-spin: http://spinroot.com/
+spin: https://spinroot.com/
 spin:
 spin:
 spin:
diff --git a/development/spin/spin.SlackBuild b/development/spin/spin.SlackBuild
index 01654858f0..01f4cab9a1 100644
--- a/development/spin/spin.SlackBuild
+++ b/development/spin/spin.SlackBuild
@@ -2,8 +2,10 @@
 
 # Slackware build script for spin
 
-# Originally by Jockey S. Kyd (jockey dot kyd at gmail dot com)
+# Samuel Judson | sam@sjudson.com
 
+# Previous maintained by:
+# Jockey S. Kyd (jockey dot kyd at gmail dot com)
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
 
 # This program is free software; you can redistribute it and/or modify
@@ -25,13 +27,13 @@
 # not, see <http://www.gnu.org/licenses/>.
 
 PRGNAM=spin
-VERSION=${VERSION:-6.4.3}
+VERSION=${VERSION:-6.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
@@ -41,9 +43,10 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+CPRGNAM=Spin
 
-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"
@@ -61,8 +64,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM`echo $VERSION | sed 's/\.//g'`.tar.gz
-mv Spin $PRGNAM-$VERSION
+tar xvf $CWD/$CPRGNAM-version-$VERSION.tar.gz
+mv $CPRGNAM-version-$VERSION $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,13 +74,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 {} \;
 
-cd Src$VERSION
+cd Src
 sed -i "s/^CFLAGS=\(.*\)$/CFLAGS=$SLKCFLAGS \1/" makefile
 make -j1
 cd ..
 
-install -Dm 755 Src$VERSION/spin $PKG/usr/bin/spin
-install -Dm 755 iSpin/ispin.tcl $PKG/usr/bin/ispin
+install -Dm 755 Src/spin $PKG/usr/bin/spin
+if [ ${GUI:-"no"} = "yes" ]
+then
+   install -Dm 755 optional_gui/ispin.tcl $PKG/usr/bin/ispin
+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/development/spin/spin.info b/development/spin/spin.info
index 16cd0bd350..983c355009 100644
--- a/development/spin/spin.info
+++ b/development/spin/spin.info
@@ -1,10 +1,10 @@
 PRGNAM="spin"
-VERSION="6.4.3"
-HOMEPAGE="http://spinroot.com/"
-DOWNLOAD="http://spinroot.com/spin/Src/spin643.tar.gz"
-MD5SUM="17eb7f14df3616e25635691967786996"
+VERSION="6.5.2"
+HOMEPAGE="https://spinroot.com/"
+DOWNLOAD="https://github.com/nimble-code/Spin/archive/version-6.5.2/Spin-version-6.5.2.tar.gz"
+MD5SUM="3cdb145fe0f9fd9e1d5695a40974f37b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
+MAINTAINER="Samuel Judson"
+EMAIL="samuel.e.judson@gmail.com"
diff --git a/development/splint/README b/development/splint/README
index 7e2da67c9e..09e24aea7b 100644
--- a/development/splint/README
+++ b/development/splint/README
@@ -1,21 +1,23 @@
-splint is a tool for statically checking C programs for security vulnerabilities
-and programming mistakes. Splint does many of the traditional lint checks
-including unused declarations, type inconsistencies, use before definition,
-unreachable code, ignored return values, execution paths with no return,
-likely infinite loops, and fall through cases.
+splint is a tool for statically checking C programs for security
+vulnerabilities and programming mistakes. Splint does many of
+the traditional lint checks including unused declarations, type
+inconsistencies, use before definition, unreachable code, ignored
+return values, execution paths with no return, likely infinite loops,
+and fall through cases.
 
 More powerful checks are made possible by additional information given
 in source code annotations.  Annotations are stylized comments that
 document assumptions about functions, variables, parameters and types.
-In addition to the checks specifically enabled by annotations, many
-of the traditional lint checks are improved by exploiting this additional
+In addition to the checks specifically enabled by annotations, many of
+the traditional lint checks are improved by exploiting this additional
 information.
 
-As more effort is put into annotating programs, better checking results.
-Splint is designed to be flexible and allow programmers to select
-appropriate points on the effort-benefit curve for particular projects.
-As different checks are turned on and more information is given in code
-annotations the number of bugs that can be detected increases dramatically.
+As more effort is put into annotating programs, better checking
+results.  Splint is designed to be flexible and allow programmers to
+select appropriate points on the effort-benefit curve for particular
+projects.  As different checks are turned on and more information
+is given in code annotations the number of bugs that can be detected
+increases dramatically.
 
 If you want splint to be used as the system default lint, then do this
 after installing splint:
diff --git a/development/spyder/README b/development/spyder/README
index 5eb8f803a2..65c9fe92a3 100644
--- a/development/spyder/README
+++ b/development/spyder/README
@@ -1,6 +1,6 @@
-Spyder (previously known as Pydee) is a powerful interactive development
-environment for the Python language with advanced editing, interactive testing,
-debugging and introspection features.
+Spyder (previously known as Pydee) is a powerful interactive
+development environment for the Python language with advanced editing,
+interactive testing, debugging and introspection features.
 
-Optional dependencies: ipython, rope, matplotlib, numpy, pyflakes, pep8,
-pylint, Sphinx and scipy
+Optional dependencies: ipython, rope, matplotlib, numpy, pyflakes,
+pep8, pylint, Sphinx and scipy
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/sqlitebrowser/sqlitebrowser.SlackBuild b/development/sqlitebrowser/sqlitebrowser.SlackBuild
index 080c6b8463..8c3dcbb554 100644
--- a/development/sqlitebrowser/sqlitebrowser.SlackBuild
+++ b/development/sqlitebrowser/sqlitebrowser.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sqlitebrowser
-VERSION=${VERSION:-3.11.2}
+VERSION=${VERSION:-3.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/sqlitebrowser/sqlitebrowser.info b/development/sqlitebrowser/sqlitebrowser.info
index 831dcd28fb..6b136698bd 100644
--- a/development/sqlitebrowser/sqlitebrowser.info
+++ b/development/sqlitebrowser/sqlitebrowser.info
@@ -1,8 +1,8 @@
 PRGNAM="sqlitebrowser"
-VERSION="3.11.2"
+VERSION="3.10.1"
 HOMEPAGE="http://sqlitebrowser.org/"
-DOWNLOAD="https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.11.2/sqlitebrowser-3.11.2.tar.gz"
-MD5SUM="9991541d1f93ebcd7769ac8e15475c71"
+DOWNLOAD="https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.10.1/sqlitebrowser-3.10.1.tar.gz"
+MD5SUM="66cbe41f9da5be80067942ed3816576c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/development/srcML/README b/development/srcML/README
index 367f53dc00..7bd92b8103 100644
--- a/development/srcML/README
+++ b/development/srcML/README
@@ -1,14 +1,16 @@
-The srcML format is a XML representation for source code, where the markup
-tags identify elements of the abstract syntax for the language. The srcml
-program is a command line application for the conversion of source code to
-srcML, an interface for the exploration, analysis, and manipulation of source
-code in this form, and the conversion of srcML back to source code. The
-current parsing technologies support C/C++, C#, and Java.
+The srcML format is a XML representation for source code, where
+the markup tags identify elements of the abstract syntax for
+the language. The srcml program is a command line application
+for the conversion of source code to srcML, an interface for the
+exploration, analysis, and manipulation of source code in this form,
+and the conversion of srcML back to source code. The current parsing
+technologies support C/C++, C#, and Java.
 
-srcML requires some statically compiled Boost libraries which are not
-available in Slackware's default installation. Thus, the required libraries
-are compiled temporarily according to srcML's documentation but will not be
-installed into your system. Also, srcML's Python binding will not be
-installed.
+srcML requires some statically compiled Boost libraries which are
+not available in Slackware's default installation. Thus, the required
+libraries are compiled temporarily according to srcML's documentation
+but will not be installed into your system. Also, srcML's Python
+binding will not be installed.
 
-To build this its dependency antlr2 must be built against jdk (or openjdk).
+To build this its dependency antlr2 must be built against jdk (or
+openjdk).
diff --git a/development/srecord/README b/development/srecord/README
index 17bbd16c60..17dee609e8 100644
--- a/development/srecord/README
+++ b/development/srecord/README
@@ -1,5 +1,5 @@
 srecord (tools for EPROM load files)
 
 The SRecord package is a collection of powerful tools for manipulating
-EPROM load files. Many file formats are supported, too many to list here.
-See http://srecord.sourceforge.net/ for the full list.
+EPROM load files. Many file formats are supported, too many to list
+here.  See http://srecord.sourceforge.net/ for the full list.
diff --git a/development/staruml/README b/development/staruml/README
index 6d8a7d1724..9d3c5e8cfa 100644
--- a/development/staruml/README
+++ b/development/staruml/README
@@ -1,3 +1,4 @@
-StarUML 2 is compatible with UML 2.x standard and supports totally 11 kinds of
-UML diagrams: Class, Object, Use Case, Component, Deployment, Composite
-Structure, Sequence, Communication, Statechart, Activity and Profile Diagram.
\ No newline at end of file
+StarUML 2 is compatible with UML 2.x standard and supports totally 11
+kinds of UML diagrams: Class, Object, Use Case, Component, Deployment,
+Composite Structure, Sequence, Communication, Statechart, Activity and
+Profile Diagram.
diff --git a/development/svn-all-fast-export/README b/development/svn-all-fast-export/README
index 19e4b606cb..80bb8da26b 100644
--- a/development/svn-all-fast-export/README
+++ b/development/svn-all-fast-export/README
@@ -1,4 +1,5 @@
 svn-all-fast-export aka svn2git
 
-This project contains all the tools required to do a conversion of an svn
-repository (server side, not a checkout) to one or more git repositories.
+This project contains all the tools required to do a conversion of
+an svn repository (server side, not a checkout) to one or more git
+repositories.
diff --git a/development/svn-all-fast-export/svn-all-fast-export.SlackBuild b/development/svn-all-fast-export/svn-all-fast-export.SlackBuild
index 63493a6c07..49bcbecf14 100644
--- a/development/svn-all-fast-export/svn-all-fast-export.SlackBuild
+++ b/development/svn-all-fast-export/svn-all-fast-export.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=svn-all-fast-export
 SRCNAM=svn2git
-VERSION=${VERSION:-1.0.17}
+VERSION=${VERSION:-1.0.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/svn-all-fast-export/svn-all-fast-export.info b/development/svn-all-fast-export/svn-all-fast-export.info
index f15081f052..664551de74 100644
--- a/development/svn-all-fast-export/svn-all-fast-export.info
+++ b/development/svn-all-fast-export/svn-all-fast-export.info
@@ -1,8 +1,8 @@
 PRGNAM="svn-all-fast-export"
-VERSION="1.0.17"
+VERSION="1.0.18"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-DOWNLOAD="https://github.com/svn-all-fast-export/svn2git/archive/1.0.17/svn2git-1.0.17.tar.gz"
-MD5SUM="a1fcfd77803f652768f64fab0ae86b98"
+DOWNLOAD="https://github.com/svn-all-fast-export/svn2git/archive/1.0.18/svn2git-1.0.18.tar.gz"
+MD5SUM="57eccceef1f775202e91df5107c5e15b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/swfmill/README b/development/swfmill/README
index d6f67f7827..0d2b608d91 100644
--- a/development/swfmill/README
+++ b/development/swfmill/README
@@ -1,16 +1,18 @@
-swfmill is an xml2swf and swf2xml processor with import functionalities.
+swfmill is an xml2swf and swf2xml processor with import
+functionalities.
 
-It's most common use is the generation of asset libraries containing
-images (PNG and JPEG), fonts (TTF) or other SWF movies for use with MTASC-
-or haXe-compiled ActionScript, although swfmill can be used to produce
-both simple and complex SWF structures.
+Its most common use is the generation of asset libraries containing
+images (PNG and JPEG), fonts (TTF) or other SWF movies for use with
+MTASC- or haXe-compiled ActionScript, although swfmill can be used to
+produce both simple and complex SWF structures.
 
 * built around an XSLT/EXSLT processor (libxslt)
 
-* input and output of the XSLT transformation can be either XML or binary SWF
+* input and output of the XSLT transformation can be either XML or
+  binary SWF
 
-* XSLT commands for importing PNG, JPEG, TTF and SWF, and for mapping SWF ID
-  numbers
+* XSLT commands for importing PNG, JPEG, TTF and SWF, and for mapping
+  SWF ID numbers
 
-* built-in "simple dialect" to support library creation and building simple
-  SWFs
+* built-in "simple dialect" to support library creation and building
+  simple SWFs
diff --git a/development/swi-prolog/swi-prolog.SlackBuild b/development/swi-prolog/swi-prolog.SlackBuild
index 0ffc6dc4de..9a7ca87992 100644
--- a/development/swi-prolog/swi-prolog.SlackBuild
+++ b/development/swi-prolog/swi-prolog.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=swi-prolog
-VERSION=${VERSION:-8.0.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-8.2.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM=swipl
@@ -73,6 +73,9 @@ find -L . \
 
 # Compatibility with 14.2's version of CMake
 sed -i 's/NATIVE_COMMAND/UNIX_COMMAND/g' packages/odbc/cmake/FindODBC.cmake
+# Respect $LIBDIRSUFFIX
+sed -i "s!lib/\${SWIPL_INSTALL_DIR}!lib${LIBDIRSUFFIX}/\${SWIPL_INSTALL_DIR}!" CMakeLists.txt
+sed -i "s!lib/cmake/swipl!lib${LIBDIRSUFFIX}/cmake/swipl!" CMakeLists.txt
 
 mkdir -p build
 cd build
@@ -95,10 +98,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   LICENSE INSTALL VERSION customize \
   $PKG/usr/doc/$PRGNAM-$VERSION
-ln -s ../../lib/$SRCNAM/doc/Manual $PKG/usr/doc/$PRGNAM-$VERSION/manual
-ln -s ../../lib/$SRCNAM/doc/packages $PKG/usr/doc/$PRGNAM-$VERSION
-ln -s ../../lib/$SRCNAM/demo $PKG/usr/doc/$PRGNAM-$VERSION
-ln -s ../../lib/$SRCNAM/README.md $PKG/usr/doc/$PRGNAM-$VERSION
+ln -s ../../lib${LIBDIRSUFFIX}/$SRCNAM/doc/Manual $PKG/usr/doc/$PRGNAM-$VERSION/manual
+ln -s ../../lib${LIBDIRSUFFIX}/$SRCNAM/doc/packages $PKG/usr/doc/$PRGNAM-$VERSION
+ln -s ../../lib${LIBDIRSUFFIX}/$SRCNAM/demo $PKG/usr/doc/$PRGNAM-$VERSION
+ln -s ../../lib${LIBDIRSUFFIX}/$SRCNAM/README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/swi-prolog/swi-prolog.info b/development/swi-prolog/swi-prolog.info
index 279e7bddb2..fc1af822dc 100644
--- a/development/swi-prolog/swi-prolog.info
+++ b/development/swi-prolog/swi-prolog.info
@@ -1,8 +1,8 @@
 PRGNAM="swi-prolog"
-VERSION="8.0.3"
+VERSION="8.2.1"
 HOMEPAGE="http://www.swi-prolog.org/"
-DOWNLOAD="http://www.swi-prolog.org/download/stable/src/swipl-8.0.3.tar.gz"
-MD5SUM="84a42c3f0ea50448d59bad4db3a3a362"
+DOWNLOAD="https://www.swi-prolog.org/download/stable/src/swipl-8.2.1.tar.gz"
+MD5SUM="c9619dbb1ab7834254d1ad24aee7a26c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/tclvfs/README b/development/tclvfs/README
index 7ee49344b5..f38f7d993d 100644
--- a/development/tclvfs/README
+++ b/development/tclvfs/README
@@ -1,2 +1,2 @@
-The TclVfs project aims to provide an extension to the Tcl language which
-allows Virtual Filesystems to be built using Tcl scripts only.
+The TclVfs project aims to provide an extension to the Tcl language
+which allows Virtual Filesystems to be built using Tcl scripts only.
diff --git a/development/tea/tea.SlackBuild b/development/tea/tea.SlackBuild
index 5145922bb2..66e4126f65 100644
--- a/development/tea/tea.SlackBuild
+++ b/development/tea/tea.SlackBuild
@@ -2,9 +2,8 @@
 
 # Slackware build script for tea
 # Written by Nai (bluedbs@gmail.com)
-
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
-# All rights reserved.
+# Isaac Yu <isaacyu1@isaacyu1.com>
+# Yth | Pont-en-Royans, France | yth@ythogtha.org
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -24,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}
 
@@ -92,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 226e50d7af..f5479a9bc4 100644
--- a/development/tea/tea.info
+++ b/development/tea/tea.info
@@ -1,10 +1,10 @@
 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=""
-MAINTAINER="Isaac Yu"
-EMAIL="isaacyu@isaacyu1.com"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/development/textadept/README b/development/textadept/README
index 0c9b7a9e10..b270b98051 100644
--- a/development/textadept/README
+++ b/development/textadept/README
@@ -1,10 +1,10 @@
-Textadept is a fast, minimalist, and remarkably extensible cross-platform
-text editor for programmers.
+Textadept is a fast, minimalist, and remarkably extensible
+cross-platform text editor for programmers.
 
 Written in a combination of C and Lua and relentlessly optimized for
 speed and minimalism over the years, Textadept is an ideal editor for
-programmers who want endless extensibility without sacrificing speed or
-succumbing to code bloat and featuritis.
+programmers who want endless extensibility without sacrificing speed
+or succumbing to code bloat and featuritis.
 
 The following executables are symlinked from /opt/ to /usr/bin/:
 
diff --git a/development/thread/README b/development/thread/README
index 4c72291b24..e5e95c699c 100644
--- a/development/thread/README
+++ b/development/thread/README
@@ -1,8 +1,11 @@
 Tcl Thread extension.
+
 You can use this extension to gain script-level access to Tcl
 threading capabilities.
-The extension can be used with Tcl cores starting from Tcl8.4 and later.
-Also, this extension supports, i.e. can be used as a loadable module of,
-AOLserver 4.x series of the highly-scalable web server from America Online.
+
+The extension can be used with Tcl cores starting from Tcl8.4 and
+later.  Also, this extension supports, i.e. can be used as a loadable
+module of, AOLserver 4.x series of the highly-scalable web server from
+America Online.
 
 You need to have your Tcl core compiled with "--enable-threads".
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/tig.SlackBuild b/development/tig/tig.SlackBuild
index 1a09002cab..27adcb5319 100644
--- a/development/tig/tig.SlackBuild
+++ b/development/tig/tig.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tig
 
-# Copyright 2014-2018 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=tig
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-2.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/tig/tig.info b/development/tig/tig.info
index 0e8c3b33f8..773fb8d038 100644
--- a/development/tig/tig.info
+++ b/development/tig/tig.info
@@ -1,8 +1,8 @@
 PRGNAM="tig"
-VERSION="2.5.0"
+VERSION="2.5.3"
 HOMEPAGE="https://jonas.github.io/tig/"
-DOWNLOAD="https://github.com/jonas/tig/releases/download/tig-2.5.0/tig-2.5.0.tar.gz"
-MD5SUM="2db8597387743288ae2ebf724434bdd0"
+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 20e8688cbc..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.3.2}
+VERSION=${VERSION:-1.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,14 +81,12 @@ if [ "$ARCH" = "x86_64" ]; then
   patch -p0 < $CWD/tiled_lib64.patch
 fi
 
+qbs setup-qt /usr/bin/qmake-qt5 qt5
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-  qmake-qt5 -r PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} RPATH=no USE_FHS_PLUGIN_PATH=yes
+  qbs profile:qt5 qbs.installPrefix:"/usr" projects.Tiled.useRPaths:false
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-  make
-make install INSTALL_ROOT=$PKG
+qbs 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
diff --git a/development/tiled/tiled.info b/development/tiled/tiled.info
index d86ed6fe20..7dc537b885 100644
--- a/development/tiled/tiled.info
+++ b/development/tiled/tiled.info
@@ -1,10 +1,10 @@
 PRGNAM="tiled"
-VERSION="1.3.2"
+VERSION="1.5.0"
 HOMEPAGE="https://www.mapeditor.org"
-DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.3.2/tiled-1.3.2.tar.gz"
-MD5SUM="d21006a528a30b6bd45f294e4bd4dfad"
+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"
+REQUIRES="qt5 qbs"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"
diff --git a/development/tiled/tiled_lib64.patch b/development/tiled/tiled_lib64.patch
index 660062f45f..4410d5a7f6 100644
--- a/development/tiled/tiled_lib64.patch
+++ b/development/tiled/tiled_lib64.patch
@@ -17,8 +17,8 @@ diff -Naur src/libtiled/pluginmanager.cpp src/libtiled/pluginmanager.cpp
  #elif defined(TILED_PLUGIN_DIR)
      QString pluginPath = QLatin1String(TILED_PLUGIN_DIR);
  #else
--    pluginPath += QLatin1String("/../lib/tiled/plugins");
-+    pluginPath += QLatin1String("/../lib64/tiled/plugins");
+-    pluginPath += QStringLiteral("/../lib/tiled/plugins");
++    pluginPath += QStringLiteral("/../lib64/tiled/plugins");
  #endif
  
      // Load dynamic plugins
diff --git a/development/tkdiff/tkdiff.SlackBuild b/development/tkdiff/tkdiff.SlackBuild
index 72930c907b..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:-4.3.5}
+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-4-3-5}
-TARFILE=${TARFILE:-tkdiff-4-3-5.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 4fdd13bcb7..14b6418f85 100644
--- a/development/tkdiff/tkdiff.info
+++ b/development/tkdiff/tkdiff.info
@@ -1,8 +1,8 @@
 PRGNAM="tkdiff"
-VERSION="4.3.5"
+VERSION="5.1"
 HOMEPAGE="https://sourceforge.net/projects/tkdiff/"
-DOWNLOAD="https://sourceforge.net/projects/tkdiff/files/tkdiff/4.3.5/tkdiff-4-3-5.zip"
-MD5SUM="1a8619f33ef95792b28787fb54dfab30"
+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/tkdnd/README b/development/tkdnd/README
index e590992e87..a769703abc 100644
--- a/development/tkdnd/README
+++ b/development/tkdnd/README
@@ -1,4 +1,4 @@
 The tkdnd family commands provide a Tcl interface to native, platform
-specific drag and drop mechanism. Under unix the drag&drop protocol in use
-is the XDND protocol version 5 (also used by the Qt toolkit, and the KDE
-and GNOME desktops).
+specific drag and drop mechanism. Under unix the drag&drop protocol in
+use is the XDND protocol version 5 (also used by the Qt toolkit, and
+the KDE and GNOME desktops).
diff --git a/development/tora/README b/development/tora/README
index e1c08a248a..e5777babe8 100644
--- a/development/tora/README
+++ b/development/tora/README
@@ -1,7 +1,7 @@
-TOra is an open-source multi-platform database management GUI that supports
-accessing most of the common database platforms in use, including Oracle, MySQL,
-and Postgres, as well as limited support for any target that can be accessed
-through Qt's ODBC support.
+TOra is an open-source multi-platform database management GUI that
+supports accessing most of the common database platforms in use,
+including Oracle, MySQL, and Postgres, as well as limited support for
+any target that can be accessed through Qt's ODBC support.
 
 For Oracle DBMS support, run the script like this,
   ORACLE_HOME=/path/to/oracle/home ./tora.Slackbuild
diff --git a/development/trac/README b/development/trac/README
index 4023016c20..c4b716005e 100644
--- a/development/trac/README
+++ b/development/trac/README
@@ -1,7 +1,8 @@
-Trac is an enhanced wiki and issue tracking system for software development
-projects. Trac uses a minimalistic approach to web-based software project
-management. Our mission is to help developers write great software while
-staying out of the way.  Trac should impose as little as possible on a
-team's established development process and policies.
+Trac is an enhanced wiki and issue tracking system for software
+development projects. Trac uses a minimalistic approach to web-based
+software project management. Our mission is to help developers write
+great software while staying out of the way.  Trac should impose as
+little as possible on a team's established development process and
+policies.
 
 Pygments is optional (provides syntax highlighting).
diff --git a/development/trf/README b/development/trf/README
index 54fa677139..25ece10156 100644
--- a/development/trf/README
+++ b/development/trf/README
@@ -1,5 +1,6 @@
-Trf extends the TCL language at the C-level with so-called ``transformer''
-procedures. With the help of some patches to the core the package is able
-to intercept all read/write operations on designated channels, thus giving
-it the ability to transform the buffer contents as desired. This allows
-things like transparent encryption, compression, charset recoding, etc.
+Trf extends the TCL language at the C-level with so-called 'transformer'
+procedures. With the help of some patches to the core the package is
+able to intercept all read/write operations on designated channels,
+thus giving it the ability to transform the buffer contents as
+desired. This allows things like transparent encryption, compression,
+charset recoding, etc.
diff --git a/development/tweak/README b/development/tweak/README
index 044fe04d59..532a13c0c9 100644
--- a/development/tweak/README
+++ b/development/tweak/README
@@ -1,25 +1,25 @@
 tweak (ncurses-based hex editor)
 
 Tweak is a hex editor. It allows you to edit a file at very low level,
-letting you see the full and exact binary contents of the file. It can be
-useful for modifying binary files such as executables, editing disk or CD
-images, debugging programs that generate binary file formats incorrectly,
-and many other things.
+letting you see the full and exact binary contents of the file. It can
+be useful for modifying binary files such as executables, editing disk
+or CD images, debugging programs that generate binary file formats
+incorrectly, and many other things.
 
-Tweak uses a complex data structure based on B-trees, designed to make
-almost all editing operations extremely fast, even when they are working
-on huge amounts of data.
+Tweak uses a complex data structure based on B-trees, designed to
+make almost all editing operations extremely fast, even when they are
+working on huge amounts of data.
 
 Tweak supports insert mode (not particularly useful if you're editing
 an executable file or a filesystem image, but can be extremely handy in
 other file formats such as PNG).
 
-Cutting, copying and pasting within the file you are editing is extremely
-efficient. No matter how big the chunk of data you are moving around -
-even if it's a 200Mb section of a CD image - Tweak will always perform
-the operation effectively instantly.
+Cutting, copying and pasting within the file you are editing is
+extremely efficient. No matter how big the chunk of data you are moving
+around - even if it's a 200Mb section of a CD image - Tweak will always
+perform the operation effectively instantly.
 
 Tweak supports lazy loading of the input file: rather than sucking it
 all into memory straight away, it simply remembers which parts of the
-editing buffer are copies of which parts of the input file and refers to
-the file on disk when it needs to.
+editing buffer are copies of which parts of the input file and refers
+to the file on disk when it needs to.
diff --git a/development/ucblogo/README b/development/ucblogo/README
index f12f875086..9a548c20a9 100644
--- a/development/ucblogo/README
+++ b/development/ucblogo/README
@@ -1,7 +1,8 @@
-Berkeley Logo is a freeware interpreter written by Brian Harvey along with
-several students (Major contributors are Daniel van Blerkom, Khang Dao,
-Michael Katz, Douglas Orleans, and Sanford Owings.) It's available for
-Unix/Linux, MacOS X, Windows - complete with C source code. A version for
-One Laptop Per Child is also available (and also older version - BLogo -
-is available for MS/PC-DOS). If you think Logo is just a graphics language
-for little kids, check out sample programs that should impress you.
+Berkeley Logo is a freeware interpreter written by Brian Harvey along
+with several students (Major contributors are Daniel van Blerkom,
+Khang Dao, Michael Katz, Douglas Orleans, and Sanford Owings.) It's
+available for Unix/Linux, MacOS X, Windows - complete with C source
+code. A version for One Laptop Per Child is also available (and also
+older version - BLogo - is available for MS/PC-DOS). If you think Logo
+is just a graphics language for little kids, check out sample programs
+that should impress you.
diff --git a/development/uncrustify/README b/development/uncrustify/README
index de25c92f08..7ad777a602 100644
--- a/development/uncrustify/README
+++ b/development/uncrustify/README
@@ -1,5 +1,5 @@
-Uncrustify is a source code beautifier that allows you to banish crusty
-code. It works with C, C++, C#, D, Java, and Pawn and indents (with spaces
-only, tabs and spaces, and tabs only), adds and removes newlines, has a
-high degree of control over operator spacing, aligns code, is extremely
-configurable, and is easy to modify.
+Uncrustify is a source code beautifier that allows you to banish
+crusty code. It works with C, C++, C#, D, Java, and Pawn and indents
+(with spaces only, tabs and spaces, and tabs only), adds and removes
+newlines, has a high degree of control over operator spacing, aligns
+code, is extremely configurable, and is easy to modify.
diff --git a/development/uncrustify/nl_func_leave_one_liners.patch b/development/uncrustify/nl_func_leave_one_liners.patch
deleted file mode 100644
index 60c43119cb..0000000000
--- a/development/uncrustify/nl_func_leave_one_liners.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 06822aa69bf460b5ef0363f2a0cf69ec7a426bda Mon Sep 17 00:00:00 2001
-From: Guy Maurel <g.maurel@agwest.de>
-Date: Fri, 29 Nov 2019 18:04:25 +0100
-Subject: nl_func_leave_one_liners is now completed
-
-Ref. #2561
-
-diff --git a/src/newlines.cpp b/src/newlines.cpp
-index a7db6181..576cd874 100644
---- a/src/newlines.cpp
-+++ b/src/newlines.cpp
-@@ -2782,12 +2782,30 @@ static void newline_func_def_or_call(chunk_t *start)
- 
-          if (tmp_next != nullptr && tmp_next->type != CT_FUNC_CLASS_DEF)
-          {
--            bool   is_proto = (  tmp->parent_type == CT_FUNC_PROTO
--                              || tmp->parent_type == CT_FUNC_CLASS_PROTO);
--            iarf_e a = (is_proto) ?
--                       options::nl_func_proto_type_name() :
--                       (options::nl_func_leave_one_liners()) ?                 // Issue #1511
--                       IARF_IGNORE : options::nl_func_type_name();
-+            chunk_t *closing = chunk_skip_to_match(tmp);
-+            chunk_t *brace   = chunk_get_next_ncnl(closing);
-+            iarf_e  a;                                           // Issue #2561
-+
-+            if (  tmp->parent_type == CT_FUNC_PROTO
-+               || tmp->parent_type == CT_FUNC_CLASS_PROTO)
-+            {
-+               // proto
-+               a = options::nl_func_proto_type_name();
-+            }
-+            else
-+            {
-+               // def
-+
-+               if (  options::nl_func_leave_one_liners()
-+                  && brace->flags.test(PCF_ONE_LINER))                 // Issue #1511
-+               {
-+                  a = IARF_IGNORE;
-+               }
-+               else
-+               {
-+                  a = options::nl_func_type_name();
-+               }
-+            }
- 
-             if (  tmp->flags.test(PCF_IN_CLASS)
-                && (options::nl_func_type_name_class() != IARF_IGNORE))
-diff --git a/tests/config/Issue_2561.cfg b/tests/config/Issue_2561.cfg
-new file mode 100644
-index 00000000..03a40504
---- /dev/null
-+++ b/tests/config/Issue_2561.cfg
-@@ -0,0 +1,5 @@
-+sp_func_def_paren               = force
-+indent_columns                  = 3
-+nl_func_leave_one_liners        = true
-+nl_func_type_name               = force
-+mod_add_long_function_closebrace_comment = 1
-diff --git a/tests/cpp.test b/tests/cpp.test
-index 77797aed..39c7e421 100644
---- a/tests/cpp.test
-+++ b/tests/cpp.test
-@@ -96,6 +96,7 @@
- 30085  nSolve.cfg                           cpp/align_class.cpp
- 30086  align_class-constr.cfg               cpp/align_class-constr.cpp
- 30087  Issue_1511.cfg                       cpp/Issue_1511.cpp
-+30088  Issue_2561.cfg                       cpp/Issue_2561.cpp
- 
- 30090  bug_488.cfg                          cpp/bug_488.cpp
- 30091  bug_472.cfg                          cpp/bug_472.cpp
-diff --git a/tests/expected/cpp/30088-Issue_2561.cpp b/tests/expected/cpp/30088-Issue_2561.cpp
-new file mode 100644
-index 00000000..aa566966
---- /dev/null
-+++ b/tests/expected/cpp/30088-Issue_2561.cpp
-@@ -0,0 +1,11 @@
-+#include <stdio.h>
-+
-+int getFoo () { return foo; }
-+
-+int
-+main (int argc, char *argv[])
-+{
-+   printf("hello world!\n");
-+
-+   return 0;
-+} // main
-diff --git a/tests/input/cpp/Issue_2561.cpp b/tests/input/cpp/Issue_2561.cpp
-new file mode 100644
-index 00000000..15232fc4
---- /dev/null
-+++ b/tests/input/cpp/Issue_2561.cpp
-@@ -0,0 +1,10 @@
-+#include <stdio.h>
-+
-+int getFoo() { return foo; }
-+
-+int main (int argc, char *argv[])
-+{
-+    printf("hello world!\n");
-+
-+    return 0;
-+}
diff --git a/development/uncrustify/uncrustify.SlackBuild b/development/uncrustify/uncrustify.SlackBuild
index 3695cc75b8..97f9a01292 100644
--- a/development/uncrustify/uncrustify.SlackBuild
+++ b/development/uncrustify/uncrustify.SlackBuild
@@ -5,8 +5,8 @@
 # Written by Aleksandar Samardzic <asamardzic@gmail.com>
 
 PRGNAM=uncrustify
-VERSION=${VERSION:-0.70.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.72.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -46,7 +46,6 @@ 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 {} \;
-patch -p1 < $CWD/nl_func_leave_one_liners.patch
 mkdir -p build
 cd build
  cmake \
diff --git a/development/uncrustify/uncrustify.info b/development/uncrustify/uncrustify.info
index d9b16ee9c9..359f2e8b83 100644
--- a/development/uncrustify/uncrustify.info
+++ b/development/uncrustify/uncrustify.info
@@ -1,8 +1,8 @@
 PRGNAM="uncrustify"
-VERSION="0.70.1"
+VERSION="0.72.0"
 HOMEPAGE="http://uncrustify.sourceforge.net/"
-DOWNLOAD="https://github.com/uncrustify/uncrustify/archive/uncrustify-0.70.1/uncrustify-uncrustify-0.70.1.tar.gz"
-MD5SUM="7b018fb343615bdb0c8c1143b89b61da"
+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/unifdef/README b/development/unifdef/README
index c233377f98..f041041cfe 100644
--- a/development/unifdef/README
+++ b/development/unifdef/README
@@ -1,13 +1,14 @@
 unifdef (selectively processes C conditional compilation)
 
-The unifdef utility selectively processes conditional C preprocessor #if
-and #ifdef directives. It removes from a file both the directives and the
-additional text that they delimit, while otherwise leaving the file alone.
+The unifdef utility selectively processes conditional C preprocessor
+#if and #ifdef directives. It removes from a file both the directives
+and the additional text that they delimit, while otherwise leaving the
+file alone.
 
 It is useful for avoiding distractions when studying code that uses
 #ifdef heavily for portability: the author's original motivation was to
 understand xterm's pty handling code. It can be used as a lightweight
 preprocessor; for example the Linux kernel uses unifdef to strip out
 #ifdef __KERNEL__ sections from the headers it exports to userland. You
-can use unifdef with languages other than C; for example UIT, a publisher
-in Cambridge, uses unifdef with LaTeX.
+can use unifdef with languages other than C; for example UIT, a
+publisher in Cambridge, uses unifdef with LaTeX.
diff --git a/development/unittest-cpp/README b/development/unittest-cpp/README
index 26b697b709..804ecfb485 100644
--- a/development/unittest-cpp/README
+++ b/development/unittest-cpp/README
@@ -1,6 +1,8 @@
 UnitTest++ is a lightweight unit testing framework for C++.
-It was designed to do test-driven development on a wide variety of platforms.
-Simplicity, portability, speed, and small footprint are all very important
-aspects of UnitTest++. UnitTest++ is mostly standard C++ and makes minimal use
-of advanced library and language features, which means it should be easily
-portable to just about any platform.
+
+It was designed to do test-driven development on a wide variety
+of platforms.  Simplicity, portability, speed, and small footprint
+are all very important aspects of UnitTest++. UnitTest++ is mostly
+standard C++ and makes minimal use of advanced library and language
+features, which means it should be easily portable to just about any
+platform.
diff --git a/development/universal-ctags/README b/development/universal-ctags/README
index 1affbcfee5..b98099df59 100644
--- a/development/universal-ctags/README
+++ b/development/universal-ctags/README
@@ -1,14 +1,16 @@
-universal-ctags has the objective of continuing the development from
-what existed in the Sourceforge area. Github exuberant-ctags
+universal-ctags has the objective of continuing the development
+from what existed in the Sourceforge area. Github exuberant-ctags
 repository was started by Reza Jelveh and was later moved to the
 universal-ctags organization.
 
-The goal of the project is preparing and maintaining common/unified working
-space where people interested in making ctags better can work
+The goal of the project is preparing and maintaining common/unified
+working space where people interested in making ctags better can work
 together.
 
-Note that the resulting package will overwrite Exuberant Ctags included in
-Slackware's vim package:
+Note that the resulting package will overwrite Exuberant Ctags
+included in Slackware's vim package:
+
 /usr/bin/ctags
 /usr/man/man1/ctags.1.gz (only if rst2man command is available)
-In case you remove this package, you'll need to reinstall vim.
+
+If you remove this package, you'll need to reinstall vim.
diff --git a/development/universal-ctags/universal-ctags.SlackBuild b/development/universal-ctags/universal-ctags.SlackBuild
index 4ee26d231e..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:-09b7cc5}
-GITVERSION=${GITVERSION:-09b7cc507b66c60356cb78e2a364fc7390aea9e0}
+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 ab90836418..c47987c11f 100644
--- a/development/universal-ctags/universal-ctags.info
+++ b/development/universal-ctags/universal-ctags.info
@@ -1,8 +1,8 @@
 PRGNAM="universal-ctags"
-VERSION="09b7cc5"
+VERSION="af30512"
 HOMEPAGE="https://ctags.io/"
-DOWNLOAD="https://download.dlackware.com/hosted-sources/universal-ctags/ctags-09b7cc507b66c60356cb78e2a364fc7390aea9e0.tar.xz"
-MD5SUM="212b57f3ad300212913a62c9f5be2ed2"
+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/urn/README b/development/urn/README
index b731adba10..bb2045f880 100644
--- a/development/urn/README
+++ b/development/urn/README
@@ -2,17 +2,21 @@ Urn is a new language developed by SquidDev, and demhydraz.
 Urn is a Lisp dialect with a focus on minimalism which compiles to Lua.
 
 What?
-* A minimal¹ Lisp implementation, with full support for compile time code execution and macros.
+* A minimal[1] Lisp implementation, with full support for compile time
+  code execution and macros.
 * Support for Lua 5.1, 5.2 and 5.3. Should also work with LuaJIT.
 * Lisp-1 scoping rules (functions and data share the same namespace).
-* Influenced by a whole range of Lisp implementations, including Common Lisp and Clojure.
-* Produces standalone, optimised Lua files: no dependencies on a standard library.
+* Influenced by a whole range of Lisp implementations, including
+  Common Lisp and Clojure.
+* Produces standalone, optimised Lua files: no dependencies on a
+  standard library.
 
-¹: Minimalism is an implementation detail.
+[1]: Minimalism is an implementation detail.
+
+Default urn works with lua 5.1.
+You can set "URN_LUAVER" environment variable to change the lua version.
+Example:
 
-Default urn works with lua 5.1
-you can set "URN_LUAVER" environment variable to change the lua version
-example:
 URN_LUAVER=5.3 for lua 5.3
 URN_LUAVER=jit for luajit
 
diff --git a/development/uz80as/README b/development/uz80as/README
index 1a6a5b60cc..e69e0cf8bf 100644
--- a/development/uz80as/README
+++ b/development/uz80as/README
@@ -1,8 +1,9 @@
 uz80as (Micro Z80 assembler)
 
-uz80as is an assembler for the Zilog Z80 and several other microprocessors.
-It accepts source files with the same syntax accepted by the Telemark Cross
-Assembler (TASM), with only minor differences.
+uz80as is an assembler for the Zilog Z80 and several other
+microprocessors.  It accepts source files with the same syntax
+accepted by the Telemark Cross Assembler (TASM), with only minor
+differences.
 
 Currently, uz80as can assemble for these microprocessors:
   - Z80 family
diff --git a/development/uz80as/uz80as.SlackBuild b/development/uz80as/uz80as.SlackBuild
index d02bbbd8cd..f3647ee810 100644
--- a/development/uz80as/uz80as.SlackBuild
+++ b/development/uz80as/uz80as.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for uz80as
 
-# Copyright 2018 Jorge Giner Cordero
+# Copyright 2020 Jorge Giner Cordero
 # 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=uz80as
-VERSION=${VERSION:-1.10}
+VERSION=${VERSION:-1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/uz80as/uz80as.info b/development/uz80as/uz80as.info
index 44e02a0ade..07f0bafee5 100644
--- a/development/uz80as/uz80as.info
+++ b/development/uz80as/uz80as.info
@@ -1,8 +1,8 @@
 PRGNAM="uz80as"
-VERSION="1.10"
+VERSION="1.11"
 HOMEPAGE="https://jorgicor.niobe.org/uz80as"
-DOWNLOAD="https://jorgicor.niobe.org/uz80as/uz80as-1.10.tar.gz"
-MD5SUM="b53d3286716b9f4798f40ece5ea86010"
+DOWNLOAD="https://jorgicor.niobe.org/uz80as/uz80as-1.11.tar.gz"
+MD5SUM="990e7f4b41358aa42766d917d077f2c7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/vala-12/README b/development/vala-12/README
index 8012129f8e..5fe9e1d676 100644
--- a/development/vala-12/README
+++ b/development/vala-12/README
@@ -1,6 +1,7 @@
-Vala is a new programming language that aims to bring modern programming
-language features to GNOME developers without imposing any additional
-runtime requirements and without using a different ABI compared to
-applications and libraries written in C.
+Vala is a new programming language that aims to bring modern
+programming language features to GNOME developers without imposing
+any additional runtime requirements and without using a different ABI
+compared to applications and libraries written in C.
 
-Note: This version of Vala is obsolete, but is required by Shotwell 0.11.6.
+Note: This version of Vala is obsolete, but is required by Shotwell
+0.11.6.
diff --git a/development/valgrind/valgrind.SlackBuild b/development/valgrind/valgrind.SlackBuild
index 9896b40a59..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.15.0}
+VERSION=${VERSION:-3.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/valgrind/valgrind.info b/development/valgrind/valgrind.info
index a4fe911996..7302656729 100644
--- a/development/valgrind/valgrind.info
+++ b/development/valgrind/valgrind.info
@@ -1,8 +1,8 @@
 PRGNAM="valgrind"
-VERSION="3.15.0"
+VERSION="3.17.0"
 HOMEPAGE="http://www.valgrind.org/"
-DOWNLOAD="http://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2"
-MD5SUM="46e5fbdcbc3502a5976a317a0860a975"
+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/README b/development/velero/README
index 437464e124..2458c83fa6 100644
--- a/development/velero/README
+++ b/development/velero/README
@@ -1,4 +1,5 @@
 velero (Backup and migrate Kubernetes resources and persistent volumes)
 
-Velero is an open source tool to safely backup and restore, perform disaster recovery,
-and migrate Kubernetes cluster resources and persistent volumes.
+Velero is an open source tool to safely backup and restore, perform
+disaster recovery, and migrate Kubernetes cluster resources and
+persistent volumes.
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 c711e0fb5d..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.1}
+VERSION=${VERSION:-1.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/velero/velero.info b/development/velero/velero.info
index 7b34b9ec93..caf957a61f 100644
--- a/development/velero/velero.info
+++ b/development/velero/velero.info
@@ -1,10 +1,10 @@
 PRGNAM="velero"
-VERSION="1.3.1"
+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.1/velero-v1.3.1-linux-amd64.tar.gz"
-MD5SUM_x86_64="af83dfd7e04caea2a99372009cc9570e"
+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/viewvc/README b/development/viewvc/README
index 1ff7941f19..2dfdba10f3 100644
--- a/development/viewvc/README
+++ b/development/viewvc/README
@@ -1,7 +1,7 @@
 ViewVC is a browser interface for CVS and Subversion version control
-repositories. It generates templatized HTML to present navigable directory,
-revision, and change log listings. It can display specific versions of
-files as well as diffs between those versions.
+repositories. It generates templatized HTML to present navigable
+directory, revision, and change log listings. It can display specific
+versions of files as well as diffs between those versions.
 
 Installing Pygments (available on SlackBuilds) will improve your ViewVC
 experience (highlighting changes)
diff --git a/development/vis/README b/development/vis/README
index ca27ca97fd..ed29e9d1aa 100644
--- a/development/vis/README
+++ b/development/vis/README
@@ -1,8 +1,9 @@
 vis (vi-like editor based on Plan 9's structural regular expressions)
 
-Vis aims to be a modern, legacy free, simple yet efficient editor combining the
-strengths of both vi(m) and sam. It extends vi's modal editing with built-in
-support for multiple cursors/selections and combines it with sam's structural
-regular expression based command language. As an universal editor it has decent
-Unicode support and should cope with arbitrary files including: large, binary
-or single-line ones.
+Vis aims to be a modern, legacy free, simple yet efficient editor
+combining the strengths of both vi(m) and sam. It extends vi's modal
+editing with built-in support for multiple cursors/selections and
+combines it with sam's structural regular expression based command
+language. As an universal editor it has decent Unicode support
+and should cope with arbitrary files including: large, binary or
+single-line ones.
diff --git a/development/vispatch/README b/development/vispatch/README
index 68398fbf13..bc82a83575 100644
--- a/development/vispatch/README
+++ b/development/vispatch/README
@@ -3,14 +3,14 @@ glquake. Original quake didn't have their maps water-vis'ed, so people
 did that by themselves and prepared patch data files. This tool is used
 for preparing and applying those patch files.
 
-At the time this tool was written, re-vis'ing maps took a lot of time, but
-applying a vispatch took less than minutes, so this was a necessity. Even
-today, if people don't want going into a 'complex' job of vising, this
-tool comes as a great convenience because there are a lot of vispatch
-data files around.
+At the time this tool was written, re-vis'ing maps took a lot of
+time, but applying a vispatch took less than minutes, so this was a
+necessity. Even today, if people don't want going into a 'complex' job
+of vising, this tool comes as a great convenience because there are a
+lot of vispatch data files around.
 
-This is a revised version of Andy Bay's 1.2a source code for unix (linux,
-freebsd, ...), as well as windows. It fixes a number of compilation
-issues, crashes and some other bugs, and resolves endianness issues. The
-source code is licensed under GPLv2, and is maintained here with
-portability in mind.
+This is a revised version of Andy Bay's 1.2a source code for unix
+(linux, freebsd, ...), as well as windows. It fixes a number of
+compilation issues, crashes and some other bugs, and resolves
+endianness issues. The source code is licensed under GPLv2, and is
+maintained here with portability in mind.
diff --git a/development/vscode-bin/vscode-bin.SlackBuild b/development/vscode-bin/vscode-bin.SlackBuild
index 0c3118b0bd..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.43.2}
-SRCVER=1585036655
+VERSION=${VERSION:-1.55.0}
+SRCVER=1617120964
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,7 +48,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf VSCode-linux-x64
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-x64-$SRCVER.tar.gz
 cd VSCode-linux-x64
 chown -R root:root .
 find -L . \
diff --git a/development/vscode-bin/vscode-bin.info b/development/vscode-bin/vscode-bin.info
index f2213b94ec..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.43.2"
+VERSION="1.55.0"
 HOMEPAGE="https://code.visualstudio.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://az764295.vo.msecnd.net/stable/0ba0ca52957102ca3527cf479571617f0de6ed50/code-stable-1585036655.tar.gz"
-MD5SUM_x86_64="c7d1ece00ccd9d329191859107252794"
+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/development/vscodium/doinst.sh b/development/vscodium/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/development/vscodium/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/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/development/vscodium/vscodium.SlackBuild b/development/vscodium/vscodium.SlackBuild
new file mode 100644
index 0000000000..c630053dbd
--- /dev/null
+++ b/development/vscodium/vscodium.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for vscodium
+
+# Copyright 2021 rc-05 <rc23@email.it>
+# 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=vscodium
+VERSION=${VERSION:-1.54.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
+
+# 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}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+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 \
+  -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/opt/$PRGNAM $PKG/usr/bin
+mv * $PKG/opt/$PRGNAM
+
+mkdir -p $PKG/usr/share/applications
+cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
+
+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
+
+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/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/README b/development/vstudio/README
index 61e66c4564..a3fd87e745 100644
--- a/development/vstudio/README
+++ b/development/vstudio/README
@@ -2,15 +2,15 @@ Valentina Studio is the best way to transform your data into meaningful
 information; create, administer, query and explore Valentina DB, MySQL,
 Postgre and SQLite databases for free on 32/64 bit Slackware Linux.
 
-Valentina Studio Key Features
-Powerful, easy to use and free. Create, edit, query, import and administer
-popular databases: Valentina DB, MySQL, Postgre and SQLite with help of
-the following tools:
+Valentina Studio Key Features: Powerful, easy to use and free. Create,
+edit, query, import and administer popular databases: Valentina DB,
+MySQL, Postgre and SQLite with help of the following tools:
 
 - Schema Editor
 - Data Editor
 - SQL Editor
 - Server Administrator
-- Utilities to diagnose, compress, clone, defragment, reindex and dump data.
+- Utilities to diagnose, compress, clone, defragment, reindex and dump
+  data.
 
 Note: You need to request a free license to use this software
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/README b/development/watchman/README
index 10ef045b50..e55abe1ff9 100644
--- a/development/watchman/README
+++ b/development/watchman/README
@@ -3,8 +3,8 @@ trigger actions (such as rebuilding assets) when matching files change.
 
 Concepts:
 
-- Watchman can recursively watch one or more directory trees (we call them
-  roots).
+- Watchman can recursively watch one or more directory trees (we call
+  them roots).
 
 - Watchman does not follow symlinks. It knows they exist, but they show
   up the same as any other file in its reporting.
@@ -20,3 +20,7 @@ Concepts:
   current state of the tree.
 
 - You can subscribe to file changes that occur in a root.
+
+Note: this is not the latest version of watchman. Newer versions
+require newer libraries than Slackware 14.2 has, so this build can't
+be upgraded.
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 0d0565fcfc..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="http://urchlay.naptime.net/~urchlay/src/xa-2.3.10.tar.gz \
-          http://urchlay.naptime.net/~urchlay/src/dxa-0.1.4.tar.gz"
-MD5SUM="14265129071922dd964d89599775d13e \
+DOWNLOAD="https://slackware.uk/~urchlay/src/xa-2.3.11.tar.gz \
+          https://slackware.uk/~urchlay/src/dxa-0.1.4.tar.gz"
+MD5SUM="72cbd5619f75b0c9839b90c41d0f9ea6 \
         3a7993751bcb94e5f9081cc2f27eee1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/xdebug/README b/development/xdebug/README
index 46446b1b66..8f44e093f7 100644
--- a/development/xdebug/README
+++ b/development/xdebug/README
@@ -1,21 +1,22 @@
 xdebug (A PHP extension for debugging PHP scripts)
 
-The Xdebug extension helps you debugging your script by providing a lot of
-valuable debug information.  The debug information that Xdebug can provide
-includes the following: stack traces and function traces in error messages,
-memory allocation and protection for infinite recursions. Xdebug also
-provides profiling information for PHP, scripts, code coverage analysis and
-capabilities to debug PHP scripts interactively with a debug client.
+The Xdebug extension helps you debugging your script by providing a
+lot of valuable debug information.  The debug information that Xdebug
+can provide includes the following: stack traces and function traces
+in error messages, memory allocation and protection for infinite
+recursions. Xdebug also provides profiling information for PHP,
+scripts, code coverage analysis and capabilities to debug PHP scripts
+interactively with a debug client.
 
 Once you've installed xdebug, uncomment the following line in
 /etc/php.d/xdebug.ini:
 
 ; zend_extension = "/usr/lib/php/extensions/xdebug.so"
 
-Restart your webserver if you're using php with it, and as a recomendation
-from xdebug's README: "Write a PHP page that calls "phpinfo();" Load it
-in a browser and look for the info on the xdebug module. If you see it,
-you have been successful!"
+Restart your webserver if you're using php with it, and as a
+recomendation from xdebug's README: "Write a PHP page that calls
+"phpinfo();" Load it in a browser and look for the info on the xdebug
+module. If you see it, you have been successful!"
 
 Note that some of xdebug's functionality may be dependent on php core
 configuration settings.
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/README b/development/xnedit/README
index 6c53d065c0..5734176c5a 100644
--- a/development/xnedit/README
+++ b/development/xnedit/README
@@ -1,4 +1,4 @@
 XNEdit (text editor with GUI, unicode support and AA text rendering)
 
-A fast and classic X11 text editor, based on NEdit, with full unicode support
-and antialiased text rendering.
+A fast and classic X11 text editor, based on NEdit, with full unicode
+support and antialiased text rendering.
diff --git a/development/xnedit/xnedit.SlackBuild b/development/xnedit/xnedit.SlackBuild
index a7ccff0e0a..f726d0cf63 100644
--- a/development/xnedit/xnedit.SlackBuild
+++ b/development/xnedit/xnedit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xnedit
 
-# Copytight 2019 Qunying Zhu <zhu.qunying@gmail.com>
+# Copyright 2019-2020 Qunying Zhu <zhu.qunying@gmail.com>
 # Copyright 2017 Alessandro Pittaluga <agp@pittux.com>
 # All rights reserved.
 
@@ -26,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xnedit
-VERSION=${VERSION:-1.1.1}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/xnedit/xnedit.info b/development/xnedit/xnedit.info
index f87b063897..db1e781a84 100644
--- a/development/xnedit/xnedit.info
+++ b/development/xnedit/xnedit.info
@@ -1,8 +1,8 @@
 PRGNAM="xnedit"
-VERSION="1.1.1"
+VERSION="1.2.2"
 HOMEPAGE="https://sourceforge.net/projects/xnedit/"
-DOWNLOAD="https://sourceforge.net/projects/xnedit/files/xnedit-1.1.1.tar.gz"
-MD5SUM="f092f6e51cbb31fdd997f6fdd1dfba34"
+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/xvi/README b/development/xvi/README
index 5f9fc07d60..c64957a55f 100644
--- a/development/xvi/README
+++ b/development/xvi/README
@@ -6,8 +6,8 @@ Atari ST, but has been ported to many platforms. In spite of its name,
 there is, as yet, no X-Windows-specific version of it.
 
 It uses text windows separated by horizontal status lines on character
-mode displays and the windows may represent different files being edited,
-or different views on to the same file.
+mode displays and the windows may represent different files being
+edited, or different views on to the same file.
 
 Two environment variables are supported:
 
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/development/yarn/README b/development/yarn/README
index 0fd6098603..0653c56ec7 100644
--- a/development/yarn/README
+++ b/development/yarn/README
@@ -1,5 +1,5 @@
 yarn is a fast, reliable, and secure dependency management.
 
 It allows you to use and share code with other developers from around
-the world. Yarn does this quickly, securely, and reliably so you don't ever
-have to worry.
+the world. Yarn does this quickly, securely, and reliably so you don't
+ever have to worry.
diff --git a/development/yarn/yarn.SlackBuild b/development/yarn/yarn.SlackBuild
index b4da0a882f..fccad85687 100644
--- a/development/yarn/yarn.SlackBuild
+++ b/development/yarn/yarn.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yarn
-VERSION=${VERSION:-1.22.4}
+VERSION=${VERSION:-1.22.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/yarn/yarn.info b/development/yarn/yarn.info
index af731ea5b0..20966c4dc8 100644
--- a/development/yarn/yarn.info
+++ b/development/yarn/yarn.info
@@ -1,8 +1,8 @@
 PRGNAM="yarn"
-VERSION="1.22.4"
+VERSION="1.22.10"
 HOMEPAGE="https://yarnpkg.com/"
-DOWNLOAD="https://github.com/yarnpkg/yarn/releases/download/v1.22.4/yarn-v1.22.4.tar.gz"
-MD5SUM="faf483d50aa8ccbdc802efa0cac5d4d3"
+DOWNLOAD="https://github.com/yarnpkg/yarn/releases/download/v1.22.10/yarn-v1.22.10.tar.gz"
+MD5SUM="52e8dbe9d0cb90683dd3ee2ebf2becb8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nodejs"
diff --git a/development/z88dk/README b/development/z88dk/README
index a6f364f987..11ce6369c4 100644
--- a/development/z88dk/README
+++ b/development/z88dk/README
@@ -1,12 +1,13 @@
 z88dk (C cross compiler targetting the Z80)
 
 z88dk is a z80 C cross compiler supplied with an assembler/linker and
-a set of libraries implementing the C standard library for a number of
-different z80 based machines. The name z88dk originates from the time when
-the project was founded and targetted only the Cambridge z88 portable.
+a set of libraries implementing the C standard library for a number
+of different z80 based machines. The name z88dk originates from the
+time when the project was founded and targetted only the Cambridge z88
+portable.
 
-Very little documentation is shipped with z88dk, and what's present is
-often outdated. For more extensive and updated docs, see the z88dk wikis:
+Very little documentation is shipped with z88dk, and what's present
+is often outdated. For more extensive and updated docs, see the z88dk
+wikis:
 
-https://github.com/z88dk/z88dk/wiki
-https://www.z88dk.org/wiki/doku.php
+https://github.com/z88dk/z88dk/wiki https://www.z88dk.org/wiki/doku.php
diff --git a/development/zeal/README b/development/zeal/README
index 43c7ef16c0..37aea3658a 100644
--- a/development/zeal/README
+++ b/development/zeal/README
@@ -1,7 +1,7 @@
 Zeal (a simple offline documentation browser inspired by Dash)
 
-Offline documentation browser inspired by Dash (http://kapeli.com/dash/),
-available for Linux and Windows.
+Offline documentation browser inspired by Dash
+(http://kapeli.com/dash/), available for Linux and Windows.
 
 - Quickly search documentation using Alt+Space (or customised) hotkey
   to display Zeal from any place in your workspace
diff --git a/development/zope.interface/README b/development/zope.interface/README
index 9b2eaba0cb..5a3a80081e 100644
--- a/development/zope.interface/README
+++ b/development/zope.interface/README
@@ -1,4 +1,5 @@
 ZOPE Interfaces are a mechanism for labeling objects as conforming to a
 given API or contract.
 
-zope.testing is an optional dependency if you want to run the test suite.
+zope.testing is an optional dependency if you want to run the test
+suite.
diff --git a/games/0ad-data/0ad-data.SlackBuild b/games/0ad-data/0ad-data.SlackBuild
index 4d84bd6605..ab69ec266e 100644
--- a/games/0ad-data/0ad-data.SlackBuild
+++ b/games/0ad-data/0ad-data.SlackBuild
@@ -2,6 +2,7 @@
 #
 # Slackware build script for 0 A.D. Data
 #
+# Copyright 2020 Tim Dickson, Scotland
 # Copyright 2016-2017 Reedych <reedych@ya.ru>
 # Copyright 2010-2015  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
@@ -25,7 +26,7 @@
 
 PRGNAM=0ad-data
 DATANAM=0ad
-VERSION=${VERSION:-0.0.21}
+VERSION=${VERSION:-0.0.23b}
 RELEASE=${RELEASE:-alpha}
 ARCH=noarch
 BUILD=${BUILD:-1}
diff --git a/games/0ad-data/0ad-data.info b/games/0ad-data/0ad-data.info
index 375d4d178f..1a3dd341a6 100644
--- a/games/0ad-data/0ad-data.info
+++ b/games/0ad-data/0ad-data.info
@@ -1,10 +1,10 @@
 PRGNAM="0ad-data"
-VERSION="0.0.21"
+VERSION="0.0.23b"
 HOMEPAGE="https://play0ad.com/"
-DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.21-alpha-unix-data.tar.xz"
-MD5SUM="d42b04e1f65d45b5a4bbf8fcea6076f8"
+DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.23b-alpha-unix-data.tar.xz"
+MD5SUM="4eee6b207892552cd3e0a408b15c191d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Reedych"
-EMAIL="reedych@ya.ru"
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild
index 524b16e406..514f61c116 100644
--- a/games/0ad/0ad.SlackBuild
+++ b/games/0ad/0ad.SlackBuild
@@ -2,6 +2,7 @@
 #
 # Slackware build script for 0.A.D.
 #
+# Copyright 2020 Tim Dickson, Scotland
 # Copyright 2016-2017 Reedych <reedych@ya.ru>
 # Copyright 2010-2016  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
@@ -24,9 +25,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=0ad
-VERSION=${VERSION:-0.0.21}
+VERSION=${VERSION:-0.0.23b}
 RELEASE=${RELEASE:-alpha}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -56,7 +57,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -eu
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -80,9 +81,14 @@ export LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
 # Fix boost names
 sed -i 's/-mt//g' build/premake/extern_libs4.lua
 
+#allow for ATLAS to be yes.
+[ "x$ATLAS" = "xyes" ]&& ATLAS="enable"
 # build/workspaces/update-workspaces.sh
 #   have a root check, let's disable it.
 patch -p1 < $CWD/disable-root-check.patch
+#apply a segfault fixing patch
+#sourced from https://code.wildfiregames.com/file/data/nryu3qhun4v6uroyiqoc/PHID-FILE-osgvknec7zmfuja5xqq4/D1852.diff
+patch -p2 < $CWD/D1852.diff
 
 build/workspaces/update-workspaces.sh \
   --bindir=/usr/games \
diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info
index 97bc6ce2ac..848b05848e 100644
--- a/games/0ad/0ad.info
+++ b/games/0ad/0ad.info
@@ -1,10 +1,10 @@
 PRGNAM="0ad"
-VERSION="0.0.21"
+VERSION="0.0.23b"
 HOMEPAGE="https://play0ad.com/"
-DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.21-alpha-unix-build.tar.xz"
-MD5SUM="095eade8c9b3deaf25d0d7fa423ff860"
+DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.23b-alpha-unix-build.tar.xz"
+MD5SUM="4fa111410ea55de7a013406ac1013668"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="0ad-data OpenAL enet gloox miniupnpc SDL2"
-MAINTAINER="Reedych"
-EMAIL="reedych@ya.ru"
+REQUIRES="0ad-data OpenAL enet gloox miniupnpc SDL2 libsodium"
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
diff --git a/games/0ad/D1852.diff b/games/0ad/D1852.diff
new file mode 100644
index 0000000000..131c8210a0
--- /dev/null
+++ b/games/0ad/D1852.diff
@@ -0,0 +1,213 @@
+Index: ps/trunk/source/ps/Replay.cpp
+===================================================================
+--- ps/trunk/source/ps/Replay.cpp
++++ ps/trunk/source/ps/Replay.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2018 Wildfire Games.
++/* Copyright (C) 2019 Wildfire Games.
+  * This file is part of 0 A.D.
+  *
+  * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -72,7 +72,7 @@
+ 	JS::RootedValue mods(cx, Mod::GetLoadedModsWithVersions(m_ScriptInterface));
+ 	m_ScriptInterface.SetProperty(attribs, "mods", mods);
+ 
+-	m_Directory = createDateIndexSubdirectory(VisualReplay::GetDirectoryName());
++	m_Directory = createDateIndexSubdirectory(VisualReplay::GetDirectoryPath());
+ 	debug_printf("Writing replay to %s\n", m_Directory.string8().c_str());
+ 
+ 	m_Stream = new std::ofstream(OsString(m_Directory / L"commands.txt").c_str(), std::ofstream::out | std::ofstream::trunc);
+Index: ps/trunk/source/ps/VisualReplay.h
+===================================================================
+--- ps/trunk/source/ps/VisualReplay.h
++++ ps/trunk/source/ps/VisualReplay.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2017 Wildfire Games.
++/* Copyright (C) 2019 Wildfire Games.
+  * This file is part of 0 A.D.
+  *
+  * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -29,12 +29,20 @@
+ {
+ 
+ /**
+- * Returns the path to the sim-log directory (that contains the directories with the replay files.
+- *
+- * @param scriptInterface - the ScriptInterface in which to create the return data.
+- * @return OsPath the absolute file path
++ * Returns the absolute path to the sim-log directory (that contains the directories with the replay files.
++ */
++OsPath GetDirectoryPath();
++
++/**
++ * Returns the absolute path to the replay cache file.
++ */
++OsPath GetCacheFilePath();
++
++/**
++ * Returns the absolute path to the temporary replay cache file used to
++ * always have a valid cache file in place even if bad things happen.
+  */
+-OsPath GetDirectoryName();
++OsPath GetTempCacheFilePath();
+ 
+ /**
+  * Replays the commands.txt file in the given subdirectory visually.
+Index: ps/trunk/source/ps/VisualReplay.cpp
+===================================================================
+--- ps/trunk/source/ps/VisualReplay.cpp
++++ ps/trunk/source/ps/VisualReplay.cpp
+@@ -40,13 +40,19 @@
+  */
+ const u8 minimumReplayDuration = 3;
+ 
+-static const OsPath tempCacheFileName = VisualReplay::GetDirectoryName() / L"replayCache_temp.json";
+-static const OsPath cacheFileName = VisualReplay::GetDirectoryName() / L"replayCache.json";
++OsPath VisualReplay::GetDirectoryPath()
++{
++	return Paths(g_args).UserData() / "replays" / engine_version;
++}
++
++OsPath VisualReplay::GetCacheFilePath()
++{
++	return GetDirectoryPath() / L"replayCache.json";
++}
+ 
+-OsPath VisualReplay::GetDirectoryName()
++OsPath VisualReplay::GetTempCacheFilePath()
+ {
+-	const Paths paths(g_args);
+-	return OsPath(paths.UserData() / "replays" / engine_version);
++	return GetDirectoryPath() / L"replayCache_temp.json";
+ }
+ 
+ bool VisualReplay::StartVisualReplay(const OsPath& directory)
+@@ -55,7 +61,7 @@
+ 	ENSURE(!g_NetClient);
+ 	ENSURE(!g_Game);
+ 
+-	const OsPath replayFile = VisualReplay::GetDirectoryName() / directory / L"commands.txt";
++	const OsPath replayFile = VisualReplay::GetDirectoryPath() / directory / L"commands.txt";
+ 
+ 	if (!FileExists(replayFile))
+ 		return false;
+@@ -69,10 +75,10 @@
+ 	JSContext* cx = scriptInterface.GetContext();
+ 	JSAutoRequest rq(cx);
+ 
+-	if (!FileExists(cacheFileName))
++	if (!FileExists(GetCacheFilePath()))
+ 		return false;
+ 
+-	std::ifstream cacheStream(OsString(cacheFileName).c_str());
++	std::ifstream cacheStream(OsString(GetCacheFilePath()).c_str());
+ 	CStr cacheStr((std::istreambuf_iterator<char>(cacheStream)), std::istreambuf_iterator<char>());
+ 	cacheStream.close();
+ 
+@@ -85,7 +91,7 @@
+ 	}
+ 
+ 	LOGWARNING("The replay cache file is corrupted, it will be deleted");
+-	wunlink(cacheFileName);
++	wunlink(GetCacheFilePath());
+ 	return false;
+ }
+ 
+@@ -95,12 +101,12 @@
+ 	JSAutoRequest rq(cx);
+ 
+ 	JS::RootedValue replaysRooted(cx, JS::ObjectValue(*replays));
+-	std::ofstream cacheStream(OsString(tempCacheFileName).c_str(), std::ofstream::out | std::ofstream::trunc);
++	std::ofstream cacheStream(OsString(GetTempCacheFilePath()).c_str(), std::ofstream::out | std::ofstream::trunc);
+ 	cacheStream << scriptInterface.StringifyJSON(&replaysRooted);
+ 	cacheStream.close();
+ 
+-	wunlink(cacheFileName);
+-	if (wrename(tempCacheFileName, cacheFileName))
++	wunlink(GetCacheFilePath());
++	if (wrename(GetTempCacheFilePath(), GetCacheFilePath()))
+ 		LOGERROR("Could not store the replay cache");
+ }
+ 
+@@ -139,7 +145,7 @@
+ 	JS::RootedObject replays(cx, JS_NewArrayObject(cx, 0));
+ 	DirectoryNames directories;
+ 
+-	if (GetDirectoryEntries(GetDirectoryName(), nullptr, &directories) != INFO::OK)
++	if (GetDirectoryEntries(GetDirectoryPath(), nullptr, &directories) != INFO::OK)
+ 		return replays;
+ 
+ 	bool newReplays = false;
+@@ -155,7 +161,7 @@
+ 			// Don't return, because we want to save our progress
+ 			break;
+ 
+-		const OsPath replayFile = GetDirectoryName() / directory / L"commands.txt";
++		const OsPath replayFile = GetDirectoryPath() / directory / L"commands.txt";
+ 
+ 		bool isNew = true;
+ 		replayCacheMap::iterator it = fileList.find(directory);
+@@ -325,7 +331,7 @@
+ JS::Value VisualReplay::LoadReplayData(const ScriptInterface& scriptInterface, const OsPath& directory)
+ {
+ 	// The directory argument must not be constant, otherwise concatenating will fail
+-	const OsPath replayFile = GetDirectoryName() / directory / L"commands.txt";
++	const OsPath replayFile = GetDirectoryPath() / directory / L"commands.txt";
+ 
+ 	if (!FileExists(replayFile))
+ 		return JS::NullValue();
+@@ -407,7 +413,7 @@
+ 	if (replayDirectory.empty())
+ 		return false;
+ 
+-	const OsPath directory = GetDirectoryName() / replayDirectory;
++	const OsPath directory = GetDirectoryPath() / replayDirectory;
+ 	return DirectoryExists(directory) && DeleteDirectory(directory) == INFO::OK;
+ }
+ 
+@@ -420,7 +426,7 @@
+ 	pCxPrivate->pScriptInterface->Eval("({})", &attribs);
+ 
+ 	// Return empty object if file doesn't exist
+-	const OsPath replayFile = GetDirectoryName() / directoryName / L"commands.txt";
++	const OsPath replayFile = GetDirectoryPath() / directoryName / L"commands.txt";
+ 	if (!FileExists(replayFile))
+ 		return attribs;
+ 
+@@ -483,7 +489,7 @@
+ 
+ bool VisualReplay::HasReplayMetadata(const OsPath& directoryName)
+ {
+-	const OsPath filePath(GetDirectoryName() / directoryName / L"metadata.json");
++	const OsPath filePath(GetDirectoryPath() / directoryName / L"metadata.json");
+ 
+ 	if (!FileExists(filePath))
+ 		return false;
+@@ -503,7 +509,7 @@
+ 	JSAutoRequest rq(cx);
+ 	JS::RootedValue metadata(cx);
+ 
+-	std::ifstream* stream = new std::ifstream(OsString(GetDirectoryName() / directoryName / L"metadata.json").c_str());
++	std::ifstream* stream = new std::ifstream(OsString(GetDirectoryPath() / directoryName / L"metadata.json").c_str());
+ 	ENSURE(stream->good());
+ 	CStr line;
+ 	std::getline(*stream, line);
+Index: ps/trunk/source/ps/scripting/JSInterface_VisualReplay.cpp
+===================================================================
+--- ps/trunk/source/ps/scripting/JSInterface_VisualReplay.cpp
++++ ps/trunk/source/ps/scripting/JSInterface_VisualReplay.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2018 Wildfire Games.
++/* Copyright (C) 2019 Wildfire Games.
+  * This file is part of 0 A.D.
+  *
+  * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -61,7 +61,7 @@
+ 
+ CStrW JSI_VisualReplay::GetReplayDirectoryName(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const CStrW& directoryName)
+ {
+-	return wstring_from_utf8(OsPath(VisualReplay::GetDirectoryName() / directoryName).string8());
++	return wstring_from_utf8(OsPath(VisualReplay::GetDirectoryPath() / directoryName).string8());
+ }
+ 
+ void JSI_VisualReplay::RegisterScriptFunctions(const ScriptInterface& scriptInterface)
diff --git a/games/0ad/README b/games/0ad/README
index 1f7344ab01..8af134503e 100644
--- a/games/0ad/README
+++ b/games/0ad/README
@@ -1,5 +1,8 @@
 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
 real-time strategy (RTS) game of ancient warfare.
 
-To include the Atlas editor, which requires wxPython:
+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/4digits/README b/games/4digits/README
index ce87c6da70..d9dde8ee03 100644
--- a/games/4digits/README
+++ b/games/4digits/README
@@ -1,3 +1,5 @@
 4digits is a guess-the-number puzzle game.
-It's also called Bulls and Cows, and in China people simply call it Guess-the-Number.
-The game's objective is to guess a four-digit number in 8 times.
+
+It's also called Bulls and Cows, and in China people simply call
+it Guess-the-Number.  The game's objective is to guess a four-digit
+number in 8 tries.
diff --git a/games/4do-libretro/4do-libretro.info b/games/4do-libretro/4do-libretro.info
index b738170ab0..15fd0c53e4 100644
--- a/games/4do-libretro/4do-libretro.info
+++ b/games/4do-libretro/4do-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="28e12061c358882e436dbbeeb6c63c16"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/7kaa/7kaa.SlackBuild b/games/7kaa/7kaa.SlackBuild
index 643cb39050..5662e3cdce 100644
--- a/games/7kaa/7kaa.SlackBuild
+++ b/games/7kaa/7kaa.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for 7kaa
 
-# Copyright <2016-2019> Sergio Vicari <devteamtuc@gmail.com>
+# Copyright <2016-2020> Sergio Vicari <devteamtuc@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=7kaa
-VERSION=${VERSION:-2.15.2}
+VERSION=${VERSION:-2.15.4p1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/7kaa/7kaa.info b/games/7kaa/7kaa.info
index 6060f0e376..a940a0066b 100644
--- a/games/7kaa/7kaa.info
+++ b/games/7kaa/7kaa.info
@@ -1,8 +1,8 @@
 PRGNAM="7kaa"
-VERSION="2.15.2"
+VERSION="2.15.4p1"
 HOMEPAGE="https://www.7kfans.com"
-DOWNLOAD="https://github.com/the3dfxdude/7kaa/releases/download/v2.15.2/7kaa-2.15.2.tar.xz"
-MD5SUM="abd3648aec3b8337a16f22de43ce9b19"
+DOWNLOAD="https://github.com/the3dfxdude/7kaa/releases/download/v2.15.4p1/7kaa-2.15.4p1.tar.xz"
+MD5SUM="33dfbe6be6135b0d76c21f28db1258a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2 enet OpenAL"
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/Chatbot-Eliza/README b/games/Chatbot-Eliza/README
index e3d00d4897..5ee92cc73e 100644
--- a/games/Chatbot-Eliza/README
+++ b/games/Chatbot-Eliza/README
@@ -1,9 +1,9 @@
 Chatbot-Eliza (Eliza chat bot interface module for Perl)
 
-The original ELIZA program was written by Joseph Weizenbaum and described
-in the Communications of the ACM in 1967.  Chatbot-Eliza is a clone of the
-classic ELIZA program written as perl module. It prompts for user input,
-and uses a simple transformation algorithm to change user input into a
-fellow-up question.
+The original ELIZA program was written by Joseph Weizenbaum and
+described in the Communications of the ACM in 1967.  Chatbot-Eliza is a
+clone of the classic ELIZA program written as perl module. It prompts
+for user input, and uses a simple transformation algorithm to change
+user input into a fellow-up question.
 
 The package includes some example scripts.
diff --git a/games/CorsixTH/CorsixTH.SlackBuild b/games/CorsixTH/CorsixTH.SlackBuild
index a6723a6e75..5b413ce9b2 100644
--- a/games/CorsixTH/CorsixTH.SlackBuild
+++ b/games/CorsixTH/CorsixTH.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CorsixTH
 
-# Copyright 2019 Nick Smallbone, Gothenburg, Sweden
+# Copyright 2019-2020 Nick Smallbone, Gothenburg, Sweden
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,12 @@
 #  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.62}
+VERSION=${VERSION:-0.63}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,19 +79,18 @@ 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 DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
+mv $PKG/usr/share/man $PKG/usr/man
+
+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
-cp -a \
-  $CWD/$PRGNAM.desktop \
-  $PKG/usr/share/applications
-mkdir -p $PKG/usr/share/pixmaps
-cp -a \
-  LDocGen/output/logo.png \
-  $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/games/CorsixTH/CorsixTH.desktop b/games/CorsixTH/CorsixTH.desktop
deleted file mode 100644
index 6c21c8fbe8..0000000000
--- a/games/CorsixTH/CorsixTH.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=CorsixTH
-Comment=An open source Theme Hospital clone
-Exec=corsix-th
-Icon=CorsixTH
-StartupNotify=false
-Categories=Game;
diff --git a/games/CorsixTH/CorsixTH.info b/games/CorsixTH/CorsixTH.info
index 69bb203c13..f596efe8a1 100644
--- a/games/CorsixTH/CorsixTH.info
+++ b/games/CorsixTH/CorsixTH.info
@@ -1,10 +1,10 @@
 PRGNAM="CorsixTH"
-VERSION="0.62"
+VERSION="0.63"
 HOMEPAGE="http://corsixth.com"
-DOWNLOAD="https://github.com/CorsixTH/CorsixTH/archive/v0.62/CorsixTH-0.62.tar.gz"
-MD5SUM="490d2fa01467913c77ae8cbc7ed9d3d8"
+DOWNLOAD="https://github.com/CorsixTH/CorsixTH/archive/v0.63/CorsixTH-0.63.tar.gz"
+MD5SUM="83b0787a0fb2a19eea45b069e023d844"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2_mixer lua-filesystem lua-lpeg ffmpeg"
+REQUIRES="SDL2 SDL2_mixer lua ffmpeg"
 MAINTAINER="Nick Smallbone"
 EMAIL="nick@smallbone.se"
diff --git a/games/FlightGear-data/FlightGear-data.SlackBuild b/games/FlightGear-data/FlightGear-data.SlackBuild
index 7bc51df1d6..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:-2019.1.2}
+VERSION=${VERSION:-2020.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,7 +41,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr/share $OUTPUT
 cd $PKG/usr/share
-tar xvf $CWD/$SRCNAM-$VERSION-data-rc.tar.bz2
+tar xvf $CWD/$SRCNAM-$VERSION-data.tar.bz2
 mv fgdata FlightGear
 chown -R root:root .
 find -L . \
diff --git a/games/FlightGear-data/FlightGear-data.info b/games/FlightGear-data/FlightGear-data.info
index 9a67873cf9..fe327a0e7b 100644
--- a/games/FlightGear-data/FlightGear-data.info
+++ b/games/FlightGear-data/FlightGear-data.info
@@ -1,8 +1,8 @@
 PRGNAM="FlightGear-data"
-VERSION="2019.1.2"
+VERSION="2020.3.6"
 HOMEPAGE="http://www.flightgear.org/"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/FlightGear-2019.1.2-data-rc.tar.bz2"
-MD5SUM="a6179d1791f9886c10358f02679ed085"
+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.SlackBuild b/games/FlightGear/FlightGear.SlackBuild
index 0bf0ad4686..fed48f1bff 100644
--- a/games/FlightGear/FlightGear.SlackBuild
+++ b/games/FlightGear/FlightGear.SlackBuild
@@ -3,6 +3,8 @@
 
 # Copyright before version 2016.3.1 by Diego Pantano  <poplin.dp@gmail.com>
 # Copyright 2016-2018 Panagiotis Nikolaou, Culver City, CA
+# Copyright 2019, 2020 Lenard Spencer, Orlando, Florida, USA
+
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +26,7 @@
 
 PRGNAM=FlightGear
 SRCNAM=flightgear
-VERSION=${VERSION:-2019.1.2}
+VERSION=${VERSION:-2020.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-${VERSION}-rc.tar.?z*
+tar xvf $CWD/$SRCNAM-${VERSION}.tar.?z*
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -80,13 +82,14 @@ find -L . \
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DEVENT_INPUT:STRING="ON" \
+    -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 8686c0e7ac..15c3db0072 100644
--- a/games/FlightGear/FlightGear.info
+++ b/games/FlightGear/FlightGear.info
@@ -1,8 +1,8 @@
 PRGNAM="FlightGear"
-VERSION="2019.1.2"
+VERSION="2020.3.6"
 HOMEPAGE="http://www.flightgear.org/"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/flightgear-2019.1.2-rc.tar.bz2"
-MD5SUM="fb9953833c54bb586a9eab21182b5e86"
+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 4a5ce89cf0..40164a5f29 100644
--- a/games/FlightGear/README
+++ b/games/FlightGear/README
@@ -2,8 +2,9 @@ FlightGear is a flight-simulator created by an international group of
 volunteers, and released as free, open-source GPL software.
 It has been used for academic research, education, and for fun.
 
-To build the internal Qt launcher, you will require QT5 and libxkbcommon
-and then pass QT5=yes to the script
+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.
 
 speex and flite are optional dependencies for voice communication
 (autodetected at build time).
diff --git a/games/Gearboy/Gearboy.info b/games/Gearboy/Gearboy.info
index 4c43ef6974..94c0b6292f 100644
--- a/games/Gearboy/Gearboy.info
+++ b/games/Gearboy/Gearboy.info
@@ -6,5 +6,5 @@ MD5SUM="ed83dcde7d9eefd845b60cfdec5d7735"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/Gearsystem/Gearsystem.info b/games/Gearsystem/Gearsystem.info
index ce0a5da07f..1456f30358 100644
--- a/games/Gearsystem/Gearsystem.info
+++ b/games/Gearsystem/Gearsystem.info
@@ -6,5 +6,5 @@ MD5SUM="6e438a0d024d6b902c2940d3e42b1fcf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
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 110224e85f..4ee46804fc 100644
--- a/games/Genesis-Plus-GX/Genesis-Plus-GX.info
+++ b/games/Genesis-Plus-GX/Genesis-Plus-GX.info
@@ -1,10 +1,10 @@
 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"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/KoboDeluxe/README b/games/KoboDeluxe/README
index 67dadff59d..1572e09af6 100644
--- a/games/KoboDeluxe/README
+++ b/games/KoboDeluxe/README
@@ -1,5 +1,6 @@
-Kobo is a game based on Xkobo. It is a 2D scrolling shooting game where you
-must destroy every enemy starbase you find in each stage, while avoiding
-being taken down by their defenses, the enemy ships, the asteroids...
- 
+Kobo is a game based on Xkobo. It is a 2D scrolling shooting game
+where you must destroy every enemy starbase you find in each stage,
+while avoiding being taken down by their defenses, the enemy ships,
+the asteroids...
+
 Tons of good old arcade endless action.
diff --git a/games/OpenRA/README b/games/OpenRA/README
index 2d079357d7..b2a7cba64d 100644
--- a/games/OpenRA/README
+++ b/games/OpenRA/README
@@ -1,12 +1,12 @@
 OpenRA is a modernized recreation of the classic RTS Command & Conquer
 
-OpenRA is a project that recreates and modernizes the classic
-Command & Conquer real time strategy games. A flexible open source
-game engine (the OpenRA engine), has been developed, which provides a
-common platform for rebuilding and reimagining classic 2D and 2.5D RTS
-games (the OpenRA mods).
+OpenRA is a project that recreates and modernizes the classic Command &
+Conquer real time strategy games. A flexible open source game engine
+(the OpenRA engine), has been developed, which provides a common
+platform for rebuilding and reimagining classic 2D and 2.5D RTS games
+(the OpenRA mods).
 
-NOTE: There is a known issue with the version of mono found at SlackBuilds.org
-and some terminals, such as urxvt, that affects OpenRA during build time and run
-time; one work around is to pass the varible TERM=xterm to the script during
-build and run time.
+NOTE: There is a known issue with the version of mono found at
+SlackBuilds.org and some terminals, such as urxvt, that affects OpenRA
+during build time and run time; one work around is to pass the varible
+TERM=xterm to the script during build and run time.
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/QuickNES-Core/QuickNES-Core.SlackBuild b/games/QuickNES-Core/QuickNES-Core.SlackBuild
new file mode 100644
index 0000000000..078b9e7565
--- /dev/null
+++ b/games/QuickNES-Core/QuickNES-Core.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for QuickNES-Core
+
+# Copyright 2020 ilmich < ardutu at gmail 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=QuickNES-Core
+LIBNAM=quicknes_libretro
+VERSION=${VERSION:-2020.10.11.81fedf7}
+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=
+[ "$ARCH" = x86_64 ] && LIBDIRSUFFIX=64
+
+set -eu
+
+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 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 {} \;
+
+[ "${DEBUG:=0}" != 0 ] && DEBUG=1
+
+make -f Makefile DEBUG=$DEBUG
+
+install -Dm0644 $LIBNAM.so $PKG/usr/lib${LIBDIRSUFFIX}/libretro/$LIBNAM.so
+install -Dm0644 $LIBNAM.info $PKG/usr/lib${LIBDIRSUFFIX}/libretro/info/$LIBNAM.info
+
+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
+cp -a 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/games/QuickNES-Core/QuickNES-Core.info b/games/QuickNES-Core/QuickNES-Core.info
new file mode 100644
index 0000000000..acd199cfed
--- /dev/null
+++ b/games/QuickNES-Core/QuickNES-Core.info
@@ -0,0 +1,10 @@
+PRGNAM="QuickNES-Core"
+VERSION="2020.10.11.81fedf7"
+HOMEPAGE="https://www.libretro.com/"
+DOWNLOAD="https://ilmich.github.io/src/QuickNES-Core-2020.10.11.81fedf7.tar.xz"
+MD5SUM="818dd86fa2555a73c84cd6282c772eca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="RetroArch"
+MAINTAINER="ilmich"
+EMAIL="ardutu@gmail.com"
diff --git a/games/QuickNES-Core/README b/games/QuickNES-Core/README
new file mode 100644
index 0000000000..2b3110d1ae
--- /dev/null
+++ b/games/QuickNES-Core/README
@@ -0,0 +1,8 @@
+QuickNES is the fastest NES emulator available via libretro,
+though this speed comes at the cost of some accuracy.
+
+This core should be used only when performance is of the
+utmost concern and even FCEUmm is too demanding.
+
+To build the debugging symbols use:
+  DEBUG=1 QuickNES-Core.SlackBuild
diff --git a/games/QuickNES-Core/slack-desc b/games/QuickNES-Core/slack-desc
new file mode 100644
index 0000000000..4a4c88a18d
--- /dev/null
+++ b/games/QuickNES-Core/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------------------------------------------------------|
+QuickNES-Core: QuickNES-Core (fast NES libretro core)
+QuickNES-Core:
+QuickNES-Core: QuickNES is the fastest NES emulator available via libretro,
+QuickNES-Core: though this speed comes at the cost of some accuracy. This core
+QuickNES-Core: should be used only when performance is of the utmost concern and
+QuickNES-Core: even FCEUmm is too demanding
+QuickNES-Core:
+QuickNES-Core:
+QuickNES-Core: Homepage: https://www.libretro.com/
+QuickNES-Core:
+QuickNES-Core:
diff --git a/games/RetroArch/RetroArch.SlackBuild b/games/RetroArch/RetroArch.SlackBuild
index b1514889e4..256833c35a 100644
--- a/games/RetroArch/RetroArch.SlackBuild
+++ b/games/RetroArch/RetroArch.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for RetroArch
 
 # Copyright 2016-2019 Hunter Sezen California, USA
+# Copyright 2020 ilmich < ardutu at gmail dot com >
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=RetroArch
-VERSION=${VERSION:-1.7.7}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.9.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,7 +61,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 . \
@@ -148,7 +149,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-assets_dir=/usr/share/games \
-  --disable-update_assets \
   --build=$ARCH-slackware-linux \
   "$@"
 
diff --git a/games/RetroArch/RetroArch.info b/games/RetroArch/RetroArch.info
index cce1d3b25b..359df0a52c 100644
--- a/games/RetroArch/RetroArch.info
+++ b/games/RetroArch/RetroArch.info
@@ -1,10 +1,10 @@
 PRGNAM="RetroArch"
-VERSION="1.7.7"
+VERSION="1.9.0"
 HOMEPAGE="https://www.libretro.com/"
-DOWNLOAD="https://github.com/libretro/RetroArch/releases/download/v1.7.7/RetroArch-1.7.7.tar.xz"
-MD5SUM="a8516a7a15502c85c371f83c104aa1c6"
+DOWNLOAD="https://github.com/libretro/RetroArch/archive/v1.9.0/RetroArch-1.9.0.tar.gz"
+MD5SUM="3f57a0b5e752921b6e1e5587bf546eb9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="ilmich"
+EMAIL="ardutu@gmail.com"
diff --git a/games/SLADE/README b/games/SLADE/README
index fb14fe9253..e4e89e9f9f 100644
--- a/games/SLADE/README
+++ b/games/SLADE/README
@@ -1,5 +1,5 @@
-SLADE is a modern editor for DOOM-engine based games and source ports. It has
-the ability to view, modify and write many different game-specific formats, and
-even convert between some of them.
+SLADE (DOOM editor)
 
-Credit to Arch Linux for the .desktop file.
+SLADE is a modern editor for DOOM-engine based games and source
+ports. It has the ability to view, modify and write many different
+game-specific formats, and even convert between some of them.
diff --git a/games/SLADE/SLADE.SlackBuild b/games/SLADE/SLADE.SlackBuild
index 35c37ca39c..cb6adf1a1e 100644
--- a/games/SLADE/SLADE.SlackBuild
+++ b/games/SLADE/SLADE.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for SLADE
 
 # Copyright 2015 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +23,16 @@
 #  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
+# - binary in /usr/games
+# - install icon in right place, symlink to old location
+# - get rid of our .desktop file (upstream provides one now)
+
 PRGNAM=SLADE
-VERSION=${VERSION:-3.1.1.5}
+VERSION=${VERSION:-3.1.12a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,37 +69,51 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+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 {} \+
+
+# 20200416 bkw: game binaries do not belong in /usr/bin.
+sed -i 's,\<bin\>,games,' src/CMakeLists.txt
 
-mkdir -p build
+# 20200416 bkw: don't depend on unstable /usr/bin/wx-config symlink.
+# stupid thing insists on searching for wx-config in PATH, instead of
+# allowing us to explicitly give a full path and name for the script, so:
+WXCONF=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-3.0
+WXTMP=$( pwd )/wxtmp
+mkdir -p $WXTMP
+ln -s $WXCONF $WXTMP/wx-config
+
+# 20200416 bkw: our wxGTK3 package doesn't include wxWebView, and it's built
+# with gtk+-2, not 3. This stuff isn't autodetected so we help it along.
 cd build
   cmake \
+    -DWITH_WXPATH=$WXTMP \
+    -DNO_WEBVIEW=ON \
+    -DWX_GTK3=OFF \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-mkdir -p $PKG/usr/share/applications
-cp $CWD/SLADE.desktop $PKG/usr/share/applications
-
-mkdir -p $PKG/usr/share/pixmaps
-convert dist/res/slade.ico[3] $PKG/usr/share/pixmaps/${PRGNAM}.ico
+mkdir -p $PKG/usr/share/icons/hicolor/128x128/apps \
+         $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
+# 20200416 bkw: don't want to hardcode the icon name here.
+cd $PKG/usr/share/icons
+  icon="$( /bin/ls *$PRGNAM.png | head -1 )"
+  mv $icon hicolor/128x128/apps
+  ln -s hicolor/128x128/apps/$icon .
+  ln -s ../icons/hicolor/128x128/apps/$icon ../pixmaps/$PRGNAM.png
+cd -
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README* *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* gpl-2.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/SLADE/SLADE.info b/games/SLADE/SLADE.info
index adbb9ee289..58e52e4d16 100644
--- a/games/SLADE/SLADE.info
+++ b/games/SLADE/SLADE.info
@@ -1,10 +1,10 @@
 PRGNAM="SLADE"
-VERSION="3.1.1.5"
+VERSION="3.1.12a"
 HOMEPAGE="http://slade.mancubus.net/"
-DOWNLOAD="https://github.com/sirjuddington/SLADE/archive/3.1.1.5/SLADE-3.1.1.5.tar.gz"
-MD5SUM="ce693b861ae962878370be80c1a3284f"
+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"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/SameBoy/SameBoy.info b/games/SameBoy/SameBoy.info
index d10143ee85..16297251c7 100644
--- a/games/SameBoy/SameBoy.info
+++ b/games/SameBoy/SameBoy.info
@@ -8,5 +8,5 @@ MD5SUM="b3fc66405a40b508fd8e13ec0db9b860 \
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/Scorched3D/README b/games/Scorched3D/README
index 97dfb1700b..fda33b1433 100644
--- a/games/Scorched3D/README
+++ b/games/Scorched3D/README
@@ -1,3 +1,3 @@
-Scorched3D is a cross-platform 3D remake of the popular 2D artillery game
-Scorched Earth. Scorched3D can be played against the computer, other players,
-and remotely across the Internet or LAN.
+Scorched3D is a cross-platform 3D remake of the popular 2D artillery
+game Scorched Earth. Scorched3D can be played against the computer,
+other players, and remotely across the Internet or LAN.
diff --git a/games/VASSAL/README b/games/VASSAL/README
index 1a71ca5c1e..448bc11ac3 100644
--- a/games/VASSAL/README
+++ b/games/VASSAL/README
@@ -1,3 +1,3 @@
-VASSAL is a game engine for building and playing online adaptations of board
-games and card games. Play live on the Internet or by email. VASSAL runs on all
-platforms, and is free, open-source software.
+VASSAL is a game engine for building and playing online adaptations
+of board games and card games. Play live on the Internet or by
+email. VASSAL runs on all platforms, and is free, open-source software.
diff --git a/games/VASSAL/VASSAL b/games/VASSAL/VASSAL
deleted file mode 100644
index 2f833e3399..0000000000
--- a/games/VASSAL/VASSAL
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/games/VASSAL
-./VASSAL.sh
diff --git a/games/VASSAL/VASSAL-mime.xml b/games/VASSAL/VASSAL-mime.xml
new file mode 100644
index 0000000000..9ce2e12f9c
--- /dev/null
+++ b/games/VASSAL/VASSAL-mime.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-vnd.vassalengine.module">
+    <sub-class-of type="application/octet-stream"/>
+    <comment>VASSAL module</comment>
+    <glob pattern="*.vmod"/>
+    <icon name="VASSAL"/>
+  </mime-type>
+  <mime-type type="application/x-vnd.vassalengine.module-extension">
+    <sub-class-of type="application/octet-stream"/>
+    <comment>VASSAL module extension</comment>
+    <glob pattern="*.vmdx"/>
+    <icon name="VASSAL"/>
+  </mime-type>
+  <mime-type type="application/x-vnd.vassalengine.game-log">
+    <sub-class-of type="application/octet-stream"/>
+    <comment>VASSAL game log</comment>
+    <glob pattern="*.vlog"/>
+    <icon name="VASSAL"/>
+  </mime-type>
+  <mime-type type="application/x-vnd.vassalengine.saved-game">
+    <sub-class-of type="application/octet-stream"/>
+    <comment>VASSAL saved game</comment>
+    <glob pattern="*.vsav"/>
+    <icon name="VASSAL"/>
+  </mime-type>
+</mime-info>
diff --git a/games/VASSAL/VASSAL.SlackBuild b/games/VASSAL/VASSAL.SlackBuild
index 8fabf966a7..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,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=VASSAL
-VERSION=${VERSION:-3.2.17}
+VERSION=${VERSION:-3.5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,18 +72,22 @@ find -L . \
 mkdir -p $PKG/usr/bin $PKG/usr/share/games/$PRGNAM
 cp -rf lib $PKG/usr/share/games/$PRGNAM
 
-install -D -m0755 $PRGNAM.sh $PKG/usr/share/games/$PRGNAM/$PRGNAM.sh
-install -D -m0755 $CWD/VASSAL $PKG/usr/bin
+sed -i "s|^\(INSTALL_DIR=\).*|\1/usr/share/games/$PRGNAM|" $PRGNAM.sh
+
+install -D -m0755 $PRGNAM.sh $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/share/applications
 install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
+mkdir -p $PKG/usr/share/mime/packages
+install -D -m644 $CWD/$PRGNAM-mime.xml $PKG/usr/share/mime/packages/$PRGNAM-mime.xml
+
 mkdir -p $PKG/usr/share/pixmaps
 install -m644 -D $CWD/$PRGNAM.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGES LICENSE README doc \
+  CHANGES LICENSE README.md doc \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 ln -s /usr/doc/$PRGNAM-$VERSION/doc $PKG/usr/share/games/$PRGNAM/doc
diff --git a/games/VASSAL/VASSAL.desktop b/games/VASSAL/VASSAL.desktop
index 54e0241956..53988fad6c 100644
--- a/games/VASSAL/VASSAL.desktop
+++ b/games/VASSAL/VASSAL.desktop
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 Categories=Game
 GenericName=Board and card game engine
+MimeType=application/x-vnd.vassalengine.module;application/x-vnd.vassalengine.module-extension;application/x-vnd.vassalengine.game-log;application/x-vnd.vassalengine.saved-game
diff --git a/games/VASSAL/VASSAL.info b/games/VASSAL/VASSAL.info
index 985ec47196..d1b8b571a7 100644
--- a/games/VASSAL/VASSAL.info
+++ b/games/VASSAL/VASSAL.info
@@ -1,10 +1,10 @@
 PRGNAM="VASSAL"
-VERSION="3.2.17"
+VERSION="3.5.5"
 HOMEPAGE="http://www.vassalengine.org/"
-DOWNLOAD="https://downloads.sourceforge.net/vassalengine/VASSAL-3.2.17-linux.tar.bz2"
-MD5SUM="dc43c18cafcf36cfbc1a0d9eb733d8d1"
+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="jdk"
+REQUIRES="jdk14"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/games/VASSAL/doinst.sh b/games/VASSAL/doinst.sh
index 5fb28930db..aea0f894eb 100644
--- a/games/VASSAL/doinst.sh
+++ b/games/VASSAL/doinst.sh
@@ -1,3 +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/games/abe/README b/games/abe/README
index 26ba79234e..535ed125b1 100644
--- a/games/abe/README
+++ b/games/abe/README
@@ -1,3 +1,4 @@
-Abe is a scrolling, platform-jumping, key-collecting, ancient pyramid
-exploring game, vaguely in the style of similar games for the Commodore+4.
-The game is intended to show young people all the cool games they missed.
+Abe is a scrolling, platform-jumping, key-collecting, ancient
+pyramid exploring game, vaguely in the style of similar games for the
+Commodore+4. The game is intended to show young people all the cool
+games they missed.
diff --git a/games/adl/adl.info b/games/adl/adl.info
index 0747e3215f..24b6d03ac2 100644
--- a/games/adl/adl.info
+++ b/games/adl/adl.info
@@ -3,16 +3,16 @@ VERSION="20110628"
 HOMEPAGE="http://adl.sourceforge.net/"
 DOWNLOAD="http://www.ifarchive.org/if-archive/programming/adl/adl.tar.Z \
           https://sourceforge.net/projects/adl/files/adl/adl%20binary%201.0/adl_linux32_1_0.tar.gz \
-          http://urchlay.naptime.net/~urchlay/src/adl-20110628.tar.gz \
-          http://urchlay.naptime.net/~urchlay/src/adl03-samples.tar.gz"
+          https://slackware.uk/~urchlay/src/adl-20110628.tar.gz \
+          https://slackware.uk/~urchlay/src/adl03-samples.tar.gz"
 MD5SUM="b01115cc2625441caf818e60527b4095 \
         c487cd233972bd5de694d303806ac653 \
         57b75b90bd09a5051270732a61c6e288 \
         6edfe44f23a99078ca797c75273fbb0e"
 DOWNLOAD_x86_64="http://www.ifarchive.org/if-archive/programming/adl/adl.tar.Z \
-                 http://urchlay.naptime.net/~urchlay/src/adl_linux64_1_0.tar.gz \
-                 http://urchlay.naptime.net/~urchlay/src/adl-20110628.tar.gz \
-                 http://urchlay.naptime.net/~urchlay/src/adl03-samples.tar.gz"
+                 https://slackware.uk/~urchlay/src/adl_linux64_1_0.tar.gz \
+                 https://slackware.uk/~urchlay/src/adl-20110628.tar.gz \
+                 https://slackware.uk/~urchlay/src/adl03-samples.tar.gz"
 MD5SUM_x86_64="b01115cc2625441caf818e60527b4095 \
                9c19e5a4ca7fa78b2d283b7ee00985c9 \
                57b75b90bd09a5051270732a61c6e288 \
diff --git a/games/ags/README b/games/ags/README
index d58df2b645..137f5c542d 100644
--- a/games/ags/README
+++ b/games/ags/README
@@ -1,5 +1,5 @@
-This is the Linux port of the Adventure Game Studio engine. You use it to play
-AGS games.
+This is the Linux port of the Adventure Game Studio engine. You use it
+to play AGS games.
 
 Just run "ags" followed by the game's .exe file.
 
diff --git a/games/ags/ags.SlackBuild b/games/ags/ags.SlackBuild
index ed063016ce..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.23}
+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 0b116e29e3..45b7e9457c 100644
--- a/games/ags/ags.info
+++ b/games/ags/ags.info
@@ -1,14 +1,10 @@
 PRGNAM="ags"
-VERSION="3.5.0.23"
+VERSION="3.5.0.31"
 HOMEPAGE="https://github.com/adventuregamestudio/ags"
-DOWNLOAD="https://github.com/adventuregamestudio/ags/archive/v.3.5.0.23.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="2d4c003ea240ebaeb0b106c9ad060cf4 \
-        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/aisleriot/slack-desc b/games/aisleriot/slack-desc
index 8a90f98c48..4b904a53e8 100644
--- a/games/aisleriot/slack-desc
+++ b/games/aisleriot/slack-desc
@@ -17,4 +17,3 @@ aisleriot:
 aisleriot:
 aisleriot:
 aisleriot:
-aisleriot:
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/alienarena/README b/games/alienarena/README
index 54a7dd3d82..61177c7400 100644
--- a/games/alienarena/README
+++ b/games/alienarena/README
@@ -1,12 +1,13 @@
-The goal of Alien Arena was to create the perfect marriage between Quake
-and Unreal Tournament, between retro sci-fi and futuristic tech, and
-between casual gamer and advanced expert, and wrap it up in a package with
-quality that could rival that of commercial games. The game has a weapon
-set that is unique and fun, and deviates a bit away from the standard Q3
-or UT2k4 weapons. Gameplay can be altered easily in the menu by choosing
-between the various game types, such as Deathmatch, Team Core Assault,
-All Out Assault, Capture the Flag, Duel, and Cattle Prod. Users can also
-apply a number of different mutators to the game rules as well, creating
-some pretty interesting scenarios. Players can join others on servers
-using the in-game browser, or use the Galaxy client, which also serves as
-a way to communicate with the large, and friendly Alien Arena community.
+The goal of Alien Arena was to create the perfect marriage between
+Quake and Unreal Tournament, between retro sci-fi and futuristic tech,
+and between casual gamer and advanced expert, and wrap it up in a
+package with quality that could rival that of commercial games. The
+game has a weapon set that is unique and fun, and deviates a bit
+away from the standard Q3 or UT2k4 weapons. Gameplay can be altered
+easily in the menu by choosing between the various game types, such
+as Deathmatch, Team Core Assault, All Out Assault, Capture the Flag,
+Duel, and Cattle Prod. Users can also apply a number of different
+mutators to the game rules as well, creating some pretty interesting
+scenarios. Players can join others on servers using the in-game
+browser, or use the Galaxy client, which also serves as a way to
+communicate with the large, and friendly Alien Arena community.
diff --git a/games/angband/angband.SlackBuild b/games/angband/angband.SlackBuild
index 886f7f7e0f..96e5c82569 100644
--- a/games/angband/angband.SlackBuild
+++ b/games/angband/angband.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Angband
 
-# Copyright 2013 Marshall Scott, SlackBuilds.org Project, David Melik, Spokane,
+# Copyright 2020 Marshall Scott, SlackBuilds.org Project, David Melik, Spokane,
 # WA, USA.
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=angband
-VERSION=${VERSION:-4.2.0}
+VERSION=${VERSION:-4.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -101,7 +101,7 @@ cp $CWD/angband.png $PKG/usr/share/pixmaps
 cp $CWD/angband.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a changes.txt readme.txt lib/help/ \
+cp -a changes.txt README.md docs/ lib/help/ \
     $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/angband/angband.info b/games/angband/angband.info
index 357b78eb0b..de1cf7f79a 100644
--- a/games/angband/angband.info
+++ b/games/angband/angband.info
@@ -1,8 +1,8 @@
 PRGNAM="angband"
-VERSION="4.2.0"
+VERSION="4.2.1"
 HOMEPAGE="http://www.rephial.org/"
-DOWNLOAD="http://rephial.org/downloads/4.2/angband-4.2.0.tar.gz"
-MD5SUM="c0c11a5e73bf1ad9c31a9df8d5f03781"
+DOWNLOAD="http://rephial.org/downloads/4.2/angband-4.2.1.tar.gz"
+MD5SUM="4538a8e34673cef9da1f11b6abda3f5e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/antares/antares.SlackBuild b/games/antares/antares.SlackBuild
index c5bf1b2b24..7e43edc6f7 100644
--- a/games/antares/antares.SlackBuild
+++ b/games/antares/antares.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=antares
-VERSION=${VERSION:-0.9.0}
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,20 +59,17 @@ find -L . \
 mkdir -p $PKG/usr/share/games/$PRGNAM/downloads
 cp $CWD/Ares-1.2.0.zip $PKG/usr/share/games/$PRGNAM/downloads
 
-# Don't connect accessibility bus.
+# Don't connect to the accessibility bus.
 # https://github.com/arescentral/antares/issues/276
 export NO_AT_BRIDGE=1
 
 # Use a system version of gn.
 sed -i 's|build/lib/bin/gn|gn|' build/lib/scripts/cfg.py
 
-# gn: Fix build with newer gn versions.
-# https://github.com/arescentral/procyon/pull/15
-( cd ext/procyon; patch -p1 < $CWD/procyon.patch )
-
-# Makefile: Install the text directory.
-# https://github.com/arescentral/antares/pull/307
-patch -p1 < $CWD/text.patch
+# Revert: Update to python3 (scripts/antares_launcher.py)
+# Doesn't work with python3 and removed upstream.
+# https://github.com/arescentral/antares/commit/0137f46c58e26352b2ba88cb581974f3f263ba3f
+patch -R -p1 < $CWD/python.patch
 
 # configure is a python script
 ./configure \
diff --git a/games/antares/antares.info b/games/antares/antares.info
index cd46acce08..b963d27dd3 100644
--- a/games/antares/antares.info
+++ b/games/antares/antares.info
@@ -1,12 +1,12 @@
 PRGNAM="antares"
-VERSION="0.9.0"
+VERSION="0.9.1"
 HOMEPAGE="https://arescentral.org/antares"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="http://downloads.arescentral.org/Antares/antares-0.9.0.zip \
-                 http://downloads.arescentral.org/Ares/Ares-1.2.0.zip"
-MD5SUM_x86_64="351ae6d76673564b4fe17b56b583a0dc \
-               b41f52c74f7cad3ff183dabe81bd1cf2"
-REQUIRES="OpenAL glfw3 gn libc++ libmodplug"
+DOWNLOAD="http://downloads.arescentral.org/Antares/antares-0.9.1.zip \
+          http://downloads.arescentral.org/Ares/Ares-1.2.0.zip"
+MD5SUM="ef44ba09889aef72763212f96989983b \
+        b41f52c74f7cad3ff183dabe81bd1cf2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="OpenAL glfw3 gn libc++ libmodplug python3"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/games/antares/procyon.patch b/games/antares/procyon.patch
deleted file mode 100644
index 1805b5aa82..0000000000
--- a/games/antares/procyon.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 42aeba19dbe79c6ebd3e860bff977595577ad90f Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 8 Jan 2020 12:12:34 -0800
-Subject: [PATCH] gn: Fix build with newer gn versions.
-
----
- src/cpp/BUILD.gn | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/cpp/BUILD.gn b/src/cpp/BUILD.gn
-index 58da775..b76d236 100644
---- a/src/cpp/BUILD.gn
-+++ b/src/cpp/BUILD.gn
-@@ -13,7 +13,7 @@
- # limitations under the License.
- 
- static_library("procyon-cpp") {
--  sources = [
-+  public = [
-     "include/pn/arg",
-     "include/pn/array",
-     "include/pn/data",
-@@ -23,6 +23,9 @@ static_library("procyon-cpp") {
-     "include/pn/output",
-     "include/pn/string",
-     "include/pn/value",
-+  ]
-+
-+  sources = [
-     "src/array.cpp",
-     "src/common.hpp",
-     "src/data.cpp",
diff --git a/games/antares/python.patch b/games/antares/python.patch
new file mode 100644
index 0000000000..8aa27450c1
--- /dev/null
+++ b/games/antares/python.patch
@@ -0,0 +1,25 @@
+From 0137f46c58e26352b2ba88cb581974f3f263ba3f Mon Sep 17 00:00:00 2001
+From: Chris Pickel <sfiera@twotaled.com>
+Date: Fri, 5 Jun 2020 20:09:00 +0900
+Subject: [PATCH] Update to python3
+
+---
+ scripts/antares_launcher.py     |  4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/antares_launcher.py b/scripts/antares_launcher.py
+index d20f343e..fc5e4d32 100755
+--- a/scripts/antares_launcher.py
++++ b/scripts/antares_launcher.py
+@@ -1,10 +1,8 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # Copyright (C) 2017 The Antares Authors
+ # This file is part of Antares, a tactical space combat game.
+ # Antares is free software, distributed under the LGPL+. See COPYING.
+ 
+-from __future__ import division, print_function, unicode_literals
+-
+ import gi
+ import json
+ import os
diff --git a/games/antares/text.patch b/games/antares/text.patch
deleted file mode 100644
index 62b7e61ba2..0000000000
--- a/games/antares/text.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 914ad7b2cd53b8396a6e407c91b63adfc3b18443 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 8 Jan 2020 07:42:21 -0800
-Subject: [PATCH] Makefile: Install the text directory.
-
-This fixes a crash at the end of the tutorial level.
-
-antares-glfw: text/6000.txt: couldn't find resource "text/6000.txt"
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index 7146731e..7404fb34 100644
---- a/Makefile
-+++ b/Makefile
-@@ -105,6 +105,7 @@ install-data: build
- 	cp -r data/sounds $(DESTDIR)$(DATADIR)/app
- 	cp -r data/sprites $(DESTDIR)$(DATADIR)/app
- 	cp -r data/strings $(DESTDIR)$(DATADIR)/app
-+	cp -r data/text $(DESTDIR)$(DATADIR)/app
- 
- .PHONY: install-scenario
- install-scenario: build
diff --git a/games/armagetronad/README b/games/armagetronad/README
index a163b69669..3e0de2b825 100644
--- a/games/armagetronad/README
+++ b/games/armagetronad/README
@@ -1,4 +1,4 @@
-armagetronad (old school Tron lightcycles Cycles OpenGL game)
+armagetronad (old school Tron lightcycles OpenGL game)
 
 A Tron lightcycles game clone that offers up to 16 players, a highly
 advanced AI, and network/internet play in a full OpenGL 3D environment.
@@ -11,7 +11,9 @@ Full documentation exists in /usr/doc/armagetronad-$VERSION/
 The armagetronad server initscript is stored as:
 /usr/share/games/armagetronad/scripts/rcd_master
 To use this script, symlink it to /etc/rc.d with this command:
-ln -s /usr/share/games/armagetronad/scripts/rcd_master /etc/rc.d/rc.armagetronad
+
+ln -s /usr/share/games/armagetronad/scripts/rcd_master \
+      /etc/rc.d/rc.armagetronad
 
 The armagetronad server system-wide install scripts enable the creation
 of a user called 'armagetronad' for use with the Master server.
diff --git a/games/armagetronad/armagetronad.SlackBuild b/games/armagetronad/armagetronad.SlackBuild
index b931746029..e32cd1cf7b 100644
--- a/games/armagetronad/armagetronad.SlackBuild
+++ b/games/armagetronad/armagetronad.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2010-2016 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.8.3.4}
+VERSION=${VERSION:-0.2.9.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,9 +58,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.src.tar.?z*
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.?z*
+cd $PRGNAM-v$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,8 +68,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 {} \;
 
+./bootstrap.sh
+
 # Fix wrong detection of libpng in configure
-sed -i 's|png_check_sig|png_sig_cmp|g' configure
+sed -i 's|png_check_sig|png_sig_cmp|g' configure || exit 1
 
 # Using --disable-games since it peppers installation
 # paths with 'games' subdirectories and we're handling that manually.
@@ -106,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 3119cf48fc..5dc8bee167 100644
--- a/games/armagetronad/armagetronad.info
+++ b/games/armagetronad/armagetronad.info
@@ -1,10 +1,10 @@
 PRGNAM="armagetronad"
-VERSION="0.2.8.3.4"
+VERSION="0.2.9.1.0"
 HOMEPAGE="http://www.armagetronad.org"
-DOWNLOAD="http://downloads.sf.net/armagetronad/armagetronad-0.2.8.3.4.src.tar.bz2"
-MD5SUM="451c074e8e07b57f3cb69e2e5e511749"
+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/asc/asc.SlackBuild b/games/asc/asc.SlackBuild
index 816bf1100f..82415dea1f 100644
--- a/games/asc/asc.SlackBuild
+++ b/games/asc/asc.SlackBuild
@@ -22,9 +22,12 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200906 bkw: modified by SlackBuilds.org: added patch to support
+# physfs 3.0.1.
+
 PRGNAM=asc
 VERSION=${VERSION:-2.6.1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +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 {} \;
 
+# 20200906 bkw: Patch borrowed from Debian, with thanks.
+patch -p1 < $CWD/libphysfs-3.0.1.patch
+
 # convert asc logo icon .gif to .png format
 convert data/icon_asc.gif $PRGNAM.png
 
diff --git a/games/asc/libphysfs-3.0.1.patch b/games/asc/libphysfs-3.0.1.patch
new file mode 100644
index 0000000000..7e1cd12782
--- /dev/null
+++ b/games/asc/libphysfs-3.0.1.patch
@@ -0,0 +1,50 @@
+From: Markus Koschany <apo@debian.org>
+Date: Fri, 17 Nov 2017 19:08:04 +0100
+Subject: libphysfs 3.0.1
+
+Bug-Debian: https://bugs.debian.org/881998
+Forwarded: http://battle-planet.de/pbp/board/viewtopic.php?f=128&t=6717
+---
+ source/libs/paragui/src/core/physfsrwops.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/source/libs/paragui/src/core/physfsrwops.h b/source/libs/paragui/src/core/physfsrwops.h
+index 91ff2eb..a259622 100644
+--- a/source/libs/paragui/src/core/physfsrwops.h
++++ b/source/libs/paragui/src/core/physfsrwops.h
+@@ -39,7 +39,7 @@ extern "C" {
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
+ 
+ /**
+  * Open a platform-independent filename for writing, and make it accessible
+@@ -51,7 +51,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
+ 
+ /**
+  * Open a platform-independent filename for appending, and make it accessible
+@@ -63,7 +63,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
+ 
+ /**
+  * Make a SDL_RWops from an existing PhysicsFS file handle. You should
+@@ -75,7 +75,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
+ 
+ #ifdef __cplusplus
+ }
diff --git a/games/atanks/doinst.sh b/games/atanks/doinst.sh
index 2aa41d640c..65c7e2eeb9 100644
--- a/games/atanks/doinst.sh
+++ b/games/atanks/doinst.sh
@@ -6,4 +6,4 @@ 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
+fi
diff --git a/games/atari++/README b/games/atari++/README
index c0b615414a..8517407876 100644
--- a/games/atari++/README
+++ b/games/atari++/README
@@ -1,8 +1,8 @@
-The Atari++ Emulator is a Unix based emulator of the Atari eight bit
-computers, namely the Atari 400 and 800, the Atari 600XL, 800XL and 130XE,
-and the Atari 5200 game console. The emulator is auto-configurable and
-will compile on a variety of systems (Linux, Solaris, Irix), and supports
-many emulation features.
+The Atari++ Emulator is a Unix based emulator of the Atari eight
+bit computers, namely the Atari 400 and 800, the Atari 600XL,
+800XL and 130XE, and the Atari 5200 game console. The emulator is
+auto-configurable and will compile on a variety of systems (Linux,
+Solaris, Irix), and supports many emulation features.
 
 Atari++ includes OS++, an open source replacement Atari 8-bit operating
 system, so it's able to run many games and applications without the
@@ -11,7 +11,16 @@ want the original ROMs. To get them, install the atari800_roms package,
 then use the atari++ GUI to set the ROM file paths to the images in
 /usr/share/atari800/roms/.
 
-Note: Atari++, by default, is built with a fancy set of CFLAGS 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
+Note: Atari++, by default, is built with a fancy set of CFLAGS
+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/atari800/README b/games/atari800/README
index fff07912ee..30d1619185 100644
--- a/games/atari800/README
+++ b/games/atari800/README
@@ -6,16 +6,17 @@ Atari800 Development Team. This program is copyrighted and released
 under the GPL.
 
 This build uses SDL for audio, and SDL+OpenGL for video by default. To
-build without OpenGL support (SDL software rendering only), set OPENGL=no
-in the script's environment.
+build without OpenGL support (SDL software rendering only), set
+OPENGL=no in the script's environment.
 
-Starting with version 4.0.0, atari800 includes free replacements for the
-system ROMs, from the Altirra project. This allows you to run most Atari
-software without installing the original ROMs. However, for maximum
-compatibility, you'll need the Atari system ROMs. These are packaged
-on SBo as atari800_roms. After installing the ROMs, use the built-in
-menu in atari800 to set the paths (/usr/share/atari800/atari800_roms/*)
-and disable the built-in Altirra ROMs.
+Starting with version 4.0.0, atari800 includes free replacements
+for the system ROMs, from the Altirra project. This allows
+you to run most Atari software without installing the original
+ROMs. However, for maximum compatibility, you'll need the Atari
+system ROMs. These are packaged on SBo as atari800_roms. After
+installing the ROMs, use the built-in menu in atari800 to set the paths
+(/usr/share/atari800/atari800_roms/*) and disable the built-in Altirra
+ROMs.
 
 When upgrading from 3.x to 4.x, if the Atari's display is 'washed out'
 (too bright), remove your old "~/.atari800.cfg".
diff --git a/games/atari800_roms/README b/games/atari800_roms/README
index a5d23991f8..f7e22305fb 100644
--- a/games/atari800_roms/README
+++ b/games/atari800_roms/README
@@ -1,15 +1,15 @@
 atari800_roms (system ROMs for Atari 8-bit computers)
 
-The operating system and BASIC language ROM images from the Atari 800 and
-800XL computers. The ROM images are installed in /usr/share/atari800/,
-for use with the atari800 emulator, but may be used with other emulators
-such as Atari++.
+The operating system and BASIC language ROM images from the
+Atari 800 and 800XL computers. The ROM images are installed in
+/usr/share/atari800/, for use with the atari800 emulator, but may be
+used with other emulators such as Atari++.
 
 Also included are bootable disk images for Atari DOS 2.5 and MyDOS
 4.5d, and a couple of disks of demo software. These are installed in
 /usr/share/atari800/disks.
 
-These ROM images are proprietary and copyrighted, but the copyright holder
-granted the right to redistribute them to the authors of PC Xformer, a
-(now obsolete) Atari emulator. This build extracts the ROMs from the PC
-Xformer zip file.
+These ROM images are proprietary and copyrighted, but the copyright
+holder granted the right to redistribute them to the authors of PC
+Xformer, a (now obsolete) Atari emulator. This build extracts the ROMs
+from the PC Xformer zip file.
diff --git a/games/bastet/README b/games/bastet/README
index 76d992edd3..e1b35a68a9 100644
--- a/games/bastet/README
+++ b/games/bastet/README
@@ -1,16 +1,16 @@
 bastet (horribly difficult Tetris clone)
 
-Have you ever thought that Tetris is evil because it never sends you that
-straight "I" brick you need to clear four rows? Well, Tetris(R) probably
-is not so malevolent, but Bastet certainly is. >:-> Bastet stands for
-"bastard tetris", and is a simple ncurses-based Tetris(R) clone for
-Linux. Instead of choosing the next block randomly, this fiendish program
-uses a special algorithm to give you the worst possible brick. Playing
-Bastet can be a very frustrating experience!
+Have you ever thought that Tetris is evil because it never sends you
+that straight "I" brick you need to clear four rows? Well, Tetris(R)
+probably is not so malevolent, but Bastet certainly is. >:-> Bastet
+stands for "bastard tetris", and is a simple ncurses-based Tetris(R)
+clone for Linux. Instead of choosing the next block randomly, this
+fiendish program uses a special algorithm to give you the worst
+possible brick. Playing Bastet can be a very frustrating experience!
 
 Bonus points for presenting it to your friends as "just another Tetris
 clone".
 
-If you're in X and have TERM set to "xterm-color", the text cursor will
-stay enabled, which looks a little weird. Use "xterm" or "xterm-256color"
-instead.
+If you're in X and have TERM set to "xterm-color", the text cursor
+will stay enabled, which looks a little weird. Use "xterm" or
+"xterm-256color" instead.
diff --git a/games/beetle-lynx-libretro/README b/games/beetle-lynx-libretro/README
index bc44a8376d..6b52855cbf 100644
--- a/games/beetle-lynx-libretro/README
+++ b/games/beetle-lynx-libretro/README
@@ -1,7 +1,8 @@
 Beetle/Mednafen LYNX is an Atari Lynx video game system emulator that
 can be used as a libretro core.
 
-Beetle/Mednafen LYNX requires the following BIOS image file for operation:
+Beetle/Mednafen LYNX requires the following BIOS image file for
+operation:
 
 * lynxboot.img (Lynx Boot Image)
 
diff --git a/games/beetle-lynx-libretro/beetle-lynx-libretro.info b/games/beetle-lynx-libretro/beetle-lynx-libretro.info
index 1a609266f6..d06c024a7f 100644
--- a/games/beetle-lynx-libretro/beetle-lynx-libretro.info
+++ b/games/beetle-lynx-libretro/beetle-lynx-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="c4ebd5ddc70076b71a4026eabcdf9043"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/beetle-ngp-libretro/README b/games/beetle-ngp-libretro/README
index 6bf8022612..02e502fb7c 100644
--- a/games/beetle-ngp-libretro/README
+++ b/games/beetle-ngp-libretro/README
@@ -1,5 +1,5 @@
-Beetle/Mednafen NGP is a SNK Neo Geo Pocket (Color) video game system emulator
-that can be used as a libretro core.
+Beetle/Mednafen NGP is a SNK Neo Geo Pocket (Color) video game system
+emulator that can be used as a libretro core.
 
 To build the debugging symbols use:
   DEBUG=1 beetle-ngp-libretro.SlackBuild
diff --git a/games/beetle-ngp-libretro/beetle-ngp-libretro.info b/games/beetle-ngp-libretro/beetle-ngp-libretro.info
index d5858535da..75ccf907c0 100644
--- a/games/beetle-ngp-libretro/beetle-ngp-libretro.info
+++ b/games/beetle-ngp-libretro/beetle-ngp-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="8c57907ee3b7aebf2d7d325fcf35c7ec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/beetle-pce-fast-libretro/README b/games/beetle-pce-fast-libretro/README
index d2e0b4a57c..1af7e587de 100644
--- a/games/beetle-pce-fast-libretro/README
+++ b/games/beetle-pce-fast-libretro/README
@@ -1,13 +1,13 @@
-Beetle/Mednafen PCE FAST is a libretro port of Mednafen PCE Fast with the PC
-Engine SuperGrafx module removed.
+Beetle/Mednafen PCE FAST is a libretro port of Mednafen PCE Fast with
+the PC Engine SuperGrafx module removed.
 
 Beetle/Mednafen PCE FAST requires the following BIOS image file for CD
 emulation to work:
 
 * syscard3.pce (PCE-CD BIOS)
 
-Any CD-ROM System BIOS will work, but some them are known to be incompatible
-with certain games.
+Any CD-ROM System BIOS will work, but some them are known to be
+incompatible with certain games.
 
 To build the debugging symbols use:
   DEBUG=1 beetle-pce-fast-libretro.SlackBuild
diff --git a/games/beetle-pce-fast-libretro/beetle-pce-fast-libretro.info b/games/beetle-pce-fast-libretro/beetle-pce-fast-libretro.info
index d0ec13b94a..4eb7a0ee10 100644
--- a/games/beetle-pce-fast-libretro/beetle-pce-fast-libretro.info
+++ b/games/beetle-pce-fast-libretro/beetle-pce-fast-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="848510cefb9fd24eff3b38f5a400014e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/beetle-pcfx-libretro/README b/games/beetle-pcfx-libretro/README
index 76b5e28a68..41c8a4ad1e 100644
--- a/games/beetle-pcfx-libretro/README
+++ b/games/beetle-pcfx-libretro/README
@@ -1,7 +1,7 @@
 Beetle/Mednafen PC-FX is a libretro port of Mednafen PCFX.
 
-Beetle/Mednafen PCFX requires the following BIOS image file for CD emulation to
-work:
+Beetle/Mednafen PCFX requires the following BIOS image file for CD
+emulation to work:
 
 * pcfx.rom (PC-FX BIOS)
 
diff --git a/games/beetle-pcfx-libretro/beetle-pcfx-libretro.info b/games/beetle-pcfx-libretro/beetle-pcfx-libretro.info
index 9e653e3f4f..ec7f2b6e69 100644
--- a/games/beetle-pcfx-libretro/beetle-pcfx-libretro.info
+++ b/games/beetle-pcfx-libretro/beetle-pcfx-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="8ce52c0f9e8f39e1ddd3135a4bb28f12"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/beetle-psx-libretro/README b/games/beetle-psx-libretro/README
index e41f5c3cc6..8f9444318f 100644
--- a/games/beetle-psx-libretro/README
+++ b/games/beetle-psx-libretro/README
@@ -1,6 +1,6 @@
-Mednafen PSX (Beetle PSX) is a Sony PlayStation1 video game system emulator
-that can be used as a libretro core. It is a libretro port of Mednafen
-PlayStation.
+Mednafen PSX (Beetle PSX) is a Sony PlayStation1 video game system
+emulator that can be used as a libretro core. It is a libretro port of
+Mednafen PlayStation.
 
 Mednafen-PSX requires the following BIOS image files for operation:
 
@@ -10,19 +10,21 @@ Mednafen-PSX requires the following BIOS image files for operation:
 
 The bios names are case sensitive.
 
-The scph7003.bin BIOS image is the same as scph5501.bin, but will need to be
-renamed to scph5501.bin to be used.
+The scph7003.bin BIOS image is the same as scph5501.bin, but will need
+to be renamed to scph5501.bin to be used.
 
-Mednafen can load CD-ROM games from a ripped/dumped copy of the disc such as
-CUE+BIN, CloneCD "CCD/IMG/SUB" rips and cdrdao "TOC" files. For games with more
-than one CD create a M3U file(plain-text, ".m3u" extension) and enter the
-filenames of the CUE/TOC/CCD files.
+Mednafen can load CD-ROM games from a ripped/dumped copy of the
+disc such as CUE+BIN, CloneCD "CCD/IMG/SUB" rips and cdrdao "TOC"
+files. For games with more than one CD create a M3U file(plain-text,
+".m3u" extension) and enter the filenames of the CUE/TOC/CCD files.
 
-Beetle PSX can use an OpenGL or Vulkan renderer instead of the accurate software
-renderer. This will require support in the libretro frontend, video card and driver.
+Beetle PSX can use an OpenGL or Vulkan renderer instead of the
+accurate software renderer. This will require support in the libretro
+frontend, video card and driver.
 
-To switch between OpenGL and Vulkan renderers configure the video driver in
-RetroArch. This can be done in the menu at 'Settings > Drivers > Video Driver'.
+To switch between OpenGL and Vulkan renderers configure the video
+driver in RetroArch. This can be done in the menu at 'Settings >
+Drivers > Video Driver'.
 
 To build the OpenGL renderer use:
   OPENGL=1 ./beetle-psx-libretro.SlackBuild
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 f3fd9edb1b..07c89fa49d 100644
--- a/games/beetle-psx-libretro/beetle-psx-libretro.info
+++ b/games/beetle-psx-libretro/beetle-psx-libretro.info
@@ -1,10 +1,10 @@
 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"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/beetle-saturn-libretro/beetle-saturn-libretro.info b/games/beetle-saturn-libretro/beetle-saturn-libretro.info
index f5da54a114..89a1764574 100644
--- a/games/beetle-saturn-libretro/beetle-saturn-libretro.info
+++ b/games/beetle-saturn-libretro/beetle-saturn-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="92c6614a0a7754756febb25d47aed43b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/beetle-supergrafx-libretro/README b/games/beetle-supergrafx-libretro/README
index 4bb58c49cf..924c918cc3 100644
--- a/games/beetle-supergrafx-libretro/README
+++ b/games/beetle-supergrafx-libretro/README
@@ -1,13 +1,13 @@
-PC Engine SuperGrafx is a NEC PC Engine SuperGrafx video game system emulator
-that can be used as a libretro core.
+PC Engine SuperGrafx is a NEC PC Engine SuperGrafx video game system
+emulator that can be used as a libretro core.
 
-Beetle/Mednafen SGX requires the following BIOS image file for CD emulation to
-work:
+Beetle/Mednafen SGX requires the following BIOS image file for CD
+emulation to work:
 
 * syscard3.pce
 
-Any CD-ROM System BIOS will work, but some them are known to be incompatible
-with certain games.
+Any CD-ROM System BIOS will work, but some them are known to be
+incompatible with certain games.
 
 To build the debugging symbols use:
   DEBUG=1 ./beetle-supergrafx-libretro.SlackBuild
diff --git a/games/beetle-supergrafx-libretro/beetle-supergrafx-libretro.info b/games/beetle-supergrafx-libretro/beetle-supergrafx-libretro.info
index 28512c5558..4b6e05b808 100644
--- a/games/beetle-supergrafx-libretro/beetle-supergrafx-libretro.info
+++ b/games/beetle-supergrafx-libretro/beetle-supergrafx-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="da53f1740db2a7c51757839cd132f261"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/beetle-vb-libretro/README b/games/beetle-vb-libretro/README
index 176b1f3f4f..60e5132ba0 100644
--- a/games/beetle-vb-libretro/README
+++ b/games/beetle-vb-libretro/README
@@ -1,5 +1,5 @@
-Beetle/Mednafen VB is a Nintendo Virtual Boy Video game system emulator that
-can be used as a libretro core.
+Beetle/Mednafen VB is a Nintendo Virtual Boy Video game system
+emulator that can be used as a libretro core.
 
 To build the debugging symbols use:
   DEBUG=1 ./beetle-vb-libretro.SlackBuild
diff --git a/games/beetle-vb-libretro/beetle-vb-libretro.info b/games/beetle-vb-libretro/beetle-vb-libretro.info
index 0cb8580ff9..beeee3f4d0 100644
--- a/games/beetle-vb-libretro/beetle-vb-libretro.info
+++ b/games/beetle-vb-libretro/beetle-vb-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="d9f0d74d96840dfd8db1c729b53379e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/beetle-wswan-libretro/README b/games/beetle-wswan-libretro/README
index d684c81ea3..989f36325c 100644
--- a/games/beetle-wswan-libretro/README
+++ b/games/beetle-wswan-libretro/README
@@ -1,5 +1,5 @@
-Beetle/Mednafen WSWAN is a WonderSwan (Color) video game system emulator that
-can be used as a libretro core.
+Beetle/Mednafen WSWAN is a WonderSwan (Color) video game system
+emulator that can be used as a libretro core.
 
 To build the debugging symbols use:
   DEBUG=1 ./beetle-wswan-libretro.SlackBuild
diff --git a/games/beetle-wswan-libretro/beetle-wswan-libretro.info b/games/beetle-wswan-libretro/beetle-wswan-libretro.info
index 79fd589c8b..1e23a7ff6b 100644
--- a/games/beetle-wswan-libretro/beetle-wswan-libretro.info
+++ b/games/beetle-wswan-libretro/beetle-wswan-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="241afe036448455c6b37d5a25f1a61a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/berusky2-data/README b/games/berusky2-data/README
index 4a4efc80f7..8c680da834 100644
--- a/games/berusky2-data/README
+++ b/games/berusky2-data/README
@@ -1,4 +1,5 @@
 Data for Berusky II game.
+
 Berusky II (Bugs Escape 3D) is our second finished project. We adopted
-the idea and the basic logical building blocks of the game from the first
-part.
+the idea and the basic logical building blocks of the game from the
+first part.
diff --git a/games/berusky2/README b/games/berusky2/README
index 63d8585a56..57ee46bb3b 100644
--- a/games/berusky2/README
+++ b/games/berusky2/README
@@ -1,7 +1,7 @@
 Berusky II (Bugs Escape 3D) is our second finished project. We adopted
-the idea and the basic logical building blocks of the game from the first
-part. The technical processing, however, has seen major changes since
-the first part. The entire game takes place in a 3D environment which
-brings along many advantages. In addition to arbitrary turning and level
-zooming, the main advantage is especially the new structure of logical
-plots which, thanks to the 3D technology, happen in space.
+the idea and the basic logical building blocks of the game from the
+first part. The technical processing, however, has seen major changes
+since the first part. The entire game takes place in a 3D environment
+which brings along many advantages. In addition to arbitrary turning
+and level zooming, the main advantage is especially the new structure
+of logical plots which, thanks to the 3D technology, happen in space.
diff --git a/games/blastem-libretro/README b/games/blastem-libretro/README
index d9e43fc894..136bb018ab 100644
--- a/games/blastem-libretro/README
+++ b/games/blastem-libretro/README
@@ -1,5 +1,6 @@
-BlastEm has the goal of being an extremely accurate Genesis emulator while
-still running on relatively modest hardware by using advanced techniques.
+BlastEm has the goal of being an extremely accurate Genesis emulator
+while still running on relatively modest hardware by using advanced
+techniques.
 
 To build the debugging symbols use:
   DEBUG=1 ./blastem-libretro.SlackBuild
diff --git a/games/blastem-libretro/blastem-libretro.info b/games/blastem-libretro/blastem-libretro.info
index 7704b0c62e..73176e2cf8 100644
--- a/games/blastem-libretro/blastem-libretro.info
+++ b/games/blastem-libretro/blastem-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="a4ddb4a6e1e189fb36b3f8e003ddb1db"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/bloodcm/README b/games/bloodcm/README
index 154eaf3a29..30629a9271 100644
--- a/games/bloodcm/README
+++ b/games/bloodcm/README
@@ -13,5 +13,5 @@ To play BloodCM: Launch EDuke32, select BloodCM in the "Custom Game"
 drop-down list, click "Start".
 
 When new versions of BloodCM are released, the download URL doesn't
-change. If you get an md5sum error on the downloaded file, please contact
-the maintainer of this SlackBuild.
+change. If you get an md5sum error on the downloaded file, please
+contact the maintainer of this SlackBuild.
diff --git a/games/blueMSX-libretro/README b/games/blueMSX-libretro/README
index eb66a25dab..0de9f92e8f 100644
--- a/games/blueMSX-libretro/README
+++ b/games/blueMSX-libretro/README
@@ -1,12 +1,12 @@
-blueMSX is a MSX video game system emulator that can be used as a libretro
-core.
+blueMSX is a MSX video game system emulator that can be used as a
+libretro core.
 
-blueMSX is a cycle accurate emulator that emulates all generations of MSX
-computers as well as SVI, ColecoVision and Sega SG-1000.
+blueMSX is a cycle accurate emulator that emulates all generations of
+MSX computers as well as SVI, ColecoVision and Sega SG-1000.
 
-The required bios images are included with the standalone blueMSX source
-package, the 'Machines' directory can be copied into the RetroArch system/bios
-directory.
+The required bios images are included with the standalone blueMSX
+source package, the 'Machines' directory can be copied into the
+RetroArch system/bios directory.
 
 To build the debugging symbols use:
   DEBUG=1 ./blueMSX-libretro.SlackBuild
diff --git a/games/blueMSX-libretro/blueMSX-libretro.info b/games/blueMSX-libretro/blueMSX-libretro.info
index 4c134c0246..3982f6a833 100644
--- a/games/blueMSX-libretro/blueMSX-libretro.info
+++ b/games/blueMSX-libretro/blueMSX-libretro.info
@@ -8,5 +8,5 @@ MD5SUM="28b1023e636524988bbad65349ba5aac \
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/bluez-sixaxis/README b/games/bluez-sixaxis/README
index 2a4d2b5cd2..9afe2b9b2c 100644
--- a/games/bluez-sixaxis/README
+++ b/games/bluez-sixaxis/README
@@ -1,10 +1,10 @@
-BlueZ provides support for the core Bluetooth layers and protocols. It is flexible,
-efficient and uses a modular implementation.
+BlueZ provides support for the core Bluetooth layers and protocols. It
+is flexible, efficient and uses a modular implementation.
 
-This package provides only the sixaxis plugin (missing from the main Slackware
-bluez release). It plugs into the existing bluez package which, as part of main
-Slackware, is expected to be installed already.
+This package provides only the sixaxis plugin (missing from the main
+Slackware bluez release). It plugs into the existing bluez package
+which, as part of main Slackware, is expected to be installed already.
 
-To enable the sixaxis plugin after installation, you may need to restart Slackware
-or, at the very least, restart the system bluetooth facililties via the
-/etc./rc.d/rc.bluetooth script.
+To enable the sixaxis plugin after installation, you may need to
+restart Slackware or, at the very least, restart the system bluetooth
+facililties via the /etc./rc.d/rc.bluetooth script.
diff --git a/games/bomberclone/README b/games/bomberclone/README
index 954a418dfe..5a2dc3bddf 100644
--- a/games/bomberclone/README
+++ b/games/bomberclone/README
@@ -1,5 +1,5 @@
-This game, i hope it will soon be a good Clone of the game AtomicBomberMan
-or even something new, depends on what you all want to have. The Network
-will support from the beginning only TCP/IP (UDP Port 11000 for the Game
-and UDP Port 11111 for the OpenGameCache Server). So everyone can play
-it over the internet. 
+This game, i hope it will soon be a good Clone of the game
+AtomicBomberMan or even something new, depends on what you all want to
+have. The Network will support from the beginning only TCP/IP (UDP Port
+11000 for the Game and UDP Port 11111 for the OpenGameCache Server). So
+everyone can play it over the internet.
diff --git a/games/brainparty/README b/games/brainparty/README
index 4534da9a01..7e436bbcb8 100644
--- a/games/brainparty/README
+++ b/games/brainparty/README
@@ -1,8 +1,9 @@
-Brain Party is a fun, free puzzle game for all the family that's made up of 36
-minigames designed to push your brain to its limits by testing memory, logic,
-mathematics, reaction time and more! Brain Party is split into two modes: test
-mode gives you five minigames in a row and adds up your brain weight to see how
-smart you are, and practise mode lets you play your favourite minigames as often
-as you want. If you do well enough, there are six extra minigames that can be
-unlocked as well as a new game mode designed to keep you playing and enjoying
-your favourite games even longer.
+Brain Party is a fun, free puzzle game for all the family that's made
+up of 36 minigames designed to push your brain to its limits by testing
+memory, logic, mathematics, reaction time and more! Brain Party is
+split into two modes: test mode gives you five minigames in a row and
+adds up your brain weight to see how smart you are, and practise mode
+lets you play your favourite minigames as often as you want. If you
+do well enough, there are six extra minigames that can be unlocked as
+well as a new game mode designed to keep you playing and enjoying your
+favourite games even longer.
diff --git a/games/brickout/README b/games/brickout/README
index 6c95edfdea..afaf7fd606 100644
--- a/games/brickout/README
+++ b/games/brickout/README
@@ -1,2 +1,3 @@
-"Brickout" is a ball-and-paddle game where it's your objective to destroy
-bricks on the screen. Gameplay is similar to "Breakout" and "Arkanoid".
+"Brickout" is a ball-and-paddle game where it's your objective to
+destroy bricks on the screen. Gameplay is similar to "Breakout" and
+"Arkanoid".
diff --git a/games/brutalchess/README b/games/brutalchess/README
index a382864c9f..963aaa4bd8 100644
--- a/games/brutalchess/README
+++ b/games/brutalchess/README
@@ -1,3 +1,4 @@
-This is Brutal Chess Alpha, version 0.5. Brutal Chess is a cross-platform GPL 
-chess game with 3D graphics powered by OpenGL and SDL. To build Brutal Chess
-you will need SDL, SDL_Image, and FreeType. These are included with Slackware.
+This is Brutal Chess Alpha, version 0.5. Brutal Chess is a
+cross-platform GPL chess game with 3D graphics powered by OpenGL
+and SDL. To build Brutal Chess you will need SDL, SDL_Image, and
+FreeType. These are included with Slackware.
diff --git a/games/bsnes-mercury/README b/games/bsnes-mercury/README
index 0cc8f82781..9ed36c43b3 100644
--- a/games/bsnes-mercury/README
+++ b/games/bsnes-mercury/README
@@ -1,13 +1,13 @@
-bsnes-mercury is a Super Nintendo video game system emulator that can be used
-as a libretro core.
+bsnes-mercury is a Super Nintendo video game system emulator that can
+be used as a libretro core.
 
-bsnes-mercury is a fork of higan, aiming to restore some useful features that
-have been removed, as well as improving performance a bit. Maximum accuracy is
-still uncompromisable; anything that affects accuracy is optional and off by
-default.
+bsnes-mercury is a fork of higan, aiming to restore some useful
+features that have been removed, as well as improving performance a
+bit. Maximum accuracy is still uncompromisable; anything that affects
+accuracy is optional and off by default.
 
-bsnes-mercury optionally supports using the following BIOS image file for
-operation:
+bsnes-mercury optionally supports using the following BIOS image file
+for operation:
 
 * dsp1.data.rom (DSP1 DATA)
 * dsp1.program.rom (DSP1 PROGRAM)
diff --git a/games/bsnes-mercury/bsnes-mercury.info b/games/bsnes-mercury/bsnes-mercury.info
index 1e737d14e3..031bd14a84 100644
--- a/games/bsnes-mercury/bsnes-mercury.info
+++ b/games/bsnes-mercury/bsnes-mercury.info
@@ -6,5 +6,5 @@ MD5SUM="f7779264f2a7808f623cf3219a7006de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/bstone/bstone.SlackBuild b/games/bstone/bstone.SlackBuild
index d03d5695b4..b37623834f 100644
--- a/games/bstone/bstone.SlackBuild
+++ b/games/bstone/bstone.SlackBuild
@@ -6,19 +6,17 @@
 
 # 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
 # build old versions any more.
-
 # 20170921 bkw: update for v1.1.9.
-
 # 20170807 bkw: update for v1.1.8, use upstream's icon instead of mine.
-
 # 20170621 bkw: fix build on -current
 
 PRGNAM=bstone
-VERSION=${VERSION:-1.1.16_2}
+VERSION=${VERSION:-1.2.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/bstone/bstone.info b/games/bstone/bstone.info
index 070dafbff4..79108fb39d 100644
--- a/games/bstone/bstone.info
+++ b/games/bstone/bstone.info
@@ -1,9 +1,9 @@
 PRGNAM="bstone"
-VERSION="1.1.16_2"
+VERSION="1.2.9"
 HOMEPAGE="http://bibendovsky.github.io/bstone/"
-DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.1.16-2/bstone-1.1.16-2.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="bf025e3e20c9866a23d7a0eb615d0a15 \
+MD5SUM="58bb68e6f7282fdf27f41a9aa90cdb6f \
         a63c88fc5b399ffb5ed42dc215321f36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/bstone/datadir.diff b/games/bstone/datadir.diff
index ebb339fe27..19a7100c32 100644
--- a/games/bstone/datadir.diff
+++ b/games/bstone/datadir.diff
@@ -1,7 +1,7 @@
-diff -Naur bstone-1.1.14/src/3d_main.cpp bstone-1.1.14.patched/src/3d_main.cpp
---- bstone-1.1.14/src/3d_main.cpp	2019-11-09 05:08:15.000000000 -0500
-+++ bstone-1.1.14.patched/src/3d_main.cpp	2019-11-27 14:08:41.481084182 -0500
-@@ -10523,24 +10523,7 @@
+diff -Naur bstone-1.2.8/src/3d_main.cpp bstone-1.2.8.patched/src/3d_main.cpp
+--- bstone-1.2.8/src/3d_main.cpp	2020-07-10 09:58:35.000000000 -0400
++++ bstone-1.2.8.patched/src/3d_main.cpp	2020-08-04 03:07:36.266707676 -0400
+@@ -10722,20 +10722,7 @@
  
  const std::string& get_default_data_dir()
  {
@@ -12,17 +12,13 @@ diff -Naur bstone-1.1.14/src/3d_main.cpp bstone-1.1.14.patched/src/3d_main.cpp
 -	{
 -		is_initialized = true;
 -
--		auto sdl_dir = ::SDL_GetBasePath();
+-		result = bstone::file_system::get_working_dir();
 -
--		if (sdl_dir)
--		{
--			result = sdl_dir;
--			::SDL_free(sdl_dir);
--		}
--	}
 -#ifdef __vita__
--	result = "ux0:/data/bstone/";
+-		result = "ux0:/data/bstone/";
 -#endif
+-	}
+-
 +	static std::string result = "/usr/share/games/bstone/";
  	return result;
  }
diff --git a/games/burgerspace/burgerspace.info b/games/burgerspace/burgerspace.info
index 8284efaf77..7a721b8787 100644
--- a/games/burgerspace/burgerspace.info
+++ b/games/burgerspace/burgerspace.info
@@ -1,7 +1,7 @@
 PRGNAM="burgerspace"
 VERSION="1.9.2"
 HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/burgerspace-1.9.2.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/burgerspace-1.9.2.tar.gz"
 MD5SUM="8675449bb1c3c014bc51837b60f6cc47"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/bzflag/README b/games/bzflag/README
index ffb8ff730e..e680a2952e 100644
--- a/games/bzflag/README
+++ b/games/bzflag/README
@@ -1,4 +1,4 @@
-BZFlag is a free multiplayer multiplatform 3D tank battle game. The name
-stands for Battle Zone capture Flag. It runs on Irix, Linux, *BSD, Windows,
-Mac OS X and other platforms. It's one of the most popular games ever on
-Silicon Graphics machines.
+BZFlag is a free multiplayer multiplatform 3D tank battle game. The
+name stands for Battle Zone capture Flag. It runs on Irix, Linux, *BSD,
+Windows, Mac OS X and other platforms. It's one of the most popular
+games ever on Silicon Graphics machines.
diff --git a/games/cannonball-libretro/cannonball-libretro.info b/games/cannonball-libretro/cannonball-libretro.info
index 0c46c0b14e..983823f1a7 100644
--- a/games/cannonball-libretro/cannonball-libretro.info
+++ b/games/cannonball-libretro/cannonball-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="75e26712b783541015325853b4386df9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/chessx/chessx.SlackBuild b/games/chessx/chessx.SlackBuild
index 8b237e7a3d..70301fd877 100644
--- a/games/chessx/chessx.SlackBuild
+++ b/games/chessx/chessx.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=chessx
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,8 +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 {} \;
 
-# Compile the application with Qt5
-lupdate chessx.pro
+# Compile the application with Qt
+lupdate-qt5 chessx.pro
+lrelease-qt5 i18n/*.ts
 qmake-qt5 QMAKE_CXXFLAGS="$SLKCFLAGS"
 make
 
diff --git a/games/chessx/chessx.info b/games/chessx/chessx.info
index 041d84f18b..02e439284d 100644
--- a/games/chessx/chessx.info
+++ b/games/chessx/chessx.info
@@ -1,8 +1,8 @@
 PRGNAM="chessx"
-VERSION="1.5.0"
+VERSION="1.5.4"
 HOMEPAGE="http://chessx.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/chessx/files/chessx/1.5.0/chessx-1.5.0.tgz"
-MD5SUM="4c18aea95d16d670fd959679e2945f5f"
+DOWNLOAD="http://sourceforge.net/projects/chessx/files/chessx/1.5.4/chessx-1.5.4.tgz"
+MD5SUM="ef52fde4ac75f92e10c81b4e3e601089"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/games/chocolate-doom/README b/games/chocolate-doom/README
index 8a56cb458a..7ed08c678e 100644
--- a/games/chocolate-doom/README
+++ b/games/chocolate-doom/README
@@ -12,7 +12,7 @@ To play chocolate-doom, you need at least one of:
 
 For chocolate-heretic:
   heretic.wad from Registered Heretic
-  heretic1.wad from Shareware Heretic (games/heretic_shareware_data on SBo)
+  heretic1.wad from Shareware Heretic (games/heretic_shareware_data)
 
 For chocolate-hexen:
   hexen.wad from Registered Hexen
@@ -25,7 +25,9 @@ Place the WAD file(s) in /usr/share/games/doom.
 
 For Chex Quest, get chex.wad from the game, and chex.deh from
 https://www.doomworld.com/idgames/utils/exe_edit/patches/chexdeh, place
-them both in /usr/share/games/doom, and run: chocolate-doom -iwad chex.wad
+them both in /usr/share/games/doom, and run:
+
+chocolate-doom -iwad chex.wad
 
 The Strife demo (strife0.wad) doesn't work with Chocolate Doom.
 Chex Quest 2 and 3 are not supported.
diff --git a/games/chocolate-doom/chocolate-doom.SlackBuild b/games/chocolate-doom/chocolate-doom.SlackBuild
index 1b2317bbd6..8fdfaa4555 100644
--- a/games/chocolate-doom/chocolate-doom.SlackBuild
+++ b/games/chocolate-doom/chocolate-doom.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201019 bkw: update for v3.0.1.
 # 20180101 bkw:
 # - Update for v3.0.0. Building 2.3.0 still works, if someone needs it.
 
@@ -23,7 +24,7 @@
 # - update README and slack-desc
 
 PRGNAM=chocolate-doom
-VERSION=${VERSION:-3.0.0}
+VERSION=${VERSION:-3.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/chocolate-doom/chocolate-doom.info b/games/chocolate-doom/chocolate-doom.info
index 96cebcd492..1a0ef1da93 100644
--- a/games/chocolate-doom/chocolate-doom.info
+++ b/games/chocolate-doom/chocolate-doom.info
@@ -1,8 +1,8 @@
 PRGNAM="chocolate-doom"
-VERSION="3.0.0"
+VERSION="3.0.1"
 HOMEPAGE="http://www.chocolate-doom.org/"
-DOWNLOAD="https://www.chocolate-doom.org/downloads/3.0.0/chocolate-doom-3.0.0.tar.gz"
-MD5SUM="8bece4533e144ca01f13daa1b5912e95"
+DOWNLOAD="https://www.chocolate-doom.org/downloads/3.0.1/chocolate-doom-3.0.1.tar.gz"
+MD5SUM="9080b4c0a4e6383d841c51d4d245cad8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_mixer SDL2_net"
diff --git a/games/chroma/README b/games/chroma/README
index fdd9d5fb6c..7de3c24f87 100644
--- a/games/chroma/README
+++ b/games/chroma/README
@@ -1,6 +1,6 @@
-Chroma is an abstract puzzle game. A variety of colourful shapes are arranged in
-a series of increasingly complex patterns, forming fiendish traps that must be
-disarmed and mysterious puzzles that must be manipulated in order to give up
-their subtle secrets. Initially so straightforward that anyone can pick it up
-and begin to play, yet gradually becoming difficult enough to tax even the
-brightest of minds.
+Chroma is an abstract puzzle game. A variety of colourful shapes
+are arranged in a series of increasingly complex patterns, forming
+fiendish traps that must be disarmed and mysterious puzzles that must
+be manipulated in order to give up their subtle secrets. Initially
+so straightforward that anyone can pick it up and begin to play, yet
+gradually becoming difficult enough to tax even the brightest of minds.
diff --git a/games/circuslinux/README b/games/circuslinux/README
index 3b22c6c86a..07bf15f0a6 100644
--- a/games/circuslinux/README
+++ b/games/circuslinux/README
@@ -1,9 +1,9 @@
-"Circus Linux!" is a clone of the Atari 2600 game "Circus Atari," produced
-by Atari, Inc. (which is itself a clone of an earlier arcade game named,
-simply "Circus").
+"Circus Linux!" is a clone of the Atari 2600 game "Circus Atari,"
+produced by Atari, Inc. (which is itself a clone of an earlier arcade
+game named, simply "Circus").
 
 The object is to move a teeter-totter back and forth across the screen
-to bounce clowns up into the air. When they reach the top, they pop rows
-of balloons and then fall back down.
+to bounce clowns up into the air. When they reach the top, they pop
+rows of balloons and then fall back down.
 
 (The gameplay is similar to the classics "Breakout" and "Arkanoid.")
diff --git a/games/ckmame/README b/games/ckmame/README
index e7326a0c11..1dee886d19 100644
--- a/games/ckmame/README
+++ b/games/ckmame/README
@@ -1,3 +1,4 @@
-A program to check ROM sets for MAME, the Multiple Arcade Machine Emulator. It
-tells you which ROM files are missing or have a wrong checksum, and can delete
-unknown and unused files from the ROM sets, and rename or move ROM files.
+A program to check ROM sets for MAME, the Multiple Arcade Machine
+Emulator. It tells you which ROM files are missing or have a wrong
+checksum, and can delete unknown and unused files from the ROM sets,
+and rename or move ROM files.
diff --git a/games/clonekeen/README b/games/clonekeen/README
index f37533af99..8c32951b27 100644
--- a/games/clonekeen/README
+++ b/games/clonekeen/README
@@ -1,7 +1,7 @@
-CloneKeen is an open-source clone of ID's classic DOS game Commander
-Keen. CloneKeen runs under many platforms including Linux & win32. There
-are some improvements over the original such as 2-player support. Original
-game data files are required.
+CloneKeen is an open-source clone of ID's classic DOS game
+Commander Keen. CloneKeen runs under many platforms including Linux &
+win32. There are some improvements over the original such as 2-player
+support. Original game data files are required.
 
 clonekeen is able to run Commander Keen episodes 1, 2, and 3. Episodes
 4 through 6 are not yet supported. Copy the *.ck1, *.ck2, and/or *.ck3
diff --git a/games/colem/README b/games/colem/README
index 08d1919f5f..756c751512 100644
--- a/games/colem/README
+++ b/games/colem/README
@@ -20,10 +20,11 @@ to provide the ROM image for the emulator to use:
 1. Buld the package with the ROM image:
 
   Place either "coleco.rom" or "coleco.zip" (containing "coleco.rom")
-  in the directory with the SlackBuild script. The resulting package will
-  include the ROM image in "usr/share/colem/coleco.rom". If you do this,
-  DO NOT give anyone a copy of the package! Using the ROM might possibly
-  be legal, but bundling it with ColEm is against the ColEm license.
+  in the directory with the SlackBuild script. The resulting package
+  will include the ROM image in "usr/share/colem/coleco.rom". If you
+  do this, DO NOT give anyone a copy of the package! Using the ROM
+  might possibly be legal, but bundling it with ColEm is against the
+  ColEm license.
 
 2. Build the package without the ROM image:
 
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 e8774c5ac3..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="http://urchlay.naptime.net/~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/README b/games/commandergenius/README
index 681095b082..695ad14184 100644
--- a/games/commandergenius/README
+++ b/games/commandergenius/README
@@ -25,12 +25,13 @@ not available via the in-game downloader, place the data files somewhere
 under /usr/share/games/commandergenius or ~/.CommanderGenius, and edit
 ~/.CommanderGenius/games.cfg to tell the game where to find the files.
 
-commandergenius also has a HQP (High Quality Pack) with enhanced graphics
-and sound for Keen 1 through 4. For Keen 1 and Keen 4, choose "Keen 1
-Special" and "Keen 4 Special" from the Game Center, to get the HQP versions
-of the games. For Keen 2 and Keen 3, the HQP will automatically be used
-if the games are installed to ~/.CommanderGenius/games/keen2 and
-~/.CommanderGenius/games/keen3, with games.cfg entries like so:
+commandergenius also has a HQP (High Quality Pack) with enhanced
+graphics and sound for Keen 1 through 4. For Keen 1 and Keen 4,
+choose "Keen 1 Special" and "Keen 4 Special" from the Game Center,
+to get the HQP versions of the games. For Keen 2 and Keen 3,
+the HQP will automatically be used if the games are installed to
+~/.CommanderGenius/games/keen2 and ~/.CommanderGenius/games/keen3,
+with games.cfg entries like so:
 
 &Dir=games/keen2/keen2.exe
 /Name=keen2
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/connectagram/README b/games/connectagram/README
index 412b58f82e..9528c87fc3 100644
--- a/games/connectagram/README
+++ b/games/connectagram/README
@@ -1,6 +1,7 @@
 Connectagram is a word unscrambling game. The board consists of several
-scrambled words that are joined together. You can choose the length of the
-words, the amount of words, and the pattern that the words are arranged in. The
-game provides a hint option for times when you are stuck, and features an
-online word lookup that fetches the definitions of each word from Wiktionary.
-Your current progress is automatically saved.
+scrambled words that are joined together. You can choose the length
+of the words, the amount of words, and the pattern that the words are
+arranged in. The game provides a hint option for times when you are
+stuck, and features an online word lookup that fetches the definitions
+of each word from Wiktionary.  Your current progress is automatically
+saved.
diff --git a/games/cosmosmash/cosmosmash.info b/games/cosmosmash/cosmosmash.info
index 02147ff59d..cb0c9edf8d 100644
--- a/games/cosmosmash/cosmosmash.info
+++ b/games/cosmosmash/cosmosmash.info
@@ -1,7 +1,7 @@
 PRGNAM="cosmosmash"
 VERSION="1.4.7"
 HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/cosmosmash.html"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/cosmosmash-1.4.7.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/cosmosmash-1.4.7.tar.gz"
 MD5SUM="f0c040b7dca95582e1b77da70d0cbf4a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/crimson/README b/games/crimson/README
index abbe0faaf2..8dec51c9c2 100644
--- a/games/crimson/README
+++ b/games/crimson/README
@@ -1,6 +1,6 @@
-Crimson Fields is a turn-based tactical war game. It can be played against
-a human opponent in hot-seat mode in front of the same machine, over a
-network, or via e-mail, or against the computer. 
+Crimson Fields is a turn-based tactical war game. It can be played
+against a human opponent in hot-seat mode in front of the same machine,
+over a network, or via e-mail, or against the computer.
 
 The game comes with tools for creating custom maps and campaigns, and a
 converter for maps from the classic games Battle Isle and History Line.
diff --git a/games/crispy-doom/crispy-doom.SlackBuild b/games/crispy-doom/crispy-doom.SlackBuild
index a651bd7445..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.7.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 8a29c2d7ba..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.7.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.7.2.tar.gz"
-MD5SUM="bf0de157cb50d29b62b293e86192b9cd"
+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/crrcsim/README b/games/crrcsim/README
index 5249fe894e..8b47455460 100644
--- a/games/crrcsim/README
+++ b/games/crrcsim/README
@@ -1,5 +1,6 @@
-CRRCSim is a model airplane flight simulation program for Linux with ports to
-other platforms. Using CRRCSim you can learn how to fly model aircraft, test
-new aircraft designs, and improve your skills by practicing in the relative
-safety of your PC. CRRCSim specializes in thermal and slope soaring simulation,
-though powered models are also included.
+CRRCSim is a model airplane flight simulation program for Linux with
+ports to other platforms. Using CRRCSim you can learn how to fly
+model aircraft, test new aircraft designs, and improve your skills by
+practicing in the relative safety of your PC. CRRCSim specializes in
+thermal and slope soaring simulation, though powered models are also
+included.
diff --git a/games/cubosphere/README b/games/cubosphere/README
index a626d23347..08dc5ce7d9 100644
--- a/games/cubosphere/README
+++ b/games/cubosphere/README
@@ -1,7 +1,8 @@
-Goal of this project is a remake of the Playstation 1 Game "Kula World" / "Roll
-Away". It is designed platform independend, written in C++ and using the
-following libraries: OpenGL, SDL (Simple DirectMedia Layer), libjpeg, LUA,
-GLSL-Shader.
+Goal of this project is a remake of the Playstation 1 Game "Kula World"
+/ "Roll Away". It is designed platform independend, written in C++ and
+using the following libraries: OpenGL, SDL (Simple DirectMedia Layer),
+libjpeg, LUA, GLSL-Shader.
 
-Note: In order to load the background music (eg. loading *.mp3 files), install
-smpeg and then rebuild the sdl package that comes with Slackware.
+Note: In order to load the background music (eg. loading *.mp3 files),
+install smpeg and then rebuild the sdl package that comes with
+Slackware.
diff --git a/games/curseofwar/README b/games/curseofwar/README
index a660a17270..68a887720d 100644
--- a/games/curseofwar/README
+++ b/games/curseofwar/README
@@ -1,6 +1,6 @@
-This is a fast-paced action strategy game for Linux implemented using 
-ncurses user interface. Unlike most RTS, you are not controlling units, 
+This is a fast-paced action strategy game for Linux implemented using
+ncurses user interface. Unlike most RTS, you are not controlling units,
 but focus on high-level strategic planning: Building infrastructure,
-securing resources, and moving your armies.
-The core game mechanics turns out to be quite close to WWI-WWII type of 
-warfare, however, there is no explicit reference to any historical period.
+securing resources, and moving your armies.  The core game mechanics
+turns out to be quite close to WWI-WWII type of warfare, however, there
+is no explicit reference to any historical period.
diff --git a/games/cutemaze/README b/games/cutemaze/README
index 8e6541e7b9..337bca562e 100644
--- a/games/cutemaze/README
+++ b/games/cutemaze/README
@@ -1,4 +1,5 @@
-CuteMaze is a simple, top-down game in which mazes are randomly generated using
-one of a choice of several different algorithms. You move the character through
-the maze while hunting for targets (cheese, by default) - the game is won once
-all of these targets have been picked up.
+CuteMaze is a simple, top-down game in which mazes are randomly
+generated using one of a choice of several different algorithms. You
+move the character through the maze while hunting for targets (cheese,
+by default) - the game is won once all of these targets have been
+picked up.
diff --git a/games/d1x-rebirth/d1x-rebirth.info b/games/d1x-rebirth/d1x-rebirth.info
index ed4f9d0953..86cc4465ae 100644
--- a/games/d1x-rebirth/d1x-rebirth.info
+++ b/games/d1x-rebirth/d1x-rebirth.info
@@ -1,7 +1,7 @@
 PRGNAM="d1x-rebirth"
 VERSION="0.58.1"
 HOMEPAGE="https://www.dxx-rebirth.com/"
-DOWNLOAD="https://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz"
+DOWNLOAD="https://www.dxx-rebirth.com/download/dxx/rebirth/d1x-rebirth_v0.58.1-src.tar.gz"
 MD5SUM="8f43e66191fdedd0c7ff9278719accf1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/d2x-rebirth/d2x-rebirth.info b/games/d2x-rebirth/d2x-rebirth.info
index 3f61438137..da4a2ed0a2 100644
--- a/games/d2x-rebirth/d2x-rebirth.info
+++ b/games/d2x-rebirth/d2x-rebirth.info
@@ -1,7 +1,7 @@
 PRGNAM="d2x-rebirth"
 VERSION="0.58.1"
 HOMEPAGE="https://www.dxx-rebirth.com/"
-DOWNLOAD="https://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.58.1-src.tar.gz"
+DOWNLOAD="https://www.dxx-rebirth.com/download/dxx/rebirth/d2x-rebirth_v0.58.1-src.tar.gz"
 MD5SUM="584187fdd922d732e47a64451085eaca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/darkplaces/README b/games/darkplaces/README
index 3feca3e654..4c32c28df8 100644
--- a/games/darkplaces/README
+++ b/games/darkplaces/README
@@ -1,28 +1,27 @@
 darkplaces (crossplatform Quake modification)
 
-DarkPlaces is a gameplay modification and a source port engine based on the
-computer game Quake.  It adds enhanced network code, with asynchronous delta
-compression, a built in server browser, real-time lighting, and bump mapping.
-It makes use of the OpenGL Shading Language and supports Ogg Vorbis.
+DarkPlaces is a gameplay modification and a source port engine based
+on the computer game Quake.  It adds enhanced network code, with
+asynchronous delta compression, a built in server browser, real-time
+lighting, and bump mapping.  It makes use of the OpenGL Shading
+Language and supports Ogg Vorbis.
 
-By default the binaries will not be built from source, we will instead use
-the supplied binaries.  if you wish to build your own binaries from source
-them pass SOURCE=YES to the build. There is a known issue with Darkplaces 
-sometimes failing to compile if MAKEFLAGS is set higher than -j1.  This 
-should only be an issue if you have custom MAKEFLAGS set in your 
-.bash_profile or in sbopkg.conf.
+By default the binaries will not be built from source, we will instead
+use the supplied binaries.  if you wish to build your own binaries
+from source them pass SOURCE=YES to the build. There is a known
+issue with Darkplaces sometimes failing to compile if MAKEFLAGS is
+set higher than -j1.  This should only be an issue if you have custom
+MAKEFLAGS set in your .bash_profile or in sbopkg.conf.
 
-The application launcher will launch the OpenGL version of Quake, however
-if you would prefer it to launch the SDL version then pass SDL=YES to the
-build.
+The application launcher will launch the OpenGL version of Quake,
+however if you would prefer it to launch the SDL version then pass
+SDL=YES to the build.
 
-Also the darkplaces game modifications are disabled by default to maintain
-that "classic" look of the original quake.  To enable the modifications,
-pass DPMOD=YES to the build.
+Also the darkplaces game modifications are disabled by default to
+maintain that "classic" look of the original quake.  To enable the
+modifications, pass DPMOD=YES to the build.
 
 *NOTE* DarkPlaces is only a game engine modification; you still need the
 original quake *.pak game files to play quake.  See README.SLACKWARE for
 more information on this and information for adding high resolution 
 textures for people with modern video cards.
-
-
diff --git a/games/dhewm3/README b/games/dhewm3/README
index a837620562..7a80a554f1 100644
--- a/games/dhewm3/README
+++ b/games/dhewm3/README
@@ -24,7 +24,7 @@ Doom 3 and the Resurrection of Evil expansion pack data are not included
 with dhewm 3 and are still covered by the original EULA. They must be
 acquired separately such as from the retail DVDs or with SteamCMD. The
 data pak00*.pk4 files need to be placed in the Doom 3 data directory
-(/usr/share/games/dhewm3/base) and for RoE (/usr/share/games/dhewm3/d3xp),
+(/usr/share/games/dhewm3/base). For RoE (/usr/share/games/dhewm3/d3xp),
 symbolic links to the data directories will work.
 
 For those using the CDs/DVD to obtain the game data, the official 1.3.1
diff --git a/games/dice/README b/games/dice/README
index dea964aca2..06ad716341 100644
--- a/games/dice/README
+++ b/games/dice/README
@@ -1,4 +1,4 @@
 DICE - Discrete Integrated Circuit Emulator
 
-It emulates computer systems that lack any type of CPU, consisting only of
-discrete logic components.
+It emulates computer systems that lack any type of CPU, consisting only
+of discrete logic components.
diff --git a/games/domination/domination.SlackBuild b/games/domination/domination.SlackBuild
index 5a9361897c..82644667a0 100644
--- a/games/domination/domination.SlackBuild
+++ b/games/domination/domination.SlackBuild
@@ -9,13 +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.1}
-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 c82af95399..ea806b13d4 100644
--- a/games/domination/domination.info
+++ b/games/domination/domination.info
@@ -1,8 +1,8 @@
 PRGNAM="domination"
-VERSION="1.2.1"
+VERSION="1.2.3"
 HOMEPAGE="http://domination.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/domination/Domination/1.2.1/Domination_1.2.1.zip"
-MD5SUM="f4e5d0586d34ba11421f1a678d338a88"
+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/README b/games/doomretro/README
index 96e48436ab..35a68083b6 100644
--- a/games/doomretro/README
+++ b/games/doomretro/README
@@ -1,18 +1,25 @@
-DOOM Retro is the classic, refined DOOM source port. It represents what DOOM
-should be today, in all its dark, gritty, unapologetically pixellated glory.
-DOOM Retro's source code is forked from Chocolate DOOM, with enhancements from
-other DOOM source ports, as well as many orignal ideas. DOOM Retro is
-deliberately minimalist by design, and does a few things differently when
-compared with other source ports.
+DOOM Retro is the classic, refined DOOM source port. It represents
+what DOOM should be today, in all its dark, gritty, unapologetically
+pixellated glory.  DOOM Retro's source code is forked from Chocolate
+DOOM, with enhancements from other DOOM source ports, as well as many
+orignal ideas. DOOM Retro is deliberately minimalist by design, and
+does a few things differently when compared with other source ports.
 
-For MIDI playback, first build and install FluidSynth, then build and install
-SDL2_mixer (so that it has FluidSynth support), and then build and install DOOM
-Retro. Then, before starting DOOM Retro, set the SDL_SOUNDFONTS environment
-variable to the path to a soundfont in sf2 format:
+The game looks in /usr/share/games/doom (and a few other places) for
+game date. To play Shareware Doom, install doom_shareware_data. To
+play Doom 2 or the full version of Doom, copy doom2.wad or doom.wad
+from the game CD or install directory to /usr/share/games/doom.
+
+For MIDI playback, first build and install FluidSynth, then build
+and install SDL2_mixer (so that it has FluidSynth support), and then
+build and install DOOM Retro. Then, before starting DOOM Retro, set
+the SDL_SOUNDFONTS environment variable to the path to a soundfont in
+sf2 format:
 
 i.e.
 
   export SDL_SOUNDFONTS=/path/to/soundfonts.sf2
 
-Settings are stored in $HOME/.config/doomretro. After starting Doom Retro for
-the first time, you will find an editable doomretro.cfg there.
+Settings are stored in $HOME/.config/doomretro. After starting Doom
+Retro for the first time, you will find an editable doomretro.cfg
+there.
diff --git a/games/doomretro/doomretro.SlackBuild b/games/doomretro/doomretro.SlackBuild
index 54ffb3e806..2b10e898bb 100644
--- a/games/doomretro/doomretro.SlackBuild
+++ b/games/doomretro/doomretro.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for doomretro
 
 # Copyright 2017 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +23,26 @@
 #  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:
+# - take over maintenance
+# - update for v3.5.4
+# - move binary to /usr/games
+# - include wrapper script
+
+# *** RANT MODE ON***
+# Every Doom engine on the planet besides this one attempts to load *some*
+# IWAD file, if you don't give it one on the command line. But this one is
+# supposed to pop up a file dialog to let you choose one. Only the dialog
+# code hasn't been ported to Linux. So for us, unlike *all other* Doom
+# source ports, we *must* specify the IWAD file on the command line.  So I
+# have to use a wrapper script to make it act like a normal Doom engine...
+# *** RANT MODE OFF***
+
 PRGNAM=doomretro
-VERSION=${VERSION:-2.9.3}
+VERSION=${VERSION:-4.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,14 +79,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+
+# All these --excludes save ~30MB in /tmp, and avoid the recursive chmod
+# tripping over broken symlinks.
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz \
+  --exclude=xcode \
+  --exclude=codeblocks \
+  --exclude=msvc \
+  --exclude=SDL2\*
+
 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
@@ -76,11 +100,13 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip 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/games
+mv $PKG/usr/bin/$PRGNAM $PKG/usr/games/$PRGNAM.bin
+rm -rf $PKG/usr/bin
+install -m0755 -oroot -groot $CWD/$PRGNAM.sh $PKG/usr/games/$PRGNAM
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
@@ -92,8 +118,7 @@ convert res/$PRGNAM.ico[2] $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
 convert res/$PRGNAM.ico[3] $PKG/usr/share/icons/hicolor/24x24/apps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CODEOWNERS LICENSE *.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CODEOWNERS LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/doomretro/doomretro.desktop b/games/doomretro/doomretro.desktop
index 73ad4a0761..fcb98398f7 100644
--- a/games/doomretro/doomretro.desktop
+++ b/games/doomretro/doomretro.desktop
@@ -3,6 +3,6 @@ Type=Application
 Name=Doom Retro
 GenericName=Classic refined DOOM source port
 Icon=doomretro
-Exec=/usr/bin/doomretro %F
+Exec=/usr/games/doomretro %F
 Terminal=false
 Categories=Game;ActionGame;
diff --git a/games/doomretro/doomretro.info b/games/doomretro/doomretro.info
index 3ada58dfb1..dfce384778 100644
--- a/games/doomretro/doomretro.info
+++ b/games/doomretro/doomretro.info
@@ -1,10 +1,10 @@
 PRGNAM="doomretro"
-VERSION="2.9.3"
+VERSION="4.0.3"
 HOMEPAGE="https://www.doomretro.com"
-DOWNLOAD="https://github.com/bradharding/doomretro/archive/v2.9.3/doomretro-2.9.3.tar.gz"
-MD5SUM="f71c3b5176a126a31398f4daca73ecd0"
+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"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/doomretro/doomretro.sh b/games/doomretro/doomretro.sh
new file mode 100644
index 0000000000..71b6a0b4f8
--- /dev/null
+++ b/games/doomretro/doomretro.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# doomretro.sh by B. Watson. Part of the SlackBuilds.org doomretro build.
+# Licensed under the WTFPL.
+
+# 20200414 bkw: doomretro on Linux doesn't open any IWAD file by default,
+# and doesn't offer a file-chooser dialog. So this wrapper script tries
+# to pick a suitable IWAD to use, if it can find one. Notice that this
+# only happens if we're run with no arguments.
+
+# Can't use an absolute path for this, or else the engine expects to
+# read doomretro.wad and write doomretro.cfg to the same directory as
+# the binary.
+realbin=doomretro.bin
+
+if [ "$1" ]; then
+  # we got arguments, just use them as-is
+  exec $realbin "$@"
+fi
+
+# no args, so try to find an IWAD and pass it as an arg to the real exe.
+wadpath="$DOOMWADDIR:\
+$DOOMWADPATH:\
+.:\
+/usr/share/games/doom:\
+/usr/local/share/games/doom:\
+/usr/share/doomretro:\
+/usr/share/doom:\
+/usr/local/doom:\
+$HOME:\
+$HOME/doom:\
+$HOME/.doom:\
+$HOME/.doomwads"
+
+iwads="doom2.wad:doom.wad:doom1.wad"
+
+IFS=:
+for dir in $wadpath; do
+  if [ -d "$dir" ]; then
+    for wad in $iwads; do
+      wad="$dir/$wad"
+      if [ -e "$wad" ]; then
+        echo "$( basename $0 ): Using $wad" 1>&2
+        exec $realbin "$wad"
+      fi
+    done
+  fi
+done
+
+# if we get, no wads found, let the real binary complain about it
+exec $realbin
diff --git a/games/doomseeker/README b/games/doomseeker/README
index e7335513fb..0e20075e4e 100644
--- a/games/doomseeker/README
+++ b/games/doomseeker/README
@@ -2,15 +2,15 @@ doomseeker (server browser for Doom and related games)
 
 Doomseeker is a cross-platform server browser for Doom and related
 games. The goal of Doomseeker is to provide a smooth, consistent
-experience for players regardless of port or platform. Doomseeker provides
-support for Chocolate Doom, Odamex, Zandronum[*], Sonic Robo Blast 2
-(aka srb2), and Turok 2 Remastered[*].
+experience for players regardless of port or platform. Doomseeker
+provides support for Chocolate Doom, Odamex, Zandronum[*], Sonic Robo
+Blast 2 (aka srb2), and Turok 2 Remastered[*].
 
 The first time you run Doomseeker, you will have tell it the location
 of your game engine binaries and IWAD files. It won't look in your
-PATH for the binaries, they'll be in either /usr/bin, /usr/games,
-or similar. If you don't know where your IWAD file(s) are located,
-try /usr/share/games/doom.
+PATH for the binaries, they'll be in either /usr/bin, /usr/games, or
+similar. If you don't know where your IWAD file(s) are located, try
+/usr/share/games/doom.
 
 This requires one or more of chocolate-doom, odamex, or srb2: to be
 useful for anything, it needs at least one supported game engine.
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/dreamchess/README b/games/dreamchess/README
index cfb7bcbf77..e8c98072e1 100644
--- a/games/dreamchess/README
+++ b/games/dreamchess/README
@@ -1,6 +1,7 @@
-DreamChess features 3D OpenGL graphics and provides various chess board sets, 
-ranging from classic wooden to flat.  A moderately strong chess engine is 
-included: Dreamer.  However, should this engine be too weak for you, then 
-you can use any other XBoard-compatible chess engine, including the popular 
-Crafty and GNU Chess.  Other features include on-screen move lists using SAN 
-notation, undo functionality, and savegames in PGN format.
+DreamChess features 3D OpenGL graphics and provides various chess board
+sets, ranging from classic wooden to flat.  A moderately strong chess
+engine is included: Dreamer.  However, should this engine be too weak
+for you, then you can use any other XBoard-compatible chess engine,
+including the popular Crafty and GNU Chess.  Other features include
+on-screen move lists using SAN notation, undo functionality, and
+savegames in PGN format.
diff --git a/games/dreamchess/dreamchess.SlackBuild b/games/dreamchess/dreamchess.SlackBuild
index b49420ffa3..e13792b066 100644
--- a/games/dreamchess/dreamchess.SlackBuild
+++ b/games/dreamchess/dreamchess.SlackBuild
@@ -3,17 +3,16 @@
 # Slackware build script for dreamchess
 
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
-# Maintained by Erik Hanson <erik@slackbuilds.org>
+# Maintained by Kent Fritz <fritz.kent@gmail.com>
 
 PRGNAM=dreamchess
-VERSION=${VERSION:-0.2.1_RC2}
-SRCVER=${SRCVER:-0.2.1-RC2}
+VERSION=${VERSION:-0.3.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
@@ -24,8 +23,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"
@@ -43,35 +42,36 @@ 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-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz ||  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 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" \
-LDFLAGS="-lm" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --disable-dependency-tracking \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
+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_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPY* INSTALL NEWS README \
+  NEWS.md README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/dreamchess/dreamchess.info b/games/dreamchess/dreamchess.info
index 2d7adabac1..ebfd935a86 100644
--- a/games/dreamchess/dreamchess.info
+++ b/games/dreamchess/dreamchess.info
@@ -1,10 +1,10 @@
 PRGNAM="dreamchess"
-VERSION="0.2.1_RC2"
+VERSION="0.3.0"
 HOMEPAGE="https://www.dreamchess.org/"
-DOWNLOAD="https://github.com/dreamchess/dreamchess/releases/download/0.2.1-RC2/dreamchess-0.2.1-RC2.tar.gz"
-MD5SUM="afb6d1b81d324dc76238f3607d84af30"
+DOWNLOAD="https://github.com/dreamchess/dreamchess/archive/0.3.0/dreamchess-0.3.0.tar.gz"
+MD5SUM="b7182cb12db05f28380bbfb29c8bca56"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="mxml"
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+REQUIRES="SDL2_mixer SDL2_image"
+MAINTAINER="Kent Fritz"
+EMAIL="fritz.kent@gmail.com"
diff --git a/games/ds-models/ds-models.info b/games/ds-models/ds-models.info
index 7e824c4a1b..7c026f0272 100644
--- a/games/ds-models/ds-models.info
+++ b/games/ds-models/ds-models.info
@@ -1,7 +1,7 @@
 PRGNAM="ds-models"
 VERSION="r15"
 HOMEPAGE="https://github.com/AA1999/ds-models"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ds-models-r15.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ds-models-r15.tar.gz"
 MD5SUM="9092e6862566680ad782673dea5a0980"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/dungeon/README b/games/dungeon/README
index e0f829af0d..192e46be7d 100644
--- a/games/dungeon/README
+++ b/games/dungeon/README
@@ -1,21 +1,21 @@
 dungeon (text adventure game)
 
-This "mainframe zork" has everything contained in the commercial ZORK I,
-part of ZORK II, and the endgame from ZORK III. Some mainframe computers
-don't have this full version, so if your mainframe doesn't have the
-endgame, the Bank of Zork, and the puzzle room, you are in for some
-new challenges.
+This "mainframe zork" has everything contained in the commercial ZORK
+I, part of ZORK II, and the endgame from ZORK III. Some mainframe
+computers don't have this full version, so if your mainframe doesn't
+have the endgame, the Bank of Zork, and the puzzle room, you are in for
+some new challenges.
 
-This version of Dungeon seems to be earlier than any of the ones available
-at www.if-archive.org. It was posted to USEnet ages ago. This build
-uses slightly modified sources, needed to get modern GNU Fortran to
-compile them.
+This version of Dungeon seems to be earlier than any of the ones
+available at www.if-archive.org. It was posted to USEnet ages ago. This
+build uses slightly modified sources, needed to get modern GNU Fortran
+to compile them.
 
-BTW, the source files say copyright INFOCOM, but allow non-commercial use.
-This was the last version before INFOCOM went commercial.
+BTW, the source files say copyright INFOCOM, but allow non-commercial
+use.  This was the last version before INFOCOM went commercial.
 
 This build includes the game map in /usr/doc/dungeon-$VERSION
 
 You can build a debugging (aka cheating) version of Dungeon by passing
-DEBUG=yes in the script's environment. This enables tracing and the
-GDT command.
+DEBUG=yes in the script's environment. This enables tracing and the GDT
+command.
diff --git a/games/dungeon/dungeon.info b/games/dungeon/dungeon.info
index 422720a1fd..466ae753f3 100644
--- a/games/dungeon/dungeon.info
+++ b/games/dungeon/dungeon.info
@@ -1,7 +1,7 @@
 PRGNAM="dungeon"
 VERSION="19800808"
 HOMEPAGE="http://almy.us/dungeon.html"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/dungeon-19800808.tar.gz \
+DOWNLOAD="https://slackware.uk/~urchlay/src/dungeon-19800808.tar.gz \
           http://almy.us/image/dungeon.jpg"
 MD5SUM="331f6fc1e02ba78ce7cb29a77fc0fe31 \
         1448fc6d9cae7f5b51660d304aa117b5"
diff --git a/games/dustrac/README b/games/dustrac/README
index 11235e7cb7..ae06ab49cc 100644
--- a/games/dustrac/README
+++ b/games/dustrac/README
@@ -1,4 +1,5 @@
-Dust Racing (Dustrac) is a tile-based, cross-platform 2D racing game written in
-Qt (C++) and OpenGL. Dust Racing comes with a Qt-based level editor for easy
-level creation. A custom engine, MiniCore, is used for physics modeling. Dust
-Racing 2D is inspired by Super Cars and Slicks'n Slide.
+Dust Racing (Dustrac) is a tile-based, cross-platform 2D racing game
+written in Qt (C++) and OpenGL. Dust Racing comes with a Qt-based level
+editor for easy level creation. A custom engine, MiniCore, is used for
+physics modeling. Dust Racing 2D is inspired by Super Cars and Slicks'n
+Slide.
diff --git a/games/edgar/edgar.SlackBuild b/games/edgar/edgar.SlackBuild
index 7fc67636d0..add25c542c 100644
--- a/games/edgar/edgar.SlackBuild
+++ b/games/edgar/edgar.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for the legend of edgar
 
-# Copyright 2017-9 Tim Dickson, dickson.tim@googlemail.com
+# Copyright 2017-20 Tim Dickson, dickson.tim@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=edgar
-VERSION=${VERSION:-1.32}
+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 a37fb14137..2e5d37c2fc 100644
--- a/games/edgar/edgar.info
+++ b/games/edgar/edgar.info
@@ -1,8 +1,8 @@
 PRGNAM="edgar"
-VERSION="1.32"
+VERSION="1.34"
 HOMEPAGE="https://www.parallelrealities.co.uk/games/edgar/"
-DOWNLOAD="https://github.com/riksweeney/edgar/archive/1.32/edgar-1.32.tar.gz"
-MD5SUM="35a9c0a00ca99900f467103d425e06e7"
+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/eduke32/README b/games/eduke32/README
index cca6e9518e..3ffb125dab 100644
--- a/games/eduke32/README
+++ b/games/eduke32/README
@@ -9,9 +9,10 @@ as eduke32_shareware_data, also available from slackbuilds.org.
 See README_game_data.txt
 
 eduke32 is an SDL application. It can be built with either SDL 1.2
-(included in Slackware), or SDL 2 (from SlackBuilds.org). By default, SDL
-2 is used if it's installed, otherwise SDL 1.2 is used. To force building
-with SDL 1.2, export SDL2=no in the environment before building eduke32.
+(included in Slackware), or SDL 2 (from SlackBuilds.org). By default,
+SDL 2 is used if it's installed, otherwise SDL 1.2 is used. To force
+building with SDL 1.2, export SDL2=no in the environment before
+building eduke32.
 
 If you want to play the HRP (High Resolution Pack), get the
 eduke32_hires_pack package from slackbuilds.org.
@@ -22,10 +23,10 @@ freepats or eawpats) from slackbuilds.org. The game looks for
 /etc/timidity/timidity.cfg, but timidity doesn't actually have to be
 installed.
 
-By default, the Build utilities (kextract kgroup transpal wad2art wad2map)
-are built by this script and installed in /usr/games. If you don't want
-these, you can set BUILD_UTILS=no in the environment before running the
-SlackBuild script.
+By default, the Build utilities (kextract kgroup transpal wad2art
+wad2map) are built by this script and installed in /usr/games. If you
+don't want these, you can set BUILD_UTILS=no in the environment before
+running the SlackBuild script.
 
 Note for 64-bit users: Despite the "32" in the name, this software
 builds and runs just fine as 64-bit native binaries :)
diff --git a/games/eduke32_hires_pack/README b/games/eduke32_hires_pack/README
index 6391dc8d00..8c2d47cc4e 100644
--- a/games/eduke32_hires_pack/README
+++ b/games/eduke32_hires_pack/README
@@ -17,5 +17,5 @@ http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip
 
 ...and save it in the same directory as the SlackBuild.
 
-If you've installed this package, but for some reason want to run eduke32
-without it, run "eduke32 -noautoload".
+If you've installed this package, but for some reason want to run
+eduke32 without it, run "eduke32 -noautoload".
diff --git a/games/empire/README b/games/empire/README
index 3b8f08c84a..76efddb5af 100644
--- a/games/empire/README
+++ b/games/empire/README
@@ -1,14 +1,14 @@
-Empire is a turn-based 4X wargame, where players command armies of units
-which they use to explore the game world, control territory, and attack
-opponents. The game world consists of "sectors", which may be designated as
-agricultural, industrial, etc. Control of these sectors grants the player a
-variety of raw and manufactured materials, which they may use to construct
-dozens of unit types.
+Empire is a turn-based 4X wargame, where players command armies of
+units which they use to explore the game world, control territory, and
+attack opponents. The game world consists of "sectors", which may be
+designated as agricultural, industrial, etc. Control of these sectors
+grants the player a variety of raw and manufactured materials, which
+they may use to construct dozens of unit types.
 
-In each round, the players submit their commands for the activities of their
-units to the central server, which executes all of the commands either
-simultaneously or in a sequence. Rounds can last anywhere from a few hours
-to a day. As such, a full game can take much longer than modern 4X games,
-depending on the size of the game world; "Blitz" games may last a few hours,
-while typical games last months and larger games can take up to a year to
-complete.
+In each round, the players submit their commands for the activities of
+their units to the central server, which executes all of the commands
+either simultaneously or in a sequence. Rounds can last anywhere from
+a few hours to a day. As such, a full game can take much longer than
+modern 4X games, depending on the size of the game world; "Blitz" games
+may last a few hours, while typical games last months and larger games
+can take up to a year to complete.
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 90e4613112..17fdc9e6d6 100644
--- a/games/endless-sky/endless-sky.SlackBuild
+++ b/games/endless-sky/endless-sky.SlackBuild
@@ -21,8 +21,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=endless-sky
-VERSION=${VERSION:-0.9.11}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.9.12}
+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/endless-sky.info b/games/endless-sky/endless-sky.info
index 393bc31e93..b34075399d 100644
--- a/games/endless-sky/endless-sky.info
+++ b/games/endless-sky/endless-sky.info
@@ -1,8 +1,8 @@
 PRGNAM="endless-sky"
-VERSION="0.9.11"
+VERSION="0.9.12"
 HOMEPAGE="http://endless-sky.github.io/"
-DOWNLOAD="https://github.com/endless-sky/endless-sky/archive/v0.9.11/endless-sky-0.9.11.tar.gz"
-MD5SUM="5e5d77bac1d0e25b0937b995aebbe990"
+DOWNLOAD="https://github.com/endless-sky/endless-sky/archive/v0.9.12/endless-sky-0.9.12.tar.gz"
+MD5SUM="af4954cab83ece599cfa46bc5a510464"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2 OpenAL"
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/enigma/README b/games/enigma/README
index ef324e00cd..520c2f7873 100644
--- a/games/enigma/README
+++ b/games/enigma/README
@@ -1,6 +1,6 @@
 enigma (puzzle game involving falling blocks)
 
-Enigma is a puzzle game involving falling blocks, exploding bombs, and pushing
-stuff around. It has elements of Boulderdash and elements of Sokoban, and
-anybody old enough to remember XOR on the Spectrum will see large elements of
-that in it.
+Enigma is a puzzle game involving falling blocks, exploding bombs,
+and pushing stuff around. It has elements of Boulderdash and elements
+of Sokoban, and anybody old enough to remember XOR on the Spectrum will
+see large elements of that in it.
diff --git a/games/eureka/README b/games/eureka/README
index 77b59d2af3..c848a450e7 100644
--- a/games/eureka/README
+++ b/games/eureka/README
@@ -1,6 +1,6 @@
-Eureka is a cross-platform DOOM level editor using the FLTK widget library. It
-is based on Yadex and provides a new interface, support for source ports and a
-3D preview feature.
+Eureka is a cross-platform DOOM level editor using the FLTK widget
+library. It is based on Yadex and provides a new interface, support for
+source ports and a 3D preview feature.
 
-Please see /usr/doc/eureka-1.07/INSTALL.txt for information on how Eureka
-looks for IWADs.
+Please see /usr/doc/eureka-1.07/INSTALL.txt for information on how
+Eureka looks for IWADs.
diff --git a/games/eureka/eureka.SlackBuild b/games/eureka/eureka.SlackBuild
index f031ef08b6..7aeae46b4b 100644
--- a/games/eureka/eureka.SlackBuild
+++ b/games/eureka/eureka.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for eureka
 
 # Copyright 2015 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +23,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200717 bkw: update for v1.27b
+
+# 20200415 bkw:
+# - take over maintenance
+# - i486 => i586
+# - update for v1.24
+
 PRGNAM=eureka
-VERSION=${VERSION:-1.21}
-SRCVER=${SRCVER:-121}
+VERSION=${VERSION:-1.27b}
+SRCVER=${VERSION/.}
 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 +49,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"
@@ -61,46 +69,46 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf eureka-$VERSION-source
-tar xvf $CWD/eureka-$SRCVER-source.tar.gz
+tar xvf $CWD/eureka-$SRCVER-source.tar.gz || \
+tar xvf $CWD/eureka-$VERSION-source.tar.gz
 cd eureka-$VERSION-source
 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 {} \;
-
-# The Makefile should not be setting the owner to root.
-sed -i "s/-o root//g" Makefile
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# And we're installing the icon and desktop file ourselves.
-sed -i "s/xdg-/# xdg-/g" Makefile
+# Game binaries go in /usr/games. And we're installing the icon and
+# desktop file ourselves.
+sed -i -e 's,\<bin\>,games,g' \
+       -e "s/xdg-/# xdg-/g" \
+       Makefile
 
 LINKER_FLAGS="\
-	-L/usr/X11R6/lib$LIBDIRSUFFIX \
-	-L/usr/lib$LIBDIRSUFFIX/eureka \
-	-ldl \
-	-lXfixes \
-	-lXcursor"
-
-mkdir -p $PKG/usr/bin
+   -lfltk \
+   -lfltk_images \
+   -lfltk_gl \
+   -lX11 \
+   -ldl \
+   -lXfixes \
+   -lXcursor"
+
+mkdir -p $PKG/usr/games
 make install \
-	PREFIX="$PKG/usr" \
-	LDFLAGS="$LINKER_FLAGS"
+   PREFIX="$PKG/usr" \
+   LDFLAGS="$LINKER_FLAGS"
+
+# Binary already stripped, thanks.
 
 mkdir -p $PKG/usr/share/applications
-cp misc/eureka.desktop $PKG/usr/share/applications
+cp misc/$PRGNAM.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/share/pixmaps
-cp misc/eureka.xpm $PKG/usr/share/pixmaps
+cp misc/$PRGNAM.xpm $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/man/man6
-install -m644 misc/eureka.6 $PKG/usr/man/man6
-gzip -9 $PKG/usr/man/man6/eureka.6
+gzip -9c < misc/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS.txt CHANGES.txt  GPL.txt INSTALL.txt README.txt TODO.txt docs/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/eureka/eureka.info b/games/eureka/eureka.info
index 113a548af8..42ea041c67 100644
--- a/games/eureka/eureka.info
+++ b/games/eureka/eureka.info
@@ -1,10 +1,10 @@
 PRGNAM="eureka"
-VERSION="1.21"
+VERSION="1.27b"
 HOMEPAGE="http://eureka-editor.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/eureka-editor/Eureka/1.21/eureka-121-source.tar.gz"
-MD5SUM="efa67e2022e70dcb22a2aa2e98542aa4"
+DOWNLOAD="http://downloads.sourceforge.net/project/eureka-editor/Eureka/1.27/eureka-1.27b-source.tar.gz"
+MD5SUM="ded6495c09e23bfe55513eb47abf17ea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
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/f1spirit/README b/games/f1spirit/README
index d93915f51b..c8dfd642de 100644
--- a/games/f1spirit/README
+++ b/games/f1spirit/README
@@ -1,9 +1,10 @@
 This game was developed for the RETRO-REMAKES REMAKE COMPETITION 2004
 organized by http://www.remakes.org
 
-This is the unofficial remake of Konami's F-1 SPIRIT which was originally
-released in 1987 for the MSX home computer systems.
+This is the unofficial remake of Konami's F-1 SPIRIT which was
+originally released in 1987 for the MSX home computer systems.
 
-The game starts in windowed mode, switch to fullscreen by pressing ALT+ENTER
+The game starts in windowed mode, switch to fullscreen by pressing
+ALT+ENTER
 
 To quit the game at ANY moment, press F12
diff --git a/games/fbalpha/README b/games/fbalpha/README
index 4695a6533a..29c1ae8fb3 100644
--- a/games/fbalpha/README
+++ b/games/fbalpha/README
@@ -1,13 +1,14 @@
-Final Burn Alpha is an arcade system emulator that can be used as a libretro
-core.
+Final Burn Alpha is an arcade system emulator that can be used as a
+libretro core.
 
 This package was previoulsy called libretro-fba.
 
-Final Burn Alpha may require both a parent and child romset to play games with,
-rebuilding romsets so they work properly is not supported on GNU/Linux, but the
-required dat files are included in the src tree.
+Final Burn Alpha may require both a parent and child romset to play
+games with, rebuilding romsets so they work properly is not supported
+on GNU/Linux, but the required dat files are included in the src tree.
 
-Romsets built for FB Alpha (0.2.97.38) are recommended for best results.
+Romsets built for FB Alpha (0.2.97.38) are recommended for best
+results.
 
 If you are building fbalpha for a Raspberry Pi 2, use:
   RPI2=1 ./fbalpha.SlackBuild
diff --git a/games/fbalpha/fbalpha.info b/games/fbalpha/fbalpha.info
index aabae92385..7ab0a1e104 100644
--- a/games/fbalpha/fbalpha.info
+++ b/games/fbalpha/fbalpha.info
@@ -6,5 +6,5 @@ MD5SUM="3e2e608993617046e10abf94fff3714c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/fceux/fceux.SlackBuild b/games/fceux/fceux.SlackBuild
index af96722a1a..476bb144be 100644
--- a/games/fceux/fceux.SlackBuild
+++ b/games/fceux/fceux.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=fceux
 VERSION=${VERSION:-2.2.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -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 {} \;
 
+# Fix building with python3
+patch -p1 < $CWD/scons-python3.patch
+
 # Set our CFLAGS, move man pages, disable debub symbols
 sed -i \
   -e "s|'-Wall'|${SLKCFLAGS}, '-Wall'|" \
diff --git a/games/fceux/scons-python3.patch b/games/fceux/scons-python3.patch
new file mode 100644
index 0000000000..c5a1080f60
--- /dev/null
+++ b/games/fceux/scons-python3.patch
@@ -0,0 +1,109 @@
+--- fceux-2.2.3/SConstruct.orig	2019-07-26 18:04:29.368573309 +0000
++++ fceux-2.2.3/SConstruct	2019-07-26 18:04:31.975265342 +0000
+@@ -46,30 +46,30 @@
+ # Default compiler flags:
+ env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare'])
+ 
+-if os.environ.has_key('PLATFORM'):
++if os.environ.get('PLATFORM'):
+   env.Replace(PLATFORM = os.environ['PLATFORM'])
+-if os.environ.has_key('CC'):
++if os.environ.get('CC'):
+   env.Replace(CC = os.environ['CC'])
+-if os.environ.has_key('CXX'):
++if os.environ.get('CXX'):
+   env.Replace(CXX = os.environ['CXX'])
+-if os.environ.has_key('WINDRES'):
++if os.environ.get('WINDRES'):
+   env.Replace(WINDRES = os.environ['WINDRES'])
+-if os.environ.has_key('CFLAGS'):
++if os.environ.get('CFLAGS'):
+   env.Append(CCFLAGS = os.environ['CFLAGS'].split())
+-if os.environ.has_key('CXXFLAGS'):
++if os.environ.get('CXXFLAGS'):
+   env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split())
+-if os.environ.has_key('CPPFLAGS'):
++if os.environ.get('CPPFLAGS'):
+   env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split())
+-if os.environ.has_key('LDFLAGS'):
++if os.environ.get('LDFLAGS'):
+   env.Append(LINKFLAGS = os.environ['LDFLAGS'].split())
+-if os.environ.has_key('PKG_CONFIG_PATH'):
++if os.environ.get('PKG_CONFIG_PATH'):
+   env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
+-if not os.environ.has_key('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin':
++if not os.environ.get('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin':
+   env['ENV']['PKG_CONFIG_PATH'] = "/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig"
+-if os.environ.has_key('PKG_CONFIG_LIBDIR'):
++if os.environ.get('PKG_CONFIG_LIBDIR'):
+   env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR']
+ 
+-print "platform: ", env['PLATFORM']
++print ("platform: ", env['PLATFORM'])
+ 
+ # compile with clang
+ if env['CLANG']:
+@@ -103,18 +103,18 @@
+     assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
+   if env['SDL2']:
+     if not conf.CheckLib('SDL2'):
+-      print 'Did not find libSDL2 or SDL2.lib, exiting!'
++      print ('Did not find libSDL2 or SDL2.lib, exiting!')
+       Exit(1)
+     env.Append(CPPDEFINES=["_SDL2"])
+     env.ParseConfig('pkg-config sdl2 --cflags --libs')
+   else:
+     if not conf.CheckLib('SDL'):
+-      print 'Did not find libSDL or SDL.lib, exiting!'
++      print ('Did not find libSDL or SDL.lib, exiting!')
+       Exit(1)
+     env.ParseConfig('sdl-config --cflags --libs')
+   if env['GTK']:
+     if not conf.CheckLib('gtk-x11-2.0'):
+-      print 'Could not find libgtk-2.0, exiting!'
++      print ('Could not find libgtk-2.0, exiting!')
+       Exit(1)
+     # Add compiler and linker flags from pkg-config
+     config_string = 'pkg-config --cflags --libs gtk+-2.0'
+@@ -153,7 +153,7 @@
+         env.Append(CCFLAGS = ["-I/usr/include/lua"])
+         lua_available = True
+       if lua_available == False:
+-        print 'Could not find liblua, exiting!'
++        print ('Could not find liblua, exiting!')
+         Exit(1)
+     else:
+       env.Append(CCFLAGS = ["-Isrc/lua/src"])
+@@ -167,7 +167,7 @@
+     gd = conf.CheckLib('gd', autoadd=1)
+     if gd == 0:
+       env['LOGO'] = 0
+-      print 'Did not find libgd, you won\'t be able to create a logo screen for your avis.'
++      print ('Did not find libgd, you won\'t be able to create a logo screen for your avis.')
+    
+   if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c', autoadd=1):
+     conf.env.Append(CCFLAGS = "-DOPENGL")
+@@ -181,8 +181,8 @@
+ if env['FRAMESKIP']:
+   env.Append(CPPDEFINES = ['FRAMESKIP'])
+ 
+-print "base CPPDEFINES:",env['CPPDEFINES']
+-print "base CCFLAGS:",env['CCFLAGS']
++print ("base CPPDEFINES:",env['CPPDEFINES'])
++print ("base CCFLAGS:",env['CCFLAGS'])
+ 
+ if env['DEBUG']:
+   env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0'])
+--- fceux-2.2.3/src/SConscript.orig    2019-07-26 18:08:11.297535443 +0000
++++ fceux-2.2.3/src/SConscript 2019-07-26 18:08:33.857781956 +0000
+@@ -33,7 +33,7 @@
+   platform_files = SConscript('drivers/sdl/SConscript')
+ file_list.append(platform_files)
+ 
+-print env['LINKFLAGS']
++print (env['LINKFLAGS'])
+ 
+ if env['PLATFORM'] == 'win32':
+   fceux = env.Program('fceux.exe', file_list)
+
+
diff --git a/games/ffgo/README b/games/ffgo/README
index d64c280425..6d41253055 100644
--- a/games/ffgo/README
+++ b/games/ffgo/README
@@ -1,4 +1,4 @@
-FFGo is a graphical launcher for FlightGear, i.e. a program whose purpose is to
-allow an easy assembling and running of a fgfs command line. It is a fork of the
-FGo! software written by Robert "erobo" Leda. FFGo is written in Python 3 and
-is based on CondConfigParser.
+FFGo is a graphical launcher for FlightGear, i.e. a program whose
+purpose is to allow an easy assembling and running of a fgfs command
+line. It is a fork of the FGo! software written by Robert "erobo"
+Leda. FFGo is written in Python 3 and is based on CondConfigParser.
diff --git a/games/fgrun/README b/games/fgrun/README
index d17ad3ac09..bd4e58518a 100644
--- a/games/fgrun/README
+++ b/games/fgrun/README
@@ -1,8 +1,8 @@
 Fgrun is a graphical front end for FlightGear.
 
-The airport's list doesn't seem to appear (or ever worse, it dissappears)
-when the refresh button is pressed. To (re)build this list execute the
-following line once the FlightGear-data is installed:
+The airport's list doesn't seem to appear (or ever worse, it
+dissappears) when the refresh button is pressed. To (re)build this
+list execute the following line once the FlightGear-data is installed:
 
 zcat /usr/share/FlightGear/Airports/metar.dat.gz > \
  ${HOME}/.fltk/flightgear.org/fgrun/airports.txt
diff --git a/games/fifengine/README b/games/fifengine/README
index f253007c04..bf6b59b54e 100644
--- a/games/fifengine/README
+++ b/games/fifengine/README
@@ -1,4 +1,4 @@
 FIFE is a free, open-source cross-platform game engine. It features
-hardware-accelerated 2D graphics, integrated GUI, audio support, lighting,
-map editor supporting top-down and isometric maps, pathfinding, virtual
-filesystem and more!
+hardware-accelerated 2D graphics, integrated GUI, audio support,
+lighting, map editor supporting top-down and isometric maps,
+pathfinding, virtual filesystem and more!
diff --git a/games/fizmo/README b/games/fizmo/README
index ef0b5db48f..393f19a2ed 100644
--- a/games/fizmo/README
+++ b/games/fizmo/README
@@ -6,8 +6,8 @@ to 5, 7 and 8. That means it allows you to play interactive fiction,
 also known as text adventures, which were implemented either by Infocom
 or created using the Inform compiler.
 
-By default, the curses (fizmo-ncursesw) and 'dumb' console (fizmo-console)
-executables are always built.
+By default, the curses (fizmo-ncursesw) and 'dumb' console
+(fizmo-console) executables are always built.
 
 Optional dependencies: these are auto-detected at build time, so just
 install them before building fizmo if you want to use them. If you have
@@ -24,5 +24,5 @@ glktermw - Required for experimental fizmo-glktermw executable. Probably
            in the environment.
 
 remglk   - Required for experimental fizmo-remglk executable. Probably
-           only of interest to developers. Can be disabled with REMGLK=no
-           in the environment.
+           only of interest to developers. Can be disabled with
+           REMGLK=no in the environment.
diff --git a/games/fmsx-libretro/README b/games/fmsx-libretro/README
index afd3fb897e..0ab14802df 100644
--- a/games/fmsx-libretro/README
+++ b/games/fmsx-libretro/README
@@ -1,6 +1,8 @@
-fMSX is a program that emulates MSX, MSX2, and MSX2+ 8bit home computers.
+fMSX is a program that emulates MSX, MSX2, and MSX2+ 8bit home
+computers.
 
-fMSX optionally supports using the following BIOS image file for operation:
+fMSX optionally supports using the following BIOS image file for
+operation:
 
 * MSX.ROM (MSX BIOS)
 * MSX2.ROM (MSX2 BIOS)
diff --git a/games/fmsx-libretro/fmsx-libretro.info b/games/fmsx-libretro/fmsx-libretro.info
index 3feff1b59e..726e2cc38b 100644
--- a/games/fmsx-libretro/fmsx-libretro.info
+++ b/games/fmsx-libretro/fmsx-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="ec4f1a3f891e2c5d2ad5ef07beaaf67a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/fortune-dune/README b/games/fortune-dune/README
index 37e1a7478c..d8a24105f4 100644
--- a/games/fortune-dune/README
+++ b/games/fortune-dune/README
@@ -17,6 +17,6 @@ Dune: House Harkonnen
 If you are not a fan of the prequel series, set PREQUELS=no in the
 environment to omit the prequel series quotes.
 
-To see a Dune fortune, run "fortune dune". To see Dune fortunes on login,
-edit /etc/profile.d/bsd-games-login-fortune.sh and add "dune" to the
-"fortune" command there.
+To see a Dune fortune, run "fortune dune". To see Dune fortunes on
+login, edit /etc/profile.d/bsd-games-login-fortune.sh and add "dune"
+to the "fortune" command there.
diff --git a/games/fortune-dune/fortune-dune.info b/games/fortune-dune/fortune-dune.info
index 0ebf73a711..83e9ba3260 100644
--- a/games/fortune-dune/fortune-dune.info
+++ b/games/fortune-dune/fortune-dune.info
@@ -1,7 +1,7 @@
 PRGNAM="fortune-dune"
 VERSION="2.0.1"
 HOMEPAGE="http://web.archive.org/web/20180611152119/https://github.com/lsdr/fortune-dune"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/fortune-dune-2.0.1.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/fortune-dune-2.0.1.tar.gz"
 MD5SUM="68d575d408a350789a866367846b62a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/fortune-farscape/README b/games/fortune-farscape/README
index acf64cd081..f889bd9feb 100644
--- a/games/fortune-farscape/README
+++ b/games/fortune-farscape/README
@@ -1,9 +1,9 @@
 fortune-farscape (Farscape quotes for fortune)
 
-Farscape is a science-fiction TV series (1999-2004) about an astronaut who
-ends up on the other side of the galaxy after crashing into a wormhole
-during the test flight of his space module Farscape-1. Here he joins a
-group of escaping prisoners on board a living ship.
+Farscape is a science-fiction TV series (1999-2004) about an astronaut
+who ends up on the other side of the galaxy after crashing into a
+wormhole during the test flight of his space module Farscape-1. Here
+he joins a group of escaping prisoners on board a living ship.
 
 This fortune file includes 392 quotes, from seasons 1-4 of the show and
 the Peacekeeper Wars miniseries. These were taken from:
diff --git a/games/fortune-farscape/fortune-farscape.info b/games/fortune-farscape/fortune-farscape.info
index 0a9aa7b12d..4054711f1c 100644
--- a/games/fortune-farscape/fortune-farscape.info
+++ b/games/fortune-farscape/fortune-farscape.info
@@ -1,7 +1,7 @@
 PRGNAM="fortune-farscape"
 VERSION="20191224"
 HOMEPAGE="https://en.wikiquote.org/wiki/Farscape"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/fortune-farscape-20191224.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/fortune-farscape-20191224.xz"
 MD5SUM="9a70ede55e521efa61744ed5c618109d"
 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/fortune-slackware/fortune-slackware.info b/games/fortune-slackware/fortune-slackware.info
index a674173afd..2f631dc4c5 100644
--- a/games/fortune-slackware/fortune-slackware.info
+++ b/games/fortune-slackware/fortune-slackware.info
@@ -1,7 +1,7 @@
 PRGNAM="fortune-slackware"
 VERSION="1.15"
 HOMEPAGE="http://web.archive.org/web/20110816020410/http://fauxascii.com/linux/mod_quotes.html"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/slack-fortunes-all-1.15.tgz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/slack-fortunes-all-1.15.tgz"
 MD5SUM="8fbf56ffc9ebceda518f02b3a8d0e55e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/fortune_doctor_who/fortune_doctor_who.SlackBuild b/games/fortune_doctor_who/fortune_doctor_who.SlackBuild
index 4956c85481..3dd56d97a6 100644
--- a/games/fortune_doctor_who/fortune_doctor_who.SlackBuild
+++ b/games/fortune_doctor_who/fortune_doctor_who.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=fortune_doctor_who
-VERSION=${VERSION:-20200108}
+VERSION=${VERSION:-20200923}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/fortune_doctor_who/fortune_doctor_who.info b/games/fortune_doctor_who/fortune_doctor_who.info
index 3dba6a8cfe..d02e2b9a95 100644
--- a/games/fortune_doctor_who/fortune_doctor_who.info
+++ b/games/fortune_doctor_who/fortune_doctor_who.info
@@ -1,5 +1,5 @@
 PRGNAM="fortune_doctor_who"
-VERSION="20150503"
+VERSION="20200923"
 HOMEPAGE="http://www.innermind.com/software/quotes/files/qfiles.htm"
 DOWNLOAD="http://www.innermind.com/software/quotes/files/Doctor_Who01-08-quotes.zip \
           http://www.innermind.com/software/quotes/files/Doctor_Who10-quotes.zip \
@@ -12,7 +12,7 @@ MD5SUM="e26d5ff60423ebd48b28e4e200d4b22f \
         13f25a1f6e37c1abd3963de90159db57 \
         c3d97d7600c04f3cc2afedc2283718ad \
         0ef08a18183b5745ada718834249a91c \
-        4260bde8fa39e3c86bf16d255c57542c"
+        e4579275f6d3a7c6bc2a6640402b7b5f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/fortune_firefly/README b/games/fortune_firefly/README
index f3edf93027..d7df06f7db 100644
--- a/games/fortune_firefly/README
+++ b/games/fortune_firefly/README
@@ -1,25 +1,26 @@
-This package contains fortunes from the TV series "Firefly", and it's movie
-"Serenity", by Joss Whedon.  The series survived only one season on Fox;
-the network scheduled a bad timeslot, played the episodes out of order,
-and in general helped seal its fate.  Nonetheless, the series built up a
-cult following; as DVD sales skyrocketted, Universal decided to sponsor
-a movie based on the series.
+This package contains fortunes from the TV series "Firefly", and it's
+movie "Serenity", by Joss Whedon.  The series survived only one season
+on Fox; the network scheduled a bad timeslot, played the episodes out
+of order, and in general helped seal its fate.  Nonetheless, the series
+built up a cult following; as DVD sales skyrocketted, Universal decided
+to sponsor a movie based on the series.
 
-Firefly is often described as a "Space Western".  A mix of humor and
-seriousness, it is sometimes described as "Star Wars" with the Rebellion
-having been brutally crushed and Han Solo needing a new job.  Over 500
-years in the future, a band of humans terraformed a nearby planetary system
-with dozens of habitable planets.  The most developed planets, toward
-the core, live in "civilization", and formed the Alliance; the planets
-on the rim tend to struggle to survive, and launched a failed rebellion
-against Alliance rule.  Captain Malcolm Reynolds, a former "browncoat"
-(rebel) commander, captains a Firefly-class starship named "Serenity",
-with a small, mostly loyal crew, taking whatever jobs (legal or otherwise)
-that they can.  Their lives become more complicated when, after taking on
-passengers for cover, they inadvertently take in a mentally disturbed girl
-who the Alliance wants more than anything else.
+Firefly is often described as a "Space Western".  A mix of humor
+and seriousness, it is sometimes described as "Star Wars" with
+the Rebellion having been brutally crushed and Han Solo needing a
+new job.  Over 500 years in the future, a band of humans terraformed
+a nearby planetary system with dozens of habitable planets.  The most
+developed planets, toward the core, live in "civilization", and formed
+the Alliance; the planets on the rim tend to struggle to survive,
+and launched a failed rebellion against Alliance rule.  Captain
+Malcolm Reynolds, a former "browncoat" (rebel) commander, captains
+a Firefly-class starship named "Serenity", with a small, mostly
+loyal crew, taking whatever jobs (legal or otherwise) that they can.
+Their lives become more complicated when, after taking on passengers
+for cover, they inadvertently take in a mentally disturbed girl who the
+Alliance wants more than anything else.
 
 All of the quotes in this package are copyrighted by Fox Broadcasting
-Corporation and Universal Pictures.  Authorship of the quotes is by Tim
-Minear, Joss Whedon, Ben Edulund, Jane Esperson, Drew Z. Greenberg, Jose
-Molina, Cheryl Cain, and Brent Matthews.
+Corporation and Universal Pictures.  Authorship of the quotes is by
+Tim Minear, Joss Whedon, Ben Edulund, Jane Esperson, Drew Z. Greenberg,
+Jose Molina, Cheryl Cain, and Brent Matthews.
diff --git a/games/fortune_firefly/fortune_firefly.info b/games/fortune_firefly/fortune_firefly.info
index 38e3840afa..7d4c36bfe8 100644
--- a/games/fortune_firefly/fortune_firefly.info
+++ b/games/fortune_firefly/fortune_firefly.info
@@ -1,7 +1,7 @@
 PRGNAM="fortune_firefly"
 VERSION="2.1.2"
 HOMEPAGE="https://github.com/AndrewReitz/fortune-firefly"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/firefly-2.1.2.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/firefly-2.1.2.xz"
 MD5SUM="68e2c4ec035043ba3a0bab0a2b5f64b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/freeciv/README b/games/freeciv/README
index f078ba0f1a..808370b684 100644
--- a/games/freeciv/README
+++ b/games/freeciv/README
@@ -2,11 +2,11 @@ Freeciv is a free turn-based multiplayer strategy game, in which each
 player becomes the leader of a civilization, fighting to obtain the
 ultimate goal: To become the greatest civilization.
 
-Players of the Civilization(R) series by Microprose(R) should feel at
-home, since one aim of Freeciv is to have optional modes (called rulesets)
-with compatible rules.
+Players of the Civilization(R) series by Microprose(R) should feel
+at home, since one aim of Freeciv is to have optional modes (called
+rulesets) with compatible rules.
 
-Freeciv is maintained by an international team of coders and enthusiasts,
-and is easily one of the most fun and addictive network games out
-there! That also means it has very extensive multilanguage support,
-something rare in games.
+Freeciv is maintained by an international team of coders and
+enthusiasts, and is easily one of the most fun and addictive network
+games out there! That also means it has very extensive multilanguage
+support, something rare in games.
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 d22be85d15..aabe16a08e 100644
--- a/games/freedink/README
+++ b/games/freedink/README
@@ -1,36 +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:
-- 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:
+  https://www.dinknetwork.com
 
-    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 942030008c..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:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -73,6 +73,10 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+# patch for upgraded sdl2
+patch src/input.cpp < "$CWD/patch_upgrade_sdl2-2.0.10"
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
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/patch_upgrade_sdl2-2.0.10 b/games/freedink/patch_upgrade_sdl2-2.0.10
new file mode 100644
index 0000000000..71a9e7cc24
--- /dev/null
+++ b/games/freedink/patch_upgrade_sdl2-2.0.10
@@ -0,0 +1,12 @@
+--- src/input.cpp	2020-09-04 17:04:11.132661873 +0200
++++ ../b/src/input.cpp	2020-09-04 17:04:52.825140645 +0200
+@@ -91,7 +91,8 @@
+ 
+   // TODO: don't attempt to simulate mouse events from touch events -
+   // fake mouse events often are de-centered
+-  SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "0");
++  SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "1");
++  SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "1");
+ 
+   /* Touch devices */
+   {
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/freedoom/README b/games/freedoom/README
index 0ea5b5d867..b737b4562a 100644
--- a/games/freedoom/README
+++ b/games/freedoom/README
@@ -15,9 +15,9 @@ freedoom1.wad  - Replacement IWAD for Doom I and Ultimate Doom.
 freedoom2.wad  - Replacement IWAD for Doom II and Final Doom.
 freedm.wad     - Standalone deathmatch-only level pack.
 
-To use these data files with zdoom, simply build and install this package.
-You will be prompted for which IWAD file to use (which game to play)
-when starting zdoom. Other Doom source ports may do the same, or may
-require a command-line option to set the IWAD file. Some engines may
-require symlinking "freedoom2.wad" to "doom2.wad" and "freedoom1.wad"
-to "doom.wad".
+To use these data files with zdoom, simply build and install this
+package.  You will be prompted for which IWAD file to use (which
+game to play) when starting zdoom. Other Doom source ports may do the
+same, or may require a command-line option to set the IWAD file. Some
+engines may require symlinking "freedoom2.wad" to "doom2.wad" and
+"freedoom1.wad" to "doom.wad".
diff --git a/games/freeminer/README b/games/freeminer/README
index 56bda7146e..395fa49f87 100644
--- a/games/freeminer/README
+++ b/games/freeminer/README
@@ -1,5 +1,5 @@
-Freeminer is a Minecraft-inspired sandbox game.
-Freeminer is based on Minetest which is developed by a number of contributors
-from all over the globe.
+Freeminer is a Minecraft-inspired sandbox game.  Freeminer is based on
+Minetest which is developed by a number of contributors from all over
+the globe.
 
 Optional dependency: leveldb
diff --git a/games/freeorion/README b/games/freeorion/README
index 400386ef5d..18aebebd17 100644
--- a/games/freeorion/README
+++ b/games/freeorion/README
@@ -1,8 +1,7 @@
-FreeOrion is a free, open source, turn-based space empire and
-galactic conquest (4X) computer game being designed and built
-by the FreeOrion project. FreeOrion is inspired by the tradition
-of the Master of Orion games, but is not a clone or remake of that
-series or any other game.
+FreeOrion is a free, open source, turn-based space empire and galactic
+conquest (4X) computer game being designed and built by the FreeOrion
+project. FreeOrion is inspired by the tradition of the Master of Orion
+games, but is not a clone or remake of that series or any other game.
 
-Note: for mitigating a hard to track segfault bug in freeoriond, clang is
-used to compile freeorion instead of gcc
+Note: for mitigating a hard to track segfault bug in freeoriond, clang
+is used to compile freeorion instead of gcc
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/games/frotz/doinst.sh b/games/frotz/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/games/frotz/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/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/system/fs-uae-arcade/README b/games/fs-uae-arcade/README
index 3d7668c656..3d7668c656 100644
--- a/system/fs-uae-arcade/README
+++ b/games/fs-uae-arcade/README
diff --git a/system/fs-uae-arcade/doinst.sh b/games/fs-uae-arcade/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/system/fs-uae-arcade/doinst.sh
+++ b/games/fs-uae-arcade/doinst.sh
diff --git a/games/fs-uae-arcade/fs-uae-arcade.SlackBuild b/games/fs-uae-arcade/fs-uae-arcade.SlackBuild
new file mode 100644
index 0000000000..085b942da1
--- /dev/null
+++ b/games/fs-uae-arcade/fs-uae-arcade.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# SlackBuild script for "fs-uae-arcade".
+
+# Copyright 2020- CRTS <crts@gmx.net>
+# Copyright 2013-2015 Marcel Saegebarth <marc@mos6581.de>
+# 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=fs-uae-arcade
+VERSION=${VERSION:-3.0.5}
+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/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -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 build
+make
+make install prefix=/usr DESTDIR=$PKG
+
+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/games/fs-uae-arcade/fs-uae-arcade.info b/games/fs-uae-arcade/fs-uae-arcade.info
new file mode 100644
index 0000000000..e181f05387
--- /dev/null
+++ b/games/fs-uae-arcade/fs-uae-arcade.info
@@ -0,0 +1,10 @@
+PRGNAM="fs-uae-arcade"
+VERSION="3.0.5"
+HOMEPAGE="https://fs-uae.net/"
+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 python-certifi"
+MAINTAINER="CRTS"
+EMAIL="crts@gmx.net"
diff --git a/system/fs-uae-arcade/slack-desc b/games/fs-uae-arcade/slack-desc
index 7fc57b1154..7fc57b1154 100644
--- a/system/fs-uae-arcade/slack-desc
+++ b/games/fs-uae-arcade/slack-desc
diff --git a/system/fs-uae-launcher/README b/games/fs-uae-launcher/README
index be59c8ae17..be59c8ae17 100644
--- a/system/fs-uae-launcher/README
+++ b/games/fs-uae-launcher/README
diff --git a/system/fs-uae-launcher/doinst.sh b/games/fs-uae-launcher/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/system/fs-uae-launcher/doinst.sh
+++ b/games/fs-uae-launcher/doinst.sh
diff --git a/games/fs-uae-launcher/fs-uae-launcher.SlackBuild b/games/fs-uae-launcher/fs-uae-launcher.SlackBuild
new file mode 100644
index 0000000000..2ce198388f
--- /dev/null
+++ b/games/fs-uae-launcher/fs-uae-launcher.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# SlackBuild script for "fs-uae-launcher".
+
+# Copyright 2020- CRTS <crts@gmx.net>
+# Copyright 2013-2015 Marcel Saegebarth <marc@mos6581.de>
+# 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=fs-uae-launcher
+VERSION=${VERSION:-3.0.5}
+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/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -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 build
+make
+make install prefix=/usr DESTDIR=$PKG
+
+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/games/fs-uae-launcher/fs-uae-launcher.info b/games/fs-uae-launcher/fs-uae-launcher.info
new file mode 100644
index 0000000000..2f1f702ebb
--- /dev/null
+++ b/games/fs-uae-launcher/fs-uae-launcher.info
@@ -0,0 +1,10 @@
+PRGNAM="fs-uae-launcher"
+VERSION="3.0.5"
+HOMEPAGE="https://fs-uae.net/"
+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 python-certifi"
+MAINTAINER="CRTS"
+EMAIL="crts@gmx.net"
diff --git a/system/fs-uae-launcher/slack-desc b/games/fs-uae-launcher/slack-desc
index a5db678416..a5db678416 100644
--- a/system/fs-uae-launcher/slack-desc
+++ b/games/fs-uae-launcher/slack-desc
diff --git a/games/fs-uae/README b/games/fs-uae/README
new file mode 100644
index 0000000000..42b833f4c7
--- /dev/null
+++ b/games/fs-uae/README
@@ -0,0 +1,5 @@
+FS-UAE focuses on emulating Amiga games using the accurate emulation
+code from WinUAE. It also has features to emulate a high-end Amiga with
+expansions.
+
+Note: Since version 2.3.x the FS-UAE Launcher is a separate package.
diff --git a/system/fs-uae/doinst.sh b/games/fs-uae/doinst.sh
index 4a25de5e6f..4a25de5e6f 100644
--- a/system/fs-uae/doinst.sh
+++ b/games/fs-uae/doinst.sh
diff --git a/games/fs-uae/fs-uae.SlackBuild b/games/fs-uae/fs-uae.SlackBuild
new file mode 100644
index 0000000000..3aa8b4d94e
--- /dev/null
+++ b/games/fs-uae/fs-uae.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# SlackBuild script for "fs-uae".
+
+# Copyright 2020- CRTS <crts@gmx.net>
+# Copyright 2012-2016 Marcel Saegebarth <marc@mos6581.de>
+# 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=fs-uae
+VERSION=${VERSION:-3.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 {} \;
+
+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
+
+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/fs-uae/fs-uae.info b/games/fs-uae/fs-uae.info
new file mode 100644
index 0000000000..3f4e454724
--- /dev/null
+++ b/games/fs-uae/fs-uae.info
@@ -0,0 +1,10 @@
+PRGNAM="fs-uae"
+VERSION="3.0.5"
+HOMEPAGE="https://fs-uae.net/"
+DOWNLOAD="https://fs-uae.net/stable/3.0.5/fs-uae-3.0.5.tar.gz"
+MD5SUM="14524d7e21a7eb6e3660a8eb1c7ce56b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="SDL2 OpenAL libmpeg2"
+MAINTAINER="CRTS"
+EMAIL="crts@gmx.net"
diff --git a/system/fs-uae/slack-desc b/games/fs-uae/slack-desc
index bab0cb5292..bab0cb5292 100644
--- a/system/fs-uae/slack-desc
+++ b/games/fs-uae/slack-desc
diff --git a/games/fs2open/README b/games/fs2open/README
index f1c1bebd5d..9303560afd 100644
--- a/games/fs2open/README
+++ b/games/fs2open/README
@@ -1,12 +1,13 @@
-The FreeSpace 2 Source Code Project is the project of a group of programmers
-currently maintaining and enhancing the game engine for the
+The FreeSpace 2 Source Code Project is the project of a group of
+programmers currently maintaining and enhancing the game engine for the
 space combat simulator FreeSpace 2, developed by Volition, Inc.
 
 You will need the game data from FreeSpace 2. If you don't already own
 FreeSpace 2, you can buy it from online stores such as Steam, Amazon
 or GOG.
 
-Copy the data directories and all .vp files into ~/.fs2_open for the game to work.
+Copy the data directories and all .vp files into ~/.fs2_open for the
+game to work.
 
-Notice for Intel cards: You may need to export 'MESA_GL_VERSION_OVERRIDE=3.2'
-if the game doesn't run.
+Notice for Intel cards: You may need to export
+'MESA_GL_VERSION_OVERRIDE=3.2' if the game doesn't run.
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/galaxyv2/README b/games/galaxyv2/README
index 4c46d1f98f..6a4273e866 100644
--- a/games/galaxyv2/README
+++ b/games/galaxyv2/README
@@ -1,3 +1,3 @@
-A 1-8 player 2D network game. Each player is in control of a ship.
-The goal is to kill everything to get the best score (dogfight), or
-race against the clock and your opponents to get the fastest time (race).
+A 1-8 player 2D network game. Each player is in control of a ship.  The
+goal is to kill everything to get the best score (dogfight), or race
+against the clock and your opponents to get the fastest time (race).
diff --git a/games/gambatte-libretro/README b/games/gambatte-libretro/README
index 044a29ba53..8ea87a3191 100644
--- a/games/gambatte-libretro/README
+++ b/games/gambatte-libretro/README
@@ -1,9 +1,10 @@
-Gambatte is a Nintendo Game Boy/Game Boy Color video game system emulator that
-can be used as a libretro core.
+Gambatte is a Nintendo Game Boy/Game Boy Color video game system
+emulator that can be used as a libretro core.
 
-Gambatte is an accuracy-focused, open-source, cross-platform Game Boy Color
-emulator written in C++. It is based on hundreds of corner case hardware tests,
-as well as previous documentation and reverse engineering efforts.
+Gambatte is an accuracy-focused, open-source, cross-platform Game
+Boy Color emulator written in C++. It is based on hundreds of corner
+case hardware tests, as well as previous documentation and reverse
+engineering efforts.
 
 To build the debugging symbols use:
   DEBUG=1 ./gambatte-libretro.SlackBuild
diff --git a/games/gambatte-libretro/gambatte-libretro.info b/games/gambatte-libretro/gambatte-libretro.info
index 675159c01f..48428ea56f 100644
--- a/games/gambatte-libretro/gambatte-libretro.info
+++ b/games/gambatte-libretro/gambatte-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="d02329b684152901a63f772ad03f01a7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/garden/README b/games/garden/README
index d750883c56..f8f84b6cce 100644
--- a/games/garden/README
+++ b/games/garden/README
@@ -1,8 +1,8 @@
-Garden of coloured lights is an old school 2D vertical shoot-em-up with some
-innovative elements. Innovative graphics, soundtrack and game concept. The game
-itself is very challenging and as you progress, you will understand that you
-are dealing with a true piece of art...
+Garden of coloured lights is an old school 2D vertical shoot-em-up
+with some innovative elements. Innovative graphics, soundtrack and game
+concept. The game itself is very challenging and as you progress, you
+will understand that you are dealing with a true piece of art...
 
-It is not an easy game, so you will need some skill and patience... And maybe
-you will appreciate the possibility to use a joystick. And yes, it is actually
-possible to get to stage 4 :-)
+It is not an easy game, so you will need some skill and patience... And
+maybe you will appreciate the possibility to use a joystick. And yes,
+it is actually possible to get to stage 4 :-)
diff --git a/games/gemrb/README b/games/gemrb/README
index c1d0ca8b08..5fa329264b 100644
--- a/games/gemrb/README
+++ b/games/gemrb/README
@@ -1,3 +1,4 @@
-GemRB is a portable open-source implementation of Bioware's Infinity Engine.
+GemRB is a portable open-source implementation of Bioware's Infinity
+Engine.
 
 Optional dependencies: OpenAL or SDL2_Mixer
diff --git a/games/gl-117/README b/games/gl-117/README
index 64b4c8a0c3..c9035decb2 100644
--- a/games/gl-117/README
+++ b/games/gl-117/README
@@ -1,4 +1,5 @@
-GL-117 is an action flight simulator. Enter the Eagle Squadron and succeed 
-in several challanging missions leading though different landscapes.  Five 
-predefined levels of video quality and an amount of viewing ranges let you 
-perfectly adjust the game to the performance of your system.
+GL-117 is an action flight simulator. Enter the Eagle Squadron and
+succeed in several challanging missions leading though different
+landscapes.  Five predefined levels of video quality and an amount of
+viewing ranges let you perfectly adjust the game to the performance of
+your system.
diff --git a/games/glbsp/README b/games/glbsp/README
index f30794633c..bacd32a642 100644
--- a/games/glbsp/README
+++ b/games/glbsp/README
@@ -1,20 +1,20 @@
-glBSP is a node builder specially designed for OpenGL ports of the DOOM
-game engine.  It adheres to the "GL-Nodes Specification", which means it
-adds some new special lumps to a WAD file that makes it easy and fast
-for an OpenGL DOOM engine to compute the polygons needed for drawing
-the levels.
+glBSP is a node builder specially designed for OpenGL ports of the
+DOOM game engine.  It adheres to the "GL-Nodes Specification", which
+means it adds some new special lumps to a WAD file that makes it easy
+and fast for an OpenGL DOOM engine to compute the polygons needed for
+drawing the levels.
 
 There are many DOOM ports that understand the GL-Nodes which glBSP
-creates, including: EDGE, the Doomsday engine (JDOOM), PrBoom, Legacy 2.0,
-Vavoom, Doom3D and ZDoomGL.
+creates, including: EDGE, the Doomsday engine (JDOOM), PrBoom, Legacy
+2.0, Vavoom, Doom3D and ZDoomGL.
 
-This script builds both the command-line (glbsp) and GUI (glBSPX) binaries
-of glBSP.  If you don't need the GUI and/or don't want to install fltk,
-"export OMIT_GUI=yes" in the build script's environment.
+This script builds both the command-line (glbsp) and GUI (glBSPX)
+binaries of glBSP.  If you don't need the GUI and/or don't want to
+install fltk, "export OMIT_GUI=yes" in the build script's environment.
 
-The package also includes a C header and a library (what would be known
-as libglbsp-dev on other Linux distributions).  By default, a dynamic
-library is created.  This works on x86 and x86_64 systems, but is untested
-on others.  If you have trouble with the shared library, "export STATIC=yes"
-in the build script's environment (and please contact the maintainer of
-this SlackBuild!)
+The package also includes a C header and a library (what would be
+known as libglbsp-dev on other Linux distributions).  By default, a
+dynamic library is created.  This works on x86 and x86_64 systems, but
+is untested on others.  If you have trouble with the shared library,
+"export STATIC=yes" in the build script's environment (and please
+contact the maintainer of this SlackBuild!)
diff --git a/games/glestae/README b/games/glestae/README
index 7ea75a8b69..8bd49926b0 100644
--- a/games/glestae/README
+++ b/games/glestae/README
@@ -1,5 +1,6 @@
 Glest Advanced Engine is a community driven project which extends and
-improves on Glest. It aims to provide features and tools that help people
-develop higher quality 3D real-time strategy games for all major platforms.
+improves on Glest. It aims to provide features and tools that help
+people develop higher quality 3D real-time strategy games for all major
+platforms.
 
 cppunit and wxPython are optional dependencies.
diff --git a/games/glestae/glestae.SlackBuild b/games/glestae/glestae.SlackBuild
index 21cf3b7933..3687ec0899 100644
--- a/games/glestae/glestae.SlackBuild
+++ b/games/glestae/glestae.SlackBuild
@@ -22,9 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200906 bkw: modified by SlackBuilds.org: the build was failing if
+# wxGTK3 was installed, due to the /usr/bin/wx-config conflict.
+
 PRGNAM=glestae
 VERSION=${VERSION:-0.3.93}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,6 +80,7 @@ patch -p1 < $CWD/gcc-4.7.patch
 mkdir -p build
 cd build
   cmake -G "Unix Makefiles" \
+    -DwxWidgets_CONFIG_OPTIONS="--version=2.8" \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
diff --git a/games/gnonograms/README b/games/gnonograms/README
index c86f231b80..2929e4b5ab 100644
--- a/games/gnonograms/README
+++ b/games/gnonograms/README
@@ -1,4 +1,4 @@
-Gnonograms is an implementation of the Japanese logic puzzle "Nonograms", also
-known as "Tsunami", "Griddlers" .....". The object of the game is to discover
-the pattern in the grid which is encoded by the clues  which are give for each
-row and column.
+Gnonograms is an implementation of the Japanese logic puzzle
+"Nonograms", also known as "Tsunami", "Griddlers" .....". The object of
+the game is to discover the pattern in the grid which is encoded by the
+clues  which are give for each row and column.
diff --git a/games/gnubg/README b/games/gnubg/README
index f365e00c22..1efba89bcd 100644
--- a/games/gnubg/README
+++ b/games/gnubg/README
@@ -1,6 +1,6 @@
-GNU Backgammon (gnubg) is for playing and analysing backgammon positions,
-games and matches.
+GNU Backgammon (gnubg) is for playing and analysing backgammon
+positions, games and matches.
 
-You may play GNU Backgammon using the command line or a graphical interface
-(based on GTK+). For 3D Boards support you will need the GTK OpenGL
-extension (gtkglext) available at SlackBuilds.org.
+You may play GNU Backgammon using the command line or a graphical
+interface (based on GTK+). For 3D Boards support you will need the GTK
+OpenGL extension (gtkglext) available at SlackBuilds.org.
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/goonies/goonies.info b/games/goonies/goonies.info
index 1010694aa1..6c25e4f474 100644
--- a/games/goonies/goonies.info
+++ b/games/goonies/goonies.info
@@ -1,7 +1,7 @@
 PRGNAM="goonies"
 VERSION="1.4.1528"
 HOMEPAGE="http://www.braingames.getput.com/goonies/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/goonies.src_1.4.1528.tgz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/goonies.src_1.4.1528.tgz"
 MD5SUM="7c220958a0766fb716d2d0081c81e8bd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/gtklife/README b/games/gtklife/README
index 8494279113..9db8a016ca 100644
--- a/games/gtklife/README
+++ b/games/gtklife/README
@@ -1 +1,2 @@
-GtkLife is a fast, featureful, open-source Conway's Life program for *nix.
+GtkLife is a fast, featureful, open-source Conway's Life program for
+*nix.
diff --git a/games/gw-libretro/README b/games/gw-libretro/README
index f2abab1b19..b1a9d6b759 100644
--- a/games/gw-libretro/README
+++ b/games/gw-libretro/README
@@ -1,9 +1,10 @@
 Game & Watch is a libretro core that runs Game & Watch simulators.
 
-It runs simulators converted from source code for the games available at
-MADrigal. Each simulator is converted with pas2lua, which was written
-specifically for this purpose, and uses bstree, which was also specifically
-written to obfuscate the generated Lua source code as per MADrigal's request.
+It runs simulators converted from source code for the games available
+at MADrigal. Each simulator is converted with pas2lua, which was
+written specifically for this purpose, and uses bstree, which was also
+specifically written to obfuscate the generated Lua source code as per
+MADrigal's request.
 
 Games for this emulator are downloadable from the RetroArch gui.
 
diff --git a/games/gw-libretro/gw-libretro.info b/games/gw-libretro/gw-libretro.info
index 7c61723a06..1d6dc2b586 100644
--- a/games/gw-libretro/gw-libretro.info
+++ b/games/gw-libretro/gw-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="22fe06dec6ca590ab38059fcad96a2a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/gzdoom-legacy/README_versions.txt b/games/gzdoom-legacy/README_versions.txt
index 56be5eae3d..bd7e56e233 100644
--- a/games/gzdoom-legacy/README_versions.txt
+++ b/games/gzdoom-legacy/README_versions.txt
@@ -15,7 +15,7 @@ file, and copy the lines below:
 For 1.8.09:
 
 VERSION="1.8.09"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/g1.8.09.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/g1.8.09.tar.gz"
 MD5SUM="ddc1dd8aef254312031184be6dec21e6"
 
 Note that SDL2 is not required for 1.8.09 (you can remove it from REQUIRES
diff --git a/games/gzdoom-legacy/gzdoom-legacy.SlackBuild b/games/gzdoom-legacy/gzdoom-legacy.SlackBuild
index 295f2dcc18..34b01f39f1 100644
--- a/games/gzdoom-legacy/gzdoom-legacy.SlackBuild
+++ b/games/gzdoom-legacy/gzdoom-legacy.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200426 bkw:
+# - Fix <unknown version> in window title for real this time, BUILD=2.
+
 # 20170610 bkw:
 # - Renamed to gzdoom-legacy. Too much effort to keep testing old
 #   gzdoom versions every time there's a new release, so the regular
@@ -33,7 +36,7 @@
 PRGNAM=gzdoom-legacy
 SRCNAM=gzdoom
 VERSION=${VERSION:-2.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -75,11 +78,8 @@ tar xvf $CWD/$SRCNAM-g$VERSION.tar.gz || \
   tar xvf $CWD/$VERSION.tar.gz
 cd $SRCNAM-g$VERSION || 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 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 {} \+
 
 # fmodapi support tries to find its lib in the current dir, fix it:
 sed -i \
@@ -95,7 +95,7 @@ patch -p1 < $CWD/window_title_version.diff
 
 # Sometimes upstream forgets to bump the version number, so the window
 # title will read 1.8.08 for version 1.8.09, eg.
-sed -i "/#define *VERSIONSTR/s,\"[^\"]*\",\"$VERSION\"," src/version.h
+sed -i "/#define *VERSIONSTR/s,[^ ]*$,\"$VERSION\"," src/version.h
 
 # This isn't currently used, but was in the past, and will be again I'm sure.
 [ -e $CWD/compilefix.$VERSION.diff ] && \
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/README b/games/hatari/README
index ec9a202d4e..53de0f8329 100644
--- a/games/hatari/README
+++ b/games/hatari/README
@@ -1,20 +1,33 @@
-Hatari is an Atari ST and STE emulator for Linux, BSD, BeOS, Mac OS X and
-other systems that are supported by the SDL library. The Atari ST was a
-16/32 bit computer system which was first released by Atari in 1985. Using
-the Motorola 68000 CPU, it was a very popular computer having quite a lot
-of CPU power at that time.
+hatari (Atari ST/STE/Falcon emulator)
+
+Hatari is an Atari ST/STE/Falcon emulator for Linux, BSD, BeOS, Mac OS
+X and other systems that are supported by the SDL library. The Atari
+ST was a 16/32 bit computer system which was first released by Atari
+in 1985. Using the Motorola 68000 CPU, it was a very popular computer
+having quite a lot of CPU power at that time.
 
 Unlike many other Atari ST emulators which try to give you a good
 environment for running GEM applications, Hatari tries to emulate the
-hardware of a ST as close as possible so that it is able to run most
+hardware of an ST as close as possible so that it is able to run most
 of the old ST games and demos.
 
-Recommended dependency: hatari_tos_roms. hatari includes a free
-replacement called EmuTOS, but most users will want to install the real
-ROM images. Most ST software won't work without hatari_tos_roms.
+Optional dependencies:
+
+hatari_tos_roms - hatari includes a free ROM replacement called EmuTOS,
+but most applications (especially games) will require the real ROM
+images. *Highly* recommended.
+
+libcapsimage - Required if you want hatari to support KyroFlux IPF and
+CTR disk images. Recommended, but creates non-redistributable package
+(mixing GPL and no-commercial-use code). Autodetected.
+
+portaudio - Only used for emulated Falcon microphone support.
+            Autotetected.
 
-Optional dependency: portaudio. Only used for emulated Falcon microphone
-support. Autotetected by the SlackBuild.
+portmidi - May offer better MIDI support than the default ALSA raw MIDI
+           device support. Autodetected.
 
-Optional dependency: SDL2. Autodetected. If you have SDL2 installed but
-want to build hatari with SDL-1.2, set SDL2=no in the environment.
+SDL2 - Using SDL2 offers some benefits like better fullscreen support
+       and resizing in windowed mode. Autodetected. If you have SDL2
+       installed but want to build hatari with SDL-1.2, export SDL2=no
+       in the environment.
diff --git a/games/hatari/hatari.SlackBuild b/games/hatari/hatari.SlackBuild
index 87f9dcb703..9f0904c9ca 100644
--- a/games/hatari/hatari.SlackBuild
+++ b/games/hatari/hatari.SlackBuild
@@ -6,6 +6,27 @@
 
 # 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),
+#   with new optional dep libcapsimage.
+# - Switch to cmake instead of using fake autotools.
+# - Add missing chown/find/chmod after tarball extraction.
+# - Doubleplusungood refs unfiles in man pages.
+# - Install a couple more doc files in doc dir.
+# - Patch hatariui to have it create a default user config file if
+#   if can't find one, rather than dying.
+# - Install utf-8 French man page in correct dir, also convert & install
+#   a 8859-1 one.
+# - Nitpick README and slack-desc.
+# - Make cmake find readline, for history/completion in the debugger.
+
 # 20191130 bkw: updated for v2.2.1.
 
 # 20180612 bkw: updated for v2.1.0.
@@ -43,7 +64,7 @@
 # - add mime type and auto-associate ST disk images and executables.
 
 PRGNAM=hatari
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,14 +81,20 @@ 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=""
 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
@@ -77,18 +104,29 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-
-# configure script is really a wrapper for cmake, doesn't support
-# --bindir, --mandir, --docdir. cheat a little.
+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 {} \+
+
+# hatariui will fail to start if there's no ~/.config/hatari/hatari.cfg.
+# hatari's got a --saveconfig option that creates a default hatari.cfg,
+# so let's have hatariui use that instead of failing.
+patch -p1 < $CWD/hatariui-create-cfg-if-missing.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.
 sed -i \
   -e 's,BINDIR *bin,BINDIR games,' \
   -e 's,share/man/man1,man/man6,' \
   -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/\"," \
@@ -99,11 +137,40 @@ if pkg-config --exists sdl2 && [ "${SDL2:-yes}" != "no" ]; then
   SDL2OPT=""
   WITHSDL=2.0
 else
-  SDL2OPT="--disable-sdl2"
+  SDL2OPT="-DENABLE_SDL2:BOOL=0"
   WITHSDL=1.2
 fi
 
-./configure $SDL2OPT --prefix=/usr
+# stoopid overcomplex SHOUTY cmake stuff...
+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" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  -DMAN_INSTALL_DIR=/usr/man \
+  -DCMAKE_BUILD_TYPE=Release .
 
 # Hard-coded paths for icon symlinks, they end up getting created in the
 # real /usr, not $PKG/usr.
@@ -122,18 +189,24 @@ cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
 cp tools/hmsa/readme-hmsa.txt readme.txt gpl.txt \
    doc/changelog.txt doc/coding.txt doc/toc.js \
    doc/video-recording.txt doc/fr/clavier-exemple.txt \
+   doc/de/*.txt \
    $DOCDIR
 
-# The UI has its own docs:
+# The UI has its own docs. These are actually used by the UI, so they
+# must be available in /usr/share/hatari (hence the symlinks).
 UIDOCDIR=$DOCDIR/${PRGNAM}ui
 mkdir -p $UIDOCDIR
 for i in README TODO release-notes.txt; do
   ln -s ../../../share/$PRGNAM/${PRGNAM}ui/$i $UIDOCDIR/$i
 done
 
-# Someone might find the French man page useful:
-mkdir -p $PKG/usr/man/fr/man6
-gzip -9c < doc/fr/$PRGNAM.1 > $PKG/usr/man/fr/man6/$PRGNAM.6.gz
+# Someone might find the French man page useful. It's in utf-8, so
+# put it in the right dir.
+mkdir -p $PKG/usr/man/fr.UTF-8/man6 $PKG/usr/man/fr/man6
+gzip -9c < doc/fr/$PRGNAM.1 > $PKG/usr/man/fr.UTF-8/man6/$PRGNAM.6.gz
+# For non-UTF-8 users:
+iconv --to ISO-8859-1 doc/fr/$PRGNAM.1 | \
+  gzip -9c > $PKG/usr/man/fr/man6/$PRGNAM.6.gz
 
 # Replace .desktop with modified one, auto-associates ST disks/executables.
 cat $CWD/${PRGNAM}ui.desktop > $PKG/usr/share/applications/${PRGNAM}ui.desktop
@@ -153,8 +226,13 @@ ln -s application-x-st-disk-image.svg \
 # Don't symlink emutos to tos here, do it conditionally in doinst.sh.
 ( cd $PKG/usr/share/$PRGNAM && mv tos.img emutos.img )
 
+WITHLCAPS=without
+ldd $PKG/usr/games/$PRGNAM | grep -q libcapsimage && WITHLCAPS=with
+
 mkdir -p $PKG/install
-sed "s,@WITHSDL@,$WITHSDL," $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s,@WITHSDL@,$WITHSDL," \
+    -e "s,@WITHLCAPS@,$WITHLCAPS," \
+	 $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
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/hatariui-create-cfg-if-missing.diff b/games/hatari/hatariui-create-cfg-if-missing.diff
new file mode 100644
index 0000000000..13637fce44
--- /dev/null
+++ b/games/hatari/hatariui-create-cfg-if-missing.diff
@@ -0,0 +1,17 @@
+diff -Naur hatari-2.2.1/python-ui/hatariui hatari-2.2.1.patched/python-ui/hatariui
+--- hatari-2.2.1/python-ui/hatariui	2019-02-08 03:30:10.000000000 -0500
++++ hatari-2.2.1.patched/python-ui/hatariui	2020-04-27 00:47:57.786768381 -0400
+@@ -3,6 +3,13 @@
+ # Don't modify the 'path' or 'conf' variable names or initial values,
+ # those will be replaced by Makefile when this script is installed.
+ 
++# 20200426 bkw: create default config file if missing
++[ -e ~/.config/hatari/hatari.cfg ] || (
++	mkdir -p ~/.config/hatari/
++	cd ~/.config/hatari/
++	hatari --saveconfig
++)
++
+ path=${0%/*}
+ name=${0##*/}
+ 
diff --git a/games/hatari/hatariui.desktop b/games/hatari/hatariui.desktop
index e283900158..b264f4b891 100644
--- a/games/hatari/hatariui.desktop
+++ b/games/hatari/hatariui.desktop
@@ -2,11 +2,13 @@
 Version=1.0
 Type=Application
 Name=Hatari UI
+GenericName=Atari ST emulator
+Comment=Run old Atari ST/STE/TT/Falcon software
 Exec=hatariui %f
-Icon=hatari-icon
+Icon=hatari
+MimeType=application/x-st-disk-image;application/x-st-executable;application/vnd.msa-disk-image;application/vnd.fastcopy-disk-image;application/x-stx-disk-image;
 Categories=Game;Emulator;
 Actions=Boot;
-MimeType=application/x-st-disk-image;application/x-st-executable;application/vnd.msa-disk-image;application/vnd.fastcopy-disk-image;application/x-stx-disk-image;
 
 [Desktop Action Boot]
 Name=Boot
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
new file mode 100644
index 0000000000..0269253476
--- /dev/null
+++ b/games/hatari/manpage.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" "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 378aaca07e..7c55291048 100644
--- a/games/hatari/slack-desc
+++ b/games/hatari/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-hatari: hatari (Atari ST and STE Emulator)
+hatari: hatari (Atari ST/STE/Falcon emulator)
 hatari:
-hatari: Hatari is an Atari ST and STE emulator for Linux and other systems
+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
 hatari: computer system which was first released by Atari in 1985.
 hatari:
-hatari: Hatari tries to emulate the hardware of a ST as close as possible so
+hatari: Hatari tries to emulate the hardware of an ST as close as possible so
 hatari: that it is able to run most of the old ST games and demos.
 hatari:
-hatari: This package was built with SDL-@WITHSDL@ support.
-hatari:
+hatari: This package was built with SDL-@WITHSDL@ support, and
+hatari: @WITHLCAPS@ libcapsimage support.
diff --git a/games/hexalate/README b/games/hexalate/README
index cb91e3ea20..de83e425c0 100644
--- a/games/hexalate/README
+++ b/games/hexalate/README
@@ -1,4 +1,5 @@
-Hexalate is a color matching game. The goal of the game is to rotate and
-position the circles so that each touching line matches in color. You rotate
-circles by right clicking, and you move circles by dragging them. The game
-stores the positions and rotations of the circles across runs.
+Hexalate is a color matching game. The goal of the game is to
+rotate and position the circles so that each touching line matches
+in color. You rotate circles by right clicking, and you move circles
+by dragging them. The game stores the positions and rotations of the
+circles across runs.
diff --git a/games/higan/README b/games/higan/README
index d5f3551c02..29252151b6 100644
--- a/games/higan/README
+++ b/games/higan/README
@@ -7,6 +7,9 @@ code. The emulator does not focus on things that would hinder accuracy.
 This includes speed and game-specific hacks for compatibility. As a 
 result, the minimum system requirements for higan are very high.
 
+Note: higan v106 is the last version that will build on Slackware 14.2.
+I will update to the latest version when 15.0 releases.
+
 As of v104, higan has top-tier support for the following consoles:
 
 - Nintendo Super Famicom/SNES, including add-on hardware:
@@ -23,7 +26,7 @@ It also includes some level of support for these consoles:
 - Sega Master System
 - Sega Game Gear
 - Sega Mega Drive/Genesis
-- NEC PC Engine/TurboGrafx 16 (but not the CD-ROM^2 System/TurboGrafx-CD)
+- NEC PC Engine/TurboGrafx 16 (but not CD-ROM^2 System/TurboGrafx-CD)
 - NEC SuperGrafx
 - Bandai WonderSwan
 - Bandai WonderSwan Color
@@ -38,19 +41,21 @@ shaders are located) is /usr/share/higan. If you want a personalized
 profile, store your files in ~/Emulation, then higan will use this
 directory instead.
 
-First time users note: By default there are *no* control mappings. You'll
-have to use Settings -> Input to map your preferred keyboard and/or
-gamepad controls for each emulated system. Also, by default, there's
-nothing 'plugged into' the emulated controller ports. In the menu bar,
-click on the system name (e.g. Famicom, Super Famicom) -> Controller
-Port 1 -> Gamepad (or whatever is required for the ROM you're running).
+First time users note: By default there are *no* control
+mappings. You'll have to use Settings -> Input to map your preferred
+keyboard and/or gamepad controls for each emulated system. Also,
+by default, there's nothing 'plugged into' the emulated controller
+ports. In the menu bar, click on the system name (e.g. Famicom, Super
+Famicom) -> Controller Port 1 -> Gamepad (or whatever is required for
+the ROM you're running).
 
 *** Build options:
 
 - OpenAL is autodetected, and used if found. You can disable it with
   OPENAL=no in the environment.
 
-- OSS is disabled by default. If you need it, set OSS=yes in the environment.
+- OSS is disabled by default. If you need it, set OSS=yes in the
+  environment.
 
 - PulseAudio is enabled by default. You can disable it with PULSE=no in
   the environment.
diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild
index caf311dd6a..d4675f6351 100644
--- a/games/higan/higan.SlackBuild
+++ b/games/higan/higan.SlackBuild
@@ -27,6 +27,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200907 bkw: upstream source moved and changed to .tar.gz, get
+#               rid of p7zip dependency. BUILD=2.
+# 20200529 bkw: add "can't update version" note to README.
 # 20181211 bkw:
 # This update would not have happened without assistance and moral support
 # from Yossi Ne'eman. Thanks!
@@ -45,7 +48,7 @@
 
 PRGNAM=higan
 VERSION=${VERSION:-106}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -82,9 +85,9 @@ SRCNAM=${PRGNAM}_v${VERSION}-source
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM
-7z x $CWD/$SRCNAM.7z
-cd $SRCNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 
 # Bletcherous permissions, please don't replace with template code.
 find . -type d -exec chmod 0755 {} \+
diff --git a/games/higan/higan.info b/games/higan/higan.info
index 4bee32e849..2b56695513 100644
--- a/games/higan/higan.info
+++ b/games/higan/higan.info
@@ -1,10 +1,10 @@
 PRGNAM="higan"
 VERSION="106"
 HOMEPAGE="https://byuu.org/emulation/higan/"
-DOWNLOAD="https://download.byuu.org/higan_v106-source.7z"
-MD5SUM="74fa6050909445035119ee764563c094"
+DOWNLOAD="https://github.com/higan-emu/higan/archive/v106/higan-106.tar.gz"
+MD5SUM="4a68c6b9671089b4a7fde0b234531d61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="p7zip gtksourceview"
+REQUIRES="gtksourceview"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/ifm/README b/games/ifm/README
index 848696ebd6..4276d4e624 100644
--- a/games/ifm/README
+++ b/games/ifm/README
@@ -1,5 +1,5 @@
-IFM is a language for keeping track of your progress through an Interactive
-Fiction game, and a program for producing various different sorts of output
-using it. You can record each room you visit and its relation to other
-rooms, the initial locations of useful items you find, and the tasks you need
-to perform in order to solve the game.
+IFM is a language for keeping track of your progress through an
+Interactive Fiction game, and a program for producing various different
+sorts of output using it. You can record each room you visit and its
+relation to other rooms, the initial locations of useful items you
+find, and the tasks you need to perform in order to solve the game.
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/README b/games/innoextract/README
index eaee18f0bf..4c1ef52cc0 100644
--- a/games/innoextract/README
+++ b/games/innoextract/README
@@ -1,7 +1,7 @@
 While Inno Setup is a tool to create installers for Microsoft Windows
-applications, innoextract allows you to extract such installers without using
-Wine. In particular, innoextract supports GOG.com installers and Arx Fatalis
-patches.
+applications, innoextract allows you to extract such installers without
+using Wine. In particular, innoextract supports GOG.com installers and
+Arx Fatalis patches.
 
 To extract a file to the current directory, run:
 
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 f1ae226320..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="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="Ruoh-Shoei Lin"
+EMAIL="lin.ruohshoei+sbo at gmail.com"
diff --git a/games/instead/instead.SlackBuild b/games/instead/instead.SlackBuild
index 14772f2fc2..60edb5e630 100644
--- a/games/instead/instead.SlackBuild
+++ b/games/instead/instead.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Andrew Lobanov <spline @ rooker dot ru>
 
 PRGNAM=instead
-VERSION=${VERSION:-3.3.0}
+VERSION=${VERSION:-3.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,7 +77,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 COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL 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/games/instead/instead.info b/games/instead/instead.info
index 239d81771c..a32b86adce 100644
--- a/games/instead/instead.info
+++ b/games/instead/instead.info
@@ -1,8 +1,8 @@
 PRGNAM="instead"
-VERSION="3.3.0"
+VERSION="3.3.2"
 HOMEPAGE="https://instead-hub.github.io/en/"
-DOWNLOAD="https://github.com/instead-hub/instead/releases/download/3.3.0/instead_3.3.0.tar.gz"
-MD5SUM="867bf07dd72cc186b8e15a5c40330e42"
+DOWNLOAD="https://github.com/instead-hub/instead/releases/download/3.3.2/instead_3.3.2.tar.gz"
+MD5SUM="c0d764e9766b6bd63e422e0c07bdc022"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="luajit SDL2_mixer SDL2_image SDL2_ttf"
diff --git a/games/ioquake3/README b/games/ioquake3/README
index 91b77d869b..04ab308a29 100644
--- a/games/ioquake3/README
+++ b/games/ioquake3/README
@@ -6,7 +6,8 @@ GPL. Since then code has been cleaned up, bugs have been fixed and
 features been added. The permanent goal is to create THE open source
 Quake 3 distribution upon which people base their games and projects.
 
-NOTE: ioquake3 is just a source code engine port.  You still need the
-original game files to play quake3.  For us this means we need one file
-from the original CD.  The file you need is [cdrom]/Quake3/baseq3/pak0.pk3
-Copy this file to the /usr/share/games/quake3/baseq3 directory.
+NOTE: ioquake3 is just a source code engine port.  You still
+need the original game files to play quake3.  For us this
+means we need one file from the original CD.  The file you
+need is [cdrom]/Quake3/baseq3/pak0.pk3 Copy this file to the
+/usr/share/games/quake3/baseq3 directory.
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/jezzball-kazzmir/README b/games/jezzball-kazzmir/README
index 53fc7b1a02..2a5ee8ca69 100644
--- a/games/jezzball-kazzmir/README
+++ b/games/jezzball-kazzmir/README
@@ -2,12 +2,13 @@ jezzball-kazzmir (2d arcade/puzzle game)
 
 Jezzball is a classic game much like qix wherein you must create walls
 and not get hit by the flying balls. If you create enough walls to cover
-80% of the screen you goto the next level where you get one extra life
+80% of the screen you go to the next level where you get one extra life
 and another ball trying to kill you.
 
 Left click to create a wall.
 Right click to change the direction of the mouse.
 
-This is a clone of the original Jezzball, rewritten by Kazzmir aka Jon
-Rafkind. This was originally for Windows, and required some minor porting
-to get it to play nice on Linux. See README_Slackware.txt for details.
+This is a clone of the original Jezzball, rewritten by Kazzmir aka
+Jon Rafkind. This was originally for Windows, and required some minor
+porting to get it to play nice on Linux. See README_Slackware.txt for
+details.
diff --git a/games/jezzball-kazzmir/jezzball-kazzmir.info b/games/jezzball-kazzmir/jezzball-kazzmir.info
index 570f70479a..9be093ad9a 100644
--- a/games/jezzball-kazzmir/jezzball-kazzmir.info
+++ b/games/jezzball-kazzmir/jezzball-kazzmir.info
@@ -1,8 +1,8 @@
 PRGNAM="jezzball-kazzmir"
 VERSION="1.1"
 HOMEPAGE="https://www.allegro.cc/depot/Jezzball"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/jezzball-1.1.tar.gz \
-          http://urchlay.naptime.net/~urchlay/src/jezzball-kazzmir-extra-backgrounds.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/jezzball-1.1.tar.gz \
+          https://slackware.uk/~urchlay/src/jezzball-kazzmir-extra-backgrounds.tar.gz"
 MD5SUM="72b25d7f8529c01164583b72870df0ea \
         8c9df20f4bc04865ee6e8300ce18990b"
 DOWNLOAD_x86_64=""
diff --git a/games/jfsw/README b/games/jfsw/README
index e15b0a810e..ab86474a68 100644
--- a/games/jfsw/README
+++ b/games/jfsw/README
@@ -12,22 +12,22 @@ Choices are:
   including the 4 levels from the demo.
 - jfsw_wanton_destruction, the Wanton Destruction expansion pack.
   Includes 12 new levels, plus the 4 levels from the demo.
+- jfsw_twin_dragon, the Twin Dragon expansion pack. Includes 14 new
+  levels, plus the 4 levels from the demo.
 
 Any or all of the game data packages can be installed at the same time
 without conflict.
 
-There is another expansion pack, Twin Dragon, which is not supported
-by jfsw.
+If you install the full version of the game, you may also want to
+install jfsw_hires_pack for some graphic enhancements. Don't bother
+trying if all you have is the shareware sw.grp: it segfaults on
+startup.
 
-If you install the full version of the game, you may also want to install
-jfsw_hires_pack for some graphic enhancements. Don't bother trying if
-all you have is the shareware sw.grp: it segfaults on startup.
-
-Optional dependencies: SDL2 and/or fluidsynth. These will be autodetected.
-If you want to force building without them, you can export SDL2=no
-and/or FLUID=no in the environment. SDL2 provides a slightly better user
-experience (YMMV). See README_music.txt for details on using fluidsynth
-with jfsw.
+Optional dependencies: SDL2 and/or fluidsynth. These will be
+autodetected.  If you want to force building without them, you can
+export SDL2=no and/or FLUID=no in the environment. SDL2 provides
+a slightly better user experience (YMMV). See README_music.txt for
+details on using fluidsynth with jfsw.
 
 To get the in-game music to play, see README_music.txt.
 
@@ -36,6 +36,6 @@ edit the config file (~/.jfsw/sw.cfg) and change MouseAnalogAxes0 to
 "analog_turning" and MouseAnalogAxes1 to "analog_moving". The digital
 axes should have "" values.
 
-Note: I've had zero luck trying to run game mods with jfsw. If you get any
-mods working, I'd love to hear from you (email address in .info file),
-let me know how you did it.
+Note: I've had zero luck trying to run game mods with jfsw. If you get
+any mods working, I'd love to hear from you (email address in .info
+file), let me know how you did it.
diff --git a/games/jfsw/README_music.txt b/games/jfsw/README_music.txt
index 32ff4729c9..f6c44ca5ab 100644
--- a/games/jfsw/README_music.txt
+++ b/games/jfsw/README_music.txt
@@ -16,17 +16,11 @@ Full (Registered) Version, Wanton Destruction expansion
 
 For these versions, jfsw doesn't actually support CD audio from a
 physical CD [*]. It does, however, support .ogg files made from the CD.
-You can use CD ripping software to rip these from the original CD,
-or download them (for free, account creation required) from:
 
-https://www.gog.com/game/shadow_warrior_complete
-
-...or download it from Steam (also for free). The same files are available
-there, under the name "Shadow Warrior Classic".
-
-The .ogg files should be named "track02.ogg" through "track14.ogg", all
-lowercase (there is NO "track01.ogg"!), and placed in either ~/.jfsw/
-or /usr/share/games/jfsw/
+As of April 2020, the jfsw_registered_data build includes the .ogg files,
+so there's no need to rip them from CD or download them separately. If
+you're playing Wanton Destruction, install both jfsw_registered_data
+and jfsw_wanton_destruction.
 
 Run the game, and the music should play. If not, use the in-game menus
 (Options, Sound Menu) to enable the music and turn up the volume.
diff --git a/games/jfsw/jfsw.SlackBuild b/games/jfsw/jfsw.SlackBuild
index bf783c30a5..61c803bc23 100644
--- a/games/jfsw/jfsw.SlackBuild
+++ b/games/jfsw/jfsw.SlackBuild
@@ -152,6 +152,14 @@ patch -p1 < $CWD/patches/sdl1_fix.diff
 # to missing driver_sdlmixer.c). Maybe someday it'll work and then we
 # hear the demo music without having to install fluidsynth?
 
+# 20200416 bkw: fluidsynth 2.x works OK, but the version check in the
+# source doesn't like its version number.
+sed -i '/^#error.*Fluid/d' jfaudiolib/src/driver_fluidsynth.c
+
+# 20200428 bkw: add Twin Dragon td.grp to the list of supported GRP
+# files. Need this for the jfsw_twin_dragon build.
+patch -p1 < $CWD/twin_dragon_grp.diff
+
 make \
   RELEASE=1 \
   PREFIX=/usr/share/games/$PRGNAM \
diff --git a/games/jfsw/twin_dragon_grp.diff b/games/jfsw/twin_dragon_grp.diff
new file mode 100644
index 0000000000..1b4a1ce07e
--- /dev/null
+++ b/games/jfsw/twin_dragon_grp.diff
@@ -0,0 +1,23 @@
+diff -Naur jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2/src/grpscan.c jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2.patched/src/grpscan.c
+--- jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2/src/grpscan.c	2017-03-24 23:22:17.000000000 -0400
++++ jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2.patched/src/grpscan.c	2020-04-28 20:48:40.091365360 -0400
+@@ -34,6 +34,7 @@
+ 	{ "Registered Version",		0x7545319F, 47536148, NULL },
+ 	{ "Shareware Version",		0x08A7FA1F, 26056769, NULL },
+ 	{ "Wanton Destruction (Addon)", 0xA9AAA7B7, 48698128, NULL },
++	{ "Twin Dragon (Addon)", 0xe06cb6b4, 53480783 },
+ };
+ struct grpfile *foundgrps = NULL;
+ 
+diff -Naur jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2/src/grpscan.h jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2.patched/src/grpscan.h
+--- jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2/src/grpscan.h	2017-03-24 23:22:17.000000000 -0400
++++ jfsw-8fc2d549d4ad840021da40e9021c6a2b891f41c2.patched/src/grpscan.h	2020-04-28 20:52:36.787343843 -0400
+@@ -25,7 +25,7 @@
+ #define __grpscan_h__
+ 
+ // List of internally-known GRP files
+-#define numgrpfiles 3
++#define numgrpfiles 4
+ struct grpfile {
+ 	const char *name;
+ 	int crcval;
diff --git a/games/jfsw_demo_data/README b/games/jfsw_demo_data/README
index 202c6ac361..f1cf3d0361 100644
--- a/games/jfsw_demo_data/README
+++ b/games/jfsw_demo_data/README
@@ -9,9 +9,9 @@ was released for the PC on May 13, 1997, while the full version was
 released on August 31, 1997. Shadow Warrior was developed using Ken
 Silverman's Build engine.
 
-The jfsw launcher supports both the demo (jfsw_demo_data) version and the
-full version (jfsw_registered_data). Since the full version includes the
-levels from the demo version (as Episode 1), there's no need to install
-both on the same system, although this is supported.
+The jfsw launcher supports both the demo (jfsw_demo_data) version
+and the full version (jfsw_registered_data). Since the full version
+includes the levels from the demo version (as Episode 1), there's no
+need to install both on the same system, although this is supported.
 
 This package can't be used with jfsw_hires_pack.
diff --git a/games/jfsw_hires_pack/README b/games/jfsw_hires_pack/README
index 67de73e67c..b606accb6d 100644
--- a/games/jfsw_hires_pack/README
+++ b/games/jfsw_hires_pack/README
@@ -4,9 +4,10 @@ This adds high resolution textures and 3D models to Shadow Warrior. For
 use with slackbuilds.org jfsw package.
 
 *** NOTE:
-*** The data file "sw.grp" from the full retail version is *required* to
-*** use this package; it will NOT work with the shareware/demo version (if
-*** you get a segfault at startup, the game is using the shareware sw.grp).
+*** The data file "sw.grp" from the full retail version is *required*
+*** to use this package; it will NOT work with the shareware/demo
+*** version. If you get a segfault at startup, the game is using the
+*** shareware sw.grp.
 
 If you have jfsw_demo_data installed, remove it with removepkg, and copy
 sw.grp from the full version to "/usr/share/games/jfsw/sw.grp". If you
diff --git a/games/jfsw_registered_data/README b/games/jfsw_registered_data/README
index 67e0da1b9d..af00313be9 100644
--- a/games/jfsw_registered_data/README
+++ b/games/jfsw_registered_data/README
@@ -1,7 +1,9 @@
 jfsw_registered_data (game data from full version of Shadow Warrior)
 
 This is the full/registered version of Shadow Warrior, for use with the
-jfsw game engine.
+jfsw game engine. The package includes the resource file (sw.grp) and
+the audio tracks from the original CD, converted to .ogg for use with
+the jfsw engine.
 
 Shadow Warrior is a first-person shooter video game developed by 3D
 Realms and published by GT Interactive Software. The shareware version
@@ -9,13 +11,12 @@ was released for the PC on May 13, 1997, while the full version was
 released on August 31, 1997. Shadow Warrior was developed using Ken
 Silverman's Build engine.
 
-The jfsw launcher supports both the demo version (jfsw_demo_data) and the
-full version (jfsw_registered_data). Since the full version includes the
-levels from the demo version (as Episode 1), there's no need to install
-both on the same system, although this is supported.
+The jfsw launcher supports both the demo version (jfsw_demo_data)
+and the full version (jfsw_registered_data). Since the full version
+includes the levels from the demo version (as Episode 1), there's no
+need to install both on the same system, although this is supported.
 
-If you get '403 Forbidden' when downloading the source file, either
-use a browser to visit the homepage and click on 'Download Full', or
-else use a custom User-Agent header. Example:
+While the package is being built, up to 1GB of space in /tmp (or $TMP)
+will be used.
 
-( source jfsw_registered_data.info ; wget --user-agent Firefox $DOWNLOAD )
+See also: games/jfsw_wanton_destruction
diff --git a/games/jfsw_registered_data/extract-shadow-warrior.sh b/games/jfsw_registered_data/extract-shadow-warrior.sh
new file mode 100644
index 0000000000..40d161fe84
--- /dev/null
+++ b/games/jfsw_registered_data/extract-shadow-warrior.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# extract-shadow-warrior.sh, by B. Watson (yalhcru@gmail.com).
+
+# Licensed under the WTFPL: Do WTF you want with this. See
+# http://www.wtfpl.net/txt/copying/ for details.
+
+# This file is part of the SlackBuilds.org jfsw_registered_data build,
+# but you're welcome to use it for any other purpose (that's why I made
+# it a standalone script).
+
+# Extracts the game data from bin/cue of Shadow Warrior for DOS, as found
+# in the zip file from https://archive.org/details/ShadowWarriorUSA. The
+# tool that handles bin/cue files is bchunk, but sadly it doesn't properly
+# handle bin/cue where each track is in a separate bin file... so we
+# help it along by chopping up the .cue file.
+
+# We expect a single argument: the name of the .cue file. Output will be
+# a set of .iso and .wav files in the current directory, named track01.iso
+# and track02.wav through track14.wav, plus a set of converted track02.ogg
+# through track14.ogg, if the oggenc command is found on $PATH.
+
+# When we're finished, the files will take up around 900MB of space,
+# so plan accordingly.
+
+# Note: converting the same wav file to ogg with oggenc multiple times,
+# does not give identical ogg files. It *does* however give the same
+# sized file every time (down to the byte). Really only matters if you're
+# debugging this script, I guess.
+
+if [ "$*" = "" ] || [ ! -e "$1" ]; then
+  echo "Usage: $( basename $0 ) cue-file.cue" 1>&2
+  exit 1
+fi
+
+# need this to let "read" read the initial spaces in the .cue file lines
+IFS=""
+
+# save old stdout
+exec 3>&1
+
+# clean up any turds from previous runs
+rm -f tmpcue??.cue
+
+# split up each track entry in the input .cue file into a separate .cue
+# file containing only that track.
+count=1
+cat "$1" | while read line; do
+  case "$line" in
+    FILE*) cue_out="tmpcue$( printf '%02d' $count ).cue"
+           exec > "$cue_out"
+           count="$( expr $count + 1 )"
+           ;;
+  esac
+  echo "$line"
+done
+
+# restore old stdout
+exec 1>&3
+
+# now convert each file to .iso or .wav (bchunk is smart enough
+# to know which is which). if a file is a .wav, we'll convert it
+# to .ogg and delete it, so we don't end up chewing up 1.3GB of
+# disk space all at once.
+for cue_out in tmpcue??.cue; do
+  rm -f track??.wav
+  binfile="$( head -1 "$cue_out" | cut -d\" -f2 )"
+  bchunk -w "$binfile" "$cue_out" track
+  [ -e track??.wav ] && oggenc -q 7 track??.wav && rm -f track??.wav
+  rm -f $cue_out
+done
diff --git a/games/jfsw_registered_data/jfsw_registered_data.SlackBuild b/games/jfsw_registered_data/jfsw_registered_data.SlackBuild
index 756d31d89c..7dca1ca210 100644
--- a/games/jfsw_registered_data/jfsw_registered_data.SlackBuild
+++ b/games/jfsw_registered_data/jfsw_registered_data.SlackBuild
@@ -6,14 +6,26 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# This game is offered as a free download on both Steam and GoG.
-# It's also been available from www.oldpcgaming.net since 2014.
+# This game is offered as a free download on both Steam and GoG. It also
+# was available from www.oldpcgaming.net from 2014 to late 2019, and
+# has been available on archive.org since late 2018.
+
+# 20200428 bkw: the old .7z from oldpcgaming.net has vanished along
+# with the site. Switched to a CD image from archive.org, in bin/cue
+# format. More work for this script to do, but as a nice bonus, we get
+# the CD audio tracks installed too.
 
 PRGNAM=jfsw_registered_data
 VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
+# Depending on what was used to do the download, the %XX hex escapes
+# might get interpreted or not, handle either name.
+SRCNAM="Shadow Warrior (USA)"
+ZIPNAME1="$SRCNAM.zip"
+ZIPNAME2="Shadow%20Warrior%20%28USA%29.zip"
+
 ARCH=noarch
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -28,26 +40,47 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-7za x $CWD/shadow.7z '*/*.GRP' '*/*.TXT' '*/*.ICO'
-cd shadow
+
+[ -e "$CWD/$ZIPNAME1" ] && ZIPNAME="$ZIPNAME1" || ZIPNAME="$ZIPNAME2"
+unzip "$CWD/$ZIPNAME"
 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 *
 
-mkdir -p $PKG/usr/share/games/jfsw
-install -m0644 SW.GRP $PKG/usr/share/games/jfsw/sw_registered.grp
+# The "source" file is a bin/cue cdrom image with multiple .bin files.
+# It took some effort to get bchunk to extract this correctly, and I've
+# moved the code into a separate script so that users of other distros
+# can possibly make use of it. In fact it's been tested on MacOSX :)
+sh $CWD/extract-shadow-warrior.sh "$SRCNAM.cue"
+
+# Loop mount the iso to extract the stuff we need from it.
+# N.B. sandbox wrappers like sbrun or slackrepo might complain that
+# /etc/mtab has been modified. We could prevent this by using the
+# --no-mtab option with the mount and umount commands below, but
+# if something makes the script die before it's finished, we would
+# have left behind an invisible mount that could cause confusion and
+# irritation later...
+MNTPNT="$( mktemp -d cdmount.XXXXXX )"
+mount -o loop track01.iso $MNTPNT
 
-# This stuff's not very relevant to a source port.
-rm -f INSTALL.TXT ORDERFRM.TXT
+cd $MNTPNT/swinst
+  mkdir -p $PKG/usr/share/games/jfsw
+  install -m0644 SW.GRP $PKG/usr/share/games/jfsw/sw_registered.grp
+
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+  for i in CREDITS.TXT license.txt; do
+    sed 's,\r,,' < $i > $PKG/usr/doc/$PRGNAM-$VERSION/$( echo $i | tr A-Z a-z )
+  done
+cd -
+
+cat $MNTPNT/sw.ico > $PKG/usr/doc/$PRGNAM-$VERSION/sw.ico
+umount $MNTPNT
+rmdir $MNTPNT
+
+# Done with the iso, now for the audio tracks (which have already been
+# converted to ogg).
+mkdir -p $PKG/usr/share/games/jfsw
+cp track??.ogg $PKG/usr/share/games/jfsw
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-for i in *.TXT; do
-  sed 's,\r,,' < $i > $PKG/usr/doc/$PRGNAM-$VERSION/$( echo $i | tr A-Z a-z )
-done
-cat SW.ICO > $PKG/usr/doc/$PRGNAM-$VERSION/sw.ico
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/jfsw_registered_data/jfsw_registered_data.info b/games/jfsw_registered_data/jfsw_registered_data.info
index a5153d153a..ede16fa8e5 100644
--- a/games/jfsw_registered_data/jfsw_registered_data.info
+++ b/games/jfsw_registered_data/jfsw_registered_data.info
@@ -1,10 +1,10 @@
 PRGNAM="jfsw_registered_data"
 VERSION="1.2"
-HOMEPAGE="http://www.oldpcgaming.net/shadow-warrior-review/"
-DOWNLOAD="http://www.oldpcgaming.net/demo/shadow.7z"
-MD5SUM="b1dff182c5760710c2e31e9f4e728eb1"
+HOMEPAGE="https://archive.org/details/ShadowWarriorUSA"
+DOWNLOAD="https://archive.org/download/ShadowWarriorUSA/Shadow%20Warrior%20%28USA%29.zip"
+MD5SUM="b301a2f6929cdd7642b308b13d4bc69c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jfsw p7zip"
+REQUIRES="jfsw bchunk"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/jfsw_twin_dragon/README b/games/jfsw_twin_dragon/README
new file mode 100644
index 0000000000..750c5e2465
--- /dev/null
+++ b/games/jfsw_twin_dragon/README
@@ -0,0 +1,22 @@
+jfsw_twin_dragon (game data for Shadow Warrior expansion pack)
+
+Twin Dragon is an expansion to the Shadow Warrior Classic and was
+released as a free download on July 4, 1998. It was created by Wylde
+Productions and Level Infinity, and features music by Castles Music
+Productions[*]. The game features 13 new levels, new sounds, artwork
+and a new final boss, Hung Lo, who replaced Zilla.
+
+After installing the package, "Twin Dragons (Addon)" should appear in
+the Game tab of the jfsw launcher. If it doesn't, upgrade jfsw to the
+latest build (at least version 20180424_8fc2d54, build 2).
+
+The expansion doesn't change the first episode of the game. To play the
+new levels, choose episode 2 ("Code of Honor") when starting a new game.
+
+The original Twin Dragon release included a modified Shadow Warrior
+executable, which changed the episode and level names for the expansion.
+This build doesn't (currently) do that, so you'll see the original names
+(e.g. "Code of Honor", rather than "Twin Dragon").
+
+[*] This build doesn't include any new music. The Twin Dragon release
+    zip file doesn't include it.
diff --git a/games/jfsw_twin_dragon/jfsw_twin_dragon.SlackBuild b/games/jfsw_twin_dragon/jfsw_twin_dragon.SlackBuild
new file mode 100644
index 0000000000..47beeabfdb
--- /dev/null
+++ b/games/jfsw_twin_dragon/jfsw_twin_dragon.SlackBuild
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# Slackware build script for jfsw_twin_dragon
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=jfsw_twin_dragon
+VERSION=${VERSION:-20200428}
+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
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unzip $CWD/$PRGNAM-$VERSION.zip
+chown -R root:root .
+chmod 644 *
+
+mkdir -p $PKG/usr/share/games/jfsw
+cp -a td.grp $PKG/usr/share/games/jfsw
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+sed -i 's,\r,,' *.txt
+cp -a *.txt *.sh *.diff *.doc *.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/games/jfsw_twin_dragon/jfsw_twin_dragon.info b/games/jfsw_twin_dragon/jfsw_twin_dragon.info
new file mode 100644
index 0000000000..f66d06e64b
--- /dev/null
+++ b/games/jfsw_twin_dragon/jfsw_twin_dragon.info
@@ -0,0 +1,10 @@
+PRGNAM="jfsw_twin_dragon"
+VERSION="20200428"
+HOMEPAGE="https://shadowwarrior.fandom.com/wiki/Twin_Dragon"
+DOWNLOAD="https://slackware.uk/~urchlay/src/jfsw_twin_dragon-20200428.zip"
+MD5SUM="8b99aaf5059079d2c39781fc2746f937"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jfsw"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/jfsw_twin_dragon/slack-desc b/games/jfsw_twin_dragon/slack-desc
new file mode 100644
index 0000000000..f9a4b6c342
--- /dev/null
+++ b/games/jfsw_twin_dragon/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------------------------------------------------------|
+jfsw_twin_dragon: jfsw_twin_dragon (game data for Shadow Warrior expansion pack)
+jfsw_twin_dragon:
+jfsw_twin_dragon: Twin Dragon is an expansion to the Shadow Warrior Classic and was
+jfsw_twin_dragon: released as a free download on July 4, 1998. It was created by Wylde
+jfsw_twin_dragon: Productions and Level Infinity, and features music by Castles Music
+jfsw_twin_dragon: Productions. The game features 13 new levels, new sounds, artwork
+jfsw_twin_dragon: and a new final boss, Hung Lo, who replaced Zilla.
+jfsw_twin_dragon:
+jfsw_twin_dragon:
+jfsw_twin_dragon:
+jfsw_twin_dragon:
diff --git a/games/jfsw_wanton_destruction/README b/games/jfsw_wanton_destruction/README
index 61851e4631..ee6b03477a 100644
--- a/games/jfsw_wanton_destruction/README
+++ b/games/jfsw_wanton_destruction/README
@@ -19,5 +19,6 @@ From the original documentation (wdinfo.txt):
   Construction, on board a 747, high tech Secret Military Base, Japanese
   Bullet Train, Zilla's Auto Factory, and Tokyo Rooftops. In addition,
   the episode contains not one, but two full size super secret levels
-  that will have you on the edge of your seat! In addition, we've included
-  three all new Wangbang-only levels as well as a capture the flag level!
+  that will have you on the edge of your seat! In addition, we've
+  included three all new Wangbang-only levels as well as a capture the
+  flag level!
diff --git a/games/jfsw_wanton_destruction/jfsw_wanton_destruction.info b/games/jfsw_wanton_destruction/jfsw_wanton_destruction.info
index 5d55b0b905..7ebe6b3138 100644
--- a/games/jfsw_wanton_destruction/jfsw_wanton_destruction.info
+++ b/games/jfsw_wanton_destruction/jfsw_wanton_destruction.info
@@ -1,7 +1,7 @@
 PRGNAM="jfsw_wanton_destruction"
 VERSION="20050909"
 HOMEPAGE="http://legacy.3drealms.com/news/2005/09/wanton_destruction_for_shadow.html"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/swwd.exe"
+DOWNLOAD="https://slackware.uk/~urchlay/src/swwd.exe"
 MD5SUM="df7732c37aaedb595386a874d1a017f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/jzintv/README b/games/jzintv/README
index 6b223bb420..3c2e465633 100644
--- a/games/jzintv/README
+++ b/games/jzintv/README
@@ -12,9 +12,9 @@ usually found as "intv.zip". Contents:
 exec.bin, 8192 bytes, md5sum 62e761035cb657903761800f4437b8af
 grom.bin, 2048 bytes, md5sum 0cd5946c6473e42e8e4c2137785e427f
 
-Your md5sums may not match, since Mattel released several versions of the
-ROMs. The above are known to work, but other versions might also work.
-jzintv looks for the .bin files, not the .zip file.
+Your md5sums may not match, since Mattel released several versions of
+the ROMs. The above are known to work, but other versions might also
+work. jzintv looks for the .bin files, not the .zip file.
 
 Once you have the ROM images, place them in the /usr/share/jzintv/rom
 directory.
diff --git a/games/knights/README b/games/knights/README
index 83b641f521..e133dba217 100644
--- a/games/knights/README
+++ b/games/knights/README
@@ -1,6 +1,6 @@
 knights (a simple chess board for KDE 4)
 
 Knights is a rewrite of the KDE3 Knights. You can play against computer
-engines that support the XBoard protocol (like GnuChess), against another
-player at the same computer, or on the Free Internet Chess Server. It
-has automatic rule checking and some nice animations.
+engines that support the XBoard protocol (like GnuChess), against
+another player at the same computer, or on the Free Internet Chess
+Server. It has automatic rule checking and some nice animations.
diff --git a/games/koules/README b/games/koules/README
index 291259d5af..2a4c5b8046 100644
--- a/games/koules/README
+++ b/games/koules/README
@@ -1,9 +1,9 @@
-Koules is a fast action arcade-style game for UNIX and OS/2. This version
-supports X window system, SVGAlib  for Linux and OS/2. It works in fine
-(up to 900x620) resolution with cool 256 color graphics, multiplayer mode
-up to 5 players, full sound and, of course, network support. Koules is
-an original idea.  First version of Koules was developed from scratch
-by Jan Hubicka in July 1995.
+Koules is a fast action arcade-style game for UNIX and OS/2. This
+version supports X window system, SVGAlib  for Linux and OS/2. It
+works in fine (up to 900x620) resolution with cool 256 color graphics,
+multiplayer mode up to 5 players, full sound and, of course, network
+support. Koules is an original idea.  First version of Koules was
+developed from scratch by Jan Hubicka in July 1995.
 
 Yes, koules used to packaged on disk y1 of Slackware 3.3. It needed
 quite a bit of patching to work well on a modern system...
@@ -18,15 +18,16 @@ useful if you use OSSv4).
 When using ALSA on a stock Slack 14.2 system, the audio will be routed
 to pulseaudio, but pulseaudio doesn't get automatically started by
 koules. This shouldn't be an issue for KDE or XFCE users (since they
-start a persistent pulseaudio daemon at startup), but if you run a window
-manager like WindowMaker or FVWM2, you might have to start pulseaudio
-manually (or, from your .xinitrc).
+start a persistent pulseaudio daemon at startup), but if you run a
+window manager like WindowMaker or FVWM2, you might have to start
+pulseaudio manually (or, from your .xinitrc).
 
 If you have Tcl/Tk installed, and you're running KDE, you'll get a nice
 GUI launcher dialog when you run Koules from the K menu. If you're not
 running KDE, try running "koules-launcher".
 
-Note: When playing as player #2 in multiplayer, the default keys are WASD,
-not the arrows (this is confusing). Players 3 and above don't seem to
-have default key maps, so be sure to configure the keys before starting
-the game (or set the control type to mouse or joystick instead).
+Note: When playing as player #2 in multiplayer, the default keys
+are WASD, not the arrows (this is confusing). Players 3 and above
+don't seem to have default key maps, so be sure to configure the keys
+before starting the game (or set the control type to mouse or joystick
+instead).
diff --git a/games/lgogdownloader/lgogdownloader.SlackBuild b/games/lgogdownloader/lgogdownloader.SlackBuild
index c6f6e18e75..a3a0032ebb 100644
--- a/games/lgogdownloader/lgogdownloader.SlackBuild
+++ b/games/lgogdownloader/lgogdownloader.SlackBuild
@@ -26,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lgogdownloader
-VERSION=${VERSION:-3.5}
+VERSION=${VERSION:-3.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/lgogdownloader/lgogdownloader.info b/games/lgogdownloader/lgogdownloader.info
index 31f74a34f8..1d87ad178e 100644
--- a/games/lgogdownloader/lgogdownloader.info
+++ b/games/lgogdownloader/lgogdownloader.info
@@ -1,8 +1,8 @@
 PRGNAM="lgogdownloader"
-VERSION="3.5"
+VERSION="3.7"
 HOMEPAGE="https://sites.google.com/site/gogdownloader/home/"
-DOWNLOAD="https://sites.google.com/site/gogdownloader/lgogdownloader-3.5.tar.gz"
-MD5SUM="174a6d177de713a022ea54cbfd71bc0d"
+DOWNLOAD="https://sites.google.com/site/gogdownloader/lgogdownloader-3.7.tar.gz"
+MD5SUM="f23ea65cd9ca604bd5bb0b1039bd1e7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="htmlcxx jsoncpp liboauth rhash tinyxml2"
diff --git a/games/libretro-2048/libretro-2048.info b/games/libretro-2048/libretro-2048.info
index 8d98f0fdaa..7ab37409f9 100644
--- a/games/libretro-2048/libretro-2048.info
+++ b/games/libretro-2048/libretro-2048.info
@@ -6,5 +6,5 @@ MD5SUM="d87b62147df0261fafed1ec0d6d3fda6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/libretro-desmume/README b/games/libretro-desmume/README
index 1d705fcdcf..7ebc3f403a 100644
--- a/games/libretro-desmume/README
+++ b/games/libretro-desmume/README
@@ -1,5 +1,5 @@
-DeSmuME is an Nintendo DS video game system emulator that can be used as a
-libretro core.
+DeSmuME is an Nintendo DS video game system emulator that can be used
+as a libretro core.
 
 To build the debugging symbols use:
   DEBUG=1 ./libretro-desmume.SlackBuild
diff --git a/games/libretro-desmume/libretro-desmume.info b/games/libretro-desmume/libretro-desmume.info
index 50fffb87e2..986c53f9e4 100644
--- a/games/libretro-desmume/libretro-desmume.info
+++ b/games/libretro-desmume/libretro-desmume.info
@@ -6,5 +6,5 @@ MD5SUM="bca5173c6378b6b05cac012d66aaa159"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/libretro-fceumm/README b/games/libretro-fceumm/README
index 20dae0580d..b0cbad0238 100644
--- a/games/libretro-fceumm/README
+++ b/games/libretro-fceumm/README
@@ -1,8 +1,8 @@
-FCEUmm is a Nintendo Entertainment System video game system emulator that can
-be used as a libretro core.
+FCEUmm is a Nintendo Entertainment System video game system emulator
+that can be used as a libretro core.
 
-FCEUmm (FCEUltra mappers modified) is a NES/Famicom emulator that specializes
-in extensive mapper support.
+FCEUmm (FCEUltra mappers modified) is a NES/Famicom emulator that
+specializes in extensive mapper support.
 
 FCEUmm requires a real BIOS for Famicom Disk System emulation to work.
 
diff --git a/games/libretro-fceumm/libretro-fceumm.info b/games/libretro-fceumm/libretro-fceumm.info
index 35094d0d1a..79f5a35aaa 100644
--- a/games/libretro-fceumm/libretro-fceumm.info
+++ b/games/libretro-fceumm/libretro-fceumm.info
@@ -6,5 +6,5 @@ MD5SUM="60f384736063dd92a6581fde0a7011a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/libretro-handy/README b/games/libretro-handy/README
index 79d9bfb4e3..9f769ef46a 100644
--- a/games/libretro-handy/README
+++ b/games/libretro-handy/README
@@ -1,7 +1,8 @@
 Handy is an Atari Lynx video game system emulator that can be used as a
 libretro core.
 
-Handy optionally supports using the following BIOS image file for operation:
+Handy optionally supports using the following BIOS image file for
+operation:
 
 * lynxboot.img (Lynx Boot Image)
 
diff --git a/games/libretro-handy/libretro-handy.info b/games/libretro-handy/libretro-handy.info
index 26f4b91024..942756b166 100644
--- a/games/libretro-handy/libretro-handy.info
+++ b/games/libretro-handy/libretro-handy.info
@@ -6,5 +6,5 @@ MD5SUM="e76b593c3b620f5ccae15bb60c71df1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/libretro-prboom/README b/games/libretro-prboom/README
index b35bb5b265..31d362c9d2 100644
--- a/games/libretro-prboom/README
+++ b/games/libretro-prboom/README
@@ -1,9 +1,9 @@
-PrBoom, the purest Doom-Port? Aims to be the most stable Doom port with the
-highest compatibility to the major Doom versions and highres software
-rendering. Full Boom and most if not all MBF features.
+PrBoom, the purest Doom-Port? Aims to be the most stable Doom port
+with the highest compatibility to the major Doom versions and highres
+software rendering. Full Boom and most if not all MBF features.
 
-The prboom.wad found in the source tree is required to play prboom, place it in
-the content directory with the other doom wads.
+The prboom.wad found in the source tree is required to play prboom,
+place it in the content directory with the other doom wads.
 
 To build the debugging symbols use:
   DEBUG=1 ./libretro-prboom.SlackBuild
diff --git a/games/libretro-prboom/libretro-prboom.info b/games/libretro-prboom/libretro-prboom.info
index e52f50a41a..52854a1a5e 100644
--- a/games/libretro-prboom/libretro-prboom.info
+++ b/games/libretro-prboom/libretro-prboom.info
@@ -6,5 +6,5 @@ MD5SUM="3fdccb998916cb5798efab7cfd09eb07"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/libretro-reicast/libretro-reicast.info b/games/libretro-reicast/libretro-reicast.info
index 1c42ed45c3..e41258a93b 100644
--- a/games/libretro-reicast/libretro-reicast.info
+++ b/games/libretro-reicast/libretro-reicast.info
@@ -6,5 +6,5 @@ MD5SUM="9f9b893222683221130a24a283741af8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/libretro-vecx/README b/games/libretro-vecx/README
index 7afd4d19a8..4e0efb1cd1 100644
--- a/games/libretro-vecx/README
+++ b/games/libretro-vecx/README
@@ -1,4 +1,5 @@
-Vecx is a Vectrex video game system emulator that can be used as a libretro core.
+Vecx is a Vectrex video game system emulator that can be used as a
+libretro core.
 
 To build the debugging symbols use:
   DEBUG=1 ./libretro-vecx.SlackBuild
diff --git a/games/libretro-vecx/libretro-vecx.info b/games/libretro-vecx/libretro-vecx.info
index 2ab8f78ce0..e9412438a0 100644
--- a/games/libretro-vecx/libretro-vecx.info
+++ b/games/libretro-vecx/libretro-vecx.info
@@ -6,5 +6,5 @@ MD5SUM="5b313a4b412a9a2eb16fca806c371f65"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/libretro-yabause/README b/games/libretro-yabause/README
index c1c9c222fa..351db37753 100644
--- a/games/libretro-yabause/README
+++ b/games/libretro-yabause/README
@@ -1,13 +1,14 @@
-Yabause is a Sega Saturn video game system emulator that can be used as a
-libretro core.
+Yabause is a Sega Saturn video game system emulator that can be used as
+a libretro core.
 
-Yabause (Yet Another Buggy And Uncomplete Saturn Emulator) is the only active
-Sega Saturn emulator that is both open-source and written with portability in
-mind. The libretro port only supports the software renderer at the moment,
-which is more accurate but also slower than the GL renderer.
+Yabause (Yet Another Buggy And Uncomplete Saturn Emulator) is the
+only active Sega Saturn emulator that is both open-source and written
+with portability in mind. The libretro port only supports the software
+renderer at the moment, which is more accurate but also slower than the
+GL renderer.
 
-Yabause optionally supports usage of an actual Saturn BIOS image file for
-increased compatibility:
+Yabause optionally supports usage of an actual Saturn BIOS image file
+for increased compatibility:
 
 * saturn_bios.bin
 
diff --git a/games/libretro-yabause/libretro-yabause.info b/games/libretro-yabause/libretro-yabause.info
index 0ee19b59ad..77cb93746b 100644
--- a/games/libretro-yabause/libretro-yabause.info
+++ b/games/libretro-yabause/libretro-yabause.info
@@ -6,5 +6,5 @@ MD5SUM="fe1d78f0f6d8e230e3ca5048c9e79d1c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/liquidwar6/README b/games/liquidwar6/README
index d30a10646a..409b7eb380 100644
--- a/games/liquidwar6/README
+++ b/games/liquidwar6/README
@@ -1,11 +1,12 @@
-Liquid War 6 is a unique multiplayer wargame. Your army is a blob of
-liquid and you have to try and eat your opponents. Rules are very simple
-yet original, they have been invented by Thomas Colcombet. It is possible
-to play alone against the computer but the game is really designed to
-be played with friends, on a single computer, on a LAN, or on Internet.
+Liquid War 6 is a unique multiplayer wargame. Your army is a blob
+of liquid and you have to try and eat your opponents. Rules are very
+simple yet original, they have been invented by Thomas Colcombet. It
+is possible to play alone against the computer but the game is really
+designed to be played with friends, on a single computer, on a LAN, or
+on Internet.
 
-If you'd like this package to include some extra game maps, get them
-from:
+If you'd like this package to include
+some extra game maps, get them from:
 http://download.savannah.gnu.org/releases/liquidwar6/0.0.13beta/liquidwar6-extra-maps-0.0.13beta.tar.gz
 
 Place the liquidwar6-extra-maps-0.0.6beta.tar.gz file in the same
diff --git a/games/lmpc/README b/games/lmpc/README
index ba531d390f..29d0a3ee6d 100644
--- a/games/lmpc/README
+++ b/games/lmpc/README
@@ -1,9 +1,12 @@
-LMPC is a utility to handle: DOOM, DOOM 2, Heretic, Hexen and Strife LMP files;
-Duke Nukem 3D and Redneck Rampage DMO files; Quake DEM QuakeWorld QWD files;
-and Quake II Arena DM3 files. The DEM file cutter tool (DEMcut), The DEM Text
-File Analyser (DEMA), the Broadcasting Server (DBS) and the DM2 file
-concatenator (DM2cat) are part of this package too.
+lmpc (The Little Movie Processing Centre)
+
+LMPC is a utility to handle: DOOM, DOOM 2, Heretic, Hexen and Strife
+LMP files; Duke Nukem 3D and Redneck Rampage DMO files; Quake DEM
+QuakeWorld QWD files; and Quake II Arena DM3 files. The DEM file cutter
+tool (demcut), The DEM Text File Analyser (dema), the Broadcasting
+Server (dbs) and the DM2 file concatenator (dm2cat) are part of this
+package too.
 
 Building this requires TeTex or TexLive to be installed, and
-/usr/share/texmf/bin to be in your PATH. On a stock install, simply enter a
-real root shell ("su -") before building.
+/usr/share/texmf/bin to be in your PATH. On a stock install, simply
+enter a real root shell ("su -") before building.
diff --git a/games/lmpc/lmpc.SlackBuild b/games/lmpc/lmpc.SlackBuild
index 81e8640cf3..418bdd675f 100644
--- a/games/lmpc/lmpc.SlackBuild
+++ b/games/lmpc/lmpc.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for lmpc
 
 # Copyright 2015 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200416 bkw:
+# - take over maintenance
+# - TODO: find out what repo "1b70022" came from. It's newer than
+#   than the version 3.4.4 at the homepage, maybe there's even newer
+#   bugfix stuff?
+# - i486 => i586
+# - add -j1 to make command :(
+# - binaries in /usr/games
+
 PRGNAM=lmpc
 VERSION=${VERSION:-1b70022}
 BUILD=${BUILD:-1}
@@ -29,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
@@ -40,8 +50,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,26 +73,20 @@ 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 {} \+
 
 sh autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr
+./configure --prefix=/usr --bindir=/usr/games
 
-make
-make install DESTDIR=$PKG
+make -j1
+make install-strip DESTDIR=$PKG
 
 # These need to be installed separately.
-install -m755 bin/dema $PKG/usr/bin/dema
-install -m755 bin/dm2cat $PKG/usr/bin/dm2cat
-
-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 -m755 bin/dema $PKG/usr/games/dema
+install -m755 bin/dm2cat $PKG/usr/games/dm2cat
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING COPYING.LIB INSTALL README.base $PKG/usr/doc/$PRGNAM-$VERSION
@@ -106,7 +110,6 @@ cp -a \
 	spec/qwd-qw/qwd.pdf \
 	$PKG/usr/doc/$PRGNAM-$VERSION/spec
 
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/misc
 cp -a spec/misc/cd.dem \
 	spec/misc/cd.html \
diff --git a/games/lmpc/lmpc.info b/games/lmpc/lmpc.info
index 5e58d55b29..f720018dbb 100644
--- a/games/lmpc/lmpc.info
+++ b/games/lmpc/lmpc.info
@@ -6,5 +6,5 @@ MD5SUM="88da9b536615a558fa8c7e91a1c834a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/lmpc/slack-desc b/games/lmpc/slack-desc
index 5406924f8e..504bda208c 100644
--- a/games/lmpc/slack-desc
+++ b/games/lmpc/slack-desc
@@ -11,8 +11,8 @@ lmpc:
 lmpc: LMPC is a utility to handle: DOOM, DOOM 2, Heretic, Hexen and Strife
 lmpc: LMP files; Duke Nukem 3D and Redneck Rampage DMO files; Quake DEM
 lmpc: QuakeWorld QWD files; and Quake II Arena DM3 files. The DEM file
-lmpc: cutter tool (DEMcut), The DEM Text File Analyser (DEMA), the
-lmpc: Broadcasting Server (DBS) and the DM2 file concatenator (DM2cat) are
+lmpc: cutter tool (demcut), The DEM Text File Analyser (dema), the
+lmpc: Broadcasting Server (dbs) and the DM2 file concatenator (dm2cat) are
 lmpc: part of this package too.
 lmpc:
 lmpc: http://demospecs.half-empty.de/lmpc-alpha/
diff --git a/games/lutris/README b/games/lutris/README
index 4662ec2916..9f61348091 100644
--- a/games/lutris/README
+++ b/games/lutris/README
@@ -1,6 +1,6 @@
-Lutris is an open gaming platform for Linux.  It helps you install and manage
-your games in a unified interface.  The goal is to support every game which
-runs on Linux, from native to Windows games (via Wine) to emulators and
-browser games.
+Lutris is an open gaming platform for Linux.  It helps you install and
+manage your games in a unified interface.  The goal is to support every
+game which runs on Linux, from native to Windows games (via Wine) to
+emulators and browser games.
 
 allegro and wine are optional dependencies for some of the runners.
diff --git a/games/maelstrom/README b/games/maelstrom/README
index e789b4a453..2f74a7ec2b 100644
--- a/games/maelstrom/README
+++ b/games/maelstrom/README
@@ -1,11 +1,11 @@
 Maelstrom is a game similar to Asteroids.
 
 You pilot your ship through the dreaded "Maelstrom" asteroid belt --
-suddenly your best friend thrusts towards you and fires, directly at your
-cockpit. You raise your shields just in time, and the battle is joined.
-The deadliest stretch of space known to mankind has just gotten
-deadlier.
+suddenly your best friend thrusts towards you and fires, directly
+at your cockpit. You raise your shields just in time, and the battle
+is joined.  The deadliest stretch of space known to mankind has just
+gotten deadlier.
 
-This package also comes with a script to create Slackware packages
-from the Maelstrom add-on graphics/sound files.
-Run 'maelstrom_addon_package.pl --help' for more information.
+This package also comes with a script to create Slackware
+packages from the Maelstrom add-on graphics/sound files.  Run
+'maelstrom_addon_package.pl --help' for more information.
diff --git a/games/mame/README b/games/mame/README
index ea0cd5dccb..c836db4ad0 100644
--- a/games/mame/README
+++ b/games/mame/README
@@ -2,21 +2,23 @@ Note: I'm aware that this isn't the latest version of MAME. However,
 it's the latest version that will compile on stock Slackware 14.2. If
 you *really* need the latest version, see README_gcc9.txt.
 
-MAME stands for Multiple Arcade Machine Emulator.  When used in conjunction 
-with images of the original arcade game's ROM and disk data, MAME attempts 
-to reproduce that game as faithfully as possible on a more modern general
-purpose computer.  MAME can currently emulate several thousand different 
-classic arcade video games from the late 1970s through the modern era.
+MAME stands for Multiple Arcade Machine Emulator.  When used in
+conjunction with images of the original arcade game's ROM and disk
+data, MAME attempts to reproduce that game as faithfully as possible
+on a more modern general purpose computer.  MAME can currently emulate
+several thousand different classic arcade video games from the late
+1970s through the modern era.
 
 MESS (Multi Emulator Super System) is the sister project of MAME. MESS
-documents the hardware for a wide variety of (mostly vintage) computers,
-video game consoles, and calculators, as MAME does for arcade games.
+documents the hardware for a wide variety of (mostly vintage)
+computers, video game consoles, and calculators, as MAME does for
+arcade games.
 
 Modern versions of MAME now include MESS, so there's no need for a
 separate MESS build or binary.
 
-This build requires around 3.5GB of storage in /tmp (or whatever you set
-TMP to in the environment).
+This build requires around 3.5GB of storage in /tmp (or whatever you
+set TMP to in the environment).
 
 Optionally, MAME can be built with a debugger for emulated ROM
 code. You don't need this just to play the games; it's mainly useful
diff --git a/games/mame2000-libretro/mame2000-libretro.SlackBuild b/games/mame2000-libretro/mame2000-libretro.SlackBuild
index 81b5fc6827..4900572f40 100644
--- a/games/mame2000-libretro/mame2000-libretro.SlackBuild
+++ b/games/mame2000-libretro/mame2000-libretro.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for mame2000-libretro
 
 # Copyright 2017-2018 Hunter Sezen California, USA
+# Copyright 2020 ilmich < ardutu at gmail dot com >
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +25,7 @@
 
 PRGNAM=mame2000-libretro
 LIBNAM=$(echo $PRGNAM | tr - _)
-VERSION=${VERSION:-2018.09.30_12b5419}
+VERSION=${VERSION:-2020.10.21_6655a51}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/mame2000-libretro/mame2000-libretro.info b/games/mame2000-libretro/mame2000-libretro.info
index 20258dc209..26abee268c 100644
--- a/games/mame2000-libretro/mame2000-libretro.info
+++ b/games/mame2000-libretro/mame2000-libretro.info
@@ -1,10 +1,10 @@
 PRGNAM="mame2000-libretro"
-VERSION="2018.09.30_12b5419"
+VERSION="2020.10.21_6655a51"
 HOMEPAGE="https://www.libretro.com/"
-DOWNLOAD="http://slackless.raccoons.tech/src/libretro/mame2000-libretro-2018.09.30_12b5419.tar.xz"
-MD5SUM="d1ca8c9b55fc0730af7a5015143908cc"
+DOWNLOAD="https://ilmich.github.io/src/mame2000-libretro-2020.10.21_6655a51.tar.xz"
+MD5SUM="b295ea55f54fc7d138d4ef2f3ed2e470"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="ilmich"
+EMAIL="ardutu@gmail.com"
diff --git a/games/mangband/doinst.sh b/games/mangband/doinst.sh
index d776254957..bf1622e748 100644
--- a/games/mangband/doinst.sh
+++ b/games/mangband/doinst.sh
@@ -12,7 +12,6 @@ config() {
   fi
 }
 
-config usr/share/games/mangband/lib/data/scores.raw.new
 config usr/share/games/mangband/lib/edit/artifact.txt.new
 config usr/share/games/mangband/lib/edit/ego_item.txt.new
 config usr/share/games/mangband/lib/edit/flavor.txt.new
diff --git a/games/mangband/mangband.SlackBuild b/games/mangband/mangband.SlackBuild
index b66fc7d50b..d9692ac84d 100644
--- a/games/mangband/mangband.SlackBuild
+++ b/games/mangband/mangband.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mangband
 
-# Copyright 2019, David Melik, Spokane, WA, USA
+# Copyright 2020, 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=mangband
-VERSION=${VERSION:-1.5.2}
+VERSION=${VERSION:-1.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/mangband/mangband.info b/games/mangband/mangband.info
index 32aee5679c..1595e5d798 100644
--- a/games/mangband/mangband.info
+++ b/games/mangband/mangband.info
@@ -1,8 +1,8 @@
 PRGNAM="mangband"
-VERSION="1.5.2"
+VERSION="1.5.3"
 HOMEPAGE="https://mangband.org/"
-DOWNLOAD="https://mangband.org/downloads/binaries/mangband-1.5.2.tar.gz"
-MD5SUM="4cb550a19535de739d014d1a6e57353c"
+DOWNLOAD="https://mangband.org/downloads/binaries/mangband-1.5.3.tar.gz"
+MD5SUM="a9831b4b350b449b1bbfd32e6e2a3857"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/README b/games/marathon-infinity-data/README
index cf99c2a5f9..576e2dded6 100644
--- a/games/marathon-infinity-data/README
+++ b/games/marathon-infinity-data/README
@@ -1,8 +1,9 @@
 marathon-infinity-data (game data for use with alephone)
 
-Marathon Infinity is the most popular Marathon game in online play, and
-is compatible with hundreds of community-made maps. This release includes
-the classic graphics, and revamped high-definition textures and weapons.
+Marathon Infinity is the most popular Marathon game in online play,
+and is compatible with hundreds of community-made maps. This release
+includes the classic graphics, and revamped high-definition textures
+and weapons.
 
 Included in the package is a shell script wrapper. Type
 "marathon-infinity" or select Marathon Infinity from the KDE or XFCE
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/mari0/mari0.info b/games/mari0/mari0.info
index 4558024711..c0d6f38970 100644
--- a/games/mari0/mari0.info
+++ b/games/mari0/mari0.info
@@ -1,7 +1,7 @@
 PRGNAM="mari0"
 VERSION="1.6"
 HOMEPAGE="http://stabyourself.net/mari0/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/mari0-source.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/mari0-source.zip"
 MD5SUM="22125f68ff41795fa8bafad5d1b1d1a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/mednafen/README b/games/mednafen/README
index c0f9b822da..0055d794f4 100644
--- a/games/mednafen/README
+++ b/games/mednafen/README
@@ -1,9 +1,10 @@
 Mednafen is a multi-game-system emulator, for various platforms,
-including emulation of Atari Lynx, Famicom, GameBoy (Color),
-GameBoy Advance, Neo Geo Pocket (Color), NES - both NTSC and PAL,
-PC-FX, WonderSwan (Color), PC Engine/TurboGrafx 16 (CD) and SuperGrafx.
+including emulation of Atari Lynx, Famicom, GameBoy (Color), GameBoy
+Advance, Neo Geo Pocket (Color), NES - both NTSC and PAL, PC-FX,
+WonderSwan (Color), PC Engine/TurboGrafx 16 (CD) and SuperGrafx.
 
-Optional dependency: Mednafen will use jack if it's available at build time.
+Optional dependency: Mednafen will use jack if it's available at build
+time.
 
 To make Mednafen use ALSA's default output, run like so:
 
diff --git a/games/mednafen/mednafen.SlackBuild b/games/mednafen/mednafen.SlackBuild
index 83c30a2c8e..806833f971 100644
--- a/games/mednafen/mednafen.SlackBuild
+++ b/games/mednafen/mednafen.SlackBuild
@@ -3,7 +3,7 @@
 
 # Copyright 2008 - 2014  Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2014 - 2016  Ryan P.C. McQuen | Everett, WA
-# Copyright 2017 - 2019  Johannes Schoepfer, Germany
+# Copyright 2017 - 2020  Johannes Schoepfer, Germany
 # 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=mednafen
-VERSION=${VERSION:-1.22.2}
+VERSION=${VERSION:-1.24.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/mednafen/mednafen.info b/games/mednafen/mednafen.info
index 160c4cecf6..4f14ae4b97 100644
--- a/games/mednafen/mednafen.info
+++ b/games/mednafen/mednafen.info
@@ -1,8 +1,8 @@
 PRGNAM="mednafen"
-VERSION="1.22.2"
+VERSION="1.24.3"
 HOMEPAGE="https://mednafen.github.io/"
-DOWNLOAD="https://mednafen.github.io/releases/files/mednafen-1.22.2.tar.xz"
-MD5SUM="de3f23360a5db97038aa30b731e03570"
+DOWNLOAD="https://mednafen.github.io/releases/files/mednafen-1.24.3.tar.xz"
+MD5SUM="a7e1ab14c970541369ac57e857c544fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
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/README b/games/mgba/README
index 397c41f49c..20c471d19e 100644
--- a/games/mgba/README
+++ b/games/mgba/README
@@ -2,15 +2,14 @@ mGBA is an emulator for running Game Boy Advance games. It aims to be
 faster and more accurate than many existing Game Boy Advance
 emulators, as well as adding features that other emulators lack.
 
-This build both the standalone application and the Libretro core (for use with
-RetroArch).
-
 The following optional dependencies will be automatically detected.
 
 * SDL2
 * libedit (for the command-line debugger)
 * ffmpeg
+* Qt5
 
-If you have Qt 5, then you can build the standalone application with a GUI:
+If you have Qt 5, then you can build the standalone application with a
+GUI:
 
     QT=on ./mGBA.SlackBuild
diff --git a/games/mgba/mgba.SlackBuild b/games/mgba/mgba.SlackBuild
index c4edefe1b8..3927ea4b1a 100644
--- a/games/mgba/mgba.SlackBuild
+++ b/games/mgba/mgba.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for mgba
 
 # Copyright 2015 Dugan Chen Canada
+# Copyright 2019-2021 Ruoh-Shoei LIN
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mgba
-LIBNAM=${PRGNAM}_libretro
-VERSION=${VERSION:-0.6.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -82,18 +82,14 @@ cd build
     -DCMAKE_INSTALL_BINDIR=games \
     -DCMAKE_INSTALL_DOCDIR=doc/$PRGNAM-$VERSION \
     -DCMAKE_INSTALL_LIBDIR:PATH=lib$LIBDIRSUFFIX \
-    -DLIBRETRO_LIBDIR=/usr/lib$LIBDIRSUFFIX/libretro \
     -DMANDIR=man \
+    -DUSE_DISCORD_RPC=OFF \
     -DBUILD_QT=${QT} \
-    -DBUILD_LIBRETRO=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
 cd ..
 
-install -Dm0644 $CWD/$LIBNAM.info \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libretro/info/$LIBNAM.info
-
 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
 
@@ -101,7 +97,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 CHANGES LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp CONTRIBUTING.md PORTING.md \
+   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/mgba/mgba.info b/games/mgba/mgba.info
index 7baf81b7df..8fac518ec0 100644
--- a/games/mgba/mgba.info
+++ b/games/mgba/mgba.info
@@ -1,12 +1,10 @@
 PRGNAM="mgba"
-VERSION="0.6.3"
+VERSION="0.9.0"
 HOMEPAGE="https://mgba.io/"
-DOWNLOAD="https://github.com/mgba-emu/mgba/archive/0.6.3/mgba-0.6.3.tar.gz \
-          https://raw.githubusercontent.com/libretro/libretro-super/4eced73/dist/info/mgba_libretro.info"
-MD5SUM="5e46c98c6321941499c44f88b2001d9b \
-        cf3a49852fb5f5af22dc8a1b1a26feac"
+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="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="Ruoh-Shoei LIN"
+EMAIL="lin.ruohshoei+sbo at gmail.com"
diff --git a/games/micropolis/micropolis.info b/games/micropolis/micropolis.info
index de184ec35c..47fdb36cae 100644
--- a/games/micropolis/micropolis.info
+++ b/games/micropolis/micropolis.info
@@ -1,7 +1,7 @@
 PRGNAM="micropolis"
 VERSION="20100418"
 HOMEPAGE="http://www.donhopkins.com/home/micropolis"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/micropolis-20100418.tar.bz2"
+DOWNLOAD="https://slackware.uk/~urchlay/src/micropolis-20100418.tar.bz2"
 MD5SUM="df7b073133991bd1a9b04db60b2ca8a7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/minetest/README b/games/minetest/README
index 79fd198e96..a752b244e6 100644
--- a/games/minetest/README
+++ b/games/minetest/README
@@ -1,5 +1,5 @@
 Minetest is an infinite-world block sandbox game and a game engine,
-inspired by InfiniMiner, Minecraft and the like. It has been in development
-and use since October 2010.
-It is Free and Open Source Software, released under the LGPL 2.1 or later,
-available for Windows, Mac OS X and Linux.
+inspired by InfiniMiner, Minecraft and the like. It has been in
+development and use since October 2010.  It is Free and Open Source
+Software, released under the LGPL 2.1 or later, available for Windows,
+Mac OS X and Linux.
diff --git a/games/minetest/minetest.SlackBuild b/games/minetest/minetest.SlackBuild
index 3ef28e8a22..cbd6ecaa57 100644
--- a/games/minetest/minetest.SlackBuild
+++ b/games/minetest/minetest.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for minetest
 
-# 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=minetest
-VERSION=${VERSION:-5.0.1}
+VERSION=${VERSION:-5.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/minetest/minetest.info b/games/minetest/minetest.info
index 39fab68750..9408239159 100644
--- a/games/minetest/minetest.info
+++ b/games/minetest/minetest.info
@@ -1,8 +1,8 @@
 PRGNAM="minetest"
-VERSION="5.0.1"
+VERSION="5.3.0"
 HOMEPAGE="http://minetest.net/"
-DOWNLOAD="https://github.com/minetest/minetest/archive/5.0.1/minetest-5.0.1.tar.gz"
-MD5SUM="626a8603bbb772282c807f9203e75382"
+DOWNLOAD="https://github.com/minetest/minetest/archive/5.3.0/minetest-5.3.0.tar.gz"
+MD5SUM="858ac78e732e54b1d0d70e2f1a7026f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL irrlicht luajit jsoncpp"
diff --git a/games/minetest_game/minetest_game.SlackBuild b/games/minetest_game/minetest_game.SlackBuild
index 8136a32203..38ca05409b 100644
--- a/games/minetest_game/minetest_game.SlackBuild
+++ b/games/minetest_game/minetest_game.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for minetest_game
 
-# 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=minetest_game
-VERSION=${VERSION:-5.0.1}
+VERSION=${VERSION:-5.3.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -73,7 +73,7 @@ mkdir -p $PKG/usr/share/minetest/games/$PRGNAM
 cp -rf * $PKG/usr/share/minetest/games/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md *.txt minetest.conf.example $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/minetest_game/minetest_game.info b/games/minetest_game/minetest_game.info
index 3722568d78..617cb32d8c 100644
--- a/games/minetest_game/minetest_game.info
+++ b/games/minetest_game/minetest_game.info
@@ -1,8 +1,8 @@
 PRGNAM="minetest_game"
-VERSION="5.0.1"
+VERSION="5.3.0"
 HOMEPAGE="http://minetest.net/"
-DOWNLOAD="https://github.com/minetest/minetest_game/archive/5.0.1/minetest_game-5.0.1.tar.gz"
-MD5SUM="23ae2beacbba3322b8d4548e99093330"
+DOWNLOAD="https://github.com/minetest/minetest_game/archive/5.3.0/minetest_game-5.3.0.tar.gz"
+MD5SUM="9cd86bc1119a01d93e092dbcbeca5c37"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="minetest"
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/miscom/README b/games/miscom/README
index a29c09295c..db9719485e 100644
--- a/games/miscom/README
+++ b/games/miscom/README
@@ -1,14 +1,15 @@
 miscom (textmode Missile Command clone)
 
-In miscom you must defend cities from missile attack. You do this by
-launching missiles of your own (in a point-and-blast fashion) to destroy
-the enemy missiles before they land.
+In miscom you must defend cities from missile attack. You do this
+by launching missiles of your own (in a point-and-blast fashion) to
+destroy the enemy missiles before they land.
 
-Miscom is a curses-based game, so it should work on any terminal. (You'll
-need 9600 baud or better for it to be playable.) It supports colour
-and sound.
+Miscom is a curses-based game, so it should work on any
+terminal. (You'll need 9600 baud or better for it to be playable.) It
+supports colour and sound.
 
-Miscom is an older game that uses OSS for audio. By default, this script
-links with libaoss, which allows the game to make sound without having
-OSS modules loaded. If you for some reason want to disable this (e.g. if
-you run OSSv4 for audio), export AOSS=no in the script's environment.
+Miscom is an older game that uses OSS for audio. By default, this
+script links with libaoss, which allows the game to make sound without
+having OSS modules loaded. If you for some reason want to disable this
+(e.g. if you run OSSv4 for audio), export AOSS=no in the script's
+environment.
diff --git a/games/mog/mog.info b/games/mog/mog.info
index fcfbc13edf..673ae6a902 100644
--- a/games/mog/mog.info
+++ b/games/mog/mog.info
@@ -1,7 +1,7 @@
 PRGNAM="mog"
 VERSION="0.63.1548"
 HOMEPAGE="http://www.braingames.getput.com/mog/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/mog.src_0.63-1548.tgz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/mog.src_0.63-1548.tgz"
 MD5SUM="68604c258ce7347662777d853d895769"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/moon-buggy/README b/games/moon-buggy/README
index 8d83f61a54..30623a0965 100644
--- a/games/moon-buggy/README
+++ b/games/moon-buggy/README
@@ -1,8 +1,8 @@
-Moon-buggy is a simple character graphics game where you drive some kind of car
-across the moon's surface. Unfortunately there are dangerous craters there.
-Fortunately your car can jump over them!
+Moon-buggy is a simple character graphics game where you drive
+some kind of car across the moon's surface. Unfortunately there are
+dangerous craters there.  Fortunately your car can jump over them!
 
-The game has some resemblance of the classic arcade game moon-patrol which was
-released in 1982. A clone of this game was relased for the Commodore C64 in
-1983. The present, ASCII art version of moon-buggy was written many years later
-by Jochen Voss.
+The game has some resemblance of the classic arcade game moon-patrol
+which was released in 1982. A clone of this game was relased for the
+Commodore C64 in 1983. The present, ASCII art version of moon-buggy was
+written many years later by Jochen Voss.
diff --git a/games/mrboom/Makefile.patch b/games/mrboom/Makefile.patch
new file mode 100644
index 0000000000..0a240e9275
--- /dev/null
+++ b/games/mrboom/Makefile.patch
@@ -0,0 +1,16 @@
+--- Makefile.orig	2020-05-09 23:50:56.489976161 +0200
++++ Makefile	2020-05-09 23:51:30.250975839 +0200
+@@ -500,11 +500,11 @@
+ 	rm -f *.d */*.d */*/*.d */*/*/*.d */*/*/*/*.d */*/*/*/*/*.d
+ 
+ strip:
+-	$(STRIP) $(TARGET_NAME).out
++	$(STRIP) $(TARGET_NAME)
+ 
+ install: strip
+ 	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/$(BINDIR)
+-	$(INSTALL) -m 555 $(TARGET_NAME).out $(DESTDIR)$(PREFIX)/$(BINDIR)/$(TARGET_NAME)
++	$(INSTALL) -m 555 $(TARGET_NAME) $(DESTDIR)$(PREFIX)/$(BINDIR)/$(TARGET_NAME)
+ 	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/$(MANDIR)
+ 	$(INSTALL) -m 644 Assets/$(TARGET_NAME).6 $(DESTDIR)$(PREFIX)/$(MANDIR) 
+ 
diff --git a/games/mrboom/mrboom.SlackBuild b/games/mrboom/mrboom.SlackBuild
index 4118447699..2c16cbd408 100644
--- a/games/mrboom/mrboom.SlackBuild
+++ b/games/mrboom/mrboom.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mrboom
 
-# Copyright 2017-2019 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2017-2020 Thibaut Notteboom, Paris, FRANCE
 # 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=mrboom
-VERSION=${VERSION:-4.8}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.9}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM=mrboom-libretro
@@ -72,6 +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/Makefile.patch
+sed -i "s|^GIT_VERSION :=.*|GIT_VERSION := \" ${VERSION}\"|" Makefile
+
 if pkg-config --exists sdl2; then
   make mrboom LIBSDL2=1
 
@@ -82,6 +85,10 @@ if pkg-config --exists sdl2; then
   install -m 0644 Assets/$PRGNAM.desktop $PKG/usr/share/applications
   install -m 0644 $CWD/mrboom.svg $PKG/usr/share/pixmaps
 
+  for i in 16x16 32x32 48x48 256x256; do
+    install -D -m0644 Assets/hicolor/$i/apps/$PRGNAM.png $PKG/usr/share/icons/hicolor/$i/apps/$PRGNAM.png
+  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
 fi
diff --git a/games/mrboom/mrboom.info b/games/mrboom/mrboom.info
index 7543a405a9..ab83b72165 100644
--- a/games/mrboom/mrboom.info
+++ b/games/mrboom/mrboom.info
@@ -1,9 +1,9 @@
 PRGNAM="mrboom"
-VERSION="4.8"
+VERSION="4.9"
 HOMEPAGE="http://mrboom.mumblecore.org/"
-DOWNLOAD="https://github.com/Javanaise/mrboom-libretro/archive/4.8/mrboom-libretro-4.8.tar.gz \
+DOWNLOAD="https://github.com/Javanaise/mrboom-libretro/archive/4.9/mrboom-libretro-4.9.tar.gz \
           https://raw.githubusercontent.com/libretro/libretro-super/master/dist/info/mrboom_libretro.info"
-MD5SUM="421978aa15b180315525ade5b3127f9e \
+MD5SUM="872747a290cf52a89aa1542d9a40771e \
         24a6cc6027701aa7cf9177c77e29e0f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/mrrescue/20180818_a5be73c.diff b/games/mrrescue/20180818_a5be73c.diff
new file mode 100644
index 0000000000..958b288c72
--- /dev/null
+++ b/games/mrrescue/20180818_a5be73c.diff
@@ -0,0 +1,373 @@
+diff --git a/conf.lua b/conf.lua
+index db46228..41d3cbf 100644
+--- a/conf.lua
++++ b/conf.lua
+@@ -1,33 +1,14 @@
+ function love.conf(t)
+     t.identity = "mrrescue"
+-    t.version = "0.10.0"
+-    t.console = false
+-
+-    t.window.title = "Mr. Rescue"
+-    t.window.icon = nil
+-    t.window.width = 256*3
+-    t.window.height = 200*3
+-    t.window.borderless = false
+-    t.window.resizable = false
+-    t.window.fullscreen = false
+-    t.window.fullscreentype = "exclusive"
+-    t.window.vsync = true
+-    t.window.fsaa = 0
+-    t.window.display = 1
+-    t.window.highdpi = false
+-    t.window.srgb = false
+-
+-    t.modules.physics = false
+-    t.modules.mouse = false
+-end
+-
+-function love.conf(t)
+-    t.identity = "mrrescue"
+-    t.version = "0.10.0"
++    t.appendidentity = false
++    t.version = "11.0"
+     t.console = false
+     t.accelerometerjoystick = true
++    t.externalstorage = false
+     t.gammacorrect = false
+- 
++
++    t.audio.mixwithsystem = true
++
+     t.window.title = "Mr. Rescue"
+     t.window.icon = nil
+     t.window.width = 256*3
+@@ -38,15 +19,17 @@ function love.conf(t)
+     t.window.minheight = 1
+     t.window.fullscreen = false
+     t.window.fullscreentype = "desktop"
+-    t.window.vsync = true
++    t.window.vsync = 1
+     t.window.msaa = 0
+     t.window.display = 1
+     t.window.highdpi = false
+     t.window.x = nil
+     t.window.y = nil
+- 
++
+     t.modules.audio = true
++    t.modules.data = true
+     t.modules.event = true
++    t.modules.font = true
+     t.modules.graphics = true
+     t.modules.image = true
+     t.modules.joystick = true
+diff --git a/config.lua b/config.lua
+index 63eeb04..71c2b66 100644
+--- a/config.lua
++++ b/config.lua
+@@ -38,7 +38,7 @@ function loadConfig()
+ 			config[i] = v
+ 		end
+ 	end
+-	if love.filesystem.exists("settings") then
++	if love.filesystem.getInfo("settings")~= nil then
+ 		local data = love.filesystem.read("settings")
+ 		local file = TSerial.unpack(data)
+ 		for i,v in pairs(file) do
+@@ -52,7 +52,7 @@ function loadConfig()
+ end
+ 
+ function loadHighscores()
+-	if love.filesystem.exists("highscores") then
++	if love.filesystem.getInfo("highscores")~= nil then
+ 		local data = love.filesystem.read("highscores")
+ 		local file = TSerial.unpack(data)
+ 		for i=1,3 do
+@@ -64,7 +64,7 @@ function loadHighscores()
+ end
+ 
+ function loadStats()
+-	if love.filesystem.exists("stats") then
++	if love.filesystem.getInfo("stats")~= nil then
+ 		local data = love.filesystem.read("stats")
+ 		stats = TSerial.unpack(data)
+ 	end
+diff --git a/highscore_entry.lua b/highscore_entry.lua
+index 2f763af..3b3bb73 100644
+--- a/highscore_entry.lua
++++ b/highscore_entry.lua
+@@ -45,9 +45,9 @@ function highscore_entry.draw()
+ 		for ix = 1,10 do
+ 			if highscore_entry.selection == char then
+ 				lg.rectangle("fill", 33+ix*16, 66+iy*16, 14, 14)
+-				lg.setColor(0,0,0,255)
++				lg.setColor(0,0,0,1)
+ 				lg.print(KEYBOARD:sub(char,char), 37+ix*16, 70+iy*16)
+-				lg.setColor(255,255,255,255)
++				lg.setColor(1,1,1,1)
+ 			else
+ 				lg.print(KEYBOARD:sub(char,char), 37+ix*16, 70+iy*16)
+ 			end
+diff --git a/highscore_list.lua b/highscore_list.lua
+index 6a17973..b66d0e2 100644
+--- a/highscore_list.lua
++++ b/highscore_list.lua
+@@ -31,10 +31,10 @@ function highscore_list.draw()
+ 		if scores[i] then
+ 			if highscore_list.level == highscore_list.hllevel
+ 			and highscore_list.hlpos == i then
+-				lg.setColor(25,118,115,255)
++				lg.setColor(25/255,118/255,115/255,1)
+ 				lg.print(scores[i].name,   48, 14+i*16)
+ 				lg.print(scores[i].score, 105, 14+i*16)
+-				lg.setColor(255,255,255,255)
++				lg.setColor(1,1,1,1)
+ 			else
+ 				lg.print(scores[i].name,   48, 14+i*16)
+ 				lg.print(scores[i].score, 105, 14+i*16)
+diff --git a/ingame.lua b/ingame.lua
+index 52004f1..4fcfcfe 100644
+--- a/ingame.lua
++++ b/ingame.lua
+@@ -189,16 +189,16 @@ function ingame.draw()
+ 		lg.pop()
+ 
+ 		if map.type == MT_NORMAL then
+-			lg.setBlendMode("multiply")
++			lg.setBlendMode("multiply", "premultiplied")
+ 			lg.draw(canvas, 0,0)
+ 			lg.setBlendMode("alpha")
+ 		end
+ 
+ 		-- Draw red screen if hit
+ 		if player.heat > 0 then
+-			lg.setColor(255,255,255,cap(player.heat*255, 16, 255))
++			lg.setColor(1,1,1,cap(player.heat, 0.063, 1))
+ 			lg.draw(img.red_screen, quad.red_screen, 0,0)
+-			lg.setColor(255,255,255,255)
++			lg.setColor(1,1,1,1)
+ 		end
+ 
+ 		-- Draw hud
+@@ -249,13 +249,13 @@ end
+  
+ function drawWonMessage()
+ 	local alpha = cap((-translate_y)/100, 0, 1)
+-	lg.setColor(0,0,0,alpha*255)
++	lg.setColor(0,0,0,alpha)
+ 	lg.rectangle("fill", 0, 40, WIDTH, #WON_MESSAGES[level]*10+12)
+-	lg.setColor(255,255,255,alpha*255)
++	lg.setColor(1,1,1,alpha)
+ 	for i,v in ipairs(WON_MESSAGES[level]) do
+ 		lg.printf(v, 0, 48+(i-1)*10, WIDTH, "center")
+ 	end
+-	lg.setColor(255,255,255,255)
++	lg.setColor(1,1,1,1)
+ end
+ 
+ function drawHUD()
+@@ -296,13 +296,13 @@ function drawHUD()
+ 	if player:isDying() then
+ 		local color = 0
+ 		if warning_frame <= 1 then
+-			color = 30 + warning_frame * 225
++			color = 0.118 + warning_frame
+ 		else
+-			color = 255 - (warning_frame % 1)*225
++			color = 1 - (warning_frame % 1)
+ 		end
+-		lg.setColor(255,color,color)
++		lg.setColor(1,color,color)
+ 		lg.draw(img.temperature_bar_blink, 74, HEIGHT-26)
+-		lg.setColor(255,255,255)
++		lg.setColor(1,1,1)
+ 	end
+ 
+ 	-- Draw item slots
+@@ -320,11 +320,11 @@ function drawHUD()
+ 
+ 	-- Draw score
+ 	lg.setFont(font.bold)
+-	lg.setColor(16,12,9)
++	lg.setColor(16/255,12/255,9/255)
+ 	lg.print("SCORE: "..score,150,187)
+-	lg.setColor(246,247,221)
++	lg.setColor(246/255,247/255,221/255)
+ 	lg.print("SCORE: "..score,150,186)
+-	lg.setColor(255,255,255)
++	lg.setColor(1,1,1)
+ 
+ 	-- Draw boss health bar
+ 	if map.type == MT_BOSS and ingame_state ~= INGAME_WON then
+diff --git a/ingame_menu.lua b/ingame_menu.lua
+index 9fcf768..82a8459 100644
+--- a/ingame_menu.lua
++++ b/ingame_menu.lua
+@@ -18,10 +18,10 @@ function ingame_menu.draw()
+ 	lg.pop()
+ 
+ 	lg.scale(config.scale)
+-	lg.setColor(0,0,0,238)
++	lg.setColor(0,0,0,238/255)
+ 	lg.rectangle("fill", 0, 0, WIDTH, HEIGHT)
+ 
+-	lg.setColor(255,255,255,255)
++	lg.setColor(1,1,1,1)
+ 	lg.printf("PAUSED", 0, 46, WIDTH, "center")
+ 	lg.print("RESUME", 103, 92)
+ 	lg.print("QUIT", 103, 106)
+diff --git a/joystick.lua b/joystick.lua
+index 50ccadb..72d545e 100644
+--- a/joystick.lua
++++ b/joystick.lua
+@@ -22,11 +22,11 @@ function joystick.draw()
+ 	lg.printf("SET JOYSTICK", 0, 39, WIDTH, "center")
+ 	for i=1,4 do
+ 		if joystick.waiting == true and joystick.selection == i then
+-			lg.setColor(195,52,41)
++			lg.setColor(195/255,52/255,41/255)
+ 		end
+ 		lg.print(string.upper(joykeynames[i]), 65, 53+i*13)
+ 		lg.print(config.joykeys[joykeynames[i]], 165, 53+i*13)
+-		lg.setColor(255,255,255)
++		lg.setColor(1,1,1)
+ 	end
+ 	lg.print("DEFAULT", 65, 118)
+ 	lg.print("BACK", 65, 131)
+diff --git a/keyboard.lua b/keyboard.lua
+index 5cada98..a4d0db8 100644
+--- a/keyboard.lua
++++ b/keyboard.lua
+@@ -22,19 +22,19 @@ function keyboard.draw()
+ 	lg.printf("SET KEYBOARD", 0, 26, WIDTH, "center")
+ 	for i,v in ipairs(keynames) do
+ 		if keyboard.waiting == true and i == keyboard.selection then
+-			lg.setColor(195,52,41)
++			lg.setColor(195/255,52/255,41/255)
+ 		end
+ 		lg.print(string.upper(v), 65, 40+i*13)
+ 		if config.keys[v] == " " then
+ 			lg.print("SPACE", 154, 40+i*13)
+ 		elseif config.keys[v] == "none" then
+-			lg.setColor(118,31,25)
++			lg.setColor(118/255,31/255,25/255)
+ 			lg.print("NONE", 154, 40+i*13)
+-			lg.setColor(255,255,255)
++			lg.setColor(1,1,1)
+ 		else
+ 			lg.print(string.upper(config.keys[v]:sub(1,7)), 154, 40+i*13)
+ 		end
+-		lg.setColor(255,255,255)
++		lg.setColor(1,1,1)
+ 	end
+ 	lg.print("DEFAULT", 65, 144)
+ 	lg.print("BACK", 65, 157)
+diff --git a/main.lua b/main.lua
+index 9433e42..56096fa 100644
+--- a/main.lua
++++ b/main.lua
+@@ -273,7 +273,7 @@ function love.releaseerrhand(msg)
+     local font = love.graphics.newFont(14)
+     love.graphics.setFont(font)
+ 
+-    love.graphics.setColor(255, 255, 255, 255)
++    love.graphics.setColor(1, 1, 1, 1)
+ 
+     love.graphics.clear()
+ 
+diff --git a/resources.lua b/resources.lua
+index e5aa70d..1bab520 100644
+--- a/resources.lua
++++ b/resources.lua
+@@ -7,7 +7,7 @@ local snd = {}	-- sound Sources
+ 
+ local IMAGE_FILES = {
+ 	"splash", "tangram", "lovesplashpixel", "howto",
+-	"tiles", "door", "boldfont", "captain_dialog", "captain_dialog_sad",
++	"tiles", "door", "captain_dialog", "captain_dialog_sad",
+ 	"boss_health", "highscore_panes", "exclamation", "stats_screen",
+ 	"awards", "hud", "hud2", "hud_people", "item_slots", "water_bar",
+ 	"reserve_bar", "overloaded_bar", "temperature_bar", "temperature_bar_blink",
+@@ -147,7 +147,7 @@ function loadResources()
+ 	img.stream:setWrap("repeat", "clamp")
+ 
+ 	-- Create fonts
+-	font.bold = lg.newImageFont(img.boldfont, " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!'-:*@<>+/_$&?", 2)
++	font.bold = lg.newImageFont("data/boldfont.png", " ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!'-:*@<>+/_$&?", 2)
+ 	lg.setFont(font.bold)
+ 
+ 	-- Create quads
+diff --git a/splash.lua b/splash.lua
+index 6c779cd..0ef225b 100644
+--- a/splash.lua
++++ b/splash.lua
+@@ -19,37 +19,37 @@ function splash.draw()
+ 
+ 	if transition_time < 4 then
+ 		if transition_time < 1 then
+-			local alpha = cap(255*transition_time, 0,255)
+-			lg.setColor(255,255,255,alpha)
++			local alpha = cap(transition_time, 0, 1)
++			lg.setColor(1,1,1,alpha)
+ 			lg.draw(img.tangram, quad.screen, 0,0)
+-			lg.setColor(255,255,255,255)
++			lg.setColor(1,1,1,1)
+ 		elseif transition_time > 3 then
+-			local alpha = cap(255*(1-(transition_time-3)), 0,255)
+-			lg.setColor(255,255,255,alpha)
++			local alpha = cap(1-(transition_time-3), 0, 1)
++			lg.setColor(1,1,1,alpha)
+ 			lg.draw(img.tangram, quad.screen, 0,0)
+-			lg.setColor(255,255,255,255)
++			lg.setColor(1,1,1,1)
+ 		else
+ 			lg.draw(img.tangram, quad.screen, 0,0)
+ 		end
+ 	elseif transition_time < 8 then
+ 		if transition_time < 5 then
+-			local alpha = cap(255*(transition_time-4), 0,255)
+-			lg.setColor(255,255,255,alpha)
++			local alpha = cap(transition_time-4, 0, 1)
++			lg.setColor(1,1,1,alpha)
+ 			lg.draw(img.lovesplashpixel, quad.screen, 0,0)
+-			lg.setColor(255,255,255,255)
++			lg.setColor(1,1,1,1)
+ 		elseif transition_time > 7 then
+-			local alpha = cap(255*(1-(transition_time-7)), 0,255)
+-			lg.setColor(255,255,255,alpha)
++			local alpha = cap(1-(transition_time-7), 0, 1)
++			lg.setColor(1,1,1,alpha)
+ 			lg.draw(img.lovesplashpixel, quad.screen, 0,0)
+-			lg.setColor(255,255,255,255)
++			lg.setColor(1,1,1,1)
+ 		else
+ 			lg.draw(img.lovesplashpixel, quad.screen, 0,0)
+ 		end
+ 	elseif transition_time < 10 then
+-		local alpha = cap(128*(transition_time-8), 0, 255)
+-		lg.setColor(255,255,255,alpha)
++		local alpha = cap(0.5*(transition_time-8), 0, 1)
++		lg.setColor(1,1,1,alpha)
+ 		lg.draw(img.splash, quad.screen, 0,0)
+-		lg.setColor(255,255,255,255)
++		lg.setColor(1,1,1,1)
+ 	else
+ 		lg.draw(img.splash, quad.screen, 0,0)
+ 		lg.setFont(font.bold)
+diff --git a/util.lua b/util.lua
+index b9976da..656600a 100644
+--- a/util.lua
++++ b/util.lua
+@@ -105,9 +105,9 @@ end
+ 
+ 
+ function drawBox(x,y,w,h)
+-	lg.setColor(30,23,18)
++	lg.setColor(30/255,23/255,18/255)
+ 	lg.rectangle("fill",x+1,y+1,w-2,h-2)
+-	lg.setColor(255,255,255)
++	lg.setColor(1,1,1)
+ 	-- Draw sides
+ 	lg.draw(img.menu_box, quad.box_left, x, y+1, 0, 1, (h-2))
+ 	lg.draw(img.menu_box, quad.box_left, x+w, y+1, 0, -1, (h-2))
diff --git a/games/mrrescue/mrrescue.SlackBuild b/games/mrrescue/mrrescue.SlackBuild
index 488bda4f29..bcb9ee7117 100644
--- a/games/mrrescue/mrrescue.SlackBuild
+++ b/games/mrrescue/mrrescue.SlackBuild
@@ -6,11 +6,18 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200415 bkw: update to latest upstream git, commit a5be73c. Required
+# for love-11.x support (someone upgraded love and didn't bother to tell
+# me so this has been broken for ~2 year).
+
 PRGNAM=mrrescue
-VERSION=${VERSION:-1.02e}
+VERSION=${VERSION:-1.02e+20180818_a5be73c}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCVER=${VERSION%%+*}
+DIFFVER=${VERSION##*+}
+
 ARCH=noarch
 
 CWD=$(pwd)
@@ -27,15 +34,18 @@ rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 
-# the source is also the binary. we only need to extract
-# any documentation (which boilds down to one file):
-unzip $CWD/$PRGNAM$VERSION.love LICENSE
+# For releases, the source is also the binary: ".love" files are just
+# zip archives full of lua source code. Since we have to apply a patch
+# from upstream git, we have to extract it, then recreate it.
+unzip $CWD/$PRGNAM$SRCVER.love
+patch -p1 < $CWD/$DIFFVER.diff
+zip -r tmp.zip *
 
 # no find/chmod boilerplate, explicit permissions
 
 mkdir -p $PKG/usr/games
 echo '#!/usr/bin/env love' > $PKG/usr/games/$PRGNAM
-cat $CWD/$PRGNAM$VERSION.love >> $PKG/usr/games/$PRGNAM
+cat tmp.zip >> $PKG/usr/games/$PRGNAM
 chmod 755 $PKG/usr/games/$PRGNAM
 
 # icon is a piece of data/splash.png from the payload file, chopped up
@@ -48,7 +58,7 @@ mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-install -oroot -groot -m0644 LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+install -oroot -groot -m0644 *.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/mrrescue/mrrescue.info b/games/mrrescue/mrrescue.info
index a1b94e5706..8341ca3573 100644
--- a/games/mrrescue/mrrescue.info
+++ b/games/mrrescue/mrrescue.info
@@ -1,5 +1,5 @@
 PRGNAM="mrrescue"
-VERSION="1.02e"
+VERSION="1.02e+20180818_a5be73c"
 HOMEPAGE="http://tangramgames.dk/games/mrrescue/"
 DOWNLOAD="https://github.com/SimonLarsen/mrrescue/releases/download/1.02e/mrrescue1.02e.love"
 MD5SUM="08f236a0f296f70fafa67be2ef20e254"
diff --git a/games/naev/README b/games/naev/README
index e618e4bd21..6e48db467c 100644
--- a/games/naev/README
+++ b/games/naev/README
@@ -1,14 +1,16 @@
-Naev is a 2D space trading and combat game, taking inspiration from the Escape 
-Velocity series, among others.
+Naev is a 2D space trading and combat game, taking inspiration from the
+Escape Velocity series, among others.
 
-You pilot a space ship from a top-down perspective, and are more or less free 
-to do what you want. As the genre name implies, you're able to trade and engage 
-in combat at will. Beyond that, there's an ever-growing number of storyline 
-missions, equipment, and ships; Even the galaxy itself grows larger with each 
-release. For the literarily-inclined, there are large amounts of lore 
-accompanying everything from planets to equipment.
+You pilot a space ship from a top-down perspective, and are more
+or less free to do what you want. As the genre name implies, you're
+able to trade and engage in combat at will. Beyond that, there's an
+ever-growing number of storyline missions, equipment, and ships;
+Even the galaxy itself grows larger with each release. For the
+literarily-inclined, there are large amounts of lore accompanying
+everything from planets to equipment.
 
-The ndata download (included in the info file) is required to play. This is
-a very large file (305M as of 0.7.0) so metered connections beware.
+The ndata download (included in the info file) is required to
+play. This is a very large file (305M as of 0.7.0) so metered
+connections beware.
 
 As of 0.7.0, naev is also available through Steam.
diff --git a/games/nblood/README b/games/nblood/README
new file mode 100644
index 0000000000..bed9e75816
--- /dev/null
+++ b/games/nblood/README
@@ -0,0 +1,11 @@
+nblood (game engine for Blood, Duke Nukem 3D, and Powerslave/Exhumed)
+
+nblood is a collection of reverse-engineered ports of Build games using
+EDuke32 engine technology and development principles.
+
+This package only includes the game engines. You'll have to provide the
+game data to actually play any of the games. See README_game_data.txt
+for the list of supported games and the data required for each one.
+
+Optional dependency: isextract. This is only needed to extract the game
+data from the Blood install CD.
diff --git a/games/nblood/README_game_data.txt b/games/nblood/README_game_data.txt
new file mode 100644
index 0000000000..fc79a8aa69
--- /dev/null
+++ b/games/nblood/README_game_data.txt
@@ -0,0 +1,60 @@
+Game Data README for nblood
+---------------------------
+
+nblood actually includes 3 game binaries: nblood itself, rednukem,
+and pcexhumed.
+
+
+nblood
+======
+
+The nblood binary plays only Blood version 1.21, and its add-on, Cryptic
+Passage. You'll need the "One Unit Whole Blood" CD-ROM: this is the only
+version of the game supported by nblood.
+
+If you want to include the game data in the nblood package:
+
+- First, install system/isextract. This is needed to extract the data.
+
+- Mount the CD-ROM (anywhere) before running the SlackBuild and the
+  build script will find the data there.
+
+- If you have an ISO image instead of a disc, just copy or symlink the .iso
+  file into the SlackBuild directory (no need to mount anything).
+
+If you have an installed copy of the game rather than a CD or ISO,
+you should be able to just copy it to /usr/share/games/nblood. Filename
+upper/lower case doesn't matter.
+
+If you're working from the original CD, you can also rip the audio
+tracks and convert them to ogg or flac. Follow the instructions in
+/usr/doc/nblood-$VERSION/README.md to hear them in the game.
+
+
+rednukem
+========
+
+The rednukem binary only plays Duke Nukem 3D: Atomic Edition v1.5 and
+possibly (untested) the Plutonium Pak.
+
+For Atomic Edition, all you need is the DUKE3D.GRP file from the install
+CD (mine's in atominst/ on the CD) or an installed copy of the game. It's
+44356548 bytes long and has an md5sum of 22b6938fe767e5cc57d1fe13080cd522.
+Copy this file to /usr/share/games/eduke32/ (no, that's not a typo,
+rednukem uses eduke32's data directory). The filename actually doesn't
+matter, rednukem uses the checksum to detect it.
+
+
+pcexhumed
+=========
+
+The pcexhumed binary plays:
+
+- Powerslave demo version. Install the powerslave_demo_data build to
+  play this.
+
+- The PC version of Exhumed. All I have is the demo version, and it fails
+  to play for me so I didn't make a package for it.
+
+- Supposedly the full versions of Powerslave and Exhumed are supported,
+  if you can find copies to try. Untested.
diff --git a/games/nblood/desktop/nblood-cryptic.desktop b/games/nblood/desktop/nblood-cryptic.desktop
new file mode 100644
index 0000000000..4b0e92fe79
--- /dev/null
+++ b/games/nblood/desktop/nblood-cryptic.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=NBlood (Cryptic Passage)
+Comment=Blood Game Engine
+Icon=nblood
+Exec=/usr/games/nblood -ini cryptic.ini %f
+Terminal=false
+Type=Application
+Categories=Game;ActionGame;
diff --git a/games/nblood/desktop/nblood.desktop b/games/nblood/desktop/nblood.desktop
new file mode 100644
index 0000000000..eff4a1dab9
--- /dev/null
+++ b/games/nblood/desktop/nblood.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=NBlood
+Comment=Blood Game Engine
+Icon=nblood
+Exec=/usr/games/nblood %f
+Terminal=false
+Type=Application
+Categories=Game;ActionGame;
diff --git a/games/nblood/desktop/pcexhumed.desktop b/games/nblood/desktop/pcexhumed.desktop
new file mode 100644
index 0000000000..2386b8a063
--- /dev/null
+++ b/games/nblood/desktop/pcexhumed.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=PCExhumed
+Comment=Exhumed/Powerslave Game Engine
+Icon=nblood
+Exec=/usr/games/pcexhumed %f
+Terminal=false
+Type=Application
+Categories=Game;ActionGame;
diff --git a/games/nblood/desktop/rednukem.desktop b/games/nblood/desktop/rednukem.desktop
new file mode 100644
index 0000000000..6624b1873f
--- /dev/null
+++ b/games/nblood/desktop/rednukem.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=RedNukem
+Comment=Duke 3D Game Engine
+Icon=nblood
+Exec=/usr/games/rednukem %f
+Terminal=false
+Type=Application
+Categories=Game;ActionGame;
diff --git a/games/nblood/doinst.sh b/games/nblood/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/games/nblood/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/games/nblood/extract-blood-data.sh b/games/nblood/extract-blood-data.sh
new file mode 100644
index 0000000000..374d2a13e5
--- /dev/null
+++ b/games/nblood/extract-blood-data.sh
@@ -0,0 +1,139 @@
+#!/bin/bash
+
+# extract-blood-data.sh - extract the game data from a mounted Blood
+# CD-ROM or (not mounted) .iso file in the current directory.
+
+# By B. Watson <yalhcru@gmail.com>, released under the WTPL: Do WTF you
+# want with this.
+
+if [ "$( id -u )" != "0" ]; then
+  echo "$(basename $0) has to run as root because it needs to mount ISO images"
+  exit 1
+fi
+
+# Copy the game data here
+DEST=${1:-./blood}
+DEST="$( readlink -f "$DEST" )"
+
+# Deal with filenames case-insensitively
+shopt -s nocaseglob
+
+# Return true if directory $1 is a valid copy of the game.
+contents_ok() {
+  local mntpnt="$1"
+
+  [ -e "$mntpnt/blood.ini"* ] && \
+  [ -e "$mntpnt/data.z"* ] && \
+  [ -e "$mntpnt/readme.txt"* ] && \
+  head -n1 "$mntpnt/readme.txt"* | grep -q '^One Unit: WHOLE BLOOD(TM) v 1.21'
+
+  return $?
+}
+
+# Try to find and mount a Blood ISO image, in the current directory.
+find_iso() {
+  local mntpnt="$1"
+  local iso
+
+  mkdir -p "$mntpnt"
+
+  for iso in *; do
+    [ -e "$iso" ] || continue
+    file -L --mime -b "$iso" | grep -qi 'iso.*9660' || continue
+
+    echo -n "Trying '$iso'... "
+    if /sbin/mount -o ro,loop -t iso9660 "$iso" "$mntpnt"; then
+      if contents_ok "$mntpnt"; then
+        echo "found One Unit Whole Blood ISO."
+        return 0
+      fi
+      echo "mounted, but not a Blood ISO."
+      /sbin/umount "$mntpnt"
+    else
+      echo "couldn't mount."
+    fi
+  done
+
+  /sbin/umount "$mntpnt" &> /dev/null
+  echo "Couldn't find One Unit Whole Blood ISO in $( pwd )"
+  return 1
+}
+
+# Extract the data we need. We might be including a little more
+# that necessary here.
+extract_data() {
+  local src="$1"
+  local dst="$2"
+  local tmpdir
+
+  echo "Extracting and copying data from $src to $dst"
+
+  mkdir -p "$dst"
+  tmpdir="$( mktemp -d ${TMP:-/tmp}/bloodtmp.XXXXXX )"
+
+  # most of the stuff we need is in data.z
+  isextract x "$src/data.z"* "$tmpdir"
+  cd "$tmpdir"
+    cp -a *.rff* \
+          *.dem* \
+          *.art* \
+          *.dat* \
+          "$dst"
+  cd -
+
+  # ...but not all of it
+  cp -a "$src/movie"* "$src/cryptic/"* "$src/blood.ini"* "$src/readme.txt"* "$dst"
+
+  # get rid of unnecessary cruft not used by nblood
+  rm -rf "$dst"/cryptic.exe*   \
+         "$dst"/movie/directx* \
+         "$dst"/movie/amovie* \
+         "$dst"/movie/_* \
+         "$dst"/movie/*.exe* \
+         "$dst"/movie/*.ins*
+
+  find "$dst" -type f -exec chmod 644 {} \+
+  chmod 755 "$dst/movie"*
+
+  rm -rf "$tmpdir"
+}
+
+# main()
+if ! which isextract &>/dev/null; then
+  echo "Can't find isextract on PATH. Please install it and re-run this script."
+  exit 1
+fi
+
+# Try to find a mounted CD
+CDROM=""
+cat /proc/mounts | while read line; do
+  t="$( echo "$line" | cut -d' ' -f3 )"
+  m="$( echo "$line" | cut -d' ' -f2 )"
+  if [ "$t" = "iso9660" ]; then
+    echo -n "Trying mount point '$m'..."
+    if contents_ok "$m"; then
+      echo OK
+      CDROM="$m"
+      break
+    fi
+    echo "not a Blood CD"
+  fi
+done
+
+if [ -n "$CDROM" ]; then
+  echo "Found One Unit Whole Blood CD-ROM mounted on $CDROM"
+else
+  CDROM="$( mktemp -d ${TMP:-/tmp}/bloodcd.XXXXXX )"
+  RMTMP="$CDROM"
+  if ! find_iso "$CDROM"; then
+    echo "Couldn't find any game data"
+    exit 1
+  fi
+fi
+
+extract_data "$CDROM" "$DEST"
+
+if [ -n "$RMTMP" ]; then
+  umount "$RMTMP" &>/dev/null
+  rmdir "$RMTMP"
+fi
diff --git a/games/nblood/git2tarxz.sh b/games/nblood/git2tarxz.sh
new file mode 100644
index 0000000000..2c8c7f8829
--- /dev/null
+++ b/games/nblood/git2tarxz.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version number.
+
+# NOTE: if you're copying this to use in another build, get rid of
+# the "rm -rf platform" or you might get surprised!
+
+# Takes one optional argument, which is the commit or tag to create a
+# tarball of. With no arg, HEAD is used.
+
+# Version number example: 0.0.1+20200227_ad7ec17
+
+# Notes:
+
+# Do not use this if you're packaging a release.
+
+# 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.
+
+# Running this script twice for the same commit will NOT give identical
+# tarballs, even if the contents are identical. This is because tar
+# includes the current time in a newly-created tarball (plus there may
+# be other git-related reasons).
+
+# Once you've generated a tarball, you'll still need a place to host it.
+# Ask on the mailing list, if you don't have your own web server to
+# play with.
+
+## Config:
+# final tarball and slackbuild PRGNAM:
+PRGNAM=nblood
+
+# Github project and user names:
+PROJNAME=NBlood
+GITUSER=nukeykt
+
+# For github projects, you can use this unmodified:
+CLONE_URL=https://github.com/$GITUSER/$PROJNAME.git
+
+# For non-github projects, you might not need GITUSER, in which case
+# just omit it from the script.
+
+## End of config.
+
+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 )
+
+VERTAG=$( git tag -l | tail -1 )
+
+VERSION=${VERTAG}+${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+# NOTE: this line is specific to nblood!
+rm -rf platform
+
+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\""
+echo "MD5SUM=\"$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )\""
diff --git a/games/nblood/icons/128.png b/games/nblood/icons/128.png
new file mode 100644
index 0000000000..b334bc15e1
--- /dev/null
+++ b/games/nblood/icons/128.png
diff --git a/games/nblood/icons/256.png b/games/nblood/icons/256.png
new file mode 100644
index 0000000000..e082493b2a
--- /dev/null
+++ b/games/nblood/icons/256.png
diff --git a/games/nblood/icons/32.png b/games/nblood/icons/32.png
new file mode 100644
index 0000000000..8cdca71238
--- /dev/null
+++ b/games/nblood/icons/32.png
diff --git a/games/nblood/icons/48.png b/games/nblood/icons/48.png
new file mode 100644
index 0000000000..cbf82a152a
--- /dev/null
+++ b/games/nblood/icons/48.png
diff --git a/games/nblood/icons/64.png b/games/nblood/icons/64.png
new file mode 100644
index 0000000000..66024e842c
--- /dev/null
+++ b/games/nblood/icons/64.png
diff --git a/games/nblood/nblood-cryptic b/games/nblood/nblood-cryptic
new file mode 100644
index 0000000000..6f0c33d092
--- /dev/null
+++ b/games/nblood/nblood-cryptic
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec nblood -ini cryptic.ini "$@"
diff --git a/games/nblood/nblood.SlackBuild b/games/nblood/nblood.SlackBuild
new file mode 100644
index 0000000000..d96b3e63e0
--- /dev/null
+++ b/games/nblood/nblood.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for nblood
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Note: if you go digging into the source, you'll see that there are lots
+# of commented-out game variations, including shareware duke nukem, the
+# non-atomic full version, even redneck rampage. I tried uncommenting a
+# couple of them, but they don't work. So for now, rednukem can't play
+# the shareware version from eduke32_shareware_data. I expect upstream
+# will finish the support for these at a later date...
+
+PRGNAM=nblood
+VERSION=${VERSION:-1.01+20200428_069c52b26}
+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}
+
+# 20200430 bkw: upstream includes a lot of fancy optimization flags that
+# are presumably well-tested, so I'm not using SLKCFLAGS. Also, nothing
+# here needs LIBDIRSUFFIX.
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.xz
+cd $PRGNAM-v$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 {} \+
+
+# Where do we find the game data?
+
+# rednukem already looks in /usr/share/games/eduke32/, though it
+# hates the shareware .grp file from eduke32_shareware_data. It'll
+# play the atomic edition of the full game.
+
+# nblood looks in /usr/share/games/nblood/, which is fine.
+
+# pcexhumed doesn't look in /usr anywhere, so I'll make up a dir name
+# for it to use.
+sed -i \
+  '/^ *addsearchpath(cwd);/aaddsearchpath("/usr/share/games/pcexhumed");' \
+  source/exhumed/src/exhumed.cpp
+
+# The engine wants to write a log file in the current directory where
+# it gets run... and segfaults if it can't. The log file is just a copy
+# of the process's stderr it looks like, so let's disable it.
+sed -i.bak \
+  's|OSD_SetLogFile(APPBASENAME ".log");|OSD_SetLogFile("/dev/null");|' \
+  source/blood/src/blood.cpp \
+  source/rr/src/game.cpp \
+  source/exhumed/src/exhumed.cpp
+
+make
+
+mkdir -p $PKG/usr/games $PKG/usr/share/applications
+for game in $PRGNAM $PRGNAM-cryptic pcexhumed rednukem; do
+  [ -e $game ] && install -s -m0755 $game $PKG/usr/games
+  cat $CWD/desktop/$game.desktop > $PKG/usr/share/applications/$game.desktop
+done
+
+# Wrapper script for Cryptic Passage, since the game doesn't let you
+# choose it from the GUI.
+install -oroot -groot -m0755 $CWD/$PRGNAM-cryptic $PKG/usr/games
+
+# The .pk3 file has to be in the game data dir.
+GAMEDIR=$PKG/usr/share/games/$PRGNAM
+mkdir -p $GAMEDIR
+install -oroot -groot -m0644 $PRGNAM.pk3 $GAMEDIR
+
+# Extract/copy the Blood gamedata. Automated here because a description of
+# the process amounts to a shell script anyway. It's a standalone script
+# so non-Slackware users might be able to use it.
+cd $CWD
+  WITHDATA="does not include"
+  TMP="$TMP" \
+    sh $CWD/extract-blood-data.sh $GAMEDIR && \
+    WITHDATA="includes"
+cd -
+
+# Icons extracted from source/blood/rsrc/game_icon.ico with icotool.
+for icon in $CWD/icons/*.png; do
+  size="$( basename $icon .png )"
+  idir=$PKG/usr/share/icons/hicolor/${size}x${size}/apps
+  mkdir -p $idir
+  cat $icon > $idir/$PRGNAM.png
+done
+
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/icons/64.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md source/blood/gpl-2.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+sed "s,@WITHDATA@,$WITHDATA," $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/nblood/nblood.info b/games/nblood/nblood.info
new file mode 100644
index 0000000000..c3ed032e58
--- /dev/null
+++ b/games/nblood/nblood.info
@@ -0,0 +1,10 @@
+PRGNAM="nblood"
+VERSION="1.01+20200428_069c52b26"
+HOMEPAGE="https://github.com/nukeykt/NBlood"
+DOWNLOAD="https://slackware.uk/~urchlay/src/nblood-v1.01+20200428_069c52b26.tar.xz"
+MD5SUM="160e9effcc8ee2491453edabbcf8d7f8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="SDL2"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/nblood/slack-desc b/games/nblood/slack-desc
new file mode 100644
index 0000000000..c3c450d420
--- /dev/null
+++ b/games/nblood/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------------------------------------------------------|
+nblood: nblood (game engine for Blood, Duke Nukem 3D, and Powerslave/Exhumed)
+nblood:
+nblood: nblood is a collection of reverse-engineered ports of Build games
+nblood: using EDuke32 engine technology and development principles.
+nblood:
+nblood: This package @WITHDATA@ the Blood game data.
+nblood:
+nblood:
+nblood:
+nblood:
+nblood:
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/README b/games/nestopia/README
index bb96bf131f..6a2ced51f5 100644
--- a/games/nestopia/README
+++ b/games/nestopia/README
@@ -1,16 +1,19 @@
-Nestopia is a portable Nintendo Entertainment System emulator. It strives for
-the most accurate emulation possible at the pixel-by-pixel and sample-by-sample
-level. It was also one of the inspirations for bsnes.
+Nestopia is a portable Nintendo Entertainment System emulator. It
+strives for the most accurate emulation possible at the pixel-by-pixel
+and sample-by-sample level. It was also one of the inspirations for
+bsnes.
 
 A 1Ghz CPU and 128MB RAM are required to get the best performance.
 
-A Disk System BIOS (disksys.rom) is optional and, of course, not included. If
-you have one, put it in ~/.nestopia
+A Disk System BIOS (disksys.rom) is optional and, of course, not
+included. If you have one, put it in ~/.nestopia
 
-This builds both the standalone application and the Libretro core (for use
-with RetroArch). To use the Libretro core, one step is to copy the following
-file to your RetroArch BIOS directory:
+This builds both the standalone application and the Libretro core (for
+use with RetroArch). To use the Libretro core, one step is to copy the
+following file to your RetroArch BIOS directory:
 
     /usr/share/nestopia/NstDatabase.xml
 
-Note: parallel building is supported with a max of 2 jobs.
+Enable GTK GUI needs newer version of gtk3 (default GTK=no)
+
+GTK=yes ./nestopia.SlackBuild
diff --git a/games/nestopia/nestopia.SlackBuild b/games/nestopia/nestopia.SlackBuild
index 6c681f22c7..3bee82c738 100644
--- a/games/nestopia/nestopia.SlackBuild
+++ b/games/nestopia/nestopia.SlackBuild
@@ -3,11 +3,12 @@
 # Slackware build script for Nestopia
 
 # Written by Dugan Chen (thedoogster@gmail.com)
+# Editd by RuohShoei LIN
 
 PRGNAM=nestopia
 LIBNAM=${PRGNAM}_libretro
-VERSION=${VERSION:-1.49}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.50}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -44,7 +45,7 @@ mkdir -p $TMP $PKG $OUTPUT
 
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.t?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
@@ -57,9 +58,15 @@ find -L . \
 autoreconf -vif
 
 # --enable-gui requires a newer GTK than what's in 14.2.
+GTK=${GTK:-no}
+case "$GTK" in
+    [yY]|[yY][eE][sS]) GTK="--enable-gui" ;;
+    *) GTK="--disable-gui" ;;
+esac
+
 CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -68,7 +75,7 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
   --enable-doc \
-  # --enable-gui
+  $GTK
 
 make
 make install DESTDIR=$PKG
diff --git a/games/nestopia/nestopia.info b/games/nestopia/nestopia.info
index 9319b50390..ba5607f146 100644
--- a/games/nestopia/nestopia.info
+++ b/games/nestopia/nestopia.info
@@ -1,12 +1,12 @@
 PRGNAM="nestopia"
-VERSION="1.49"
+VERSION="1.50"
 HOMEPAGE="http://0ldsk00l.ca/nestopia/"
-DOWNLOAD="http://downloads.sourceforge.net/project/nestopiaue/1.49/nestopia-1.49.tgz \
+DOWNLOAD="https://github.com/0ldsk00l/nestopia/archive/1.50/nestopia-1.50.tar.gz \
           https://raw.githubusercontent.com/libretro/libretro-super/6043e5f/dist/info/nestopia_libretro.info"
-MD5SUM="249910d2d7a3bc3d978ce3d0b6d6304e \
+MD5SUM="09f24c934663d93b1266aa6e8afa4592 \
         1813bb09acf63d4772e50adc4182d259"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2 autoconf-archive"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="RuohShoei LIN"
+EMAIL="lin[dot]ruohshoei [at] gmail [dot] com"
diff --git a/games/nethack/nethack-366.patch b/games/nethack/nethack-366.patch
new file mode 100644
index 0000000000..c8295c896e
--- /dev/null
+++ b/games/nethack/nethack-366.patch
@@ -0,0 +1,33 @@
+--- /var/lib/sbopkg/r0t/14.2/games/nethack/nethack.SlackBuild	2019-06-08 22:37:23.000000000 +0000
++++ nethack.SlackBuild	2020-03-26 02:19:34.386984395 +0000
+@@ -25,7 +25,8 @@
+ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ PRGNAM=nethack
+-VERSION=${VERSION:-3.6.2}
++VERSION=${VERSION:-3.6.6}
++SRCDIR=NetHack-NetHack-${VERSION}_Released
+ SRCVERSION=$(echo $VERSION | sed "s,\.,,g")
+ BUILD=${BUILD:-1}
+ TAG=${TAG:-_SBo}
+@@ -63,9 +64,9 @@
+ rm -rf $PKG
+ mkdir -p $TMP $PKG $OUTPUT
+ cd $TMP
+-rm -rf $PRGNAM-$VERSION
++rm -rf $SRCDIR
+ tar xvf $CWD/$PRGNAM-$SRCVERSION-src.tgz
+-cd $PRGNAM-$VERSION
++cd $SRCDIR
+ chown -R root:root .
+ find -L . \
+  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+@@ -97,7 +98,7 @@
+ cd sys/unix
+ sh setup.sh hints/linux
+ cd ../..
+-make -j1 install PREFIX=$PKG
++make -j1 install PREFIX=$PKG WINTTYLIB=-lncurses
+ mkdir -p $PKG/usr/man/man6
+ make PREFIX=$PKG -j1 install manpages # Multi-threaded builds fail.
+ 
diff --git a/games/nethack/nethack.SlackBuild b/games/nethack/nethack.SlackBuild
index f9061f8ead..10fddde55c 100644
--- a/games/nethack/nethack.SlackBuild
+++ b/games/nethack/nethack.SlackBuild
@@ -25,7 +25,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nethack
-VERSION=${VERSION:-3.6.2}
+VERSION=${VERSION:-3.6.6}
+SRCDIR=NetHack-NetHack-${VERSION}_Released
 SRCVERSION=$(echo $VERSION | sed "s,\.,,g")
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -63,9 +64,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $SRCDIR
 tar xvf $CWD/$PRGNAM-$SRCVERSION-src.tgz
-cd $PRGNAM-$VERSION
+cd $SRCDIR
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -97,7 +98,7 @@ sed -e "/^MANDIR\s*=/s|/usr/man/man6|$PKG/usr/man/man6|" -i sys/unix/Makefile.do
 cd sys/unix
 sh setup.sh hints/linux
 cd ../..
-make -j1 install PREFIX=$PKG
+make -j1 install PREFIX=$PKG WINTTYLIB=-lncurses
 mkdir -p $PKG/usr/man/man6
 make PREFIX=$PKG -j1 install manpages # Multi-threaded builds fail.
 
diff --git a/games/nethack/nethack.info b/games/nethack/nethack.info
index 8b08aa9c73..7a3aa538cc 100644
--- a/games/nethack/nethack.info
+++ b/games/nethack/nethack.info
@@ -1,8 +1,8 @@
 PRGNAM="nethack"
-VERSION="3.6.2"
-HOMEPAGE="http://nethack.org"
-DOWNLOAD="http://nethack.org/download/3.6.2/nethack-362-src.tgz"
-MD5SUM="567c89d9606456ce98c1b9535d024b8f"
+VERSION="3.6.6"
+HOMEPAGE="https://nethack.org"
+DOWNLOAD="https://nethack.org/download/3.6.6/nethack-366-src.tgz"
+MD5SUM="6c9a75f556d24c66801d74d8727a602e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/nevernoid/README b/games/nevernoid/README
index c1a445fe76..552926cf13 100644
--- a/games/nevernoid/README
+++ b/games/nevernoid/README
@@ -5,6 +5,6 @@ script simply packages the binary in a Slack-friendly way, including
 a wrapper script to allow the game to work without being run from its
 data directory.
 
-Note: In the 32-bit build, the fullscreen option is visible in the
-options menu, but it's non-functional (author disabled it on purpose). The
-fullscreen option works in the 64-bit build.
+Note: In the 32-bit build, the fullscreen option is visible in
+the options menu, but it's non-functional (author disabled it on
+purpose). The fullscreen option works in the 64-bit build.
diff --git a/games/noteye/README b/games/noteye/README
index dc085ec0ab..e86f64085b 100644
--- a/games/noteye/README
+++ b/games/noteye/README
@@ -5,12 +5,12 @@ modify the output of console and libtcod roguelikes, and it also works
 as a library which allows to easily port old ASCII roguelikes like ADOM
 into 21st century.
 
-Hydra Slayer is a Roguelike game focused on one thing: slaying Hydras. It
-is inspired by Greek mythology, Dungeon Crawl, MathRL seven day roguelike,
-and some mathematical puzzles about brave heroes slaying many headed
-beasts. Hydra Slayer features an original combat system, based on
-mathematical puzzles. Since Hydra Slayer is a flagship roguelike for
-NotEye, the two are distributed together.
+Hydra Slayer is a Roguelike game focused on one thing: slaying
+Hydras. It is inspired by Greek mythology, Dungeon Crawl, MathRL seven
+day roguelike, and some mathematical puzzles about brave heroes slaying
+many headed beasts. Hydra Slayer features an original combat system,
+based on mathematical puzzles. Since Hydra Slayer is a flagship
+roguelike for NotEye, the two are distributed together.
 
 NotEye can be used as a frontend for most of the rogue-like games on
 SlackBuilds.org, such as rogue, adom, nethack... try searching the site
diff --git a/games/noteye/noteye.info b/games/noteye/noteye.info
index a991ae1728..2300ed29e9 100644
--- a/games/noteye/noteye.info
+++ b/games/noteye/noteye.info
@@ -1,7 +1,7 @@
 PRGNAM="noteye"
 VERSION="7.6"
 HOMEPAGE="http://www.roguetemple.com/z/noteye.php"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/noteye-76.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/noteye-76.zip"
 MD5SUM="650d0fd56b6d5ba72527737596c92766"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/notpacman/README b/games/notpacman/README
index a5f61559bd..02eeab7dc7 100644
--- a/games/notpacman/README
+++ b/games/notpacman/README
@@ -2,6 +2,6 @@ notpacman (rotating pac-man game)
 
 Ever wondered what Pacman would be like with physics? No? Well, it's
 revolutionary. This mashup of "Not" and "Pacman" puts The Pac and the
-Ghosts in a Pacworld cage, at the mercy of gravity and the level's shape,
-controlled solely by you. Ghosts still don't like you very much, so you
-should be careful to make Pacman avoid them.
+Ghosts in a Pacworld cage, at the mercy of gravity and the level's
+shape, controlled solely by you. Ghosts still don't like you very much,
+so you should be careful to make Pacman avoid them.
diff --git a/games/notpacman/notpacman.info b/games/notpacman/notpacman.info
index fc12cee470..1257de73d7 100644
--- a/games/notpacman/notpacman.info
+++ b/games/notpacman/notpacman.info
@@ -1,7 +1,7 @@
 PRGNAM="notpacman"
 VERSION="1.0.4"
 HOMEPAGE="http://stabyourself.net/notpacman/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/notpacman-source.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/notpacman-source.zip"
 MD5SUM="a7f00ac3b1c8cb94bfa07b711b076223"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/nottetris2/README b/games/nottetris2/README
index bc2cd668e9..97e6a6a898 100644
--- a/games/nottetris2/README
+++ b/games/nottetris2/README
@@ -1,14 +1,14 @@
 nottetris2 (tetris clone with physics)
 
 Not Tetris 2 is the spiritual successor of the classic Tetris mixed
-with physics. The result is a fun spinoff in which blocks are no longer
-bound to the usual grid. Blocks can be rotated and placed at any angle,
-resulting in a complete mess if not careful. And with the newest cutting
-edge technology, Not tetris 2 allows line clears when the lines are
-sufficiently filled. The old mode is still available for play and is
-now called Stack.
+with physics. The result is a fun spinoff in which blocks are no
+longer bound to the usual grid. Blocks can be rotated and placed at any
+angle, resulting in a complete mess if not careful. And with the newest
+cutting edge technology, Not tetris 2 allows line clears when the lines
+are sufficiently filled. The old mode is still available for play and
+is now called Stack.
 
-Also in this version is a multiplayer mode that allows up to 2 players on
-a single computer, with each having their own seperate Stack to fill. In
-the Invade mode, players can bounce their blocks to their opponent's
-side and save up on their own space.
+Also in this version is a multiplayer mode that allows up to 2 players
+on a single computer, with each having their own seperate Stack to
+fill. In the Invade mode, players can bounce their blocks to their
+opponent's side and save up on their own space.
diff --git a/games/nottetris2/nottetris2.info b/games/nottetris2/nottetris2.info
index c85f0c3851..bfa438a8fe 100644
--- a/games/nottetris2/nottetris2.info
+++ b/games/nottetris2/nottetris2.info
@@ -1,7 +1,7 @@
 PRGNAM="nottetris2"
 VERSION="20110620"
 HOMEPAGE="http://stabyourself.net/nottetris2/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/nottetris2-source.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/nottetris2-source.zip"
 MD5SUM="35090d40c02139ea8b2f14c1b8de3f95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/nsudoku/nsudoku.info b/games/nsudoku/nsudoku.info
index 4a8c00d1c4..7fadf44e99 100644
--- a/games/nsudoku/nsudoku.info
+++ b/games/nsudoku/nsudoku.info
@@ -1,7 +1,7 @@
 PRGNAM="nsudoku"
 VERSION="1.3"
-HOMEPAGE="http://www.sh1fty.com/nsudoku/"
-DOWNLOAD="http://sh1fty.com/nsudoku/nsudoku.c"
+HOMEPAGE="https://www.tbmatuka.com/nsudoku/"
+DOWNLOAD="https://www.tbmatuka.com/nsudoku/nsudoku.c"
 MD5SUM="cae8ddb55879427631d995a2e6b16e55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/nxengine-libretro/README b/games/nxengine-libretro/README
index 8ed85748bb..05cf3aef55 100644
--- a/games/nxengine-libretro/README
+++ b/games/nxengine-libretro/README
@@ -1,8 +1,8 @@
-Port of NxEngine to the libretro API. NXEngine is a Cave Story game engine
-clone.
+Port of NxEngine to the libretro API. NXEngine is a Cave Story game
+engine clone.
 
-It will require Cave Story 1.0.0.6 and the Aeon Genesis translation which can
-be download from the RetroArch downloadable content.
+It will require Cave Story 1.0.0.6 and the Aeon Genesis translation
+which can be download from the RetroArch downloadable content.
 
 Alternatively Cave Story is available from Studio Pixel's website:
 https://studiopixel.sakura.ne.jp/archives/index.html
diff --git a/games/nxengine-libretro/nxengine-libretro.info b/games/nxengine-libretro/nxengine-libretro.info
index 2d19b572c7..2a14b07d7f 100644
--- a/games/nxengine-libretro/nxengine-libretro.info
+++ b/games/nxengine-libretro/nxengine-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="37100efca74e0000854f6a42e7c97116"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/oblige-legacy4/README b/games/oblige-legacy4/README
index fddaaf73b3..7ef33f66e8 100644
--- a/games/oblige-legacy4/README
+++ b/games/oblige-legacy4/README
@@ -1,9 +1,9 @@
-OBLIGE v4 is a random level generator for various classic games, including
-DOOM, DOOM II, Heretic, Hexen, and Quake. The goal is to produce high
-quality levels which are fun to play.
+OBLIGE v4 is a random level generator for various classic games,
+including DOOM, DOOM II, Heretic, Hexen, and Quake. The goal is to
+produce high quality levels which are fun to play.
 
 This is an older version of oblige, with support for Heretic, Hexen,
-and Quake. If you want the latest version (6.x), install oblige. It can
+and Quake. If you want the latest version (7.x), install oblige. It can
 coexist with this version, but lacks support for Heretic and Quake. 6.x
 also uses a different alrogithm for level generation.
 
diff --git a/games/oblige/README b/games/oblige/README
index 655f4e9542..27ad0146e5 100644
--- a/games/oblige/README
+++ b/games/oblige/README
@@ -1,5 +1,6 @@
-OBLIGE is a random level generator for Doom, Doom II, and their expansion
-packs. The goal is to produce high quality levels which are fun to play.
+OBLIGE is a random level generator for Doom, Doom II, and their
+expansion packs. The goal is to produce high quality levels which are
+fun to play.
 
 A Doom engine is required if you actually want to play the levels you
 generate. Currently there are builds on SBo for zdoom, gzdoom, prboom,
diff --git a/games/odamex/README b/games/odamex/README
index b031563f0c..b97c5c769a 100644
--- a/games/odamex/README
+++ b/games/odamex/README
@@ -22,9 +22,9 @@ FreeDoom >=0.6.2 (FREEDOOM.WAD aka 'freedoom' SBo build)
 Place the WAD file(s) in /usr/share/games/doom. The filenames can be
 all lowercase (doom.wad) or all uppercase (DOOM.WAD).
 
-Optional dependency: miniupnpc (auto-detected at build time). This adds
-support for UPnP to odasrv (the odamex server). It has no effect on odamex
-(the client) or odalaunch (the launcher).
+Optional dependency: miniupnpc (auto-detected at build time). This
+adds support for UPnP to odasrv (the odamex server). It has no effect
+on odamex (the client) or odalaunch (the launcher).
 
 Note: If you get compile errors relating to wxIntPtr not being defined,
 upgrade your wxPython or wxGTK package to at least version 2.8.12.0. If
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/onscripter/onscripter.SlackBuild b/games/onscripter/onscripter.SlackBuild
index 6ac7a818e8..516cf80a4a 100644
--- a/games/onscripter/onscripter.SlackBuild
+++ b/games/onscripter/onscripter.SlackBuild
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # Slackware build script for onscripter
-# @(#)onscripter.SlackBuild	1.3 19/12/13 19:36:30
+# @(#)onscripter.SlackBuild	1.4 20/05/03 06:46:49
 
-# Copyright 2019 GOSIKI Agiri
+# Copyright 2020 GOSIKI Agiri
 # 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=onscripter
-VERSION=${VERSION:-20191116}
+VERSION=${VERSION:-20200419}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/onscripter/onscripter.info b/games/onscripter/onscripter.info
index 4b92d44373..2fb6058379 100644
--- a/games/onscripter/onscripter.info
+++ b/games/onscripter/onscripter.info
@@ -1,8 +1,8 @@
 PRGNAM="onscripter"
-VERSION="20191116"
+VERSION="20200419"
 HOMEPAGE="https://onscripter.osdn.jp/onscripter.html"
-DOWNLOAD="https://onscripter.osdn.jp/onscripter-20191116.tar.gz"
-MD5SUM="9caa3094b4b34a129ecd0f85db3eef62"
+DOWNLOAD="https://onscripter.osdn.jp/onscripter-20200419.tar.gz"
+MD5SUM="c852b16b0e7345aa1dfa2ba4b7942117"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="smpeg lua"
diff --git a/games/oolite/oolite.SlackBuild b/games/oolite/oolite.SlackBuild
index aae7511482..04d0866d96 100644
--- a/games/oolite/oolite.SlackBuild
+++ b/games/oolite/oolite.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for oolite
 
-# Copyright 2016 - 2018 Johannes Schoepfer, Germany
+# Copyright 2016 - 2020 Johannes Schoepfer, 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=oolite
-VERSION=${VERSION:-1.88}
+VERSION=${VERSION:-1.90}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,18 +69,28 @@ 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 sure only system libs may be used
+rm deps/Linux-deps/x86*/lib/*
+
 source /usr/share/GNUstep/Makefiles/GNUstep.sh
 export GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles
-sed -i "/ADDITIONAL_OBJSLKFLAGS/s/=/= -fobjc-exceptions ${SLKCFLAGS}/" GNUmakefile
-make -f libjs.make debug=no
-make -f Makefile ESPEAK=yes release-deployment
+## Link to espeak-ng instead of espeak 
+#  -e "/ADDITIONAL_OBJC_LIBS/s/+= -lespeak/+= -lespeak-ng/" \
+sed -i \
+  -e "/ADDITIONAL_OBJCFLAGS/s/=/= -fobjc-exceptions ${SLKCFLAGS}/" \
+  -e "s/-mtune=generic//g" \
+  -e "s/ -lpng / -l:libpng14.so.14 /g" \
+  GNUmakefile
+
+make -f Makefile ESPEAK=yes use_deps=no debug=no release
 
 mkdir -p $PKG/usr/share/{oolite,pixmaps,applications}
 cp -a oolite.app/* $PKG/usr/share/oolite/
 cp installers/FreeDesktop/oolite-icon.png $PKG/usr/share/pixmaps
 cp installers/FreeDesktop/oolite.desktop $PKG/usr/share/applications
 
-find $PKG -type f -exec file {} + | fgrep -e "executable" -e "shared object" | fgrep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -type f -exec 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/games
 cat << 'EOF' > $PKG/usr/games/oolite
diff --git a/games/oolite/oolite.info b/games/oolite/oolite.info
index 9c74d20463..a7b6028400 100644
--- a/games/oolite/oolite.info
+++ b/games/oolite/oolite.info
@@ -1,8 +1,8 @@
 PRGNAM="oolite"
-VERSION="1.88"
+VERSION="1.90"
 HOMEPAGE="http://www.oolite.org/"
-DOWNLOAD="https://github.com/OoliteProject/oolite/releases/download/1.88/oolite-source-1.88.tar.bz2"
-MD5SUM="e42fe5dd4788d69d102f121bc5226b3d"
+DOWNLOAD="https://github.com/OoliteProject/oolite/releases/download/1.90/oolite-source-1.90.tar.bz2"
+MD5SUM="c34c6f88606be75c90cc52c5a4173611"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="espeak gnustep-base OpenAL"
diff --git a/games/open-adventure/README b/games/open-adventure/README
index cf936c0e78..b06a4f85f5 100644
--- a/games/open-adventure/README
+++ b/games/open-adventure/README
@@ -1,12 +1,12 @@
 advent (Colossal Cave Adventure, the 1995 430-point version)
 
-This is the last descendent of the original 1976 Colossal Cave Adventure
-worked on by the original authors - Crowther & Woods. It has sometimes
-been known as Adventure 2.5. The original PDP-10 name 'advent' is used
-to avoid collision with the bsd-games version.
+This is the last descendent of the original 1976 Colossal Cave
+Adventure worked on by the original authors - Crowther & Woods. It
+has sometimes been known as Adventure 2.5. The original PDP-10 name
+'advent' is used to avoid collision with the bsd-games version.
 
-This code is a forward-port of the Crowther/Woods Adventure 2.5 from 1995,
-last version in the main line of Colossal Cave Adventure development
-written by the original authors. The authors have given permission and
-encouragement for this release. The file history.txt contains a more
-detailed history of this game and its ancestors.
+This code is a forward-port of the Crowther/Woods Adventure 2.5
+from 1995, last version in the main line of Colossal Cave Adventure
+development written by the original authors. The authors have given
+permission and encouragement for this release. The file history.txt
+contains a more detailed history of this game and its ancestors.
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/openarena/README b/games/openarena/README
index ec22df3eb3..a656b492fd 100644
--- a/games/openarena/README
+++ b/games/openarena/README
@@ -1,16 +1,17 @@
-OpenArena is an open-source content package for Quake III Arena licensed under
-the GPL, effectively creating a free stand-alone game.  You do not need Quake
-III Arena to play this game.
+OpenArena is an open-source content package for Quake III Arena
+licensed under the GPL, effectively creating a free stand-alone game.
+You do not need Quake III Arena to play this game.
 
-OpenArena has bots, network playability, many maps and most of the other
-features you would expect from a commercial first person shooter.
+OpenArena has bots, network playability, many maps and most of the
+other features you would expect from a commercial first person shooter.
 
-OpenArena requires 3D accelerated video drivers but runs quite well on the
-open-source Intel drivers.
+OpenArena requires 3D accelerated video drivers but runs quite well on
+the open-source Intel drivers.
 
-Please be advised that the main game zip file, openarena-0.8.8.zip, is about
-405MB.  This file is already patched with the 0.8.8 patch.  Also, the download
-site listed in the openarena.info file is a direct link, but it is sometimes
-slow.  You may wish to visit the openarena homepage (openarena.ws), click on
-"Downloads," and look for much faster download sites that do not offer direct
-links.  Just make sure you find the full zip that includes the 0.8.8 patch.
+Please be advised that the main game zip file, openarena-0.8.8.zip, is
+about 405MB.  This file is already patched with the 0.8.8 patch.  Also,
+the download site listed in the openarena.info file is a direct link,
+but it is sometimes slow.  You may wish to visit the openarena homepage
+(openarena.ws), click on "Downloads," and look for much faster download
+sites that do not offer direct links.  Just make sure you find the full
+zip that includes the 0.8.8 patch.
diff --git a/games/opendune/README b/games/opendune/README
index f49700599e..06f584319b 100644
--- a/games/opendune/README
+++ b/games/opendune/README
@@ -2,8 +2,9 @@ opendune (realtime strategy game)
 
 OpenDUNE is an open source re-creation of the popular game "Dune
 II", originally made by Westwood Studios, and released by Virgin
-Entertainment. It attempts to re-create the original game and apply modern
-technology to it to allow it to be run natively on most operating systems.
+Entertainment. It attempts to re-create the original game and apply
+modern technology to it to allow it to be run natively on most
+operating systems.
 
 To play the game, you'll need the *.PAK files from the original game.
 All three existing versions of the Dune 2 1.07 data files (eu, hs
diff --git a/games/openjazz/README b/games/openjazz/README
index 60c3086e70..9e3763f427 100644
--- a/games/openjazz/README
+++ b/games/openjazz/README
@@ -15,12 +15,13 @@ There is no support for saving/loading the game. Multiplayer
 is supported, but not well tested. For more information, see
 http://www.alister.eu/jazz/oj/faq.php
 
-This build includes the data files from the shareware edition, installed
-in /usr/share/openjazz/shareware, and a wrapper script openjazz-shareware
-that runs them (along with a .desktop file that does the same). To run
-one of the other supported games, you'll need an installed/extracted copy
-of the game in its own directory, and you'll have to pass the directory
-path to openjazz as an argument. Example:
+This build includes the data files from the shareware edition,
+installed in /usr/share/openjazz/shareware, and a wrapper script
+openjazz-shareware that runs them (along with a .desktop file that
+does the same). To run one of the other supported games, you'll
+need an installed/extracted copy of the game in its own directory,
+and you'll have to pass the directory path to openjazz as an
+argument. Example:
 
 $ openjazz /dosC/games/jazz
 
diff --git a/games/openjazz/openjazz.info b/games/openjazz/openjazz.info
index 52db92ffed..b83569a91e 100644
--- a/games/openjazz/openjazz.info
+++ b/games/openjazz/openjazz.info
@@ -2,7 +2,7 @@ PRGNAM="openjazz"
 VERSION="160214"
 HOMEPAGE="http://www.alister.eu/jazz/oj/"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/OpenJazz-src-160214.zip \
-          http://urchlay.naptime.net/~urchlay/src/jjrabbit.zip"
+          https://slackware.uk/~urchlay/src/jjrabbit.zip"
 MD5SUM="a570ae8b148a8b0fd7a3a121289a4721 \
         48bc5ae9ac3d0bb3a45a8262f68bf78c"
 DOWNLOAD_x86_64=""
diff --git a/games/openmortal/README b/games/openmortal/README
index 0425d6b776..98eec54b70 100644
--- a/games/openmortal/README
+++ b/games/openmortal/README
@@ -1,8 +1,8 @@
 openmortal (2D fighting game)
 
-Open Mortal is a parody of the once popular coin-up fighting game, Mortal
-Kombat, for Windows and Linux. It is currently playable, has 16 playable
-characters, some more in the making. New characters can be added, so be
-an Open Mortal actor today!
+Open Mortal is a parody of the once popular coin-up fighting game,
+Mortal Kombat, for Windows and Linux. It is currently playable, has
+16 playable characters, some more in the making. New characters can be
+added, so be an Open Mortal actor today!
 
 Single player mode is not implemented. This game is multiplayer only.
diff --git a/games/openmw/openmw.SlackBuild b/games/openmw/openmw.SlackBuild
index 25bc48a8eb..c7aa4a7031 100644
--- a/games/openmw/openmw.SlackBuild
+++ b/games/openmw/openmw.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openmw
-VERSION=${VERSION:-0.41.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.46.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/games/openmw/openmw.info b/games/openmw/openmw.info
index 8e7ffddf3f..84245b124e 100644
--- a/games/openmw/openmw.info
+++ b/games/openmw/openmw.info
@@ -1,8 +1,8 @@
 PRGNAM="openmw"
-VERSION="0.41.0"
+VERSION="0.46.0"
 HOMEPAGE="https://openmw.org"
-DOWNLOAD="https://github.com/OpenMW/openmw/archive/openmw-0.41.0.tar.gz"
-MD5SUM="8a939016d489b9cffdcd82aa36ed4973"
+DOWNLOAD="https://github.com/OpenMW/openmw/archive/openmw-0.46.0.tar.gz"
+MD5SUM="3a85106cac2728fcc16a0f9b682afb6b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="FreeImage OpenAL unshield ffmpeg OpenSceneGraph SDL2 MyGUI bullet"
diff --git a/games/openttd/README b/games/openttd/README
index 17d7dbb39d..97fe558bd2 100644
--- a/games/openttd/README
+++ b/games/openttd/README
@@ -1,27 +1,30 @@
-OpenTTD is a clone of the Microprose game "Transport Tycoon Deluxe," a popular
-game originally written by Chris Sawyer.  Significant enhancements from the
-original game include bigger maps, new AI, stable multiplayer mode, dedicated
-server mode, and many in-game updates.
+OpenTTD is a clone of the Microprose game "Transport Tycoon Deluxe,"
+a popular game originally written by Chris Sawyer.  Significant
+enhancements from the original game include bigger maps, new AI,
+stable multiplayer mode, dedicated server mode, and many in-game
+updates.
 
-Historically, users of OpenTTD needed access to several original Windows data
-files in order to successfully run the game.  However, now there are two
-options:
+Historically, users of OpenTTD needed access to several original
+Windows data files in order to successfully run the game.  However,
+now there are two options:
 
 1.  Using open source data files.
 
-There are now open source equivalent files for the graphics (opengfx), sound
-(opensfx), and music (openmsx) data files.  This script includes support for
-these three extra downloads and will move the files into the right place so
-long as OPENDATA=YES (which is the default).
+There are now open source equivalent files for the graphics (opengfx),
+sound (opensfx), and music (openmsx) data files.  This script includes
+support for these three extra downloads and will move the files into
+the right place so long as OPENDATA=YES (which is the default).
 
 2.  Using the original Windows data files.
 
-Alternatively, the user can still use the original Windows data files.  If the
-original Windows data files are going to be used, then they must be copied into
-the /usr/share/games/openttd/data directory before the game can be played.
-List of the required files: sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf
-trgtr.grf.  Note that the user can either set OPENDATA=NO in which case the
-open source data files will not be used by the script and OpenTTD.  Or, the
-user can keep OPENDATA=YES in which case the open source data files will be
-included giving the user the ability to choose which data file set (original
-Windows or open source data files) to use within the game options menu.
+Alternatively, the user can still use the original Windows data files.
+If the original Windows data files are going to be used, then they
+must be copied into the /usr/share/games/openttd/data directory before
+the game can be played.  List of the required files: sample.cat
+trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf.  Note that the
+user can either set OPENDATA=NO in which case the open source data
+files will not be used by the script and OpenTTD.  Or, the user can
+keep OPENDATA=YES in which case the open source data files will be
+included giving the user the ability to choose which data file set
+(original Windows or open source data files) to use within the game
+options menu.
diff --git a/games/openttd/openttd.SlackBuild b/games/openttd/openttd.SlackBuild
index 2430a7d97a..5e9956d310 100644
--- a/games/openttd/openttd.SlackBuild
+++ b/games/openttd/openttd.SlackBuild
@@ -4,6 +4,7 @@
 
 # Copyright 2007-2010 Chess Griffin <chess@chessgriffin.com>
 # Copyright 2011-2014 LEVAI Daniel
+# Copyright 2020 Heiko Rosemann
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,11 +25,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openttd
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-OPENGFX=0.5.2
+OPENGFX=0.6.0
 OPENSFX=0.2.3
 OPENMSX=0.3.1
 
@@ -59,7 +60,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC "
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
diff --git a/games/openttd/openttd.info b/games/openttd/openttd.info
index 91de4393e4..b049376f26 100644
--- a/games/openttd/openttd.info
+++ b/games/openttd/openttd.info
@@ -1,16 +1,16 @@
 PRGNAM="openttd"
-VERSION="1.6.1"
+VERSION="1.10.1"
 HOMEPAGE="http://www.openttd.org"
-DOWNLOAD="http://binaries.openttd.org/releases/1.6.1/openttd-1.6.1-source.tar.xz \
-          http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip \
-          http://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip \
-          http://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip"
-MD5SUM="420c0488d2b085a1879ae2325e558310 \
-        e64352d0578822c6e5388b631b3086f7 \
+DOWNLOAD="https://cdn.openttd.org/openttd-releases/1.10.1/openttd-1.10.1-source.tar.xz \
+          https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip \
+          https://cdn.openttd.org/openmsx-releases/0.3.1/openmsx-0.3.1-all.zip \
+          https://cdn.openttd.org/opensfx-releases/0.2.3/opensfx-0.2.3-all.zip"
+MD5SUM="d01908c4d23c1a0065d8e1d17dec9f42 \
+        994d8ce816542b74130964971736d4d6 \
         858b79d44aea6de5e15d9d1439e86cc3 \
         3605b82f24153500c8a1804e4420168a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="LEVAI Daniel"
-EMAIL="leva@ecentrum.hu"
+MAINTAINER="Heiko Rosemann"
+EMAIL="heiko.rosemann@web.de"
diff --git a/games/parallel-n64/README b/games/parallel-n64/README
index 5e866ebecf..ef8b3ca241 100644
--- a/games/parallel-n64/README
+++ b/games/parallel-n64/README
@@ -1,15 +1,15 @@
-Parallel-n64 is a cross-platform plugin-based N64 emulator which is capable of
-accurately playing many games.
+Parallel-n64 is a cross-platform plugin-based N64 emulator which is
+capable of accurately playing many games.
 
 This package was previously called mupen64plus-libretro.
 
-Parallel-n64 optionally supports using OpenGL ES 2 instead of OpenGL which
-will require support in the libretro frontend, video card and driver. This
-can be done by building Mupen64Plus with:
+Parallel-n64 optionally supports using OpenGL ES 2 instead of OpenGL
+which will require support in the libretro frontend, video card and
+driver. This can be done by building Mupen64Plus with:
   GLES=1 ./parallel-n64.SlackBuild
 
-Vulkan can be used instead of OpenGL which will require support in the libretro
-frontend, video card and driver.
+Vulkan can be used instead of OpenGL which will require support in the
+libretro frontend, video card and driver.
 
 To build the debugging symbols use:
   DEBUG=1 ./parallel-n64.SlackBuild
diff --git a/games/parallel-n64/parallel-n64.info b/games/parallel-n64/parallel-n64.info
index 77ecdcd959..bf456c87eb 100644
--- a/games/parallel-n64/parallel-n64.info
+++ b/games/parallel-n64/parallel-n64.info
@@ -6,5 +6,5 @@ MD5SUM="3b3c8b3e3478d53a5b6a2a708cb54449"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/pasang-emas/README b/games/pasang-emas/README
index b4df4e4a14..aacafdf257 100644
--- a/games/pasang-emas/README
+++ b/games/pasang-emas/README
@@ -1,3 +1,3 @@
-Pasang is a traditional two-player board game of Brunei. The game starts
-with a board-full of tokens. The players take turn capturing these tokens.
-The player with the most tokens wins.
+Pasang is a traditional two-player board game of Brunei. The game
+starts with a board-full of tokens. The players take turn capturing
+these tokens.  The player with the most tokens wins.
diff --git a/games/pcsx-rearmed/README b/games/pcsx-rearmed/README
index 52fcf7e0d9..8350da9abb 100644
--- a/games/pcsx-rearmed/README
+++ b/games/pcsx-rearmed/README
@@ -1,13 +1,15 @@
-PCSX ReARMed is yet another PCSX fork based on the PCSX-Reloaded project,
-which itself contains code from PCSX, PCSX-df and PCSX-Revolution. This
-version is ARM architecture oriented and features MIPS->ARM recompiler by
-Ari64, NEON GTE code and more performance improvements. It was created for
-Pandora handheld, but should be usable on other devices after some code
-adjustments (N900, GPH Wiz/Caanoo, PlayBook versions are also available).
+PCSX ReARMed is yet another PCSX fork based on the PCSX-Reloaded
+project, which itself contains code from PCSX, PCSX-df and
+PCSX-Revolution. This version is ARM architecture oriented and features
+MIPS->ARM recompiler by Ari64, NEON GTE code and more performance
+improvements. It was created for Pandora handheld, but should be
+usable on other devices after some code adjustments (N900,
+GPH Wiz/Caanoo, PlayBook versions are also available).
 
-PCSX ReARMed features ARM NEON GPU by Exophase, that in many cases produces
-pixel perfect graphics at very high performance. There is also Una-i's GPU
-plugin from PCSX4ALL project, and traditional P.E.Op.S. one.
+PCSX ReARMed features ARM NEON GPU by Exophase, that in many cases 
+produces pixel perfect graphics at very high performance. There is
+also Una-i's GPU plugin from PCSX4ALL project, and traditional
+P.E.Op.S. one.
 
 PCSX ReARMed looks for the following BIOS image files inside the
 frontend's 'System Directory'.
@@ -17,9 +19,10 @@ frontend's 'System Directory'.
 * scph5502.bin (MD5 sum: 32736f17079d0b2b7024407c39bd3050)
 
 In case it can find no BIOS files named like this inside the 'System
-Directory', it will default to a High-Level Emulation BIOS. This decreases the
-level of compatibility of the emulator, so it is recommended that you always
-supply valid BIOS images inside the system directory.
+Directory', it will default to a High-Level Emulation BIOS.
+This decreases the level of compatibility of the emulator, so it is
+recommended that you always supply valid BIOS images inside the system
+directory.
 
 To build the debugging symbols use:
   DEBUG=1 ./pcsx-rearmed.SlackBuild
diff --git a/games/pcsx-rearmed/pcsx-rearmed.SlackBuild b/games/pcsx-rearmed/pcsx-rearmed.SlackBuild
index 7c6c68d01c..4c2cc1cd1d 100644
--- a/games/pcsx-rearmed/pcsx-rearmed.SlackBuild
+++ b/games/pcsx-rearmed/pcsx-rearmed.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for PCSX-ReARMed
 
 # Copyright 2016-2018 Hunter Sezen
+# Copyright 20120 ilmich < ardutu at gmail dot com >
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +25,7 @@
 
 PRGNAM=pcsx-rearmed
 LIBNAM=pcsx_rearmed_libretro
-VERSION=${VERSION:-2018.09.07_0370856}
+VERSION=${VERSION:-2020.10.11_19b9695}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/pcsx-rearmed/pcsx-rearmed.info b/games/pcsx-rearmed/pcsx-rearmed.info
index 16794a9251..ebaf846cbf 100644
--- a/games/pcsx-rearmed/pcsx-rearmed.info
+++ b/games/pcsx-rearmed/pcsx-rearmed.info
@@ -1,10 +1,10 @@
 PRGNAM="pcsx-rearmed"
-VERSION="2018.09.07_0370856"
+VERSION="2020.10.11_19b9695"
 HOMEPAGE="https://www.libretro.com/"
-DOWNLOAD="http://slackless.raccoons.tech/src/libretro/pcsx-rearmed-2018.09.07_0370856.tar.xz"
-MD5SUM="29ea15d12e99a0c732c7ffe4374f5af1"
+DOWNLOAD="https://ilmich.github.io/src/pcsx-rearmed-2020.10.11_19b9695.tar.xz"
+MD5SUM="ebc27a8ca62674bd9a5b2e605e4276d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="ilmich"
+EMAIL="ardutu@gmail.com"
diff --git a/games/pcsx2/README b/games/pcsx2/README
index 3e1ed39b6a..f7af9b09c6 100644
--- a/games/pcsx2/README
+++ b/games/pcsx2/README
@@ -1,13 +1,17 @@
-PCSX2 is an open source Playstation 2 emulator. Its purpose is to mimic
-the PS2 hardware, using a combination of MIPS CPU Interpreters, Recompilers
-and a Virtual Machine which manages hardware states and PS2 system memory.
+PCSX2 is an open source Playstation 2 emulator. Its purpose is to
+mimic the PS2 hardware, using a combination of MIPS CPU Interpreters,
+Recompilers and a Virtual Machine which manages hardware states and PS2
+system memory.
 
-NOTE: This is buildable only on x86 32bit platforms and will require a PS2 bios
-dump to play games. For x86_64 64bit platforms multilib support will be needed
-including compat32 versions of SDL2, wxGTK3, portaudio and soundtouch.
+portaudio is an optional dependency.
 
-PCSX2 offers experimental support for the EGL api instead of GLX. This can be
-used by building PCSX2 with:
+NOTE: This is buildable only on x86 32bit platforms and will require
+a PS2 bios dump to play games. For x86_64 64bit platforms multilib
+support will be needed including compat32 versions of SDL2, wxGTK3,
+soundtouch and optionally portaudio.
+
+PCSX2 offers experimental support for the EGL api instead of GLX. This
+can be used by building PCSX2 with:
   EGL_API=yes ./pcsx2.SlackBuild
 
 To build debugging symbols for PCSX2 use:
diff --git a/games/pcsx2/pcsx2.SlackBuild b/games/pcsx2/pcsx2.SlackBuild
index 2f5096784e..6f8a6e67f2 100644
--- a/games/pcsx2/pcsx2.SlackBuild
+++ b/games/pcsx2/pcsx2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pcsx2
 
-# 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=pcsx2
-VERSION=${VERSION:-2018.12.11_0e43803}
+VERSION=${VERSION:-1.6.0}
 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 . \
@@ -72,8 +72,10 @@ find -L . \
 # pcsx2 does not support x86_64 yet and does
 # not plan to for the foreseeable future.
 BINDIR=; MULTILIB=
-[ "$ARCH" = 'x86_64' ] && BINDIR='/32' \
+if [ "$ARCH" = 'x86_64' ]; then
+  BINDIR='/32'
   MULTILIB='-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake'
+fi
 
 RELEASE=Debug
 
@@ -102,6 +104,11 @@ sed -i \
   's|truetype/freefont/FreeSerif.ttf|TTF/LiberationSerif-Regular.ttf|' \
   plugins/GSdx/GSdx.cpp
 
+# spu2-x: Make portaudio an optional dependency.
+# https://github.com/PCSX2/pcsx2/pull/3110
+# https://github.com/PCSX2/pcsx2/commit/84d090e2fde50c66b965b84c73abd9f04a1770dd
+patch -p1 < $CWD/portaudio.patch
+
 mkdir -p build
 cd build
   cmake \
@@ -113,7 +120,6 @@ cd build
     -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin${BINDIR}/wx-config \
     -DwxWidgets_wxrc_EXECUTABLE=/usr/bin${BINDIR}/wxrc-3.0 \
     -DBUILD_REPLAY_LOADERS=TRUE \
-    -DDISABLE_ADVANCE_SIMD=ON \
     -DDISABLE_BUILD_DATE=ON \
     -DGSDX_LEGACY=ON \
     -DPACKAGE_MODE=ON \
@@ -144,7 +150,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Fix doinst.sh for x86_64
-[ "$ARCH" = 'x86_64' ] && \
+[ "$ARCH" != 'x86_64' ] ||
   sed -i 's|-loaders |-loaders-32 |' $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/games/pcsx2/pcsx2.info b/games/pcsx2/pcsx2.info
index 721f10dd91..5f6122596b 100644
--- a/games/pcsx2/pcsx2.info
+++ b/games/pcsx2/pcsx2.info
@@ -1,10 +1,10 @@
 PRGNAM="pcsx2"
-VERSION="2018.12.11_0e43803"
+VERSION="1.6.0"
 HOMEPAGE="https://pcsx2.net"
-DOWNLOAD="http://slackless.raccoons.tech/src/pcsx2-2018.12.11_0e43803.tar.xz"
-MD5SUM="48af5b3fc0c1a16bd71dd433ea14111e"
+DOWNLOAD="https://github.com/PCSX2/pcsx2/archive/v1.6.0/pcsx2-1.6.0.tar.gz"
+MD5SUM="51185d06f77b39df03e42fc68710c174"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
-REQUIRES="SDL2 wxGTK3 portaudio soundtouch"
+REQUIRES="SDL2 wxGTK3 soundtouch"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/games/pcsx2/portaudio.patch b/games/pcsx2/portaudio.patch
new file mode 100644
index 0000000000..e4194bc3b7
--- /dev/null
+++ b/games/pcsx2/portaudio.patch
@@ -0,0 +1,320 @@
+From 84d090e2fde50c66b965b84c73abd9f04a1770dd Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 7 May 2020 15:31:48 +0000
+Subject: [PATCH] spu2-x: Make portaudio an optional dependency. (#3110)
+
+* spu2-x: Make portaudio an optional dependency.
+
+v2: Fix crash in the audio settings with SDL1 and without portaudio.
+
+* cmake: Add PORTAUDIO_API to disable portaudio support.
+---
+ build.sh                            |  4 +++-
+ cmake/BuildParameters.cmake         |  1 +
+ cmake/SearchForStuff.cmake          |  6 ++++--
+ cmake/SelectPcsx2Plugins.cmake      | 15 ++++++++-------
+ plugins/spu2-x/src/CMakeLists.txt   | 19 ++++++++++++++++---
+ plugins/spu2-x/src/Linux/Config.cpp | 20 +++++++++++++++++++-
+ plugins/spu2-x/src/SndOut.cpp       |  2 ++
+ plugins/spu2-x/src/SndOut.h         |  2 ++
+ 8 files changed, 55 insertions(+), 14 deletions(-)
+
+diff --git a/build.sh b/build.sh
+index e1bc256475..54b30e404e 100755
+--- a/build.sh
++++ b/build.sh
+@@ -213,6 +213,7 @@ for ARG in "$@"; do
+         --pgo-optimize      ) flags="$flags -DUSE_PGO_OPTIMIZE=TRUE" ;;
+         --pgo-generate      ) flags="$flags -DUSE_PGO_GENERATE=TRUE" ;;
+         --no-dev9ghzdrk     ) flags="$flags -DDISABLE_DEV9GHZDRK=TRUE" ;;
++        --no-portaudio      ) flags="$flags -DPORTAUDIO_API=FALSE" ;;
+         --no-simd           ) flags="$flags -DDISABLE_ADVANCE_SIMD=TRUE" ;;
+         --no-trans          ) flags="$flags -DNO_TRANSLATION=TRUE" ;;
+         --cross-multilib    ) flags="$flags -DCMAKE_TOOLCHAIN_FILE=$toolfile"; useCross=1; ;;
+@@ -244,7 +245,8 @@ for ARG in "$@"; do
+             echo
+             echo "** Distribution Compatibilities **"
+             echo "--sdl12         : Build with SDL1.2 (requires if wx is linked against SDL1.2)"
+-	    echo "--no-dev9ghzdrk : Skip dev9ghzdrk. (Avoids needing escalated privileges to build.)"
++            echo "--no-dev9ghzdrk : Skip dev9ghzdrk. (Avoids needing escalated privileges to build.)"
++            echo "--no-portaudio  : Skip portaudio for spu2x."
+             echo
+             echo "** Expert Developer option **"
+             echo "--gtk3          : replace GTK2 by GTK3"
+diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
+index 235bdb8e59..83bab90dab 100644
+--- a/cmake/BuildParameters.cmake
++++ b/cmake/BuildParameters.cmake
+@@ -48,6 +48,7 @@ option(DISABLE_CHEATS_ZIP "Disable including the cheats_ws.zip file")
+ option(DISABLE_PCSX2_WRAPPER "Disable including the PCSX2-linux.sh file")
+ option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path")
+ option(EXTRA_PLUGINS "Build various 'extra' plugins")
++option(PORTAUDIO_API "Build portaudio support on spu2x" ON)
+ option(SDL2_API "Use SDL2 on spu2x and onepad (wxWidget mustn't be built with SDL1.2 support" ON)
+ option(GTK3_API "Use GTK3 api (experimental/wxWidget must be built with GTK3 support)")
+ 
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index a062d457a3..50f8f5f3e8 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -105,7 +105,9 @@ endif()
+ if(OPENCL_API)
+     check_lib(OPENCL OpenCL CL/cl.hpp)
+ endif()
+-check_lib(PORTAUDIO portaudio portaudio.h pa_linux_alsa.h)
++if(PORTAUDIO_API)
++    check_lib(PORTAUDIO portaudio portaudio.h pa_linux_alsa.h)
++endif()
+ check_lib(SOUNDTOUCH SoundTouch soundtouch/SoundTouch.h)
+ 
+ if(SDL2_API)
+@@ -227,4 +229,4 @@ if((GCC_VERSION VERSION_EQUAL "9.0" OR GCC_VERSION VERSION_GREATER "9.0") AND GC
+     https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=275ab714637a64672c6630cfd744af2c70957d5a
+     Even with that patch, compiling with LTO may still segfault. Use at your own risk!
+     This text being in a compile log in an open issue may cause it to be closed.")
+-endif()
+\ No newline at end of file
++endif()
+diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
+index 69d0e07b91..00bf22e6ca 100644
+--- a/cmake/SelectPcsx2Plugins.cmake
++++ b/cmake/SelectPcsx2Plugins.cmake
+@@ -7,7 +7,7 @@ set(msg_dep_cdvdgiga    "check these libraries -> gtk2, libudev")
+ set(msg_dep_zerogs      "check these libraries -> glew, opengl, X11, nvidia-cg-toolkit (>=2.1)")
+ set(msg_dep_gsdx        "check these libraries -> opengl, png (>=1.2), zlib (>=1.2.4), X11, liblzma")
+ set(msg_dep_onepad      "check these libraries -> sdl2, X11, gtk2")
+-set(msg_dep_spu2x       "check these libraries -> soundtouch (>=1.5), alsa, portaudio (>=1.9), sdl (>=1.2) pcsx2 common libs")
++set(msg_dep_spu2x       "check these libraries -> soundtouch (>=1.5), alsa, portaudio (optional, >=1.9), sdl (>=1.2), pcsx2 common libs")
+ set(msg_dep_zerospu2    "check these libraries -> soundtouch (>=1.5), alsa")
+ set(msg_dep_dev         "check these libraries -> gtk2, pcap, libxml2")
+ if(GLSL_API)
+@@ -267,12 +267,13 @@ endif()
+ #			spu2-x
+ #---------------------------------------
+ # requires: -SoundTouch
+-#			-ALSA
+-#           -Portaudio
++#           -ALSA
+ #           -SDL
+ #           -common_libs
++#
++# optional: -Portaudio
+ #---------------------------------------
+-if((PORTAUDIO_FOUND AND SOUNDTOUCH_FOUND AND SDLn_FOUND AND common_libs)
++if((SOUNDTOUCH_FOUND AND SDLn_FOUND AND common_libs)
+ 	AND ((Linux AND ALSA_FOUND) OR (UNIX AND NOT Linux)))
+ 	set(spu2-x TRUE)
+ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/spu2-x")
+@@ -287,8 +288,8 @@ endif()
+ #			zerospu2
+ #---------------------------------------
+ # requires: -SoundTouch
+-#			-ALSA
+-#			-PortAudio
++#           -ALSA
++#           -PortAudio
+ #---------------------------------------
+ if(EXTRA_PLUGINS)
+     if(EXISTS "${CMAKE_SOURCE_DIR}/plugins/zerospu2" AND SOUNDTOUCH_FOUND AND ALSA_FOUND)
+@@ -312,4 +313,4 @@ if(GTKn_FOUND)
+     set(USBnull TRUE)
+ endif()
+ #---------------------------------------
+-#-------------------------------------------------------------------------------
+\ No newline at end of file
++#-------------------------------------------------------------------------------
+diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt
+index e4c7141287..d17538e33e 100644
+--- a/plugins/spu2-x/src/CMakeLists.txt
++++ b/plugins/spu2-x/src/CMakeLists.txt
+@@ -45,7 +45,6 @@ set(spu2xSources
+     RegTable.cpp
+     Reverb.cpp
+     SndOut.cpp
+-    SndOut_Portaudio.cpp
+     SndOut_SDL.cpp
+     spu2freeze.cpp
+     Spu2replay.cpp
+@@ -111,7 +110,6 @@ else()
+     include_directories(Linux)
+ endif()
+ 
+-
+ set(spu2xFinalSources
+     ${spu2xSources}
+     ${spu2xHeaders}
+@@ -121,11 +119,26 @@ set(spu2xFinalSources
+ set(spu2xFinalLibs
+     Utilities_NO_TLS
+     ${ALSA_LIBRARIES}
+-    ${PORTAUDIO_LIBRARIES}
+     ${GTK2_LIBRARIES}
+     ${SOUNDTOUCH_LIBRARIES}
+ )
+ 
++if (PORTAUDIO_FOUND)
++    set(spu2xFinalFlags
++        ${spu2xFinalFlags}
++        "-DSPU2X_PORTAUDIO"
++    )
++
++    LIST(APPEND spu2xFinalSources
++         SndOut_Portaudio.cpp
++    )
++
++    set(spu2xFinalLibs
++        ${spu2xFinalLibs}
++        ${PORTAUDIO_LIBRARIES}
++    )
++endif()
++
+ if (SDL2_API)
+     set(spu2xFinalLibs
+         ${spu2xFinalLibs}
+diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp
+index 998f9bd25a..96a9e7bc8b 100644
+--- a/plugins/spu2-x/src/Linux/Config.cpp
++++ b/plugins/spu2-x/src/Linux/Config.cpp
+@@ -76,7 +76,9 @@ bool _visual_debug_enabled = false; // windows only feature
+ u32 OutputModule = 0;
+ int SndOutLatencyMS = 300;
+ int SynchMode = 0; // Time Stretch, Async or Disabled
++#ifdef SPU2X_PORTAUDIO
+ static u32 OutputAPI = 0;
++#endif
+ static u32 SdlOutputAPI = 0;
+ 
+ int numSpeakers = 0;
+@@ -122,7 +124,7 @@ void ReadSettings()
+ 
+     wxString temp;
+ 
+-#if SDL_MAJOR_VERSION >= 2
++#if SDL_MAJOR_VERSION >= 2 || !defined(SPU2X_PORTAUDIO)
+     CfgReadStr(L"OUTPUT", L"Output_Module", temp, SDLOut->GetIdent());
+ #else
+     CfgReadStr(L"OUTPUT", L"Output_Module", temp, PortaudioOut->GetIdent());
+@@ -130,6 +132,7 @@ void ReadSettings()
+     OutputModule = FindOutputModuleById(temp.c_str()); // find the driver index of this module
+ 
+ // find current API
++#ifdef SPU2X_PORTAUDIO
+ #ifdef __linux__
+     CfgReadStr(L"PORTAUDIO", L"HostApi", temp, L"ALSA");
+     if (temp == L"OSS")
+@@ -142,6 +145,7 @@ void ReadSettings()
+     CfgReadStr(L"PORTAUDIO", L"HostApi", temp, L"OSS");
+     OutputAPI = 0; // L"OSS"
+ #endif
++#endif
+ 
+ #ifdef __unix__
+     CfgReadStr(L"SDL", L"HostApi", temp, L"pulseaudio");
+@@ -158,7 +162,9 @@ void ReadSettings()
+     SndOutLatencyMS = CfgReadInt(L"OUTPUT", L"Latency", 300);
+     SynchMode = CfgReadInt(L"OUTPUT", L"Synch_Mode", 0);
+ 
++#ifdef SPU2X_PORTAUDIO
+     PortaudioOut->ReadSettings();
++#endif
+ #ifdef __unix__
+     SDLOut->ReadSettings();
+ #endif
+@@ -209,7 +215,9 @@ void WriteSettings()
+     CfgWriteInt(L"OUTPUT", L"Synch_Mode", SynchMode);
+     CfgWriteInt(L"DEBUG", L"DelayCycles", delayCycles);
+ 
++#ifdef SPU2X_PORTAUDIO
+     PortaudioOut->WriteSettings();
++#endif
+ #ifdef __unix__
+     SDLOut->WriteSettings();
+ #endif
+@@ -273,7 +281,9 @@ void DisplayDialog()
+ 
+     GtkWidget *output_frame, *output_box;
+     GtkWidget *mod_label, *mod_box;
++#ifdef SPU2X_PORTAUDIO
+     GtkWidget *api_label, *api_box;
++#endif
+ #if SDL_MAJOR_VERSION >= 2
+     GtkWidget *sdl_api_label, *sdl_api_box;
+ #endif
+@@ -309,11 +319,14 @@ void DisplayDialog()
+     mod_label = gtk_label_new("Module:");
+     mod_box = gtk_combo_box_text_new();
+     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "0 - No Sound (Emulate SPU2 only)");
++#ifdef SPU2X_PORTAUDIO
+     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "1 - PortAudio (Cross-platform)");
++#endif
+     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "2 - SDL Audio (Recommended for PulseAudio)");
+     //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "3 - Alsa (probably doesn't work)");
+     gtk_combo_box_set_active(GTK_COMBO_BOX(mod_box), OutputModule);
+ 
++#ifdef SPU2X_PORTAUDIO
+     api_label = gtk_label_new("PortAudio API:");
+     api_box = gtk_combo_box_text_new();
+ #ifdef __linux__
+@@ -325,6 +338,7 @@ void DisplayDialog()
+     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(api_box), "OSS");
+ #endif
+     gtk_combo_box_set_active(GTK_COMBO_BOX(api_box), OutputAPI);
++#endif
+ 
+ #if SDL_MAJOR_VERSION >= 2
+     sdl_api_label = gtk_label_new("SDL API:");
+@@ -383,8 +397,10 @@ void DisplayDialog()
+ 
+     gtk_container_add(GTK_CONTAINER(output_box), mod_label);
+     gtk_container_add(GTK_CONTAINER(output_box), mod_box);
++#ifdef SPU2X_PORTAUDIO
+     gtk_container_add(GTK_CONTAINER(output_box), api_label);
+     gtk_container_add(GTK_CONTAINER(output_box), api_box);
++#endif
+ #if SDL_MAJOR_VERSION >= 2
+     gtk_container_add(GTK_CONTAINER(output_box), sdl_api_label);
+     gtk_container_add(GTK_CONTAINER(output_box), sdl_api_box);
+@@ -430,6 +446,7 @@ void DisplayDialog()
+         if (gtk_combo_box_get_active(GTK_COMBO_BOX(mod_box)) != -1)
+             OutputModule = gtk_combo_box_get_active(GTK_COMBO_BOX(mod_box));
+ 
++#ifdef SPU2X_PORTAUDIO
+         if (gtk_combo_box_get_active(GTK_COMBO_BOX(api_box)) != -1) {
+             OutputAPI = gtk_combo_box_get_active(GTK_COMBO_BOX(api_box));
+ #ifdef __linux__
+@@ -456,6 +473,7 @@ void DisplayDialog()
+             }
+ #endif
+         }
++#endif
+ 
+ #if SDL_MAJOR_VERSION >= 2
+         if (gtk_combo_box_get_active(GTK_COMBO_BOX(sdl_api_box)) != -1) {
+diff --git a/plugins/spu2-x/src/SndOut.cpp b/plugins/spu2-x/src/SndOut.cpp
+index 7963b12b75..6d9d58c2b3 100644
+--- a/plugins/spu2-x/src/SndOut.cpp
++++ b/plugins/spu2-x/src/SndOut.cpp
+@@ -88,7 +88,9 @@ SndOutModule *mods[] =
+         DSoundOut,
+         WaveOut,
+ #endif
++#if defined(_WIN32) || defined(SPU2X_PORTAUDIO)
+         PortaudioOut,
++#endif
+ #if defined(SPU2X_SDL) || defined(SPU2X_SDL2)
+         SDLOut,
+ #endif
+diff --git a/plugins/spu2-x/src/SndOut.h b/plugins/spu2-x/src/SndOut.h
+index ba84075aec..918d9d08ff 100644
+--- a/plugins/spu2-x/src/SndOut.h
++++ b/plugins/spu2-x/src/SndOut.h
+@@ -673,7 +673,9 @@ extern SndOutModule *DSoundOut;
+ extern SndOutModule *XAudio2_27_Out;
+ extern SndOutModule *XAudio2Out;
+ #endif
++#if defined(_WIN32) || defined(SPU2X_PORTAUDIO)
+ extern SndOutModule *PortaudioOut;
++#endif
+ #if defined(SPU2X_SDL) || defined(SPU2X_SDL2)
+ extern SndOutModule *const SDLOut;
+ #endif
diff --git a/games/pcsxr/README b/games/pcsxr/README
index a76c44b256..8f442574b6 100644
--- a/games/pcsxr/README
+++ b/games/pcsxr/README
@@ -1,5 +1,6 @@
-PCSX-Reloaded is a PlayStation Emulator based on PCSX-df Project, with 
-support for both Windows and GNU/Linux as well as many bugfixes and 
+PCSX-Reloaded is a PlayStation Emulator based on PCSX-df Project, with
+support for both Windows and GNU/Linux as well as many bugfixes and
 improvements.
 
-This package conflicts with pcsx-df. Both cannot be installed at the same time!
+This package conflicts with pcsx-df. Both cannot be installed at the
+same time!
diff --git a/games/peg-e/README b/games/peg-e/README
index 48cd409537..d0b4a90be0 100644
--- a/games/peg-e/README
+++ b/games/peg-e/README
@@ -1,4 +1,5 @@
-Peg-E is a peg solitaire game in which you jump over pieces in order to remove
-them from the board, ultimately trying to eliminate all but one. The boards are
-randomly generated, with 100 levels of difficulty. The game auto-saves, and has
-undo-redo capability. Pieces can move horizontally, vertically, and diagonally.
+Peg-E is a peg solitaire game in which you jump over pieces in
+order to remove them from the board, ultimately trying to eliminate
+all but one. The boards are randomly generated, with 100 levels of
+difficulty. The game auto-saves, and has undo-redo capability. Pieces
+can move horizontally, vertically, and diagonally.
diff --git a/games/peg-e/peg-e.SlackBuild b/games/peg-e/peg-e.SlackBuild
index a1b7c98157..71dcea9bbd 100644
--- a/games/peg-e/peg-e.SlackBuild
+++ b/games/peg-e/peg-e.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for peg-e
 
-# Copyright 2012-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2012-2020 Larry Hajali <larryhaja[at]gmail[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=peg-e
-VERSION=${VERSION:-1.2.6}
+VERSION=${VERSION:-1.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/peg-e/peg-e.info b/games/peg-e/peg-e.info
index d11453f87d..7e2b34663e 100644
--- a/games/peg-e/peg-e.info
+++ b/games/peg-e/peg-e.info
@@ -1,8 +1,8 @@
 PRGNAM="peg-e"
-VERSION="1.2.6"
+VERSION="1.2.8"
 HOMEPAGE="https://gottcode.org/peg-e/"
-DOWNLOAD="https://gottcode.org/peg-e/peg-e-1.2.6-src.tar.bz2"
-MD5SUM="001a9d449c47e7dca9c9c93defbaa946"
+DOWNLOAD="https://gottcode.org/peg-e/peg-e-1.2.8-src.tar.bz2"
+MD5SUM="ea2659e5cf6e0d981189cbe2751588df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/games/penguin-command/README b/games/penguin-command/README
index 01f232300e..ee94a3e3eb 100644
--- a/games/penguin-command/README
+++ b/games/penguin-command/README
@@ -1,11 +1,12 @@
 penguin-command (Missile Command clone)
 
-This is a clone of the classic "Missile Command" Game, but it has better
-graphics and music. The gameplay has only been slightly modified. Penguin
-Command is licensed under the GPL.
+This is a clone of the classic "Missile Command" Game, but it has
+better graphics and music. The gameplay has only been slightly
+modified. Penguin Command is licensed under the GPL.
 
-By default, the game runs fullscreen unless you pass it the -w option. If
-you want to patch the code so the game starts in a window by default,
-set WINDOWED=yes in the SlackBuild script's environment. This only
-changes the default, it will still be possible to use the -f option to
-get fullscreen mode, or press Alt-Enter to toggle fullscreen mode.
+By default, the game runs fullscreen unless you pass it the -w
+option. If you want to patch the code so the game starts in a window by
+default, set WINDOWED=yes in the SlackBuild script's environment. This
+only changes the default, it will still be possible to use the -f
+option to get fullscreen mode, or press Alt-Enter to toggle fullscreen
+mode.
diff --git a/games/pentagram/pentagram.info b/games/pentagram/pentagram.info
index 05eb1e3302..a4c27b4de5 100644
--- a/games/pentagram/pentagram.info
+++ b/games/pentagram/pentagram.info
@@ -1,7 +1,7 @@
 PRGNAM="pentagram"
 VERSION="20130617_svn"
 HOMEPAGE="http://pentagram.sourceforge.net/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/pentagram-20130617_svn.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/pentagram-20130617_svn.tar.xz"
 MD5SUM="7786306d42cf27b7f855cbef3f637864"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/picodrive/picodrive.info b/games/picodrive/picodrive.info
index f00e46f12b..ef9a0a5613 100644
--- a/games/picodrive/picodrive.info
+++ b/games/picodrive/picodrive.info
@@ -6,5 +6,5 @@ MD5SUM="c867f2003e3d4a580d5b0e0fe86d0b7a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.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/playonlinux/README b/games/playonlinux/README
index 1f714fe640..0a4af11234 100644
--- a/games/playonlinux/README
+++ b/games/playonlinux/README
@@ -1,14 +1,14 @@
-PlayOnLinux is a graphical front-end for Wine which automatically creates
-a prefix for the application you're trying to install. It manages
-its own wine versions internally, meaning you only have to have some
-version of Wine already already installed as a base and PlayOnLinux
-will automatically download and use whatever Wine version is necessary
-(which can also be specified by the user in the case of manual, unscripted
-installations). POL supports the use of installation scripts which are
-used to automatically install an application and configure Wine to work
-with that application. Dozens of official scripts for various games and
-software already exist, and the POL website has tutorials to instruct
-users on writing their own.
+PlayOnLinux is a graphical front-end for Wine which automatically
+creates a prefix for the application you're trying to install. It
+manages its own wine versions internally, meaning you only have to
+have some version of Wine already already installed as a base and
+PlayOnLinux will automatically download and use whatever Wine version
+is necessary (which can also be specified by the user in the case of
+manual, unscripted installations). POL supports the use of installation
+scripts which are used to automatically install an application and
+configure Wine to work with that application. Dozens of official
+scripts for various games and software already exist, and the POL
+website has tutorials to instruct users on writing their own.
 
 For maximum performance and compatibility, PlayOnLinux should be run on
 a 32-bit system, or on a 64-bit system enabled for multilib, and 32-bit
diff --git a/games/powerslave_demo_data/README b/games/powerslave_demo_data/README
new file mode 100644
index 0000000000..a8d7c2d10a
--- /dev/null
+++ b/games/powerslave_demo_data/README
@@ -0,0 +1,10 @@
+powerslave_demo_data (game data for nblood)
+
+PowerSlave, known as Exhumed in Europe, is a first-person
+shooter developed by Lobotomy Software and published by Playmates
+Interactive. It was released in North America, Europe and Japan, for
+the Sega Saturn, PlayStation, and MS-DOS over the course of a year from
+late 1996 to late 1997.
+
+This build installs the data files required to play the demo version of
+PowerSlave with nblood's "pcexhumed" engine.
diff --git a/games/powerslave_demo_data/powerslave_demo_data.SlackBuild b/games/powerslave_demo_data/powerslave_demo_data.SlackBuild
new file mode 100644
index 0000000000..f699c53cbf
--- /dev/null
+++ b/games/powerslave_demo_data/powerslave_demo_data.SlackBuild
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Slackware build script for powerslave_demo_data
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Supposedly, pcexhumed can play 2 variants of this game: "Exhumed"
+# and "PowerSlave". But I can't get Exhumed to work.
+
+# VERSION is the date of the newest file in the zip (PS.EXE)
+
+PRGNAM=powerslave_demo_data
+VERSION=${VERSION:-19961212}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+SRCNAM=pwrslave
+
+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
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unzip $CWD/$SRCNAM.zip
+chown -R root:root .
+chmod 644 *
+
+GAMEDIR=$PKG/usr/share/games/pcexhumed
+mkdir -p $GAMEDIR
+cp -a STUFF.DAT DEMO.VCR BOOK.MOV $GAMEDIR
+
+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
+
+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/powerslave_demo_data/powerslave_demo_data.info b/games/powerslave_demo_data/powerslave_demo_data.info
new file mode 100644
index 0000000000..8e7aa51de0
--- /dev/null
+++ b/games/powerslave_demo_data/powerslave_demo_data.info
@@ -0,0 +1,10 @@
+PRGNAM="powerslave_demo_data"
+VERSION="19961212"
+HOMEPAGE="http://www.jonof.id.au/build.games/ps"
+DOWNLOAD="http://www.jonof.id.au/files/buildgames/pwrslave.zip"
+MD5SUM="3aeccfc387bc9443a855b6090479724d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="nblood"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/powerslave_demo_data/slack-desc b/games/powerslave_demo_data/slack-desc
new file mode 100644
index 0000000000..d94ec70d7d
--- /dev/null
+++ b/games/powerslave_demo_data/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------------------------------------------------------|
+powerslave_demo_data: powerslave_demo_data (game data for nblood)
+powerslave_demo_data:
+powerslave_demo_data: PowerSlave, known as Exhumed in Europe, is a first-person
+powerslave_demo_data: shooter developed by Lobotomy Software and published by Playmates
+powerslave_demo_data: Interactive. It was released in North America, Europe and Japan,
+powerslave_demo_data: for the Sega Saturn, PlayStation, and MS-DOS over the course of a
+powerslave_demo_data: year from late 1996 to late 1997.
+powerslave_demo_data:
+powerslave_demo_data: This package installs the data files required to play the demo
+powerslave_demo_data: version of PowerSlave with nblood's "pcexhumed" engine.
+powerslave_demo_data:
diff --git a/games/ppsspp/README b/games/ppsspp/README
index fb8d1b3f87..addf8a0eb8 100644
--- a/games/ppsspp/README
+++ b/games/ppsspp/README
@@ -2,13 +2,13 @@ PPSSPP can run your PSP games on your PC in full HD resolution. It can
 even upscale textures that would otherwise be too blurry as they were
 made for the small screen of the original PSP.
 
-* Play in HD resolutions and more
-* Play on a tablet for big-screen mobile gaming
-* Customize on-screen touch controls or use an external controller or keyboard
-* Save and restore game state anywhere, anytime
-* Crank up the anisotropic filtering and texture scaling
-* Continue where you left off by transferring saves from your real PSP
+* Play in HD resolutions and more * Play on a tablet for big-screen
+mobile gaming * Customize on-screen touch controls or use an external
+controller or keyboard * Save and restore game state anywhere, anytime
+* Crank up the anisotropic filtering and texture scaling * Continue
+where you left off by transferring saves from your real PSP
 
 snappy is an optional dependency.
 
-This builds the application and the Libretro core (for use with RetroArch).
+QT=on will enable QT GUI and require qt5 installed (default is
+'QT=off').
diff --git a/games/ppsspp/ppsspp-qt.desktop b/games/ppsspp/ppsspp-qt.desktop
index e89a5f950f..4bdd11d58a 100644
--- a/games/ppsspp/ppsspp-qt.desktop
+++ b/games/ppsspp/ppsspp-qt.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
-Name=ppsspp-qt
-Exec=ppsspp-qt
+Version=1.0
+Name=PPSSPP (Qt)
+Exec=ppsspp-qt %f
 Icon=ppsspp
 Type=Application
+GenericName=PSP Emulator
 Comment=ppsspp (fast and portable PSP emulator)
 Categories=Game
diff --git a/games/ppsspp/ppsspp.SlackBuild b/games/ppsspp/ppsspp.SlackBuild
index 67f04c3335..48a9237578 100644
--- a/games/ppsspp/ppsspp.SlackBuild
+++ b/games/ppsspp/ppsspp.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for ppsspp
 
 # Copyright 2016  Hunter Sezen California, USA
+# Copyright 2019-2020  Ruoh-Shoei LIN
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +23,14 @@
 #  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.6.3}
+VERSION=${VERSION:-1.10.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,13 +72,20 @@ cd $PRGNAM-$VERSION
 
 # The submodules are in a separate archive. This is equivalent to
 # git submodule update --init --recursive
-tar xvf $CWD/${PRGNAM}_submodules-${VERSION}.tar.xz
-mv ${PRGNAM}_submodules-${VERSION}/ext/* ext
-rmdir ${PRGNAM}_submodules-${VERSION}/ext
-mv ${PRGNAM}_submodules-${VERSION}/assets/* assets
-rmdir ${PRGNAM}_submodules-${VERSION}/assets
-mv ${PRGNAM}_submodules-${VERSION}/* .
-rmdir ${PRGNAM}_submodules-${VERSION}
+tar -xvf $CWD/glslang-d0850f8*.tar.gz \
+    -C ext/glslang --strip-components=1
+tar -xvf $CWD/ppsspp-lang-1c64b8f*.tar.gz \
+    -C assets/lang --strip-components=1
+tar -xvf $CWD/SPIRV-Cross-a1f7c8d*.tar.gz \
+    -C ext/SPIRV-Cross --strip-components=1
+tar -xvf $CWD/armips-7885552*.tar.gz \
+    -C ext/armips --strip-components=1
+tar -xvf $CWD/ppsspp-ffmpeg-55147e5*.tar.gz \
+    --exclude '*/Windows*' --exclude '*/android' \
+    --exclude '*/ios' --exclude '*/blackberry'\
+    --exclude '*/macosx' --exclude '*/wiiu' \
+    --exclude '*/symbian' \
+    -C ffmpeg --strip-components=1
 
 chown -R root:root .
 find -L . \
@@ -86,38 +100,58 @@ sed -i 's/VERSION 3.6/VERSION 3.5.2/' CMakeLists.txt
 # Don't force explicit ccache invocation.
 sed -i -e '/include(ccache)/d' CMakeLists.txt
 
-mkdir -p build
-cd build
+# set git-version
+sed -i "s/unknown/${VERSION}/" git-version.cmake
+
+mkdir -p build-qt build-sdl
+
+QT=${QT:-off}
+if [ "$QT" = "on" ]; then
+    cd build-qt
+    cmake \
+	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_SKIP_RPATH=TRUE \
+	-Wno-dev \
+	-DUSING_QT_UI=ON \
+	-DUSE_SYSTEM_LIBZIP=ON \
+	-DUSE_DISCORD=OFF \
+	-DCMAKE_BUILD_TYPE=Release ..
+    make
+    cd ..
+    install -Dm755 build-qt/PPSSPPQt $PKG/usr/games/ppsspp-qt
+    install -Dm644 $CWD/ppsspp-qt.desktop $PKG/usr/share/applications/ppsspp-qt.desktop
+fi
+
+cd build-sdl
 cmake \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DCMAKE_SKIP_RPATH=TRUE \
   -Wno-dev \
-  -DUSING_QT_UI=ON \
-  -DLIBRETRO=ON \
+  -DUSING_QT_UI=OFF \
+  -DHEADLESS='ON' \
+  -DUSE_SYSTEM_LIBZIP=ON \
+  -DUSE_DISCORD=OFF \
   -DCMAKE_BUILD_TYPE=Release ..
 make
 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
+install -Dm755 build-sdl/PPSSPPHeadless $PKG/usr/games/ppsspp-headless
+install -Dm755 build-sdl/PPSSPPSDL $PKG/usr/games/ppsspp-sdl
 
 mkdir -p $PKG/usr/{games,share/{applications,icons/hicolor,pixmaps,ppsspp}}
-cp $CWD/ppsspp.desktop $PKG/usr/share/applications
+install -Dm644 $CWD/ppsspp.desktop $PKG/usr/share/applications/ppsspp.desktop
 cp -r assets $PKG/usr/share/ppsspp
 cp -r icons/hicolor/* $PKG/usr/share/icons/hicolor
 cp icons/icon-512.svg $PKG/usr/share/pixmaps/ppsspp.svg
 
-cp build/PPSSPPQt $PKG/usr/games/ppsspp-qt
-cp $CWD/ppsspp-qt.desktop $PKG/usr/share/applications
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/libretro/info
-cp build/lib/ppsspp_libretro.so $PKG/usr/lib${LIBDIRSUFFIX}/libretro
-cp $CWD/ppsspp_libretro.info $PKG/usr/lib${LIBDIRSUFFIX}/libretro/info
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.TXT README.md korean.txt chinese.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -v LICENSE.TXT README.md history.md headless/headless.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/ppsspp/ppsspp.desktop b/games/ppsspp/ppsspp.desktop
index 74dd7f4cde..63e50e308a 100644
--- a/games/ppsspp/ppsspp.desktop
+++ b/games/ppsspp/ppsspp.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
-Name=ppsspp
-Exec=ppsspp
+Version=1.0
+Name=PPSSPP (SDL)
+Exec=ppsspp-sdl %f
 Icon=ppsspp
 Type=Application
+GenericName=PSP Emulator
 Comment=ppsspp (fast and portable PSP emulator)
 Categories=Game
diff --git a/games/ppsspp/ppsspp.info b/games/ppsspp/ppsspp.info
index 9236266435..3021609a00 100644
--- a/games/ppsspp/ppsspp.info
+++ b/games/ppsspp/ppsspp.info
@@ -1,14 +1,20 @@
 PRGNAM="ppsspp"
-VERSION="1.6.3"
-HOMEPAGE="http://www.ppsspp.org/"
-DOWNLOAD="https://github.com/hrydgard/ppsspp/archive/v1.6.3/ppsspp-1.6.3.tar.gz \
-          https://downloads.sourceforge.net/project/slackbuildsdirectlinks/ppsspp/ppsspp_submodules-1.6.3.tar.xz \
-          https://raw.githubusercontent.com/libretro/libretro-super/263e116/dist/info/ppsspp_libretro.info"
-MD5SUM="fc667ad6fe5e9c16cc13bbc64da1c99f \
-        0262021e692e0f7ed9ad1ea4cd7c458a \
-        69d0a6ac19d4608225407dff8eb13fa6"
+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/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"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2 qt5"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+REQUIRES="SDL2 python3"
+MAINTAINER="Ruoh-Shoei LIN"
+EMAIL="lin.ruohshoei [at] gmail [dot] com"
diff --git a/games/prboom-plus/README b/games/prboom-plus/README
index 43eafc4b0e..b42063184f 100644
--- a/games/prboom-plus/README
+++ b/games/prboom-plus/README
@@ -1,12 +1,20 @@
-PrBoom+ is a Doom source port developed from the original PrBoom project.
+prboom-plus (Doom source port)
 
-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.
+PrBoom+ is a Doom source port developed from the original PrBoom
+project.
 
-FluidSynth, needed for soundfont support, is an  optional dependency.
+Features uncapped framerate, widescreen aspect ratios, soundfont
+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 /usr/share/games/doom.
+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
+/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 2ac6a047c3..aa14bfb9c2 100644
--- a/games/prboom-plus/prboom-plus.SlackBuild
+++ b/games/prboom-plus/prboom-plus.SlackBuild
@@ -2,16 +2,35 @@
 
 # Slackware build script for prboom-plus
 
-# Written by Dugan Chen (thedoogster@gmail.com)
+# Originally written by Dugan Chen (email removed)
+# Modified and now maintained by B. Watson <yalhcru@gmail.com>.
+# 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
+# - switch to coelckers github fork, since it's maintained
+# - SDL2_* now required
+# - install desktop, icon, bash completion
+# - game binaries in /usr/games
 
 PRGNAM=prboom-plus
-VERSION=${VERSION:-2.5.1.4}
+VERSION=${VERSION:-2.6um}
 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 +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"
@@ -38,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
@@ -45,39 +75,41 @@ 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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --build=$ARCH-slackware-linux \
-  --datarootdir=/usr \
-  --enable-gl
-
-make
-make install DESTDIR=$PKG
-
-# Configure script insists on putting docs in /usr/share/doc, even when told not to.
-mv $PKG/usr/share/doc $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
-
-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 \
-  doc/ AUTHORS COPYING INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+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
+
+# 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?/*.?
+
+# desktop/icon/completion included in tarball but not installed
+mkdir -p $PKG/usr/share/applications \
+         $PKG/usr/share/icons/hicolor/scalable/apps \
+         $PKG/usr/share/bash-completion/completions
+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
+
+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 450e3d6e19..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.4"
+VERSION="2.6um"
 HOMEPAGE="http://prboom-plus.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/prboom-plus/prboom-plus/2.5.1.4/prboom-plus-2.5.1.4.tar.gz"
-MD5SUM="eff7878d4542259a2bd6b2fef79962ca"
+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=""
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster@gmail.com"
+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/prboom/README b/games/prboom/README
index cee6080859..34d67fb062 100644
--- a/games/prboom/README
+++ b/games/prboom/README
@@ -1,7 +1,8 @@
-PrBoom is a modern doom game engine or "doom-port" to play id Software's Doom,
-Doom II, Doom expansion packs and custom "iwads" or mods (It doesn't include
-the game itself). It aims to be the most stable Doom port with the highest
-compatibility to the major Doom versions.
+PrBoom is a modern doom game engine or "doom-port" to play id
+Software's Doom, Doom II, Doom expansion packs and custom "iwads"
+or mods (It doesn't include the game itself). It aims to be the most
+stable Doom port with the highest compatibility to the major Doom
+versions.
 
 If you don't own any of the Doom games, get the shareware doom1.wad from
 http://www.libsdl.org/projects/doom/data/doom1.wad.zip, unzip it, and
diff --git a/games/prosystem-libretro/README b/games/prosystem-libretro/README
index 477578d986..a627965199 100644
--- a/games/prosystem-libretro/README
+++ b/games/prosystem-libretro/README
@@ -1,7 +1,8 @@
-ProSystem is an Atari 7800 video game system emulator that can be used as a
-libretro core.
+ProSystem is an Atari 7800 video game system emulator that can be used
+as a libretro core.
 
-ProSystem optionally supports using the following BIOS image file for operation:
+ProSystem optionally supports using the following BIOS image file for
+operation:
 
 * 7800 BIOS (U).rom (Atari 7800 BIOS)
 
diff --git a/games/prosystem-libretro/prosystem-libretro.info b/games/prosystem-libretro/prosystem-libretro.info
index 7c76c098c4..ab65affd24 100644
--- a/games/prosystem-libretro/prosystem-libretro.info
+++ b/games/prosystem-libretro/prosystem-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="1e44cac327e0235df0e20b57f9790b69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
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/pushover/README b/games/pushover/README
index e0bb0a4311..7fe4030e3e 100644
--- a/games/pushover/README
+++ b/games/pushover/README
@@ -1,4 +1,4 @@
-Pushover is a puzzle game originally published by Ocean in 1992. In this
-game, you control an ant that can walk along platforms that are connected
-with ladders. On those platforms are dominos that need to fall according
-to some rules.
+Pushover is a puzzle game originally published by Ocean in 1992. In
+this game, you control an ant that can walk along platforms that are
+connected with ladders. On those platforms are dominos that need to
+fall according to some rules.
diff --git a/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.info b/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.info
index 7f5f1a1e6a..c49fad4f23 100644
--- a/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.info
+++ b/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.info
@@ -2,7 +2,7 @@ PRGNAM="pysolfc-extra-cardsets"
 VERSION="2.0"
 HOMEPAGE="https://pysolfc.sourceforge.net"
 DOWNLOAD="https://downloads.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2 \
-          http://urchlay.naptime.net/~urchlay/src/pysolfc-cardsets-bknoll.tar.xz"
+          https://slackware.uk/~urchlay/src/pysolfc-cardsets-bknoll.tar.xz"
 MD5SUM="0ce4aa6801196f9166815b244aeea47e \
         35e3df2c464019167377dc35d5d8354e"
 DOWNLOAD_x86_64=""
diff --git a/games/pysolfc/README b/games/pysolfc/README
index d1f64a5d05..e170010803 100644
--- a/games/pysolfc/README
+++ b/games/pysolfc/README
@@ -1,16 +1,17 @@
 pysolfc (solitaire card game suite)
 
-PySolFC (PySol Fanclub Edition) is a solitaire suite containing over 1000
-individual games.
+PySolFC (PySol Fanclub Edition) is a solitaire suite containing over
+1000 individual games.
 
 There are games that use the 52 card International Pattern deck,
 games for the 78 card Tarock deck, eight and ten suite Ganjifa games,
 Hanafuda games, Matrix games, Mahjongg games, and games for an original
-hexadecimal-based deck. PySolFC features a modern look and feel, multiple
-cardsets and backgrounds, sound, unlimited undo, player statistics,
-and much more.
+hexadecimal-based deck. PySolFC features a modern look and feel,
+multiple cardsets and backgrounds, sound, unlimited undo, player
+statistics, and much more.
 
-PySolFC comes with several different cardsets, but there are many optional
-cardsets available. These can be found in games/pysolfc-extra-cardsets.
+PySolFC comes with several different cardsets, but there
+are many optional cardsets available. These can be found in
+games/pysolfc-extra-cardsets.
 
 PySolFC is distributed under the terms of the GNU GPL.
diff --git a/games/qtads/README b/games/qtads/README
index 1a2804a78b..d04031da8f 100644
--- a/games/qtads/README
+++ b/games/qtads/README
@@ -1,13 +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
-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.
+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/qtsixa/README b/games/qtsixa/README
index b6cb594d20..2cafcb5d23 100644
--- a/games/qtsixa/README
+++ b/games/qtsixa/README
@@ -2,20 +2,21 @@ QtSixA is the Sixaxis Joystick Manager. It can connect PS3 hardware
 (Sixaxis/DualShock3 and Keypads) to a Linux-compatible machine.
 Currently it supports Sixaxis buttons, axis, accelerometers and LEDs.
 
-Some patches thankfully taken from https://aur.archlinux.org/packages/qtsixa/.
+Some patches thankfully taken from:
+https://aur.archlinux.org/packages/qtsixa/.
 
 Notes:
 
-Be sure you are using a Bluetooth dongle with a HCI version higher than 1.1
-by using `hciconfig default version | grep HCI`.
+Be sure you are using a Bluetooth dongle with a HCI version higher
+than 1.1 by using `hciconfig default version | grep HCI`.
 
-Please note that due to the behaviour of "sixpair" and a replaced "hidd",
-the stock Bluetooth stack is getting disabled while running and no other
-Bluetooth devices will work, until the "replaced" hidd is disabled again
-from `sh /etc/rc.d/rc.sixad stop`.
+Please note that due to the behaviour of "sixpair" and a replaced
+"hidd", the stock Bluetooth stack is getting disabled while running
+and no other Bluetooth devices will work, until the "replaced" hidd is
+disabled again from `sh /etc/rc.d/rc.sixad stop`.
 
-In case something like `kdesu` is not installed, you need to run `qtsixa`
-with root rights.
+In case something like `kdesu` is not installed, you need to run
+`qtsixa` with root rights.
 
 Steps:
 
diff --git a/games/quakeforge/README b/games/quakeforge/README
index b5a8935356..5516aac839 100644
--- a/games/quakeforge/README
+++ b/games/quakeforge/README
@@ -1,8 +1,8 @@
 QuakeForge is a source port of id Software's Quake I.
 
-You will need at least pak0.pak to play the shareware version, and pak1.pak to
-play the full game. These can be added to either ~/.quakeforge/id1 or
-/usr/share/games/quakeforge/id1/.
+You will need at least pak0.pak to play the shareware version,
+and pak1.pak to play the full game. These can be added to either
+~/.quakeforge/id1 or /usr/share/games/quakeforge/id1/.
 
 Note: You may have to manually specify the resolution for OpenGL clients
 e.g. nq-glx -width 1024 -height 768 -fullscreen
diff --git a/games/quarry/README b/games/quarry/README
new file mode 100644
index 0000000000..a0b2fad9dc
--- /dev/null
+++ b/games/quarry/README
@@ -0,0 +1,7 @@
+Quarry is a universal board game interface program. At present it
+supports three games: Go, Amazons and Reversi. It is intended to be
+useful for both users and developers of game engines (i.e. programs
+that play board games).
+
+Quarry uses are currently limited to playing against a computer
+program (e.g. GNU Go) and browsing and editing SGF game records.
diff --git a/games/quarry/doinst.sh b/games/quarry/doinst.sh
new file mode 100644
index 0000000000..8211abc687
--- /dev/null
+++ b/games/quarry/doinst.sh
@@ -0,0 +1,6 @@
+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/games/quarry/quarry.SlackBuild b/games/quarry/quarry.SlackBuild
new file mode 100644
index 0000000000..484221ba98
--- /dev/null
+++ b/games/quarry/quarry.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for Quarry.
+
+# Copyright 2020 Roman Kodinets <rkodinets@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=quarry
+VERSION=${VERSION:-0.3.0.1}
+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/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -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 {} \;
+
+# Fix linking errors
+find './src/' -type f -name '*.h' -exec sed -i 's/^inline //g' {} \;
+# Do not try to build German help files (fixes install error)
+sed -i 's/^\(SUBDIRS = C\) de/\1/' './help/Makefile.in'
+# Do not try to update mime/desktop database from Makefile (do it from doinst.sh instead)
+sed -i '/\$(MAKE).*hook/d' './data/Makefile.in'
+# Fix desktop file contents
+sed -i 's/^\(Icon=.*\)\.png$/\1/;\/^Version/d;s/^\(Categories=\)Application;/\1/' './data/quarry.desktop.in'
+
+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 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 AUTHORS COPYING* ChangeLog 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
+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/quarry/quarry.info b/games/quarry/quarry.info
new file mode 100644
index 0000000000..72aa79ec67
--- /dev/null
+++ b/games/quarry/quarry.info
@@ -0,0 +1,10 @@
+PRGNAM="quarry"
+VERSION="0.3.0.1"
+HOMEPAGE="http://home.gna.org/quarry/"
+DOWNLOAD="https://github.com/ejona86/quarry/archive/0.3.0.1/quarry-0.3.0.1.tar.gz"
+MD5SUM="3c05c4b51d77114d0be2400647340737"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Roman Kodinets"
+EMAIL="rkodinets@gmail.com"
diff --git a/games/quarry/slack-desc b/games/quarry/slack-desc
new file mode 100644
index 0000000000..7d5e10d925
--- /dev/null
+++ b/games/quarry/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------------------------------------------------------|
+quarry: quarry (a universal board game interface program)
+quarry:
+quarry: Quarry is a universal board game interface program. At present it
+quarry: supports three games: Go, Amazons and Reversi. It is intended to be
+quarry: useful for both users and developers of game engines (i.e. programs
+quarry: that play board games).
+quarry:
+quarry: Quarry uses are currently limited to playing against a computer
+quarry: program (e.g. GNU Go) and browsing and editing SGF game records.
+quarry:
+quarry:
diff --git a/games/qxw/README b/games/qxw/README
index 371b3d09f8..8ff3528602 100644
--- a/games/qxw/README
+++ b/games/qxw/README
@@ -6,9 +6,15 @@ mirror symmetries as well as 'left-and-right' and 'up-and-down'.
 Interactive or fully automatic filling of whole or partial grid - and
 lots, lots more.
 
-NOTE:  If you wish to include the qxw-guide.[version].pdf in the package,
-download from http://www.quinapalus.com/qxw.html and add
-the file to your Qxw SlackBuild directory (where this file is).
-It will automatically be added to the SBo package.
+NOTE:  If you wish to include the qxw-guide.[version].pdf in the
+package, download from http://www.quinapalus.com/qxw.html and add the
+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/qzdl/qzdl.SlackBuild b/games/qzdl/qzdl.SlackBuild
index bb793949d5..269e7488fd 100644
--- a/games/qzdl/qzdl.SlackBuild
+++ b/games/qzdl/qzdl.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for qzdl
 #
-# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2015 Gethyn ThomasQuail <email removed>
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Based on:
@@ -25,6 +26,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200416 bkw:
+# - take over maintenance
+# - binaries in /usr/games
+# - symlink icon to /usr/share/icons
+# - various tweaks
+
 PRGNAM=qzdl
 VERSION=${VERSION:-3.2.2.3}
 BUILD=${BUILD:-2}
@@ -66,13 +73,7 @@ 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 {} \;
 
-# Let's compile!
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -85,17 +86,17 @@ find -L . \
 
 make
 
-# Makes bin directory and copies over executable
-mkdir -p $PKG/usr/bin
-cp -a zdl $PKG/usr/bin
+mkdir -p $PKG/usr/games
+install -s -m0755 zdl $PKG/usr/games
+ln -s zdl $PKG/usr/games/$PRGNAM
 
-# Makes desktop file related directories
-mkdir -p $PKG/usr/share/applications
-mkdir -p $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/share/applications \
+         $PKG/usr/share/pixmaps \
+         $PKG/usr/share/icons/hicolor/scalable/apps
 
-# Copies over desktop file and icon
 cp $CWD/qzdl.desktop $PKG/usr/share/applications
 cp -a res/zdl3.svg $PKG/usr/share/pixmaps
+ln -s ../../../../pixmaps/zdl3.svg $PKG/usr/share/icons/hicolor/scalable/apps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS CHANGELOG LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/qzdl/qzdl.info b/games/qzdl/qzdl.info
index afc05874c7..640628cd7a 100644
--- a/games/qzdl/qzdl.info
+++ b/games/qzdl/qzdl.info
@@ -6,5 +6,5 @@ MD5SUM="50e61034d288d57ab3aecbd03dcf946a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@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/rezerwar/README b/games/rezerwar/README
index f900db9baf..58c5517c0a 100644
--- a/games/rezerwar/README
+++ b/games/rezerwar/README
@@ -1,5 +1,6 @@
-Rezerwar is a puzzle game that could be quickly described as the illegitimate 
-child of a known tetromino game and a pipe game.  I adopted this bastard child
-and tried to give it some life.  The goal of this game is to basically create 
-networks of water and make them disappear, a couple tricks and techniques will
-help you achieve this goal faster.
+Rezerwar is a puzzle game that could be quickly described as
+the illegitimate child of a known tetromino game and a pipe game.
+I adopted this bastard child and tried to give it some life.  The goal
+of this game is to basically create networks of water and make them
+disappear, a couple tricks and techniques will help you achieve this
+goal faster.
diff --git a/games/roll/slack-desc b/games/roll/slack-desc
index 94ea7bdee1..8a23c4900c 100644
--- a/games/roll/slack-desc
+++ b/games/roll/slack-desc
@@ -16,3 +16,4 @@ roll:
 roll: Homepage: http://matteocorti.github.io/roll/
 roll:
 roll:
+roll:
diff --git a/games/rott/README b/games/rott/README
index c47d15054d..0b0bbfe3c9 100644
--- a/games/rott/README
+++ b/games/rott/README
@@ -7,15 +7,15 @@ life-preserving armor, traps and ambushes galore.
 
 WARNING: Rise of the Triad features wanton and gratuitous violence.
 
-In order to play the game, you need the data files from either the retail
-or shareware (demo) version of the game. See README_gamedata.txt for
-details. If you want to include the shareware game data in your Slackware
-package, download the file http://icculus.org/rott/share/1rott13.zip
-and place it in the directory with the SlackBuild script, before running
-the script.
+In order to play the game, you need the data files from
+either the retail or shareware (demo) version of the game. See
+README_gamedata.txt for details. If you want to include the
+shareware game data in your Slackware package, download the file
+http://icculus.org/rott/share/1rott13.zip and place it in the directory
+with the SlackBuild script, before running the script.
 
-Multiplayer games (aka comm-bat) are NOT truly supported: you can start up
-a comm-bat game, but you can only play by yourself (no actual networking
-code exists in this version of the game).
+Multiplayer games (aka comm-bat) are NOT truly supported: you can
+start up a comm-bat game, but you can only play by yourself (no actual
+networking code exists in this version of the game).
 
 For more information, see http://www.3drealms.com/rott/
diff --git a/games/sauerbraten/README b/games/sauerbraten/README
index 5469e427a9..34d6b1835d 100644
--- a/games/sauerbraten/README
+++ b/games/sauerbraten/README
@@ -1,5 +1,6 @@
-Sauerbraten is a networked fast-paced 3D first person first-person shooter
-game. It supports rather modern graphic effects and a some nice graphic
-details. The game client also works as the map editor. It is even possible 
-to create and/or edit a map together with other people over a network
-connection. This package installs the game client and map editor.
+Sauerbraten is a networked fast-paced 3D first person first-person
+shooter game. It supports rather modern graphic effects and a some nice
+graphic details. The game client also works as the map editor. It is
+even possible to create and/or edit a map together with other people
+over a network connection. This package installs the game client and
+map editor.
diff --git a/games/scummvm-libretro/scummvm-libretro.info b/games/scummvm-libretro/scummvm-libretro.info
index d26b2f8a5d..26b7e8caf2 100644
--- a/games/scummvm-libretro/scummvm-libretro.info
+++ b/games/scummvm-libretro/scummvm-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="9ef0f055c8a94708f7d2137084df473c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/scummvm/fix-fluidsynth2-build.diff b/games/scummvm/fix-fluidsynth2-build.diff
new file mode 100644
index 0000000000..db7edcd335
--- /dev/null
+++ b/games/scummvm/fix-fluidsynth2-build.diff
@@ -0,0 +1,27 @@
+diff -Naur scummvm-2.1.2/audio/softsynth/fluidsynth.cpp scummvm-2.1.2.patched/audio/softsynth/fluidsynth.cpp
+--- scummvm-2.1.2/audio/softsynth/fluidsynth.cpp	2020-03-30 18:32:51.000000000 -0400
++++ scummvm-2.1.2.patched/audio/softsynth/fluidsynth.cpp	2020-04-11 17:40:39.247407731 -0400
+@@ -20,10 +20,13 @@
+  *
+  */
+ 
+-#include "common/scummsys.h"
++#include "config.h"
+ 
+ #ifdef USE_FLUIDSYNTH
+ 
++#include <fluidsynth.h>
++
++#include "common/scummsys.h"
+ #include "common/config-manager.h"
+ #include "common/error.h"
+ #include "common/system.h"
+@@ -35,8 +38,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
+-#include <fluidsynth.h>
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];
diff --git a/games/scummvm/scummvm.SlackBuild b/games/scummvm/scummvm.SlackBuild
index 1a54e58fe9..c0a8a400f7 100644
--- a/games/scummvm/scummvm.SlackBuild
+++ b/games/scummvm/scummvm.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scummvm
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,8 +72,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 {} \;
 
+# 20200411 bkw: This is necessary for fluidsynth-2.x. Based on upstream's
+# git commit 68758a87.
+patch -p1 < $CWD/fix-fluidsynth2-build.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="-fuse-ld=gold" \
 ./configure \
   --prefix=/usr \
   --bindir=/usr/games \
diff --git a/games/scummvm/scummvm.info b/games/scummvm/scummvm.info
index afe8aaddfc..bb2af9ad60 100644
--- a/games/scummvm/scummvm.info
+++ b/games/scummvm/scummvm.info
@@ -1,8 +1,8 @@
 PRGNAM="scummvm"
-VERSION="2.1.1"
+VERSION="2.1.2"
 HOMEPAGE="https://www.scummvm.org/"
-DOWNLOAD="https://www.scummvm.org/frs/scummvm/2.1.1/scummvm-2.1.1.tar.xz"
-MD5SUM="d75fec6358f7814b47d6aca5e18c9863"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/scummvm-2.1.2.tar.xz"
+MD5SUM="dd680a1f0f3a6745bf3a8033167ee778"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/sdlpop/sdlpop.SlackBuild b/games/sdlpop/sdlpop.SlackBuild
index c07308feec..d9940fac0c 100644
--- a/games/sdlpop/sdlpop.SlackBuild
+++ b/games/sdlpop/sdlpop.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200927 bkw: updated for v1.21.
 # 20191127 bkw: updated for v1.20.
 # 20180611 bkw: updated for v1.20.
 # 20170316 bkw:
@@ -17,7 +18,7 @@
 # - update wrapper script to support both system-wide and per-user mods.
 
 PRGNAM=sdlpop
-VERSION=${VERSION:-1.20}
+VERSION=${VERSION:-1.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/sdlpop/sdlpop.info b/games/sdlpop/sdlpop.info
index 23dbe86615..0ae0fe4415 100644
--- a/games/sdlpop/sdlpop.info
+++ b/games/sdlpop/sdlpop.info
@@ -1,8 +1,8 @@
 PRGNAM="sdlpop"
-VERSION="1.20"
+VERSION="1.21"
 HOMEPAGE="http://www.popot.org/get_the_games.php?game=SDLPoP"
-DOWNLOAD="https://github.com/NagyD/SDLPoP/archive/v1.20/SDLPoP-1.20.zip"
-MD5SUM="1e0961be9c8de62c9008b80f5b74d070"
+DOWNLOAD="https://github.com/NagyD/SDLPoP/archive/v1.21/SDLPoP-1.21.zip"
+MD5SUM="9bf414e82ed313f61be02a25ef88c92b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_mixer SDL2_image"
diff --git a/games/smc/smc.info b/games/smc/smc.info
index c55e4291f0..b4808cd15a 100644
--- a/games/smc/smc.info
+++ b/games/smc/smc.info
@@ -1,7 +1,7 @@
 PRGNAM="smc"
 VERSION="20140328"
 HOMEPAGE="http://www.secretmaryo.org/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/smc-20140328.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/smc-20140328.tar.gz"
 MD5SUM="a0d2e7a20d93badf2708baabcaabedba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/smokinguns/smokinguns.SlackBuild b/games/smokinguns/smokinguns.SlackBuild
index 08884d004b..9aa9c9cac6 100644
--- a/games/smokinguns/smokinguns.SlackBuild
+++ b/games/smokinguns/smokinguns.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for smokinguns
 
-# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
+# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/games/snes9x2010/README b/games/snes9x2010/README
index f4de9dc55a..f71e265395 100644
--- a/games/snes9x2010/README
+++ b/games/snes9x2010/README
@@ -1,9 +1,9 @@
-snes9x2010 is a Super Nintendo video game system emulator that can be used as
-a libretro core.
+snes9x2010 is a Super Nintendo video game system emulator that can be
+used as a libretro core.
 
-snes9x2010 is a Super Nintendo Entertainment System (SNES) emulator based on
-Snes9x 1.52 with backported patches for performance and compatibility
-improvements.
+snes9x2010 is a Super Nintendo Entertainment System (SNES) emulator
+based on Snes9x 1.52 with backported patches for performance and
+compatibility improvements.
 
 This package was previously called snes9x-next.
 
diff --git a/games/snes9x2010/snes9x2010.SlackBuild b/games/snes9x2010/snes9x2010.SlackBuild
index 4a89a5c969..634bc6842c 100644
--- a/games/snes9x2010/snes9x2010.SlackBuild
+++ b/games/snes9x2010/snes9x2010.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for snes9x2010
 
 # Copyright 2016-2018 Hunter Sezen California, USA
+# Copyright 2020 ilmich < ardutu at gmail dot com >
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +25,7 @@
 
 PRGNAM=snes9x2010
 LIBNAM=${PRGNAM}_libretro
-VERSION=${VERSION:-2018.10.11_d857a31}
+VERSION=${VERSION:-2020.05.18_187e2b5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/snes9x2010/snes9x2010.info b/games/snes9x2010/snes9x2010.info
index c84d731177..9566ba2b62 100644
--- a/games/snes9x2010/snes9x2010.info
+++ b/games/snes9x2010/snes9x2010.info
@@ -1,10 +1,10 @@
 PRGNAM="snes9x2010"
-VERSION="2018.10.11_d857a31"
+VERSION="2020.05.18_187e2b5"
 HOMEPAGE="https://www.libretro.com/"
-DOWNLOAD="http://slackless.raccoons.tech/src/libretro/snes9x2010-2018.10.11_d857a31.tar.xz"
-MD5SUM="ddc7e21f49601268375a1b296950efdf"
+DOWNLOAD="https://ilmich.github.io/src/snes9x2010-2020.05.18_187e2b5.tar.xz"
+MD5SUM="c93a209cdafe0954062d2a637d9f47f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="ilmich"
+EMAIL="ardutu@gmail.com"
diff --git a/games/solarus-quest-editor/qt-5.15.patch b/games/solarus-quest-editor/qt-5.15.patch
new file mode 100644
index 0000000000..05f91b101c
--- /dev/null
+++ b/games/solarus-quest-editor/qt-5.15.patch
@@ -0,0 +1,25 @@
+From 81d5c7f1602cf355684d70a5e3449fefccfc44b8 Mon Sep 17 00:00:00 2001
+From: Hugo Hromic <hhromic@gmail.com>
+Date: Mon, 1 Jun 2020 18:45:16 +0100
+Subject: [PATCH] Add missing include directive for QPainterPath
+
+* Not implicit anymore since Qt 5.15
+---
+ src/entities/jumper.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/entities/jumper.cpp b/src/entities/jumper.cpp
+index 5d4b31e0..edd38fa9 100644
+--- a/src/entities/jumper.cpp
++++ b/src/entities/jumper.cpp
+@@ -17,6 +17,7 @@
+ #include "entities/jumper.h"
+ #include "map_model.h"
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ namespace SolarusEditor {
+ 
+-- 
+GitLab
+
diff --git a/games/solarus-quest-editor/solarus-quest-editor.SlackBuild b/games/solarus-quest-editor/solarus-quest-editor.SlackBuild
index 4242ab626e..be49584f04 100644
--- a/games/solarus-quest-editor/solarus-quest-editor.SlackBuild
+++ b/games/solarus-quest-editor/solarus-quest-editor.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for solarus-quest-editor
 
-# 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=solarus-quest-editor
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +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 {} \;
 
+# Add missing include directive for QPainterPath
+# https://gitlab.com/solarus-games/solarus-quest-editor/-/merge_requests/421
+# https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/81d5c7f1602cf355684d70a5e3449fefccfc44b8
+patch -p1 < $CWD/qt-5.15.patch
+
 mkdir -p build
 cd build
   cmake \
diff --git a/games/solarus-quest-editor/solarus-quest-editor.info b/games/solarus-quest-editor/solarus-quest-editor.info
index 4cb0fecaa1..b63f110578 100644
--- a/games/solarus-quest-editor/solarus-quest-editor.info
+++ b/games/solarus-quest-editor/solarus-quest-editor.info
@@ -1,10 +1,10 @@
 PRGNAM="solarus-quest-editor"
-VERSION="1.6.2"
+VERSION="1.6.4"
 HOMEPAGE="https://www.solarus-games.org/"
-DOWNLOAD="https://gitlab.com/solarus-games/solarus-quest-editor/-/archive/v1.6.2/solarus-quest-editor-v1.6.2.tar.gz"
-MD5SUM="41baa5f00f714baffd825e5efcf9c237"
+DOWNLOAD="https://gitlab.com/solarus-games/solarus-quest-editor/-/archive/v1.6.4/solarus-quest-editor-v1.6.4.tar.gz"
+MD5SUM="3eebb8c607e6c212b1aaf29478c3958d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="glm solarus qt5"
+REQUIRES="solarus qt5"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
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/cmake.patch b/games/solarus/cmake.patch
new file mode 100644
index 0000000000..1661f39485
--- /dev/null
+++ b/games/solarus/cmake.patch
@@ -0,0 +1,25 @@
+From 17f2f33d8733aa7dcb5e52fc9043447758a74869 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 4 Sep 2020 09:21:45 -0700
+Subject: [PATCH] cmake: Fix compatibility with cmake 3.5.2.
+
+cmake 3.5.2 does not have VERSION_GREATER_EQUAL or VERSION_LESS_EQUAL.
+---
+ cmake/modules/FindGLM.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake
+index 32ce5058d..e3905b6c3 100644
+--- a/cmake/modules/FindGLM.cmake
++++ b/cmake/modules/FindGLM.cmake
+@@ -52,6 +52,6 @@ find_package_handle_standard_args(GLM
+ )
+ 
+ # Enable GLM experimental extensions for GLM 0.9.9.0 to 0.9.9.3
+-if(GLM_VERSION_STRING VERSION_GREATER_EQUAL 0.9.9.0 AND GLM_VERSION_STRING VERSION_LESS_EQUAL 0.9.9.3)
++if((GLM_VERSION_STRING VERSION_EQUAL 0.9.9.0 OR GLM_VERSION_STRING VERSION_GREATER 0.9.9.0) AND (GLM_VERSION_STRING VERSION_EQUAL 0.9.9.3 OR GLM_VERSION_STRING VERSION_LESS 0.9.9.3))
+   add_definitions(-DGLM_ENABLE_EXPERIMENTAL)
+ endif()
+-- 
+2.25.0
+
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 f9da1706e2..a46b54ddf3 100644
--- a/games/solarus/solarus.SlackBuild
+++ b/games/solarus/solarus.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for solarus
 
-# 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=solarus
-VERSION=${VERSION:-1.6.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.6.4}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -75,6 +75,14 @@ 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 \
@@ -86,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/solarus/solarus.info b/games/solarus/solarus.info
index 186cd560e0..740a8f5ce3 100644
--- a/games/solarus/solarus.info
+++ b/games/solarus/solarus.info
@@ -1,10 +1,10 @@
 PRGNAM="solarus"
-VERSION="1.6.2"
+VERSION="1.6.4"
 HOMEPAGE="https://www.solarus-games.org/"
-DOWNLOAD="https://gitlab.com/solarus-games/solarus/-/archive/v1.6.2/solarus-v1.6.2.tar.gz"
-MD5SUM="f5ea8ccddb3d26136b5de51e255e991f"
+DOWNLOAD="https://gitlab.com/solarus-games/solarus/-/archive/v1.6.4/solarus-v1.6.4.tar.gz"
+MD5SUM="d06a3258910cb113d28e1349ca437125"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="OpenAL SDL2_image SDL2_ttf libmodplug luajit physfs"
+REQUIRES="OpenAL SDL2_image SDL2_ttf glm libmodplug luajit physfs"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/games/speed-dreams/speed-dreams.SlackBuild b/games/speed-dreams/speed-dreams.SlackBuild
index 3887ecbb24..1812248a77 100644
--- a/games/speed-dreams/speed-dreams.SlackBuild
+++ b/games/speed-dreams/speed-dreams.SlackBuild
@@ -4,7 +4,7 @@
 # written by powtrix (@gmail.com)
 
 PRGNAM=speed-dreams
-VERSION=${VERSION:-2.2.2_rc2_r6527}
+VERSION=${VERSION:-2.2.2_r6553}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,7 +49,6 @@ tar xvf $CWD/$PRGNAM-src-base-$SRCVERSION.tar.xz
 tar xvf $CWD/$PRGNAM-src-hq-cars-and-tracks-$SRCVERSION.tar.xz
 tar xvf $CWD/$PRGNAM-src-more-hq-cars-and-tracks-$SRCVERSION.tar.xz
 tar xvf $CWD/$PRGNAM-src-wip-cars-and-tracks-$SRCVERSION.tar.xz
-tar xvf $CWD/$PRGNAM-src-unmaintained-$SRCVERSION.tar.xz
 
 chown -R root:root .
 find -L . \
diff --git a/games/speed-dreams/speed-dreams.info b/games/speed-dreams/speed-dreams.info
index f722c9cca6..12f64fe555 100644
--- a/games/speed-dreams/speed-dreams.info
+++ b/games/speed-dreams/speed-dreams.info
@@ -1,15 +1,13 @@
 PRGNAM="speed-dreams"
-VERSION="2.2.2_rc2_r6527"
+VERSION="2.2.2_r6553"
 HOMEPAGE="http://www.speed-dreams.org/"
-DOWNLOAD="https://sf.net/projects/speed-dreams/files/2.2.2/2.2.2-rc2/speed-dreams-src-base-2.2.2-rc2-r6527.tar.xz \
-          https://sf.net/projects/speed-dreams/files/2.2.2/2.2.2-rc2/speed-dreams-src-hq-cars-and-tracks-2.2.2-rc2-r6527.tar.xz \
-          https://sf.net/projects/speed-dreams/files/2.2.2/2.2.2-rc2/speed-dreams-src-more-hq-cars-and-tracks-2.2.2-rc2-r6527.tar.xz \
-          https://sf.net/projects/speed-dreams/files/2.2.2/2.2.2-rc2/speed-dreams-src-unmaintained-2.2.2-rc2-r6527.tar.xz \
-          https://sf.net/projects/speed-dreams/files/2.2.2/2.2.2-rc2/speed-dreams-src-wip-cars-and-tracks-2.2.2-rc2-r6527.tar.xz"
-MD5SUM="956bda0acbcb89eaa2ca742dbedc8941 \
+DOWNLOAD="https://sf.net/projects/speed-dreams/files/2.2.2/speed-dreams-src-base-2.2.2-r6553.tar.xz \
+          https://sf.net/projects/speed-dreams/files/2.2.2/speed-dreams-src-hq-cars-and-tracks-2.2.2-r6553.tar.xz \
+          https://sf.net/projects/speed-dreams/files/2.2.2/speed-dreams-src-more-hq-cars-and-tracks-2.2.2-r6553.tar.xz \
+          https://sf.net/projects/speed-dreams/files/2.2.2/speed-dreams-src-wip-cars-and-tracks-2.2.2-r6553.tar.xz"
+MD5SUM="75dcdc727f7b40b3a9b8e6dace72612f \
         ed11647ad2d479dc4012ffd79375b995 \
         d615eda2c443a2e5ce74cf45d5374062 \
-        5d55831ca9371f8a55cc5616f9612164 \
         bc183b3e80c742bc249f630cb029920c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/spring/spring.SlackBuild b/games/spring/spring.SlackBuild
index 0c2deeee4c..cb6abb7814 100644
--- a/games/spring/spring.SlackBuild
+++ b/games/spring/spring.SlackBuild
@@ -27,7 +27,7 @@
 #
 
 PRGNAM=spring
-VERSION=${VERSION:-100.0}
+VERSION=${VERSION:-104.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -38,7 +38,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
diff --git a/games/spring/spring.info b/games/spring/spring.info
index fe5bd79a74..a0ad49fae0 100644
--- a/games/spring/spring.info
+++ b/games/spring/spring.info
@@ -1,8 +1,8 @@
 PRGNAM="spring"
-VERSION="100.0"
+VERSION="104.0"
 HOMEPAGE="https://springrts.com"
-DOWNLOAD="https://downloads.sourceforge.net/springrts/spring_100.0_src.tar.gz"
-MD5SUM="496ce9d145dbad6aef9ff5f00ff63979"
+DOWNLOAD="https://downloads.sourceforge.net/springrts/spring_104.0_src.tar.gz"
+MD5SUM="c890fe7318f8d6798e70a411e411939e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="DevIL OpenAL p7zip jdk SDL2 bullet libunwind"
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/README b/games/starfighter/README
index ee87959117..c729830b7b 100644
--- a/games/starfighter/README
+++ b/games/starfighter/README
@@ -1,10 +1,11 @@
-Project: Starfighter is an old school 2D shoot 'em up game.  In the game, you 
-take on the role of a rebel pilot named Chris who is attempting to overthrow 
-a military corporation called Weapco.  Weapco has seized control of the known 
-universe and currently rules it with an iron fist.  Chris can no longer stand 
-back and watch as millions of people suffer and die.  He steals an experimental
-craft known as "Firefly" and begins his mission to fight his way to Sol, 
-freeing key systems along the way.  The game opens with Chris attempting to 
-escape a Weapco patrol that has intercepted him.
+Project: Starfighter is an old school 2D shoot 'em up game.  In the
+game, you take on the role of a rebel pilot named Chris who is
+attempting to overthrow a military corporation called Weapco.  Weapco
+has seized control of the known universe and currently rules it with
+an iron fist.  Chris can no longer stand back and watch as millions of
+people suffer and die.  He steals an experimental craft known as
+"Firefly" and begins his mission to fight his way to Sol, freeing key
+systems along the way.  The game opens with Chris attempting to escape
+a Weapco patrol that has intercepted him.
 
 Note: On slackware 14.2 make sure SDL2_image is 2.0.1 build 2 or higher.
diff --git a/games/starfighter/starfighter.SlackBuild b/games/starfighter/starfighter.SlackBuild
index d8914e70f4..7bb9b55a3a 100644
--- a/games/starfighter/starfighter.SlackBuild
+++ b/games/starfighter/starfighter.SlackBuild
@@ -1,19 +1,29 @@
 #!/bin/sh
 # Slackware build script for starfighter
 
-# Written by Tim Dickson   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
+# 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.
 
-# changelog
-
-# updated 15/10/2016 for v1.6
-# make file now supports destdir and project comes with desktop file and icon
-# so separate one not needed.
-# doc location still changed to support slackware prefered location
-# updated 05/03/2017 for v1.7
-# updated 22/07/2019 for v2.0 (2.0.0.3)
 
 PRGNAM=starfighter
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION-src
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+tar -xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
 cd $PRGNAM-$VERSION-src
 chown -R root:root .
 find -L . \
@@ -58,8 +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 {} \;
 
-CFLAGS="$SLKFLAGS"
-CXXFLAGS="$SLKCFLAGS"
+CFLAGS="$SLKFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/games/starfighter/starfighter.info b/games/starfighter/starfighter.info
index ec53d72540..d66a8c86bd 100644
--- a/games/starfighter/starfighter.info
+++ b/games/starfighter/starfighter.info
@@ -1,10 +1,10 @@
 PRGNAM="starfighter"
-VERSION="2.0"
+VERSION="2.4"
 HOMEPAGE="https://github.com/pr-starfighter/starfighter/"
-DOWNLOAD="https://github.com/pr-starfighter/starfighter/releases/download/v2.0.0.3/starfighter-2.0-src.tar.gz"
-MD5SUM="dcb7da670b84acfc25cf146df3033045"
+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"
+REQUIRES="SDL2_image SDL2_mixer SDL2_ttf"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"
diff --git a/games/steam/README b/games/steam/README
index db6915a01e..6f4193d351 100644
--- a/games/steam/README
+++ b/games/steam/README
@@ -4,7 +4,4 @@ Steam provides the user with installation and automatic updating of games on
 multiple computers, and community features such as friends lists and groups,
 cloud saving, and in-game voice and chat functionality.
 
-Depending on the game being played and hardware being used, some games may
-benefit by inclusion of flashplayer-plugin and btxc_dxtn packages from SBo.
-
 A multilib installation is required to run steam.
diff --git a/games/steam/patch-slackdirs.diff b/games/steam/patch-slackdirs.diff
new file mode 100644
index 0000000000..f5c87f1a6f
--- /dev/null
+++ b/games/steam/patch-slackdirs.diff
@@ -0,0 +1,26 @@
+--- Makefile.orig	2020-03-20 03:13:39.000000000 +1000
++++ Makefile	2020-04-23 18:31:43.521950531 +1000
+@@ -14,10 +14,10 @@
+ 	ln -fns $(pkglibdir)/bin_steamdeps.py $(DESTDIR)$(bindir)/$(PACKAGE)deps
+ 
+ install-docs:
+-	install -d -m 755 $(DESTDIR)$(PREFIX)/share/doc/$(PACKAGE)/
+-	install -p -m 644 README steam_subscriber_agreement.txt $(DESTDIR)$(PREFIX)/share/doc/$(PACKAGE)/
+-	install -d -m 755 $(DESTDIR)$(PREFIX)/share/man/man6/
+-	install -m 644 $(PACKAGE).6 $(DESTDIR)$(PREFIX)/share/man/man6/
++	install -d -m 755 $(DESTDIR)$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/
++	install -p -m 644 README steam_subscriber_agreement.txt $(DESTDIR)$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/
++	install -d -m 755 $(DESTDIR)$(PREFIX)/man/man6/
++	install -m 644 $(PACKAGE).6 $(DESTDIR)$(PREFIX)/man/man6/
+ 
+ install-icons:
+ 	install -d -m 755 $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
+@@ -39,7 +39,7 @@
+ 	install -p -m 644 bootstraplinux_ubuntu12_32.tar.xz $(DESTDIR)$(PREFIX)/lib/$(PACKAGE)/
+ 
+ install-desktop:
+-	install -d -m 755 $(DESTDIR)$(PREFIX)/share/applications/
++	install -d -m 755 $(DESTDIR)$(datadir)/applications/
+ 	install -d -m 755 $(DESTDIR)$(pkglibdir)/
+ 	install -p -m 644 $(PACKAGE).desktop $(DESTDIR)$(pkglibdir)
+ 	ln -fns $(pkglibdir)/$(PACKAGE).desktop $(DESTDIR)$(datadir)/applications/
diff --git a/games/steam/steam.SlackBuild b/games/steam/steam.SlackBuild
index ea68e62a07..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,8 +25,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=steam
-VERSION=${VERSION:-1.0.0.61}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.0.0.69}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -61,9 +61,12 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM\_$VERSION
+rm -rf ${PRGNAM}-launcher
 tar xvf $CWD/$PRGNAM\_$VERSION.tar.gz
-cd $PRGNAM
+cd ${PRGNAM}-launcher
+
+# Use Slackware-specific installation directories
+patch -p0 < $CWD/patch-slackdirs.diff
 
 chown -R root:root .
 find -L . \
@@ -72,32 +75,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 {} \;
 
-make install DESTDIR=$PKG
-sed -i -e "s/distribution.\\\n/distribution.\\\n    Actually, don't worry - this is Slackware\!\\\n\\\n/" $PKG/usr/bin/steamdeps
+# alienBOB's trick for unfound system apps
+sed -i -e '\/usr\/bin\/env\ bash/{N;s#$#\nexport PATH="/usr/lib/steam/local:$PATH"\n#}' bin_steam.sh
+mkdir -p $PKG/usr/lib/steam/local
+ln -sf /sbin/pidof $PKG/usr/lib/steam/local/pidof
+ln -sf /sbin/lspci $PKG/usr/lib/steam/local/lspci
+
+sed -i -e "s/distribution.\\\n/distribution.\\\n    Actually, don't worry - this is Slackware\!\\\n\\\n/" bin_steamdeps.py
+make install DESTDIR=$PKG VERSION=$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
 
-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/lib/udev/rules.d
-install -p -m 0644 lib/udev/rules.d/*.rules $PKG/lib/udev/rules.d/
+install -p -m 0644 subprojects/steam-devices/*.rules $PKG/lib/udev/rules.d/
 sed -i -e 's/^KERNEL=="uinput".*/& GROUP="plugdev"/' $PKG/lib/udev/rules.d/60-steam-input.rules
 
-mkdir -p $PKG/usr/share/applications
-install -m 0644 steam.desktop $PKG/usr/share/applications/
-
-# alienBOB's trick for unfound system apps
-sed -i -e '\/usr\/bin\/env\ bash/{N;s#$#\nexport PATH="/usr/lib/steam/local:$PATH"\n#}' $PKG/usr/bin/steam
-mkdir -p $PKG/usr/lib/steam/local
-ln -sf /sbin/pidof $PKG/usr/lib/steam/local/pidof
-ln -sf /sbin/lspci $PKG/usr/lib/steam/local/lspci
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/steam/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
+cp subprojects/steam-devices/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/steam/steam.info b/games/steam/steam.info
index c830d5b030..e61d6d06ad 100644
--- a/games/steam/steam.info
+++ b/games/steam/steam.info
@@ -1,10 +1,10 @@
 PRGNAM="steam"
-VERSION="1.0.0.61"
-HOMEPAGE="http://store.steampowered.com/"
-DOWNLOAD="http://repo.steampowered.com/steam/archive/precise/steam_1.0.0.61.tar.gz"
-MD5SUM="a5d3e33a736a4abdcfe112add79af836"
+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"
+REQUIRES="OpenAL python3 zenity"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/games/stella-libretro/stella-libretro.info b/games/stella-libretro/stella-libretro.info
index 480b1c539e..d4bd982af7 100644
--- a/games/stella-libretro/stella-libretro.info
+++ b/games/stella-libretro/stella-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="d5928abe05d3edac62b413d6dc3ea718"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
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 4c4f6cc0f8..503512ab5d 100644
--- a/games/stella/stella.SlackBuild
+++ b/games/stella/stella.SlackBuild
@@ -8,6 +8,16 @@
 
 # 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.
+# - use clang++, our g++ is too old.
+
 # 20191201 bkw:
 # - update for 6.0.2.
 # - replace my outdated man page with the up-to-date one from Debian.
@@ -41,7 +51,7 @@
 # - StartupNotify=false in .desktop
 
 PRGNAM=stella
-VERSION=${VERSION:-6.0.2}
+VERSION=${VERSION:-6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -87,7 +97,7 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 # because we have 7.x.
 #sed -i 's,\[5-6\],[5-9],g' configure
 
-CFLAGS="$SLKCFLAGS" \
+CC="clang" CXX="clang++" CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/games/stella/stella.info b/games/stella/stella.info
index 4f84ddc7dd..f28829c3e8 100644
--- a/games/stella/stella.info
+++ b/games/stella/stella.info
@@ -1,8 +1,8 @@
 PRGNAM="stella"
-VERSION="6.0.2"
+VERSION="6.4"
 HOMEPAGE="https://stella-emu.github.io/"
-DOWNLOAD="https://github.com/stella-emu/stella/releases/download/6.0.2/stella-6.0.2-src.tar.xz"
-MD5SUM="43f71246d9ab256687bce4ddc6e63965"
+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 b0a272f2a7..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.24.0}
+VERSION=${VERSION:-0.26.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -106,9 +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 -ar $PKG/usr/share/games/crawl/docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+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 21f9dad368..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.24.0"
-HOMEPAGE="https://crawl.develz.org/"
-DOWNLOAD="https://crawl.develz.org/release/0.24/stone_soup-0.24.0-nodeps.tar.xz"
-MD5SUM="49b1424ec0713e117c84085541a84071"
+VERSION="0.26.0"
+HOMEPAGE="http://crawl.develz.org/"
+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/stuntrally/README b/games/stuntrally/README
index 92453e9b38..2fd05bfdaa 100644
--- a/games/stuntrally/README
+++ b/games/stuntrally/README
@@ -1,6 +1,6 @@
 stuntrally (game based on VDrift and OGRE, with Track Editor)
 
-The game features 172 tracks in 34 sceneries and 25 vehicles. Game
+The game features 191 tracks in 34 sceneries and 28 vehicles. Game
 modes include: single race, tutorials, championships, challenges,
 multiplayer and split screen. Replays and Ghost drive are available.
 The Track Editor allows creating and modifying tracks.
@@ -8,7 +8,5 @@ The Track Editor allows creating and modifying tracks.
 The game aims at a rally style of driving (like in Richard Burns
 Rally), with possible stunt elements (jumps, loops, pipes).
 
-Required Dependency
-
-ogre needs to be built with FreeImage for stuntrally to work.  If you
-built ogre prior to installing FreeImage, you will need to rebuild ogre.
+This is currently repackaging the binary version until stuntrally can be
+ported to ogre-1.11+.
diff --git a/games/stuntrally/stuntrally.SlackBuild b/games/stuntrally/stuntrally.SlackBuild
index 60d2a75f68..0850ac5fbb 100644
--- a/games/stuntrally/stuntrally.SlackBuild
+++ b/games/stuntrally/stuntrally.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for stuntrally
 
-# Copyright 2017 Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2020 Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # 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=stuntrally
-VERSION=${VERSION:-2.6.1}
+SRCNAM=StuntRally
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,35 +60,30 @@ 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
-tar xvf $CWD/tracks-$VERSION.tar.gz
-mv tracks-$VERSION/ data/tracks
+rm -rf $SRCNAM-$VERSION-linux64
+tar xvf $CWD/$SRCNAM-$VERSION-linux.tar.gz
+cd $SRCNAM-$VERSION-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 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
 cd ..
+mkdir -p $PKG/{opt/$PRGNAM/,usr/bin/}
+cp -r StuntRally-$VERSION-linux64/* $PKG/opt/$PRGNAM/
+
+cd $PKG
+ln -s /opt/$PRGNAM/stuntrally usr/bin/
+ln -s /opt/$PRGNAM/sr-editor usr/bin/
+mv opt/$PRGNAM/share usr/
+rm -f $PKG/opt/$PRGNAM/lib/{32,64}/libstdc++.so.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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a License.txt Readme.txt  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a opt/$PRGNAM/License.txt opt/$PRGNAM/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/games/stuntrally/stuntrally.info b/games/stuntrally/stuntrally.info
index 3b8f7ca2a4..72700ca438 100644
--- a/games/stuntrally/stuntrally.info
+++ b/games/stuntrally/stuntrally.info
@@ -1,12 +1,10 @@
 PRGNAM="stuntrally"
-VERSION="2.6.1"
+VERSION="2.6"
 HOMEPAGE="http://stuntrally.tuxfamily.org/"
-DOWNLOAD="https://github.com/stuntrally/stuntrally/archive/2.6.1/stuntrally-2.6.1.tar.gz \
-          https://github.com/stuntrally/tracks/archive/2.6.1/tracks-2.6.1.tar.gz"
-MD5SUM="03f64cd2724d51888d42da3208710c65 \
-        fc075a198ad2ec4bf4b4739010761a25"
+DOWNLOAD="http://downloads.sourceforge.net/stuntrally/2.6/StuntRally-2.6-linux.tar.gz"
+MD5SUM="5be1af1b727af2bc7f5bd5e34c2deb8a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="MyGUI SDL2 enet bullet OpenAL FreeImage"
+REQUIRES=""
 MAINTAINER="Jeremy Hansen"
 EMAIL="jebrhansen+SBo@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/supertuxkart/README b/games/supertuxkart/README
index 0676a9a8bf..7ea19c392c 100644
--- a/games/supertuxkart/README
+++ b/games/supertuxkart/README
@@ -1,10 +1,11 @@
 SuperTuxKart is a Free 3D kart racing game; we want to make the game fun
-more than we want to make it realistic. You can play with up to 4 friends
-on one PC, racing against each other or just try to beat the computer.
+more than we want to make it realistic. You can play with up to 4
+friends on one PC, racing against each other or just try to beat the
+computer.
 
 Extra karts and tracks can be downloaded from within the game.
 
 NOTE: It requires OpenGL 3.1 support and above to play the game.
 
-To enable in-game recording, pass RECORDER=yes to the script. This requires
-libopenglrecorder as an optional dependency.
+To enable in-game recording, pass RECORDER=yes to the script. This
+requires libopenglrecorder as an optional dependency.
diff --git a/games/supertuxkart/supertuxkart.SlackBuild b/games/supertuxkart/supertuxkart.SlackBuild
index 5e2c1c0cc2..47fd592558 100644
--- a/games/supertuxkart/supertuxkart.SlackBuild
+++ b/games/supertuxkart/supertuxkart.SlackBuild
@@ -26,7 +26,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=supertuxkart
-VERSION=${VERSION:-1.1}
+SRCNAM=SuperTuxKart
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,9 +71,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-src
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.xz
-cd $PRGNAM-$VERSION-src
+rm -rf $SRCNAM-$VERSION-src
+tar xvf $CWD/$SRCNAM-$VERSION-src.tar.xz
+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/games/supertuxkart/supertuxkart.info b/games/supertuxkart/supertuxkart.info
index 4fba2d08a3..6424058cac 100644
--- a/games/supertuxkart/supertuxkart.info
+++ b/games/supertuxkart/supertuxkart.info
@@ -1,8 +1,8 @@
 PRGNAM="supertuxkart"
-VERSION="1.1"
+VERSION="1.2"
 HOMEPAGE="http://supertuxkart.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/1.1/supertuxkart-1.1-src.tar.xz"
-MD5SUM="731569c58428f32a0e46943fad7ba1e3"
+DOWNLOAD="http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/1.2/SuperTuxKart-1.2-src.tar.xz"
+MD5SUM="ca1b8f2f517f7234d088cae836f35ebe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL"
diff --git a/games/syobonaction/syobonaction.info b/games/syobonaction/syobonaction.info
index 64e166aeb1..b541ebfc67 100644
--- a/games/syobonaction/syobonaction.info
+++ b/games/syobonaction/syobonaction.info
@@ -1,7 +1,7 @@
 PRGNAM="syobonaction"
 VERSION="0.2"
 HOMEPAGE="https://github.com/CecilHarvey/syobon/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/syobonaction-0.2.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/syobonaction-0.2.tar.gz"
 MD5SUM="5c85c936a0436e5b0b85a08abcd5b105"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/tbftss/tbftss.SlackBuild b/games/tbftss/tbftss.SlackBuild
index 36f644a6e6..d119970edd 100644
--- a/games/tbftss/tbftss.SlackBuild
+++ b/games/tbftss/tbftss.SlackBuild
@@ -12,7 +12,7 @@
 
 PRGNAM=tbftss
 VERSION=${VERSION:-1.5.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -47,9 +47,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-rm -rf build
+#rm -rf build
 tar xvf $CWD/$PRGNAM-$VERSION.src.tar.gz
-cd build/$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/games/tbftss/tbftss.info b/games/tbftss/tbftss.info
index 1fc934572f..eb7cc333c5 100644
--- a/games/tbftss/tbftss.info
+++ b/games/tbftss/tbftss.info
@@ -2,7 +2,7 @@ PRGNAM="tbftss"
 VERSION="1.5.1"
 HOMEPAGE="https://www.battleforthesolarsystem.com/games/pw/"
 DOWNLOAD="https://www.battleforthesolarsystem.com/downloads/tbftss-1.5.1.src.tar.gz"
-MD5SUM="c8c7325a0dbea923606ed191381af68d"
+MD5SUM="7decbd60a5131f8ac2dad261102e6e9d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_image SDL2_mixer SDL2_ttf"
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/tyrquake-libretro/tyrquake-libretro.info b/games/tyrquake-libretro/tyrquake-libretro.info
index 2b3c20e73e..1435bcb139 100644
--- a/games/tyrquake-libretro/tyrquake-libretro.info
+++ b/games/tyrquake-libretro/tyrquake-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="7e708db8e103a504059a78cc4c68204e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
diff --git a/games/unigine-superposition-benchmark/README b/games/unigine-superposition-benchmark/README
new file mode 100644
index 0000000000..f6c0c02b86
--- /dev/null
+++ b/games/unigine-superposition-benchmark/README
@@ -0,0 +1,11 @@
+Unigine Superposition is an extreme performance and stability test
+for PC hardware: video card, power supply, cooling system. Check
+your rig in stock and overclocking modes with real-life load! Also
+includes interactive experience in a beautiful, detailed environment.
+
+Please note that the source file is 1500mb if you are on a slow
+internet connection.  And building the package will take several 
+minutes due to its large size. 
+
+Unigine Superposition is 64-bit only.  It will not run on 32-bit
+Slackware.
diff --git a/games/unigine-superposition-benchmark/doinst.sh b/games/unigine-superposition-benchmark/doinst.sh
new file mode 100644
index 0000000000..392c12adb9
--- /dev/null
+++ b/games/unigine-superposition-benchmark/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
diff --git a/games/unigine-superposition-benchmark/slack-desc b/games/unigine-superposition-benchmark/slack-desc
new file mode 100644
index 0000000000..ad727fd763
--- /dev/null
+++ b/games/unigine-superposition-benchmark/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------------------------------------------------------|
+unigine-superposition-benchmark: unigine-superposition-benchmark (benchmarking and stability tool)
+unigine-superposition-benchmark:
+unigine-superposition-benchmark: Unigine Superposition is an extreme performance and stability test
+unigine-superposition-benchmark: for PC hardware: video card, power supply, cooling system. Check
+unigine-superposition-benchmark: your rig in stock and overclocking modes with real-life load! Also
+unigine-superposition-benchmark: includes interactive experience in a beautiful, detailed environment.
+unigine-superposition-benchmark:
+unigine-superposition-benchmark:
+unigine-superposition-benchmark:
+unigine-superposition-benchmark:
+unigine-superposition-benchmark:
diff --git a/games/unigine-superposition-benchmark/unigine-superposition-benchmark.SlackBuild b/games/unigine-superposition-benchmark/unigine-superposition-benchmark.SlackBuild
new file mode 100644
index 0000000000..b9ce0d2b3e
--- /dev/null
+++ b/games/unigine-superposition-benchmark/unigine-superposition-benchmark.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for unigine-superposition-benchmark
+
+# Copyright 2020 Matt Dinslage Springfield, MO
+# 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=unigine-superposition-benchmark
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=Unigine_Superposition
+
+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
+cd $PKG
+sh $CWD/$SRCNAM-$VERSION.run --target "$PKG/opt/$PRGNAM" --noexec
+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 {} \;
+
+# add application launcher
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop 
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/opt/$PRGNAM/docs/*.pdf $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/unigine-superposition-benchmark/unigine-superposition-benchmark.desktop b/games/unigine-superposition-benchmark/unigine-superposition-benchmark.desktop
new file mode 100644
index 0000000000..b63eb72e1e
--- /dev/null
+++ b/games/unigine-superposition-benchmark/unigine-superposition-benchmark.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=unigine-superposition-benchmark
+GenericName=Interactive system benchmarking software
+Exec=/opt/unigine-superposition-benchmark/Superposition
+Terminal=false
+Type=Application
+Categories=Game;
+Icon=/opt/unigine-superposition-benchmark/icons/superposition_icon_256.png
+StartupNotify=false
diff --git a/games/unigine-superposition-benchmark/unigine-superposition-benchmark.info b/games/unigine-superposition-benchmark/unigine-superposition-benchmark.info
new file mode 100644
index 0000000000..ef7ff33374
--- /dev/null
+++ b/games/unigine-superposition-benchmark/unigine-superposition-benchmark.info
@@ -0,0 +1,10 @@
+PRGNAM="unigine-superposition-benchmark"
+VERSION="1.1"
+HOMEPAGE="https://benchmark.unigine.com/superposition"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://assets.unigine.com/d/Unigine_Superposition-1.1.run"
+MD5SUM_x86_64="8a049dfc97af056d1bcdbb2c8d247c67"
+REQUIRES=""
+MAINTAINER="M.Dinslage"
+EMAIL="daedra1980@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/vegastrike/README b/games/vegastrike/README
index 23222eefc5..2702aa164b 100644
--- a/games/vegastrike/README
+++ b/games/vegastrike/README
@@ -1,31 +1,31 @@
-Welcome to Vega Strike, a 3d OpenGL spaceflight simulator being developed
-for multi-platform play.
+Welcome to Vega Strike, a 3d OpenGL spaceflight simulator being
+developed for multi-platform play.
 
 Vega Strike allows players to explore a vastly dynamic universe where
 frontiers collide and you're just a pilot trying to make ends meet. How?
 That's your decision. Vega Strike is designed as a non-linear gaming
 experience, where you choose what action you want to take.
 
-Vega Strike features a dynamic trading economy, allowing your character to
-operate as a merchant. Discover what trade routes bring in the most profit,
-what commodities make you the most money given your ship's cargo space
-limitations, accept cargo missions and learn to avoid areas of danger
-(repairs eat into your profits!).
+Vega Strike features a dynamic trading economy, allowing your character
+to operate as a merchant. Discover what trade routes bring in the most
+profit, what commodities make you the most money given your ship's cargo
+space limitations, accept cargo missions and learn to avoid areas of
+danger (repairs eat into your profits!).
 
 If you are tired of making money on milk runs, or want to try something
 different, then there are other paths to success. Vega Strike features a
 mission generator, providing multiple missions to the experienced
 (and not so experienced) pilots. Engage in bounty hunting, patrols,
-battles and escort missions. Feel like traveling? Explore the dynamic
+battles and escort missions. Feel like travelling? Explore the dynamic
 universe and see the farthest reaches of known space.
 Want a walk on the wild side? You could always turn pirate! Just be
 prepared for the consequences.
 
-Your ship just not doing the job you want it to? Vega Strike gives you the
-ability to purchase from a wide variety of ships capable of doing different
-jobs. Want to haul cargo? Fight battles? There's a ship for you. Your ship
-is fully customizable, so if you've got the credit, outfit your craft
-with the right tools for the job at hand.
+Your ship just not doing the job you want it to? Vega Strike gives you
+the ability to purchase from a wide variety of ships capable of doing
+different jobs. Want to haul cargo? Fight battles? There's a ship for
+you. Your ship is fully customizable, so if you've got the credit,
+outfit your craft with the right tools for the job at hand.
 
 Have a chat with the bartender or view the news broadcasts to find out
 what's going on in the universe. While you're there, talk to the fixers,
diff --git a/games/vegastrike/README.SlackBuild b/games/vegastrike/README.SlackBuild
new file mode 100644
index 0000000000..6ed1a58ad3
--- /dev/null
+++ b/games/vegastrike/README.SlackBuild
@@ -0,0 +1,23 @@
+Following features are new in this build:
+
+  - Contains a few bugfixes for version 0.5.1.r1.
+  - Corrects the stats of a few ship-parts because they do not
+    behave in the same way that similiar parts behave.
+    This is done by default. If this is not wanted then use
+
+      PARTSFIX=NO ./vegastrike.SlackBuild
+
+    to build the package.
+  - The server will not be build by default since it is experimental
+    at this stage. If you want to build the server anyway then use
+
+      DISABLE_SERVER=OFF ./vegastrike.SlackBuild
+
+
+HINTS:
+
+  - After installation run 'vssetup' and adjust the settings
+    before you launch 'vegastrike'.
+  - You can quit the game either by pressing ESC and then 'q'
+    during flight or by clicking 'Quit Game' on a save screen.
+
diff --git a/games/vegastrike/patch-0.5.1.r1 b/games/vegastrike/patch-0.5.1.r1
deleted file mode 100644
index 4077324d4c..0000000000
--- a/games/vegastrike/patch-0.5.1.r1
+++ /dev/null
@@ -1,326 +0,0 @@
-diff -ruN ./CMakeLists.txt ../b/CMakeLists.txt
---- ./CMakeLists.txt	2012-03-26 02:50:49.000000000 +0200
-+++ ../b/CMakeLists.txt	2019-09-20 14:45:44.171890881 +0200
-@@ -10,7 +10,7 @@
- 
- project (vsUTCS)
- 
--
-+include(GNUInstallDirs)
- 
- include_directories(${vsUTCS_SOURCE_DIR}/src 
- 					${vsUTCS_SOURCE_DIR}/src/cmd
-@@ -828,33 +828,33 @@
- 
- #Find FFMpeg
- 
--find_package(FFMPEG)
--IF(FFMPEG_FOUND)
--	SET(TST_INCLUDES ${TST_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
--	SET(TST_LIBS ${TST_LIBS} ${FFMPEG_LIBRARIES})
--	add_definitions(${FFMPEG_DEFINITIONS})
--	SET(HAVE_FFMPEG 1 )
--	IF(swscale1_FOUND)
--        message("++ FFmpeg's libswscale found.")
--	ELSE(swscale1_FOUND)
--        message("-- FFMpeg's libswscale not found... depending on your ffmpeg version, VS might not build.")
--	ENDIF(swscale1_FOUND)
--ELSE(FFMPEG_FOUND)
--	message("-- FFMPEG Not Found")
--ENDIF(FFMPEG_FOUND)
-+#find_package(FFMPEG)
-+#IF(FFMPEG_FOUND)
-+#	SET(TST_INCLUDES ${TST_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
-+#	SET(TST_LIBS ${TST_LIBS} ${FFMPEG_LIBRARIES})
-+#	add_definitions(${FFMPEG_DEFINITIONS})
-+#	SET(HAVE_FFMPEG 1 )
-+#	IF(swscale1_FOUND)
-+#        message("++ FFmpeg's libswscale found.")
-+#	ELSE(swscale1_FOUND)
-+#        message("-- FFMpeg's libswscale not found... depending on your ffmpeg version, VS might not build.")
-+#	ENDIF(swscale1_FOUND)
-+#ELSE(FFMPEG_FOUND)
-+#	message("-- FFMPEG Not Found")
-+#ENDIF(FFMPEG_FOUND)
- 
- #Find Ogre
- 
--find_package(OGRE)
--IF(OGRE_FOUND)
--    SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
--    SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
--    add_definitions(${OGRE_DEFINITIONS})
--    SET(HAVE_OGRE 1)
--    message("++ Found Ogre: ${OGRE_VERSION}")
--ELSE(OGRE_FOUND)
--    message("-- Ogre Not Found: compiling without")
--ENDIF(OGRE_FOUND)
-+#find_package(OGRE)
-+#IF(OGRE_FOUND)
-+#    SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
-+#    SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
-+#    add_definitions(${OGRE_DEFINITIONS})
-+#    SET(HAVE_OGRE 1)
-+#    message("++ Found Ogre: ${OGRE_VERSION}")
-+#ELSE(OGRE_FOUND)
-+#    message("-- Ogre Not Found: compiling without")
-+#ENDIF(OGRE_FOUND)
- 
- IF(NOT BEOS)
- 	FIND_LIBRARY(UTIL_LIB util)
-@@ -977,12 +977,12 @@
- 	HAVE_AVFORMAT_H
- 	HAVE_AVCODEC_H
- 	HAVE_AVIO_H
--	HAVE_FFMPEG_SWSCALE_H
-+#	HAVE_FFMPEG_SWSCALE_H
- 	CMAKE_BACKWARDS_COMPATIBILITY
--	FFMPEG_INCLUDE_DIR
--	FFMPEG_FOUND
--	FFMPEG_LIBRARIES
--	FFMPEG_DEFINITIONS
-+#	FFMPEG_INCLUDE_DIR
-+#	FFMPEG_FOUND
-+#	FFMPEG_LIBRARIES
-+#	FFMPEG_DEFINITIONS
- 	GTK2_ATK_INCLUDE_DIR
- 	GTK2_ATK_LIBRARY
- 	GTK2_CAIRO_INCLUDE_DIR
-diff -ruN ./objconv/basemaker/base_maker_texture.cpp ../b/objconv/basemaker/base_maker_texture.cpp
---- ./objconv/basemaker/base_maker_texture.cpp	2010-03-10 03:56:23.000000000 +0100
-+++ ../b/objconv/basemaker/base_maker_texture.cpp	2019-09-20 14:45:44.174891262 +0200
-@@ -6,9 +6,12 @@
- #define XMD_H
- #define HAVE_BOOLEAN
- #endif
-+
- extern "C" {
- //YUCK it doesn't even have extern c in the headers!
- #include <jpeglib.h>
-+#include <string.h>
-+
- }
- 
- #define strip_16 true
-diff -ruN ./objconv/mesher/to_OgreMesh.cpp ../b/objconv/mesher/to_OgreMesh.cpp
---- ./objconv/mesher/to_OgreMesh.cpp	2011-06-02 01:47:36.000000000 +0200
-+++ ../b/objconv/mesher/to_OgreMesh.cpp	2019-09-20 14:45:44.176891516 +0200
-@@ -1078,10 +1078,15 @@
-     Ogre::VertexDeclaration *newDcl =
-         data->vertexDeclaration->getAutoOrganisedDeclaration(
-             mesh->hasSkeleton() );
--#else
-+#elif (OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR < 8)
-     Ogre::VertexDeclaration *newDcl =
-         data->vertexDeclaration->getAutoOrganisedDeclaration(
-             mesh->hasSkeleton(), mesh->hasVertexAnimation() || (mesh->getPoseCount() > 0) );
-+#else
-+    Ogre::VertexDeclaration *newDcl =
-+        data->vertexDeclaration->getAutoOrganisedDeclaration(
-+            mesh->hasSkeleton(), mesh->hasVertexAnimation() || (mesh->getPoseCount() > 0),
-+		    mesh->getSharedVertexDataAnimationIncludesNormals()); // what about Pose objects?
- #endif
-     if ( *newDcl != *(data->vertexDeclaration) ) {
-         //Usages don't matter here since we're onlly exporting
-@@ -1109,35 +1114,35 @@
-     }
- }
- 
--void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance )
--{
--    struct outputContext *ctxt = (struct outputContext*) outputcontext;
--    MeshPtr newMesh = ctxt->top;
--    if ( force || (newMesh->getNumLodLevels() <= 1) ) {
--        if (newMesh->getNumLodLevels() <= 1)
--            newMesh->removeLodLevels();
--        const Ogre::ProgressiveMesh::VertexReductionQuota quota = Ogre::ProgressiveMesh::VRQ_PROPORTIONAL;
--        const Real reduction  = Real( 1-reductionFactor );
--        
--        Real currDist = refDistance;
--        
--    #if (OGRE_VERSION >= 0x010700)
--        Ogre::Mesh::LodValueList distanceList;
--
--        // pixel area is squared length, and length is proportional to triangle count
--        const Real distFactor = reductionFactor * reductionFactor; 
--        newMesh->setLodStrategy(Ogre::LodStrategyManager::getSingletonPtr()->
--            getStrategy( "PixelCount" ) );
--    #else
--        Ogre::Mesh::LodDistanceList distanceList;
--        const Real distFactor = ( (reduction > 0.00001) ? 1/reduction : 1 );
--    #endif
--
--        for (int iLod = 0; iLod < numLod; ++iLod, currDist *= distFactor)
--            distanceList.push_back( currDist );
--        newMesh->generateLodLevels( distanceList, quota, reduction );
--    }
--}
-+//void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance )
-+//{
-+//    struct outputContext *ctxt = (struct outputContext*) outputcontext;
-+//    MeshPtr newMesh = ctxt->top;
-+//    if ( force || (newMesh->getNumLodLevels() <= 1) ) {
-+//        if (newMesh->getNumLodLevels() <= 1)
-+//            newMesh->removeLodLevels();
-+//        const Ogre::ProgressiveMesh::VertexReductionQuota quota = Ogre::ProgressiveMesh::VRQ_PROPORTIONAL;
-+//        const Real reduction  = Real( 1-reductionFactor );
-+//        
-+//        Real currDist = refDistance;
-+//        
-+//    #if (OGRE_VERSION >= 0x010700)
-+//        Ogre::Mesh::LodValueList distanceList;
-+//
-+//        // pixel area is squared length, and length is proportional to triangle count
-+//        const Real distFactor = reductionFactor * reductionFactor; 
-+//        newMesh->setLodStrategy(Ogre::LodStrategyManager::getSingletonPtr()->
-+//            getStrategy( "PixelCount" ) );
-+//    #else
-+//        Ogre::Mesh::LodDistanceList distanceList;
-+//        const Real distFactor = ( (reduction > 0.00001) ? 1/reduction : 1 );
-+//    #endif
-+//
-+//        for (int iLod = 0; iLod < numLod; ++iLod, currDist *= distFactor)
-+//            distanceList.push_back( currDist );
-+//        newMesh->generateLodLevels( distanceList, quota, reduction );
-+//    }
-+//}
- 
- void DoneMeshes( void *outputcontext )
- {
-diff -ruN ./objconv/mesher/to_OgreMesh.h ../b/objconv/mesher/to_OgreMesh.h
---- ./objconv/mesher/to_OgreMesh.h	2010-02-25 16:22:25.000000000 +0100
-+++ ../b/objconv/mesher/to_OgreMesh.h	2019-09-20 14:45:44.179891897 +0200
-@@ -20,7 +20,7 @@
- float RadialSize( void *outputcontext );     //returns the size of the resulting mesh (it's maximum distance from 0,0,0). Useful for LODding.
- 
- void Optimize( void *outputcontext );     //a good idea - reorganizes internal buffers so that the output mesh is more efficient
--void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance );     //autogenerates LOD levels - if force==true, will discard current LOD data
-+//void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance );     //autogenerates LOD levels - if force==true, will discard current LOD data
- void AutoEdgeList( void *outputcontext );     //a good idea - prepares the mesh for stencil shadows
- void AutoTangents( void *outputcontext );     //prepares the mesh for normal mapping (only needed if the material uses normal mapping)
- }
-diff -ruN ./setup/src/c/setup.cpp ../b/setup/src/c/setup.cpp
---- ./setup/src/c/setup.cpp	2011-03-15 01:28:47.000000000 +0100
-+++ ../b/setup/src/c/setup.cpp	2019-09-20 14:45:44.180892025 +0200
-@@ -110,10 +110,22 @@
-                 return 1;
-             }
-         }
--        
-+
- #ifdef DATA_DIR
-         data_paths.push_back( DATA_DIR );
- #endif
-+		/* whatever the plan was, it does not work on Linux - at least
-+		 * not at this stage. Hence, use fixed absolute paths to
-+		 * find data directory
-+		 */ 
-+		data_paths.push_back( "/usr/share/games/vegastrike/data");
-+		data_paths.push_back( "/usr/share/vegastrike/data");
-+		data_paths.push_back( "/usr/games/vegastrike/data");
-+		data_paths.push_back( "/usr/local/share/games/vegastrike/data");
-+		data_paths.push_back( "/usr/local/share/vegastrike/data");
-+		data_paths.push_back( "/usr/local/games/vegastrike/data");
-+		data_paths.push_back( "/opt/vegastrike/data");
-+
-         data_paths.push_back( origpath );
-         data_paths.push_back( string( origpath )+"/.." );
-         data_paths.push_back( string( origpath )+"/../data4.x" );
-@@ -133,22 +145,7 @@
-         data_paths.push_back( "../Resources" );
-         data_paths.push_back( "../Resources/data" );
-         data_paths.push_back( "../Resources/data4.x" );
--/*
-- *               data_paths.push_back( "/usr/share/local/vegastrike/data");
-- *               data_paths.push_back( "/usr/local/share/vegastrike/data");
-- *               data_paths.push_back( "/usr/local/vegastrike/data");
-- *               data_paths.push_back( "/usr/share/vegastrike/data");
-- *               data_paths.push_back( "/usr/local/games/vegastrike/data");
-- *               data_paths.push_back( "/usr/games/vegastrike/data");
-- *               data_paths.push_back( "/opt/share/vegastrike/data");
-- *               data_paths.push_back( "/usr/share/local/vegastrike/data4.x");
-- *               data_paths.push_back( "/usr/local/share/vegastrike/data4.x");
-- *               data_paths.push_back( "/usr/local/vegastrike/data4.x");
-- *               data_paths.push_back( "/usr/share/vegastrike/data4.x");
-- *               data_paths.push_back( "/usr/local/games/vegastrike/data4.x");
-- *               data_paths.push_back( "/usr/games/vegastrike/data4.x");
-- *               data_paths.push_back( "/opt/share/vegastrike/data4.x");
-- */
-+
-         //Win32 data should be "."
-         char tmppath[16384];
-         for (vector< string >::iterator vsit = data_paths.begin(); vsit != data_paths.end(); vsit++) {
-diff -ruN ./src/cmd/music.cpp ../b/src/cmd/music.cpp
---- ./src/cmd/music.cpp	2012-03-19 09:20:14.000000000 +0100
-+++ ../b/src/cmd/music.cpp	2019-09-20 14:45:44.182892279 +0200
-@@ -448,7 +448,9 @@
-             if (foundcache) {
-                 *me->music_load_info = wherecache->second;
-                 me->freeWav = false;
--            }
-+            } else if ( ! AUDLoadSoundFile(songname, me->music_load_info, true)) {
-+				VSFileSystem::vs_dprintf(1, "Failed to load music file \"%s\"", songname);
-+			}
-         }
-         if (me->freeWav && docacheme) {
-             me->freeWav = false;
-diff -ruN ./src/cmd/unit_jump.h ../b/src/cmd/unit_jump.h
---- ./src/cmd/unit_jump.h	2012-03-19 09:20:14.000000000 +0100
-+++ ../b/src/cmd/unit_jump.h	2019-09-20 14:45:44.184892533 +0200
-@@ -108,7 +108,7 @@
-                      (tester = *i) != NULL; ++i)

-                     if (tester->isUnit() == UNITPTR && tester != this)

-                         if ( ( this->LocalPosition()-tester->LocalPosition() ).Magnitude() < this->rSize()+tester->rSize() )

--                            SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()

-+                            this->SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()

-                                            *( 4*( this->rSize()+tester->rSize() ) ) );

-             DealPossibleJumpDamage( this );

-             static int jumparrive = AUDCreateSound( vs_config->getVariable( "unitaudio", "jumparrive", "sfx43.wav" ), false );

-diff -ruN ./src/gfx/quadsquare.cpp ../b/src/gfx/quadsquare.cpp
---- ./src/gfx/quadsquare.cpp	2010-03-10 06:27:01.000000000 +0100
-+++ ../b/src/gfx/quadsquare.cpp	2019-09-20 14:45:44.186892787 +0200
-@@ -13,9 +13,9 @@
- #include <float.h>
- #include <math.h>
- #include <assert.h>
--#include "quadsquare.h"
- #include "gfxlib.h"
- #include "aux_texture.h"
-+#include "quadsquare.h"
- using std::vector;
- 
- unsigned int*quadsquare::VertexAllocated;
-diff -ruN ./src/networking/lowlevel/packetmem.cpp ../b/src/networking/lowlevel/packetmem.cpp
---- ./src/networking/lowlevel/packetmem.cpp	2008-03-31 10:20:19.000000000 +0200
-+++ ../b/src/networking/lowlevel/packetmem.cpp	2019-09-20 14:45:44.187892914 +0200
-@@ -102,7 +102,7 @@
-     }
-     else
-     {
--        _buffer.reset( 0 );
-+        _buffer.reset();
-         _len = 0;
-     }
- }
-diff -ruN ./src/vsfilesystem.cpp ../b/src/vsfilesystem.cpp
---- ./src/vsfilesystem.cpp	2012-03-19 09:20:14.000000000 +0100
-+++ ../b/src/vsfilesystem.cpp	2019-09-20 14:45:44.190893296 +0200
-@@ -563,6 +563,18 @@
-     data_paths.push_back( DATA_DIR );
- #endif
-     if ( !vegastrike_cwd.empty() ) {
-+		/* whatever the plan was, it does not work on Linux - at least
-+		 * not at this stage. Hence, use fixed absolute paths to
-+		 * find data directory
-+		 */ 
-+		data_paths.push_back( "/usr/share/games/vegastrike/data");
-+		data_paths.push_back( "/usr/share/vegastrike/data");
-+		data_paths.push_back( "/usr/games/vegastrike/data");
-+		data_paths.push_back( "/usr/local/share/games/vegastrike/data");
-+		data_paths.push_back( "/usr/local/share/vegastrike/data");
-+		data_paths.push_back( "/usr/local/games/vegastrike/data");
-+		data_paths.push_back( "/opt/vegastrike/data");
-+
-         data_paths.push_back( vegastrike_cwd );
-         data_paths.push_back( vegastrike_cwd+"/.." );
-         data_paths.push_back( vegastrike_cwd+"/../data4.x" );
diff --git a/games/vegastrike/patches/patch-0.5.1.r1_2 b/games/vegastrike/patches/patch-0.5.1.r1_2
new file mode 100644
index 0000000000..7780674c0c
--- /dev/null
+++ b/games/vegastrike/patches/patch-0.5.1.r1_2
@@ -0,0 +1,616 @@
+diff -ruN ./CMakeLists.txt ../c/CMakeLists.txt
+--- ./CMakeLists.txt	2012-03-26 02:50:49.000000000 +0200
++++ ../c/CMakeLists.txt	2020-09-03 16:25:55.870086658 +0200
+@@ -10,7 +10,7 @@
+ 
+ project (vsUTCS)
+ 
+-
++include(GNUInstallDirs)
+ 
+ include_directories(${vsUTCS_SOURCE_DIR}/src 
+ 					${vsUTCS_SOURCE_DIR}/src/cmd
+@@ -828,33 +828,33 @@
+ 
+ #Find FFMpeg
+ 
+-find_package(FFMPEG)
+-IF(FFMPEG_FOUND)
+-	SET(TST_INCLUDES ${TST_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
+-	SET(TST_LIBS ${TST_LIBS} ${FFMPEG_LIBRARIES})
+-	add_definitions(${FFMPEG_DEFINITIONS})
+-	SET(HAVE_FFMPEG 1 )
+-	IF(swscale1_FOUND)
+-        message("++ FFmpeg's libswscale found.")
+-	ELSE(swscale1_FOUND)
+-        message("-- FFMpeg's libswscale not found... depending on your ffmpeg version, VS might not build.")
+-	ENDIF(swscale1_FOUND)
+-ELSE(FFMPEG_FOUND)
+-	message("-- FFMPEG Not Found")
+-ENDIF(FFMPEG_FOUND)
++#find_package(FFMPEG)
++#IF(FFMPEG_FOUND)
++#	SET(TST_INCLUDES ${TST_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
++#	SET(TST_LIBS ${TST_LIBS} ${FFMPEG_LIBRARIES})
++#	add_definitions(${FFMPEG_DEFINITIONS})
++#	SET(HAVE_FFMPEG 1 )
++#	IF(swscale1_FOUND)
++#        message("++ FFmpeg's libswscale found.")
++#	ELSE(swscale1_FOUND)
++#        message("-- FFMpeg's libswscale not found... depending on your ffmpeg version, VS might not build.")
++#	ENDIF(swscale1_FOUND)
++#ELSE(FFMPEG_FOUND)
++#	message("-- FFMPEG Not Found")
++#ENDIF(FFMPEG_FOUND)
+ 
+ #Find Ogre
+ 
+-find_package(OGRE)
+-IF(OGRE_FOUND)
+-    SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
+-    SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
+-    add_definitions(${OGRE_DEFINITIONS})
+-    SET(HAVE_OGRE 1)
+-    message("++ Found Ogre: ${OGRE_VERSION}")
+-ELSE(OGRE_FOUND)
+-    message("-- Ogre Not Found: compiling without")
+-ENDIF(OGRE_FOUND)
++#find_package(OGRE)
++#IF(OGRE_FOUND)
++#    SET(TST_INCLUDES ${TST_INCLUDES} ${OGRE_INCLUDE_DIR})
++#    SET(TST_LIBS ${TST_LIBS} ${OGRE_LIBRARY})
++#    add_definitions(${OGRE_DEFINITIONS})
++#    SET(HAVE_OGRE 1)
++#    message("++ Found Ogre: ${OGRE_VERSION}")
++#ELSE(OGRE_FOUND)
++#    message("-- Ogre Not Found: compiling without")
++#ENDIF(OGRE_FOUND)
+ 
+ IF(NOT BEOS)
+ 	FIND_LIBRARY(UTIL_LIB util)
+@@ -977,12 +977,12 @@
+ 	HAVE_AVFORMAT_H
+ 	HAVE_AVCODEC_H
+ 	HAVE_AVIO_H
+-	HAVE_FFMPEG_SWSCALE_H
++#	HAVE_FFMPEG_SWSCALE_H
+ 	CMAKE_BACKWARDS_COMPATIBILITY
+-	FFMPEG_INCLUDE_DIR
+-	FFMPEG_FOUND
+-	FFMPEG_LIBRARIES
+-	FFMPEG_DEFINITIONS
++#	FFMPEG_INCLUDE_DIR
++#	FFMPEG_FOUND
++#	FFMPEG_LIBRARIES
++#	FFMPEG_DEFINITIONS
+ 	GTK2_ATK_INCLUDE_DIR
+ 	GTK2_ATK_LIBRARY
+ 	GTK2_CAIRO_INCLUDE_DIR
+diff -ruN ./objconv/basemaker/base_maker_texture.cpp ../c/objconv/basemaker/base_maker_texture.cpp
+--- ./objconv/basemaker/base_maker_texture.cpp	2010-03-10 03:56:23.000000000 +0100
++++ ../c/objconv/basemaker/base_maker_texture.cpp	2020-09-03 16:25:55.871086646 +0200
+@@ -6,9 +6,12 @@
+ #define XMD_H
+ #define HAVE_BOOLEAN
+ #endif
++
+ extern "C" {
+ //YUCK it doesn't even have extern c in the headers!
+ #include <jpeglib.h>
++#include <string.h>
++
+ }
+ 
+ #define strip_16 true
+diff -ruN ./objconv/mesher/to_OgreMesh.cpp ../c/objconv/mesher/to_OgreMesh.cpp
+--- ./objconv/mesher/to_OgreMesh.cpp	2011-06-02 01:47:36.000000000 +0200
++++ ../c/objconv/mesher/to_OgreMesh.cpp	2020-09-03 16:25:55.872086633 +0200
+@@ -1078,10 +1078,15 @@
+     Ogre::VertexDeclaration *newDcl =
+         data->vertexDeclaration->getAutoOrganisedDeclaration(
+             mesh->hasSkeleton() );
+-#else
++#elif (OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR < 8)
+     Ogre::VertexDeclaration *newDcl =
+         data->vertexDeclaration->getAutoOrganisedDeclaration(
+             mesh->hasSkeleton(), mesh->hasVertexAnimation() || (mesh->getPoseCount() > 0) );
++#else
++    Ogre::VertexDeclaration *newDcl =
++        data->vertexDeclaration->getAutoOrganisedDeclaration(
++            mesh->hasSkeleton(), mesh->hasVertexAnimation() || (mesh->getPoseCount() > 0),
++		    mesh->getSharedVertexDataAnimationIncludesNormals()); // what about Pose objects?
+ #endif
+     if ( *newDcl != *(data->vertexDeclaration) ) {
+         //Usages don't matter here since we're onlly exporting
+@@ -1109,35 +1114,35 @@
+     }
+ }
+ 
+-void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance )
+-{
+-    struct outputContext *ctxt = (struct outputContext*) outputcontext;
+-    MeshPtr newMesh = ctxt->top;
+-    if ( force || (newMesh->getNumLodLevels() <= 1) ) {
+-        if (newMesh->getNumLodLevels() <= 1)
+-            newMesh->removeLodLevels();
+-        const Ogre::ProgressiveMesh::VertexReductionQuota quota = Ogre::ProgressiveMesh::VRQ_PROPORTIONAL;
+-        const Real reduction  = Real( 1-reductionFactor );
+-        
+-        Real currDist = refDistance;
+-        
+-    #if (OGRE_VERSION >= 0x010700)
+-        Ogre::Mesh::LodValueList distanceList;
+-
+-        // pixel area is squared length, and length is proportional to triangle count
+-        const Real distFactor = reductionFactor * reductionFactor; 
+-        newMesh->setLodStrategy(Ogre::LodStrategyManager::getSingletonPtr()->
+-            getStrategy( "PixelCount" ) );
+-    #else
+-        Ogre::Mesh::LodDistanceList distanceList;
+-        const Real distFactor = ( (reduction > 0.00001) ? 1/reduction : 1 );
+-    #endif
+-
+-        for (int iLod = 0; iLod < numLod; ++iLod, currDist *= distFactor)
+-            distanceList.push_back( currDist );
+-        newMesh->generateLodLevels( distanceList, quota, reduction );
+-    }
+-}
++//void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance )
++//{
++//    struct outputContext *ctxt = (struct outputContext*) outputcontext;
++//    MeshPtr newMesh = ctxt->top;
++//    if ( force || (newMesh->getNumLodLevels() <= 1) ) {
++//        if (newMesh->getNumLodLevels() <= 1)
++//            newMesh->removeLodLevels();
++//        const Ogre::ProgressiveMesh::VertexReductionQuota quota = Ogre::ProgressiveMesh::VRQ_PROPORTIONAL;
++//        const Real reduction  = Real( 1-reductionFactor );
++//        
++//        Real currDist = refDistance;
++//        
++//    #if (OGRE_VERSION >= 0x010700)
++//        Ogre::Mesh::LodValueList distanceList;
++//
++//        // pixel area is squared length, and length is proportional to triangle count
++//        const Real distFactor = reductionFactor * reductionFactor; 
++//        newMesh->setLodStrategy(Ogre::LodStrategyManager::getSingletonPtr()->
++//            getStrategy( "PixelCount" ) );
++//    #else
++//        Ogre::Mesh::LodDistanceList distanceList;
++//        const Real distFactor = ( (reduction > 0.00001) ? 1/reduction : 1 );
++//    #endif
++//
++//        for (int iLod = 0; iLod < numLod; ++iLod, currDist *= distFactor)
++//            distanceList.push_back( currDist );
++//        newMesh->generateLodLevels( distanceList, quota, reduction );
++//    }
++//}
+ 
+ void DoneMeshes( void *outputcontext )
+ {
+diff -ruN ./objconv/mesher/to_OgreMesh.h ../c/objconv/mesher/to_OgreMesh.h
+--- ./objconv/mesher/to_OgreMesh.h	2010-02-25 16:22:25.000000000 +0100
++++ ../c/objconv/mesher/to_OgreMesh.h	2020-09-03 16:25:55.873086621 +0200
+@@ -20,7 +20,7 @@
+ float RadialSize( void *outputcontext );     //returns the size of the resulting mesh (it's maximum distance from 0,0,0). Useful for LODding.
+ 
+ void Optimize( void *outputcontext );     //a good idea - reorganizes internal buffers so that the output mesh is more efficient
+-void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance );     //autogenerates LOD levels - if force==true, will discard current LOD data
++//void AutoLOD( void *outputcontext, bool force, int numLod, float reductionFactor, float refDistance );     //autogenerates LOD levels - if force==true, will discard current LOD data
+ void AutoEdgeList( void *outputcontext );     //a good idea - prepares the mesh for stencil shadows
+ void AutoTangents( void *outputcontext );     //prepares the mesh for normal mapping (only needed if the material uses normal mapping)
+ }
+diff -ruN ./setup/src/c/setup.cpp ../c/setup/src/c/setup.cpp
+--- ./setup/src/c/setup.cpp	2011-03-15 01:28:47.000000000 +0100
++++ ../c/setup/src/c/setup.cpp	2020-09-03 16:25:55.873086621 +0200
+@@ -110,10 +110,22 @@
+                 return 1;
+             }
+         }
+-        
++
+ #ifdef DATA_DIR
+         data_paths.push_back( DATA_DIR );
+ #endif
++		/* whatever the plan was, it does not work on Linux - at least
++		 * not at this stage. Hence, use fixed absolute paths to
++		 * find data directory
++		 */ 
++		data_paths.push_back( "/usr/share/games/vegastrike/data");
++		data_paths.push_back( "/usr/share/vegastrike/data");
++		data_paths.push_back( "/usr/games/vegastrike/data");
++		data_paths.push_back( "/usr/local/share/games/vegastrike/data");
++		data_paths.push_back( "/usr/local/share/vegastrike/data");
++		data_paths.push_back( "/usr/local/games/vegastrike/data");
++		data_paths.push_back( "/opt/vegastrike/data");
++
+         data_paths.push_back( origpath );
+         data_paths.push_back( string( origpath )+"/.." );
+         data_paths.push_back( string( origpath )+"/../data4.x" );
+@@ -133,22 +145,7 @@
+         data_paths.push_back( "../Resources" );
+         data_paths.push_back( "../Resources/data" );
+         data_paths.push_back( "../Resources/data4.x" );
+-/*
+- *               data_paths.push_back( "/usr/share/local/vegastrike/data");
+- *               data_paths.push_back( "/usr/local/share/vegastrike/data");
+- *               data_paths.push_back( "/usr/local/vegastrike/data");
+- *               data_paths.push_back( "/usr/share/vegastrike/data");
+- *               data_paths.push_back( "/usr/local/games/vegastrike/data");
+- *               data_paths.push_back( "/usr/games/vegastrike/data");
+- *               data_paths.push_back( "/opt/share/vegastrike/data");
+- *               data_paths.push_back( "/usr/share/local/vegastrike/data4.x");
+- *               data_paths.push_back( "/usr/local/share/vegastrike/data4.x");
+- *               data_paths.push_back( "/usr/local/vegastrike/data4.x");
+- *               data_paths.push_back( "/usr/share/vegastrike/data4.x");
+- *               data_paths.push_back( "/usr/local/games/vegastrike/data4.x");
+- *               data_paths.push_back( "/usr/games/vegastrike/data4.x");
+- *               data_paths.push_back( "/opt/share/vegastrike/data4.x");
+- */
++
+         //Win32 data should be "."
+         char tmppath[16384];
+         for (vector< string >::iterator vsit = data_paths.begin(); vsit != data_paths.end(); vsit++) {
+diff -ruN ./setup/src/include/central.cpp ../c/setup/src/include/central.cpp
+--- ./setup/src/include/central.cpp	2004-10-25 04:27:13.000000000 +0200
++++ ../c/setup/src/include/central.cpp	2020-09-03 17:45:35.786329482 +0200
+@@ -20,6 +20,8 @@
+ struct group GROUPS;
+ struct global_settings CONFIG;
+ 
++static char EMPTY_STR[] = "";
++
+ // Primary initialization function. Sets everything up and takes care of the program
+ void Start(int * argc, char ***argv) {
+ 	LoadMainConfig();
+@@ -65,7 +67,7 @@
+ 		if (CUR->name == NULL) { continue; }
+ 		if (strcmp(CUR->name, group) == 0) { return CUR->setting; }
+ 	} while ((CUR = CUR->next) > 0);
+-	return '\0';
++	return EMPTY_STR;
+ }
+ 
+ struct catagory *GetCatStruct(char *name) {
+diff -ruN ./src/cmd/music.cpp ../c/src/cmd/music.cpp
+--- ./src/cmd/music.cpp	2012-03-19 09:20:14.000000000 +0100
++++ ../c/src/cmd/music.cpp	2020-09-03 16:25:55.874086608 +0200
+@@ -448,7 +448,9 @@
+             if (foundcache) {
+                 *me->music_load_info = wherecache->second;
+                 me->freeWav = false;
+-            }
++            } else if ( ! AUDLoadSoundFile(songname, me->music_load_info, true)) {
++				VSFileSystem::vs_dprintf(1, "Failed to load music file \"%s\"", songname);
++			}
+         }
+         if (me->freeWav && docacheme) {
+             me->freeWav = false;
+diff -ruN ./src/cmd/unit.cpp ../c/src/cmd/unit.cpp
+--- ./src/cmd/unit.cpp	2012-03-19 09:20:14.000000000 +0100
++++ ../c/src/cmd/unit.cpp	2020-09-03 16:25:55.875086596 +0200
+@@ -80,6 +80,7 @@
+ template < class UnitType >GameUnit< UnitType >::GameUnit( int ) : sparkle_accum( 0 )
+     , phalos( new HaloSystem() )
+ {
++	VSFileSystem::vs_dprintf(3, "Unit created by Constructor: template < class UnitType >GameUnit< UnitType >::GameUnit( int ) : sparkle_accum( 0 ), phalos( new HaloSystem() )\n");
+     this->Unit::Init();
+ }
+ 
+@@ -99,6 +100,14 @@
+     , phalos( new HaloSystem() )
+ {
+     Unit::Init( filename, SubU, faction, unitModifications, flightgrp, fg_subnumber, netxml );
++
++	std::string fn = string(filename);
++	std::string str_faction = string(FactionUtil::GetFaction(faction));
++	std::string objtype = UniverseUtil::LookupUnitStat( fn, str_faction, "Object_Type");
++	if (objtype.compare("Vessel") == 0) {
++		VSFileSystem::vs_dprintf(3, "Recomputing upgrades for (units.csv) Object_Type: %s\n", objtype.c_str());
++		UnitUtil::RecomputeUnitUpgrades(this);
++	}
+ }
+ 
+ template < class UnitType >GameUnit< UnitType >::~GameUnit()
+diff -ruN ./src/cmd/unit_collide.h ../c/src/cmd/unit_collide.h
+--- ./src/cmd/unit_collide.h	2012-03-19 09:20:14.000000000 +0100
++++ ../c/src/cmd/unit_collide.h	2020-09-03 17:34:09.178913256 +0200
+@@ -94,9 +94,9 @@
+     {
+         if ( !hugeobjects.empty() )
+             hugeobjects.clear();
+-        if ( this->active_huge.size() )
++        if ( this->active_huge->size() )
+             ha.clear();
+-        if ( this->accum_huge.size() )
++        if ( this->accum_huge->size() )
+             hb.clear();
+         acc_huge.clear();
+         act_huge.clear();
+diff -ruN ./src/cmd/unit_generic.cpp ../c/src/cmd/unit_generic.cpp
+--- ./src/cmd/unit_generic.cpp	2012-03-19 09:20:14.000000000 +0100
++++ ../c/src/cmd/unit_generic.cpp	2020-09-03 16:25:55.879086546 +0200
+@@ -4903,16 +4903,26 @@
+ 
+ static const string LOAD_FAILED = "LOAD_FAILED";
+ 
++//const Unit * makeFinalBlankUpgrade( string name, int faction )
++//{
++//    char  *unitdir    = GetUnitDir( name.c_str() );
++//    string limiternam = name;
++//    if (unitdir != name)
++//        limiternam = string( unitdir )+string( ".blank" );
++//    free( unitdir );
++//    const Unit *lim = UnitConstCache::getCachedConst( StringIntKey( limiternam, faction ) );
++//    if (!lim)
++//        lim = UnitConstCache::setCachedConst( StringIntKey( limiternam, faction ), makeBlankUpgrade( limiternam, faction ) );
++//    if (lim->name == LOAD_FAILED)
++//        lim = NULL;
++//    return lim;
++//}
++
+ const Unit * makeFinalBlankUpgrade( string name, int faction )
+ {
+-    char  *unitdir    = GetUnitDir( name.c_str() );
+-    string limiternam = name;
+-    if (unitdir != name)
+-        limiternam = string( unitdir )+string( ".blank" );
+-    free( unitdir );
+-    const Unit *lim = UnitConstCache::getCachedConst( StringIntKey( limiternam, faction ) );
++    const Unit *lim = UnitConstCache::getCachedConst( StringIntKey( name, faction ) );
+     if (!lim)
+-        lim = UnitConstCache::setCachedConst( StringIntKey( limiternam, faction ), makeBlankUpgrade( limiternam, faction ) );
++        lim = UnitConstCache::setCachedConst( StringIntKey( name, faction ), makeBlankUpgrade( name, faction ) );
+     if (lim->name == LOAD_FAILED)
+         lim = NULL;
+     return lim;
+@@ -6387,21 +6397,48 @@
+                                 int tmpammo = mounts[jmod].ammo;
+                                 if (mounts[jmod].ammo != -1 && up->mounts[i].ammo != -1) {
+                                     tmpammo += up->mounts[i].ammo;
+-                                    if (templ) {
+-                                        if (templ->GetNumMounts() > jmod) {
+-                                            if (templ->mounts[jmod].volume != -1) {
+-                                                if (templ->mounts[jmod].volume < mounts[jmod].type->volume*tmpammo) {
+-                                                    tmpammo =
+-                                                        (int) floor( .125
+-                                                                    +( (0
+-                                                                        +templ->mounts[jmod].volume)
+-                                                                      /mounts[jmod].type->volume ) );
++                                    if (ismissiletype) {
++                                        if (templ) {
++                                            if (templ->GetNumMounts() > jmod) {
++                                                if (templ->mounts[jmod].volume != -1) {
++                                                    if (templ->mounts[jmod].volume < mounts[jmod].type->volume*tmpammo) {
++                                                        tmpammo =
++                                                            (int) floor( .125
++                                                                        +( (0
++                                                                            +templ->mounts[jmod].volume)
++                                                                          /mounts[jmod].type->volume ) );
++                                                    }
+                                                 }
+                                             }
+                                         }
++                                        if (tmpammo*mounts[jmod].type->volume > mounts[jmod].volume)
++                                            tmpammo = (int) floor( .125+( (0+mounts[jmod].volume)/mounts[jmod].type->volume ) );
++                                    } else {
++                                        std::string ammoname = up->name.get();
++                                        std::size_t ammopos = ammoname.find("_ammo");
++                                        std::string weaponname = ammoname.substr(0, ammopos);
++
++                                        /* Do NOT delete this Unit because it will be either fetched
++                                        * from a cache or - if it has to be created - it will
++                                        * be automatically put in a cache.
++                                        * Deletion will corrupt the cache!
++                                        */
++                                        const Unit * weapon = getUnitFromUpgradeName(weaponname);
++
++                                        if (weapon == NULL || weapon->name == LOAD_FAILED) {
++                                            // this should not happen
++                                            VSFileSystem::vs_dprintf(1, "UpgradeMount(): FAILED to obtain weapon: %s\n", weaponname.c_str());
++                                            cancompletefully = false;
++                                            break;
++                                        }
++
++                                        int maxammo = weapon->mounts[0].ammo;
++
++                                        if (tmpammo > maxammo) {
++                                            tmpammo = maxammo;
++                                        }
+                                     }
+-                                    if (tmpammo*mounts[jmod].type->volume > mounts[jmod].volume)
+-                                        tmpammo = (int) floor( .125+( (0+mounts[jmod].volume)/mounts[jmod].type->volume ) );
++
+                                     if (tmpammo > mounts[jmod].ammo) {
+                                         cancompletefully = true;
+                                         if (touchme)
+diff -ruN ./src/cmd/unit_jump.h ../c/src/cmd/unit_jump.h
+--- ./src/cmd/unit_jump.h	2012-03-19 09:20:14.000000000 +0100
++++ ../c/src/cmd/unit_jump.h	2020-09-03 16:25:55.880086533 +0200
+@@ -108,7 +108,7 @@
+                      (tester = *i) != NULL; ++i)

+                     if (tester->isUnit() == UNITPTR && tester != this)

+                         if ( ( this->LocalPosition()-tester->LocalPosition() ).Magnitude() < this->rSize()+tester->rSize() )

+-                            SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()

++                            this->SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()

+                                            *( 4*( this->rSize()+tester->rSize() ) ) );

+             DealPossibleJumpDamage( this );

+             static int jumparrive = AUDCreateSound( vs_config->getVariable( "unitaudio", "jumparrive", "sfx43.wav" ), false );

+diff -ruN ./src/gfx/cockpit_xml.cpp ../c/src/gfx/cockpit_xml.cpp
+--- ./src/gfx/cockpit_xml.cpp	2010-12-15 09:53:40.000000000 +0100
++++ ../c/src/gfx/cockpit_xml.cpp	2020-09-03 16:30:00.313030701 +0200
+@@ -315,7 +315,7 @@
+         for (counter = 0; counter < 4; ++counter)
+             if (!replaced[counter]) {
+                 delete Pit[counter];
+-                Pit[counter] = false;
++                Pit[counter] = NULL;
+             }
+         break;
+     case UnitImages< void >::SHIELD4:
+diff -ruN ./src/gfx/quadsquare.cpp ../c/src/gfx/quadsquare.cpp
+--- ./src/gfx/quadsquare.cpp	2010-03-10 06:27:01.000000000 +0100
++++ ../c/src/gfx/quadsquare.cpp	2020-09-03 16:25:55.881086521 +0200
+@@ -13,9 +13,9 @@
+ #include <float.h>
+ #include <math.h>
+ #include <assert.h>
+-#include "quadsquare.h"
+ #include "gfxlib.h"
+ #include "aux_texture.h"
++#include "quadsquare.h"
+ using std::vector;
+ 
+ unsigned int*quadsquare::VertexAllocated;
+diff -ruN ./src/gui/text_area.cpp ../c/src/gui/text_area.cpp
+--- ./src/gui/text_area.cpp	2010-02-25 15:26:53.000000000 +0100
++++ ../c/src/gui/text_area.cpp	2020-09-03 17:46:51.883378138 +0200
+@@ -32,6 +32,8 @@
+  *  };
+  */
+ 
++static char EMPTY_STR[] = "";
++
+ TextArea::~TextArea() {}
+ 
+ TextArea::TextArea()
+@@ -316,7 +318,7 @@
+ {
+     TextAreaItem *search;
+     search = ItemList->FindCount( cur_selected, 0 );
+-    if (search == 0) return '\0';
++    if (search == 0) return EMPTY_STR;
+     if (type == 1) return search->name;
+ 
+     else return search->description;
+diff -ruN ./src/networking/lowlevel/packetmem.cpp ../c/src/networking/lowlevel/packetmem.cpp
+--- ./src/networking/lowlevel/packetmem.cpp	2008-03-31 10:20:19.000000000 +0200
++++ ../c/src/networking/lowlevel/packetmem.cpp	2020-09-03 16:25:55.881086521 +0200
+@@ -102,7 +102,7 @@
+     }
+     else
+     {
+-        _buffer.reset( 0 );
++        _buffer.reset();
+         _len = 0;
+     }
+ }
+diff -ruN ./src/pk3.cpp ../c/src/pk3.cpp
+--- ./src/pk3.cpp	2012-03-19 09:20:14.000000000 +0100
++++ ../c/src/pk3.cpp	2020-09-03 16:31:12.819124250 +0200
+@@ -356,7 +356,7 @@
+     }
+     //if the file isn't in the archive
+     if (index == -1)
+-        return false;
++        return NULL;
+     int flength = GetFileLen( index );
+ 
+     buffer = new char[flength];
+diff -ruN ./src/vsfilesystem.cpp ../c/src/vsfilesystem.cpp
+--- ./src/vsfilesystem.cpp	2012-03-19 09:20:14.000000000 +0100
++++ ../c/src/vsfilesystem.cpp	2020-09-03 16:25:55.882086508 +0200
+@@ -460,13 +460,15 @@
+ 
+ int vs_fprintf( FILE *fp, const char *format, ... )
+ {
++	int ret = 0;
+     if (!use_volumes) {
+         va_list ap;
+         va_start( ap, format );
+ 
+-        return vfprintf( fp, format, ap );
+-    } else {}
+-    return 0;
++        ret = vfprintf( fp, format, ap );
++		va_end(ap);
++    }
++    return ret;
+ }
+ 
+ void vs_dprintf( char level, const char *format, ... )
+@@ -475,19 +477,22 @@
+         va_list ap;
+         va_start( ap, format );
+         vfprintf( stderr, format, ap );
++		va_end(ap);
+     }
+ }
+ 
+ #if 0
+ int vs_fscanf( FILE *fp, const char *format, ... )
+ {
++	int ret = 0;
+     if (!use_volumes) {
+         va_list arglist;
+         va_start( arglist, format );
+         //return _input(fp,(unsigned char*)format,arglist);
+-        return vfscanf( fp, format, arglist );
+-    } else {}
+-    return 0;
++        ret = vfscanf( fp, format, arglist );
++		va_end(arglist);
++    }
++    return ret;
+ }
+ #endif
+ 
+@@ -563,6 +568,18 @@
+     data_paths.push_back( DATA_DIR );
+ #endif
+     if ( !vegastrike_cwd.empty() ) {
++		/* whatever the plan was, it does not work on Linux - at least
++		 * not at this stage. Hence, use fixed absolute paths to
++		 * find data directory
++		 */ 
++		data_paths.push_back( "/usr/share/games/vegastrike/data");
++		data_paths.push_back( "/usr/share/vegastrike/data");
++		data_paths.push_back( "/usr/games/vegastrike/data");
++		data_paths.push_back( "/usr/local/share/games/vegastrike/data");
++		data_paths.push_back( "/usr/local/share/vegastrike/data");
++		data_paths.push_back( "/usr/local/games/vegastrike/data");
++		data_paths.push_back( "/opt/vegastrike/data");
++
+         data_paths.push_back( vegastrike_cwd );
+         data_paths.push_back( vegastrike_cwd+"/.." );
+         data_paths.push_back( vegastrike_cwd+"/../data4.x" );
+@@ -1713,16 +1730,18 @@
+ 
+ int VSFile::Fprintf( const char *format, ... )
+ {
++	int ret = 0;
+     if (!UseVolumes[alt_type] || this->volume_type == VSFSNone) {
+         va_list ap;
+         va_start( ap, format );
+ 
+-        return vfprintf( this->fp, format, ap );
++        ret = vfprintf( this->fp, format, ap );
++		va_end(ap);
+     } else {
+         cerr<<"!!! ERROR : Writing is not supported within resource/volume files"<<endl;
+         VSExit( 1 );
+     }
+-    return 0;
++    return ret;
+ }
+ 
+ #if 0
+@@ -1742,18 +1761,17 @@
+     if (!UseVolumes[alt_type] || this->volume_type == VSFSNone) {
+         //return _input(fp,(unsigned char*)format,arglist);
+         ret = vfscanf( this->fp, newformat, arglist );
+-        va_end( arglist );
+     } else {
+         if (q_volume_format == vfmtVSR) {} else if (q_volume_format == vfmtPK3) {
+             //If the file has not been extracted yet we do now
+             checkExtracted();
+             ret = vsscanf( pk3_extracted_file+offset, newformat, arglist );
+             readbytes     = GetReadBytes( newformat, arglist );
+-            va_end( arglist );
+             cerr<<" SSCANF : Read "<<readbytes<<" bytes"<<endl;
+             this->offset += readbytes;
+         }
+     }
++	va_end( arglist );
+     delete[] newformat;
+     return ret;
+ }
diff --git a/games/vegastrike/patches/patch_partsfix-0.5.1.r1_2 b/games/vegastrike/patches/patch_partsfix-0.5.1.r1_2
new file mode 100644
index 0000000000..563de8f15c
--- /dev/null
+++ b/games/vegastrike/patches/patch_partsfix-0.5.1.r1_2
@@ -0,0 +1,315 @@
+diff -ruN ./master_part_list.csv ../b/master_part_list.csv
+--- ./master_part_list.csv	2011-08-18 23:31:22.000000000 +0200
++++ ../b/master_part_list.csv	2020-09-02 18:44:14.247248161 +0200
+@@ -545,11 +545,11 @@
+ ,,,,,
+ "jump_drive","upgrades/Jump_Drives",8000,16,2,"@upgrades/jump_drive.image@A jump drive is required for rapid interstellar travel via the jump network."
+ ,,,,,
+-"add_spec_capacitor01","upgrades/SPEC_Capacitors",6000,5,4,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
+-"add_spec_capacitor02","upgrades/SPEC_Capacitors",18000,10,6,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
+-"add_spec_capacitor03","upgrades/SPEC_Capacitors",32000,20,12,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
+-"add_spec_capacitor04","upgrades/SPEC_Capacitors",96000,40,18,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
+-"add_spec_capacitor05","upgrades/SPEC_Capacitors",150000,60,24,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
++"spec_capacitor01","upgrades/SPEC_Capacitors",6000,5,4,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
++"spec_capacitor02","upgrades/SPEC_Capacitors",18000,10,6,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
++"spec_capacitor03","upgrades/SPEC_Capacitors",32000,20,12,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
++"spec_capacitor04","upgrades/SPEC_Capacitors",96000,40,18,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
++"spec_capacitor05","upgrades/SPEC_Capacitors",150000,60,24,"@upgrades/reactor_capacitance.image@Capacitor for storing energy for FTL travel"
+ ,,,,,
+ "armor01","upgrades/Armor",4000,20,0,"@cargo/plasteel.image@Armor takes up no upgrade volume, but does add to the mass of your ship, affecting maneuverability"
+ "armor02","upgrades/Armor",8000,25,0,"@cargo/isometal.image@Armor takes up no upgrade volume, but does add to the mass of your ship, affecting maneuverability"
+diff -ruN ./units/units.csv ../b/units/units.csv
+--- ./units/units.csv	2011-09-22 00:20:24.000000000 +0200
++++ ../b/units/units.csv	2020-09-02 18:44:14.260247998 +0200
+@@ -1,7 +1,7 @@
+ ,"Directory","Name","STATUS","Object_Type","Combat_Role","Textual_Description","Hud_image","Unit_Scale","Cockpit","CockpitX","CockpitY","CockpitZ","Mesh","Shield_Mesh","Rapid_Mesh","BSP_Mesh","Use_BSP","Use_Rapid","NoDamageParticles","Mass","Moment_Of_Inertia","Fuel_Capacity","Hull","Armor_Front_Top_Right","Armor_Front_Top_Left","Armor_Front_Bottom_Right","Armor_Front_Bottom_Left","Armor_Back_Top_Right","Armor_Back_Top_Left","Armor_Back_Bottom_Right","Armor_Back_Bottom_Left","Shield_Front_Top_Right","Shield_Back_Top_Left","Shield_Front_Bottom_Right","Shield_Front_Bottom_Left","Shield_Back_Top_Right","Shield_Front_Top_Left","Shield_Back_Bottom_Right","Shield_Back_Bottom_Left","Shield_Recharge","Shield_Leak","Warp_Capacitor","Primary_Capacitor","Reactor_Recharge","Jump_Drive_Present","Jump_Drive_Delay","Wormhole","Outsystem_Jump_Cost","Warp_Usage_Cost","Afterburner_Type","Afterburner_Usage_Cost","Maneuver_Yaw","Maneuver_Pitch","Maneuver_Roll","Yaw_Governor","Pitch_Governor","Roll_Governor","Afterburner_Accel","Forward_Accel","Retro_Accel","Left_Accel","Right_Accel","Top_Accel","Bottom_Accel","Afterburner_Speed_Governor","Default_Speed_Governor","ITTS","Radar_Color","Radar_Range","Tracking_Cone","Max_Cone","Lock_Cone","Hold_Volume","Can_Cloak","Cloak_Min","Cloak_Rate","Cloak_Energy","Cloak_Glass","Repair_Droid","ECM_Rating","ECM_Resist","Ecm_Drain","Hud_Functionality","Max_Hud_Functionality","Lifesupport_Functionality","Max_Lifesupport_Functionality","Comm_Functionality","Max_Comm_Functionality","FireControl_Functionality","Max_FireControl_Functionality","SPECDrive_Functionality","Max_SPECDrive_Functionality","Slide_Start","Slide_End","Activation_Accel","Activation_Speed","Upgrades","Prohibited_Upgrades","Sub_Units","Sound","Light","Mounts","Net_Comm","Dock","Cargo_Import","Cargo","Explosion","Num_Animation_Stages","Upgrade_Storage_Volume","Heat_Sink_Rating","Shield_Efficiency","Num_Chunks","Chunk_0","Collide_Subunits","Spec_Interdiction","Tractorability"
+ "Key","String","string","For Internal Use Only","string","string","string","string","float","string","x=float","y=float","z=float(meters)","{filename(string);frame(int);texturetime(float)}","string","string","string","boolean","boolean","boolean","metric tons","metric tons * meters*meters","metric tons","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD","VSD/second","percentage","800MJ","100MJ","100MJ/s","Boolean","seconds","boolean","800MJ","800MJ/second","int type","100MJ/s","metric tons*degrees/second^2","metric tons*degrees/second^2","metric tons*degrees/second^2","degrees/sec","degrees/sec","degrees/sec","metric tons*m/s^2","metric tons*m/s^2","metric tons*m/s^2","metric tons*m/s^2","metric tons*m/s^2","metric tons**m/s^2","metric tons*m/s^2","meters/second","meters/second","boolean","boolean","meters","Degrees","Degrees","Degrees","m^3","boolean","percentage","percentage/second","800MJ/s","boolean","int","int","int","800MJ/s","1 normalized fraction","1 normalized fraction","1 normalized fraction","1 normalized fraction","1 normalized fraction","1 normalized fraction","1 normalized fraction","1 normalized fraction","1 normalized fraction","1 normalized fraction","seconds","seconds","m/s^2","m/s","{filename(string);mountoffset(int);subunoffset(int)}","Semicolon delineated list of prohibited upgrades, allowing up to a certain number if specified with colon.","{filename(string);x(meters);y(meters);z(meters);forex(meters);forey(meters);forez(meters);upx(meters);upy(meters);upz(meters);restricted(meters)}","shieldhit(string);armorhit(string);hullhit(string);jump(string);explode(string);cloak(string);engine(string)","{meshfile(string);x(meters);y(meters);z(meters);scale(meters);r(percentage);g(percentage);b(percentage);a(percentage);activationspeed(meters/second)}","{type(string);ammo(int);volume(meters);SIZE(string);x(meters);y(meters);z(meters);xyscale(meters);zscale(meters);forex(meters);forey(meters);forez(meters);upx(meters);upy(meters);upz(meters);functionality(percentage);maxfunctionality(percentage)}","?","{Type(int);x(meters);y(meters);z(meters);size(meters);minsize(meters)}","{Cat(string);price(percentage);pricestddev(percentage);quant(percentage);quantstddev(percentage)}","{filename(string);Category(string);price(credits);quant(int);mass(metric Tons);volume(meters*meters*meters);functionality(percentage);maxfunctionality(percentage);description(string);missionCargo(bool)}","string","int","float","float","float(percent)","int","{mesh;;}","boolean",,"pPiI"
+ ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-"Admonisher_Milspec_Package__upgrades",,"Admonisher_Milspec_Package",,,,,,,,,,,,,,,,,,360,360,,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield08;;}{add_spec_capacitor03;;}{capacitor07;;}{reactor10;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}",,,,,,,,,,,,,,,,,,,
++"Admonisher_Milspec_Package__upgrades",,"Admonisher_Milspec_Package",,,,,,,,,,,,,,,,,,360,360,,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield08;;}{spec_capacitor03;;}{capacitor07;;}{reactor10;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}",,,,,,,,,,,,,,,,,,,
+ "Ancestor_Milspec_Package__upgrades",,"Ancestor_Milspec_Package",,,,,,,,,,,,,,,,,,112,112,,120,18.75,18.75,18.75,18.75,18.75,18.75,18.75,18.75,200,180,,,,,,,30,0,590,300,60,TRUE,1,,200,40,1,4,50000,50000,50000,55,55,55,18000,15000,9000,5000,5000,5000,5000,275,275,FALSE,TRUE,300000000,5,180,10,175,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+ "Areus_Milspec_Package__upgrades",,"Areus_Milspec_Package",,,,,,,,,,,,,,,,,,216,216,,,150,150,150,150,137.5,137.5,137.5,137.5,600,600,600,600,,,,,40,0,1600,1200,240,TRUE,,,200,200,1,4,,,,70,75,70,,,,,,,,,,TRUE,TRUE,300000000,8,180,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+ "Ariston_Milspec_Package__upgrades",,"Ariston_Milspec_Package",,,,,,,,,,,,,,,,,,160,160,,500,120,120,120,120,120,120,120,120,475,475,475,475,,,,,90,0,1360,1492,248,TRUE,1,,200,60,1,4,60000,60000,60000,80,90,100,21600,15000,10000,4000,4000,4000,4000,260,260,TRUE,TRUE,300000000,5,180,10,40,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+@@ -9,15 +9,15 @@
+ "Convolution_Milspec_Package__upgrades",,"Convolution_Milspec_Package",,,,,,,,,,,,,,,,,,80,80,,165,41.25,41.25,41.25,41.25,41.25,41.25,41.25,41.25,300,300,300,300,,,,,45,0,300,357,32,TRUE,1,,200,45,1,4,50000,50000,50000,60,70,65,16000,15000,12000,3000,3000,3000,3000,310,310,TRUE,TRUE,300000000,5,180,10,25,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+ "Derivative_Milspec_Package__upgrades",,"Derivative_Milspec_Package",,,,,,,,,,,,,,,,,,60,60,,275,61.5,61.5,61.5,61.5,61.5,61.5,61.5,61.5,420,420,,,,,,,120,0,250,512,128,TRUE,1,,200,40,1,4,50000,50000,50000,65,70,80,18000,14000,12000,4000,4000,4000,4000,460,460,TRUE,TRUE,300000000,5,180,10,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+ "Determinant_Milspec_Package__upgrades",,"Determinant_Milspec_Package",,,,,,,,,,,,,,,,,,54,54,,150,45,45,45,45,40,40,40,40,300,300,300,300,,,,,45,0,300,357,32,TRUE,1,,200,45,1,4,50000,50000,50000,55,55,60,18000,14000,12000,3000,3000,3000,3000,460,460,TRUE,TRUE,300000000,5,180,10,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+-"Dodo_Milspec_Package__upgrades",,"Dodo_Milspec_Package",,,,,,,,,,,,,,,,,,560,560,,1600,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,300000000,4,180,25,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor01;;}{quadshield02;;}{add_spec_capacitor01;;}{capacitor02;;}{reactor03;;}{skyscope2;;}",,,,,,,,,,,,,,,,,,,
+-"Dostoevsky_Milspec_Package__upgrades",,"Dostoevsky_Milspec_Package",,,,,,,,,,,,,,,,,,42,42,,250,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,460,460,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{add_spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}",,,,,,,,,,,,,,,,,,,
++"Dodo_Milspec_Package__upgrades",,"Dodo_Milspec_Package",,,,,,,,,,,,,,,,,,560,560,,1600,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,300000000,4,180,25,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor01;;}{quadshield02;;}{spec_capacitor01;;}{capacitor02;;}{reactor03;;}{skyscope2;;}",,,,,,,,,,,,,,,,,,,
++"Dostoevsky_Milspec_Package__upgrades",,"Dostoevsky_Milspec_Package",,,,,,,,,,,,,,,,,,42,42,,250,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,460,460,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}",,,,,,,,,,,,,,,,,,,
+ "Franklin_Milspec_Package__upgrades",,"Franklin_Milspec_Package",,,,,,,,,,,,,,,,,,152,152,,900,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,80,87,95,40000,40000,22000,10000,10000,10000,10000,440,440,FALSE,FALSE,300000000,5,180,10,300,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+-"Gawain_Milspec_Package__upgrades",,"Gawain_Milspec_Package",,,,,,,,,,,,,,,,,,72,72,,400,1,1,1,1,1,1,1,1,0,0,,,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{dualshield04;;}{add_spec_capacitor02;;}{capacitor03;;}{reactor04;;}{jump_drive;;}{starscanner2;;}{ecm_package01;;}",,,,,,,,,,,,,,,,,,,
++"Gawain_Milspec_Package__upgrades",,"Gawain_Milspec_Package",,,,,,,,,,,,,,,,,,72,72,,400,1,1,1,1,1,1,1,1,0,0,,,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{dualshield04;;}{spec_capacitor02;;}{capacitor03;;}{reactor04;;}{jump_drive;;}{starscanner2;;}{ecm_package01;;}",,,,,,,,,,,,,,,,,,,
+ "Goddard_Milspec_Package__upgrades",,"Goddard_Milspec_Package",,,,,,,,,,,,,,,,,,4800,4800,,2100,450,450,450,450,400,400,400,400,1400,1400,1400,1400,,,,,200,0,450,4000,500,TRUE,1,,200,200,1,4,100000,100000,100000,55,55,50,150000,130000,110000,60000,60000,60000,60000,220,220,TRUE,TRUE,150000000,15,180,90,1000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+-"Lancelot_Milspec_Package__upgrades",,"Lancelot_Milspec_Package",,,,,,,,,,,,,,,,,,208,208,,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,50,50,55,30000,27000,22000,5000,5000,5000,5000,490,490,FALSE,FALSE,300000000,5,180,10,75,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield07;;}{add_spec_capacitor03;;}{capacitor06;;}{reactor06;;}{jump_drive;;}{starscanner3;;}{ecm_package02;;}",,,,,,,,,,,,,,,,,,,
++"Lancelot_Milspec_Package__upgrades",,"Lancelot_Milspec_Package",,,,,,,,,,,,,,,,,,208,208,,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,50,50,55,30000,27000,22000,5000,5000,5000,5000,490,490,FALSE,FALSE,300000000,5,180,10,75,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield07;;}{spec_capacitor03;;}{capacitor06;;}{reactor06;;}{jump_drive;;}{starscanner3;;}{ecm_package02;;}",,,,,,,,,,,,,,,,,,,
+ "Mule_Milspec_Package__upgrades",,"Mule_Milspec_Package",,,,,,,,,,,,,,,,,,32000,32000,,14000,825,825,825,825,1000,1000,1000,1000,2300,3000,2000,2000,,,,,30,0,1200,5000,80,TRUE,1,,400,,1,8,60000,60000,60000,10,10,10,600000,300000,300000,50000,50000,50000,50000,40,40,TRUE,TRUE,300000000,4,180,25,200000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+ "Nicander_Milspec_Package__upgrades",,"Nicander_Milspec_Package",,,,,,,,,,,,,,,,,,61,61,,271,90.5,90.5,90.5,90.5,90.5,90.5,90.5,90.5,360,360,,,,,,,90,0,1300,500,160,TRUE,1,,200,45,1,4,60000,60000,60000,90,100,120,21600,15000,10000,4000,4000,4000,4000,380,380,TRUE,TRUE,300000000,5,180,10,25,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+-"Pacifier_Milspec_Package__upgrades",,"Pacifier_Milspec_Package",,,,,,,,,,,,,,,,,,640,640,,800,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,180,180,FALSE,FALSE,300000000,8,180,50,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{add_spec_capacitor04;;}{capacitor09;;}{reactor07;;}{jump_drive;;}{hawkeye2;;}{ecm_package03;;}",,,,,,,,,,,,,,,,,,,
++"Pacifier_Milspec_Package__upgrades",,"Pacifier_Milspec_Package",,,,,,,,,,,,,,,,,,640,640,,800,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,180,180,FALSE,FALSE,300000000,8,180,50,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{spec_capacitor04;;}{capacitor09;;}{reactor07;;}{jump_drive;;}{hawkeye2;;}{ecm_package03;;}",,,,,,,,,,,,,,,,,,,
+ "Progeny_Milspec_Package__upgrades",,"Progeny_Milspec_Package",,,,,,,,,,,,,,,,,,64,64,,165,65,65,65,65,45,45,45,45,420,60,100,100,,,,,42,0,250,300,40,TRUE,1,,200,20,1,4,50000,50000,50000,85,70,85,18000,15000,9000,5000,5000,5000,5000,340,340,FALSE,TRUE,300000000,5,180,10,20,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+ "Schroedinger_Milspec_Package__upgrades",,"Schroedinger_Milspec_Package",,,,,,,,,,,,,,,,,,120,120,,194,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,360,360,360,360,,,,,100,0,360,720,120,TRUE,1,,200,40,1,4,50000,50000,50000,90,90,90,30000,30000,22000,5000,5000,5000,5000,650,650,FALSE,TRUE,300000000,5,180,10,75,1,0.3,0.1,1,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+ "Shizu_Milspec_Package__upgrades",,"Shizu_Milspec_Package",,,,,,,,,,,,,,,,,,130,130,,255,37.5,37.5,37.5,37.5,37.5,37.5,37.5,37.5,50,50,50,50,,,,,50,0,450,300,60,TRUE,1,,200,50,3,0,50000,50000,50000,110,110,110,12000,12000,12000,12000,12000,12000,12000,340,340,FALSE,TRUE,300000000,5,180,10,40,,0.3,0.1,60,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,,,,,,,,,,,,,,,,,
+@@ -341,11 +341,11 @@
+ "Starfortress__aera","./factions/aera/starfortress","Starfortress__aera",,"Installation","BASE","WRITEME","aerastarfortress-hud.spr",3,,,,,"{starfortress.bfxm;;}",,,,,,,43911034000,43911034000,3659252833,80000000,4000,4000,4000,4000,4000,4000,4000,4000,246802,246802,246802,246802,,,,,100,0,,25000000,210000,FALSE,,,,,0,,0,0,20,,,,0,0,0,0,0,0,0,,,FALSE,TRUE,300000000,5,180,180,1.00E+011,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,"{turretheavy;-569.400696;337.419067;375.000305;1.000000;-0.000000;0.000000;0.000000;0.000000;-1.000000;180.0}{turretheavy;604.729431;346.817444;375.000305;-0.000000;0.000000;-1.000000;-0.135850;0.990729;0.000000;180.0}{turretheavy;572.495300;-340.637878;375.000305;0.000000;0.000000;-1.000000;-0.192772;-0.981244;-0.000000;180.0}{turretheavy;-552.274109;-152.007675;375.000244;0.000000;0.000000;-1.000000;-0.192772;-0.981244;-0.000000;180.0}{turret;-999.445679;-69.772247;-612.431030;0.124033;-0.000002;-0.992278;0.698922;-0.709842;0.087365;180.0}{turretLR_PminusBeam;-1517.572876;-262.500000;675.897522;-0.995882;-0.000000;-0.090662;0.045191;-0.866916;-0.496401;180.0}{turretLR_PminusBeam;-1517.572876;262.500000;675.897522;-0.995882;0.000000;-0.090662;0.045191;0.866916;-0.496401;180.0}{turret;-1284.291260;16.650602;487.500000;0.000000;0.000000;-1.000000;-0.810475;-0.585773;-0.000000;180.0}{turret;-102.228752;-1090.169922;-623.771362;0.784838;-0.614916;-0.076865;-0.000002;0.124033;-0.992278;180.0}{turretLR_PminusBeam;262.500000;-1517.573120;675.897522;-0.090166;-0.090293;0.991825;0.000000;-0.995882;-0.090662;180.0}{turretLR_PminusBeam;-262.500000;-1517.572876;675.897522;-0.498453;-0.078596;0.863346;-0.000000;-0.995882;-0.090662;180.0}{turret;337.500000;-1077.565063;600.000000;0.000000;-0.882806;-0.469737;1.000000;0.000000;0.000000;180.0}{turretLR_PminusBeam;1517.573120;-262.500000;675.897522;0.078596;-0.498453;0.863346;0.995882;0.000001;-0.090662;180.0}{turretLR_PminusBeam;1517.573120;262.500000;675.897522;-0.078596;-0.498453;-0.863346;0.995882;-0.000001;-0.090662;180.0}{turret;-337.500000;1077.565308;600.000000;-1.000000;0.000000;0.000000;-0.000000;-0.469737;-0.882806;180.0}{turret;-125.000000;1053.349487;-619.168701;0.000002;-0.124038;-0.992278;-0.260700;-0.957965;0.119748;180.0}{turretLR_PminusBeam;262.500000;1517.573120;675.897400;0.090166;-0.090292;-0.991825;-0.000001;0.995882;-0.090662;180.0}{turretLR_PminusBeam;-262.500000;1517.572876;675.897400;0.498453;-0.078596;-0.863347;-0.000000;0.995882;-0.090662;180.0}{turret;1089.830322;130.688965;-623.728760;0.691112;-0.717566;-0.086389;-0.124033;0.000002;-0.992278;180.0}{turretbeamheavy;-612.451233;612.451538;600.000122;-0.707107;0.707107;0.000000;-0.000000;0.000000;-1.000000;180.0}{turretbeamheavy;-612.451111;-612.450867;600.000122;-0.707107;0.707107;0.000000;-0.707107;-0.707107;0.000001;180.0}{turretbeamheavy;612.450989;-612.451294;600.000122;0.000000;0.000000;1.000000;0.707107;-0.707107;0.000000;180.0}{turretbeamheavy;612.450806;612.451050;600.000122;0.707107;-0.707107;0.000000;0.707107;0.707107;0.000001;180.0}{turretmainheavy;-11.116958;84.176636;1949.999634;-0.999583;-0.028875;0.000000;0.000000;0.000000;1.000000;180.0}{turretbeam;-587.953369;587.953491;1050.000000;0.707106;0.707107;0.000000;-0.707107;0.707106;0.000000;180.0}{turretbeam;587.953064;587.953308;1050.000000;0.707107;-0.707107;0.000000;0.707107;0.707107;-0.000001;180.0}{turretbeam;-587.953003;-587.953247;1050.000000;-0.707107;0.707107;0.000000;-0.707107;-0.707107;-0.000001;180.0}{turretbeam;587.953308;-587.953369;1050.000000;-0.707107;-0.707107;0.000000;0.707107;-0.707107;0.000000;180.0}{turret;-2362.500488;-0.000582;-825.000183;0.338722;0.000000;-0.940886;-0.940886;-0.000000;-0.338722;180.0}{turret;-1020.000122;0.000000;2137.500244;-1.000000;0.000000;0.000000;0.000000;0.000000;1.000000;180.0}{turret;-1340.949341;0.000000;1725.000122;-0.494333;0.000000;-0.869273;-0.869273;0.000000;0.494333;180.0}{turret;-0.000590;2362.500244;-825.000244;1.000000;0.000000;-0.000001;-0.000000;0.940886;-0.338722;180.0}{turret;0.000000;1020.000061;2137.500244;-1.000000;0.000000;0.000000;0.000000;0.000000;1.000000;180.0}{turret;0.000514;-2362.500244;-825.000244;1.000000;0.000000;0.000000;0.000000;-0.940887;-0.338721;180.0}{turret;0.000000;-1020.000000;2137.500244;-1.000000;0.000000;0.000000;0.000000;0.000000;1.000000;180.0}{turret;0.000000;-1340.949341;1725.000122;-1.000000;0.000000;0.000000;0.000000;-0.869273;0.494333;180.0}{turret;0.000000;1340.949341;1725.000244;-1.000000;0.000000;0.000000;0.000000;0.869273;0.494333;180.0}{turret;2362.500244;0.000674;-825.000244;-0.000000;1.000000;0.000000;0.940887;0.000000;-0.338721;180.0}{turret;1019.999939;0.000000;2137.500244;0.000000;1.000000;0.000000;0.000000;-0.000000;1.000000;180.0}{turret;1340.949341;0.000000;1725.000122;-0.494333;0.000000;0.869273;0.869273;0.000000;0.494333;180.0}",,,"{Nicander.escort;6;;special-missile;33;18.5;0;;;0;0;1;0;1;0;1;1}{Nicander.escort;6;;special-missile;33;18.5;0;;;0;0;1;0;1;0;1;1}{Nicander.escort;6;;special-missile;33;18.5;0;;;0;0;1;0;1;0;1;1}{Nicander.escort;6;;special-missile;33;18.5;0;;;0;0;1;0;1;0;1;1}",,"{11;0;-1150;950;300;0}{20;0;-2300;950;300;0}{11;0;1150;950;300;0}{20;0;2300;950;300;0}{11;1150;0;950;300;0}{20;2300;0;950;300;0}{11;-1150;0;950;300;0}{20;-2300;0;950;300;0}{1;0;-950;950;300;0}{1;0;950;950;300;0}{1;950;0;950;300;0}{1;-950;0;950;300;0}{1;0;-750;950;300;0}{1;0;750;950;300;0}{1;750;0;950;300;0}{1;-750;0;950;300;0}{1;0;-550;950;300;0}{1;0;550;950;300;0}{1;550;0;950;300;0}{1;-550;0;950;300;0}{1;0;-250;950;300;0}{1;0;250;950;300;0}{1;250;0;950;300;0}{1;-250;0;950;300;0}{1;0;0;950;300;0}","{Consumer_and_Commercial_Goods/Domestic;.9;.2;30;20}{Consumer_and_Commercial_Goods/Electronics;1.2;.2;50;40}{Industrially_Manufactured_Goods/Agricultural;.8;.1;;}{Industrially_Manufactured_Goods/Construction;1.1;.2;10;10}{Industrially_Manufactured_Goods/Electronics;1.1;.2;20;10}{Industrially_Manufactured_Goods/Manufacturing;1.1;.1;50;30}{Industrially_Manufactured_Goods/Mining;.8;.1;;}{Industrially_Manufactured_Goods/Power_Utilities;1.2;.1;30;10}{Industrially_Manufactured_Goods/Recycled_Products;1.1;.1;10;7}{Natural_Products/Food/Aera;1.9;.2;150;2}{Natural_Products/Life-forms;.95;.1;;}{Natural_Products/Liquor;.9;.1;10;1}{Natural_Products/Renewable_Resources;.8;.1;;}{Raw_Materials/Gases;1.1;.1;10;10}{Raw_Materials/Hydrocarbons;.8;.1;;}{Raw_Materials/Industrial_Gems;1.1;.1;;}{Raw_Materials/Metals;.8;.1;;}{Raw_Materials/Stone;.8;.1;;}{Refined_Materials/Alloys/Aera;1;.1;20;20}{Refined_Materials/Chemicals;1.2;.3;10;10}{Refined_Materials/Precious_Metals;.8;.1;;}{Refined_Materials/Purified_and_Enhanced_Materials;.8;.1;;}{Refined_Materials/Radioactive_Metals;.8;.1;;}{Refined_Materials/Synthetics;1.05;.3;10;10}{Research;12;2;3;10}{Specialty_Goods/Entertainment;1.1;.2;10;10}{Specialty_Goods/Medical;.8;.1;;}{Specialty_Goods/Pharmaceutical;1.9;.1;3;3}{starships/Aera/Heavy;1;;10;50}{starships/Aera/Light;1;;35;170}{starships/Aera/Milspec;1;;5;20}{upgrades/Ammunition/Aera;1;.1;3000;2500}{upgrades/Armor;1;.1;25;75}{upgrades/Capacitors/Standard;1;.1;10;5}{upgrades/ECM_Systems;1;.1;15;70}{upgrades/Experimental;1.4;.2;;}{upgrades/Jump_Drives;1;.1;14;52}{upgrades/Miscellaneous/Aera_Milspec;1;.1;2;10}{upgrades/Overdrive;1;.1;22;102}{upgrades/Reactors/Standard;1;.1;45;175}{upgrades/Repair_Systems;1.1;.2;15;70}{upgrades/Sensors/Confed;1;.1;2;10}{upgrades/Sensors/Common;1;;10;50}{upgrades/Shield_Systems/Standard_Dual_Shields;1;.1;30;55}{upgrades/Shield_Systems/Standard_Quad_Shields;1;.1;27;35}{upgrades/Weapons/Beam_Arrays_Heavy;1;.1;2;10}{upgrades/Weapons/Beam_Arrays_Light;1;;10;50}{upgrades/Weapons/Beam_Arrays_Medium;1;.1;5;20}{upgrades/Weapons/Mount_Enhancements;1;.1;10;50}{upgrades/Weapons/Mounted_Guns_Aera_Milspec;1;.1;5;20}{upgrades/Weapons/Mounted_Guns_Heavy;1;.1;8;30}{upgrades/Weapons/Mounted_Guns_Light;1;;20;100}{upgrades/Weapons/Mounted_Guns_Medium;1;;10;50}{upgrades/Weapons/Turrets/Aera;1;.1;1;2}","{Pilot;Contraband;1000;0;.01;1;1;1;;0}",,0,1000000,0,,,,,0.75,"pPiI"
+ "Starfortress__rlaan","./installations/Rlaan_Star_Fortress","Starfortress__rlaan",,"Installation","BASE","Rlaan star fortress","rlaan_star_fortress-hud.sprite",66,,,,,"{rlaan_star_fortress.bfxm;;}",,,,,,,8241769.5,8241769.5,686814.13,712000,15000,15000,15000,15000,15000,15000,15000,15000,3000,3000,3000,3000,,,,,50,0,,40000,4000,FALSE,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,TRUE,300000000,5,180,180,1.00E+011,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,";;;;;;",,"{Zhuangzong;16;;special-missile;0;311;-1260;;;0;0;1;0;1;0;1;1}",,"{10;11.98;-0.39;17.92;0.88;0}{20;23.96;4;35.84;0.88;0}{10;17.8;-0.39;12.0;0.88;0}{20;35.6;4;24.0;0.88;0}{10;21.0;-0.39;4.24;0.88;0}{20;42.0;4;8.48;0.88;0}{10;21.0;-0.39;-4.19;0.88;0}{20;42.0;4;-4.38;0.88;0}{10;17.82;-0.39;-11.82;0.88;0}{20;36.64;4;-23.64;0.88;0}{10;11.95;-0.39;-17.86;0.88;0}{20;23.9;4;-35.72;0.88;0}{10;-17.77;-0.39;-12.06;0.88;0}{20;-35.54;4;-24.12;0.88;0}{10;-20.93;-0.39;-4.32;0.88;0}{20;-41.86;4;-8.64;0.88;0}{10;-20.93;-0.39;4.09;0.88;0}{20;-41.86;4;8.18;0.88;0}{10;-17.87;-0.39;11.81;0.88;0}{20;-35.74;4;23.62;0.88;0}{10;-12.08;-0.39;17.77;0.88;0}{20;-24.16;4;35.54;0.88;0}{10;-12.08;-0.39;-18.02;0.88;0}{20;-24.16;4;-36.04;0.88;0}{10;-4.24;-0.39;-21.05;0.88;0}{20;-8.48;4;-42.1;0.88;0}{10;-4.24;-0.39;21.05;0.88;0}{20;-8.48;4;42.1;0.88;0}{10;4.13;-0.39;21.05;0.88;0}{20;8.26;4;42.1;0.88;0}{10;4.13;-0.39;-21.25;0.88;0}{20;8.26;4;-42.5;0.88;0}","{Consumer_and_Commercial_Goods/Domestic;.9;.2;30;20}{Consumer_and_Commercial_Goods/Electronics;1.2;.2;50;40}{Industrially_Manufactured_Goods/Agricultural;.8;.1;;}{Industrially_Manufactured_Goods/Construction;1.55;.2;10;10}{Industrially_Manufactured_Goods/Electronics;1.1;.2;20;10}{Industrially_Manufactured_Goods/Manufacturing;1.1;.1;50;30}{Industrially_Manufactured_Goods/Mining;.8;.1;;}{Industrially_Manufactured_Goods/Power_Utilities;1.2;.1;30;10}{Industrially_Manufactured_Goods/Recycled_Products;1.1;.1;10;7}{Natural_Products/Food/Rlaan;1.9;.2;150;2}{Natural_Products/Life-forms;.95;.1;;}{Natural_Products/Liquor;.9;.1;10;1}{Natural_Products/Renewable_Resources;.8;.1;;}{Raw_Materials/Gases;1.1;.1;10;10}{Raw_Materials/Hydrocarbons;.8;.1;;}{Raw_Materials/Industrial_Gems;1.1;.1;;}{Raw_Materials/Metals;.8;.1;;}{Raw_Materials/Stone;.8;.1;;}{Refined_Materials/Alloys/Rlaan;1;.1;20;20}{Refined_Materials/Chemicals;1.125;.375;20;20}{Refined_Materials/Precious_Metals;.8;.1;;}{Refined_Materials/Purified_and_Enhanced_Materials;.8;.1;;}{Refined_Materials/Radioactive_Metals;.8;.1;;}{Research;12;2;3;10}{Specialty_Goods/Augmentation;1.1;.2;20;10}{Specialty_Goods/Entertainment;1.1;.2;10;10}{Specialty_Goods/Medical;1.9;.1;3;3}{Specialty_Goods/Pharmaceutical;1.85;.1;;3}{starships/Rlaan/Heavy;1;;25;120}{starships/Rlaan/Light;1;;20;100}{starships/Rlaan/Milspec;1;;5;20}{upgrades/Ammunition/Rlaan;1;.1;3000;250}{upgrades/Armor;1;.1;35;80}{upgrades/Capacitors/Standard;1;.1;20;10}{upgrades/ECM_Systems;1;.1;15;70}{upgrades/Experimental;1.4;.2;;}{upgrades/Jump_Drives;1;.1;18;54}{upgrades/Overdrive;1;.1;23;84}{upgrades/Reactors/Standard;1;.1;57;200}{upgrades/Repair_Systems;1.1;.2;15;70}{upgrades/Sensors/Rlaan;1;.1;3;10}{upgrades/Sensors/Common;1;;10;50}{upgrades/Shield_Systems/Standard_Dual_Shields;1;.1;50;60}{upgrades/Shield_Systems/Standard_Quad_Shields;1;.1;47;40}{upgrades/Weapons/Beam_Arrays_Heavy;1;.1;2;10}{upgrades/Weapons/Beam_Arrays_Light;1;;10;50}{upgrades/Weapons/Beam_Arrays_Medium;1;.1;5;20}{upgrades/Weapons/Beam_Arrays_Rlaan_Milspec;1;.1;-2;50}{upgrades/Weapons/Mount_Enhancements;1;.1;10;50}{upgrades/Weapons/Mounted_Guns_Heavy;1;.1;8;30}{upgrades/Weapons/Mounted_Guns_Light;1;;20;100}{upgrades/Weapons/Mounted_Guns_Medium;1;;10;50}{upgrades/Weapons/Mounted_Guns_Rlaan_Milspec;1;.1;5;20}{upgrades/Weapons/Turrets/Rlaan;1;.1;1;4}","{Pilot;Contraband;1200;0;.01;1;1;1;;0}",,0,1000000,0,,,,,0.75,"pPiI"
+ "Shipyard__forsaken.armature","./factions/forsaken/shipyard","Forsaken Shipyard Armature",,"Installation","TFIGHTER","Destroyable Eye-Candy -- contains dock and weapons",,24,,,,,"{forsakenyardarm.bfxm;;}",,,,,,,100000,100000,1,100000,25,25,25,25,25,25,25,25,300,300,,,,,,,10,0,,6000,60,FALSE,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,300000,5,180,180,1000000000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,,,";;;;;;",,"{Hyena;8;;special-missile;-29.5;-4.5;-66;;;0;0;1;0;1;0;1;1}",,"{1;-29.5;-4.5;-66;3;0}","{upgrades/Armor;1;.1;10;5}{upgrades/Capacitors/Standard;1;.1;10;5}{upgrades/Jump_Drives;1;.1;4;2}{upgrades/Overdrive;1;.1;3;2}{upgrades/Reactors/Standard;1;.1;10;5}{upgrades/Shield_Systems/Standard_Dual_Shields;1;.1;20;5}{upgrades/Shield_Systems/Standard_Quad_Shields;1;.1;20;5}",,,0,1000000,0,,,,,0.75,"pPiI"
+-"add_spec_capacitor01__upgrades",,"FTL Energy Capacitor I",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,200,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-"add_spec_capacitor02__upgrades",,"FTL Energy Capacitor II",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,400,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-"add_spec_capacitor03__upgrades",,"FTL Energy Capacitor III",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-"add_spec_capacitor04__upgrades",,"FTL Energy Capacitor IV",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,2000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-"add_spec_capacitor05__upgrades",,"FTL Energy Capacitor V",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,3000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
++"spec_capacitor01__upgrades",,"FTL Energy Capacitor I",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,200,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
++"spec_capacitor02__upgrades",,"FTL Energy Capacitor II",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,400,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
++"spec_capacitor03__upgrades",,"FTL Energy Capacitor III",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
++"spec_capacitor04__upgrades",,"FTL Energy Capacitor IV",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,2000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
++"spec_capacitor05__upgrades",,"FTL Energy Capacitor V",,"Upgrade_Additive",,"Capacitor for storing energy for FTL travel",,,,,,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,3000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+ "armor01__upgrades",,"Plasteel Armor",,"Upgrade_Additive",,"Armor takes up no upgrade volume, but does add to the mass of your ship, affecting maneuverability",,,,,,,,,,,,,,10,10,,,50,50,50,50,50,50,50,50,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+ "armor02__upgrades",,"Isometal Armor",,"Upgrade_Additive",,"Armor takes up no upgrade volume, but does add to the mass of your ship, affecting maneuverability",,,,,,,,,,,,,,10,10,,,100,100,100,100,100,100,100,100,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+ "armor03__upgrades",,"Polysteel Armor",,"Upgrade_Additive",,"Armor takes up no upgrade volume, but does add to the mass of your ship, affecting maneuverability",,,,,,,,,,,,,,10,10,,,150,150,150,150,150,150,150,150,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+@@ -463,16 +463,16 @@
+ "Goddard.milspec","./vessels/Goddard","Goddard",,"Vessel","BOMBER","Recently developed Andolian bomber. One of the most advanced and most expensive human craft currently in service.","goddard-hud.spr",5,"no-cockpit",0,0,13.5,"{goddard.bfxm;;}",,,,,,,4800,4800,166.67,2100,450,450,450,450,400,400,400,400,1400,1400,1400,1400,,,,,200,0,450,4000,500,TRUE,1,,200,200,1,4,100000,100000,100000,55,55,50,150000,130000,110000,60000,60000,60000,60000,220,220,TRUE,TRUE,150000000,15,180,90,1000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretpdlong;0;2.2;4.5;0;0;1;0;1;0;180.0}{turretpdlong;0;-4.05;10;0;0;1;0;-1;0;180.0}",";;;;;;","{supernova.bmp.bfxm;0;0;-4.4;1.2;;;;;}{supernova.bmp.bfxm;0.6;0;-4.4;1.2;;;;;}{supernova.bmp.bfxm;-0.6;0;-4.4;1.2;;;;;}{supernova.bmp.bfxm;1.2;0;-4.4;1.2;;;;;}{supernova.bmp.bfxm;-1.2;0;-4.4;1.2;;;;;}{supernova.bmp.bfxm;1.8;0;-4.3;1.2;;;;;}{supernova.bmp.bfxm;-1.8;0;-4.3;1.2;;;;;}{supernova.bmp.bfxm;5;0.275;-2;2;;;;;}{supernova.bmp.bfxm;4;0.275;-2;2;;;;;}{supernova.bmp.bfxm;-5;0.275;-2;2;;;;;}{supernova.bmp.bfxm;-4;0.275;-2;2;;;;;}{supernova.bmp.bfxm;8.75;0.275;-2.75;2;;;;;}{supernova.bmp.bfxm;9.75;0.275;-2.75;2;;;;;}{supernova.bmp.bfxm;-9.75;0.275;-2.75;2;;;;;}{supernova.bmp.bfxm;-8.75;0.275;-2.75;2;;;;;}","{;;800;heavy-missile;1;-2;7;;;;;;;;;1;1}{;;800;heavy-missile;-1;-2;7;;;;;;;;;1;1}{;;800;heavy-missile;1;-2;-1;;;;;;;;;1;1}{;;800;heavy-missile;-1;-2;-1;;;;;;;;;1;1}{;;5;light autotracking;12.5;0.1;0;;;;;;;;;1;1}{;;5;light autotracking;-12.5;0.1;0;;;;;;;;;1;1}{;;5;light autotracking;12.5;-0.1;0;;;;;;;;;1;1}{;;5;light autotracking;-12.5;-0.1;0;;;;;;;;;1;1}{;;5;light medium autotracking;-2;0;12;;;;;;;;;1;1}{;;5;light medium autotracking;2;-0;12;;;;;;;;;1;1}{;;30;medium heavy;0.1;-2;13;;;;;;;;;1;1}{;;30;medium heavy;0.1;-2;13;;;;;;;;;1;1}{;;30;medium heavy;0.1;-2;13;;;;;;;;;1;1}{;;80;light-missile medium-missile;4.1;0;-3;;;;;;;;;1;1}{;;80;light-missile medium-missile;3.9;0;-3;;;;;;;;;1;1}{;;80;light-missile medium-missile;-4.1;0;-3;;;;;;;;;1;1}{;;80;light-missile medium-missile;-3.9;0;-3;;;;;;;;;1;1}{;;80;light-missile medium-missile;8.1;0;-3;;;;;;;;;1;1}{;;80;light-missile medium-missile;7.9;0;-3;;;;;;;;;1;1}{;;80;light-missile medium-missile;-8.1;0;-3;;;;;;;;;1;1}{;;80;light-missile medium-missile;-7.9;0;-3;;;;;;;;;1;1}",,,,"{Goddard_Milspec_Package;upgrades/Packages/Milspec;200000;1;300;24000;1;1;Full-Custom Milspec Configuration;0}",,0,25000,0,,,,,,"pPiI"
+ "Kierkegaard","./vessels/Kierkegaard","Kierkegaard",,"Vessel","BOMBER","Andolian Protectorate Missileboat/Gunship","Kierkegaard-hud.spr",5,"no-cockpit",0,0,7,"{kierkegaard.bfxm;;}",,,,,,,1500,1500,60,1000,650,650,650,650,650,650,650,650,2800,2800,2400,2400,,,,,150,0,1600,2000,250,TRUE,1,,200,120,1,4,50000,50000,50000,45,50,55,60000,55000,40000,8000,8000,8000,8000,240,240,FALSE,FALSE,300000000,10,180,90,400,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretpdlong;0;2.3;-4.5;0;0;1;0;1;0;180.0}{turretpdlong;0;-1.9;5.75;0;0;1;0;-1;0;180.0}{turretbeam;2.1;2;-4.4;1.0;0;0;0;1;0;180.0}{turretbeam;-2.3;-0.65;-4.1;1.0;0;0;0;-1;0;180.0}{turretbeam;-2.1;2;-4.4;1.0;0;0;0;1;0;180.0}{turretbeam;2.3;-0.65;-4.1;1.0;0;0;0;-1;0;180.0}",";;;;;;","{supernova.bmp.bfxm;0;0.75;-7.5;4;;;;;}{supernova.bmp.bfxm;0;-2;0.3;1;;;;;}{supernova.bmp.bfxm;0.5;-2;0.3;1;;;;;}{supernova.bmp.bfxm;-0.5;-2;0.3;1;;;;;}{supernova.bmp.bfxm;0.25;-2;0.3;1;;;;;}{supernova.bmp.bfxm;-0.25;-2;0.3;1;;;;;}{supernova.bmp.bfxm;0;-1.6;-1.35;1;;;;;}{supernova.bmp.bfxm;0.4;-1.6;-1.35;1;;;;;}{supernova.bmp.bfxm;-0.4;-1.6;-1.35;1;;;;;}{supernova.bmp.bfxm;0.2;-1.6;-1.35;1;;;;;}{supernova.bmp.bfxm;-0.2;-1.6;-1.35;1;;;;;}","{Resignation;32;800;light-missile medium-missile special-missile;2.1;0.75;0;;;;;;;;;1;1}{Resignation;32;800;light-missile medium-missile special-missile;-2;0.75;0;;;;;;;;;1;1}",,,,,,0,4500,0,,,,,,"pPiI"
+ "Kierkegaard.blank","./vessels/Kierkegaard","Kierkegaard","MANEUVOUR","Vessel","BOMBER","Andolian Protectorate Missileboat/Gunship","Kierkegaard-hud.spr",5,"no-cockpit",0,0,7,"{kierkegaard.bfxm;;}",,,,,,,1300,1300,60,1000,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,40,45,40,60000,55000,40000,8000,8000,8000,8000,190,190,FALSE,FALSE,3000000,0,0,0,60,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0.75;-7.5;4;;;;;}{supernova.bmp.bfxm;0;-2;0.3;1;;;;;}{supernova.bmp.bfxm;0.5;-2;0.3;1;;;;;}{supernova.bmp.bfxm;-0.5;-2;0.3;1;;;;;}{supernova.bmp.bfxm;0.25;-2;0.3;1;;;;;}{supernova.bmp.bfxm;-0.25;-2;0.3;1;;;;;}{supernova.bmp.bfxm;0;-1.6;-1.35;1;;;;;}{supernova.bmp.bfxm;0.4;-1.6;-1.35;1;;;;;}{supernova.bmp.bfxm;-0.4;-1.6;-1.35;1;;;;;}{supernova.bmp.bfxm;0.2;-1.6;-1.35;1;;;;;}{supernova.bmp.bfxm;-0.2;-1.6;-1.35;1;;;;;}","{;;800;light-missile medium-missile special-missile;2.1;0.75;0;;;;;;;;;1;1}{;;800;light-missile medium-missile special-missile;-2;0.75;0;;;;;;;;;1;1}",,,,,,0,4500,0,,,,,,"pPiI"
+-"Pacifier","./vessels/Pacifier","Pacifier",,"Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,640,640,40.42,800,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,180,180,FALSE,FALSE,300000000,8,180,50,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{add_spec_capacitor04;;}{capacitor09;;}{reactor07;;}{jump_drive;;}{hawkeye2;;}{ecm_package03;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{HeavyIonBeam;;;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{MiniDriver;600;3;Light;.65;3.75;7;;;;;;;;;1;1}{MiniDriver;600;3;Light;-.65;3.75;7;;;;;;;;;1;1}{Hail;32;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{Hail;32;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{torpedo;2;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{torpedo;2;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{Dumbfire;16;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{Dumbfire;16;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,,,0,2500,0,,,,,,"pPiI"
++"Pacifier","./vessels/Pacifier","Pacifier",,"Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,640,640,40.42,800,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,180,180,FALSE,FALSE,300000000,8,180,50,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{spec_capacitor04;;}{capacitor09;;}{reactor07;;}{jump_drive;;}{hawkeye2;;}{ecm_package03;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{HeavyIonBeam;;;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{MiniDriver;600;3;Light;.65;3.75;7;;;;;;;;;1;1}{MiniDriver;600;3;Light;-.65;3.75;7;;;;;;;;;1;1}{Hail;32;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{Hail;32;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{torpedo;2;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{torpedo;2;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{Dumbfire;16;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{Dumbfire;16;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,,,0,2500,0,,,,,,"pPiI"
+ "Pacifier.blank","./vessels/Pacifier","Pacifier","MANEUVOUR","Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,486,486,40.42,800,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,175,175,FALSE,FALSE,100000,0,0,0,1000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{;;3;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{;;3;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{;;3;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{;;3;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{;;3;Light;.65;3.75;7;;;;;;;;;1;1}{;;3;Light;-.65;3.75;7;;;;;;;;;1;1}{;;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{;;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{;;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,,,0,2500,0,,,,,,"pPiI"
+ "Pacifier.milspec","./vessels/Pacifier","Pacifier",,"Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,640,640,40.42,800,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,,,TRUE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,180,180,FALSE,FALSE,300000000,8,180,50,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{;;15;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{;;3;Light;.65;3.75;7;;;;;;;;;1;1}{;;3;Light;-.65;3.75;7;;;;;;;;;1;1}{;;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{;;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{;;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,"{Pacifier_Milspec_Package;upgrades/Packages/Milspec;200000;1;114;2375;1;1;Full-Custom Milspec Configuration;0}",,0,2500,0,,,,,,"pPiI"
+-"Pacifier.rg","./vessels/Pacifier","Pacifier",,"Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,640,640,40.42,800,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,180,180,FALSE,FALSE,300000000,8,180,50,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{add_spec_capacitor04;;}{capacitor09;;}{reactor07;;}{jump_drive;;}{hawkeye2;;}{ecm_package03;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{HeavyIonBeam;;;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{MicroDriver;3000;3;Light;.65;3.75;7;;;;;;;;;1;1}{MicroDriver;3000;3;Light;-.65;3.75;7;;;;;;;;;1;1}{Hail;32;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{Hail;32;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{torpedo;2;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{torpedo;2;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{Dumbfire;16;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{Dumbfire;16;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,,,0,2500,0,,,,,,"pPiI"
+-"Pacifier.rgspec","./vessels/Pacifier","Pacifier",,"Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,640,640,40.42,800,1,1,1,1,1,1,1,1,1,0,0,0,,,,,0,0,25,,,TRUE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,180,180,FALSE,FALSE,300000000,8,180,50,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{add_spec_capacitor04;;}{capacitor09;;}{reactor07;;}{jump_drive;;}{hawkeye2;;}{ecm_package03;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{;;3;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{;;3;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{;;3;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{;;3;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{;;3;Light;.65;3.75;7;;;;;;;;;1;1}{;;3;Light;-.65;3.75;7;;;;;;;;;1;1}{;;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{;;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{;;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+-"Pacifier.stock","./vessels/Pacifier","Pacifier","MANEUVOUR","Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,500,500,40.42,800,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,175,175,FALSE,FALSE,300000000,4,180,25,1000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{;;15;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{;;3;Light;.65;3.75;7;;;;;;;;;1;1}{;;3;Light;-.65;3.75;7;;;;;;;;;1;1}{;;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{;;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{;;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,2500,0,,,,,,"pPiI"
++"Pacifier.rg","./vessels/Pacifier","Pacifier",,"Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,640,640,40.42,800,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,180,180,FALSE,FALSE,300000000,8,180,50,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{spec_capacitor04;;}{capacitor09;;}{reactor07;;}{jump_drive;;}{hawkeye2;;}{ecm_package03;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{HeavyIonBeam;;;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{MicroDriver;3000;3;Light;.65;3.75;7;;;;;;;;;1;1}{MicroDriver;3000;3;Light;-.65;3.75;7;;;;;;;;;1;1}{Hail;32;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{Hail;32;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{torpedo;2;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{torpedo;2;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{Dumbfire;16;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{Dumbfire;16;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,,,0,2500,0,,,,,,"pPiI"
++"Pacifier.rgspec","./vessels/Pacifier","Pacifier",,"Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,640,640,40.42,800,1,1,1,1,1,1,1,1,1,0,0,0,,,,,0,0,25,,,TRUE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,180,180,FALSE,FALSE,300000000,8,180,50,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{spec_capacitor04;;}{capacitor09;;}{reactor07;;}{jump_drive;;}{hawkeye2;;}{ecm_package03;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{;;3;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{;;3;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{;;3;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{;;3;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{;;3;Light;.65;3.75;7;;;;;;;;;1;1}{;;3;Light;-.65;3.75;7;;;;;;;;;1;1}{;;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{;;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{;;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,,,0,125,0,,,,,,"pPiI"
++"Pacifier.stock","./vessels/Pacifier","Pacifier","MANEUVOUR","Vessel","BOMBER","Aging Purist heavy fighter/bomber","osprey-hud.spr",1,"no-cockpit",0,0,17,"{pacifier.bfxm;;}",,,,,,,500,500,40.42,800,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,25,30,35,27000,19000,14000,4000,4000,4000,4000,175,175,FALSE,FALSE,300000000,4,180,25,1000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;-4;1.05;-15.5;13;;;;;}{supernova.bmp.bfxm;3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;-3.75;-.75;-17;18;;;;;}{supernova.bmp.bfxm;3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-3.75;-15.8;8;;;;;}{supernova.bmp.bfxm;5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-5.25;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;3.5;-5.1;-15.8;8;;;;;}{supernova.bmp.bfxm;-3.5;-5.1;-15.8;8;;;;;}","{;;15;Light Medium Heavy;1;-5.86;11.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1;-5.86;11.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;1;-8;11.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1;-8;11.5;;;;;;;;;1;1}{;;3;Light;.65;3.75;7;;;;;;;;;1;1}{;;3;Light;-.65;3.75;7;;;;;;;;;1;1}{;;8;special-missile;4;-3.75;.2;;;;;;;;;1;1}{;;8;special-missile;-4;-3.75;.2;;;;;;;;;1;1}{;;200;heavy-missile;-5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;200;heavy-missile;5.000000;-.9000000;-3.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;3.000000;-.9000000;-1.000000;;;;;;;;;1;1}{;;16;light-missile medium-missile;-3.000000;-.9000000;-1.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,2500,0,,,,,,"pPiI"
+ "Taizong","./vessels/Taizong","Taizong",,"Vessel","BOMBER","Rlaan mass production assault craft","taizong-hud.sprite",0.5,"rlaan-cockpit.cpt",0,0,39,"{taizong.bfxm;;}",,,,,,,240,240,19.17,1800,800,800,800,800,600,600,600,600,450,400,400,400,,,,,250,0,600,1400,360,TRUE,1,,200,200,3,0,40000,40000,40000,90,90,90,12000,12000,12000,12000,12000,12000,12000,310,310,,TRUE,300000000,12,180,49.46,50,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{KtekBeam;;;Light Medium Heavy autotracking;-9;-.25;-.75;;;;;;;;;1;1}{KtekBeam;;;Light Medium Heavy autotracking;9;-.25;-.75;;;;;;;;;1;1}{Ktek;;;Light;-4.5;-.6;12.25;;;;;;;;;1;1}{Ktek;;;Light;4.5;-.6;12.25;;;;;;;;;1;1}{MiniGravThumper;8;200;special-missile;0;-0.5;0;;;;;;;;;1;1}",,,,,"explosion_rlaan.ani",0,1500,0,,,,,,"pPiI"
+ "Taizong.blank","./vessels/Taizong","Taizong","MANEUVOUR","Vessel","BOMBER","Rlaan mass production assault craft","taizong-hud.sprite",0.5,"rlaan-cockpit.cpt",0,0,39,"{taizong.bfxm;;}",,,,,,,100,100,19.17,1200,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,3,0,50000,50000,50000,75,75,75,12000,12000,12000,12000,12000,12000,12000,250,250,FALSE,FALSE,100000,0,0,0,32,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;;Light Medium Heavy autotracking;-9;-.25;-.75;;;;;;;;;1;1}{;;;Light Medium Heavy autotracking;9;-.25;-.75;;;;;;;;;1;1}{;;;Light;-4.5;-.6;12.25;;;;;;;;;1;1}{;;;Light;4.5;-.6;12.25;;;;;;;;;1;1}{;;200;special-missile;0;-0.5;0;;;;;;;;;1;1}",,,,,"explosion_rlaan.ani",0,1500,0,,,,,,"pPiI"
+ "Taizong.milspec","./vessels/Taizong","Taizong",,"Vessel","BOMBER","Rlaan mass production assault craft","taizong-hud.sprite",0.5,"rlaan-cockpit.cpt",0,0,39,"{taizong.bfxm;;}",,,,,,,240,240,19.17,1200,140,140,140,140,122.5,122.5,122.5,122.5,350,300,300,300,,,,,250,0,600,1400,360,TRUE,1,,200,200,3,0,40000,40000,40000,90,90,90,12000,12000,12000,12000,12000,12000,12000,310,310,,TRUE,300000000,12,180,49.46,50,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;5;Light Medium Heavy autotracking;-9;-.25;-.75;;;;;;;;;1;1}{;;5;Light Medium Heavy autotracking;9;-.25;-.75;;;;;;;;;1;1}{;;5;Light;-4.5;-.6;12.25;;;;;;;;;1;1}{;;5;Light;4.5;-.6;12.25;;;;;;;;;1;1}{;;200;special-missile;0;-0.5;0;;;;;;;;;1;1}",,,,"{Taizong_Milspec_Package;upgrades/Packages/Milspec;200000;1;140;1425;1;1;Full-Custom Milspec Configuration;0}","explosion_rlaan.ani",0,1500,0,,,,,,"pPiI"
+-"Taizong.stock","./vessels/Taizong","Taizong","MANEUVOUR","Vessel","BOMBER","Rlaan mass production assault craft","taizong-hud.sprite",0.5,"rlaan-cockpit.cpt",0,0,39,"{taizong.bfxm;;}",,,,,,,114,114,19.17,1200,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,3,0,50000,50000,50000,75,75,75,12000,12000,12000,12000,12000,12000,12000,250,250,FALSE,FALSE,300000000,4,180,25,32,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;5;Light Medium Heavy autotracking;-9;-.25;-.75;;;;;;;;;1;1}{;;5;Light Medium Heavy autotracking;9;-.25;-.75;;;;;;;;;1;1}{;;5;Light;-4.5;-.6;12.25;;;;;;;;;1;1}{;;5;Light;4.5;-.6;12.25;;;;;;;;;1;1}{;;200;special-missile;0;-0.5;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}","explosion_rlaan.ani",0,1500,0,,,,,,"pPiI"
++"Taizong.stock","./vessels/Taizong","Taizong","MANEUVOUR","Vessel","BOMBER","Rlaan mass production assault craft","taizong-hud.sprite",0.5,"rlaan-cockpit.cpt",0,0,39,"{taizong.bfxm;;}",,,,,,,114,114,19.17,1200,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,3,0,50000,50000,50000,75,75,75,12000,12000,12000,12000,12000,12000,12000,250,250,FALSE,FALSE,300000000,4,180,25,32,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;5;Light Medium Heavy autotracking;-9;-.25;-.75;;;;;;;;;1;1}{;;5;Light Medium Heavy autotracking;9;-.25;-.75;;;;;;;;;1;1}{;;5;Light;-4.5;-.6;12.25;;;;;;;;;1;1}{;;5;Light;4.5;-.6;12.25;;;;;;;;;1;1}{;;200;special-missile;0;-0.5;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}","explosion_rlaan.ani",0,1500,0,,,,,,"pPiI"
+ "Archimedes","./vessels/Archimedes","Archimedes",,"Vessel","CAPITAL","Aging considerably, the Archimedes class remains formidable at long range, where it's arsenal of capital missiles of design more modern than itself maintain its martial standing with assistance from recent upgrades to the main battery of beam weapons and fully modern sensor equipment. However, limited time, resources, and fundamental design issues have meant that the rest of the ship shows the age of the design enough that the survivability of the craft is not as high as it once was, even if the offensive impact has increased.","archimedes-hud.sprite",1,,,,,"{archimedes.bfxm;;}",,,,,,,38400000,38400000,3820092.46,2210459,25000,25000,25000,25000,25000,25000,25000,25000,64000,64000,64000,64000,,,,,120,0,22000,100000,7000,TRUE,1,,20000,20000,1,16,10000000,10000000,10000000,3,3,4,250000000,180000000,140000000,10000000,10000000,10000000,10000000,25,25,TRUE,TRUE,300000000,24.49,180,84.26,200000000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Shady_Mechanic","{turretLR_PminusBeam;-0.65;-101.44;-14.37;0.0;0.0;1.0;0.0;-1.0;0.0;180.0}{turretLR_PminusBeam;-0.65;101.6;-14.37;0.0;0.0;1.0;0.0;1.0;0.0;180.0}{turretcapmissile;2.644841;0.400000;-4.770843;1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretcapmissile;2.187699;0.400000;-2.384122;0.129257;0.000000;0.991611;0.000000;1.000000;0.000000;180.0}{turretcapmissile;-3.073313;0.000000;-4.899379;-0.226708;0.000000;-0.973963;0.000000;-1.000000;-0.000000;180.0}{turretcapmissile;2.882210;0.000000;-4.341503;-0.226708;0.000000;0.973963;-0.000000;-1.000000;0.000000;180.0}{turretcapmissile;-1.312452;0.400000;5.613851;-0.315232;0.000000;0.949015;0.000000;1.000000;0.000000;180.0}{turretcapmissile;1.262048;0.600000;5.714783;0.793417;0.000000;-0.608679;0.000000;1.000000;0.000000;180.0}{turretpd;-2.381250;0.400000;-2.455606;0.226708;0.000000;0.973963;-0.000000;1.000000;0.000000;180.0}{turretpd;-3.243412;0.400000;-4.968820;-0.637206;0.000000;-0.770694;0.000000;1.000000;0.000000;180.0}{turretpd;2.644841;0.400000;-4.770843;1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretpd;2.187699;0.400000;-2.384122;0.129257;0.000000;0.991611;0.000000;1.000000;0.000000;180.0}{turretpd;-3.073313;0.000000;-4.899379;-0.226708;0.000000;-0.973963;0.000000;-1.000000;-0.000000;180.0}{turretpd;2.882210;0.000000;-4.341503;-0.226708;0.000000;0.973963;-0.000000;-1.000000;0.000000;180.0}{turretpd;-1.312452;0.400000;5.613851;-0.315232;0.000000;0.949015;0.000000;1.000000;0.000000;180.0}{turretpd;1.262048;0.600000;5.714783;0.793417;0.000000;-0.608679;0.000000;1.000000;0.000000;180.0}{turretpd;-0.750000;0.800000;1.975000;1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretpd;0.750000;0.800000;2.033626;0.000000;0.000000;1.000000;0.000000;1.000000;0.000000;180.0}{turretcapmissile;-0.000000;0.200000;13.616410;0.000000;0.000000;1.000000;0.000000;1.000000;0.000000;180.0}{turretcapmissile;-0.000000;0.000000;13.757195;-0.543227;0.000000;-0.839586;0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;-0.000000;-0.200000;5.096140;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;0.500000;-0.200000;7.500000;-0.597359;0.000000;0.801974;-0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;-0.50000;-0.200000;7.500000;-0.597359;0.000000;0.801974;-0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;-0.381250;0.800000;-6.455606;0.226708;0.000000;0.973963;-0.000000;1.000000;0.000000;180.0}{turretbeamheavy;0.381250;0.800000;-6.455606;0.226708;0.000000;0.973963;-0.000000;1.000000;0.000000;180.0}",";;;;;;","{supernova.bmp.bfxm;-0.65;-0.0;-1260.76;100;;;;;}{supernova.bmp.bfxm;-219.38;-0.0;-996.0;100;;;;;}{supernova.bmp.bfxm;-150.35;-0.0;-996.0;100;;;;;}{supernova.bmp.bfxm;-80.64;-0.0;-996.0;100;;;;;}{supernova.bmp.bfxm;220.49;-0.0;-996.0;100;;;;;}{supernova.bmp.bfxm;151.14;-0.0;-996.0;100;;;;;}{supernova.bmp.bfxm;80.98;-0.0;-996.0;100;;;;;}",,,"{;264.81;-0.0;-698.71;57.69;0}{;-264.17;-0.0;-698.71;57.69;0}","{Consumer_and_Commercial_Goods/Domestic;.9;.2;1;2}{Consumer_and_Commercial_Goods/Electronics;1.2;.2;1;4}{Contraband;;;;}{Industrially_Manufactured_Goods/Agricultural;.8;.1;;}{Industrially_Manufactured_Goods/Construction;.8;.2;;3}{Industrially_Manufactured_Goods/Electronics;.8;.2;;1}{Industrially_Manufactured_Goods/Manufacturing;.8;.1;1;3}{Industrially_Manufactured_Goods/Mining;.8;.1;;}{Industrially_Manufactured_Goods/Power_Utilities;1.2;.1;3;4}{Industrially_Manufactured_Goods/Recycled_Products;.78;.2;10;15}{Natural_Products/Food;1.2;.2;5;2}{Natural_Products/Life-forms;.9;.1;;}{Natural_Products/Liquor;1.05;.1;;1}{Natural_Products/Renewable_Resources;.8;.1;;}{Raw_Materials/Gases;1.1;.1;1;1}{Raw_Materials/Hydrocarbons;.8;.1;;}{Raw_Materials/Industrial_Gems;.8;.1;;}{Raw_Materials/Metals;.8;.1;;}{Raw_Materials/Stone;.8;.1;;}{Refined_Materials/Alloys;1.1;.1;;2}{Refined_Materials/Chemicals;1.1;.3;1;1}{Refined_Materials/Precious_Metals;.8;.1;;}{Refined_Materials/Purified_and_Enhanced_Materials;.8;.1;;}{Refined_Materials/Radioactive_Metals;.8;.1;;}{Specialty_Goods/Entertainment;1.1;.2;;4}{Specialty_Goods/Medical;1.1;.1;;3}{starships/Confed/Heavy;1;;-2;5}{starships/Confed/Light;1;;;3}{starships/Confed/Medium;1;;-3;9}{starships/Confed/Milspec;1;;-3;5}{starships/Regional_Guard/Heavy;1;;-2;3}{starships/Regional_Guard/Light;1;;;2}{starships/Regional_Guard/Medium;1;;;2}{upgrades/Ammunition/Confed;1;.1;-20;50}{upgrades/Armor;1;.1;;5}{upgrades/ECM_Systems;1;.1;;5}{upgrades/Experimental;1.4;.2;-20;23}{upgrades/Jump_Drives;1;.1;;5}{upgrades/Overdrive;1;.1;;5}{upgrades/Reactors/Standard;1;;;17}{upgrades/Repair_Systems;1.1;.2;;5}{upgrades/Sensors/Confed;1;.1;;1}{upgrades/Sensors/Common;1;;;5}{upgrades/Shield_Systems/Standard_Dual_Shields;1;;;5}{upgrades/Shield_Systems/Standard_Quad_Shields;1;.1;-2;5}{upgrades/SPEC_Capacitors;1;.1;4;2}{upgrades/Weapons/Beam_Arrays_Confed_Milspec;1;.1;;5}{upgrades/Weapons/Beam_Arrays_Heavy;1;.1;;1}{upgrades/Weapons/Beam_Arrays_Light;1;;;5}{upgrades/Weapons/Beam_Arrays_Medium;1;.1;;2}{upgrades/Weapons/Mount_Enhancements;1;.1;;5}{upgrades/Weapons/Mounted_Guns_Confed_Milspec;1;.1;;2}{upgrades/Weapons/Mounted_Guns_Heavy;1;.1;;3}{upgrades/Weapons/Mounted_Guns_Light;1;;;10}{upgrades/Weapons/Mounted_Guns_Medium;1;;;5}{upgrades/Weapons/Turrets;1;.1;1;1}",,,0,100000,0,,,,,,"pPiI"
+ "Archimedes.blank","./vessels/Archimedes","Archimedes",,"Vessel","CAPITAL","Aging considerably, the Archimedes class remains formidable at long range, where it's arsenal of capital missiles of design more modern than itself maintain its martial standing with assistance from recent upgrades to the main battery of beam weapons and fully modern sensor equipment. However, limited time, resources, and fundamental design issues have meant that the rest of the ship shows the age of the design enough that the survivability of the craft is not as high as it once was, even if the offensive impact has increased.","archimedes-hud.sprite",96,,,,,"{archimedes.bfxm;;}",,,,,,,38400000,38400000,3820092.46,2210459,12500,12500,12500,12500,12500,12500,12500,12500,42000,42000,42000,42000,,,,,120,0,22000,100000,7000,TRUE,1,,20000,20000,1,16,10000000,10000000,10000000,3,3,4,250000000,180000000,140000000,10000000,10000000,10000000,10000000,25,25,TRUE,TRUE,300000000,24.49,180,84.26,20000000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Shady_Mechanic","{turretcapmissile;-2.381250;0.400000;-2.455606;0.226708;0.000000;0.973963;-0.000000;1.000000;0.000000;180.0}{turretcapmissile;-3.243412;0.400000;-4.968820;-0.637206;0.000000;-0.770694;0.000000;1.000000;0.000000;180.0}{turretcapmissile;2.644841;0.400000;-4.770843;1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretcapmissile;2.187699;0.400000;-2.384122;0.129257;0.000000;0.991611;0.000000;1.000000;0.000000;180.0}{turretcapmissile;-3.073313;0.000000;-4.899379;-0.226708;0.000000;-0.973963;0.000000;-1.000000;-0.000000;180.0}{turretcapmissile;2.882210;0.000000;-4.341503;-0.226708;0.000000;0.973963;-0.000000;-1.000000;0.000000;180.0}{turretcapmissile;-1.312452;0.400000;5.613851;-0.315232;0.000000;0.949015;0.000000;1.000000;0.000000;180.0}{turretcapmissile;1.262048;0.600000;5.714783;0.793417;0.000000;-0.608679;0.000000;1.000000;0.000000;180.0}{turretpd;-2.381250;0.400000;-2.455606;0.226708;0.000000;0.973963;-0.000000;1.000000;0.000000;180.0}{turretpd;-3.243412;0.400000;-4.968820;-0.637206;0.000000;-0.770694;0.000000;1.000000;0.000000;180.0}{turretpd;2.644841;0.400000;-4.770843;1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretpd;2.187699;0.400000;-2.384122;0.129257;0.000000;0.991611;0.000000;1.000000;0.000000;180.0}{turretpd;-3.073313;0.000000;-4.899379;-0.226708;0.000000;-0.973963;0.000000;-1.000000;-0.000000;180.0}{turretpd;2.882210;0.000000;-4.341503;-0.226708;0.000000;0.973963;-0.000000;-1.000000;0.000000;180.0}{turretpd;-1.312452;0.400000;5.613851;-0.315232;0.000000;0.949015;0.000000;1.000000;0.000000;180.0}{turretpd;1.262048;0.600000;5.714783;0.793417;0.000000;-0.608679;0.000000;1.000000;0.000000;180.0}{turretpd;-0.750000;0.800000;1.975000;1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretpd;0.750000;0.800000;2.033626;0.000000;0.000000;1.000000;0.000000;1.000000;0.000000;180.0}{turretLR_PminusBeam;-0.000000;0.200000;13.616410;0.000000;0.000000;1.000000;0.000000;1.000000;0.000000;180.0}{turretLR_PminusBeam;-0.000000;0.000000;13.757195;-0.543227;0.000000;-0.839586;0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;-0.000000;-0.200000;5.096140;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;0.500000;-0.200000;7.500000;-0.597359;0.000000;0.801974;-0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;-0.50000;-0.200000;7.500000;-0.597359;0.000000;0.801974;-0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;-0.381250;0.800000;-6.455606;0.226708;0.000000;0.973963;-0.000000;1.000000;0.000000;180.0}{turretbeamheavy;0.381250;0.800000;-6.455606;0.226708;0.000000;0.973963;-0.000000;1.000000;0.000000;180.0}",";;;;;;","{supernova.bmp.bfxm;-0.007512;0.108995;-13.162303;0.420000;;;;;}{supernova.bmp.bfxm;-1.298644;0.250378;-9.955322;0.739999;;;;;}{supernova.bmp.bfxm;-2.182528;0.257965;-9.449021;0.779999;;;;;}{supernova.bmp.bfxm;-2.919419;0.241751;-9.026920;0.779999;;;;;}{supernova.bmp.bfxm;1.947601;0.169290;-9.583591;0.690000;;;;;}{supernova.bmp.bfxm;1.252088;0.181478;-9.981990;0.680000;;;;;}{supernova.bmp.bfxm;2.731254;0.138757;-9.134703;0.530000;;;;;}",,,"{;.50;.45;9;.3;0}{;-.50;.45;9;.3;0}",,,,0,100000,0,,,,,,"pPiI"
+ "Clydesdale","./vessels/Clydesdale","Clydesdale",,"Vessel","CAPITAL","The only warship produced at Merchant shipyards, the Clydesdale suffers somewhat from being a truly Confederation designed vessel, with noticeable committee effects. If not posessing unrivaled capabilities, nor visionary design, it is nonetheless a solid, workhorse of a vessel and produced, like all craft rolling off the Merchant shipyards, in some number.","clydesdale-hud.sprite",9.44,,,,,"{clydesdale.bfxm;;}","clydesdale-shield.bfxm",,,,,,29559158,29559158,2463263.17,1646000,22000,22000,22000,22000,22000,22000,22000,22000,36000,36000,36000,36000,,,,,80,0,25000,30000,700,TRUE,1,,20000,,1,16,20000000,20000000,20000000,4,4,12,300000000,200000000,150000000,10000000,10000000,10000000,10000000,35,35,TRUE,TRUE,300000000,8.11,180,95.74,50000000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Shady_Mechanic","{turretbeamheavy;0;-21.2;-18;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;0;-21.2;58;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;0;-21.2;95;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretbeamheavy;0;26.5;47;-1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretbeamheavy;0.64;55.5;-103;0;1;0;1;0;0;180.0}{turretbeamheavy;-0.64;55.5;-103;0;-1;0;-1;0;0;180.0}{turretbeamheavy;0.64;-55.5;-88;0;1;0;1;0;0;180.0}{turretbeamheavy;-0.64;-55.5;-88;0;-1;0;-1;0;0;180.0}{turretbeamheavy;0.64;-47.5;123.75;0;1;0;1;0;0;180.0}{turretbeamheavy;-0.64;-47.5;123.75;0;-1;0;-1;0;0;180.0}{turretbeam;4.5;26.35;91.75;-1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretbeam;-4.5;26.35;91.75;-1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretpd;4.5;26.35;54;-1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretpd;-4.5;26.35;54;-1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretpd;4.5;26.35;40;-1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretpd;-4.5;26.35;40;-1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretbeam;4.5;26.35;-18;-1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretbeam;-4.5;26.35;-18;-1.000000;0.000000;0.000000;-0.000000;1.000000;0.000000;180.0}{turretpd;4.5;-21.15;-15;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretpd;-4.5;-21.15;-15;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretbeam;4.5;-21.15;58;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretbeam;-4.5;-21.15;58;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretpd;4.5;-21.15;92;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}{turretpd;-4.5;-21.15;92;-1.000000;0.000000;0.000000;-0.000000;-1.000000;0.000000;180.0}",";;;;;;","{supernova.bmp.bfxm;-8;-12;-115;40;;;;;}{supernova.bmp.bfxm;-8;-5;-115;40;;;;;}{supernova.bmp.bfxm;-8;2;-115;40;;;;;}{supernova.bmp.bfxm;-12;-1;-115;20;;;;;}{supernova.bmp.bfxm;-14;1.75;-115;20;;;;;}{supernova.bmp.bfxm;-13;4.75;-115;20;;;;;}{supernova.bmp.bfxm;8;-12;-115;40;;;;;}{supernova.bmp.bfxm;8;-5;-115;40;;;;;}{supernova.bmp.bfxm;8;2;-115;40;;;;;}{supernova.bmp.bfxm;12;-1;-115;20;;;;;}{supernova.bmp.bfxm;14;1.75;-115;20;;;;;}{supernova.bmp.bfxm;13;4.75;-115;20;;;;;}{supernova.bmp.bfxm;-8.5;15.75;-115;50;;;;;}{supernova.bmp.bfxm;-15.125;13.5;-115;30;;;;;}{supernova.bmp.bfxm;-15.125;17.75;-115;30;;;;;}{supernova.bmp.bfxm;-22.25;12.5;-115;10;;;;;}{supernova.bmp.bfxm;-19.125;16.5;-115;10;;;;;}{supernova.bmp.bfxm;-18.25;18.5;-115;10;;;;;}{supernova.bmp.bfxm;8.5;15.75;-115;50;;;;;}{supernova.bmp.bfxm;15.125;13.5;-115;30;;;;;}{supernova.bmp.bfxm;15.125;17.75;-115;30;;;;;}{supernova.bmp.bfxm;22.25;12.5;-115;10;;;;;}{supernova.bmp.bfxm;19.125;16.5;-115;10;;;;;}{supernova.bmp.bfxm;18.25;18.5;-115;10;;;;;}","{torpedo;16;;;0.64;-40;120;;;;;;;;;1;1}{torpedo;16;;;-0.64;-40;120;;;;;;;;;1;1}{torpedo;16;;;1;-35;123;;;;;;;;;1;1}{torpedo;16;;;-1;-35;123;;;;;;;;;1;1}",,"{;0;-55;120;40;0}{;0;-30;0;30;0}","{Consumer_and_Commercial_Goods/Domestic;.9;.2;1;2}{Consumer_and_Commercial_Goods/Electronics;1.2;.2;1;4}{Contraband;;;;}{Industrially_Manufactured_Goods/Agricultural;.8;.1;;}{Industrially_Manufactured_Goods/Construction;.8;.2;;3}{Industrially_Manufactured_Goods/Electronics;.8;.2;;1}{Industrially_Manufactured_Goods/Manufacturing;.8;.1;1;3}{Industrially_Manufactured_Goods/Mining;.8;.1;;}{Industrially_Manufactured_Goods/Power_Utilities;1.2;.1;3;4}{Industrially_Manufactured_Goods/Recycled_Products;.78;.2;10;15}{Natural_Products/Food;1.2;.2;5;2}{Natural_Products/Life-forms;.9;.1;;}{Natural_Products/Liquor;1.05;.1;;1}{Natural_Products/Renewable_Resources;.8;.1;;}{Raw_Materials/Gases;1.1;.1;1;1}{Raw_Materials/Hydrocarbons;.8;.1;;}{Raw_Materials/Industrial_Gems;.8;.1;;}{Raw_Materials/Metals;.8;.1;;}{Raw_Materials/Stone;.8;.1;;}{Refined_Materials/Alloys;1.1;.1;;2}{Refined_Materials/Chemicals;1.1;.3;1;1}{Refined_Materials/Precious_Metals;.8;.1;;}{Refined_Materials/Purified_and_Enhanced_Materials;.8;.1;;}{Refined_Materials/Radioactive_Metals;.8;.1;;}{Specialty_Goods/Entertainment;1.1;.2;;4}{Specialty_Goods/Medical;1.1;.1;;3}{starships/Confed/Heavy;1;;-2;5}{starships/Confed/Light;1;;;3}{starships/Confed/Medium;1;;-3;9}{starships/Confed/Milspec;1;;-3;5}{starships/Regional_Guard/Heavy;1;;-2;3}{starships/Regional_Guard/Light;1;;;2}{starships/Regional_Guard/Medium;1;;;2}{upgrades/Ammunition/Confed;1;.1;200;50}{upgrades/Ammunition/Common;1.4;.1;200;50}{upgrades/Armor;1;.1;;5}{upgrades/Capacitors/Standard;1;.1;2;10}{upgrades/ECM_Systems;1;.1;;5}{upgrades/Experimental;1.4;.2;-20;23}{upgrades/Jump_Drives;1;.1;;5}{upgrades/Overdrive;1;.1;;5}{upgrades/Reactors/Standard;1;;;17}{upgrades/Repair_Systems;1.1;.2;;5}{upgrades/Sensors/Confed;1;.1;;1}{upgrades/Sensors/Common;1;;;5}{upgrades/Shield_Systems/Standard_Dual_Shields;1;;;5}{upgrades/Shield_Systems/Standard_Quad_Shields;1;.1;-2;5}{upgrades/SPEC_Capacitors;1;.1;4;2}{upgrades/Weapons/Beam_Arrays_Confed_Milspec;1;.1;;5}{upgrades/Weapons/Beam_Arrays_Heavy;1;.1;;1}{upgrades/Weapons/Beam_Arrays_Light;1;;;5}{upgrades/Weapons/Beam_Arrays_Medium;1;.1;;2}{upgrades/Weapons/Mount_Enhancements;1;.1;;5}{upgrades/Weapons/Mounted_Guns_Confed_Milspec;1;.1;;2}{upgrades/Weapons/Mounted_Guns_Heavy;1;.1;;3}{upgrades/Weapons/Mounted_Guns_Light;1;;;10}{upgrades/Weapons/Mounted_Guns_Medium;1;;;5}{upgrades/Weapons/Turrets;1;.1;1;1}",,,0,100000,0,,,,,,"pPiI"
+@@ -507,67 +507,67 @@
+ "Thales.blank","./vessels/Thales","Thales",,"Vessel","ESCORTCAP","The Thales class has the distinction of being the oldest military vessel in service that was originally designed for military use.","corvette-hud.spr",70,,,,,"{thales.bfxm;;}",,,,,,,88000,88000,16000,2600,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,8,50000,50000,50000,8,10,8,3000000,3000000,2000000,800000,800000,800000,800000,180,180,FALSE,FALSE,0,0,0,0,10000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Shady_Mechanic","{turret_120;0.80;0.12;-0.08;1;0;0;0;1;0;75}{turret_120;0.80;0.08;-0.08;1;0;0;0;-1;0;75}{turret_120;-0.80;0.12;-0.08;-1;0;0;0;1;0;75}{turret_120;-0.80;0.08;-0.08;-1;0;0;0;-1;0;75}{turret_120;0.68;0.085;1.875;0;0;1;1;0;0;160}{turret_120;-0.68;0.085;1.875;0;0;1;-1;0;0;160}{turretpd;1.72;-.11;-1.375;.966;-0.25;0;0.25;0.966;0;160}{turretpd;1.72;-.14;-1.375;0.966;-.25;0;-0.25;-0.966;0;160}{turretpd;-1.72;-.11;-1.375;-.966;-0.25;0;-0.25;0.966;0;160}{turretpd;-1.72;-.14;-1.375;-0.966;-.25;0;0.25;-0.966;0;160}{turretpd;-0.065;0.36;2.4;0;0;1;0;1;0;160}{turretpd;-0.15;0.36;2.11;0;0;1;0;1;0;160}{turretflak_90;0;-0.05;-1.45;0;0;-1;0;1;0;85}{turretflak_90;0;0.33;-1.45;0;0;-1;0;-1;0;85}{turretpd;0;-0.07;-1.45;0;0;-1;0;-1;0;180}",";;;;;;",,"{;;;capship-heavy SPECIAL;-0.025;-0.073;2.75;;;;;;;;;1;1}{;;;capship-heavy SPECIAL;-0.025;-0.073;2.75;;;;;;;;;1;1}{;;;capship-heavy SPECIAL;-0.025;-0.073;2.75;;;;;;;;;1;1}{tractor;;; SPECIAL autotracking;0;0;-1;;;0;-0.17;0.98;0;1;0;1;1}",,"{;0;-0.3;-0.7;0.3;0}",,,,0,600,0,,,,,,"pPiI"
+ "Vigilance","./vessels/Vigilance","Vigilance","NEEDS ENGINES AND WEAPONS","Vessel","ESCORTCAP","Purist manufactured corvette","vigilance-hud.sprite",110,,0,0,0,"{vigilance.bfxm;;}",,,,,,,100000,100000,16000,15000,1200,1200,1200,1200,1200,1200,1200,1200,18000,18000,18000,18000,,,,,75,0,2500,15000,300,TRUE,1,,1000,120,1,8,4500000,4500000,4500000,15,15,20,5000000,4500000,3000000,800000,800000,800000,800000,225,225,TRUE,TRUE,300000000,10,180,75,10000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretflak;0;1.79;-13.05;0;0;-1;0;1;0;180}{turretflak;0;-1.3;4.01;0;0;1;0;-1;0;180}",";;;;;;","{supernova.bmp.bfxm;1.1;0.95;-11.46;0.398;;;;;}{supernova.bmp.bfxm;-1.1;0.95;-11.46;0.398;;;;;}{supernova.bmp.bfxm;-4.44;-0.97;-12.55;0.614;;;;;}{supernova.bmp.bfxm;4.44;-0.97;-12.55;0.614;;;;;}{supernova.bmp.bfxm;2.97;-0.42;-10.9;1.023;;;;;}{supernova.bmp.bfxm;-2.96;-0.42;-10.9;1.023;;;;;}{supernova.bmp.bfxm;-0.85;-0.28;-11.46;1.137;;;;;}{supernova.bmp.bfxm;-0.29;-0.28;-11.46;1.137;;;;;}{supernova.bmp.bfxm;0.85;-0.28;-11.46;1.137;;;;;}{supernova.bmp.bfxm;0.3;-0.28;-11.46;1.137;;;;;}{supernova.bmp.bfxm;0.46;0.72;-11.46;1.137;;;;;}{supernova.bmp.bfxm;-0.44;0.72;-11.46;1.137;;;;;}","{capiff;25;;;1.645490;-0.231993;-5;;;;;;;;;1;1}{capiff;25;;;-1.645490;-0.231993;-5;;;;;;;;;1;1}{capiff;25;;;1.645490;-0.231993;-5;;;;;;;;;1;1}{capiff;25;;;-1.645490;-0.231993;-5;;;;;;;;;1;1}{capiff;25;;;1.645490;-0.231993;-5;;;;;;;;;1;1}{capiff;25;;;-1.645490;-0.231993;-5;;;;;;;;;1;1}{capiff;25;;;1.645490;-0.231993;-5;;;;;;;;;1;1}{capiff;25;;;-1.645490;-0.231993;-5;;;;;;;;;1;1}{torpedo;50;;;0.64;2.5;3;;;;;;;;;1;1}{torpedo;50;;;-0.64;2.5;3;;;;;;;;;1;1}{RelativisticParticleBeam;;;capship-light autotracking;2.507689;-0.052456;-3.449466;;;0;0;1;-0;1;0;1;1}{RelativisticParticleBeam;;;capship-light autotracking;-2.507689;-0.052456;-3.449466;;;0;0;1;-0;1;0;1;1}{RelativisticParticleBeam;;;capship-light autotracking;2.206848;-0.882219;-3.449466;;;0;0;1;-0;1;0;1;1}{RelativisticParticleBeam;;;capship-light autotracking;-2.206848;-0.882219;-3.449466;;;0;0;1;-0;1;0;1;1}",,"{1;0;-0.1;-2.1;0.8;0}","{Natural_Products/Food;1.3;.2;10;20}{Natural_Products/Liquor;1.05;.1;;1}{upgrades/Ammunition/Common;1;.1;80;90}{upgrades/Ammunition/Uncommon;2;.3;60;180}",,,0,600,0,,,,,,"pPiI"
+ "Vigilance.blank","./vessels/Vigilance","Vigilance","NEEDS ENGINES AND WEAPONS","Vessel","ESCORTCAP",,"Vigilance-hud.spr",110,,0,0,0,"{vigilance.bfxm;;}",,,,,,,100000,100000,16000,15000,1200,1200,1200,1200,1200,1200,1200,1200,18000,18000,18000,18000,,,,,50,0,2500,15000,300,TRUE,1,,1000,120,1,8,4500000,4500000,4500000,15,15,20,5000000,4500000,3000000,800000,800000,800000,800000,225,225,TRUE,TRUE,300000000,10,180,75,10000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,,,"{1;0;-0.1;-2.1;0.8;0}",,,,0,600,0,,,,,,"pPiI"
+-"Admonisher","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield08;;}{add_spec_capacitor03;;}{capacitor07;;}{reactor10;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{HeavyIonBeam;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{Pugilist;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{Pugilist;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{HeatSeeker;5;15;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{HeatSeeker;5;15;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{Torpedo;3;300;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,1400,0,,,,,,"pPiI"
+-"Admonisher.HSspec","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,58,62,68,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{add_spec_capacitor03;;}{capacitor06;;}{reactor09;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{Crippler;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{LeechGun;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{LeechGun;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{Leech;48;48;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{Leech;48;48;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{EMPTorpedo;1;90;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,60,0,,,,,,"pPiI"
++"Admonisher","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield08;;}{spec_capacitor03;;}{capacitor07;;}{reactor10;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{HeavyIonBeam;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{Pugilist;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{Pugilist;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{HeatSeeker;5;15;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{HeatSeeker;5;15;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{Torpedo;3;300;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,1400,0,,,,,,"pPiI"
++"Admonisher.HSspec","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,58,62,68,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{spec_capacitor03;;}{capacitor06;;}{reactor09;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{Crippler;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{LeechGun;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{LeechGun;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{Leech;48;48;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{Leech;48;48;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{EMPTorpedo;1;90;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,60,0,,,,,,"pPiI"
+ "Admonisher.blank","./vessels/Admonisher","Admonisher","MANEUVOUR","Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,220,220,22.92,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,190,190,FALSE,FALSE,100000,0,0,0,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;300;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,1400,0,,,,,,"pPiI"
+ "Admonisher.milspec","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{;;15;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{;;5;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{;;5;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;300;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,"{Admonisher_Milspec_Package;upgrades/Packages/Milspec;200000;1;140;1330;1;1;Full-Custom Milspec Configuration;0}",,0,1200,0,,,,,,"pPiI"
+-"Admonisher.puristspec","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield08;;}{add_spec_capacitor03;;}{capacitor07;;}{reactor10;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{;;20;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{;;20;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{;;20;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{;;20;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{;;5;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{;;5;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;300;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,60,0,,,,,,"pPiI"
+-"Admonisher.rg","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield08;;}{add_spec_capacitor03;;}{capacitor07;;}{reactor10;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{HeavyIonBeam;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{PlasmaPlume;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{PlasmaPlume;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{HeatSeeker;5;15;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{HeatSeeker;5;15;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{EMPTorpedo;3;300;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,1400,0,,,,,,"pPiI"
++"Admonisher.puristspec","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield08;;}{spec_capacitor03;;}{capacitor07;;}{reactor10;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{;;20;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{;;20;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{;;20;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{;;20;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{;;5;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{;;5;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;300;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,60,0,,,,,,"pPiI"
++"Admonisher.rg","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor04;;}{quadshield08;;}{spec_capacitor03;;}{capacitor07;;}{reactor10;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{HeavyIonBeam;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{HeavyIonBeam;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{PlasmaPlume;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{PlasmaPlume;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{HeatSeeker;5;15;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{HeatSeeker;5;15;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{EMPTorpedo;3;300;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,1400,0,,,,,,"pPiI"
+ "Admonisher.rgspec","./vessels/Admonisher","Admonisher","MANEUVOUR","Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,190,190,FALSE,FALSE,300000000,0,0,0,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{;;15;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{;;5;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{;;5;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{;5;1;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;5;1;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;1;1;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,60,0,,,,,,"pPiI"
+ "Admonisher.salvage","./vessels/Admonisher","Admonisher","MANEUVOUR","Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,240,240,22.92,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,190,190,FALSE,FALSE,3000000,0,0,0,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{;;15;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{;;5;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{;;5;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{;5;1;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;5;1;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;1;1;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,1400,0,,,,,,"pPiI"
+-"Admonisher.stock","./vessels/Admonisher","Admonisher","MANEUVOUR","Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,234,234,22.92,700,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,190,190,FALSE,FALSE,300000000,4,180,25,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{;;15;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{;;5;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{;;5;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;90;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,1200,0,,,,,,"pPiI"
+-"Admonisher__homeland-security","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,58,62,68,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{add_spec_capacitor03;;}{capacitor06;;}{reactor09;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{Crippler;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{LeechGun;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{LeechGun;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{Leech;5;1;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{Leech;5;1;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{EMPTorpedo;1;1;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,1200,0,,,,,,"pPiI"
++"Admonisher.stock","./vessels/Admonisher","Admonisher","MANEUVOUR","Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,234,234,22.92,700,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,55,60,65,24000,20000,16000,4000,4000,4000,4000,190,190,FALSE,FALSE,300000000,4,180,25,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{;;15;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{;;15;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{;;15;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{;;5;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{;;5;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;90;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,1200,0,,,,,,"pPiI"
++"Admonisher__homeland-security","./vessels/Admonisher","Admonisher",,"Vessel","FIGHTER","Purist light assault craft","admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,360,360,22.92,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,58,62,68,24000,20000,16000,4000,4000,4000,4000,250,250,FALSE,FALSE,300000000,5,180,10,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield10;;}{spec_capacitor03;;}{capacitor06;;}{reactor09;;}{jump_drive;;}{starscanner2;;}{ecm_package02;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{Crippler;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{Crippler;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{LeechGun;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{LeechGun;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{Leech;5;1;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{Leech;5;1;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{EMPTorpedo;1;1;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,1200,0,,,,,,"pPiI"
+ "Admonisher__homeland-security.blank","./vessels/Admonisher","Admonisher","MANEUVOUR","Vessel","FIGHTER","Purist light assault craft","homeland-security_admonisher-hud.sprite",0.76,"no-cockpit",0,8.26,9.6,"{admonisher.bfxm;;}","admonisher-shield.bfxm",,,,,,220,220,21,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,58,62,68,24000,20000,16000,4000,4000,4000,4000,190,190,FALSE,FALSE,100000,0,0,0,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-4.5;1.8;-13.85;5;;;;;}{supernova.bmp.bfxm;-5.1;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;-3.95;2.75;-13.85;5;;;;;}{supernova.bmp.bfxm;4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;-4.5;.35;-13.85;12;;;;;}{supernova.bmp.bfxm;6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;4.5;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-6.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-5.45;-4.8;-12.3;4;;;;;}{supernova.bmp.bfxm;-4.5;-4.8;-12.3;4;;;;;}","{;;;Light Medium Heavy;2.35;6;10.3;;;;;;;;;1;1}{;;;Light Medium Heavy;-2.35;6;10.3;;;;;;;;;1;1}{;;;Light Medium Heavy;-1.75;-10.5;9.5;;;;;;;;;1;1}{;;;Light Medium Heavy;1.75;-10.5;9.5;;;;;;;;;1;1}{;;;Light;8.1;-3.5;-1.65;;;;;;;;;1;1}{;;;Light;-8.1;-3.5;-1.65;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;-0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;48;Light-Missile Medium-Missile;0.300000;-0.100000;0.000000;;;;;;;;;1;1}{;;100;Heavy-Missile;-0.000000;0.000000;0.000000;;;;;;;;;1;1}",,,,,,0,1200,0,,,,,,"pPiI"
+ "Ancestor","./vessels/Ancestor","Ancestor",,"Vessel","FIGHTER","Shaper orbit-ground aerospace attack craft","ancestor-hud.sprite",1,,0,1.8,8,"{ancestor.bfxm;;}","ancestor-shield.bfxm",,,,,,112,112,3.25,120,25,25,25,25,25,25,25,25,300,220,,,,,,,30,0,590,300,60,TRUE,1,,200,40,1,4,50000,50000,50000,55,55,55,18000,15000,9000,5000,5000,5000,5000,275,275,FALSE,TRUE,300000000,5,180,10,175,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;0;.5;-7.5;8;;;;;}{thrust1.bfxm;1.3;0;-7.5;10;;;;;}{thrust1.bfxm;-1.3;0;-7.5;10;;;;;}{thrust1.bfxm;.4;-.3;-7;4;;;;;}{thrust1.bfxm;-.4;-.3;-7;4;;;;;}","{Pugilist;;;Light Autotrack;1.75;1.5;-1;;;;;;;;;1;1}{Pugilist;;;Light Autotrack;-1.75;1.5;-1;;;;;;;;;1;1}{IonBeam;;;Light Medium;3.5;0;3.125;;;;;;;;;1;1}{IonBeam;;;Light Medium;-3.5;0;3.125;;;;;;;;;1;1}{ImageRecognition;4;48;light-missile medium-missile;-2.500000;-0.200000;-2.00000;;;;;;;;;1;1}{ImageRecognition;4;48;light-missile medium-missile;2.500000;-0.200000;-2.00000;;;;;;;;;1;1}",,,,,,0,400,0,,,,,,"pPiI"
+ "Ancestor.blank","./vessels/Ancestor","Ancestor","MANEUVOUR","Vessel","FIGHTER","Shaper orbit-ground aerospace attack craft","ancestor-hud.sprite",1,,0,1.8,8,"{ancestor.bfxm;;}","ancestor-shield.bfxm",,,,,,52,52,3.25,120,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,55,55,55,18000,15000,9000,5000,5000,5000,5000,205,205,FALSE,FALSE,100000,0,0,0,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;0;.5;-7.5;8;;;;;}{thrust1.bfxm;1.3;0;-7.5;10;;;;;}{thrust1.bfxm;-1.3;0;-7.5;10;;;;;}{thrust1.bfxm;.4;-.3;-7;4;;;;;}{thrust1.bfxm;-.4;-.3;-7;4;;;;;}","{;;;Light Autotrack;1.75;1.5;-1;;;;;;;;;1;1}{;;;Light Autotrack;-1.75;1.5;-1;;;;;;;;;1;1}{;;;Light Medium;3.5;0;3.125;;;;;;;;;1;1}{;;;Light Medium;-3.5;0;3.125;;;;;;;;;1;1}{;4;48;light-missile medium-missile;-2.500000;-0.200000;-2.00000;;;;;;;;;1;1}{;4;48;light-missile medium-missile;2.500000;-0.200000;-2.00000;;;;;;;;;1;1}",,,,,,0,400,0,,,,,,"pPiI"
+ "Ancestor.milspec","./vessels/Ancestor","Ancestor",,"Vessel","FIGHTER","Shaper orbit-ground aerospace attack craft","ancestor-hud.sprite",1,,0,1.8,8,"{ancestor.bfxm;;}","ancestor-shield.bfxm",,,,,,112,112,3.25,120,18.75,18.75,18.75,18.75,18.75,18.75,18.75,18.75,200,180,,,,,,,30,0,590,300,60,TRUE,1,,200,40,1,4,50000,50000,50000,55,55,55,18000,15000,9000,5000,5000,5000,5000,275,275,FALSE,TRUE,300000000,5,180,10,175,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;0;.5;-7.5;8;;;;;}{thrust1.bfxm;1.3;0;-7.5;10;;;;;}{thrust1.bfxm;-1.3;0;-7.5;10;;;;;}{thrust1.bfxm;.4;-.3;-7;4;;;;;}{thrust1.bfxm;-.4;-.3;-7;4;;;;;}","{;;5;Light Autotrack;1.75;1.5;-1;;;;;;;;;1;1}{;;5;Light Autotrack;-1.75;1.5;-1;;;;;;;;;1;1}{;;10;Light Medium;3.5;0;3.125;;;;;;;;;1;1}{;;10;Light Medium;-3.5;0;3.125;;;;;;;;;1;1}{;;48;light-missile medium-missile;-2.500000;-0.200000;-2.00000;;;;;;;;;1;1}{;;48;light-missile medium-missile;2.500000;-0.200000;-2.00000;;;;;;;;;1;1}",,,,"{Ancestor_Milspec_Package;upgrades/Packages/Milspec;200000;1;60;380;1;1;Full-Custom Milspec Configuration;0}",,0,400,0,,,,,,"pPiI"
+ "Ancestor.shaperspec","./vessels/Ancestor","Ancestor","MANEUVOUR","Vessel","FIGHTER","Shaper orbit-ground aerospace attack craft","ancestor-hud.sprite",1,,0,1.8,8,"{ancestor.bfxm;;}","ancestor-shield.bfxm",,,,,,112,112,3.25,120,1,1,1,1,1,1,1,1,0,0,,,,,,,0,0,25,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,55,55,18000,15000,9000,5000,5000,5000,5000,205,205,FALSE,FALSE,300000000,0,0,0,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;0;.5;-7.5;8;;;;;}{thrust1.bfxm;1.3;0;-7.5;10;;;;;}{thrust1.bfxm;-1.3;0;-7.5;10;;;;;}{thrust1.bfxm;.4;-.3;-7;4;;;;;}{thrust1.bfxm;-.4;-.3;-7;4;;;;;}","{;;5;Light Autotrack;1.75;1.5;-1;;;;;;;;;1;1}{;;5;Light Autotrack;-1.75;1.5;-1;;;;;;;;;1;1}{;;10;Light Medium;3.5;0;3.125;;;;;;;;;1;1}{;;10;Light Medium;-3.5;0;3.125;;;;;;;;;1;1}{;4;48;light-missile medium-missile;-2.500000;-0.200000;-2.00000;;;;;;;;;1;1}{;4;48;light-missile medium-missile;2.500000;-0.200000;-2.00000;;;;;;;;;1;1}",,,,,,0,20,0,,,,,,"pPiI"
+-"Ancestor.stock","./vessels/Ancestor","Ancestor","MANEUVOUR","Vessel","FIGHTER","Shaper orbit-ground aerospace attack craft","ancestor-hud.sprite",1,,0,1.8,8,"{ancestor.bfxm;;}","ancestor-shield.bfxm",,,,,,66,66,3.25,120,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,55,55,55,18000,15000,9000,5000,5000,5000,5000,205,205,FALSE,FALSE,300000000,4,180,25,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;0;.5;-7.5;8;;;;;}{thrust1.bfxm;1.3;0;-7.5;10;;;;;}{thrust1.bfxm;-1.3;0;-7.5;10;;;;;}{thrust1.bfxm;.4;-.3;-7;4;;;;;}{thrust1.bfxm;-.4;-.3;-7;4;;;;;}","{;;5;Light Autotrack;1.75;1.5;-1;;;;;;;;;1;1}{;;5;Light Autotrack;-1.75;1.5;-1;;;;;;;;;1;1}{;;10;Light Medium;3.5;0;3.125;;;;;;;;;1;1}{;;10;Light Medium;-3.5;0;3.125;;;;;;;;;1;1}{;4;48;light-missile medium-missile;-2.500000;-0.200000;-2.00000;;;;;;;;;1;1}{;4;48;light-missile medium-missile;2.500000;-0.200000;-2.00000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,400,0,,,,,,"pPiI"
++"Ancestor.stock","./vessels/Ancestor","Ancestor","MANEUVOUR","Vessel","FIGHTER","Shaper orbit-ground aerospace attack craft","ancestor-hud.sprite",1,,0,1.8,8,"{ancestor.bfxm;;}","ancestor-shield.bfxm",,,,,,66,66,3.25,120,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,55,55,55,18000,15000,9000,5000,5000,5000,5000,205,205,FALSE,FALSE,300000000,4,180,25,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;0;.5;-7.5;8;;;;;}{thrust1.bfxm;1.3;0;-7.5;10;;;;;}{thrust1.bfxm;-1.3;0;-7.5;10;;;;;}{thrust1.bfxm;.4;-.3;-7;4;;;;;}{thrust1.bfxm;-.4;-.3;-7;4;;;;;}","{;;5;Light Autotrack;1.75;1.5;-1;;;;;;;;;1;1}{;;5;Light Autotrack;-1.75;1.5;-1;;;;;;;;;1;1}{;;10;Light Medium;3.5;0;3.125;;;;;;;;;1;1}{;;10;Light Medium;-3.5;0;3.125;;;;;;;;;1;1}{;4;48;light-missile medium-missile;-2.500000;-0.200000;-2.00000;;;;;;;;;1;1}{;4;48;light-missile medium-missile;2.500000;-0.200000;-2.00000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,400,0,,,,,,"pPiI"
+ "Ariston","./vessels/Ariston","Ariston",,"Vessel","FIGHTER","Aeran escort/superiority fighter","ariston-hud.spr",1.25,"light_cockpit.cpt",0,0,14,"{ariston.bfxm;;}",,,,,,,160,160,16.67,600,450,450,450,450,450,450,450,450,600,600,600,600,,,,,90,0,1360,1492,248,TRUE,1,,200,60,1,4,60000,60000,60000,80,90,100,21600,15000,10000,4000,4000,4000,4000,260,260,TRUE,TRUE,300000000,5,180,10,40,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-2.75;0;-8.75;12;;;;;}{aeraburn.bfxm;2.75;0;-8.75;12;;;;;}","{Photon_MKIII;3000;6;light medium autotracking;8;-3;10.85;;;;;;;;;1;1}{Photon_MKIII;3000;6;light medium autotracking;-8;-3;10.85;;;;;;;;;1;1}{Photon_MKIII;3000;6;light medium autotracking;6;-2.9;10.5;;;;;;;;;1;1}{Photon_MKIII;3000;6;light medium autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{Photon_MKIII;3000;6;light medium autotracking;9;-1.65;-1;;;;;;;;;1;1}{Photon_MKIII;3000;6;light medium autotracking;-9;-1.65;-1;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;8;-3;10.85;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;-8;-3;10.85;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;6;-2.9;10.5;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;9;-1.65;-1;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;-9;-1.65;-1;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;3.6;-1.6;1.2;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;-3.6;-1.6;1.2;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;3.6;1.6;1.2;;;;;;;;;1;1}{Javelin;27;27;special-missile autotracking;-3.6;1.6;1.2;;;;;;;;;1;1}{heatseeker;3;9;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{heatseeker;3;9;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}{porcupinemine;6;30;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{porcupinemine;6;30;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}",,,,,"explosion_aera.ani",0,600,0,,,,,,"pPiI"
+ "Ariston.blank","./vessels/Ariston","Ariston","MANEUVOUR","Vessel","FIGHTER","Aeran escort/superiority fighter","ariston-hud.spr",1.25,"light_cockpit.cpt",0,0,14,"{ariston.bfxm;;}",,,,,,,70,70,16.67,500,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,60000,60000,60000,80,90,100,21600,15000,10000,4000,4000,4000,4000,195,195,FALSE,FALSE,100000,0,0,0,40,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-2.75;0;-8.75;12;;;;;}{aeraburn.bfxm;2.75;0;-8.75;12;;;;;}","{;;;light medium autotracking;8;-3;10.85;;;;;;;;;1;1}{;;;light medium autotracking;-8;-3;10.85;;;;;;;;;1;1}{;;;light medium autotracking;6;-2.9;10.5;;;;;;;;;1;1}{;;;light medium autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{;;;light medium autotracking;9;-1.65;-1;;;;;;;;;1;1}{;;;light medium autotracking;-9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;8;-3;10.85;;;;;;;;;1;1}{;27;27;special-missile autotracking;-8;-3;10.85;;;;;;;;;1;1}{;27;27;special-missile autotracking;6;-2.9;10.5;;;;;;;;;1;1}{;27;27;special-missile autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{;27;27;special-missile autotracking;9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;-9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;3.6;-1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;-3.6;-1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;3.6;1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;-3.6;1.6;1.2;;;;;;;;;1;1}{;3;9;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{;3;9;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}{;6;30;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{;6;30;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}",,,,,"explosion_aera.ani",0,600,0,,,,,,"pPiI"
+ "Ariston.escort","./vessels/Ariston","Ariston",,"Vessel","FIGHTER","Aeran escort/superiority fighter","ariston-hud.spr",1.25,"light_cockpit.cpt",0,0,14,"{ariston.bfxm;;}",,,,,,,140,140,16.67,500,120,120,120,120,120,120,120,120,475,475,475,475,,,,,90,0,1360,1492,248,TRUE,1,,200,60,1,4,60000,60000,60000,80,90,100,21600,15000,10000,4000,4000,4000,4000,260,260,TRUE,TRUE,300000000,5,180,10,40,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-2.75;0;-8.75;12;;;;;}{aeraburn.bfxm;2.75;0;-8.75;12;;;;;}","{Photon_MKIII;6000;12;light medium autotracking;8;-3;10.85;;;;;;;;;1;1}{Photon_MKIII;6000;12;light medium autotracking;-8;-3;10.85;;;;;;;;;1;1}{Photon_MKIII;6000;12;light medium autotracking;6;-2.9;10.5;;;;;;;;;1;1}{Photon_MKIII;6000;12;light medium autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{Photon_MKIII;6000;12;light medium autotracking;9;-1.65;-1;;;;;;;;;1;1}{Photon_MKIII;6000;12;light medium autotracking;-9;-1.65;-1;;;;;;;;;1;1}{heatseeker;3;9;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{heatseeker;3;9;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}{heatseeker;10;30;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{heatseeker;10;30;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}",,,,,"explosion_aera.ani",0,600,0,,,,,,"pPiI"
+ "Ariston.milspec","./vessels/Ariston","Ariston",,"Vessel","FIGHTER","Aeran escort/superiority fighter","ariston-hud.spr",1.25,"light_cockpit.cpt",0,0,14,"{ariston.bfxm;;}",,,,,,,160,160,16.67,500,120,120,120,120,120,120,120,120,475,475,475,475,,,,,90,0,1360,1492,248,TRUE,1,,200,60,1,4,60000,60000,60000,80,90,100,21600,15000,10000,4000,4000,4000,4000,260,260,TRUE,TRUE,300000000,5,180,10,40,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-2.75;0;-8.75;12;;;;;}{aeraburn.bfxm;2.75;0;-8.75;12;;;;;}","{;;10;light medium autotracking;8;-3;10.85;;;;;;;;;1;1}{;;10;light medium autotracking;-8;-3;10.85;;;;;;;;;1;1}{;;10;light medium autotracking;6;-2.9;10.5;;;;;;;;;1;1}{;;10;light medium autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{;;10;light medium autotracking;9;-1.65;-1;;;;;;;;;1;1}{;;10;light medium autotracking;-9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;8;-3;10.85;;;;;;;;;1;1}{;27;27;special-missile autotracking;-8;-3;10.85;;;;;;;;;1;1}{;27;27;special-missile autotracking;6;-2.9;10.5;;;;;;;;;1;1}{;27;27;special-missile autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{;27;27;special-missile autotracking;9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;-9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;3.6;-1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;-3.6;-1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;3.6;1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;-3.6;1.6;1.2;;;;;;;;;1;1}{;;9;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{;;9;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}{;;30;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{;;30;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}",,,,"{Ariston_Milspec_Package;upgrades/Packages/Milspec;200000;1;90;590;1;1;Full-Custom Milspec Configuration;0}","explosion_aera.ani",0,600,0,,,,,,"pPiI"
+-"Ariston.stock","./vessels/Ariston","Ariston","MANEUVOUR","Vessel","FIGHTER","Aeran escort/superiority fighter","ariston-hud.spr",1.25,"light_cockpit.cpt",0,0,14,"{ariston.bfxm;;}",,,,,,,84,84,16.67,500,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,60000,60000,60000,80,90,100,21600,15000,10000,4000,4000,4000,4000,195,195,FALSE,FALSE,300000000,4,180,25,40,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-2.75;0;-8.75;12;;;;;}{aeraburn.bfxm;2.75;0;-8.75;12;;;;;}","{;;10;light medium autotracking;8;-3;10.85;;;;;;;;;1;1}{;;10;light medium autotracking;-8;-3;10.85;;;;;;;;;1;1}{;;10;light medium autotracking;6;-2.9;10.5;;;;;;;;;1;1}{;;10;light medium autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{;;10;light medium autotracking;9;-1.65;-1;;;;;;;;;1;1}{;;10;light medium autotracking;-9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;8;-3;10.85;;;;;;;;;1;1}{;27;27;special-missile autotracking;-8;-3;10.85;;;;;;;;;1;1}{;27;27;special-missile autotracking;6;-2.9;10.5;;;;;;;;;1;1}{;27;27;special-missile autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{;27;27;special-missile autotracking;9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;-9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;3.6;-1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;-3.6;-1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;3.6;1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;-3.6;1.6;1.2;;;;;;;;;1;1}{;3;9;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{;3;9;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}{;6;30;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{;6;30;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}","explosion_aera.ani",0,600,0,,,,,,"pPiI"
++"Ariston.stock","./vessels/Ariston","Ariston","MANEUVOUR","Vessel","FIGHTER","Aeran escort/superiority fighter","ariston-hud.spr",1.25,"light_cockpit.cpt",0,0,14,"{ariston.bfxm;;}",,,,,,,84,84,16.67,500,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,60000,60000,60000,80,90,100,21600,15000,10000,4000,4000,4000,4000,195,195,FALSE,FALSE,300000000,4,180,25,40,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-2.75;0;-8.75;12;;;;;}{aeraburn.bfxm;2.75;0;-8.75;12;;;;;}","{;;10;light medium autotracking;8;-3;10.85;;;;;;;;;1;1}{;;10;light medium autotracking;-8;-3;10.85;;;;;;;;;1;1}{;;10;light medium autotracking;6;-2.9;10.5;;;;;;;;;1;1}{;;10;light medium autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{;;10;light medium autotracking;9;-1.65;-1;;;;;;;;;1;1}{;;10;light medium autotracking;-9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;8;-3;10.85;;;;;;;;;1;1}{;27;27;special-missile autotracking;-8;-3;10.85;;;;;;;;;1;1}{;27;27;special-missile autotracking;6;-2.9;10.5;;;;;;;;;1;1}{;27;27;special-missile autotracking;-6;-2.9;10.5;;;;;;;;;1;1}{;27;27;special-missile autotracking;9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;-9;-1.65;-1;;;;;;;;;1;1}{;27;27;special-missile autotracking;3.6;-1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;-3.6;-1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;3.6;1.6;1.2;;;;;;;;;1;1}{;27;27;special-missile autotracking;-3.6;1.6;1.2;;;;;;;;;1;1}{;3;9;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{;3;9;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}{;6;30;medium-missile autotracking;3.6;-1.6;1.200000;;;;;;;;;1;1}{;6;30;medium-missile autotracking;-3.6;-1.6;1.200000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}","explosion_aera.ani",0,600,0,,,,,,"pPiI"
+ "Beholder","./vessels/Beholder","Beholder",,"Vessel","FIGHTER","Ancient Drone","beholder-hud.sprite",,,,,,"{beholder.bfxm;;}","beholder-shield.bfxm",,,,,,90,90,3.8,1000,500,500,500,500,500,500,500,500,10000,10000,10000,10000,,,,,20000,0,32000,65000,26000,TRUE,1,,200,300,1,1,33192,29044,33192,360,360,360,31415,31415,31415,31415,31415,31415,31415,1050,1050,FALSE,TRUE,300000000,3.14,180,10,5,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,,"{supernova.bmp.bfxm;0;-0.5;13;0.500000;;;;;}{supernova.bmp.bfxm;0;0;-7.20000;3.000000;;;;;}","{UnknownHeavyBeam;;;Light autotracking;0;-0.5;13.0;;;;;;;;;1;1}",,,,,,0,667,0,,,,,,"pPiI"
+ "Beholder.blank","./vessels/Beholder","Beholder",,"Vessel","FIGHTER","Ancient Drone","beholder-hud.sprite",,,,,,"{beholder.bfxm;;}","beholder-shield.bfxm",,,,,,90,90,3.8,1000,500,500,500,500,500,500,500,500,10000,10000,10000,10000,,,,,20000,0,32000,65000,26000,TRUE,1,,200,300,1,1,33192,29044,33192,360,360,360,31415,31415,31415,31415,31415,31415,31415,1050,1050,FALSE,TRUE,300000000,3.14,180,10,5,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,,"{supernova.bmp.bfxm;0;-0.5;13;0.500000;;;;;}{supernova.bmp.bfxm;0;0;-7.20000;3.000000;;;;;}","{UnknownHeavyBeam;;;Light autotracking;0;-0.5;13.0;;;;;;;;;1;1}",,,,,,0,667,0,,,,,,"pPiI"
+ "Convolution","./vessels/Convolution","Convolution",,"Vessel","FIGHTER","Unadorned assault craft","convolution-hud.sprite",3,,,,4.5,"{convolution.bfxm;;}",,,,,,,80,80,5.17,165,41.25,41.25,41.25,41.25,41.25,41.25,41.25,41.25,600,600,600,600,,,,,45,0,300,357,32,TRUE,1,,200,45,1,4,50000,50000,50000,60,70,65,16000,15000,12000,3000,3000,3000,3000,310,310,TRUE,TRUE,300000000,5,180,10,25,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.506007;2.40000e-2;-5.16000;.6;;;;;}{supernova.bmp.bfxm;9.59928e-2;3.20000e-2;-3.67200;.6;;;;;}","{DisruptorBeam;;;Light;-2.75800;-0.682000;0.628000;;;;;;;;;1;1}{DisruptorBeam;;;Light;3.94800;-1.03200;1.21200;;;;;;;;;1;1}{Dissonance;;;Medium;-4.40000e-2;1.22800;-0.508000;;;;;;;;;1;1}{Dissonance;;;Medium;-0.320000;-0.352000;4.16400;;;;;;;;;1;1}",,,,,,0,275,0,,,,,,"pPiI"
+ "Convolution.blank","./vessels/Convolution","Convolution","MANEUVOUR","Vessel","FIGHTER","Unadorned assault craft","convolution-hud.sprite",3,,,,4.5,"{convolution.bfxm;;}",,,,,,,40,40,5.17,165,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,60,70,65,16000,15000,12000,3000,3000,3000,3000,230,230,FALSE,FALSE,100000,0,0,0,15,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.506007;2.40000e-2;-5.16000;.6;;;;;}{supernova.bmp.bfxm;9.59928e-2;3.20000e-2;-3.67200;.6;;;;;}","{;;;Light;-2.75800;-0.682000;0.628000;;;;;;;;;1;1}{;;;Light;3.94800;-1.03200;1.21200;;;;;;;;;1;1}{;;;Medium;-4.40000e-2;1.22800;-0.508000;;;;;;;;;1;1}{;;;Medium;-0.320000;-0.352000;4.16400;;;;;;;;;1;1}{;20;5;special-missile;-3.00944e-2;0.757442;-1.86303;;;;;;;;;1;1}{;1;100;Light-missile medium-missile heavy-missile;1.65074;-0.522844;1.34526e-3;;;;;;;;;1;1}",,,,,,0,275,0,,,,,,"pPiI"
+ "Convolution.milspec","./vessels/Convolution","Convolution",,"Vessel","FIGHTER","Unadorned assault craft","convolution-hud.sprite",3,,,,4.5,"{convolution.bfxm;;}",,,,,,,80,80,5.17,165,41.25,41.25,41.25,41.25,41.25,41.25,41.25,41.25,300,300,300,300,,,,,45,0,300,357,32,TRUE,1,,200,45,1,4,50000,50000,50000,60,70,65,16000,15000,12000,3000,3000,3000,3000,310,310,TRUE,TRUE,300000000,5,180,10,25,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.506007;2.40000e-2;-5.16000;.6;;;;;}{supernova.bmp.bfxm;9.59928e-2;3.20000e-2;-3.67200;.6;;;;;}","{;;5;Light;-2.75800;-0.682000;0.628000;;;;;;;;;1;1}{;;5;Light;3.94800;-1.03200;1.21200;;;;;;;;;1;1}{;;10;Medium;-4.40000e-2;1.22800;-0.508000;;;;;;;;;1;1}{;;10;Medium;-0.320000;-0.352000;4.16400;;;;;;;;;1;1}",,,,"{Convolution_Milspec_Package;upgrades/Packages/Milspec;200000;1;40;265;1;1;Full-Custom Milspec Configuration;0}",,0,275,0,,,,,,"pPiI"
+-"Convolution.stock","./vessels/Convolution","Convolution","MANEUVOUR","Vessel","FIGHTER","Unadorned assault craft","convolution-hud.sprite",3,,,,4.5,"{convolution.bfxm;;}",,,,,,,54,54,5.17,165,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,60,70,65,16000,15000,12000,3000,3000,3000,3000,230,230,FALSE,FALSE,300000000,4,180,25,15,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.506007;2.40000e-2;-5.16000;.6;;;;;}{supernova.bmp.bfxm;9.59928e-2;3.20000e-2;-3.67200;.6;;;;;}","{;;5;Light;-2.75800;-0.682000;0.628000;;;;;;;;;1;1}{;;5;Light;3.94800;-1.03200;1.21200;;;;;;;;;1;1}{;;10;Medium;-4.40000e-2;1.22800;-0.508000;;;;;;;;;1;1}{;;10;Medium;-0.320000;-0.352000;4.16400;;;;;;;;;1;1}{;20;5;special-missile;-3.00944e-2;0.757442;-1.86303;;;;;;;;;1;1}{;1;100;Light-missile medium-missile heavy-missile;1.65074;-0.522844;1.34526e-3;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,275,0,,,,,,"pPiI"
++"Convolution.stock","./vessels/Convolution","Convolution","MANEUVOUR","Vessel","FIGHTER","Unadorned assault craft","convolution-hud.sprite",3,,,,4.5,"{convolution.bfxm;;}",,,,,,,54,54,5.17,165,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,60,70,65,16000,15000,12000,3000,3000,3000,3000,230,230,FALSE,FALSE,300000000,4,180,25,15,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.506007;2.40000e-2;-5.16000;.6;;;;;}{supernova.bmp.bfxm;9.59928e-2;3.20000e-2;-3.67200;.6;;;;;}","{;;5;Light;-2.75800;-0.682000;0.628000;;;;;;;;;1;1}{;;5;Light;3.94800;-1.03200;1.21200;;;;;;;;;1;1}{;;10;Medium;-4.40000e-2;1.22800;-0.508000;;;;;;;;;1;1}{;;10;Medium;-0.320000;-0.352000;4.16400;;;;;;;;;1;1}{;20;5;special-missile;-3.00944e-2;0.757442;-1.86303;;;;;;;;;1;1}{;1;100;Light-missile medium-missile heavy-missile;1.65074;-0.522844;1.34526e-3;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,275,0,,,,,,"pPiI"
+ "Determinant","./vessels/Determinant","Determinant",,"Vessel","FIGHTER","Unadorned superiority fighter","determinant-hud.sprite",1,,,,4,"{determinant.bfxm;;}",,,,,,,54,54,4.5,150,45,45,45,45,40,40,40,40,600,600,600,600,,,,,45,0,300,357,32,TRUE,1,,200,45,1,4,50000,50000,50000,55,55,60,18000,14000,12000,3000,3000,3000,3000,460,460,TRUE,TRUE,300000000,5,180,10,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.158000;2.80064e-2;-4.83800;1;;;;;}{supernova.bmp.bfxm;0.786000;3.40064e-2;-4.83800;1;;;;;}","{DisruptorBeam;;;Light;-0.598000;3.19962e-2;2.87600;;;;;;;;;1;1}{Dissonance;;;Light Medium Heavy;0.270000;-0.418006;3.63600;;;;;;;;;1;1}{FriendOrFoe;5;80;Light-missile Medium-missile;-1.50600;-0.154000;-1.83200;;;;;;;;;1;1}",,,,,,0,120,0,,,,,,"pPiI"
+ "Determinant.blank","./vessels/Determinant","Determinant","MANEUVOUR","Vessel","FIGHTER","Unadorned superiority fighter","determinant-hud.sprite",1,,,,4,"{determinant.bfxm;;}",,,,,,,30,30,4.5,150,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,55,55,60,18000,14000,12000,3000,3000,3000,3000,352,352,FALSE,FALSE,100000,0,0,0,20,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.158000;2.80064e-2;-4.83800;1;;;;;}{supernova.bmp.bfxm;0.786000;3.40064e-2;-4.83800;1;;;;;}","{;;;Light;-0.598000;3.19962e-2;2.87600;;;;;;;;;1;1}{;;;Light Medium Heavy;0.270000;-0.418006;3.63600;;;;;;;;;1;1}{;5;80;Light-missile Medium-missile;-1.50600;-0.154000;-1.83200;;;;;;;;;1;1}",,,,,,0,120,0,,,,,,"pPiI"
+ "Determinant.milspec","./vessels/Determinant","Determinant",,"Vessel","FIGHTER","Unadorned superiority fighter","determinant-hud.sprite",1,,,,4,"{determinant.bfxm;;}",,,,,,,54,54,4.5,150,45,45,45,45,40,40,40,40,300,300,300,300,,,,,45,0,300,357,32,TRUE,1,,200,45,1,4,50000,50000,50000,55,55,60,18000,14000,12000,3000,3000,3000,3000,460,460,TRUE,TRUE,300000000,5,180,10,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.158000;2.80064e-2;-4.83800;1;;;;;}{supernova.bmp.bfxm;0.786000;3.40064e-2;-4.83800;1;;;;;}","{;;5;Light;-0.598000;3.19962e-2;2.87600;;;;;;;;;1;1}{;;15;Light Medium Heavy;0.270000;-0.418006;3.63600;;;;;;;;;1;1}{;;80;Light-missile Medium-missile;-1.50600;-0.154000;-1.83200;;;;;;;;;1;1}",,,,"{Determinant_Milspec_Package;upgrades/Packages/Milspec;200000;1;24;115;1;1;Full-Custom Milspec Configuration;0}",,0,120,0,,,,,,"pPiI"
+-"Determinant.stock","./vessels/Determinant","Determinant","MANEUVOUR","Vessel","FIGHTER","Unadorned superiority fighter","determinant-hud.sprite",1,,,,4,"{determinant.bfxm;;}",,,,,,,44,44,4.5,150,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,55,55,60,18000,14000,12000,3000,3000,3000,3000,352,352,FALSE,FALSE,300000000,4,180,25,20,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.158000;2.80064e-2;-4.83800;1;;;;;}{supernova.bmp.bfxm;0.786000;3.40064e-2;-4.83800;1;;;;;}","{;;5;Light;-0.598000;3.19962e-2;2.87600;;;;;;;;;1;1}{;;15;Light Medium Heavy;0.270000;-0.418006;3.63600;;;;;;;;;1;1}{;5;80;Light-missile Medium-missile;-1.50600;-0.154000;-1.83200;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,120,0,,,,,,"pPiI"
+-"Dostoevsky","./vessels/Dostoevsky","Dostoevsky",,"Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,,,,10,"{dostoevsky.bfxm;;}",,,,,,,42,42,3.5,300,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,460,460,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{add_spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{EMPTorpedo;1;90;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{Hephaestus-mini;15000;15;Light Medium Heavy Special autotracking;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{Hephaestus-mini;15000;15;Light Medium Heavy Special autotracking;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,,,0,125,0,,,,,,"pPiI"
++"Determinant.stock","./vessels/Determinant","Determinant","MANEUVOUR","Vessel","FIGHTER","Unadorned superiority fighter","determinant-hud.sprite",1,,,,4,"{determinant.bfxm;;}",,,,,,,44,44,4.5,150,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,55,55,60,18000,14000,12000,3000,3000,3000,3000,352,352,FALSE,FALSE,300000000,4,180,25,20,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.158000;2.80064e-2;-4.83800;1;;;;;}{supernova.bmp.bfxm;0.786000;3.40064e-2;-4.83800;1;;;;;}","{;;5;Light;-0.598000;3.19962e-2;2.87600;;;;;;;;;1;1}{;;15;Light Medium Heavy;0.270000;-0.418006;3.63600;;;;;;;;;1;1}{;5;80;Light-missile Medium-missile;-1.50600;-0.154000;-1.83200;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,120,0,,,,,,"pPiI"
++"Dostoevsky","./vessels/Dostoevsky","Dostoevsky",,"Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,,,,10,"{dostoevsky.bfxm;;}",,,,,,,42,42,3.5,300,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,460,460,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{EMPTorpedo;1;90;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{Hephaestus-mini;15000;15;Light Medium Heavy Special autotracking;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{Hephaestus-mini;15000;15;Light Medium Heavy Special autotracking;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+ "Dostoevsky.blank","./vessels/Dostoevsky","Dostoevsky","MANEUVOUR","Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,"no-cockpit",,,10,"{dostoevsky.bfxm;;}",,,,,,,22,22,3.5,250,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,340,340,FALSE,FALSE,100000,0,0,0,20,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{;4;1;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{;;;Light Medium Heavy Special;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{;;;Light Medium Heavy Special;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+ "Dostoevsky.klkkspec","./vessels/Dostoevsky","Dostoevsky","MANEUVOUR","Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,"no-cockpit",,,10,"{dostoevsky.bfxm;;}",,,,,,,42,42,3.5,300,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,340,340,FALSE,FALSE,300000000,0,0,0,20,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{;;80;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{;;15;Light Medium Heavy Special;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{;;15;Light Medium Heavy Special;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,,,0,5,0,,,,,,"pPiI"
+ "Dostoevsky.milspec","./vessels/Dostoevsky","Dostoevsky",,"Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,,,,10,"{dostoevsky.bfxm;;}",,,,,,,42,42,3.5,250,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,,,TRUE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,460,460,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{;1;90;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{;;10;Light Medium Heavy Special autotracking;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{;;10;Light Medium Heavy Special autotracking;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,"{Dostoevsky_Milspec_Package;upgrades/Packages/Milspec;200000;1;20;120;1;1;Full-Custom Milspec Configuration;0}",,0,125,0,,,,,,"pPiI"
+-"Dostoevsky.rg","./vessels/Dostoevsky","Dostoevsky",,"Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,,,,10,"{dostoevsky.bfxm;;}",,,,,,,42,42,3.5,250,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,460,460,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{add_spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{EMPTorpedo;1;90;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{LR_Disruptor;;;Light Medium Heavy Special autotracking;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{LR_Disruptor;;;Light Medium Heavy Special autotracking;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,,,0,125,0,,,,,,"pPiI"
++"Dostoevsky.rg","./vessels/Dostoevsky","Dostoevsky",,"Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,,,,10,"{dostoevsky.bfxm;;}",,,,,,,42,42,3.5,250,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,460,460,FALSE,FALSE,300000000,5,180,10,150,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{EMPTorpedo;1;90;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{LR_Disruptor;;;Light Medium Heavy Special autotracking;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{LR_Disruptor;;;Light Medium Heavy Special autotracking;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+ "Dostoevsky.rgspec","./vessels/Dostoevsky","Dostoevsky","MANEUVOUR","Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,"no-cockpit",,,10,"{dostoevsky.bfxm;;}",,,,,,,42,42,3.5,250,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,340,340,FALSE,FALSE,300000000,0,0,0,20,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{;;32;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{;;15;Light Medium Heavy Special;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{;;15;Light Medium Heavy Special;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,,,0,5,0,,,,,,"pPiI"
+-"Dostoevsky.stock","./vessels/Dostoevsky","Dostoevsky","MANEUVOUR","Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,"no-cockpit",,,10,"{dostoevsky.bfxm;;}",,,,,,,36,36,3.5,250,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,340,340,FALSE,FALSE,300000000,4,180,25,20,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{;;32;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{;;15;Light Medium Heavy Special;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{;;15;Light Medium Heavy Special;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,125,0,,,,,,"pPiI"
++"Dostoevsky.stock","./vessels/Dostoevsky","Dostoevsky","MANEUVOUR","Vessel","FIGHTER","A superiority fighter manufactured in massive numbers by the Andolian Protectorate, the Dostoevsky combines a light, efficient design with immediately palpable firepower.  Though designed to engage other fighters, its ability to carry a torpedo, if only one, broadens the range of targets that must stay wary, especially in the numbers that Dostoevskys tend to appear in.","dostoevsky-hud.sprite",1.58,"no-cockpit",,,10,"{dostoevsky.bfxm;;}",,,,,,,36,36,3.5,250,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,45,45,55,15000,15000,11000,5000,5000,5000,5000,340,340,FALSE,FALSE,300000000,4,180,25,20,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{;;32;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}{;;15;Light Medium Heavy Special;3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}{;;15;Light Medium Heavy Special;-3.1;-0.13;2.35;;;0;0;1;0;1;0;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,125,0,,,,,,"pPiI"
+ "Hammer","./vessels/Hammer","Hammer",,"Vessel","FIGHTER","The Hammer assault craft was originally named the 'Toad', a creation of the LIHW.  However, usage of this model by the ISO has made it iconic, to the point where few call it by its original name.  Much larger than the other famous ISO ship, the Sickle, the Hammer  has sometimes been referred to as 'the mighty arm of the proletariat' in ISO propaganda.","hammer-hud.sprite",0.69,"no-cockpit",0,0.5,29,"{hammer.bfxm;;}",,,,,,,104,104,9.58,246,100,100,100,100,70,70,70,70,440,120,200,200,,,,,40,0,200,800,80,TRUE,1,,200,100,1,4,50000,50000,50000,40,40,40,14000,14000,10000,2000,2000,2000,2000,310,310,TRUE,TRUE,300000000,5,180,10,100,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.086;-0.269;-14.620000;2.000000;;;;;}","{IonBeam;;;Light;3.76500;0.15400;19.31000;;;;;;;;;1;1}{IonBeam;;;Light;2.80800;0.15400;19.98000;;;;;;;;;1;1}{IonBeam;;;Light;3.76500;-0.15400;19.31000;;;;;;;;;1;1}{IonBeam;;;Light;2.80800;-0.15400;19.98000;;;;;;;;;1;1}{torpedo;1;100;heavy-missile;-12;0;6.5;;;;;;;;;1;1}{friendorfoe;1;16;medium-missile;-12;0.05;6.55;;;;;;;;;1;1}{friendorfoe;1;16;medium-missile;-12;-0.05;6.55;;;;;;;;;1;1}{friendorfoe;1;16;medium-missile;-12;-0.05;6.45;;;;;;;;;1;1}{friendorfoe;1;16;medium-missile;-12;0.05;6.45;;;;;;;;;1;1}",,,,,,0,325,0,,,,,,"pPiI"
+ "Hammer.blank","./vessels/Hammer","Hammer","MANEUVOUR","Vessel","FIGHTER","The Hammer assault craft was originally named the 'Toad', a creation of the LIHW.  However, usage of this model by the ISO has made it iconic, to the point where few call it by its original name.  Much larger than the other famous ISO ship, the Sickle, the Hammer  has sometimes been referred to as 'the mighty arm of the proletariat' in ISO propaganda.","hammer-hud.sprite",0.69,"no-cockpit",0,0.5,29,"{hammer.bfxm;;}",,,,,,,44,44,9.58,246,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,40,40,40,14000,14000,10000,2000,2000,2000,2000,235,235,FALSE,FALSE,100000,0,0,0,100,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.086;-0.269;-14.620000;2.000000;;;;;}","{;;;Light;3.76500;0.15400;19.31000;;;;;;;;;1;1}{;;;Light;2.80800;0.15400;19.98000;;;;;;;;;1;1}{;;;Light;3.76500;-0.15400;19.31000;;;;;;;;;1;1}{;;;Light;2.80800;-0.15400;19.98000;;;;;;;;;1;1}{;1;100;heavy-missile;-12;0;6.5;;;;;;;;;1;1}{;1;16;medium-missile;-12;0.05;6.55;;;;;;;;;1;1}{;1;16;medium-missile;-12;-0.05;6.55;;;;;;;;;1;1}{;1;16;medium-missile;-12;-0.05;6.45;;;;;;;;;1;1}{;1;16;medium-missile;-12;0.05;6.45;;;;;;;;;1;1}",,,,,,0,325,0,,,,,,"pPiI"
+ "Hammer.iso","./vessels/Hammer","Hammer",,"Vessel","FIGHTER","The Hammer assault craft was originally named the 'Toad', a creation of the LIHW.  However, usage of this model by the ISO has made it iconic, to the point where few call it by its original name.  Much larger than the other famous ISO ship, the Sickle, the Hammer  has sometimes been referred to as 'the mighty arm of the proletariat' in ISO propaganda.","hammer-hud.sprite",0.69,"no-cockpit",0,0.5,29,"{hammer.bfxm;;}",,,,,,,104,104,9.58,246,100,100,100,100,70,70,70,70,220,60,100,100,,,,,40,0,200,800,80,TRUE,1,,200,100,1,4,50000,50000,50000,40,40,40,14000,14000,10000,2000,2000,2000,2000,310,310,TRUE,TRUE,300000000,5,180,10,100,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.086;-0.269;-14.620000;2.000000;;;;;}","{ParticleBeam;;;Light;3.76500;0.15400;19.31000;;;;;;;;;1;1}{ParticleBeam;;;Light;2.80800;0.15400;19.98000;;;;;;;;;1;1}{ParticleBeam;;;Light;3.76500;-0.15400;19.31000;;;;;;;;;1;1}{ParticleBeam;;;Light;2.80800;-0.15400;19.98000;;;;;;;;;1;1}{torpedo;1;100;heavy-missile;-12;0;6.5;;;;;;;;;1;1}{friendorfoe;1;16;medium-missile;-12;0.05;6.55;;;;;;;;;1;1}{friendorfoe;1;16;medium-missile;-12;-0.05;6.55;;;;;;;;;1;1}{friendorfoe;1;16;medium-missile;-12;-0.05;6.45;;;;;;;;;1;1}{friendorfoe;1;16;medium-missile;-12;0.05;6.45;;;;;;;;;1;1}",,,,,,0,325,0,,,,,,"pPiI"
+ "Hammer.isospec","./vessels/Hammer","Hammer",,"Vessel","FIGHTER","The Hammer assault craft was originally named the 'Toad', a creation of the LIHW.  However, usage of this model by the ISO has made it iconic, to the point where few call it by its original name.  Much larger than the other famous ISO ship, the Sickle, the Hammer  has sometimes been referred to as 'the mighty arm of the proletariat' in ISO propaganda.","hammer-hud.sprite",0.69,"no-cockpit",0,0.5,29,"{hammer.bfxm;;}",,,,,,,104,104,9.58,246,100,100,100,100,70,70,70,70,220,60,100,100,,,,,40,0,200,800,80,TRUE,1,,200,100,1,4,50000,50000,50000,40,40,40,14000,14000,10000,2000,2000,2000,2000,310,310,TRUE,TRUE,300000000,5,180,10,100,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.086;-0.269;-14.620000;2.000000;;;;;}","{;;5;Light;3.76500;0.15400;19.31000;;;;;;;;;1;1}{;;5;Light;2.80800;0.15400;19.98000;;;;;;;;;1;1}{;;5;Light;3.76500;-0.15400;19.31000;;;;;;;;;1;1}{;;5;Light;2.80800;-0.15400;19.98000;;;;;;;;;1;1}{;1;100;heavy-missile;-12;0;6.5;;;;;;;;;1;1}{;1;16;medium-missile;-12;0.05;6.55;;;;;;;;;1;1}{;1;16;medium-missile;-12;-0.05;6.55;;;;;;;;;1;1}{;1;16;medium-missile;-12;-0.05;6.45;;;;;;;;;1;1}{;1;16;medium-missile;-12;0.05;6.45;;;;;;;;;1;1}",,,,,,0,16,0,,,,,,"pPiI"
+-"Hammer.stock","./vessels/Hammer","Hammer","MANEUVOUR","Vessel","FIGHTER","The Hammer assault craft was originally named the 'Toad', a creation of the LIHW.  However, usage of this model by the ISO has made it iconic, to the point where few call it by its original name.  Much larger than the other famous ISO ship, the Sickle, the Hammer  has sometimes been referred to as 'the mighty arm of the proletariat' in ISO propaganda.","hammer-hud.sprite",0.69,"no-cockpit",0,0.5,29,"{hammer.bfxm;;}",,,,,,,58,58,9.58,246,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,,,FALSE,1,,200,120,1,4,50000,50000,50000,40,40,40,14000,14000,10000,2000,2000,2000,2000,235,235,FALSE,FALSE,300000000,4,180,25,100,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.086;-0.269;-14.620000;2.000000;;;;;}","{;;5;Light;3.76500;0.15400;19.31000;;;;;;;;;1;1}{;;5;Light;2.80800;0.15400;19.98000;;;;;;;;;1;1}{;;5;Light;3.76500;-0.15400;19.31000;;;;;;;;;1;1}{;;5;Light;2.80800;-0.15400;19.98000;;;;;;;;;1;1}{;1;100;heavy-missile;-12;0;6.5;;;;;;;;;1;1}{;1;16;medium-missile;-12;0.05;6.55;;;;;;;;;1;1}{;1;16;medium-missile;-12;-0.05;6.55;;;;;;;;;1;1}{;1;16;medium-missile;-12;-0.05;6.45;;;;;;;;;1;1}{;1;16;medium-missile;-12;0.05;6.45;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,325,0,,,,,,"pPiI"
++"Hammer.stock","./vessels/Hammer","Hammer","MANEUVOUR","Vessel","FIGHTER","The Hammer assault craft was originally named the 'Toad', a creation of the LIHW.  However, usage of this model by the ISO has made it iconic, to the point where few call it by its original name.  Much larger than the other famous ISO ship, the Sickle, the Hammer  has sometimes been referred to as 'the mighty arm of the proletariat' in ISO propaganda.","hammer-hud.sprite",0.69,"no-cockpit",0,0.5,29,"{hammer.bfxm;;}",,,,,,,58,58,9.58,246,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,,,FALSE,1,,200,120,1,4,50000,50000,50000,40,40,40,14000,14000,10000,2000,2000,2000,2000,235,235,FALSE,FALSE,300000000,4,180,25,100,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.086;-0.269;-14.620000;2.000000;;;;;}","{;;5;Light;3.76500;0.15400;19.31000;;;;;;;;;1;1}{;;5;Light;2.80800;0.15400;19.98000;;;;;;;;;1;1}{;;5;Light;3.76500;-0.15400;19.31000;;;;;;;;;1;1}{;;5;Light;2.80800;-0.15400;19.98000;;;;;;;;;1;1}{;1;100;heavy-missile;-12;0;6.5;;;;;;;;;1;1}{;1;16;medium-missile;-12;0.05;6.55;;;;;;;;;1;1}{;1;16;medium-missile;-12;-0.05;6.55;;;;;;;;;1;1}{;1;16;medium-missile;-12;-0.05;6.45;;;;;;;;;1;1}{;1;16;medium-missile;-12;0.05;6.45;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,325,0,,,,,,"pPiI"
+ "Hyena","./vessels/Hyena","Hyena",,"Vessel","FIGHTER","Like their namesakes from the savannahs of Earth, Hyenas are often seen preferring to engage the damaged, the naive, and the straggler rather than pursuing more solid prey, especially when in the hands of Pirates.  Though they possess neither great speed, nor impressive maneuverability, the Hyenas nonetheless pack enough firepower to give a pilot pause, especially in packs.","hyena-hud.spr",0.15,"no-cockpit",0,0,100,"{hyena.bfxm;;}",,,,,,,144,144,3.77,132,44,44,44,44,44,44,44,44,180,120,120,120,,,,,23.5,0,250,300,50,TRUE,1,,200,30,1,4,50000,50000,50000,60,65,65,15000,14000,10000,2000,2000,2000,2000,275,275,FALSE,TRUE,300000000,5,180,10,200,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-43.740699;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;-35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;43.740699;-14.15585;-74.549662;20;;;;;}","{MiniDriver;4000;20;Light Medium;-12.6;-16.5;4;;;;;;;;;1;1}{MiniDriver;4000;20;Light Medium;12.6;-16.5;4;;;;;;;;;1;1}{Pugilist;;;Light;-12.5;-1.5;-1;;;;;;;;;1;1}{Pugilist;;;Light;12.5;-1.5;-1;;;;;;;;;1;1}{friendorfoe;1;16;Special light-missile;0;-.23;4;;;;;;;;;1;1}",,,,,,0,450,0,,,,,,"pPiI"
+ "Hyena.blank","./vessels/Hyena","Hyena","MANEUVOUR","Vessel","FIGHTER","Like their namesakes from the savannahs of Earth, Hyenas are often seen preferring to engage the damaged, the naive, and the straggler rather than pursuing more solid prey, especially when in the hands of Pirates.  Though they possess neither great speed, nor impressive maneuverability, the Hyenas nonetheless pack enough firepower to give a pilot pause, especially in packs.","hyena-hud.spr",0.15,"no-cockpit",0,0,100,"{hyena.bfxm;;}",,,,,,,84,84,3.77,132,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,60,65,65,15000,14000,10000,2000,2000,2000,2000,205,205,FALSE,FALSE,100000,0,0,0,20,,,,,,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-43.740699;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;-35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;43.740699;-14.15585;-74.549662;20;;;;;}","{;;;Light Special;-12.6;-16.5;4;;;;;;;;;1;1}{;;;Light Special;12.6;-16.5;4;;;;;;;;;1;1}{;;;Light;-12.5;-1.5;-1;;;;;;;;;1;1}{;;;Light;12.5;-1.5;-1;;;;;;;;;1;1}{;1;16;Special;0;-.23;4;;;;;;;;;1;1}",,,,,,0,450,0,,,,,,"pPiI"
+ "Hyena.civvie","./vessels/Hyena","Hyena",,"Vessel","FIGHTER","Like their namesakes from the savannahs of Earth, Hyenas are often seen preferring to engage the damaged, the naive, and the straggler rather than pursuing more solid prey, especially when in the hands of Pirates.  Though they possess neither great speed, nor impressive maneuverability, the Hyenas nonetheless pack enough firepower to give a pilot pause, especially in packs.","hyena-hud.spr",0.15,"no-cockpit",0,0,100,"{hyena.bfxm;;}",,,,,,,144,144,3.77,132,44,44,44,44,44,44,44,44,90,60,60,60,,,,,23.5,0,250,300,50,TRUE,1,,200,30,1,4,50000,50000,50000,60,65,65,15000,14000,10000,2000,2000,2000,2000,210,210,FALSE,TRUE,300000000,5,180,10,200,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-43.740699;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;-35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;43.740699;-14.15585;-74.549662;20;;;;;}","{Pugilist;;;Light Medium;-12.6;-16.5;4;;;;;;;;;1;1}{Pugilist;;;Light Medium;12.6;-16.5;4;;;;;;;;;1;1}{PlasmaPlume;;;Light;-12.5;-1.5;-1;;;;;;;;;1;1}{PlasmaPlume;;;Light;12.5;-1.5;-1;;;;;;;;;1;1}{tractorbeam;1;16;Special light-missile;0;-.23;4;;;;;;;;;1;1}",,,,,,0,450,0,,,,,,"pPiI"
+ "Hyena.hunter","./vessels/Hyena","Hyena","MANEUVOUR","Vessel","FIGHTER","Like their namesakes from the savannahs of Earth, Hyenas are often seen preferring to engage the damaged, the naive, and the straggler rather than pursuing more solid prey, especially when in the hands of Pirates.  Though they possess neither great speed, nor impressive maneuverability, the Hyenas nonetheless pack enough firepower to give a pilot pause, especially in packs.","hyena-hud.spr",0.15,"no-cockpit",0,0,100,"{hyena.bfxm;;}",,,,,,,110,110,3.77,132,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,FALSE,1,,200,120,1,4,50000,50000,50000,60,65,65,15000,14000,10000,2000,2000,2000,2000,205,205,FALSE,FALSE,300000000,0,0,0,20,,,,,,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-43.740699;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;-35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;43.740699;-14.15585;-74.549662;20;;;;;}","{;;5;Light Special;-12.6;-16.5;4;;;;;;;;;1;1}{;;5;Light Special;12.6;-16.5;4;;;;;;;;;1;1}{;;5;Light;-12.5;-1.5;-1;;;;;;;;;1;1}{;;5;Light;12.5;-1.5;-1;;;;;;;;;1;1}{;1;16;Special;0;-.23;4;;;;;;;;;1;1}",,,,,,0,450,0,,,,,,"pPiI"
+-"Hyena.stock","./vessels/Hyena","Hyena","MANEUVOUR","Vessel","FIGHTER","Like their namesakes from the savannahs of Earth, Hyenas are often seen preferring to engage the damaged, the naive, and the straggler rather than pursuing more solid prey, especially when in the hands of Pirates.  Though they possess neither great speed, nor impressive maneuverability, the Hyenas nonetheless pack enough firepower to give a pilot pause, especially in packs.","hyena-hud.spr",0.15,"no-cockpit",0,0,100,"{hyena.bfxm;;}",,,,,,,98,98,3.77,132,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,60,65,65,15000,14000,10000,2000,2000,2000,2000,205,205,FALSE,FALSE,300000000,4,180,25,20,,,,,,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-43.740699;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;-35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;43.740699;-14.15585;-74.549662;20;;;;;}","{;;5;Light Special;-12.6;-16.5;4;;;;;;;;;1;1}{;;5;Light Special;12.6;-16.5;4;;;;;;;;;1;1}{;;5;Light;-12.5;-1.5;-1;;;;;;;;;1;1}{;;5;Light;12.5;-1.5;-1;;;;;;;;;1;1}{;1;16;Special;0;-.23;4;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,450,0,,,,,,"pPiI"
++"Hyena.stock","./vessels/Hyena","Hyena","MANEUVOUR","Vessel","FIGHTER","Like their namesakes from the savannahs of Earth, Hyenas are often seen preferring to engage the damaged, the naive, and the straggler rather than pursuing more solid prey, especially when in the hands of Pirates.  Though they possess neither great speed, nor impressive maneuverability, the Hyenas nonetheless pack enough firepower to give a pilot pause, especially in packs.","hyena-hud.spr",0.15,"no-cockpit",0,0,100,"{hyena.bfxm;;}",,,,,,,98,98,3.77,132,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,60,65,65,15000,14000,10000,2000,2000,2000,2000,205,205,FALSE,FALSE,300000000,4,180,25,20,,,,,,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-43.740699;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;-35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;35.702901;-14.15585;-74.549662;20;;;;;}{supernova.bmp.bfxm;43.740699;-14.15585;-74.549662;20;;;;;}","{;;5;Light Special;-12.6;-16.5;4;;;;;;;;;1;1}{;;5;Light Special;12.6;-16.5;4;;;;;;;;;1;1}{;;5;Light;-12.5;-1.5;-1;;;;;;;;;1;1}{;;5;Light;12.5;-1.5;-1;;;;;;;;;1;1}{;1;16;Special;0;-.23;4;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,450,0,,,,,,"pPiI"
+ "Lancelot","./vessels/Lancelot","Lancelot",,"Vessel","FIGHTER","High-Born heavy superiority fighter","destiny-hud.spr",1,,0,0.5,10,"{lancelot.bfxm;;}","lancelot_shield.bfxm",,,,,,208,208,14.25,950,515,515,515,515,390,390,390,390,2400,1500,1800,1800,,,,,80,0,250,1200,220,TRUE,1,,200,120,1,4,50000,50000,50000,50,50,55,30000,27000,22000,5000,5000,5000,5000,490,490,FALSE,FALSE,300000000,5,180,10,75,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;-3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;-3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;-3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;-2.9;-.16;-9.25;3;;;;;}{supernova.bmp.bfxm;2.9;-.16;-9.25;3;;;;;}","{razor;1000;20;light medium autotracking;-0.6;-2.8;7;;;;;;;;;1;1}{razor;1000;20;light medium autotracking;0.6;-2.8;7;;;;;;;;;1;1}{ShieldBreaker;;;medium heavy;-2;-0.16;11;;;;;;;;;1;1}{ShieldBreaker;;;medium heavy;2;-0.16;11;;;;;;;;;1;1}{HeatSeeker;4;12;light-missile medium-missile;4.470487;-0.182350;-1.094219;;;;;;;;;1;1}{HeatSeeker;4;12;light-missile medium-missile;-4.512798;-0.183760;-1.121801;;;;;;;;;1;1}{HeatSeeker;4;12;light-missile medium-missile;3.470487;-0.182350;-1.094219;;;;;;;;;1;1}{HeatSeeker;4;12;light-missile medium-missile;-3.512798;-0.183760;-1.121801;;;;;;;;;1;1}",,,,,,0,725,0,,,,,,"pPiI"
+ "Lancelot.blank","./vessels/Lancelot","Lancelot","MANEUVOUR","Vessel","FIGHTER","High-Born heavy superiority fighter","destiny-hud.spr",1,,0,0.5,10,"{lancelot.bfxm;;}","lancelot_shield.bfxm",,,,,,108,108,14.25,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,50,50,55,30000,27000,22000,5000,5000,5000,5000,370,370,FALSE,FALSE,100000,0,0,0,40,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;-3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;-3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;-3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;-2.9;-.16;-9.25;3;;;;;}{supernova.bmp.bfxm;2.9;-.16;-9.25;3;;;;;}","{;;;light medium;-0.6;-2.8;7;;;;;;;;;1;1}{;;;light medium;0.6;-2.8;7;;;;;;;;;1;1}{;;;medium heavy;-2;-0.16;11;;;;;;;;;1;1}{;;;medium heavy;2;-0.16;11;;;;;;;;;1;1}{;4;1;light-missile medium-missile;4.470487;-0.182350;-1.094219;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-4.512798;-0.183760;-1.121801;;;;;;;;;1;1}{;4;1;light-missile medium-missile;3.470487;-0.182350;-1.094219;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-3.512798;-0.183760;-1.121801;;;;;;;;;1;1}",,,,,,0,725,0,,,,,,"pPiI"
+ "Lancelot.milspec","./vessels/Lancelot","Lancelot",,"Vessel","FIGHTER","High-Born heavy superiority fighter","destiny-hud.spr",1,,0,0.5,10,"{lancelot.bfxm;;}","lancelot_shield.bfxm",,,,,,208,208,14.25,700,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,,,TRUE,1,,200,120,1,4,50000,50000,50000,50,50,55,30000,27000,22000,5000,5000,5000,5000,490,490,FALSE,FALSE,300000000,5,180,10,75,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;-3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;-3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;-3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;-2.9;-.16;-9.25;3;;;;;}{supernova.bmp.bfxm;2.9;-.16;-9.25;3;;;;;}","{;;20;light medium;-0.6;-2.8;7;;;;;;;;;1;1}{;;20;light medium;0.6;-2.8;7;;;;;;;;;1;1}{;;20;medium heavy;-2;-0.16;11;;;;;;;;;1;1}{;;20;medium heavy;2;-0.16;11;;;;;;;;;1;1}{;;12;light-missile medium-missile;4.470487;-0.182350;-1.094219;;;;;;;;;1;1}{;;12;light-missile medium-missile;-4.512798;-0.183760;-1.121801;;;;;;;;;1;1}{;;12;light-missile medium-missile;3.470487;-0.182350;-1.094219;;;;;;;;;1;1}{;;12;light-missile medium-missile;-3.512798;-0.183760;-1.121801;;;;;;;;;1;1}",,,,"{Lancelot_Milspec_Package;upgrades/Packages/Milspec;200000;1;100;690;1;1;Full-Custom Milspec Configuration;0}",,0,725,0,,,,,,"pPiI"
+-"Lancelot.stock","./vessels/Lancelot","Lancelot","MANEUVOUR","Vessel","FIGHTER","High-Born heavy superiority fighter","destiny-hud.spr",1,,0,0.5,10,"{lancelot.bfxm;;}","lancelot_shield.bfxm",,,,,,122,122,14.25,700,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,50,50,55,30000,27000,22000,5000,5000,5000,5000,370,370,FALSE,FALSE,300000000,4,180,25,40,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;-3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;-3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;-3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;-2.9;-.16;-9.25;3;;;;;}{supernova.bmp.bfxm;2.9;-.16;-9.25;3;;;;;}","{;;10;light medium;-0.6;-2.8;7;;;;;;;;;1;1}{;;10;light medium;0.6;-2.8;7;;;;;;;;;1;1}{;;15;medium heavy;-2;-0.16;11;;;;;;;;;1;1}{;;15;medium heavy;2;-0.16;11;;;;;;;;;1;1}{;4;1;light-missile medium-missile;4.470487;-0.182350;-1.094219;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-4.512798;-0.183760;-1.121801;;;;;;;;;1;1}{;4;1;light-missile medium-missile;3.470487;-0.182350;-1.094219;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-3.512798;-0.183760;-1.121801;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,725,0,,,,,,"pPiI"
+-"Redeemer","./vessels/Redeemer","Redeemer",,"Vessel","FIGHTER","Aging Luddite insystem fighter","redeemer-hud.spr",1,"no-cockpit",0,0.25,8,"{redeemer.bfxm;;}",,,,,,,11.2,11.2,3.25,120,20,20,20,20,20,20,20,20,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,60,66,76,2000,1750,1000,700,700,700,700,250,250,FALSE,FALSE,300000000,5,180,10,5,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor01;;}{dualshield02;;}{add_spec_capacitor01;;}{capacitor01;;}{reactor02;;}{skyscope2;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;-0.0;-0.533517;-4.4708;5;;;;;}","{MiniDriver;1000;5;Light Medium;-0.876000;-0.140000;-0.732000;;;;;;;;;1;1}{MassDriver;1000;5;Light Medium;0.886000;-0.140000;-0.732000;;;;;;;;;1;1}{Dumbfire;32;32;light-missile;-0.276000;-0.182000;0.00000e+0;;;;;;;;;1;1}{Dumbfire;32;32;light-missile;0.278000;-0.182000;0.00000e+0;;;;;;;;;1;1}",,,,,,0,40,0,,,,,,"pPiI"
++"Lancelot.stock","./vessels/Lancelot","Lancelot","MANEUVOUR","Vessel","FIGHTER","High-Born heavy superiority fighter","destiny-hud.spr",1,,0,0.5,10,"{lancelot.bfxm;;}","lancelot_shield.bfxm",,,,,,122,122,14.25,700,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,50,50,55,30000,27000,22000,5000,5000,5000,5000,370,370,FALSE,FALSE,300000000,4,180,25,40,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;3.35;1.125;-9.25;8;;;;;}{supernova.bmp.bfxm;-3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;3.5;.125;-9.25;3;;;;;}{supernova.bmp.bfxm;-3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;3;.25;-9.25;3;;;;;}{supernova.bmp.bfxm;-3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;3.35;-.3;-9.25;3;;;;;}{supernova.bmp.bfxm;-2.9;-.16;-9.25;3;;;;;}{supernova.bmp.bfxm;2.9;-.16;-9.25;3;;;;;}","{;;10;light medium;-0.6;-2.8;7;;;;;;;;;1;1}{;;10;light medium;0.6;-2.8;7;;;;;;;;;1;1}{;;15;medium heavy;-2;-0.16;11;;;;;;;;;1;1}{;;15;medium heavy;2;-0.16;11;;;;;;;;;1;1}{;4;1;light-missile medium-missile;4.470487;-0.182350;-1.094219;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-4.512798;-0.183760;-1.121801;;;;;;;;;1;1}{;4;1;light-missile medium-missile;3.470487;-0.182350;-1.094219;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-3.512798;-0.183760;-1.121801;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,725,0,,,,,,"pPiI"
++"Redeemer","./vessels/Redeemer","Redeemer",,"Vessel","FIGHTER","Aging Luddite insystem fighter","redeemer-hud.spr",1,"no-cockpit",0,0.25,8,"{redeemer.bfxm;;}",,,,,,,11.2,11.2,3.25,120,20,20,20,20,20,20,20,20,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,60,66,76,2000,1750,1000,700,700,700,700,250,250,FALSE,FALSE,300000000,5,180,10,5,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor01;;}{dualshield02;;}{spec_capacitor01;;}{capacitor01;;}{reactor02;;}{skyscope2;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;-0.0;-0.533517;-4.4708;5;;;;;}","{MiniDriver;1000;5;Light Medium;-0.876000;-0.140000;-0.732000;;;;;;;;;1;1}{MassDriver;1000;5;Light Medium;0.886000;-0.140000;-0.732000;;;;;;;;;1;1}{Dumbfire;32;32;light-missile;-0.276000;-0.182000;0.00000e+0;;;;;;;;;1;1}{Dumbfire;32;32;light-missile;0.278000;-0.182000;0.00000e+0;;;;;;;;;1;1}",,,,,,0,40,0,,,,,,"pPiI"
+ "Redeemer.blank","./vessels/Redeemer","Redeemer","MANEUVOUR","Vessel","FIGHTER","Aging Luddite insystem fighter","redeemer-hud.spr",1,"no-cockpit",0,0.25,8,"{redeemer.bfxm;;}",,,,,,,11.2,11.2,3.25,120,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,60,66,76,2000,1750,1000,700,700,700,700,163,163,FALSE,FALSE,100000,0,0,0,10,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;-0.0;-0.533517;-4.4708;5;;;;;}","{;;;Light Medium;-0.876000;-0.140000;-0.732000;;;;;;;;;1;1}{;;;Light Medium;0.886000;-0.140000;-0.732000;;;;;;;;;1;1}{;1;32;light-missile;-0.276000;-0.182000;0.00000e+0;;;;;;;;;1;1}{;1;32;light-missile;0.278000;-0.182000;0.00000e+0;;;;;;;;;1;1}{;4;1;Special Special-Missile;-0.582000;-0.182000;0;;;;;;;;;1;1}",,,,,,0,40,0,,,,,,"pPiI"
+-"Redeemer.stock","./vessels/Redeemer","Redeemer","MANEUVOUR","Vessel","FIGHTER","Aging Luddite insystem fighter","redeemer-hud.spr",1,"no-cockpit",0,0.25,8,"{redeemer.bfxm;;}",,,,,,,11.2,11.2,3.25,120,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,25,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,60,66,76,2000,1750,1000,700,700,700,700,163,163,FALSE,FALSE,300000000,4,180,25,10,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;-0.0;-0.533517;-4.4708;5;;;;;}","{;;5;Light Medium;-0.876000;-0.140000;-0.732000;;;;;;;;;1;1}{;;5;Light Medium;0.886000;-0.140000;-0.732000;;;;;;;;;1;1}{;1;32;light-missile;-0.276000;-0.182000;0.00000e+0;;;;;;;;;1;1}{;1;32;light-missile;0.278000;-0.182000;0.00000e+0;;;;;;;;;1;1}{;4;1;Special Special-Missile;-0.582000;-0.182000;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,40,0,,,,,,"pPiI"
++"Redeemer.stock","./vessels/Redeemer","Redeemer","MANEUVOUR","Vessel","FIGHTER","Aging Luddite insystem fighter","redeemer-hud.spr",1,"no-cockpit",0,0.25,8,"{redeemer.bfxm;;}",,,,,,,11.2,11.2,3.25,120,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,25,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,60,66,76,2000,1750,1000,700,700,700,700,163,163,FALSE,FALSE,300000000,4,180,25,10,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{thrust1.bfxm;-0.0;-0.533517;-4.4708;5;;;;;}","{;;5;Light Medium;-0.876000;-0.140000;-0.732000;;;;;;;;;1;1}{;;5;Light Medium;0.886000;-0.140000;-0.732000;;;;;;;;;1;1}{;1;32;light-missile;-0.276000;-0.182000;0.00000e+0;;;;;;;;;1;1}{;1;32;light-missile;0.278000;-0.182000;0.00000e+0;;;;;;;;;1;1}{;4;1;Special Special-Missile;-0.582000;-0.182000;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,40,0,,,,,,"pPiI"
+ "Regret","./vessels/Regret","Regret",,"Vessel","FIGHTER","Shmrn in-system superiority fighter","Regret-hud.spr",1,,0,0,0,"{regret.bfxm;;}","regret-shield.bfxm",,,,,,72,72,3.46,200,50,50,50,50,50,50,50,50,250,250,,,,,,,25,0,25,300,25,FALSE,1,,200,120,1,2,50000,50000,50000,65,65,65,17500,15000,15000,5000,5000,5000,5000,350,325,TRUE,TRUE,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"jumpdrive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.5973;0.48082;-7.39491;4;;;;;}{supernova.bmp.bfxm;0.5973;0.48082;-7.39491;4;;;;;}{supernova.bmp.bfxm;2.0167;0.00188;-7.39491;4;;;;;}{supernova.bmp.bfxm;-2.0167;0.00188;-7.39491;4;;;;;}{supernova.bmp.bfxm;0.61947;-0.49032;-7.39491;4;;;;;}{supernova.bmp.bfxm;-0.61947;-0.49032;-7.39491;4;;;;;}","{FS_MWRF_Laser;;;Medium;0;-2.8;5.5;.2;.2;;;;;;;1;1}{FS_MWRF_Laser;;;Medium;0;3;7.75;.2;.2;;;;;;;1;1}{Hail;100;25;special special-missile medium-missile;0;0;6.5;;;;;;;;;1;1}{Hail;100;25;special special-missile medium-missile;0;0;6.5;;;;;;;;;1;1}{Hail;100;25;special special-missile medium-missile;0;0;6.5;;;;;;;;;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+ "Regret.blank","./vessels/Regret","Regret",,"Vessel","FIGHTER",,"Regret-hud.spr",2,,0,0,0,"{regret.bfxm;;}",,,,,,,72,72,3.46,200,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,2,50000,50000,50000,65,65,65,17500,15000,15000,5000,5000,5000,5000,350,325,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"jumpdrive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.5973;0.48082;-7.39491;4;;;;;}{supernova.bmp.bfxm;0.5973;0.48082;-7.39491;4;;;;;}{supernova.bmp.bfxm;2.0167;0.00188;-7.39491;4;;;;;}{supernova.bmp.bfxm;-2.0167;0.00188;-7.39491;4;;;;;}{supernova.bmp.bfxm;0.61947;-0.49032;-7.39491;4;;;;;}{supernova.bmp.bfxm;-0.61947;-0.49032;-7.39491;4;;;;;}","{FS_MWRF_Laser;;;Medium;0;-2.8;5.5;.2;.2;;;;;;;1;1}{FS_MWRF_Laser;;;Medium;0;3;7.75;.2;.2;;;;;;;1;1}{Hail;100;25;special special-missile medium-missile;0;0;6.5;;;;;;;;;1;1}{Hail;100;25;special special-missile medium-missile;0;0;6.5;;;;;;;;;1;1}{Hail;100;25;special special-missile medium-missile;0;0;6.5;;;;;;;;;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+ "Robin","./vessels/Robin","Robin",,"Vessel","FIGHTER","LIHW mass production utility fighter","robin-hud.sprite",1.25,,0,0.5,12,"{robin.bfxm;;}",,,,,,,48,48,3.51,127,35,35,35,35,35,35,35,35,250,250,,,,,,,25,0,250,400,33,TRUE,1,,200,20,1,4,50000,50000,50000,65,65,70,8500,8500,7500,2000,2000,2000,2000,180,180,FALSE,TRUE,300000000,5,180,10,25,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.500000;0.700000;-8.000000;2.750000;;;;;}{supernova.bmp.bfxm;-1.500000;0.700000;-8.000000;2.750000;;;;;}","{Pugilist;;;light;0.800000;-0.600000;8.000000;;;;;;;;;1;1}{Pugilist;;;light;-0.800000;-0.600000;8.000000;;;;;;;;;1;1}{ParticleBeam;;;light;-0.000000;-0.400000;8.200000;;;;;;;;;1;1}{Swarm;25;7;Special Special-Missile;2.000000;0.800000;-4.000000;;;;;;;;;1;1}{Swarm;25;7;Special Special-Missile;-2.000000;0.800000;-4.000000;;;;;;;;;1;1}{Swarm;25;7;Special Special-Missile;1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{Swarm;25;7;Special Special-Missile;-1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{FriendOrFoe;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{FriendOrFoe;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+ "Robin.blank","./vessels/Robin","Robin","MANEUVOUR","Vessel","FIGHTER","LIHW mass production utility fighter","robin-hud.sprite",1.25,,0,0.5,12,"{robin.bfxm;;}",,,,,,,28,28,3.51,127,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,65,65,70,8500,8500,7500,2000,2000,2000,2000,230,203,FALSE,FALSE,100000,0,0,0,7,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.500000;0.700000;-8.000000;2.750000;;;;;}{supernova.bmp.bfxm;-1.500000;0.700000;-8.000000;2.750000;;;;;}","{;;;light;0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;;light;-0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;;light;-0.000000;-0.400000;8.200000;;;;;;;;;1;1}{;25;7;Special Special-Missile;2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+-"Robin.hunter","./vessels/Robin","Robin","MANEUVOUR","Vessel","FIGHTER","LIHW mass production utility fighter","robin-hud.sprite",1.25,,0,0.5,12,"{robin.bfxm;;}",,,,,,,48,48,3.51,127,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,250,,,FALSE,1,,200,120,1,4,50000,50000,50000,65,65,70,8500,8500,7500,2000,2000,2000,2000,230,203,FALSE,FALSE,300000000,0,0,0,7,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.500000;0.700000;-8.000000;2.750000;;;;;}{supernova.bmp.bfxm;-1.500000;0.700000;-8.000000;2.750000;;;;;}","{;;5;light;0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;5;light;-0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;5;light;-0.000000;-0.400000;8.200000;;;;;;;;;1;1}{;25;7;Special Special-Missile;2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,125,0,,,,,,"pPiI"
+-"Robin.stock","./vessels/Robin","Robin","MANEUVOUR","Vessel","FIGHTER","LIHW mass production utility fighter","robin-hud.sprite",1.25,,0,0.5,12,"{robin.bfxm;;}",,,,,,,42,42,3.51,127,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,65,65,70,8500,8500,7500,2000,2000,2000,2000,230,203,FALSE,FALSE,300000000,4,180,25,7,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.500000;0.700000;-8.000000;2.750000;;;;;}{supernova.bmp.bfxm;-1.500000;0.700000;-8.000000;2.750000;;;;;}","{;;5;light;0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;5;light;-0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;5;light;-0.000000;-0.400000;8.200000;;;;;;;;;1;1}{;25;7;Special Special-Missile;2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,125,0,,,,,,"pPiI"
++"Robin.hunter","./vessels/Robin","Robin","MANEUVOUR","Vessel","FIGHTER","LIHW mass production utility fighter","robin-hud.sprite",1.25,,0,0.5,12,"{robin.bfxm;;}",,,,,,,48,48,3.51,127,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,250,,,FALSE,1,,200,120,1,4,50000,50000,50000,65,65,70,8500,8500,7500,2000,2000,2000,2000,230,203,FALSE,FALSE,300000000,0,0,0,7,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.500000;0.700000;-8.000000;2.750000;;;;;}{supernova.bmp.bfxm;-1.500000;0.700000;-8.000000;2.750000;;;;;}","{;;5;light;0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;5;light;-0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;5;light;-0.000000;-0.400000;8.200000;;;;;;;;;1;1}{;25;7;Special Special-Missile;2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,125,0,,,,,,"pPiI"
++"Robin.stock","./vessels/Robin","Robin","MANEUVOUR","Vessel","FIGHTER","LIHW mass production utility fighter","robin-hud.sprite",1.25,,0,0.5,12,"{robin.bfxm;;}",,,,,,,42,42,3.51,127,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,65,65,70,8500,8500,7500,2000,2000,2000,2000,230,203,FALSE,FALSE,300000000,4,180,25,7,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.500000;0.700000;-8.000000;2.750000;;;;;}{supernova.bmp.bfxm;-1.500000;0.700000;-8.000000;2.750000;;;;;}","{;;5;light;0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;5;light;-0.800000;-0.600000;8.000000;;;;;;;;;1;1}{;;5;light;-0.000000;-0.400000;8.200000;;;;;;;;;1;1}{;25;7;Special Special-Missile;2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-2.000000;0.800000;-4.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;25;7;Special Special-Missile;-1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,125,0,,,,,,"pPiI"
+ "Robin.tutorial","./vessels/Robin","Robin",,"Vessel","FIGHTER","Oswald's utility fighter","robin-hud.sprite",1.25,,0,0.5,12,"{robin.bfxm;;}",,,,,,,48,48,3.51,500,500,500,500,500,500,500,500,500,250,250,250,250,,,,,100,0,250,400,33,TRUE,1,,200,20,1,4,50000,50000,50000,65,65,70,8500,8500,7500,2000,2000,2000,2000,300,250,FALSE,TRUE,300000000,5,180,10,25,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{quadshield15;;}{armor06;;}{autotracking;;}{mult_overdrive02;;}{ecm_package03;;}{reactor08;;}{capacitor05;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.500000;0.700000;-8.000000;2.750000;;;;;}{supernova.bmp.bfxm;-1.500000;0.700000;-8.000000;2.750000;;;;;}","{Pugilist;;;light;0.800000;-0.600000;8.000000;;;;;;;;;1;1}{Pugilist;;;light;-0.800000;-0.600000;8.000000;;;;;;;;;1;1}{ParticleBeam;;;light;-0.000000;-0.400000;8.200000;;;;;;;;;1;1}{Swarm;25;7;Special Special-Missile;2.000000;0.800000;-4.000000;;;;;;;;;1;1}{Swarm;25;7;Special Special-Missile;-2.000000;0.800000;-4.000000;;;;;;;;;1;1}{Swarm;25;7;Special Special-Missile;1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{Swarm;25;7;Special Special-Missile;-1.000000;-1.400000;-1.000000;;;;;;;;;1;1}{FriendOrFoe;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{FriendOrFoe;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+ "Seaxbane","./vessels/Seaxbane","Seaxbane",,"Vessel","FIGHTER","Security drone","seaxbane-hud.sprite",0.13,,0,0,0,"{seaxbane.bfxm;;}",,,,,,,25,25,2,60,25,25,25,25,25,25,25,25,50,50,,,,,,,15,0,25,200,25,FALSE,1,,200,120,1,4,50000,50000,50000,90,90,90,3000,3000,3000,3000,3000,3000,3000,222,222,FALSE,FALSE,3000000,5,180,50,1,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.97838;5.31369;-12.347302;13;;;;;}{supernova.bmp.bfxm;-4.97823;5.31369;-12.347297;13;;;;;}","{Arc_Device;;;Light Medium;21.89495;-6.265625;15.019003;;;;;;;;;1;1}{Arc_Device;;;Light Medium;-21.89495;-6.265625;15.019003;;;;;;;;;1;1}{Crippler;;;Light Medium Special;0;19.2408;20.111703;;;;;;;;;1;1}",,,,,,0,1,0,,,,,,"pPiI"
+ "Seaxbane.blank","./vessels/Seaxbane","SeaxBane",,"Vessel","FIGHTER","Security drone","seaxbane-hud.sprite",0.13,,0,0,0,"{seaxbane.bfxm;;}",,,,,,,25,25,2,60,25,25,25,25,25,25,25,25,50,50,,,,,,,15,0,25,200,25,FALSE,1,,200,120,1,4,50000,50000,50000,90,90,90,3000,3000,3000,3000,3000,3000,3000,222,222,FALSE,FALSE,3000000,5,180,50,1,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;4.97838;5.31369;-12.347302;13;;;;;}{supernova.bmp.bfxm;-4.97823;5.31369;-12.347297;13;;;;;}","{Arc_Device;;;Light Medium;21.89495;-6.265625;15.019003;;;;;;;;;1;1}{Arc_Device;;;Light Medium;-21.89495;-6.265625;15.019003;;;;;;;;;1;1}{Crippler;;;Light Medium Special;0;19.2408;20.111703;;;;;;;;;1;1}",,,,,,0,1,0,,,,,,"pPiI"
+@@ -577,26 +577,26 @@
+ "Sickle.blank","./vessels/Sickle","Sickle","MANEUVOUR","Vessel","FIGHTER","Like the Hammer, the Sickle is a ship of LIHW design, and was known prior to ISO usage as the 'Goose'. While the Hammer is more feared, the Sickle is more common. By far the most common ship seen in use by the ISO, the Sickle's maneuverability and large missile bays make it a favorite of many Hunters as well.","sickle-hud.sprite",1.5,,,,13,"{sickle.bfxm;;}",,,,,,,110,110,4.58,150,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,70,75,90,14000,14000,10000,2000,2000,2000,2000,180,180,FALSE,FALSE,100000,0,0,0,14,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.058558;0.326294;-1.977969;1.780003;;;;;}{supernova.bmp.bfxm;-1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;0.863464;-1.003810;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;-0.863464;-1.003810;-3.000000;0.40000;;;;;}","{;2;32;Light-missile Medium-missile;-1.056411;-1.226957;3.200000;;;;;;;;;1;1}{;2;32;Light-missile Medium-missile;1.056411;-1.226957;3.200000;;;;;;;;;1;1}{;;;Light medium;0;0.1;3;;;;;;;;;1;1}{;2;32;light-missile medium-missile Special;-1.629525;1.044771;3.200000;;;;;;;;;1;1}{;2;32;light-missile medium-missile Special;1.629525;1.044771;3.200000;;;;;;;;;1;1}",,,,,,0,250,0,,,,,,"pPiI"
+ "Sickle.iso","./vessels/Sickle","Sickle",,"Vessel","FIGHTER","Like the Hammer, the Sickle is a ship of LIHW design, and was known prior to ISO usage as the 'Goose'. While the Hammer is more feared, the Sickle is more common. By far the most common ship seen in use by the ISO, the Sickle's maneuverability and large missile bays make it a favorite of many Hunters as well.","sickle-hud.sprite",1.5,,,,13,"{sickle.bfxm;;}",,,,,,,180,180,4.58,150,40,40,40,40,22.5,22.5,22.5,22.5,180,60,,,,,,,20,0,250,180,40,TRUE,1,,200,60,1,4,50000,50000,50000,70,75,90,14000,14000,10000,2000,2000,2000,2000,170,170,FALSE,TRUE,300000000,5,180,10,50,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.058558;0.326294;-1.977969;1.780003;;;;;}{supernova.bmp.bfxm;-1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;0.863464;-1.003810;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;-0.863464;-1.003810;-3.000000;0.40000;;;;;}","{friendorfoe;2;32;Light-missile Medium-missile;-1.056411;-1.226957;3.200000;;;;;;;;;1;1}{friendorfoe;2;32;Light-missile Medium-missile;1.056411;-1.226957;3.200000;;;;;;;;;1;1}{HeavyIonBeam;;;Light medium;0;0.1;3;;;;;;;;;1;1}{friendorfoe;2;32;light-missile medium-missile Special;-1.629525;1.044771;3.200000;;;;;;;;;1;1}{friendorfoe;2;32;light-missile medium-missile Special;1.629525;1.044771;3.200000;;;;;;;;;1;1}",,,,,,0,250,0,,,,,,"pPiI"
+ "Sickle.isospec","./vessels/Sickle","Sickle",,"Vessel","FIGHTER","Like the Hammer, the Sickle is a ship of LIHW design, and was known prior to ISO usage as the 'Goose'. While the Hammer is more feared, the Sickle is more common. By far the most common ship seen in use by the ISO, the Sickle's maneuverability and large missile bays make it a favorite of many Hunters as well.","sickle-hud.sprite",1.5,,,,13,"{sickle.bfxm;;}",,,,,,,180,180,4.58,150,40,40,40,40,22.5,22.5,22.5,22.5,180,60,,,,,,,20,0,250,180,40,TRUE,1,,200,60,1,4,50000,50000,50000,70,75,90,14000,14000,10000,2000,2000,2000,2000,170,170,FALSE,TRUE,300000000,5,180,10,50,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.058558;0.326294;-1.977969;1.780003;;;;;}{supernova.bmp.bfxm;-1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;0.863464;-1.003810;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;-0.863464;-1.003810;-3.000000;0.40000;;;;;}","{;2;32;Light-missile Medium-missile;-1.056411;-1.226957;3.200000;;;;;;;;;1;1}{;2;32;Light-missile Medium-missile;1.056411;-1.226957;3.200000;;;;;;;;;1;1}{;;10;Light medium;0;0.1;3;;;;;;;;;1;1}{;2;32;light-missile medium-missile Special;-1.629525;1.044771;3.200000;;;;;;;;;1;1}{;2;32;light-missile medium-missile Special;1.629525;1.044771;3.200000;;;;;;;;;1;1}",,,,,,0,12,0,,,,,,"pPiI"
+-"Sickle.stock","./vessels/Sickle","Sickle","MANEUVOUR","Vessel","FIGHTER","Like the Hammer, the Sickle is a ship of LIHW design, and was known prior to ISO usage as the 'Goose'. While the Hammer is more feared, the Sickle is more common. By far the most common ship seen in use by the ISO, the Sickle's maneuverability and large missile bays make it a favorite of many Hunters as well.","sickle-hud.sprite",1.5,,,,13,"{sickle.bfxm;;}",,,,,,,124,124,4.58,150,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,70,75,90,14000,14000,10000,2000,2000,2000,2000,180,180,FALSE,FALSE,300000000,4,180,25,14,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.058558;0.326294;-1.977969;1.780003;;;;;}{supernova.bmp.bfxm;-1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;0.863464;-1.003810;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;-0.863464;-1.003810;-3.000000;0.40000;;;;;}","{;2;32;Light-missile Medium-missile;-1.056411;-1.226957;3.200000;;;;;;;;;1;1}{;2;32;Light-missile Medium-missile;1.056411;-1.226957;3.200000;;;;;;;;;1;1}{;;;Light medium;0;0.1;3;;;;;;;;;1;1}{;2;32;light-missile medium-missile Special;-1.629525;1.044771;3.200000;;;;;;;;;1;1}{;2;32;light-missile medium-missile Special;1.629525;1.044771;3.200000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,250,0,,,,,,"pPiI"
++"Sickle.stock","./vessels/Sickle","Sickle","MANEUVOUR","Vessel","FIGHTER","Like the Hammer, the Sickle is a ship of LIHW design, and was known prior to ISO usage as the 'Goose'. While the Hammer is more feared, the Sickle is more common. By far the most common ship seen in use by the ISO, the Sickle's maneuverability and large missile bays make it a favorite of many Hunters as well.","sickle-hud.sprite",1.5,,,,13,"{sickle.bfxm;;}",,,,,,,124,124,4.58,150,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,70,75,90,14000,14000,10000,2000,2000,2000,2000,180,180,FALSE,FALSE,300000000,4,180,25,14,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.058558;0.326294;-1.977969;1.780003;;;;;}{supernova.bmp.bfxm;-1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;1.347379;0.958650;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;0.863464;-1.003810;-3.000000;0.40000;;;;;}{supernova.bmp.bfxm;-0.863464;-1.003810;-3.000000;0.40000;;;;;}","{;2;32;Light-missile Medium-missile;-1.056411;-1.226957;3.200000;;;;;;;;;1;1}{;2;32;Light-missile Medium-missile;1.056411;-1.226957;3.200000;;;;;;;;;1;1}{;;;Light medium;0;0.1;3;;;;;;;;;1;1}{;2;32;light-missile medium-missile Special;-1.629525;1.044771;3.200000;;;;;;;;;1;1}{;2;32;light-missile medium-missile Special;1.629525;1.044771;3.200000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,250,0,,,,,,"pPiI"
+ "Vendetta.blank","./vessels/Vendetta","Vendetta",,"Vessel","FIGHTER","LTC built Hunter-commisioned vessel","vendetta-hud.spr",0.5,,0,0.71,30.33,"{vendetta.bfxm;;}",,,,,,,180,180,15,600,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,150,1,4,50000,50000,50000,70,70,70,35000,30000,25000,5000,5000,5000,5000,490,450,FALSE,FALSE,100000,1,1,20,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;7.861;-2.5;2.6;11;;;;;}{supernova.bmp.bfxm;-7.861;-2.5;2.6;11;;;;;}{supernova.bmp.bfxm;7.661;-3.9;4.206;8;;;;;}{supernova.bmp.bfxm;-7.661;-3.9;4.206;8;;;;;}","{;;;light autotracking;-34.575;0.55;29.427;;;;;;;;;1;1}{;;;light autotracking;-34.575;-4.244;29.427;;;;;;;;;1;1}{;;;light autotracking;-23.535;0.55;33.618;;;;;;;;;1;1}{;;;light autotracking;-23.535;-4.244;33.618;;;;;;;;;1;1}{;;;light autotracking;23.535;0.55;33.618;;;;;;;;;1;1}{;;;light autotracking;23.535;-4.244;33.618;;;;;;;;;1;1}{;;;light autotracking;34.575;0.55;29.427;;;;;;;;;1;1}{;;;light autotracking;34.575;-4.244;29.427;;;;;;;;;1;1}",,,,,,0,680,0,,,,,,"pPiI"
+ "Vendetta.hunter","./vessels/Vendetta","Vendetta",,"Vessel","FIGHTER","LTC built Hunter-commisioned vessel","vendetta-hud.spr",0.5,,0,0.71,30.33,"{vendetta.bfxm;;}",,,,,,,250,250,15,700,450,450,450,450,400,400,400,400,1200,900,800,800,,,,,60,0,325,2000,250,TRUE,1,,200,150,1,4,50000,50000,50000,70,70,70,35000,30000,25000,5000,5000,5000,5000,490,450,TRUE,TRUE,300000000,4,180,25,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;7.861;-2.5;2.6;11;;;;;}{supernova.bmp.bfxm;-7.861;-2.5;2.6;11;;;;;}{supernova.bmp.bfxm;7.661;-3.9;4.206;8;;;;;}{supernova.bmp.bfxm;-7.661;-3.9;4.206;8;;;;;}","{IonBurster;;;light autotracking;-34.575;0.55;29.427;;;;;;;;;1;1}{IonBurster;;;light autotracking;-34.575;-4.244;29.427;;;;;;;;;1;1}{IonBurster;;;light autotracking;-23.535;0.55;33.618;;;;;;;;;1;1}{IonBurster;;;light autotracking;-23.535;-4.244;33.618;;;;;;;;;1;1}{IonBurster;;;light autotracking;23.535;0.55;33.618;;;;;;;;;1;1}{IonBurster;;;light autotracking;23.535;-4.244;33.618;;;;;;;;;1;1}{IonBurster;;;light autotracking;34.575;0.55;29.427;;;;;;;;;1;1}{IonBurster;;;light autotracking;34.575;-4.244;29.427;;;;;;;;;1;1}",,,,,,0,680,0,,,,,,"pPiI"
+-"Vendetta.stock","./vessels/Vendetta","Vendetta",,"Vessel","FIGHTER","LTC built Hunter-commisioned vessel","vendetta-hud.spr",0.5,,0,0.71,30.33,"{vendetta.bfxm;;}",,,,,,,194,194,15,600,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,150,1,4,50000,50000,50000,70,70,70,35000,30000,25000,5000,5000,5000,5000,490,450,FALSE,FALSE,300000000,4,180,25,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;7.861;-2.5;2.6;11;;;;;}{supernova.bmp.bfxm;-7.861;-2.5;2.6;11;;;;;}{supernova.bmp.bfxm;7.661;-3.9;4.206;8;;;;;}{supernova.bmp.bfxm;-7.661;-3.9;4.206;8;;;;;}","{;;;light autotracking;-34.575;0.55;29.427;;;;;;;;;1;1}{;;;light autotracking;-34.575;-4.244;29.427;;;;;;;;;1;1}{;;;light autotracking;-23.535;0.55;33.618;;;;;;;;;1;1}{;;;light autotracking;-23.535;-4.244;33.618;;;;;;;;;1;1}{;;;light autotracking;23.535;0.55;33.618;;;;;;;;;1;1}{;;;light autotracking;23.535;-4.244;33.618;;;;;;;;;1;1}{;;;light autotracking;34.575;0.55;29.427;;;;;;;;;1;1}{;;;light autotracking;34.575;-4.244;29.427;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,680,0,,,,,,"pPiI"
++"Vendetta.stock","./vessels/Vendetta","Vendetta",,"Vessel","FIGHTER","LTC built Hunter-commisioned vessel","vendetta-hud.spr",0.5,,0,0.71,30.33,"{vendetta.bfxm;;}",,,,,,,194,194,15,600,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,150,1,4,50000,50000,50000,70,70,70,35000,30000,25000,5000,5000,5000,5000,490,450,FALSE,FALSE,300000000,4,180,25,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;7.861;-2.5;2.6;11;;;;;}{supernova.bmp.bfxm;-7.861;-2.5;2.6;11;;;;;}{supernova.bmp.bfxm;7.661;-3.9;4.206;8;;;;;}{supernova.bmp.bfxm;-7.661;-3.9;4.206;8;;;;;}","{;;;light autotracking;-34.575;0.55;29.427;;;;;;;;;1;1}{;;;light autotracking;-34.575;-4.244;29.427;;;;;;;;;1;1}{;;;light autotracking;-23.535;0.55;33.618;;;;;;;;;1;1}{;;;light autotracking;-23.535;-4.244;33.618;;;;;;;;;1;1}{;;;light autotracking;23.535;0.55;33.618;;;;;;;;;1;1}{;;;light autotracking;23.535;-4.244;33.618;;;;;;;;;1;1}{;;;light autotracking;34.575;0.55;29.427;;;;;;;;;1;1}{;;;light autotracking;34.575;-4.244;29.427;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,680,0,,,,,,"pPiI"
+ "Zhuangzong","./vessels/Zhuangzong","Zhuangzong",,"Vessel","FIGHTER","Rlaan mass production fighter","zhuangzong-hud.spr",1,"rlaan-cockpit.cpt",0,0,5.5,"{zhuangzong.bfxm;;}","zhuangzong_shield.bfxm",,,,,,170,170,5.42,750,380,380,380,380,380,380,380,380,300,200,250,250,,,,,150,0,350,800,120,TRUE,1,,200,120,3,0,50000,50000,50000,100,100,100,12000,12000,12000,12000,12000,12000,12000,220,220,FALSE,TRUE,300000000,5,180,10,15,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{KtekBeam;;;Light Medium Heavy;-7.5;-1;0;;;;;;;;;1;1}{KtekBeam;;;Light Medium Heavy;7.5;-1;0;;;;;;;;;1;1}{Ktek;;;Light Medium Heavy;-.75;-6;3.25;;;;;;;;;1;1}{Ktek;;;Light Medium Heavy;.75;-6;3.25;;;;;;;;;1;1}",,,,,"explosion_rlaan.ani",0,200,0,,,,,,"pPiI"
+ "Zhuangzong.blank","./vessels/Zhuangzong","Zhuangzong","MANEUVOUR","Vessel","FIGHTER","Rlaan mass production fighter","zhuangzong-hud.spr",1,"rlaan-cockpit.cpt",0,0,5.5,"{zhuangzong.bfxm;;}","zhuangzong_shield.bfxm",,,,,,100,100,5.42,400,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,3,0,50000,50000,50000,100,100,100,12000,12000,12000,12000,12000,12000,12000,225,225,FALSE,FALSE,100000,0,0,0,15,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;;Light Medium Heavy;-7.5;-1;0;;;;;;;;;1;1}{;;;Light Medium Heavy;7.5;-1;0;;;;;;;;;1;1}{;;;Light Medium Heavy;-.75;-6;3.25;;;;;;;;;1;1}{;;;Light Medium Heavy;.75;-6;3.25;;;;;;;;;1;1}",,,,,"explosion_rlaan.ani",0,200,0,,,,,,"pPiI"
+ "Zhuangzong.milspec","./vessels/Zhuangzong","Zhuangzong",,"Vessel","FIGHTER","Rlaan mass production fighter","zhuangzong-hud.spr",1,"rlaan-cockpit.cpt",0,0,5.5,"{zhuangzong.bfxm;;}","zhuangzong_shield.bfxm",,,,,,170,170,5.42,400,56,56,56,56,56,56,56,56,150,100,125,125,,,,,100,0,350,800,120,TRUE,1,,200,120,3,0,50000,50000,50000,100,100,100,12000,12000,12000,12000,12000,12000,12000,220,220,FALSE,TRUE,300000000,5,180,10,15,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;5;Light Medium Heavy;-7.5;-1;0;;;;;;;;;1;1}{;;5;Light Medium Heavy;7.5;-1;0;;;;;;;;;1;1}{;;5;Light Medium Heavy;-.75;-6;3.25;;;;;;;;;1;1}{;;5;Light Medium Heavy;.75;-6;3.25;;;;;;;;;1;1}",,,,"{Zhuangzong_Milspec_Package;upgrades/Packages/Milspec;200000;1;70;190;1;1;Full-Custom Milspec Configuration;0}","explosion_rlaan.ani",0,200,0,,,,,,"pPiI"
+-"Zhuangzong.stock","./vessels/Zhuangzong","Zhuangzong","MANEUVOUR","Vessel","FIGHTER","Rlaan mass production fighter","zhuangzong-hud.spr",1,"rlaan-cockpit.cpt",0,0,5.5,"{zhuangzong.bfxm;;}","zhuangzong_shield.bfxm",,,,,,114,114,5.42,400,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,3,0,50000,50000,50000,100,100,100,12000,12000,12000,12000,12000,12000,12000,225,225,FALSE,FALSE,300000000,4,180,25,15,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;5;Light Medium Heavy;-7.5;-1;0;;;;;;;;;1;1}{;;5;Light Medium Heavy;7.5;-1;0;;;;;;;;;1;1}{;;5;Light Medium Heavy;-.75;-6;3.25;;;;;;;;;1;1}{;;5;Light Medium Heavy;.75;-6;3.25;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}","explosion_rlaan.ani",0,200,0,,,,,,"pPiI"
++"Zhuangzong.stock","./vessels/Zhuangzong","Zhuangzong","MANEUVOUR","Vessel","FIGHTER","Rlaan mass production fighter","zhuangzong-hud.spr",1,"rlaan-cockpit.cpt",0,0,5.5,"{zhuangzong.bfxm;;}","zhuangzong_shield.bfxm",,,,,,114,114,5.42,400,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,3,0,50000,50000,50000,100,100,100,12000,12000,12000,12000,12000,12000,12000,225,225,FALSE,FALSE,300000000,4,180,25,15,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;5;Light Medium Heavy;-7.5;-1;0;;;;;;;;;1;1}{;;5;Light Medium Heavy;7.5;-1;0;;;;;;;;;1;1}{;;5;Light Medium Heavy;-.75;-6;3.25;;;;;;;;;1;1}{;;5;Light Medium Heavy;.75;-6;3.25;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}","explosion_rlaan.ani",0,200,0,,,,,,"pPiI"
+ "Derivative","./vessels/Derivative","Derivative",,"Vessel","INTERCEPTOR","Unadorned missile based interceptor","Derivative-hud.spr",1,"no-cockpit",0,0.21,3.5,"{Derivative.bfxm;;}","Derivative_shield.bfxm",,,,,,60,60,11.17,275,61.5,61.5,61.5,61.5,61.5,61.5,61.5,61.5,600,600,,,,,,,120,0,250,512,128,TRUE,1,,200,40,1,4,50000,50000,50000,65,70,80,18000,14000,12000,4000,4000,4000,4000,460,460,TRUE,TRUE,300000000,5,180,10,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;-0.386000;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;0.386000;8.60000e-2;-3.90200;.5;;;;;}","{LR_Disruptor;;;special heavy;-2.24600;-0.412000;-0.328000;;;;;;;;;1;1}{LR_Disruptor;;;special heavy;2.24600;-0.422000;-0.328000;;;;;;;;;1;1}{LR_Disruptor;;;light medium;-0.382000;-5.80000e-2;3.26400;;;;;;;;;1;1}{LR_Disruptor;;;light medium;0.380000;-5.80000e-2;3.26400;;;;;;;;;1;1}{HeatSeeker;2;6;light-missile medium-missile;-0.898000;-0.108000;-1.29000;;;;;;;;;1;1}{HeatSeeker;2;6;light-missile medium-missile;0.904000;-0.108000;-1.29000;;;;;;;;;1;1}{Heatseeker;2;6;light-missile medium-missile;-0.152000;-1.80000e-2;2.67800;;;;;;;;;1;1}{Heatseeker;2;6;light-missile medium-missile;0.158000;-1.80000e-2;2.67800;;;;;;;;;1;1}",,,,,,0,100,0,,,,,,"pPiI"
+ "Derivative.blank","./vessels/Derivative","Derivative","MANEUVOUR","Vessel","INTERCEPTOR","Unadorned missile based interceptor","Derivative-hud.spr",1,"no-cockpit",0,0.21,3.5,"{Derivative.bfxm;;}",,,,,,,30,30,11.17,275,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,65,70,80,18000,14000,12000,4000,4000,4000,4000,345,345,FALSE,FALSE,100000,0,0,0,7,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;-0.386000;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;0.386000;8.60000e-2;-3.90200;.5;;;;;}","{;;;special heavy;-2.24600;-0.412000;-0.328000;;;;;;;;;1;1}{;;;special heavy;2.24600;-0.422000;-0.328000;;;;;;;;;1;1}{;;;light medium;-0.382000;-5.80000e-2;3.26400;;;;;;;;;1;1}{;;;light medium;0.380000;-5.80000e-2;3.26400;;;;;;;;;1;1}{;2;6;light-missile medium-missile;-0.898000;-0.108000;-1.29000;;;;;;;;;1;1}{;2;6;light-missile medium-missile;0.904000;-0.108000;-1.29000;;;;;;;;;1;1}{;2;6;light-missile medium-missile;-0.152000;-1.80000e-2;2.67800;;;;;;;;;1;1}{;2;6;light-missile medium-missile;0.158000;-1.80000e-2;2.67800;;;;;;;;;1;1}",,,,,,0,100,0,,,,,,"pPiI"
+ "Derivative.milspec","./vessels/Derivative","Derivative",,"Vessel","INTERCEPTOR","Unadorned missile based interceptor","Derivative-hud.spr",1,"no-cockpit",0,0.21,3.5,"{Derivative.bfxm;;}",,,,,,,60,60,11.17,275,61.5,61.5,61.5,61.5,61.5,61.5,61.5,61.5,420,420,,,,,,,120,0,250,512,128,TRUE,1,,200,40,1,4,50000,50000,50000,65,70,80,18000,14000,12000,4000,4000,4000,4000,460,460,TRUE,TRUE,300000000,5,180,10,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;-0.386000;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;0.386000;8.60000e-2;-3.90200;.5;;;;;}","{;;15;special heavy;-2.24600;-0.412000;-0.328000;;;;;;;;;1;1}{;;15;special heavy;2.24600;-0.422000;-0.328000;;;;;;;;;1;1}{;;10;light medium;-0.382000;-5.80000e-2;3.26400;;;;;;;;;1;1}{;;10;light medium;0.380000;-5.80000e-2;3.26400;;;;;;;;;1;1}{;;6;light-missile medium-missile;-0.898000;-0.108000;-1.29000;;;;;;;;;1;1}{;;6;light-missile medium-missile;0.904000;-0.108000;-1.29000;;;;;;;;;1;1}{;;6;light-missile medium-missile;-0.152000;-1.80000e-2;2.67800;;;;;;;;;1;1}{;;6;light-missile medium-missile;0.158000;-1.80000e-2;2.67800;;;;;;;;;1;1}",,,,"{Derivative_Milspec_Package;upgrades/Packages/Milspec;200000;1;30;90;1;1;Full-Custom Milspec Configuration;0}",,0,100,0,,,,,,"pPiI"
+-"Derivative.stock","./vessels/Derivative","Derivative","MANEUVOUR","Vessel","INTERCEPTOR","Unadorned missile based interceptor","Derivative-hud.spr",1,"no-cockpit",0,0.21,3.5,"{Derivative.bfxm;;}",,,,,,,44,44,11.17,275,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,65,70,80,18000,14000,12000,4000,4000,4000,4000,345,345,FALSE,FALSE,300000000,4,180,25,7,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;-0.386000;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;0.386000;8.60000e-2;-3.90200;.5;;;;;}","{;;15;special heavy;-2.24600;-0.412000;-0.328000;;;;;;;;;1;1}{;;15;special heavy;2.24600;-0.422000;-0.328000;;;;;;;;;1;1}{;;10;light medium;-0.382000;-5.80000e-2;3.26400;;;;;;;;;1;1}{;;10;light medium;0.380000;-5.80000e-2;3.26400;;;;;;;;;1;1}{;2;6;light-missile medium-missile;-0.898000;-0.108000;-1.29000;;;;;;;;;1;1}{;2;6;light-missile medium-missile;0.904000;-0.108000;-1.29000;;;;;;;;;1;1}{;2;6;light-missile medium-missile;-0.152000;-1.80000e-2;2.67800;;;;;;;;;1;1}{;2;6;light-missile medium-missile;0.158000;-1.80000e-2;2.67800;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,100,0,,,,,,"pPiI"
++"Derivative.stock","./vessels/Derivative","Derivative","MANEUVOUR","Vessel","INTERCEPTOR","Unadorned missile based interceptor","Derivative-hud.spr",1,"no-cockpit",0,0.21,3.5,"{Derivative.bfxm;;}",,,,,,,44,44,11.17,275,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,65,70,80,18000,14000,12000,4000,4000,4000,4000,345,345,FALSE,FALSE,300000000,4,180,25,7,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;-0.386000;8.60000e-2;-3.90200;.5;;;;;}{supernova.bmp.bfxm;0.386000;8.60000e-2;-3.90200;.5;;;;;}","{;;15;special heavy;-2.24600;-0.412000;-0.328000;;;;;;;;;1;1}{;;15;special heavy;2.24600;-0.422000;-0.328000;;;;;;;;;1;1}{;;10;light medium;-0.382000;-5.80000e-2;3.26400;;;;;;;;;1;1}{;;10;light medium;0.380000;-5.80000e-2;3.26400;;;;;;;;;1;1}{;2;6;light-missile medium-missile;-0.898000;-0.108000;-1.29000;;;;;;;;;1;1}{;2;6;light-missile medium-missile;0.904000;-0.108000;-1.29000;;;;;;;;;1;1}{;2;6;light-missile medium-missile;-0.152000;-1.80000e-2;2.67800;;;;;;;;;1;1}{;2;6;light-missile medium-missile;0.158000;-1.80000e-2;2.67800;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,100,0,,,,,,"pPiI"
+ "Dirge","./vessels/Dirge","Dirge",,"Vessel","INTERCEPTOR","Shmrn Insystem Interceptor","Dirge-hud.spr",1,"no-cockpit",0,0,10,"{dirge.bfxm;;}",,,,,,,20,20,3,160,50,50,50,50,50,50,50,50,123,123,234,234,,,,,25,0,25,400,128,FALSE,1,,200,120,1,4,40000,40000,40000,80,90,90,6000,5500,5000,1000,1000,1000,1000,235,235,FALSE,,300000000,5,180,10,5,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.55;-2.2;-3;4;;;;;}{supernova.bmp.bfxm;-1.55;-2.2;-3;4;;;;;}","{ParticleBeam;;;Light;4.3;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;-4.3;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;3.8;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;-3.8;0.5;7.;;;;;;;;;1;1}{friendorfoe;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{friendorfoe;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,,,0,75,0,,,,,,"pPiI"
+ "Dirge.blank","./vessels/Dirge","Dirge","MANEUVOUR","Vessel","INTERCEPTOR","Shmrn Insystem Interceptor","Dirge-hud.spr",1,"no-cockpit",0,0,10,"{dirge.bfxm;;}",,,,,,,20,20,3,160,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,40000,40000,40000,80,90,90,6000,5500,5000,1000,1000,1000,1000,180,180,FALSE,FALSE,100000,0,0,0,5,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.55;-2.2;-3;4;;;;;}{supernova.bmp.bfxm;-1.55;-2.2;-3;4;;;;;}","{;;;Light;4.3;0.5;7;;;;;;;;;1;1}{;;;Light;-4.3;0.5;7;;;;;;;;;1;1}{;;;Light;3.8;0.5;7;;;;;;;;;1;1}{;;;Light;-3.8;0.5;7.;;;;;;;;;1;1}{;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,,,0,75,0,,,,,,"pPiI"
+-"Dirge.stock","./vessels/Dirge","Dirge","MANEUVOUR","Vessel","INTERCEPTOR","Shmrn Insystem Interceptor","Dirge-hud.spr",1,"no-cockpit",0,0,10,"{dirge.bfxm;;}",,,,,,,20,20,3,160,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,25,100,15,FALSE,1,,200,120,1,4,40000,40000,40000,80,90,90,6000,5500,5000,1000,1000,1000,1000,180,180,FALSE,FALSE,300000000,4,180,25,5,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.55;-2.2;-3;4;;;;;}{supernova.bmp.bfxm;-1.55;-2.2;-3;4;;;;;}","{;;;Light;4.3;0.5;7;;;;;;;;;1;1}{;;;Light;-4.3;0.5;7;;;;;;;;;1;1}{;;;Light;3.8;0.5;7;;;;;;;;;1;1}{;;;Light;-3.8;0.5;7.;;;;;;;;;1;1}{;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,75,0,,,,,,"pPiI"
+-"Gawain","./vessels/Gawain","Gawain",,"Vessel","INTERCEPTOR","Main line High-Born interceptor","gawain-hud.spr",1.25,,0,0,10,"{gawain.bfxm;;}",,,,,,,72,72,3.46,400,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{dualshield04;;}{add_spec_capacitor02;;}{capacitor03;;}{reactor04;;}{jump_drive;;}{starscanner2;;}{ecm_package01;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.328;-9.75;8;;;;;}{supernova.bmp.bfxm;0.25;-1.1;-9.75;5;;;;;}{supernova.bmp.bfxm;-0.25;-1.1;-9.75;5;;;;;}","{ParticleBeam;;;Light;1.4;0;.5;.2;.2;;;;;;;1;1}{ParticleBeam;;;Light;-1.4;0;.5;.2;.2;;;;;;;1;1}{reaper;1500;15;Light Medium;0;-2.5;10.25;.2;.2;;;;;;;1;1}{ParticleBeam;;;Light;0;-2.8;10.25;.2;.2;;;;;;;1;1}{Hail;20;5;special special-missile medium-missile;1.95;.45;-.75;;;;;;;;;1;1}{Hail;20;5;Special special-missile medium-missile;-1.95;.45;-.75;;;;;;;;;1;1}{Dumbfire;8;8;light-missile medium-missile;1.95;.81;-.75;;;;;;;;;1;1}{Dumbfire;8;8;light-missile medium-missile;-1.95;.81;-.75;;;;;;;;;1;1}",,,,,,0,225,0,,,,,,"pPiI"
++"Dirge.stock","./vessels/Dirge","Dirge","MANEUVOUR","Vessel","INTERCEPTOR","Shmrn Insystem Interceptor","Dirge-hud.spr",1,"no-cockpit",0,0,10,"{dirge.bfxm;;}",,,,,,,20,20,3,160,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,25,100,15,FALSE,1,,200,120,1,4,40000,40000,40000,80,90,90,6000,5500,5000,1000,1000,1000,1000,180,180,FALSE,FALSE,300000000,4,180,25,5,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.55;-2.2;-3;4;;;;;}{supernova.bmp.bfxm;-1.55;-2.2;-3;4;;;;;}","{;;;Light;4.3;0.5;7;;;;;;;;;1;1}{;;;Light;-4.3;0.5;7;;;;;;;;;1;1}{;;;Light;3.8;0.5;7;;;;;;;;;1;1}{;;;Light;-3.8;0.5;7.;;;;;;;;;1;1}{;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,75,0,,,,,,"pPiI"
++"Gawain","./vessels/Gawain","Gawain",,"Vessel","INTERCEPTOR","Main line High-Born interceptor","gawain-hud.spr",1.25,,0,0,10,"{gawain.bfxm;;}",,,,,,,72,72,3.46,400,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{dualshield04;;}{spec_capacitor02;;}{capacitor03;;}{reactor04;;}{jump_drive;;}{starscanner2;;}{ecm_package01;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.328;-9.75;8;;;;;}{supernova.bmp.bfxm;0.25;-1.1;-9.75;5;;;;;}{supernova.bmp.bfxm;-0.25;-1.1;-9.75;5;;;;;}","{ParticleBeam;;;Light;1.4;0;.5;.2;.2;;;;;;;1;1}{ParticleBeam;;;Light;-1.4;0;.5;.2;.2;;;;;;;1;1}{reaper;1500;15;Light Medium;0;-2.5;10.25;.2;.2;;;;;;;1;1}{ParticleBeam;;;Light;0;-2.8;10.25;.2;.2;;;;;;;1;1}{Hail;20;5;special special-missile medium-missile;1.95;.45;-.75;;;;;;;;;1;1}{Hail;20;5;Special special-missile medium-missile;-1.95;.45;-.75;;;;;;;;;1;1}{Dumbfire;8;8;light-missile medium-missile;1.95;.81;-.75;;;;;;;;;1;1}{Dumbfire;8;8;light-missile medium-missile;-1.95;.81;-.75;;;;;;;;;1;1}",,,,,,0,225,0,,,,,,"pPiI"
+ "Gawain.blank","./vessels/Gawain","Gawain","MANEUVOUR","Vessel","INTERCEPTOR","Main line High-Born interceptor","gawain-hud.spr",1.25,,0,0,10,"{gawain.bfxm;;}",,,,,,,42,42,3.46,400,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,410,410,FALSE,FALSE,100000,0,0,0,15,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.328;-9.75;8;;;;;}{supernova.bmp.bfxm;0.25;-1.1;-9.75;5;;;;;}{supernova.bmp.bfxm;-0.25;-1.1;-9.75;5;;;;;}","{;;;Light;1.4;0;.5;.2;.2;;;;;;;1;1}{;;;Light;-1.4;0;.5;.2;.2;;;;;;;1;1}{;;;Light Medium;0;-2.5;10.25;.2;.2;;;;;;;1;1}{;;;Light;0;-2.8;10.25;.2;.2;;;;;;;1;1}{;4;1;special special-missile medium-missile;1.95;.45;-.75;;;;;;;;;1;1}{;4;1;Special special-missile medium-missile;-1.95;.45;-.75;;;;;;;;;1;1}{;4;1;light-missile medium-missile;1.95;.81;-.75;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-1.95;.81;-.75;;;;;;;;;1;1}",,,,,,0,225,0,,,,,,"pPiI"
+-"Gawain.highbornspec","./vessels/Gawain","Gawain",,"Vessel","INTERCEPTOR","Main line High-Born interceptor","gawain-hud.spr",1.25,,0,0,10,"{gawain.bfxm;;}",,,,,,,72,72,3.46,400,1,1,1,1,1,1,1,1,0,0,,,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{dualshield04;;}{add_spec_capacitor02;;}{capacitor03;;}{reactor04;;}{jump_drive;;}{starscanner2;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.328;-9.75;8;;;;;}{supernova.bmp.bfxm;0.25;-1.1;-9.75;5;;;;;}{supernova.bmp.bfxm;-0.25;-1.1;-9.75;5;;;;;}","{;;5;Light;1.4;0;.5;.2;.2;;;;;;;1;1}{;;5;Light;-1.4;0;.5;.2;.2;;;;;;;1;1}{;;10;Light Medium;0;-2.5;10.25;.2;.2;;;;;;;1;1}{;;5;Light;0;-2.8;10.25;.2;.2;;;;;;;1;1}{;;5;special special-missile medium-missile;1.95;.45;-.75;;;;;;;;;1;1}{;;5;Special special-missile medium-missile;-1.95;.45;-.75;;;;;;;;;1;1}{;;8;light-missile medium-missile;1.95;.81;-.75;;;;;;;;;1;1}{;;8;light-missile medium-missile;-1.95;.81;-.75;;;;;;;;;1;1}",,,,,,0,10,0,,,,,,"pPiI"
++"Gawain.highbornspec","./vessels/Gawain","Gawain",,"Vessel","INTERCEPTOR","Main line High-Born interceptor","gawain-hud.spr",1.25,,0,0,10,"{gawain.bfxm;;}",,,,,,,72,72,3.46,400,1,1,1,1,1,1,1,1,0,0,,,,,,,0,0,250,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{dualshield04;;}{spec_capacitor02;;}{capacitor03;;}{reactor04;;}{jump_drive;;}{starscanner2;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.328;-9.75;8;;;;;}{supernova.bmp.bfxm;0.25;-1.1;-9.75;5;;;;;}{supernova.bmp.bfxm;-0.25;-1.1;-9.75;5;;;;;}","{;;5;Light;1.4;0;.5;.2;.2;;;;;;;1;1}{;;5;Light;-1.4;0;.5;.2;.2;;;;;;;1;1}{;;10;Light Medium;0;-2.5;10.25;.2;.2;;;;;;;1;1}{;;5;Light;0;-2.8;10.25;.2;.2;;;;;;;1;1}{;;5;special special-missile medium-missile;1.95;.45;-.75;;;;;;;;;1;1}{;;5;Special special-missile medium-missile;-1.95;.45;-.75;;;;;;;;;1;1}{;;8;light-missile medium-missile;1.95;.81;-.75;;;;;;;;;1;1}{;;8;light-missile medium-missile;-1.95;.81;-.75;;;;;;;;;1;1}",,,,,,0,10,0,,,,,,"pPiI"
+ "Gawain.milspec","./vessels/Gawain","Gawain",,"Vessel","INTERCEPTOR","Main line High-Born interceptor","gawain-hud.spr",1.25,,0,0,10,"{gawain.bfxm;;}",,,,,,,72,72,3.46,400,1,1,1,1,1,1,1,1,0,0,,,,,,,0,0,25,,,TRUE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.328;-9.75;8;;;;;}{supernova.bmp.bfxm;0.25;-1.1;-9.75;5;;;;;}{supernova.bmp.bfxm;-0.25;-1.1;-9.75;5;;;;;}","{;;5;Light;1.4;0;.5;.2;.2;;;;;;;1;1}{;;5;Light;-1.4;0;.5;.2;.2;;;;;;;1;1}{;;10;Light Medium;0;-2.5;10.25;.2;.2;;;;;;;1;1}{;;5;Light;0;-2.8;10.25;.2;.2;;;;;;;1;1}{;;5;special special-missile medium-missile;1.95;.45;-.75;;;;;;;;;1;1}{;;5;Special special-missile medium-missile;-1.95;.45;-.75;;;;;;;;;1;1}{;;8;light-missile medium-missile;1.95;.81;-.75;;;;;;;;;1;1}{;;8;light-missile medium-missile;-1.95;.81;-.75;;;;;;;;;1;1}",,,,"{Gawain_Milspec_Package;upgrades/Packages/Milspec;200000;1;30;215;1;1;Full-Custom Milspec Configuration;0}",,0,225,0,,,,,,"pPiI"
+-"Gawain.stock","./vessels/Gawain","Gawain","MANEUVOUR","Vessel","INTERCEPTOR","Main line High-Born interceptor","gawain-hud.spr",1.25,,0,0,10,"{gawain.bfxm;;}",,,,,,,56,56,3.46,400,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,410,410,FALSE,FALSE,300000000,4,180,25,15,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.328;-9.75;8;;;;;}{supernova.bmp.bfxm;0.25;-1.1;-9.75;5;;;;;}{supernova.bmp.bfxm;-0.25;-1.1;-9.75;5;;;;;}","{;;5;Light;1.4;0;.5;.2;.2;;;;;;;1;1}{;;5;Light;-1.4;0;.5;.2;.2;;;;;;;1;1}{;;10;Light Medium;0;-2.5;10.25;.2;.2;;;;;;;1;1}{;;5;Light;0;-2.8;10.25;.2;.2;;;;;;;1;1}{;4;1;special special-missile medium-missile;1.95;.45;-.75;;;;;;;;;1;1}{;4;1;Special special-missile medium-missile;-1.95;.45;-.75;;;;;;;;;1;1}{;4;1;light-missile medium-missile;1.95;.81;-.75;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-1.95;.81;-.75;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,225,0,,,,,,"pPiI"
++"Gawain.stock","./vessels/Gawain","Gawain","MANEUVOUR","Vessel","INTERCEPTOR","Main line High-Born interceptor","gawain-hud.spr",1.25,,0,0,10,"{gawain.bfxm;;}",,,,,,,56,56,3.46,400,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,410,410,FALSE,FALSE,300000000,4,180,25,15,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.328;-9.75;8;;;;;}{supernova.bmp.bfxm;0.25;-1.1;-9.75;5;;;;;}{supernova.bmp.bfxm;-0.25;-1.1;-9.75;5;;;;;}","{;;5;Light;1.4;0;.5;.2;.2;;;;;;;1;1}{;;5;Light;-1.4;0;.5;.2;.2;;;;;;;1;1}{;;10;Light Medium;0;-2.5;10.25;.2;.2;;;;;;;1;1}{;;5;Light;0;-2.8;10.25;.2;.2;;;;;;;1;1}{;4;1;special special-missile medium-missile;1.95;.45;-.75;;;;;;;;;1;1}{;4;1;Special special-missile medium-missile;-1.95;.45;-.75;;;;;;;;;1;1}{;4;1;light-missile medium-missile;1.95;.81;-.75;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-1.95;.81;-.75;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}",,0,225,0,,,,,,"pPiI"
+ "Jackal","./vessels/Jackal","Jackal",,"Vessel","INTERCEPTOR","Forsaken Interceptor","jackal-hud.sprite",1,"no-cockpit",0,0,10,"{jackal.bfxm;;}",,,,,,,20,20,3,160,50,50,50,50,50,50,50,50,123,123,234,234,,,,,25,0,25,400,128,FALSE,1,,200,120,1,4,40000,40000,40000,80,90,90,6000,5500,5000,1000,1000,1000,1000,235,235,FALSE,,300000000,5,180,10,5,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.55;-2.2;-3;4;;;;;}{supernova.bmp.bfxm;-1.55;-2.2;-3;4;;;;;}","{ParticleBeam;;;Light;4.3;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;-4.3;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;3.8;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;-3.8;0.5;7.;;;;;;;;;1;1}{friendorfoe;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{friendorfoe;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,,,0,75,0,,,,,,"pPiI"
+ "Jackal.blank","./vessels/Jackal","Jackal",,"Vessel","INTERCEPTOR","Forsaken Interceptor","jackal-hud.sprite",1,"no-cockpit",0,0,10,"{jackal.bfxm;;}",,,,,,,20,20,3,160,50,50,50,50,50,50,50,50,123,123,234,234,,,,,25,0,25,400,128,FALSE,1,,200,120,1,4,40000,40000,40000,80,90,90,6000,5500,5000,1000,1000,1000,1000,235,235,FALSE,,300000000,5,180,10,5,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.55;-2.2;-3;4;;;;;}{supernova.bmp.bfxm;-1.55;-2.2;-3;4;;;;;}","{ParticleBeam;;;Light;4.3;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;-4.3;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;3.8;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;-3.8;0.5;7.;;;;;;;;;1;1}{friendorfoe;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{friendorfoe;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,,,0,75,0,,,,,,"pPiI"
+ "Knight","./vessels/Knight","Knight",,"Vessel","INTERCEPTOR","Uln Interceptor","knight-hud.sprite",1,"no-cockpit",0,0,10,"{knight.bfxm;;}",,,,,,,20,20,3,160,50,50,50,50,50,50,50,50,123,123,234,234,,,,,25,0,25,400,128,FALSE,1,,200,120,1,4,40000,40000,40000,80,90,90,6000,5500,5000,1000,1000,1000,1000,235,235,FALSE,,300000000,5,180,10,5,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.55;-2.2;-3;4;;;;;}{supernova.bmp.bfxm;-1.55;-2.2;-3;4;;;;;}","{ParticleBeam;;;Light;4.3;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;-4.3;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;3.8;0.5;7;;;;;;;;;1;1}{ParticleBeam;;;Light;-3.8;0.5;7.;;;;;;;;;1;1}{friendorfoe;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{friendorfoe;3;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,,,0,75,0,,,,,,"pPiI"
+@@ -605,22 +605,22 @@
+ "Nicander.blank","./vessels/Nicander","Nicander","MANEUVOUR","Vessel","INTERCEPTOR","Aeran interceptor","nicander-hud.spr",1.25,"light_cockpit.cpt",0,0.25,13,"{nicander.bfxm;;}",,,,,,,41,41,11,271,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,4,60000,60000,60000,90,100,120,21600,15000,10000,4000,4000,4000,4000,290,290,FALSE,FALSE,100000,0,0,0,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-0.75;-0.086;-10;8;;;;;}{aeraburn.bfxm;0.75;-0.086;-10;8;;;;;}","{;;;light medium autotracking;5.600000;-1.600000;3.200000;;;;;;;;;1;1}{;;;light medium autotracking;-5.600000;-1.600000;3.200000;;;;;;;;;1;1}{;;;light medium autotracking;.5;-1.65;8;;;;;;;;;1;1}{;;;light medium autotracking;-.5;-1.65;8;;;;;;;;;1;1}{;200;100;special-missile autotracking;3.600000;-1.600000;1.200000;;;;;;;;;1;1}{;200;100;special-missile autotracking;-3.600000;-1.600000;1.200000;;;;;;;;;1;1}",,,,,"explosion_aera.ani",0,225,0,,,,,,"pPiI"
+ "Nicander.escort","./vessels/Nicander","Nicander",,"Vessel","INTERCEPTOR","Aeran interceptor","nicander-hud.spr",1.25,"light_cockpit.cpt",0,0.25,13,"{nicander.bfxm;;}",,,,,,,61,61,11,271,90.5,90.5,90.5,90.5,90.5,90.5,90.5,90.5,360,360,,,,,,,90,0,1300,500,160,TRUE,1,,200,45,1,4,60000,60000,60000,90,100,120,21600,15000,10000,4000,4000,4000,4000,380,380,TRUE,TRUE,300000000,5,180,10,25,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-0.75;-0.086;-10;8;;;;;}{aeraburn.bfxm;0.75;-0.086;-10;8;;;;;}","{Photon_MKIII;6000;12;light medium autotracking;5.600000;-1.600000;3.200000;;;;;;;;;1;1}{Photon_MKIII;6000;12;light medium autotracking;-5.600000;-1.600000;3.200000;;;;;;;;;1;1}{Photon_MKIII;7500;15;light medium autotracking;.5;-1.65;8;;;;;;;;;1;1}{Photon_MKIII;7500;15;light medium autotracking;-.5;-1.65;8;;;;;;;;;1;1}{Photonswarm;200;100;special-missile autotracking;3.600000;-1.600000;1.200000;;;;;;;;;1;1}{Photonswarm;200;100;special-missile autotracking;-3.600000;-1.600000;1.200000;;;;;;;;;1;1}",,,,,"explosion_aera.ani",0,225,0,,,,,,"pPiI"
+ "Nicander.milspec","./vessels/Nicander","Nicander",,"Vessel","INTERCEPTOR","Aeran interceptor","nicander-hud.spr",1.25,"light_cockpit.cpt",0,0.25,13,"{nicander.bfxm;;}",,,,,,,61,61,11,271,90.5,90.5,90.5,90.5,90.5,90.5,90.5,90.5,360,360,,,,,,,90,0,1300,500,160,TRUE,1,,200,45,1,4,60000,60000,60000,90,100,120,21600,15000,10000,4000,4000,4000,4000,380,380,TRUE,TRUE,300000000,5,180,10,25,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-0.75;-0.086;-10;8;;;;;}{aeraburn.bfxm;0.75;-0.086;-10;8;;;;;}","{;;12;light medium autotracking;5.600000;-1.600000;3.200000;;;;;;;;;1;1}{;;12;light medium autotracking;-5.600000;-1.600000;3.200000;;;;;;;;;1;1}{;;15;light medium autotracking;.5;-1.65;8;;;;;;;;;1;1}{;;15;light medium autotracking;-.5;-1.65;8;;;;;;;;;1;1}{;;100;special-missile autotracking;3.600000;-1.600000;1.200000;;;;;;;;;1;1}{;;100;special-missile autotracking;-3.600000;-1.600000;1.200000;;;;;;;;;1;1}",,,,"{Nicander_Milspec_Package;upgrades/Packages/Milspec;200000;1;20;215;1;1;Full-Custom Milspec Configuration;0}","explosion_aera.ani",0,225,0,,,,,,"pPiI"
+-"Nicander.stock","./vessels/Nicander","Nicander","MANEUVOUR","Vessel","INTERCEPTOR","Aeran interceptor","nicander-hud.spr",1.25,"light_cockpit.cpt",0,0.25,13,"{nicander.bfxm;;}",,,,,,,55,55,11,271,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,60000,60000,60000,90,100,120,21600,15000,10000,4000,4000,4000,4000,290,290,FALSE,FALSE,300000000,4,180,25,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-0.75;-0.086;-10;8;;;;;}{aeraburn.bfxm;0.75;-0.086;-10;8;;;;;}","{;;10;light medium autotracking;5.600000;-1.600000;3.200000;;;;;;;;;1;1}{;;10;light medium autotracking;-5.600000;-1.600000;3.200000;;;;;;;;;1;1}{;;10;light medium autotracking;.5;-1.65;8;;;;;;;;;1;1}{;;10;light medium autotracking;-.5;-1.65;8;;;;;;;;;1;1}{;200;100;special-missile autotracking;3.600000;-1.600000;1.200000;;;;;;;;;1;1}{;200;100;special-missile autotracking;-3.600000;-1.600000;1.200000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}","explosion_aera.ani",0,225,0,,,,,,"pPiI"
++"Nicander.stock","./vessels/Nicander","Nicander","MANEUVOUR","Vessel","INTERCEPTOR","Aeran interceptor","nicander-hud.spr",1.25,"light_cockpit.cpt",0,0.25,13,"{nicander.bfxm;;}",,,,,,,55,55,11,271,1,1,1,1,1,1,1,1,75,75,,,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,60000,60000,60000,90,100,120,21600,15000,10000,4000,4000,4000,4000,290,290,FALSE,FALSE,300000000,4,180,25,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-0.75;-0.086;-10;8;;;;;}{aeraburn.bfxm;0.75;-0.086;-10;8;;;;;}","{;;10;light medium autotracking;5.600000;-1.600000;3.200000;;;;;;;;;1;1}{;;10;light medium autotracking;-5.600000;-1.600000;3.200000;;;;;;;;;1;1}{;;10;light medium autotracking;.5;-1.65;8;;;;;;;;;1;1}{;;10;light medium autotracking;-.5;-1.65;8;;;;;;;;;1;1}{;200;100;special-missile autotracking;3.600000;-1.600000;1.200000;;;;;;;;;1;1}{;200;100;special-missile autotracking;-3.600000;-1.600000;1.200000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{dualshield01;upgrades/Shield_Systems/Standard_Dual_Shields;200;1;1;4;1;1;;0}","explosion_aera.ani",0,225,0,,,,,,"pPiI"
+ "Progeny","./vessels/Progeny","Progeny",,"Vessel","INTERCEPTOR","Shaper single-pilot interceptor","mongoose-hud.spr",1,,0,0.5,7,"{progeny.bfxm;;}","progeny_shield.bfxm",,,,,,64,64,5.17,180,100,100,100,100,80,80,80,80,420,120,200,200,,,,,42,0,250,300,40,TRUE,1,,200,20,1,4,50000,50000,50000,85,70,85,18000,15000,9000,5000,5000,5000,5000,340,340,FALSE,TRUE,300000000,5,180,10,20,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;-2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;4;2.335;-5;7;;;;;}{supernova.bmp.bfxm;-4;2.335;-5;7;;;;;}","{LR_Disruptor;;;light medium;0.95;-2.635;12.000000;;;;;;;;;1;1}{LR_Disruptor;;;light medium;-0.95;-2.635;12.000000;;;;;;;;;1;1}{Swarm;125;32;Special Special-Missile;2.641;-.705;10;;;;;;;;;1;1}{Swarm;125;32;Special Special-Missile;-2.641;-.705;10;;;;;;;;;1;1}{Swarm;125;32;Special Special-Missile;1.355;-.705;10;;;;;;;;;1;1}{Swarm;125;32;Special Special-Missile;-1.355;-.705;10;;;;;;;;;1;1}{FriendOrFoe;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{FriendOrFoe;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,,,0,230,0,,,,,,"pPiI"
+ "Progeny.blank","./vessels/Progeny","Progeny","MANEUVOUR","Vessel","INTERCEPTOR","Shaper single-pilot interceptor","mongoose-hud.spr",1,,0,0.5,7,"{progeny.bfxm;;}","progeny_shield.bfxm",,,,,,44,44,5.17,165,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,85,70,85,18000,15000,9000,5000,5000,5000,5000,255,255,FALSE,FALSE,100000,0,0,0,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;-2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;4;2.335;-5;7;;;;;}{supernova.bmp.bfxm;-4;2.335;-5;7;;;;;}","{;;;light medium;0.95;-2.635;12.000000;;;;;;;;;1;1}{;;;light medium;-0.95;-2.635;12.000000;;;;;;;;;1;1}{;125;32;Special Special-Missile;2.641;-.705;10;;;;;;;;;1;1}{;125;32;Special Special-Missile;-2.641;-.705;10;;;;;;;;;1;1}{;125;32;Special Special-Missile;1.355;-.705;10;;;;;;;;;1;1}{;125;32;Special Special-Missile;-1.355;-.705;10;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,,,0,230,0,,,,,,"pPiI"
+ "Progeny.milspec","./vessels/Progeny","Progeny",,"Vessel","INTERCEPTOR","Shaper single-pilot interceptor","mongoose-hud.spr",1,,0,0.5,7,"{progeny.bfxm;;}","progeny_shield.bfxm",,,,,,64,64,5.17,165,65,65,65,65,45,45,45,45,420,60,100,100,,,,,42,0,25,300,40,TRUE,1,,200,20,1,4,50000,50000,50000,85,70,85,18000,15000,9000,5000,5000,5000,5000,340,340,FALSE,TRUE,300000000,5,180,10,20,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;-2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;4;2.335;-5;7;;;;;}{supernova.bmp.bfxm;-4;2.335;-5;7;;;;;}","{;;10;light medium;0.95;-2.635;12.000000;;;;;;;;;1;1}{;;10;light medium;-0.95;-2.635;12.000000;;;;;;;;;1;1}{;;32;Special Special-Missile;2.641;-.705;10;;;;;;;;;1;1}{;;32;Special Special-Missile;-2.641;-.705;10;;;;;;;;;1;1}{;;32;Special Special-Missile;1.355;-.705;10;;;;;;;;;1;1}{;;32;Special Special-Missile;-1.355;-.705;10;;;;;;;;;1;1}{;;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,"{Progeny_Milspec_Package;upgrades/Packages/Milspec;200000;1;20;218;1;1;Full-Custom Milspec Configuration;0}",,0,230,0,,,,,,"pPiI"
+ "Progeny.rg","./vessels/Progeny","Progeny",,"Vessel","INTERCEPTOR","Shaper single-pilot interceptor","mongoose-hud.spr",1,,0,0.5,7,"{progeny.bfxm;;}","progeny_shield.bfxm",,,,,,64,64,5.17,165,65,65,65,65,45,45,45,45,420,60,100,100,,,,,42,0,250,300,40,TRUE,1,,200,20,1,4,50000,50000,50000,85,70,85,18000,15000,9000,5000,5000,5000,5000,340,340,FALSE,TRUE,300000000,5,180,10,20,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;-2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;4;2.335;-5;7;;;;;}{supernova.bmp.bfxm;-4;2.335;-5;7;;;;;}","{Disruptor;;;light medium;0.95;-2.635;12.000000;;;;;;;;;1;1}{Disruptor;;;light medium;-0.95;-2.635;12.000000;;;;;;;;;1;1}{Swarm;125;32;Special Special-Missile;2.641;-.705;10;;;;;;;;;1;1}{Swarm;125;32;Special Special-Missile;-2.641;-.705;10;;;;;;;;;1;1}{Swarm;125;32;Special Special-Missile;1.355;-.705;10;;;;;;;;;1;1}{Swarm;125;32;Special Special-Missile;-1.355;-.705;10;;;;;;;;;1;1}{FriendOrFoe;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{FriendOrFoe;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,,,0,230,0,,,,,,"pPiI"
+ "Progeny.rgspec","./vessels/Progeny","Progeny",,"Vessel","INTERCEPTOR","Shaper single-pilot interceptor","mongoose-hud.spr",1,,0,0.5,7,"{progeny.bfxm;;}","progeny_shield.bfxm",,,,,,64,64,5.17,165,65,65,65,65,45,45,45,45,420,60,100,100,,,,,42,0,250,300,40,TRUE,1,,200,20,1,4,50000,50000,50000,85,70,85,18000,15000,9000,5000,5000,5000,5000,340,340,FALSE,TRUE,300000000,5,180,10,20,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;-2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;4;2.335;-5;7;;;;;}{supernova.bmp.bfxm;-4;2.335;-5;7;;;;;}","{;;10;light medium;0.95;-2.635;12.000000;;;;;;;;;1;1}{;;10;light medium;-0.95;-2.635;12.000000;;;;;;;;;1;1}{;;32;Special Special-Missile;2.641;-.705;10;;;;;;;;;1;1}{;;32;Special Special-Missile;-2.641;-.705;10;;;;;;;;;1;1}{;;32;Special Special-Missile;1.355;-.705;10;;;;;;;;;1;1}{;;32;Special Special-Missile;-1.355;-.705;10;;;;;;;;;1;1}{;;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,,,0,15,0,,,,,,"pPiI"
+-"Progeny.stock","./vessels/Progeny","Progeny","MANEUVOUR","Vessel","INTERCEPTOR","Shaper single-pilot interceptor","mongoose-hud.spr",1,,0,0.5,7,"{progeny.bfxm;;}","progeny_shield.bfxm",,,,,,58,58,5.17,165,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,85,70,85,18000,15000,9000,5000,5000,5000,5000,255,255,FALSE,FALSE,300000000,4,180,25,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;-2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;4;2.335;-5;7;;;;;}{supernova.bmp.bfxm;-4;2.335;-5;7;;;;;}","{;;;light medium;0.95;-2.635;12.000000;;;;;;;;;1;1}{;;;light medium;-0.95;-2.635;12.000000;;;;;;;;;1;1}{;125;32;Special Special-Missile;2.641;-.705;10;;;;;;;;;1;1}{;125;32;Special Special-Missile;-2.641;-.705;10;;;;;;;;;1;1}{;125;32;Special Special-Missile;1.355;-.705;10;;;;;;;;;1;1}{;125;32;Special Special-Missile;-1.355;-.705;10;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,230,0,,,,,,"pPiI"
++"Progeny.stock","./vessels/Progeny","Progeny","MANEUVOUR","Vessel","INTERCEPTOR","Shaper single-pilot interceptor","mongoose-hud.spr",1,,0,0.5,7,"{progeny.bfxm;;}","progeny_shield.bfxm",,,,,,58,58,5.17,165,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,85,70,85,18000,15000,9000,5000,5000,5000,5000,255,255,FALSE,FALSE,300000000,4,180,25,10,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;-2.8;2.8;-5;7;;;;;}{supernova.bmp.bfxm;4;2.335;-5;7;;;;;}{supernova.bmp.bfxm;-4;2.335;-5;7;;;;;}","{;;;light medium;0.95;-2.635;12.000000;;;;;;;;;1;1}{;;;light medium;-0.95;-2.635;12.000000;;;;;;;;;1;1}{;125;32;Special Special-Missile;2.641;-.705;10;;;;;;;;;1;1}{;125;32;Special Special-Missile;-2.641;-.705;10;;;;;;;;;1;1}{;125;32;Special Special-Missile;1.355;-.705;10;;;;;;;;;1;1}{;125;32;Special Special-Missile;-1.355;-.705;10;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}{;1;16;Medium-Missile Light-Missile;-2.5000000;-1.400000;-2.000000;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,230,0,,,,,,"pPiI"
+ "Schroedinger","./vessels/Schroedinger","Schroedinger",,"Vessel","INTERCEPTOR","The Schroedinger serves as a scout ship, lightly armed when compared to most other vessels.  As per the infamous cat, its acceleration curve and advanced ECM and stealth hardware make it difficult to discern whether its in the same state it was last seen in.","schroedinger-hud.spr",1.5,,,,12.5,"{schroedinger.bfxm;;}",,,,,,,160,160,10,194,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,360,360,360,360,,,,,100,0,360,720,120,TRUE,1,,200,40,1,4,50000,50000,50000,90,90,90,30000,30000,22000,5000,5000,5000,5000,650,650,FALSE,TRUE,300000000,5,180,10,75,1,0.3,0.1,1,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.5;-5.5;10;;;;;}","{DisruptorBeam;;;Light Autotracking;0;3;.5;;;;;;;;;1;1}",,,,,,0,325,0,,,,,,"pPiI"
+ "Schroedinger.blank","./vessels/Schroedinger","Schroedinger","MANEUVOUR","Vessel","INTERCEPTOR","The Schroedinger serves as a scout ship, lightly armed when compared to most other vessels.  As per the infamous cat, its acceleration curve and advanced ECM and stealth hardware make it difficult to discern whether its in the same state it was last seen in.","schroedinger-hud.spr",1.5,,,,12.5,"{schroedinger.bfxm;;}",,,,,,,90,90,6.67,194,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,1,4,50000,50000,50000,90,90,90,30000,30000,22000,5000,5000,5000,5000,425,425,FALSE,FALSE,100000,0,0,0,15,1,0.3,0.1,1,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.5;-5.5;10;;;;;}","{;;;Light Autotracking;0;3;.5;;;;;;;;;1;1}",,,,,,0,325,0,,,,,,"pPiI"
+ "Schroedinger.milspec","./vessels/Schroedinger","Schroedinger",,"Vessel","INTERCEPTOR","The Schroedinger serves as a scout ship, lightly armed when compared to most other vessels.  As per the infamous cat, its acceleration curve and advanced ECM and stealth hardware make it difficult to discern whether its in the same state it was last seen in.","schroedinger-hud.spr",1.5,,,,12.5,"{schroedinger.bfxm;;}",,,,,,,120,120,10,194,12.5,12.5,12.5,12.5,12.5,12.5,12.5,12.5,360,360,360,360,,,,,100,0,360,720,120,TRUE,1,,200,40,1,4,50000,50000,50000,90,90,90,30000,30000,22000,5000,5000,5000,5000,650,650,FALSE,TRUE,300000000,5,180,10,75,1,0.3,0.1,1,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.5;-5.5;10;;;;;}","{;;5;Light Autotracking;0;3;.5;;;;;;;;;1;1}",,,,"{Schroedinger_Milspec_Package;upgrades/Packages/Milspec;200000;1;30;307;1;1;Full-Custom Milspec Configuration;0}",,0,325,0,,,,,,"pPiI"
+-"Schroedinger.stock","./vessels/Schroedinger","Schroedinger","MANEUVOUR","Vessel","INTERCEPTOR","The Schroedinger serves as a scout ship, lightly armed when compared to most other vessels.  As per the infamous cat, its acceleration curve and advanced ECM and stealth hardware make it difficult to discern whether its in the same state it was last seen in.","schroedinger-hud.spr",1.5,,,,12.5,"{schroedinger.bfxm;;}",,,,,,,104,104,6.67,194,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,90,90,90,30000,30000,22000,5000,5000,5000,5000,425,425,FALSE,FALSE,300000000,4,180,25,15,1,0.3,0.1,1,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.5;-5.5;10;;;;;}","{;;5;Light Autotracking;0;3;.5;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,325,0,,,,,,"pPiI"
++"Schroedinger.stock","./vessels/Schroedinger","Schroedinger","MANEUVOUR","Vessel","INTERCEPTOR","The Schroedinger serves as a scout ship, lightly armed when compared to most other vessels.  As per the infamous cat, its acceleration curve and advanced ECM and stealth hardware make it difficult to discern whether its in the same state it was last seen in.","schroedinger-hud.spr",1.5,,,,12.5,"{schroedinger.bfxm;;}",,,,,,,104,104,6.67,194,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,1,4,50000,50000,50000,90,90,90,30000,30000,22000,5000,5000,5000,5000,425,425,FALSE,FALSE,300000000,4,180,25,15,1,0.3,0.1,1,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;-.5;-5.5;10;;;;;}","{;;5;Light Autotracking;0;3;.5;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,325,0,,,,,,"pPiI"
+ "Shizu","./vessels/Shizu","Shizu",,"Vessel","INTERCEPTOR","The Rlaan Shizu is in many ways similar to its Confederate counterpart, the Schroedinger, meant more for reconaissance and scouting patrols than heavy combat.  Nonetheless, its twin gun mountings allow it to mount a basic defense, should it come under attack.","shizu-hud.sprite",0.64,"rlaan-cockpit.cpt",0,0,15,"{shizu.bfxm;;}",,,,,,,130,130,4.75,255,37.5,37.5,37.5,37.5,37.5,37.5,37.5,37.5,100,100,100,100,,,,,50,0,450,300,60,TRUE,1,,200,50,3,0,50000,50000,50000,110,110,110,12000,12000,12000,12000,12000,12000,12000,340,340,FALSE,TRUE,300000000,5,180,10,40,,0.3,0.1,60,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{Ktek;;;Light Medium;-4.125;-4.4;0;;;;;;;;;1;1}{Ktek;;;Light Medium;4.125;-4.4;0;;;;;;;;;1;1}",,,,,"explosion_rlaan.ani",0,450,0,,,,,,"pPiI"
+ "Shizu.blank","./vessels/Shizu","Shizu","MANEUVOUR","Vessel","INTERCEPTOR","The Rlaan Shizu is in many ways similar to its Confederate counterpart, the Schroedinger, meant more for reconaissance and scouting patrols than heavy combat.  Nonetheless, its twin gun mountings allow it to mount a basic defense, should it come under attack.","shizu-hud.sprite",0.64,"rlaan-cockpit.cpt",0,0,15,"{shizu.bfxm;;}",,,,,,,70,70,4.75,255,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,200,120,3,0,50000,50000,50000,110,110,110,12000,12000,12000,12000,12000,12000,12000,260,260,FALSE,FALSE,100000,0,0,0,40,,0.3,0.1,60,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;;Light Medium;-4.125;-4.4;0;;;;;;;;;1;1}{;;;Light Medium;4.125;-4.4;0;;;;;;;;;1;1}",,,,,"explosion_rlaan.ani",0,450,0,,,,,,"pPiI"
+ "Shizu.civvie","./vessels/Shizu","Shizu",,"Vessel","INTERCEPTOR","The Rlaan Shizu is in many ways similar to its Confederate counterpart, the Schroedinger, meant more for reconaissance and scouting patrols than heavy combat.  Nonetheless, its twin gun mountings allow it to mount a basic defense, should it come under attack.","shizu-hud.sprite",0.64,"rlaan-cockpit.cpt",0,0,15,"{shizu.bfxm;;}",,,,,,,130,130,4.75,255,37.5,37.5,37.5,37.5,37.5,37.5,37.5,37.5,50,50,50,50,,,,,50,0,450,300,60,TRUE,1,,200,50,3,0,50000,50000,50000,110,110,110,12000,12000,12000,12000,12000,12000,12000,340,340,FALSE,TRUE,300000000,5,180,10,40,,0.3,0.1,60,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,,,,,,"explosion_rlaan.ani",0,450,0,,,,,,"pPiI"
+ "Shizu.milspec","./vessels/Shizu","Shizu",,"Vessel","INTERCEPTOR","The Rlaan Shizu is in many ways similar to its Confederate counterpart, the Schroedinger, meant more for reconaissance and scouting patrols than heavy combat.  Nonetheless, its twin gun mountings allow it to mount a basic defense, should it come under attack.","shizu-hud.sprite",0.64,"rlaan-cockpit.cpt",0,0,15,"{shizu.bfxm;;}",,,,,,,130,130,4.75,255,37.5,37.5,37.5,37.5,37.5,37.5,37.5,37.5,50,50,50,50,,,,,50,0,450,300,60,TRUE,1,,200,50,3,0,50000,50000,50000,110,110,110,12000,12000,12000,12000,12000,12000,12000,340,340,FALSE,TRUE,300000000,5,180,10,40,,0.3,0.1,60,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;10;Light Medium;-4.125;-4.4;0;;;;;;;;;1;1}{;;10;Light Medium;4.125;-4.4;0;;;;;;;;;1;1}",,,,"{Shizu_Milspec_Package;upgrades/Packages/Milspec;200000;1;60;425;1;1;Full-Custom Milspec Configuration;0}","explosion_rlaan.ani",0,450,0,,,,,,"pPiI"
+-"Shizu.stock","./vessels/Shizu","Shizu","MANEUVOUR","Vessel","INTERCEPTOR","The Rlaan Shizu is in many ways similar to its Confederate counterpart, the Schroedinger, meant more for reconaissance and scouting patrols than heavy combat.  Nonetheless, its twin gun mountings allow it to mount a basic defense, should it come under attack.","shizu-hud.sprite",0.64,"rlaan-cockpit.cpt",0,0,15,"{shizu.bfxm;;}",,,,,,,84,84,4.75,255,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,3,0,50000,50000,50000,110,110,110,12000,12000,12000,12000,12000,12000,12000,260,260,FALSE,FALSE,300000000,4,180,25,40,,0.3,0.1,60,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;5;Light Medium;-4.125;-4.4;0;;;;;;;;;1;1}{;;5;Light Medium;4.125;-4.4;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}","explosion_rlaan.ani",0,450,0,,,,,,"pPiI"
++"Shizu.stock","./vessels/Shizu","Shizu","MANEUVOUR","Vessel","INTERCEPTOR","The Rlaan Shizu is in many ways similar to its Confederate counterpart, the Schroedinger, meant more for reconaissance and scouting patrols than heavy combat.  Nonetheless, its twin gun mountings allow it to mount a basic defense, should it come under attack.","shizu-hud.sprite",0.64,"rlaan-cockpit.cpt",0,0,15,"{shizu.bfxm;;}",,,,,,,84,84,4.75,255,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,200,120,3,0,50000,50000,50000,110,110,110,12000,12000,12000,12000,12000,12000,12000,260,260,FALSE,FALSE,300000000,4,180,25,40,,0.3,0.1,60,FALSE,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{;;5;Light Medium;-4.125;-4.4;0;;;;;;;;;1;1}{;;5;Light Medium;4.125;-4.4;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}","explosion_rlaan.ani",0,450,0,,,,,,"pPiI"
+ "Hidalgo__pirates","./vessels/Hidalgo","Hidalgo",,"Vessel","SCAVENGER","Converted luxury yachts make excellent pirate vessels, provided the pirate doesn't need to purchase the vessel in the first place.","hidalgo-hud.sprite",1,"no-cockpit",0,0,0,"{hidalgo.bfxm;;}",,,,,,,60000,60000,2333.33,14000,825,825,825,825,1000,1000,1000,1000,4600,6000,4000,4000,,,,,30,0,1200,5000,80,TRUE,,,400,,1,4,60000,60000,60000,10,10,10,600000,300000,300000,10000,10000,10000,10000,40,40,TRUE,TRUE,300000000,5,180,10,200000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;20.65;7.75;1.0;0;0;0;1;0;180.0}{turretbeam;0;-17;80.75;1.0;0;0;0;-1;0;180.0}",,"{supernova.bmp.bfxm;5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;-5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;-2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;0;-10.65;-74.75;20;;;;;}{supernova.bmp.bfxm;-14.25;-15;-25.5;30;;;;;}{supernova.bmp.bfxm;14.25;-15;-25.5;30;;;;;}","{tractor;;;special autotracking;-4.5;3;32.5;;;;;;;;;1;1}{tractor;;;special autotracking;4.5;3;32.5;;;;;;;;;1;1}{Arc_Device;;;light medium Heavy autotracking;-0;2;30;;;;;;;;;1;1}{heatseeker;15;45;Medium-missile light-missile;6.5;3;12.5;;;;;;;;;1;1}{Heatseeker;15;45;Medium-missile light-missile;-6.5;3;12.5;;;;;;;;;1;1}{imagerecognition;8;72;special-missile Medium-missile;0;3;2.5;;;;;;;;;1;1}",,"{;30;0;-37;30;0}{;-30;0;-37;30;0}","{Consumer_and_Commercial_Goods/Electronics;1.1;.1;;2}{Contraband/Confed;1.1;.1;;2}{Industrially_Manufactured_Goods/Construction;1.2;.1;;5}{Industrially_Manufactured_Goods/Manufacturing;1.1;.1;;4}{Industrially_Manufactured_Goods/Mining;.6;.1;;1}{Natural_Products/Food;.7;.2;;10}",,,0,600,0,,,,,-8,"pPiI"
+ "Hidalgo__pirates.blank","./vessels/Hidalgo","Hidalgo",,"Vessel","SCAVENGER","Converted luxury yachts make excellent pirate vessels, provided the pirate doesn't need to purchase the vessel in the first place.","hidalgo-hud.sprite",1,"no-cockpit",0,0,0,"{hidalgo.bfxm;;}",,,,,,,60000,60000,2333.33,14000,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,10,10,10,60000,30000,30000,10000,10000,10000,10000,30,30,FALSE,FALSE,0,0,0,0,200000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;20.65;7.75;1.0;0;0;0;1;0;180.0}{turretbeam;0;-17;80.75;1.0;0;0;0;-1;0;180.0}",,"{supernova.bmp.bfxm;5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;-5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;-2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;0;-10.65;-74.75;20;;;;;}{supernova.bmp.bfxm;-14.25;-15;-25.5;30;;;;;}{supernova.bmp.bfxm;14.25;-15;-25.5;30;;;;;}","{;;;special autotracking;-4.5;3;32.5;;;;;;;;;1;1}{;;;special autotracking;4.5;3;32.5;;;;;;;;;1;1}{;;;light medium Heavy autotracking;-0;2;30;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;6.5;3;12.5;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;-6.5;3;12.5;;;;;;;;;1;1}{;8;72;special-missile Medium-missile;0;3;2.5;;;;;;;;;1;1}",,"{;30;0;-37;30;0}{;-30;0;-37;30;0}",,,,0,600,0,,,,,-8,"pPiI"
+ "Hyena__pirates","./vessels/Hyena","Hyena",,"Vessel","SCAVENGER","The Hyena's size and bulk may be to its detriment as a combat vessel, but are desired properties for looting-oriented engagements.","hyena-hud.spr",0.15,"no-cockpit",0,0,100,"{hyena.bfxm;;}",,,,,,,144,144,3.77,112,44,44,44,44,44,44,44,44,180,120,120,120,,,,,23.5,0,100,300,50,TRUE,,,300,30,1,4,113840,121586,113840,70,80,80,13000,12000,9000,4000,4000,4000,4000,250,250,FALSE,TRUE,300000000,5,180,10,45,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,"{Crippler;;;Light Special;-12.6;-16.5;4;;;;;;;;;1;1}{Crippler;;;Light Special;12.6;-16.5;4;;;;;;;;;1;1}{LeechGun;;;Light;-12.5;-1.5;-1;;;;;;;;;1;1}{LeechGun;;;Light;12.5;-1.5;-1;;;;;;;;;1;1}{Tractor;1;16;Special;0;-.23;4;;;;;;;;;1;1}",,,,,,0,325,0,,,,,-2,"pPiI"
+@@ -629,13 +629,13 @@
+ "Plowshare__pirates.blank","./vessels/Plowshare","Plowshare","MANEUVOUR","Vessel","SCAVENGER","A scavenger","wayfarer-hud.spr",1,"no-cockpit",0,6,25,"{plowshare.bfxm;;}","plowshare_shield.bfxm",,,,,,800,800,40,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,40,45,45,20000,15000,10000,4000,4000,4000,4000,65,65,FALSE,FALSE,0,0,0,0,2500,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;-6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;12.75;-9;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-9;-14.75;8;;;;;}","{;;;special;11.5;-2.5;24;;;;;;;;;1;1}{;;;special;-11.5;-2.5;24;;;;;;;;;1;1}{;;;Light Medium;11.5;-4.5;23;;;;;;;;;1;1}{;;;Light Medium;-11.5;-4.5;23;;;;;;;;;1;1}{;8;24;light-missile medium-missile;-5.3;7;12;;;;;;;;;1;1}{;8;24;light-missile medium-missile;5.3;7;12;;;;;;;;;1;1}",,,,,,0,600,0,,,,,-5,"pPiI"
+ "Thales__pirates","./vessels/Thales","Thales",,"Vessel","SCAVENGER","Over the decades, as they were decommissioned from the Andolian fleet and sold to other governments, many Thales class vessels have found their way into the hands of less than reputable parties.","corvette-hud.spr",70,,,,,"{thales.bfxm;;}",,,,,,,88000,88000,16000,2500,250,250,500,500,350,350,600,600,10000,10000,10000,10000,,,,,50,0,1000,11000,300,TRUE,,,900,250,1,4,3000000,3000000,3000000,8,10,8,2700000,2500000,1500000,750000,750000,750000,750000,135,135,FALSE,TRUE,1000000000,10,180,60,5000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turret_120;0.80;0.12;-0.08;1;0;0;0;1;0;75}{turret_120;0.80;0.08;-0.08;1;0;0;0;-1;0;75}{turret_120;-0.80;0.12;-0.08;-1;0;0;0;1;0;75}{turret_120;-0.80;0.08;-0.08;-1;0;0;0;-1;0;75}{turret_120;0.68;0.085;1.875;0;0;1;1;0;0;160}{turret_120;-0.68;0.085;1.875;0;0;1;-1;0;0;160}{turretflak;1.72;-.11;-1.375;.966;-0.25;0;0.25;0.966;0;160}{turretflak;1.72;-.14;-1.375;0.966;-.25;0;-0.25;-0.966;0;160}{turretflak;-1.72;-.11;-1.375;-.966;-0.25;0;-0.25;0.966;0;160}{turretflak;-1.72;-.14;-1.375;-0.966;-.25;0;0.25;-0.966;0;160}{turretflak_120;-0.065;0.36;2.4;0;0;1;0;1;0;160}{turretflak_120;-0.15;0.36;2.11;0;0;1;0;1;0;160}{turretflak_90;0;-0.05;-1.45;0;0;-1;0;1;0;85}{turretflak_90;0;0.33;-1.45;0;0;-1;0;-1;0;85}{turretpd;0;-0.07;-1.45;0;0;-1;0;-1;0;180}",";;;;;;",,"{capshipdisruptor;;;capship-heavy SPECIAL;-0.025;-0.073;2.75;;;;;;;;;1;1}{tractor;;; SPECIAL autotracking;0;0;-1;;;0;-0.17;0.98;0;1;0;1;1}",,"{;0;-0.3;-0.7;0.3;0}","{Natural_Products/Food;1.3;.2;10;20}{Natural_Products/Liquor;1.05;.1;;1}{upgrades/Ammunition;2;.1;5;10}",,,0,600,0,,,,,-10,"pPiI"
+ "Thales__pirates.blank","./vessels/Thales","Thales",,"Vessel","SCAVENGER","Over the decades, as they were decommissioned from the Andolian fleet and sold to other governments, many Thales class vessels have found their way into the hands of less than reputable parties.","corvette-hud.spr",70,,,,,"{thales.bfxm;;}",,,,,,,88000,88000,16000,2500,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,8,10,8,2700000,2500000,1500000,750000,750000,750000,750000,105,105,FALSE,FALSE,0,0,0,0,5000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turret_120;0.80;0.12;-0.08;1;0;0;0;1;0;75}{turret_120;0.80;0.08;-0.08;1;0;0;0;-1;0;75}{turret_120;-0.80;0.12;-0.08;-1;0;0;0;1;0;75}{turret_120;-0.80;0.08;-0.08;-1;0;0;0;-1;0;75}{turret_120;0.68;0.085;1.875;0;0;1;1;0;0;160}{turret_120;-0.68;0.085;1.875;0;0;1;-1;0;0;160}{turretflak;1.72;-.11;-1.375;.966;-0.25;0;0.25;0.966;0;160}{turretflak;1.72;-.14;-1.375;0.966;-.25;0;-0.25;-0.966;0;160}{turretflak;-1.72;-.11;-1.375;-.966;-0.25;0;-0.25;0.966;0;160}{turretflak;-1.72;-.14;-1.375;-0.966;-.25;0;0.25;-0.966;0;160}{turretflak_120;-0.065;0.36;2.4;0;0;1;0;1;0;160}{turretflak_120;-0.15;0.36;2.11;0;0;1;0;1;0;160}{turretflak_90;0;-0.05;-1.45;0;0;-1;0;1;0;85}{turretflak_90;0;0.33;-1.45;0;0;-1;0;-1;0;85}{turretpd;0;-0.07;-1.45;0;0;-1;0;-1;0;180}",";;;;;;",,"{;;;capship-heavy SPECIAL;-0.025;-0.073;2.75;;;;;;;;;1;1}{;;; SPECIAL autotracking;0;0;-1;;;0;-0.17;0.98;0;1;0;1;1}",,"{;0;-0.3;-0.7;0.3;0}",,,,0,600,0,,,,,-10,"pPiI"
+-"Ct2000","./vessels/Ct2000","Ct2000",,"Vessel","SHUTTLE","LIHW Wake Industries corporate shuttle","ct2000-hud.sprite",5,"no-cockpit",0,0,3.5,"{ct2000.bfxm;;}",,,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{add_spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,"{;0;-0.85;1.5;0.5;0}",,,,0,360,0,,,,,,"pPiI"
+-"Ct2000.blank","./vessels/Ct2000","Ct2000",,"Vessel","SHUTTLE","LIHW Wake Industries corporate shuttle","ct2000-hud.sprite",5,"no-cockpit",0,0,3.5,"{ct2000.bfxm;;}",,,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{add_spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,"{;0;-0.85;1.5;0.5;0}",,,,0,360,0,,,,,,"pPiI"
+-"Dodo","./vessels/Dodo","Dodo",,"Vessel","SHUTTLE","Replacement model for Dodo","dodo-hud.sprite",0.2,"no-cockpit",0,0,125,"{dodo.bfxm;;}",,,,,,,560,560,91.41,1600,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,300000000,4,180,25,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor01;;}{quadshield02;;}{add_spec_capacitor01;;}{capacitor02;;}{reactor03;;}{skyscope2;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{Skatecargo;0;0;0;;;;;;;0}",";;;;;;","{supernova.bmp.bfxm;10.24;-2.759;-18.302;6;;;;;}{supernova.bmp.bfxm;-10.24;-2.759;-18.302;6;;;;;}","{handlaser;;;;64;51;11.8091;;;;;;;;;1;1}{handlaser;;;;-64;51;11.8091;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;-212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}",,"{;0;-4.7;6;25;0}","{Raw_Materials/Gases;.7;.2;;2}{Raw_Materials/Hydrocarbons;.8;.2;;2}",,,0,1800,0,,,,,,"pPiI"
++"Ct2000","./vessels/Ct2000","Ct2000",,"Vessel","SHUTTLE","LIHW Wake Industries corporate shuttle","ct2000-hud.sprite",5,"no-cockpit",0,0,3.5,"{ct2000.bfxm;;}",,,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,"{;0;-0.85;1.5;0.5;0}",,,,0,360,0,,,,,,"pPiI"
++"Ct2000.blank","./vessels/Ct2000","Ct2000",,"Vessel","SHUTTLE","LIHW Wake Industries corporate shuttle","ct2000-hud.sprite",5,"no-cockpit",0,0,3.5,"{ct2000.bfxm;;}",,,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,"{;0;-0.85;1.5;0.5;0}",,,,0,360,0,,,,,,"pPiI"
++"Dodo","./vessels/Dodo","Dodo",,"Vessel","SHUTTLE","Replacement model for Dodo","dodo-hud.sprite",0.2,"no-cockpit",0,0,125,"{dodo.bfxm;;}",,,,,,,560,560,91.41,1600,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,300000000,4,180,25,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor01;;}{quadshield02;;}{spec_capacitor01;;}{capacitor02;;}{reactor03;;}{skyscope2;;}","mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{Skatecargo;0;0;0;;;;;;;0}",";;;;;;","{supernova.bmp.bfxm;10.24;-2.759;-18.302;6;;;;;}{supernova.bmp.bfxm;-10.24;-2.759;-18.302;6;;;;;}","{handlaser;;;;64;51;11.8091;;;;;;;;;1;1}{handlaser;;;;-64;51;11.8091;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;-212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}",,"{;0;-4.7;6;25;0}","{Raw_Materials/Gases;.7;.2;;2}{Raw_Materials/Hydrocarbons;.8;.2;;2}",,,0,1800,0,,,,,,"pPiI"
+ "Dodo.blank","./vessels/Dodo","Dodo","MANEUVOUR","Vessel","SHUTTLE","The ugliest cargo tug in existence","dodo-hud.sprite",0.2,"no-cockpit",0,0,125,"{dodo.bfxm;;}",,,,,,,420,420,91.41,1600,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,325,,,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,100000,0,0,0,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{Skatecargo;0;0;0;;;;;;;0}",";;;;;;","{supernova.bmp.bfxm;10.24;-2.759;-18.302;6;;;;;}{supernova.bmp.bfxm;-10.24;-2.759;-18.302;6;;;;;}","{;;;;64;51;11.8091;;;;;;;;;1;1}{;;;;-64;51;11.8091;;;;;;;;;1;1}{;;;Special autotracking;212;-50;65;;;;;;;;;1;1}{;;;Special autotracking;-212;-50;65;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}{;;;Special;-0;-35;95;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}{;;;Special;-0;-35;95;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}",,"{;0;-4.7;6;25;0}",,,,0,1800,0,,,,,,"pPiI"
+-"Dodo.civvie","./vessels/Dodo","Dodo",,"Vessel","SHUTTLE","The ugliest cargo tug in existence","dodo-hud.sprite",0.2,"no-cockpit",0,0,125,"{dodo.bfxm;;}",,,,,,,560,560,91.41,1600,1,1,1,1,1,1,1,1,25,25,25,25,,,,,2,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,300000000,4,180,25,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor01;;}{quadshield02;;}{add_spec_capacitor01;;}{capacitor02;;}{reactor03;;}{skyscope2;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{Skatecargo;0;0;0;;;;;;;0}",";;;;;;","{supernova.bmp.bfxm;10.24;-2.759;-18.302;6;;;;;}{supernova.bmp.bfxm;-10.24;-2.759;-18.302;6;;;;;}","{handlaser;;;;64;51;11.8091;;;;;;;;;1;1}{handlaser;;;;-64;51;11.8091;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;-212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}",,"{;0;-4.7;6;25;0}","{Raw_Materials/Gases;.7;.2;;2}{Raw_Materials/Hydrocarbons;.8;.2;;2}",,,0,1800,0,,,,,,"pPiI"
++"Dodo.civvie","./vessels/Dodo","Dodo",,"Vessel","SHUTTLE","The ugliest cargo tug in existence","dodo-hud.sprite",0.2,"no-cockpit",0,0,125,"{dodo.bfxm;;}",,,,,,,560,560,91.41,1600,1,1,1,1,1,1,1,1,25,25,25,25,,,,,2,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,300000000,4,180,25,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor01;;}{quadshield02;;}{spec_capacitor01;;}{capacitor02;;}{reactor03;;}{skyscope2;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{Skatecargo;0;0;0;;;;;;;0}",";;;;;;","{supernova.bmp.bfxm;10.24;-2.759;-18.302;6;;;;;}{supernova.bmp.bfxm;-10.24;-2.759;-18.302;6;;;;;}","{handlaser;;;;64;51;11.8091;;;;;;;;;1;1}{handlaser;;;;-64;51;11.8091;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;-212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}",,"{;0;-4.7;6;25;0}","{Raw_Materials/Gases;.7;.2;;2}{Raw_Materials/Hydrocarbons;.8;.2;;2}",,,0,1800,0,,,,,,"pPiI"
+ "Dodo.milspec","./vessels/Dodo","Dodo",,"Vessel","SHUTTLE","The ugliest cargo tug in existence","dodo-hud.sprite",0.2,"no-cockpit",0,0,125,"{dodo.bfxm;;}",,,,,,,560,560,91.41,1600,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,300000000,4,180,25,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{Skatecargo;0;0;0;;;;;;;0}",";;;;;;","{supernova.bmp.bfxm;10.24;-2.759;-18.302;6;;;;;}{supernova.bmp.bfxm;-10.24;-2.759;-18.302;6;;;;;}","{handlaser;;;;64;51;11.8091;;;;;;;;;1;1}{handlaser;;;;-64;51;11.8091;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special autotracking;-212;-50;65;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;-0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}{Heavytractor;;;Special;0;-35;95;;;;;;;;;1;1}",,"{;0;-4.7;6;25;0}",,"{Dodo_Milspec_Package;upgrades/Packages/Milspec;200000;1;140;1725;1;1;Full-Custom Milspec Configuration;0}",,0,1800,0,,,,,,"pPiI"
+-"Dodo.stock","./vessels/Dodo","Dodo","MANEUVOUR","Vessel","SHUTTLE","The ugliest cargo tug in existence","dodo-hud.sprite",1,"no-cockpit",0,0,125,"{dodo.bfxm;;}",,,,,,,434,434,91.41,1600,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,300000000,4,180,25,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{Skatecargo;0;0;0;;;;;;;0}",";;;;;;","{supernova.bmp.bfxm;10.24;-2.759;-18.302;6;;;;;}{supernova.bmp.bfxm;-10.24;-2.759;-18.302;6;;;;;}","{;;;;64;51;11.8091;;;;;;;;;1;1}{;;;;-64;51;11.8091;;;;;;;;;1;1}{;;;Special autotracking;212;-50;65;;;;;;;;;1;1}{;;;Special autotracking;-212;-50;65;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}{;;;Special;-0;-35;95;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}{;;;Special;-0;-35;95;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}",,"{;0;-4.7;6;25;0}",,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,1800,0,,,,,,"pPiI"
++"Dodo.stock","./vessels/Dodo","Dodo","MANEUVOUR","Vessel","SHUTTLE","The ugliest cargo tug in existence","dodo-hud.sprite",1,"no-cockpit",0,0,125,"{dodo.bfxm;;}",,,,,,,434,434,91.41,1600,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,68,65,62,60000,60000,60000,10000,10000,10000,10000,85,85,FALSE,FALSE,300000000,4,180,25,700,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{Skatecargo;0;0;0;;;;;;;0}",";;;;;;","{supernova.bmp.bfxm;10.24;-2.759;-18.302;6;;;;;}{supernova.bmp.bfxm;-10.24;-2.759;-18.302;6;;;;;}","{;;;;64;51;11.8091;;;;;;;;;1;1}{;;;;-64;51;11.8091;;;;;;;;;1;1}{;;;Special autotracking;212;-50;65;;;;;;;;;1;1}{;;;Special autotracking;-212;-50;65;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}{;;;Special;-0;-35;95;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}{;;;Special;-0;-35;95;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}{;;;Special;0;-35;95;;;;;;;;;1;1}",,"{;0;-4.7;6;25;0}",,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,1800,0,,,,,,"pPiI"
+ "Entourage","./vessels/Entourage","Entourage","ART-DONE NEEDS STATS","Vessel","SHUTTLE","Luxury Personal Transportation by the Luxury Travel Conglomerate primarily utilized by the Highborn and Uln Ranks of Lords","entourage-hud.sprite",1,"no-cockpit",0,0,0,"{entourage.bfxm;;}","entourage-shield.bfxm",,,,,,72,72,3.46,400,25,25,25,25,25,25,25,25,125,125,,,,,,,25,0,250,125,15,TRUE,1,,200,120,1,0,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.1;-0.44;-2.95;0.151;;;;;}{supernova.bmp.bfxm;-0.05;-0.44;-2.95;0.151;;;;;}{supernova.bmp.bfxm;-0.3;0.25;-2.99;0.195;;;;;}{supernova.bmp.bfxm;0.35;0.25;-2.99;0.195;;;;;}{supernova.bmp.bfxm;1.67;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;1.36;-0.08;-3.51;0.32;;;;;}{supernova.bmp.bfxm;1.04;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;0.75;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-1.61;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-1.31;-0.08;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-0.99;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-0.7;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-0.11;0.26;-2.99;0.274;;;;;}{supernova.bmp.bfxm;0.31;-0.43;-2.95;0.274;;;;;}{supernova.bmp.bfxm;-0.26;-0.43;-2.95;0.274;;;;;}{supernova.bmp.bfxm;0.15;0.26;-2.99;0.274;;;;;}",,,,,,,0,225,0,,,,,,"pPiI"
+ "Entourage.stock","./vessels/Entourage","Entourage","ART-DONE NEEDS STATS","Vessel","SHUTTLE","Luxury Personal Transportation by the Luxury Travel Conglomerate primarily utilized by the Highborn and Uln Ranks of Lords","entourage-hud.sprite",1,"no-cockpit",0,0,0,"{entourage.bfxm;;}","entourage-shield.bfxm",,,,,,72,72,3.46,400,25,25,25,25,25,25,25,25,125,125,,,,,,,25,0,250,125,15,TRUE,1,,200,120,1,0,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.1;-0.44;-2.95;0.151;;;;;}{supernova.bmp.bfxm;-0.05;-0.44;-2.95;0.151;;;;;}{supernova.bmp.bfxm;-0.3;0.25;-2.99;0.195;;;;;}{supernova.bmp.bfxm;0.35;0.25;-2.99;0.195;;;;;}{supernova.bmp.bfxm;1.67;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;1.36;-0.08;-3.51;0.32;;;;;}{supernova.bmp.bfxm;1.04;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;0.75;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-1.61;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-1.31;-0.08;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-0.99;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-0.7;-0.1;-3.51;0.32;;;;;}{supernova.bmp.bfxm;-0.11;0.26;-2.99;0.274;;;;;}{supernova.bmp.bfxm;0.31;-0.43;-2.95;0.274;;;;;}{supernova.bmp.bfxm;-0.26;-0.43;-2.95;0.274;;;;;}{supernova.bmp.bfxm;0.15;0.26;-2.99;0.274;;;;;}",,,,,,,0,225,0,,,,,,"pPiI"
+ "Entourage.blank","./vessels/Entourage","Entourage","ART-DONE NEEDS STATS","Vessel","SHUTTLE",,"entourage-hud.sprite",1,,0,0,0,"{entourage.bfxm;;}","entourage-shield.bfxm",,,,,,72,72,3.46,400,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,TRUE,1,,200,120,1,0,50000,50000,50000,55,60,60,25000,22000,15000,5000,5000,5000,5000,540,540,FALSE,,300000000,5,180,10,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;",,,,,,,,0,225,0,,,,,,"pPiI"
+@@ -644,31 +644,31 @@
+ "Franklin.civvie","./vessels/Franklin","Franklin",,"Vessel","SHUTTLE","Andolian diplomatic shuttle","franklin-hud.sprite",10,,0,0,2.5,"{franklin.bfxm;;}",,,,,,,152,152,47.92,900,1,1,1,1,1,1,1,1,75,75,75,75,,,,,2,0,325,100,15,TRUE,1,,300,120,1,4,50000,50000,50000,80,87,95,35000,30000,22000,10000,10000,10000,10000,440,440,FALSE,FALSE,300000000,5,180,10,300,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;-0.298000;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;0.290000;2.40000e-2;-1.03600;.5;;;;;}","{ParticleBeam;;;Light Medium Heavy;-1.45600;-2.00000e-2;-0.396000;;;;;;;;;1;1}{ParticleBeam;;;Light Medium Heavy;1.45800;-2.00000e-2;-0.396000;;;;;;;;;1;1}{Disruptor;;;Light Medium Heavy;0.160000;-0.102000;2.42200;;;;;;;;;1;1}{Disruptor;;;Light Medium Heavy;-0.132000;-0.102000;2.42200;;;;;;;;;1;1}",,,,,,0,300,0,,,,,,"pPiI"
+ "Franklin.hunter","./vessels/Franklin","Franklin","MANEUVOUR","Vessel","SHUTTLE","Andolian diplomatic shuttle","franklin-hud.sprite",10,,0,0,2.5,"{franklin.bfxm;;}",,,,,,,152,152,47.92,900,1,1,1,1,1,1,1,1,150,150,150,150,,,,,4,0,325,600,25,FALSE,1,,300,120,1,4,50000,50000,50000,80,87,95,40000,40000,22000,10000,10000,10000,10000,440,440,FALSE,FALSE,300000000,0,0,0,300,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{franklinpd;0;0.25;0;1.0;0;0;0;1;0;180.0}{franklinpd;0;-0.25;1;1.0;0;0;0;-1;0;180.0}",";;;;;;","{supernova.bmp.bfxm;0.00000e+0;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;-0.298000;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;0.290000;2.40000e-2;-1.03600;.5;;;;;}","{;;15;Light Medium;-1.45600;-2.00000e-2;-0.396000;;;;;;;;;1;1}{;;15;Light Medium;1.45800;-2.00000e-2;-0.396000;;;;;;;;;1;1}{;1;90;Special-missile Heavy-missile;5.00000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;1;90;Special-missile Heavy-missile;-4.20000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;special;5.00000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;special;-4.20000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;15;Light Medium;0.160000;-0.102000;2.42200;;;;;;;;;1;1}{;;15;Light Medium;-0.132000;-0.102000;2.42200;;;;;;;;;1;1}",,,,,,0,300,0,,,,,,"pPiI"
+ "Franklin.milspec","./vessels/Franklin","Franklin",,"Vessel","SHUTTLE","Andolian diplomatic shuttle","franklin-hud.sprite",10,,0,0,2.5,"{franklin.bfxm;;}",,,,,,,152,152,47.92,900,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,600,25,TRUE,1,,300,120,1,4,50000,50000,50000,80,87,95,40000,40000,22000,10000,10000,10000,10000,440,440,FALSE,FALSE,300000000,5,180,10,300,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{franklinpd;0;0.25;0;1.0;0;0;0;1;0;180.0}{franklinpd;0;-0.25;1;1.0;0;0;0;-1;0;180.0}",";;;;;;","{supernova.bmp.bfxm;0.00000e+0;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;-0.298000;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;0.290000;2.40000e-2;-1.03600;.5;;;;;}","{;;15;Light Medium;-1.45600;-2.00000e-2;-0.396000;;;;;;;;;1;1}{;;15;Light Medium;1.45800;-2.00000e-2;-0.396000;;;;;;;;;1;1}{;1;90;Special-missile Heavy-missile;5.00000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;1;90;Special-missile Heavy-missile;-4.20000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;special;5.00000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;special;-4.20000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;15;Light Medium;0.160000;-0.102000;2.42200;;;;;;;;;1;1}{;;15;Light Medium;-0.132000;-0.102000;2.42200;;;;;;;;;1;1}",,,,"{Franklin_Milspec_Package;upgrades/Packages/Milspec;200000;1;80;285;1;1;Full-Custom Milspec Configuration;0}",,0,300,0,,,,,,"pPiI"
+-"Franklin.stock","./vessels/Franklin","Franklin","MANEUVOUR","Vessel","SHUTTLE","Andolian diplomatic shuttle","franklin-hud.sprite",10,,0,0,2.5,"{franklin.bfxm;;}",,,,,,,86,86,47.92,900,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,80,87,95,40000,40000,22000,10000,10000,10000,10000,440,440,FALSE,FALSE,300000000,4,180,25,300,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{franklinpd;0;0.25;0;1.0;0;0;0;1;0;180.0}{franklinpd;0;-0.25;1;1.0;0;0;0;-1;0;180.0}",";;;;;;","{supernova.bmp.bfxm;0.00000e+0;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;-0.298000;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;0.290000;2.40000e-2;-1.03600;.5;;;;;}","{;;;Light Medium Heavy;-1.45600;-2.00000e-2;-0.396000;;;;;;;;;1;1}{;;;Light Medium Heavy;1.45800;-2.00000e-2;-0.396000;;;;;;;;;1;1}{;1;90;Special-missile Heavy-missile;5.00000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;1;90;Special-missile Heavy-missile;-4.20000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;special;5.00000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;special;-4.20000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;Light Medium Heavy;0.160000;-0.102000;2.42200;;;;;;;;;1;1}{;;;Light Medium Heavy;-0.132000;-0.102000;2.42200;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,300,0,,,,,,"pPiI"
++"Franklin.stock","./vessels/Franklin","Franklin","MANEUVOUR","Vessel","SHUTTLE","Andolian diplomatic shuttle","franklin-hud.sprite",10,,0,0,2.5,"{franklin.bfxm;;}",,,,,,,86,86,47.92,900,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,80,87,95,40000,40000,22000,10000,10000,10000,10000,440,440,FALSE,FALSE,300000000,4,180,25,300,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{franklinpd;0;0.25;0;1.0;0;0;0;1;0;180.0}{franklinpd;0;-0.25;1;1.0;0;0;0;-1;0;180.0}",";;;;;;","{supernova.bmp.bfxm;0.00000e+0;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;-0.298000;2.40000e-2;-1.03600;.5;;;;;}{supernova.bmp.bfxm;0.290000;2.40000e-2;-1.03600;.5;;;;;}","{;;;Light Medium Heavy;-1.45600;-2.00000e-2;-0.396000;;;;;;;;;1;1}{;;;Light Medium Heavy;1.45800;-2.00000e-2;-0.396000;;;;;;;;;1;1}{;1;90;Special-missile Heavy-missile;5.00000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;1;90;Special-missile Heavy-missile;-4.20000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;special;5.00000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;special;-4.20000e-2;-0.102000;2.91600;;;;;;;;;1;1}{;;;Light Medium Heavy;0.160000;-0.102000;2.42200;;;;;;;;;1;1}{;;;Light Medium Heavy;-0.132000;-0.102000;2.42200;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,300,0,,,,,,"pPiI"
+ "GTIO","./vessels/GTIO","GTIO",,"Vessel","SHUTTLE","High-Born Manufactured Civilian Sports-Vessel","gtio-hud.sprite",0.03,"no-cockpit",0,0,0,"{gtio.bfxm;;}",,,,,,,80,80,25,100,1,1,1,1,1,1,1,1,25,25,25,25,,,,,4,0,25,200,20,FALSE,1,,300,120,1,4,50000,50000,50000,70,70,70,27000,19000,14000,4000,4000,4000,4000,370,370,FALSE,FALSE,300000000,4,180,25,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;160;0;-400;800;;;;;}{supernova.bmp.bfxm;-160;0;-400;800;;;;;}",,,,,,,0,300,0,,,,,,"pPiI"
+ "GTIO.blank","./vessels/GTIO","GTIO","MANEUVOUR","Vessel","SHUTTLE","High-Born Manufactured Civilian Sports-Vessel","gtio-hud.sprite",0.03,"no-cockpit",0,0,0,"{gtio.bfxm;;}",,,,,,,80,80,15,100,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,70,70,70,27000,19000,14000,4000,4000,4000,4000,365,365,FALSE,FALSE,100000,0,0,0,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;160;0;-400;800;;;;;}{supernova.bmp.bfxm;-160;0;-400;800;;;;;}",,,,,,,0,300,0,,,,,,"pPiI"
+ "GTIO.civvie","./vessels/GTIO","GTIO",,"Vessel","SHUTTLE","High-Born Manufactured Civilian Sports-Vessel","gtio-hud.sprite",0.03,"no-cockpit",0,0,0,"{gtio.bfxm;;}",,,,,,,80,80,25,100,1,1,1,1,1,1,1,1,25,25,25,25,,,,,2,0,25,200,20,FALSE,1,,300,120,1,4,50000,50000,50000,70,70,70,27000,19000,14000,4000,4000,4000,4000,370,370,FALSE,FALSE,300000000,4,180,25,25,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;160;0;-400;800;;;;;}{supernova.bmp.bfxm;-160;0;-400;800;;;;;}",,,,,,,0,300,0,,,,,,"pPiI"
+-"H496","./vessels/H496","H496",,"Vessel","SHUTTLE","Limousine for the starfaring crowd constructed by the Luxury Travel Conglomerate","h496-hud.sprite",2,,0,0,0,"{h496.bfxm;;}","h496-shield.bfxm",,,,,,567,567,30.46,600,50,50,50,50,50,50,50,50,900,900,900,900,,,,,15,0,400,800,25,TRUE,1,,200,120,1,0,50000,50000,50000,35,35,35,27000,27000,15000,5000,5000,5000,5000,540,300,FALSE,,300000000,5,180,10,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{jump_drive;;}{reactor03;;}{capacitor04;;}{dualshield04;;}{armor04;;}{repair_droid01;;}{hawkeye1;;}{ecm_package01;;}{add_spec_capacitor01;;}","upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretgunsmall;-1.29;0.71;10.2;0.0;0.0;1.0;0.0;1.0;0.0;180.0}{turretgunsmall;1.29;0.71;10.2;0.0;0.0;1.0;0.0;1.0;0.0;180.0}",";;;;;;","{supernova.bmp.bfxm;-5.57;-0.33;-11.3;6.248;;;;;}{supernova.bmp.bfxm;5.56;-0.33;-11.3;6.248;;;;;}","{IonBeam;;;Light;-1.2;0.71;10.2;;;;;;;;;1;1}{IonBeam;;;Light;-1.40;0.71;10.2;;;;;;;;;1;1}{IonBeam;;;Light;1.20;0.71;10.2;;;;;;;;;1;1}{IonBeam;;;Light;1.40;0.71;10.2;;;;;;;;;1;1}",,,,,,0,225,0,,,,,,"pPiI"
++"H496","./vessels/H496","H496",,"Vessel","SHUTTLE","Limousine for the starfaring crowd constructed by the Luxury Travel Conglomerate","h496-hud.sprite",2,,0,0,0,"{h496.bfxm;;}","h496-shield.bfxm",,,,,,567,567,30.46,600,50,50,50,50,50,50,50,50,900,900,900,900,,,,,15,0,400,800,25,TRUE,1,,200,120,1,0,50000,50000,50000,35,35,35,27000,27000,15000,5000,5000,5000,5000,540,300,FALSE,,300000000,5,180,10,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{jump_drive;;}{reactor03;;}{capacitor04;;}{dualshield04;;}{armor04;;}{repair_droid01;;}{hawkeye1;;}{ecm_package01;;}{spec_capacitor01;;}","upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretgunsmall;-1.29;0.71;10.2;0.0;0.0;1.0;0.0;1.0;0.0;180.0}{turretgunsmall;1.29;0.71;10.2;0.0;0.0;1.0;0.0;1.0;0.0;180.0}",";;;;;;","{supernova.bmp.bfxm;-5.57;-0.33;-11.3;6.248;;;;;}{supernova.bmp.bfxm;5.56;-0.33;-11.3;6.248;;;;;}","{IonBeam;;;Light;-1.2;0.71;10.2;;;;;;;;;1;1}{IonBeam;;;Light;-1.40;0.71;10.2;;;;;;;;;1;1}{IonBeam;;;Light;1.20;0.71;10.2;;;;;;;;;1;1}{IonBeam;;;Light;1.40;0.71;10.2;;;;;;;;;1;1}",,,,,,0,225,0,,,,,,"pPiI"
+ "H496.blank","./vessels/H496","H496",,"Vessel","SHUTTLE",,"H496-hud.spr",2,,0,0,0,"{H496.bfxm;;}","H496shield.bfxm",,,,,,567,567,30.46,600,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,200,120,1,0,50000,50000,50000,35,35,35,27000,27000,15000,5000,5000,5000,5000,540,120,FALSE,,300000000,5,180,10,250,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;5.25;-0.55;-12.75;6;;;;;}{supernova.bmp.bfxm;-5.25;-0.55;-12.75;6;;;;;}",,,,,,,0,225,0,,,,,,"pPiI"
+ "Kafka","./vessels/Kafka","Kafka",,"Vessel","SHUTTLE","A Klk'k unarmed light cargo shuttle","kafka-hud.sprite",4,"no-cockpit",0,0,0,"{kafka.bfxm;;}",,,,,,,320,320,25,120,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,25,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,40,45,45,15000,15000,12000,10000,10000,10000,10000,105,105,FALSE,FALSE,300000000,4,180,25,1600,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;1;-5.15;2;;;;;}{supernova.bmp.bfxm;1;1.2;-5.175;3;;;;;}{supernova.bmp.bfxm;-1;1.2;-5.175;3;;;;;}{supernova.bmp.bfxm;3;-1.8;-4.15;1;;;;;}{supernova.bmp.bfxm;-3;-1.8;-4.15;1;;;;;}{supernova.bmp.bfxm;2.7;-1.95;-4.15;1;;;;;}{supernova.bmp.bfxm;-2.7;-1.95;-4.15;1;;;;;}",,,,,,,0,250,0,,,,,,"pPiI"
+ "Kafka.blank","./vessels/Kafka","Kafka","MANEUVOUR","Vessel","SHUTTLE","A Klk'k unarmed light cargo shuttle","kafka-hud.sprite",4,,0,0,0,"{kafka.bfxm;;}",,,,,,,320,320,30,120,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,40,45,45,15000,15000,12000,10000,10000,10000,10000,105,105,FALSE,FALSE,100000,0,0,0,1600,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;1;-5.15;2;;;;;}{supernova.bmp.bfxm;1;1.2;-5.175;3;;;;;}{supernova.bmp.bfxm;-1;1.2;-5.175;3;;;;;}{supernova.bmp.bfxm;3;-1.8;-4.15;1;;;;;}{supernova.bmp.bfxm;-3;-1.8;-4.15;1;;;;;}{supernova.bmp.bfxm;2.7;-1.95;-4.15;1;;;;;}{supernova.bmp.bfxm;-2.7;-1.95;-4.15;1;;;;;}",,,,,,,0,250,0,,,,,,"pPiI"
+ "Kafka.civvie","./vessels/Kafka","Kafka",,"Vessel","SHUTTLE","A Klk'k unarmed light cargo shuttle","kafka-hud.sprite",4,"no-cockpit",0,0,0,"{kafka.bfxm;;}",,,,,,,320,320,25,120,1,1,1,1,1,1,1,1,25,25,25,25,,,,,2,0,25,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,40,45,45,15000,15000,12000,10000,10000,10000,10000,105,105,FALSE,FALSE,300000000,4,180,25,1600,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;1;-5.15;2;;;;;}{supernova.bmp.bfxm;1;1.2;-5.175;3;;;;;}{supernova.bmp.bfxm;-1;1.2;-5.175;3;;;;;}{supernova.bmp.bfxm;3;-1.8;-4.15;1;;;;;}{supernova.bmp.bfxm;-3;-1.8;-4.15;1;;;;;}{supernova.bmp.bfxm;2.7;-1.95;-4.15;1;;;;;}{supernova.bmp.bfxm;-2.7;-1.95;-4.15;1;;;;;}",,,,"{Natural_Products/Renewable_Resources;.8;.2;;5}",,,0,250,0,,,,,,"pPiI"
+ "Koala.blank","./vessels/Koala","Koala",,"Vessel","SHUTTLE","Insystem Taxi","Koala-hud.spr",2,"no-cockpit",0,0,0,"{koala.bfxm;;}",,,,,,,320,320,30,120,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,40,45,45,15000,15000,12000,10000,10000,10000,10000,105,105,FALSE,FALSE,100000,0,0,0,1600,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.9;1.5;-4.9;4;;;;;}{supernova.bmp.bfxm;-1.8;1.5;-4.9;4;;;;;}{supernova.bmp.bfxm;1.9;-0.5;-4;4;;;;;}{supernova.bmp.bfxm;-1.9;-0.5;-4;4;;;;;}",,,,,,,0,250,0,,,,,,"pPiI"
+ "Koala.civvie","./vessels/Koala","Koala",,"Vessel","SHUTTLE","Insystem Taxi","Koala-hud.spr",2,"no-cockpit",0,0,0,"{koala.bfxm;;}",,,,,,,320,320,25,120,1,1,1,1,1,1,1,1,25,25,25,25,,,,,2,0,25,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,40,45,45,15000,15000,12000,10000,10000,10000,10000,105,105,FALSE,FALSE,300000000,4,180,25,1600,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;1.9;1.5;-4.9;4;;;;;}{supernova.bmp.bfxm;-1.8;1.5;-4.9;4;;;;;}{supernova.bmp.bfxm;1.9;-0.5;-4;4;;;;;}{supernova.bmp.bfxm;-1.9;-0.5;-4;4;;;;;}",,,,"{Specialty_Goods/Entertainment;1;.1;;1}",,,0,250,0,,,,,,"pPiI"
+-"Llama","./vessels/Llama","Llama",,"Vessel","SHUTTLE","Venerable LIHW built armed light cargo shuttle","llama-hud.spr",7,"no-cockpit",0,0,3.5,"{llama.bfxm;;}",,,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{add_spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,,,0,360,0,,,,,,"pPiI"
+-"Llama.begin","./vessels/Llama","Llama",,"Vessel","SHUTTLE","Venerable LIHW built armed light cargo shuttle","llama-hud.spr",7,"no-cockpit",0,0,3.5,"{llama.bfxm;;}",,,,,TRUE,TRUE,250,250,25,500,100,100,100,100,100,100,100,100,150,150,150,150,,,,,8,0,325,200,30,FALSE,1,,200,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,120,120,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0.35;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31;0;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;0;-1.82200;2;;;;;}","{laser;;15;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{laser;;15;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{laser;;3;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{laser;;3;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{Dumbfire;48;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;@upgrades/skyscope_alpha.png@Refurbished Part;0}{capacitor02;upgrades/Capacitors/Standard;200;1;4;4;1;1;@upgrades/capacitor.png@Refurbished Part;0}{reactor02;upgrades/Reactors/Standard;200;1;2;3.5;1;1;@upgrades/reactor.png@Refurbished Part;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;@upgrades/reactor_capacitance.png@Refurbished Part;0}{quadshield02;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;2;8;1;1;@upgrades/shield.png@Refurbished Part;0}{armor02;upgrades/Armor;200;1;20;0;1;1;@cargo/plasteel.png@Refurbished Part;0}",,0,360,0,,,,,,
++"Llama","./vessels/Llama","Llama",,"Vessel","SHUTTLE","Venerable LIHW built armed light cargo shuttle","llama-hud.spr",7,"no-cockpit",0,0,3.5,"{llama.bfxm;;}",,,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,,,0,360,0,,,,,,"pPiI"
++"Llama.begin","./vessels/Llama","Llama",,"Vessel","SHUTTLE","Venerable LIHW built armed light cargo shuttle","llama-hud.spr",7,"no-cockpit",0,0,3.5,"{llama.bfxm;;}",,,,,TRUE,TRUE,250,250,25,500,100,100,100,100,100,100,100,100,150,150,150,150,,,,,8,0,325,200,30,FALSE,1,,200,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,120,120,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0.35;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31;0;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;0;-1.82200;2;;;;;}","{laser;;15;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{laser;;15;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{laser;;3;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{laser;;3;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{Dumbfire;48;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;@upgrades/skyscope_alpha.png@Refurbished Part;0}{capacitor02;upgrades/Capacitors/Standard;200;1;4;4;1;1;@upgrades/capacitor.png@Refurbished Part;0}{reactor02;upgrades/Reactors/Standard;200;1;2;3.5;1;1;@upgrades/reactor.png@Refurbished Part;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;@upgrades/reactor_capacitance.png@Refurbished Part;0}{quadshield02;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;2;8;1;1;@upgrades/shield.png@Refurbished Part;0}{armor02;upgrades/Armor;200;1;20;0;1;1;@cargo/plasteel.png@Refurbished Part;0}",,0,360,0,,,,,,
+ "Llama.blank","./vessels/Llama","Llama","MANEUVOUR","Vessel","SHUTTLE","Venerable LIHW built armed light cargo shuttle","llama-hud.spr",7,,0,0,3.5,"{llama.bfxm;;}",,,,,,,216,216,25,500,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,100000,0,0,0,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,,,0,360,0,,,,,,"pPiI"
+ "Llama.civvie","./vessels/Llama","Llama",,"Vessel","SHUTTLE","Venerable LIHW built armed light cargo shuttle","llama-hud.spr",7,"no-cockpit",0,0,3.5,"{llama.bfxm;;}",,,,,,,336,336,25,500,1,1,1,1,1,1,1,1,75,75,75,75,,,,,2,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{Laser;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Laser;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,,,0,360,0,,,,,,"pPiI"
+-"Llama.stock","./vessels/Llama","Llama","MANEUVOUR","Vessel","SHUTTLE","Venerable LIHW built armed light cargo shuttle","llama-hud.spr",7,,0,0,3.5,"{llama.bfxm;;}",,,,,,,230,230,25,500,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{;;10;Light Medium;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{;;10;Light Medium;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{;;5;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{;;5;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,360,0,,,,,,"pPiI"
+-"Plowshare","./vessels/Plowshare","Plowshare",,"Vessel","SHUTTLE","Lovingly referred to as a 'large brick with engines and guns', the Plowshare is a top of the line Purist cargo shuttle, far more spacious than the aged LIHW Llama, and easier to obtain for private use than the Merchant Reindeer. Much of the non-Merchant's Guild traffic within Purist friendly systems occurs via Plowshares.","wayfarer-hud.spr",1,"no-cockpit",0,6,25,"{plowshare.bfxm;;}","plowshare_shield.bfxm",,,,,,800,800,44.17,900,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,35,35,35,27000,19000,14000,10000,10000,10000,10000,60,60,FALSE,FALSE,300000000,4,180,25,10000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield08;;}{add_spec_capacitor02;;}{capacitor06;;}{reactor07;;}{jump_drive;;}{hawkeye1;;}{ecm_package02;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;-6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;12.75;-9;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-9;-14.75;8;;;;;}","{tractorbeam;;;special;11.5;-2.5;24;;;;;;;;;1;1}{tractorbeam;;;special;-11.5;-2.5;24;;;;;;;;;1;1}{MiniDriver;;;Light Medium;11.5;-4.5;23;;;;;;;;;1;1}{MiniDriver;;;Light Medium;-11.5;-4.5;23;;;;;;;;;1;1}{Dumbfire;4;4;light-missile medium-missile;-5.3;7;12;;;;;;;;;1;1}{Dumbfire;4;4;light-missile medium-missile;5.3;7;12;;;;;;;;;1;1}",,,"{Natural_Products/Renewable_Resources;.8;.2;;5}{Raw_Materials/Hydrocarbons;.8;.2;;2}{Specialty_Goods/Entertainment;1;.1;;1}",,,0,600,0,,,,,,"pPiI"
++"Llama.stock","./vessels/Llama","Llama","MANEUVOUR","Vessel","SHUTTLE","Venerable LIHW built armed light cargo shuttle","llama-hud.spr",7,,0,0,3.5,"{llama.bfxm;;}",,,,,,,230,230,25,500,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0.00000e+0;0.350000;-2.09200;2;;;;;}{supernova.bmp.bfxm;1.31600;-6.00000e-3;-1.82200;2;;;;;}{supernova.bmp.bfxm;-1.32800;-6.00000e-3;-1.82200;2;;;;;}","{;;10;Light Medium;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{;;10;Light Medium;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{;;5;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{;;5;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,360,0,,,,,,"pPiI"
++"Plowshare","./vessels/Plowshare","Plowshare",,"Vessel","SHUTTLE","Lovingly referred to as a 'large brick with engines and guns', the Plowshare is a top of the line Purist cargo shuttle, far more spacious than the aged LIHW Llama, and easier to obtain for private use than the Merchant Reindeer. Much of the non-Merchant's Guild traffic within Purist friendly systems occurs via Plowshares.","wayfarer-hud.spr",1,"no-cockpit",0,6,25,"{plowshare.bfxm;;}","plowshare_shield.bfxm",,,,,,800,800,44.17,900,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,35,35,35,27000,19000,14000,10000,10000,10000,10000,60,60,FALSE,FALSE,300000000,4,180,25,10000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor06;;}{quadshield08;;}{spec_capacitor02;;}{capacitor06;;}{reactor07;;}{jump_drive;;}{hawkeye1;;}{ecm_package02;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;-6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;12.75;-9;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-9;-14.75;8;;;;;}","{tractorbeam;;;special;11.5;-2.5;24;;;;;;;;;1;1}{tractorbeam;;;special;-11.5;-2.5;24;;;;;;;;;1;1}{MiniDriver;;;Light Medium;11.5;-4.5;23;;;;;;;;;1;1}{MiniDriver;;;Light Medium;-11.5;-4.5;23;;;;;;;;;1;1}{Dumbfire;4;4;light-missile medium-missile;-5.3;7;12;;;;;;;;;1;1}{Dumbfire;4;4;light-missile medium-missile;5.3;7;12;;;;;;;;;1;1}",,,"{Natural_Products/Renewable_Resources;.8;.2;;5}{Raw_Materials/Hydrocarbons;.8;.2;;2}{Specialty_Goods/Entertainment;1;.1;;1}",,,0,600,0,,,,,,"pPiI"
+ "Plowshare.blank","./vessels/Plowshare","Plowshare","MANEUVOUR","Vessel","SHUTTLE","Lovingly referred to as a 'large brick with engines and guns', the Plowshare is a top of the line Purist cargo shuttle, far more spacious than the aged LIHW Llama, and easier to obtain for private use than the Merchant Reindeer. Much of the non-Merchant's Guild traffic within Purist friendly systems occurs via Plowshares.","wayfarer-hud.spr",1,"no-cockpit",0,6,25,"{plowshare.bfxm;;}","plowshare_shield.bfxm",,,,,,660,660,44.17,900,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,35,35,35,27000,19000,14000,4000,4000,4000,4000,60,100,FALSE,FALSE,100000,0,0,0,10000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;-6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;12.75;-9;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-9;-14.75;8;;;;;}","{;;;special;11.5;-2.5;24;;;;;;;;;1;1}{;;;special;-11.5;-2.5;24;;;;;;;;;1;1}{;;;Light Medium;11.5;-4.5;23;;;;;;;;;1;1}{;;;Light Medium;-11.5;-4.5;23;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-5.3;7;12;;;;;;;;;1;1}{;4;1;light-missile medium-missile;5.3;7;12;;;;;;;;;1;1}",,,,,,0,600,0,,,,,,"pPiI"
+ "Plowshare.civvie","./vessels/Plowshare","Plowshare",,"Vessel","SHUTTLE","Lovingly referred to as a 'large brick with engines and guns', the Plowshare is a top of the line Purist cargo shuttle, far more spacious than the aged LIHW Llama, and easier to obtain for private use than the Merchant Reindeer. Much of the non-Merchant's Guild traffic within Purist friendly systems occurs via Plowshares.","wayfarer-hud.spr",1,"no-cockpit",0,6,25,"{plowshare.bfxm;;}","plowshare_shield.bfxm",,,,,,800,800,44.17,900,1,1,1,1,1,1,1,1,75,75,75,75,,,,,2,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,35,35,35,27000,19000,14000,10000,10000,10000,10000,60,60,FALSE,FALSE,300000000,4,180,25,10000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;-6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;12.75;-9;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-9;-14.75;8;;;;;}","{tractorbeam;;;special;11.5;-2.5;24;;;;;;;;;1;1}{tractorbeam;;;special;-11.5;-2.5;24;;;;;;;;;1;1}{MicroDriver;;;Light Medium;11.5;-4.5;23;;;;;;;;;1;1}{MicroDriver;;;Light Medium;-11.5;-4.5;23;;;;;;;;;1;1}",,,"{Natural_Products/Renewable_Resources;.8;.2;;5}{Raw_Materials/Hydrocarbons;.8;.2;;2}{Specialty_Goods/Entertainment;1;.1;;1}",,,0,600,0,,,,,,"pPiI"
+-"Plowshare.stock","./vessels/Plowshare","Plowshare","MANEUVOUR","Vessel","SHUTTLE","Lovingly referred to as a 'large brick with engines and guns', the Plowshare is a top of the line Purist cargo shuttle, far more spacious than the aged LIHW Llama, and easier to obtain for private use than the Merchant Reindeer. Much of the non-Merchant's Guild traffic within Purist friendly systems occurs via Plowshares.","wayfarer-hud.spr",1,"no-cockpit",0,6,25,"{plowshare.bfxm;;}","plowshare_shield.bfxm",,,,,,674,674,44.17,900,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,35,35,35,27000,19000,14000,4000,4000,4000,4000,60,100,FALSE,FALSE,300000000,4,180,25,10000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;-6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;12.75;-9;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-9;-14.75;8;;;;;}","{;;;special;11.5;-2.5;24;;;;;;;;;1;1}{;;;special;-11.5;-2.5;24;;;;;;;;;1;1}{;;;Light Medium;11.5;-4.5;23;;;;;;;;;1;1}{;;;Light Medium;-11.5;-4.5;23;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-5.3;7;12;;;;;;;;;1;1}{;4;1;light-missile medium-missile;5.3;7;12;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,600,0,,,,,,"pPiI"
++"Plowshare.stock","./vessels/Plowshare","Plowshare","MANEUVOUR","Vessel","SHUTTLE","Lovingly referred to as a 'large brick with engines and guns', the Plowshare is a top of the line Purist cargo shuttle, far more spacious than the aged LIHW Llama, and easier to obtain for private use than the Merchant Reindeer. Much of the non-Merchant's Guild traffic within Purist friendly systems occurs via Plowshares.","wayfarer-hud.spr",1,"no-cockpit",0,6,25,"{plowshare.bfxm;;}","plowshare_shield.bfxm",,,,,,674,674,44.17,900,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,4,50000,50000,50000,35,35,35,27000,19000,14000,4000,4000,4000,4000,60,100,FALSE,FALSE,300000000,4,180,25,10000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;-6.3;8;-12.25;8;;;;;}{supernova.bmp.bfxm;12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-3.4;-14.75;8;;;;;}{supernova.bmp.bfxm;12.75;-9;-14.75;8;;;;;}{supernova.bmp.bfxm;-12.75;-9;-14.75;8;;;;;}","{;;;special;11.5;-2.5;24;;;;;;;;;1;1}{;;;special;-11.5;-2.5;24;;;;;;;;;1;1}{;;;Light Medium;11.5;-4.5;23;;;;;;;;;1;1}{;;;Light Medium;-11.5;-4.5;23;;;;;;;;;1;1}{;4;1;light-missile medium-missile;-5.3;7;12;;;;;;;;;1;1}{;4;1;light-missile medium-missile;5.3;7;12;;;;;;;;;1;1}",,,,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,600,0,,,,,,"pPiI"
+ "Sartre","./vessels/Sartre","Sartre",,"Vessel","SHUTTLE","Andolian Protectorate orbital shuttle","sartre-hud.sprite",8,"no-cockpit",0,0,0,"{sartre.bfxm;;}",,,,,,,4480,4480,91.41,1240,300,300,300,300,300,300,300,300,900,900,,,,,,,20,0,150,2000,120,FALSE,,,300,150,1,4,180000,180000,180000,30,50,60,60000,60000,44000,22231,22231,22231,22231,40,40,FALSE,TRUE,300000000,4,180,25,36000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0.8;-5.5;5;;;;;}",,,"{;0;-4.7;6;25;0}","{Raw_Materials/Gases;.7;.2;;2}{Raw_Materials/Hydrocarbons;.8;.2;;2}",,,0,200,0,,,,,,"pPiI"
+ "Sartre.blank","./vessels/Sartre","Sartre","MANEUVOUR","Vessel","SHUTTLE","Andolian Protectorate orbital shuttle","sartre-hud.sprite",8,"no-cockpit",0,0,0,"{sartre.bfxm;;}",,,,,,,4480,4480,5,1240,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,40,45,50,60000,60000,44000,22000,22000,22000,22000,40,40,FALSE,FALSE,100000,0,0,0,36000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0.8;-5.5;5;;;;;}",,,"{;0;-4.7;6;25;0}",,,,0,200,0,,,,,,"pPiI"
+ "Sartre.civvie","./vessels/Sartre","Sartre",,"Vessel","SHUTTLE","Andolian Protectorate orbital shuttle","sartre-hud.sprite",8,"no-cockpit",0,0,0,"{sartre.bfxm;;}",,,,,,,4480,4480,91.41,1240,300,300,300,300,300,300,300,300,600,600,,,,,,,20,0,150,2000,120,FALSE,,,300,150,1,4,180000,180000,180000,30,50,60,60000,60000,44000,22231,22231,22231,22231,40,40,FALSE,TRUE,300000000,4,180,25,36000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;jump_drive;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0.8;-5.5;5;;;;;}",,,"{;0;-4.7;6;25;0}","{Raw_Materials/Gases;.7;.2;;2}{Raw_Materials/Hydrocarbons;.8;.2;;2}",,,0,200,0,,,,,,"pPiI"
+-"Bell","./vessels/Bell","Bell",,"Vessel","SUPPORT","Andolian communication vessel","bell-hud.sprite",77,"no-cockpit",0,0,3.5,"{bell.bfxm;;}","bell-shield.bfxm",,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{add_spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.22;0.52;-2.89;0.227;;;;;}{supernova.bmp.bfxm;0.22;0.52;-2.89;0.227;;;;;}{supernova.bmp.bfxm;0.0;0.77;-2.83;0.627;;;;;}{supernova.bmp.bfxm;0.0;0.22;-2.95;0.839;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,"{;0;-0.85;1.5;0.5;0}",,,,0,360,0,,,,,,"pPiI"
+-"Bell.blank","./vessels/Bell","Bell",,"Vessel","SUPPORT","Andolian communication vessel","bell-hud.sprite",77,"no-cockpit",0,0,3.5,"{bell.bfxm;;}","bell-shield.bfxm",,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{add_spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.22;0.52;-2.89;0.227;;;;;}{supernova.bmp.bfxm;0.22;0.52;-2.89;0.227;;;;;}{supernova.bmp.bfxm;0.0;0.77;-2.83;0.627;;;;;}{supernova.bmp.bfxm;0.0;0.22;-2.95;0.839;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,"{;0;-0.85;1.5;0.5;0}",,,,0,360,0,,,,,,"pPiI"
++"Bell","./vessels/Bell","Bell",,"Vessel","SUPPORT","Andolian communication vessel","bell-hud.sprite",77,"no-cockpit",0,0,3.5,"{bell.bfxm;;}","bell-shield.bfxm",,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.22;0.52;-2.89;0.227;;;;;}{supernova.bmp.bfxm;0.22;0.52;-2.89;0.227;;;;;}{supernova.bmp.bfxm;0.0;0.77;-2.83;0.627;;;;;}{supernova.bmp.bfxm;0.0;0.22;-2.95;0.839;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,"{;0;-0.85;1.5;0.5;0}",,,,0,360,0,,,,,,"pPiI"
++"Bell.blank","./vessels/Bell","Bell",,"Vessel","SUPPORT","Andolian communication vessel","bell-hud.sprite",77,"no-cockpit",0,0,3.5,"{bell.bfxm;;}","bell-shield.bfxm",,,,,,336,336,25,500,1,1,1,1,1,1,1,1,0,0,0,0,,,,,0,0,325,,,TRUE,1,,300,120,1,4,50000,50000,50000,45,50,55,17000,17000,15000,4000,4000,4000,4000,125,125,FALSE,FALSE,300000000,4,180,25,2000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,"{armor03;;}{quadshield05;;}{spec_capacitor03;;}{capacitor04;;}{reactor05;;}{jump_drive;;}{skyscope3;;}{ecm_package01;;}","mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;-0.22;0.52;-2.89;0.227;;;;;}{supernova.bmp.bfxm;0.22;0.52;-2.89;0.227;;;;;}{supernova.bmp.bfxm;0.0;0.77;-2.83;0.627;;;;;}{supernova.bmp.bfxm;0.0;0.22;-2.95;0.839;;;;;}","{Disruptor;;;Light;1.01200;-6.80000e-2;3.40800;;;;;;;;;1;1}{Disruptor;;;Light;-0.964000;-6.80000e-2;3.40800;;;;;;;;;1;1}{ParticleBeam;;;Light;0.380000;0.176000;1.07600;;;;;;;;;1;1}{ParticleBeam;;;Light;-0.336000;0.176000;1.07600;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}{;0;48;light-missile medium-missile special-missile;0;0;0;;;;;;;;;1;1}",,"{;0;-0.85;1.5;0.5;0}",,,,0,360,0,,,,,,"pPiI"
+ "Charillus","./vessels/Charillus","Charillus",,"Vessel","SUPPORT",,"Charillus-hud.spr",64,,0,0,0,"{Charillus.bfxm;;}",,,,,,,2500000,2500000,30000,50000,11000,11000,11000,11000,11000,11000,11000,11000,16000,16000,16000,16000,,,,,45,0,25000,2000,200,TRUE,1,,200,120,1,0,2500000,2500000,2500000,25,25,25,50000000,50000000,30000000,5000000,5000000,5000000,5000000,25,25,TRUE,,300000000,5,180,10,8000000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{aeraturretpd;0;0;0;0;0;1;0;1;0;180.0}",";;;;;;","{aeraburn.bfxm;0;0.75;-3.35;1.75;;;;;}{aeraburn.bfxm;0;0.9;-3.15;1.75;;;;;}{aeraburn.bfxm;0.5;0.85;-3.2;1.5;;;;;}{aeraburn.bfxm;0.25;0.85;-3.2;1.5;;;;;}{aeraburn.bfxm;-0.5;0.85;-3.2;1.5;;;;;}{aeraburn.bfxm;-0.25;0.85;-3.2;1.5;;;;;}",,,"{;0;-1.5;0;1;0}","{Raw_Materials/Gases;.7;.2;;2}{Raw_Materials/Hydrocarbons;.8;.2;;2}{Industrially_Manufactured_Goods/Mining;.6;.1;;1}{Fragments;;;100;100}",,,0,600,0,,,,,,"pPiI"
+ "Charillus.blank","./vessels/Charillus","Charillus",,"Vessel","SUPPORT",,"Charillus-hud.spr",64,,0,0,0,"{Charillus.bfxm;;}",,,,,,,2500000,2500000,30000,50000,11000,11000,11000,11000,11000,11000,11000,11000,16000,16000,16000,16000,,,,,45,0,25000,2000,200,TRUE,1,,200,120,1,0,2500000,2500000,2500000,25,25,25,50000000,50000000,30000000,5000000,5000000,5000000,5000000,25,25,TRUE,,300000000,5,180,10,8000000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{aeraburn.bfxm;-1;5.125;-11.25;2;;;;;}",,,"{;0;-1.5;0;1;0}",,,,0,600,0,,,,,,"pPiI"
+ "Cultivator","./vessels/Cultivator","Cultivator",,"Vessel","SUPPORT","Shaper mining/resource gathering vessel","cultivator-hud.sprite",50,,0,0,0,"{cultivator.bfxm;;}",,,,,,,10000000,10000000,169170.04,175000,2300,2300,2300,2300,2300,2300,2300,2300,7500,7500,7500,7500,,,,,20,0,325,4000,60,TRUE,1,,200,120,1,8,5000000,5000000,5000000,8,8,8,60000000,30000000,30000000,5000000,5000000,5000000,5000000,25,25,FALSE,TRUE,300000000,5,180,10,1500000,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretflak;2;-0.54;9;0;0;1;0;1;0;180.0}{turretflak;2;-0.95;9;0;0;1;0;-1;0;180.0}{turretflak;-2;-0.54;9;0;0;1;0;1;0;180.0}{turretflak;-2;-0.95;9;0;0;1;0;-1;0;180.0}",";;;;;;","{supernova.bmp.bfxm;0.115;-0.33;-7.37;0.61;;;;;}{supernova.bmp.bfxm;0.115;-0.67;-7.37;0.61;;;;;}{supernova.bmp.bfxm;0.35;-0.33;-7.37;0.61;;;;;}{supernova.bmp.bfxm;0.35;-0.67;-7.37;0.61;;;;;}{supernova.bmp.bfxm;0.72;-0.33;-7.37;0.61;;;;;}{supernova.bmp.bfxm;0.72;-0.67;-7.37;0.61;;;;;}{supernova.bmp.bfxm;0.955;-0.33;-7.37;0.61;;;;;}{supernova.bmp.bfxm;0.955;-0.67;-7.37;0.61;;;;;}{supernova.bmp.bfxm;-0.235;-0.33;-7.37;0.61;;;;;}{supernova.bmp.bfxm;-0.235;-0.67;-7.37;0.61;;;;;}{supernova.bmp.bfxm;-0.47;-0.33;-7.37;0.61;;;;;}{supernova.bmp.bfxm;-0.47;-0.67;-7.37;0.61;;;;;}{supernova.bmp.bfxm;-0.84;-0.33;-7.37;0.61;;;;;}{supernova.bmp.bfxm;-0.84;-0.67;-7.37;0.61;;;;;}{supernova.bmp.bfxm;-1.075;-0.33;-7.37;0.61;;;;;}{supernova.bmp.bfxm;-1.075;-0.67;-7.37;0.61;;;;;}",,,"{;0;2.9;1.25;3;0}","{Raw_Materials/Gases;.7;.2;;2}{Raw_Materials/Hydrocarbons;.8;.2;;2}{Industrially_Manufactured_Goods/Mining;.6;.1;;1}{Fragments;;;100;100}",,,0,600,0,,,,,,"pPiI"
+@@ -690,10 +690,10 @@
+ "Mule.blank","./vessels/Mule","Mule",,"Vessel","SUPPORT","The most ubiquitous cargo hauler in human space, Mule class vessels are prized for both their dependability, and, because of their number and smallish size, their ease of replacement.","longhaul-hud.spr",1.1,"no-cockpit",0,0,75,"{mule.bfxm;;}","mule_shields.bfxm",,,,,,31500,31500,2333.33,14000,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,400,120,1,8,50000,50000,50000,10,10,10,600000,300000,300000,50000,50000,50000,50000,40,40,FALSE,FALSE,100000,0,0,0,200000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;20.65;7.75;1.0;0;0;0;1;0;180.0}{turretbeam;0;-17;80.75;1.0;0;0;0;-1;0;180.0}",,"{supernova.bmp.bfxm;5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;-5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;-2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;0;-10.65;-74.75;20;;;;;}{supernova.bmp.bfxm;-14.25;-15;-25.5;30;;;;;}{supernova.bmp.bfxm;14.25;-15;-25.5;30;;;;;}","{;;;special autotracking;-4.5;3;32.5;;;;;;;;;1;1}{;;;special autotracking;4.5;3;32.5;;;;;;;;;1;1}{;;;light medium Heavy autotracking;-0;2;30;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;6.5;3;12.5;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;-6.5;3;12.5;;;;;;;;;1;1}{;8;72;special-missile Medium-missile;0;3;2.5;;;;;;;;;1;1}",,"{;30;0;-37;30;0}{;-30;0;-37;30;0}",,,,0,600,0,,,,,,"pPiI"
+ "Mule.civvie","./vessels/Mule","Mule",,"Vessel","SUPPORT","The most ubiquitous cargo hauler in human space, Mule class vessels are prized for both their dependability, and, because of their number and smallish size, their ease of replacement.","longhaul-hud.spr",1.1,"no-cockpit",0,0,75,"{mule.bfxm;;}","mule_shields.bfxm",,,,,,32000,32000,2333.33,14000,825,825,825,825,1000,1000,1000,1000,2300,3000,2000,2000,,,,,30,0,1200,5000,80,TRUE,1,,400,,1,8,60000,60000,60000,10,10,10,600000,300000,300000,50000,50000,50000,50000,40,40,TRUE,TRUE,300000000,4,180,25,200000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;20.65;7.75;1.0;0;0;0;1;0;180.0}{turretbeam;0;-17;80.75;1.0;0;0;0;-1;0;180.0}",,"{supernova.bmp.bfxm;5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;-5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;-2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;0;-10.65;-74.75;20;;;;;}{supernova.bmp.bfxm;-14.25;-15;-25.5;30;;;;;}{supernova.bmp.bfxm;14.25;-15;-25.5;30;;;;;}","{tractor;;;special autotracking;-4.5;3;32.5;;;;;;;;;1;1}{tractor;;;special autotracking;4.5;3;32.5;;;;;;;;;1;1}{MicroDriver;;;light medium Heavy autotracking;-0;2;30;;;;;;;;;1;1}",,"{;30;0;-37;30;0}{;-30;0;-37;30;0}","{Consumer_and_Commercial_Goods/Domestic;1.1;.1;;2}{Consumer_and_Commercial_Goods/Electronics;1.1;.1;;2}{Industrially_Manufactured_Goods/Construction;1.2;.1;;5}{Industrially_Manufactured_Goods/Manufacturing;1.1;.1;;4}{Industrially_Manufactured_Goods/Mining;.6;.1;;1}{Natural_Products/Food;.7;.2;;10}",,,0,600,0,,,,,,"pPiI"
+ "Mule.milspec","./vessels/Mule","Mule",,"Vessel","SUPPORT","The most ubiquitous cargo hauler in human space, Mule class vessels are prized for both their dependability, and, because of their number and smallish size, their ease of replacement.","longhaul-hud.spr",1.1,"no-cockpit",0,0,75,"{mule.bfxm;;}","mule_shields.bfxm",,,,,,32000,32000,2333.33,14000,825,825,825,825,1000,1000,1000,1000,2300,3000,2000,2000,,,,,30,0,1200,5000,80,TRUE,1,,400,,1,8,60000,60000,60000,10,10,10,600000,300000,300000,50000,50000,50000,50000,40,40,TRUE,TRUE,300000000,4,180,25,200000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;20.65;7.75;1.0;0;0;0;1;0;180.0}{turretbeam;0;-17;80.75;1.0;0;0;0;-1;0;180.0}",,"{supernova.bmp.bfxm;5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;-5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;-2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;0;-10.65;-74.75;20;;;;;}{supernova.bmp.bfxm;-14.25;-15;-25.5;30;;;;;}{supernova.bmp.bfxm;14.25;-15;-25.5;30;;;;;}","{tractor;;;special autotracking;-4.5;3;32.5;;;;;;;;;1;1}{tractor;;;special autotracking;4.5;3;32.5;;;;;;;;;1;1}{;;25;light medium Heavy autotracking;-0;2;30;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;6.5;3;12.5;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;-6.5;3;12.5;;;;;;;;;1;1}{;8;72;special-missile Medium-missile;0;3;2.5;;;;;;;;;1;1}",,"{;30;0;-37;30;0}{;-30;0;-37;30;0}",,"{Mule_Milspec_Package;upgrades/Packages/Milspec;200000;1;500;570;1;1;Full-Custom Milspec Configuration;0}",,0,600,0,,,,,,"pPiI"
+-"Mule.stock","./vessels/Mule","Mule",,"Vessel","SUPPORT","The most ubiquitous cargo hauler in human space, Mule class vessels are prized for both their dependability, and, because of their number and smallish size, their ease of replacement.","longhaul-hud.spr",1.1,"no-cockpit",0,0,75,"{mule.bfxm;;}","mule_shields.bfxm",,,,,,31514,31514,2333.33,14000,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,400,120,1,8,50000,50000,50000,10,10,10,600000,300000,300000,50000,50000,50000,50000,40,40,FALSE,FALSE,300000000,4,180,25,200000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;20.65;7.75;1.0;0;0;0;1;0;180.0}{turretbeam;0;-17;80.75;1.0;0;0;0;-1;0;180.0}",,"{supernova.bmp.bfxm;5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;-5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;-2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;0;-10.65;-74.75;20;;;;;}{supernova.bmp.bfxm;-14.25;-15;-25.5;30;;;;;}{supernova.bmp.bfxm;14.25;-15;-25.5;30;;;;;}","{;;;special autotracking;-4.5;3;32.5;;;;;;;;;1;1}{;;;special autotracking;4.5;3;32.5;;;;;;;;;1;1}{;;25;light medium Heavy autotracking;-0;2;30;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;6.5;3;12.5;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;-6.5;3;12.5;;;;;;;;;1;1}{;8;72;special-missile Medium-missile;0;3;2.5;;;;;;;;;1;1}",,"{;30;0;-37;30;0}{;-30;0;-37;30;0}",,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,600,0,,,,,,"pPiI"
++"Mule.stock","./vessels/Mule","Mule",,"Vessel","SUPPORT","The most ubiquitous cargo hauler in human space, Mule class vessels are prized for both their dependability, and, because of their number and smallish size, their ease of replacement.","longhaul-hud.spr",1.1,"no-cockpit",0,0,75,"{mule.bfxm;;}","mule_shields.bfxm",,,,,,31514,31514,2333.33,14000,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,400,120,1,8,50000,50000,50000,10,10,10,600000,300000,300000,50000,50000,50000,50000,40,40,FALSE,FALSE,300000000,4,180,25,200000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;20.65;7.75;1.0;0;0;0;1;0;180.0}{turretbeam;0;-17;80.75;1.0;0;0;0;-1;0;180.0}",,"{supernova.bmp.bfxm;5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;-5;8.5;-76.75;45;;;;;}{supernova.bmp.bfxm;2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;-2.75;-7.375;-76;20;;;;;}{supernova.bmp.bfxm;0;-10.65;-74.75;20;;;;;}{supernova.bmp.bfxm;-14.25;-15;-25.5;30;;;;;}{supernova.bmp.bfxm;14.25;-15;-25.5;30;;;;;}","{;;;special autotracking;-4.5;3;32.5;;;;;;;;;1;1}{;;;special autotracking;4.5;3;32.5;;;;;;;;;1;1}{;;25;light medium Heavy autotracking;-0;2;30;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;6.5;3;12.5;;;;;;;;;1;1}{;15;45;Medium-missile light-missile;-6.5;3;12.5;;;;;;;;;1;1}{;8;72;special-missile Medium-missile;0;3;2.5;;;;;;;;;1;1}",,"{;30;0;-37;30;0}{;-30;0;-37;30;0}",,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,600,0,,,,,,"pPiI"
+ "Ox","./vessels/Ox","Ox",,"Vessel","SUPPORT","A container transport, the Ox is more suited to multi-hop interstellar bulk cargo runs than the smaller mule.","cargoship.spr",1,"no-cockpit",0,0,325,"{ox_new.bfxm;;}",,,,,,,30000000,30000000,169170.04,271000,1000,1000,1000,1000,1000,1000,1000,1000,8000,10000,8000,8000,,,,,15,0,325,5000,80,TRUE,1,,300,120,1,8,5000000,5000000,5000000,5,5,5,60000000,30000000,30000000,5000000,5000000,5000000,5000000,5,5,FALSE,FALSE,300000000,4,180,25,15000000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;98.579;-287.184;0;0;-1;0;1;0;175.0}{turretbeam;0;0;516;0;-1;0;0;0;1;200.0}{turretpd;-27.023;95.026;-287.776;0;0;-1;-0;1;0;175.0}{turretpd;27.023;95.026;-287.776;0;0;-1;0;1;0;175.0}{turretpd;65.001;-65.024;-290.478;0;0;-1;0;-1;0;170.0}{turretpd;-65.001;-65.024;-290.478;0;0;-1;0;-1;0;170.0}",";;;;;;","{supernova.bmp.bfxm;60;90;-370;22;;;;;}{supernova.bmp.bfxm;-60;90;-370;22;;;;;}{supernova.bmp.bfxm;130;-60;-370;22;;;;;}{supernova.bmp.bfxm;0;-60;-370;22;;;;;}{supernova.bmp.bfxm;-130;-60;-370;22;;;;;}",,,"{;0;-24;477;100;0}{;0;58;504;10;0}","{Industrially_Manufactured_Goods/Agricultural;1.2;.1;;7}{Industrially_Manufactured_Goods/Construction;1.2;.1;;5}{Industrially_Manufactured_Goods/Manufacturing;1.1;.1;;4}{Natural_Products/Food;.7;.2;;30}{Specialty_Goods/Medical;1.2;.1;;3}",,,0,600,0,,,,,,"pPiI"
+ "Ox.blank","./vessels/Ox","Ox",,"Vessel","SUPPORT","A container transport, the Ox is more suited to multi-hop interstellar bulk cargo runs than the smaller mule.","cargoship.spr",1,"no-cockpit",0,0,325,"{ox_new.bfxm;;}",,,,,,,29999000,29999000,169170.04,271000,0,0,0,0,0,0,0,0,0,0,0,0,,,,,0,0,25,,,FALSE,1,,300,120,1,8,5000000,5000000,5000000,5,5,5,60000000,30000000,30000000,5000000,5000000,5000000,5000000,5,5,FALSE,FALSE,100000,0,0,0,15000000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;98.579;-287.184;0;0;-1;0;1;0;175.0}{turretbeam;0;0;516;0;-1;0;0;0;1;200.0}{turretpd;-27.023;95.026;-287.776;0;0;-1;-0;1;0;175.0}{turretpd;27.023;95.026;-287.776;0;0;-1;0;1;0;175.0}{turretpd;65.001;-65.024;-290.478;0;0;-1;0;-1;0;170.0}{turretpd;-65.001;-65.024;-290.478;0;0;-1;0;-1;0;170.0}",";;;;;;","{supernova.bmp.bfxm;60;90;-370;22;;;;;}{supernova.bmp.bfxm;-60;90;-370;22;;;;;}{supernova.bmp.bfxm;130;-60;-370;22;;;;;}{supernova.bmp.bfxm;0;-60;-370;22;;;;;}{supernova.bmp.bfxm;-130;-60;-370;22;;;;;}",,,"{;0;-24;477;100;0}{;0;58;504;10;0}",,,,0,600,0,,,,,,"pPiI"
+-"Ox.stock","./vessels/Ox","Ox",,"Vessel","SUPPORT","A container transport, the Ox is more suited to multi-hop interstellar bulk cargo runs than the smaller mule.","cargoship.spr",1,"no-cockpit",0,0,325,"{ox_new.bfxm;;}",,,,,,,29999014,29999014,169170.04,271000,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,8,5000000,5000000,5000000,5,5,5,60000000,30000000,30000000,5000000,5000000,5000000,5000000,5,5,FALSE,FALSE,300000000,4,180,25,15000000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;98.579;-287.184;0;0;-1;0;1;0;175.0}{turretbeam;0;0;516;0;-1;0;0;0;1;200.0}{turretpd;-27.023;95.026;-287.776;0;0;-1;-0;1;0;175.0}{turretpd;27.023;95.026;-287.776;0;0;-1;0;1;0;175.0}{turretpd;65.001;-65.024;-290.478;0;0;-1;0;-1;0;170.0}{turretpd;-65.001;-65.024;-290.478;0;0;-1;0;-1;0;170.0}",";;;;;;","{supernova.bmp.bfxm;60;90;-370;22;;;;;}{supernova.bmp.bfxm;-60;90;-370;22;;;;;}{supernova.bmp.bfxm;130;-60;-370;22;;;;;}{supernova.bmp.bfxm;0;-60;-370;22;;;;;}{supernova.bmp.bfxm;-130;-60;-370;22;;;;;}",,,"{;0;-24;477;100;0}{;0;58;504;10;0}",,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{add_spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,600,0,,,,,,"pPiI"
++"Ox.stock","./vessels/Ox","Ox",,"Vessel","SUPPORT","A container transport, the Ox is more suited to multi-hop interstellar bulk cargo runs than the smaller mule.","cargoship.spr",1,"no-cockpit",0,0,325,"{ox_new.bfxm;;}",,,,,,,29999014,29999014,169170.04,271000,1,1,1,1,1,1,1,1,75,75,75,75,,,,,4,0,325,100,15,FALSE,1,,300,120,1,8,5000000,5000000,5000000,5,5,5,60000000,30000000,30000000,5000000,5000000,5000000,5000000,5,5,FALSE,FALSE,300000000,4,180,25,15000000,,,,,,,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1","{turretbeam;0;98.579;-287.184;0;0;-1;0;1;0;175.0}{turretbeam;0;0;516;0;-1;0;0;0;1;200.0}{turretpd;-27.023;95.026;-287.776;0;0;-1;-0;1;0;175.0}{turretpd;27.023;95.026;-287.776;0;0;-1;0;1;0;175.0}{turretpd;65.001;-65.024;-290.478;0;0;-1;0;-1;0;170.0}{turretpd;-65.001;-65.024;-290.478;0;0;-1;0;-1;0;170.0}",";;;;;;","{supernova.bmp.bfxm;60;90;-370;22;;;;;}{supernova.bmp.bfxm;-60;90;-370;22;;;;;}{supernova.bmp.bfxm;130;-60;-370;22;;;;;}{supernova.bmp.bfxm;0;-60;-370;22;;;;;}{supernova.bmp.bfxm;-130;-60;-370;22;;;;;}",,,"{;0;-24;477;100;0}{;0;58;504;10;0}",,"{skyscope1;upgrades/Sensors/Common;200;1;0.01;1;1;1;;0}{capacitor01;upgrades/Capacitors/Standard;200;1;2;2;1;1;;0}{reactor01;upgrades/Reactors/Standard;200;1;1;2;1;1;;0}{spec_capacitor01;upgrades/SPEC_Capacitors;200;1;5;4;1;1;;0}{quadshield01;upgrades/Shield_Systems/Standard_Quad_Shields;200;1;1;4;1;1;;0}",,0,600,0,,,,,,"pPiI"
+ "Quicksilver","./vessels/Quicksilver","Quicksilver",,"Vessel","SUPPORT","Confederation courier ship","quicksilver-hud.sprite",1.5,"no-cockpit",0,0,0,"{quicksilver.bfxm;;}",,,,,,,33.6,33.6,3.5,90,1,1,1,1,1,1,1,1,25,25,25,25,,,,,2,0,325,100,10,TRUE,1,,300,120,1,4,50000,50000,50000,45,45,55,18000,18000,14000,4000,4000,4000,4000,305,305,FALSE,FALSE,300000000,4,180,25,10,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade;mult_shady_morethrust;mult_shady_moreshields;mult_shady_moregunrecharge;mult_shady_moreshieldrecharge;mult_shady_moreturning;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{heatseeker;8;24;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+ "Quicksilver.blank","./vessels/Quicksilver","Quicksilver","MANEUVOUR","Vessel","SUPPORT","Confederation courier ship","quicksilver-hud.sprite",1.5,"no-cockpit",0,0,0,"{quicksilver.bfxm;;}",,,,,,,33.6,33.6,3.5,90,0,0,0,0,0,0,0,0,0,0,0,0,,,,,2,0,25,,,FALSE,1,,300,120,1,4,50000,50000,50000,80,80,100,18000,18000,14000,4000,4000,4000,400,305,305,FALSE,FALSE,100000,0,0,0,10,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}","{;8;24;light-missile medium-missile heavy-missile;0;-.13;2;;;;;;;;;1;1}",,,,,,0,125,0,,,,,,"pPiI"
+ "Quicksilver.civvie","./vessels/Quicksilver","Quicksilver",,"Vessel","SUPPORT","Confederation courier ship","quicksilver-hud.sprite",1.5,"no-cockpit",0,0,0,"{quicksilver.bfxm;;}",,,,,,,33.6,33.6,3.5,90,1,1,1,1,1,1,1,1,25,25,25,25,,,,,2,0,325,100,10,TRUE,1,,300,120,1,4,50000,50000,50000,45,45,55,18000,18000,14000,4000,4000,4000,4000,305,305,FALSE,FALSE,300000000,4,180,25,10,,,,,0,0,0,0,0,"1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1","1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1",1,1,1,1,1,1,1,1,0,0,,,,"mult_shady_moreupgrade:1;mult_shady_morethrust:1;mult_shady_moreshields:1;mult_shady_moregunrecharge:1;mult_shady_moreshieldrecharge:1;mult_shady_moreturning:1;upgrades/Overdrive:1;upgrades/Capacitors:1;upgrades/Reactors:1;upgrades/Armor:1;upgrades/Sensors:1;upgrades/Shield_Systems:1;upgrades/Passenger_Quarters:1;upgrades/Repair_Systems:1;upgrades/ECM_Systems:1",,";;;;;;","{supernova.bmp.bfxm;0;0;-6.36800;4;;;;;}",,,,,,,0,125,0,,,,,,"pPiI"
diff --git a/games/vegastrike/slack-desc b/games/vegastrike/slack-desc
index 3e5629d092..b6a853fd3a 100644
--- a/games/vegastrike/slack-desc
+++ b/games/vegastrike/slack-desc
@@ -8,12 +8,12 @@
           |-----handy-ruler------------------------------------------------------|
 vegastrike: vegastrike (free, Elite-like space simulator)
 vegastrike:
-vegastrike: Vegastrike is an Open Source 3D Action-Space-Sim that 
-vegastrike: lets you trade, fight, and explore in a vast universe. 
+vegastrike: Vegastrike is an Open Source 3D Action-Space-Sim that
+vegastrike: lets you trade, fight, and explore in a vast universe.
 vegastrike:
+vegastrike: Homepage: http://vegastrike.sourceforge.net
 vegastrike:
 vegastrike:
-vegastrike: Homepage: http://vegastrike.sourceforge.net
 vegastrike:
 vegastrike:
 vegastrike:
diff --git a/games/vegastrike/vegastrike.SlackBuild b/games/vegastrike/vegastrike.SlackBuild
index 462af92053..77f7eebd21 100644
--- a/games/vegastrike/vegastrike.SlackBuild
+++ b/games/vegastrike/vegastrike.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=vegastrike
 VERSION=${VERSION:-0.5.1.r1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 PRGSRCSUF=${PRGSRCSUF:-.tar.bz2}
@@ -84,7 +84,9 @@ tar xvf $CWD/$PRGSRCNAME$PRGSRCSUF
 
 cd $PRGSRCNAME
 
-patch -p0 < $CWD/patch-$VERSION
+declare patchdir="$CWD/patches"
+
+patch -p0 < "$patchdir/patch-${VERSION}_$BUILD"
 
 BUILDDIR=build
 mkdir -p $BUILDDIR
@@ -110,6 +112,7 @@ cmake \
 	-DCMAKE_INSTALL_MANDIR=/usr/man \
 	-DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
 	-DCMAKE_SYSTEM_PROCESSOR=$ARCH \
+	-DDISABLE_SERVER=${DISABLE_SERVER:-ON} \
 	..
 
 make
@@ -128,16 +131,34 @@ objconvdir=$vsbasedir/objconv
 
 mkdir -p $vsbasedir $bindir $objconvdir
 
-for f in ./build/objconv/asteroidgen ./build/objconv/replace ./build/objconv/trisort ./build/vegaserver ./build/vegastrike ./build/setup/vssetup;do
-	cp $f $bindir
+for f in ./build/vegaserver ./build/vegastrike ./build/setup/vssetup;do
+	if [[ -e "$f" ]];then
+		chmod +x $f
+		cp $f $bindir
+	fi
 done
 
-for f in ./objconv/3ds2xml ./objconv/obj2xml ./objconv/wcp2xml;do
-	chmod -x $f
-	cp $f $objconvdir
+for f in ./build/objconv/asteroidgen ./build/objconv/replace ./build/objconv/trisort ./build/objconv/mesh_tool ;do
+	if [[ -e "$f" ]];then
+		chmod +x $f
+		cp $f $objconvdir
+	fi
 done
 
 tar xvf $CWD/$PRGDATANAME$PRGDATASUF
+
+PARTSFIX=${PARTSFIX:-YES}
+
+case ${PARTSFIX^^} in
+Y|YES|T|TRUE|ON|1)
+	cd $PRGDATANAME
+	patch -p0 < "$patchdir/patch_partsfix-${VERSION}_$BUILD"
+	cd -
+	;;
+*)
+	;;
+esac
+
 mv $PRGDATANAME $vsdatadir
 
 tar xvf $CWD/$PRGEXTRANAME$PRGEXTRASUF
@@ -171,3 +192,4 @@ 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/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/virtualjaguar-libretro/virtualjaguar-libretro.info b/games/virtualjaguar-libretro/virtualjaguar-libretro.info
index 31d220802c..138e8b57ec 100644
--- a/games/virtualjaguar-libretro/virtualjaguar-libretro.info
+++ b/games/virtualjaguar-libretro/virtualjaguar-libretro.info
@@ -6,5 +6,5 @@ MD5SUM="5ef19efa102a4410d78da6accecacf21"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="RetroArch"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere.com"
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/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild
index c9f033a488..9aa0274c11 100644
--- a/games/warzone2100/warzone2100.SlackBuild
+++ b/games/warzone2100/warzone2100.SlackBuild
@@ -23,8 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200811 bkw: fix various issues on behalf of the SBo team:
+# - man pages were in /usr/share/man
+# - old source wasn't being deleted before extraction
+# - removed "-GNinja" from cmake command line: unnecessary, and adds a
+#   dependency on ninja (which wasn't listed in the .info file)
+# - got rid of unneeded template code (no perllocal.pod gets installed)
+# - move binary to /usr/games (since it has a section 6 man page)
+
 PRGNAM=warzone2100
-VERSION=${VERSION:-3.3.0}
+VERSION=${VERSION:-3.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,16 +50,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
 
@@ -60,7 +68,8 @@ set -e
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-${VERSION}_src.tar.?z
+rm -rf $PRGNAM
+tar xvf $CWD/${PRGNAM}_src.tar.?z
 cd $PRGNAM
 chown -R root:root .
 find -L . \
@@ -69,35 +78,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-./autogen.sh
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -fpermissive" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-distributor=Slackware \
-  --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
-
-find $PKG -name perllocal.pod \
-  -o -name ".packlist" \
-  -o -name "*.bs" \
-  | xargs rm -f
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_BINDIR=games \
+    ..
+  DESTDIR=$PKG cmake --build . --target install
+cd ..
 
 # Let's not pollute the themed icon directory
 mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
 
 # --docdir= above works :)
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/share/doc/$PRGNAM/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/warzone2100/warzone2100.info b/games/warzone2100/warzone2100.info
index 098af855c7..91fde3557c 100644
--- a/games/warzone2100/warzone2100.info
+++ b/games/warzone2100/warzone2100.info
@@ -1,10 +1,10 @@
 PRGNAM="warzone2100"
-VERSION="3.3.0"
+VERSION="3.4.1"
 HOMEPAGE="http://wz2100.net"
-DOWNLOAD="https://downloads.sourceforge.net/project/warzone2100/releases/3.3.0/warzone2100-3.3.0_src.tar.xz"
-MD5SUM="665f03234b4a5e1be69eb71d1da2a1bc"
+DOWNLOAD="https://github.com/Warzone2100/warzone2100/releases/download/3.4.1/warzone2100_src.tar.xz"
+MD5SUM="f538187f6ffdd6cfd0c660d45f3f2238"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="OpenAL physfs SDL2 qt5"
+REQUIRES="OpenAL physfs SDL2 qt5 libsodium"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"
diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild
index 23a024bb32..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.11}
+VERSION=${VERSION:-1.14.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/wesnoth/wesnoth.info b/games/wesnoth/wesnoth.info
index cf9cd4e925..0ed9cd9009 100644
--- a/games/wesnoth/wesnoth.info
+++ b/games/wesnoth/wesnoth.info
@@ -1,8 +1,8 @@
 PRGNAM="wesnoth"
-VERSION="1.14.11"
+VERSION="1.14.15"
 HOMEPAGE="http://www.wesnoth.org"
-DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.14.11.tar.bz2"
-MD5SUM="193b3900f65e4cce7fbf2893f2baf18a"
+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/wolf4sdl/wolf4sdl.info b/games/wolf4sdl/wolf4sdl.info
index 8a2277bd90..67fbbd21e6 100644
--- a/games/wolf4sdl/wolf4sdl.info
+++ b/games/wolf4sdl/wolf4sdl.info
@@ -1,7 +1,7 @@
 PRGNAM="wolf4sdl"
 VERSION="1.7"
 HOMEPAGE="https://github.com/mozzwald/wolf4sdl"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/Wolf4SDL-1.7-src.zip \
+DOWNLOAD="https://slackware.uk/~urchlay/src/Wolf4SDL-1.7-src.zip \
           http://downloads.sourceforge.net/project/wolfgl/Data/Demo/wolfdata.zip \
           http://downloads.sourceforge.net/project/wolfgl/Data/Demo/sdmdata.zip"
 MD5SUM="303f340598bfbe3440523c1ddb9f52e8 \
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/worldofpadman/README b/games/worldofpadman/README
index c92140fcbd..ef277f01bf 100644
--- a/games/worldofpadman/README
+++ b/games/worldofpadman/README
@@ -1,9 +1,10 @@
-World of Padman (WoP) is an open source first-person shooter video game 
-available in both English and German. Originally it was a modification for the 
-game Quake III Arena titled PadMod created in the year 2004. After the source 
-code for Quake III Arena was released, the game became standalone.[1] The idea 
-is based on the Padman comic strip for the magazine PlayStation Games created 
-by the professional cartoon artist Andreas 'ENTE' (German for "Duck") Endres, 
-who is also the man who made many of the maps included with the game in 1998. 
-The current version runs on an enhanced version of the ioquake3 engine, which 
-is based on the Quake III Arena engine.
+World of Padman (WoP) is an open source first-person shooter video
+game available in both English and German. Originally it was a
+modification for the game Quake III Arena titled PadMod created in the
+year 2004. After the source code for Quake III Arena was released, the
+game became standalone.[1] The idea is based on the Padman comic strip
+for the magazine PlayStation Games created by the professional cartoon
+artist Andreas 'ENTE' (German for "Duck") Endres, who is also the man
+who made many of the maps included with the game in 1998.  The current
+version runs on an enhanced version of the ioquake3 engine, which is
+based on the Quake III Arena engine.
diff --git a/games/worldofpadman/worldofpadman.SlackBuild b/games/worldofpadman/worldofpadman.SlackBuild
index d9e8c02e62..088234b464 100644
--- a/games/worldofpadman/worldofpadman.SlackBuild
+++ b/games/worldofpadman/worldofpadman.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for worldofpadman
 
-# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
+# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
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/xu4/README-SBo.txt b/games/xu4/README-SBo.txt
index 480d3aff27..0554d13278 100644
--- a/games/xu4/README-SBo.txt
+++ b/games/xu4/README-SBo.txt
@@ -48,7 +48,7 @@ you should install the PDF manuals. To do this, download the file
 ultima4_scanned_docs.zip and place it in the SlackBuild directory,
 before running the script.
 
-URL: http://urchlay.naptime.net/slackstuff/src/ultima4_scanned_docs.zip
+URL: https://slackware.uk/~urchlay/src/ultima4_scanned_docs.zip
 md5sum: c6be37b7028d6f7b56843a73517a5c31
 
 The PDF docs aren't listed in the .info file because they're fairly large,
diff --git a/games/xu4/xu4.info b/games/xu4/xu4.info
index dd86891286..7c0e1d4661 100644
--- a/games/xu4/xu4.info
+++ b/games/xu4/xu4.info
@@ -1,7 +1,7 @@
 PRGNAM="xu4"
 VERSION="20130612_svn"
 HOMEPAGE="http://xu4.sourceforge.net/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/xu4-20130612_svn.tar.xz \
+DOWNLOAD="https://slackware.uk/~urchlay/src/xu4-20130612_svn.tar.xz \
           http://www.thatfleminggent.com/ultima/ultima4.zip"
 MD5SUM="a0c013bf91458b2b4c5ad8c729990d62 \
         f2006a5dbf175571912ef2594b6eb900"
diff --git a/games/yae/yae.info b/games/yae/yae.info
index b9758299de..9b22d875a6 100644
--- a/games/yae/yae.info
+++ b/games/yae/yae.info
@@ -2,7 +2,7 @@ PRGNAM="yae"
 VERSION="0.7"
 HOMEPAGE="https://sourceforge.net/projects/yae-gpl/"
 DOWNLOAD="https://downloads.sourceforge.net/project/yae-gpl/yae-gpl/yae-0.7/yae-0.7.tgz \
-          http://urchlay.naptime.net/~urchlay/src/yae-roms.tar.gz"
+          https://slackware.uk/~urchlay/src/yae-roms.tar.gz"
 MD5SUM="4c8b1d40f1ad7dc451f3679466d9e6cf \
         e816c4e83cf302030dc2da8d84ab745b"
 DOWNLOAD_x86_64=""
diff --git a/games/yamagi-quake2/yamagi-quake2.info b/games/yamagi-quake2/yamagi-quake2.info
index ff06960f48..808c3cfa36 100644
--- a/games/yamagi-quake2/yamagi-quake2.info
+++ b/games/yamagi-quake2/yamagi-quake2.info
@@ -12,5 +12,5 @@ MD5SUM="73355f0774302a7f498de09ae54e80d5 \
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="Ruoh-Shoei Lin"
+EMAIL="lin.ruohshoei@gmail.com"
diff --git a/games/yarntown/README b/games/yarntown/README
new file mode 100644
index 0000000000..19001eeafa
--- /dev/null
+++ b/games/yarntown/README
@@ -0,0 +1,5 @@
+Yarntown is a 2D hommage to Bloodborne, a dark fantasy video game
+released on Playstation 4 in 2015. Bloodborne is as renowned for its
+demanding and merciless gameplay as for its incredible gothico-victorian
+atmosphere. This quest recreates only a part of the original game,
+because this is just a little side project.
diff --git a/games/yarntown/doinst.sh b/games/yarntown/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/games/yarntown/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/games/yarntown/install.patch b/games/yarntown/install.patch
new file mode 100644
index 0000000000..7c0222c848
--- /dev/null
+++ b/games/yarntown/install.patch
@@ -0,0 +1,397 @@
+From d335e5562c3b2d405a1b7c1b116a0f2333cd9389 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 28 Aug 2020 09:45:43 -0700
+Subject: [PATCH 1/4] Add a desktop file.
+
+---
+ yarntown.desktop | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 yarntown.desktop
+
+diff --git a/yarntown.desktop b/yarntown.desktop
+new file mode 100644
+index 0000000..c2827d6
+--- /dev/null
++++ b/yarntown.desktop
+@@ -0,0 +1,9 @@
++[Desktop Entry]
++Name=Yarntown
++GenericName=Yarntown game for the Solarus engine
++Comment=Yarntown (2D hommage to Bloodborne)
++Exec=yarntown
++Terminal=false
++Type=Application
++Icon=yarntown
++Categories=Game;AdventureGame;
+-- 
+GitLab
+
+
+From 959930c05781c13971945a81698a55e341771f06 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 29 Aug 2020 13:47:39 -0700
+Subject: [PATCH 2/4] Add a .gitignore.
+
+---
+ .gitignore | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 .gitignore
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..b37f35a
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,2 @@
++*.solarus
++yarntown
+-- 
+GitLab
+
+
+From ee5635b327b883486051d92be381a5202f0774ac Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 1 Sep 2020 07:00:47 -0700
+Subject: [PATCH 3/4] Add the quest version to quest.dat.
+
+---
+ data/quest.dat | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/quest.dat b/data/quest.dat
+index f97b633..bf7ff4c 100644
+--- a/data/quest.dat
++++ b/data/quest.dat
+@@ -6,7 +6,7 @@ quest{
+   long_description = [[
+ ]],
+   author = "Max Mraz",
+-  quest_version = "",
++  quest_version = "1.0.6",
+   release_date = "",
+   website = "",
+   normal_quest_size = "416x240",
+-- 
+GitLab
+
+
+From 9bf2149bd137d14940ca451b1976f26f15b650d3 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 29 Aug 2020 11:24:27 -0700
+Subject: [PATCH 4/4] Add a install.sh posix script.
+
+---
+ INSTALL    |  68 ++++++++++++++++
+ install.sh | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 293 insertions(+)
+ create mode 100644 INSTALL
+ create mode 100755 install.sh
+
+diff --git a/INSTALL b/INSTALL
+new file mode 100644
+index 0000000..cc12b3d
+--- /dev/null
++++ b/INSTALL
+@@ -0,0 +1,68 @@
++install.sh is a POSIX sh script known to work with the following shells:
++
++  ash
++  dash
++  bash
++  ksh
++  loksh
++  mksh
++  pdksh
++  posh (0.14.1 or newer)
++  oksh
++  yash
++  zsh
++
++install.sh accepts the following arguments as targets:
++
++build - Generates the solarus.data archive and the executable script.
++clean - Removes the solarus.data archive and the executable script.
++install - Installs the solarus.data archive and executable script.
++install-assets - Installs the docs, icons and desktop file.
++uninstall - Uninstalls all installed files.
++
++The build, clean and install targets can customize the name of the data
++archive.
++
++  DATANAME - Name of the solarus data archive (data.solarus)
++
++Additionally the following arguments can be passed to the install
++and uninstall targets to configure the install paths.
++
++  PREFIX - Install path prefix (/usr/local)
++  BINDIR - Binary install directory (PREFIX/bin)
++  DOCDIR - Documentation install directory (PREFIX/share/doc)
++  MANDIR - Manpage install directory (PREFIX/share/man)
++  DATADIR - Read-only data install directory (DATAROOTDIR)
++  DATAROOTDIR -  Read-only data root install directory (PREFIX/share)
++  SYSCONFDIR - Read-only data install directory (PREFIX/etc)
++
++The configurable install directories can be either absolute or relative
++paths. If they are set as relative paths the value of PREFIX will be
++prepended to the install directory. For example if MANDIR is set to
++'man' man pages will be installed to '/usr/local/man/' instead of
++'/usr/local/share/man/'.
++
++By design install.sh will not use any set environment variables and all
++configuration must be passed explicitly as arguments.
++
++EXAMPLES
++
++  ./install.sh install PREFIX=/usr DESTDIR=/tmp
++
++      Installs to '/tmp/usr/'.
++
++  ./install.sh uninstall PREFIX=/usr DESTDIR=/tmp
++
++      Uninstalls from '/tmp/usr/'.
++
++  ./install.sh install DOCDIR=/usr/local/doc
++
++      Installs documentation to '/usr/local/doc/$PRGNAM-$VERSION'.
++
++  ./install.sh install MANDIR=man
++
++      Installs man pages to '$PREFIX/man/man1/'.
++
++  ./install.sh install SYSCONFDIR=/etc
++
++      Installs read-only data to '/etc/'.
+diff --git a/install.sh b/install.sh
+new file mode 100755
+index 0000000..9cc10da
+--- /dev/null
++++ b/install.sh
+@@ -0,0 +1,225 @@
++#!/bin/sh
++# Install script for yarntown.
++
++# Copyright 2017-2020 orbea
++# 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.
++
++# IFS is <space><tab><newline>
++IFS=' 	
++'
++\unset -f command printf unalias : 2>/dev/null
++\unalias -a 2>/dev/null
++PATH="$(command -p getconf PATH):$PATH"
++LC_ALL=C; export LC_ALL
++
++set -euf
++
++die () {
++  ret="$1"; shift
++  case "$ret" in
++    : ) printf %s\\n "$@" >&2; return 0 ;;
++    0 ) printf %s\\n "$@" ;;
++    * ) printf %s\\n "$@" >&2 ;;
++  esac
++  exit "$ret"
++}
++
++case "${1:-}" in
++  install-assets ) INSTALL=4 ;;
++  clean ) INSTALL=3 ;;
++  build ) INSTALL=2 ;;
++  install ) INSTALL=1 ;;
++  uninstall ) INSTALL=0 ;;
++  '' ) die 1 'No install target.' ;;
++  * ) die 1 "No rule to install target '$1'." ;;
++esac
++
++cmd () {
++  print=
++  for command do
++    case "$command" in
++      -- ) : ;;
++      */* ) print="${print} '$command'" ;;
++      * ) print="${print} $command" ;;
++    esac
++  done
++  printf " %s\\n" "$print"
++  command -p "$@"
++}
++
++is_absolute () { case "$1" in /*) return 0 ;; *) return 1 ;; esac; }
++
++PREFIX=; BINDIR=; DATADIR=; DATANAME=; DATAROOTDIR=; DOCDIR=; MANDIR=
++SYSCONFDIR=; DESTDIR=
++
++CWD="$(pwd)"
++
++if [ "$0" != "${0%/*}" ]; then
++  SOURCE_DIR="$(cd -- "${0%/*}/" && pwd -P)"
++else
++  SOURCE_DIR="$(pwd -P)"
++fi
++
++quest_version="$(grep quest_version "$SOURCE_DIR"/data/quest.dat)"
++quest_version="${quest_version%\"*}"
++
++PRGNAM=yarntown
++VERSION="${quest_version#*\"}"
++
++shift
++
++install_args=
++
++while [ $# -gt 0 ]; do
++  arg="$1"; shift
++  case "${arg%%=*}" in
++    DATANAME|DESTDIR|PREFIX )
++      eval "${arg%%=*}=\"\${arg#*=}\""
++    ;;
++    BINDIR|DATADIR|DATAROOTDIR|DOCDIR|MANDIR|SYSCONFDIR )
++      install_args=1
++      eval "${arg%%=*}=\"\${arg#*=}\""
++    ;;
++    * )
++      die : "WARNING: Variable '${arg%%=*}' was not used by $PRGNAM."
++    ;;
++  esac
++done
++
++PREFIX="${PREFIX:-/usr/local}"
++BINDIR="${BINDIR:-${PREFIX}/bin}"
++DOCDIR="${DOCDIR:-${PREFIX}/share/doc}/$PRGNAM-$VERSION"
++MANDIR="${MANDIR:-${PREFIX}/share/man}"
++DATANAME="${DATANAME:-data.solarus}"
++DATAROOTDIR="${DATAROOTDIR:-${PREFIX}/share}"
++DATADIR="${DATADIR:-${DATAROOTDIR}}/solarus/$PRGNAM"
++SYSCONFDIR="${SYSCONFDIR:-${PREFIX}/etc}"
++DESTDIR="${DESTDIR:-}"
++
++is_absolute "$PREFIX" || PREFIX="$CWD/$PREFIX"
++
++if [ -n "$install_args" ]; then
++  for i in \$BINDIR \$DATADIR \$DATAROOTDIR \$DOCDIR \$MANDIR \$SYSCONFDIR; do
++    eval "dest=\"$i\""
++    is_absolute "${dest:?}" || eval "${i#*$}=\"\${PREFIX}/$i\""
++  done
++fi
++
++####################
++### Project Code ###
++####################
++
++build_bin () {
++  command -p rm -f -- "$CWD/$PRGNAM"
++  printf 'Generating %s script...\n' "$PRGNAM"
++  printf '#!/bin/sh\nsolarus-run %s "$@"\n' "$DATADIR" > "$CWD/$PRGNAM"
++}
++
++build_data () {
++  command -p rm -f -- "$CWD/$DATANAME"
++  printf 'Generating %s...\n' "$DATANAME"
++  (
++    cd -- "${SOURCE_DIR}"/data/
++    command -p find . -type f \( \
++      -name '*.spc' -o \
++      -name '*.ogg' -o \
++      -name '*.it'  -o \
++      -name '*.png' -o \
++      -name '*.dat' -o \
++      -name '*.lua' -o \
++      -name '*.ttf' -o \
++      -name '*.ttc' -o \
++      -name '*.fon' -o \
++      -name '*.glsl'   \
++    \) -exec zip -9 -q "$CWD/$DATANAME" {} +
++  )
++}
++
++icon_sizes='16 32 64 128 256 512 1024'
++
++case $INSTALL in
++  # install-assets
++  4 )
++    printf 'Installing assets...\n'
++    cmd mkdir -p -- "${DESTDIR}${DATAROOTDIR}/applications"
++    cmd mkdir -p -- "${DESTDIR}${DATAROOTDIR}/pixmaps"
++    cmd mkdir -p -- "${DESTDIR}${DOCDIR}"
++    cmd rm -f -- "${DESTDIR}${DOCDIR}/credits.txt"
++    cmd cp -- "${SOURCE_DIR}/credits.txt" "${DESTDIR}${DOCDIR}"
++    cmd rm -f -- "${DESTDIR}${DOCDIR}/readme.md"
++    cmd cp -- "${SOURCE_DIR}/readme.md" "${DESTDIR}${DOCDIR}"
++    cmd rm -f -- "${DESTDIR}${DATAROOTDIR}/applications/$PRGNAM.desktop"
++    cmd cp -- "${SOURCE_DIR}/$PRGNAM.desktop" \
++      "${DESTDIR}${DATAROOTDIR}/applications"
++    cmd rm -f -- "${DESTDIR}${DATAROOTDIR}/pixmaps/$PRGNAM.png"
++    cmd cp -- "${SOURCE_DIR}/data/logos/logo.png" \
++      "${DESTDIR}${DATAROOTDIR}/pixmaps/$PRGNAM.png"
++
++    eval "set -- $icon_sizes"
++    for icon do
++      icon_dir="${DESTDIR}${DATAROOTDIR}/icons/hicolor/${icon}x${icon}/apps"
++      cmd mkdir -p -- "$icon_dir"
++      cmd rm -f -- "$icon_dir/$PRGNAM.png"
++      cmd cp -- "${SOURCE_DIR}/medias/icon/icon_$icon.png" \
++        "$icon_dir/$PRGNAM.png"
++    done
++  ;;
++  # clean
++  3 )
++    printf 'Removing %s...\n' "$DATANAME"
++    cmd rm -f -- "$CWD/$DATANAME"
++    cmd rm -f -- "$CWD/$PRGNAM"
++  ;;
++  # build
++  2 )
++    build_data
++    build_bin
++  ;;
++  # install
++  1 )
++    [ -f "$CWD/$DATANAME" ] || build_data
++    [ -f "$CWD/$PRGNAM" ] || build_bin
++    printf 'Installing...\n'
++    cmd mkdir -p -- "${DESTDIR}${BINDIR}"
++    cmd mkdir -p -- "${DESTDIR}${DATADIR}"
++    cmd rm -f -- "${DESTDIR}${BINDIR}/$PRGNAM"
++    cmd cp -- "$CWD/$PRGNAM" "${DESTDIR}${BINDIR}"
++    cmd rm -f -- "${DESTDIR}${DATADIR}/$DATANAME"
++    cmd cp -- "$CWD/$DATANAME" "${DESTDIR}${DATADIR}"
++    cmd chmod 0755 -- "${DESTDIR}${BINDIR}/$PRGNAM"
++  ;;
++  # uninstall
++  0 )
++    printf 'Uninstalling...\n'
++    cmd rm -rf -- "${DESTDIR}${DOCDIR}"
++    cmd rm -rf -- "${DESTDIR}${DATADIR}"
++    cmd rm -f -- "${DESTDIR}${BINDIR}/$PRGNAM"
++    cmd rm -f -- "${DESTDIR}${DATAROOTDIR}/applications/$PRGNAM.desktop"
++    cmd rm -f -- "${DESTDIR}${DATAROOTDIR}/pixmaps/$PRGNAM.png"
++
++    eval "set -- $icon_sizes"
++    for icon do
++      icon_dir="${DESTDIR}${DATAROOTDIR}/icons/hicolor/${icon}x${icon}/apps"
++      cmd rm -f -- "$icon_dir/$PRGNAM.png"
++    done
++  ;;
++esac
++
++exit 0
+-- 
+GitLab
+
diff --git a/games/yarntown/slack-desc b/games/yarntown/slack-desc
new file mode 100644
index 0000000000..c7f4dd7813
--- /dev/null
+++ b/games/yarntown/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------------------------------------------------------|
+yarntown: yarntown (2D hommage to Bloodborne for the solarus engine)
+yarntown:
+yarntown: You've come on the night of the hunt. The streets of this cursed,
+yarntown: gothic town are overrun with beasts, and what has become of the men
+yarntown: who tried to hunt them before. Explore the twisting roads, go toe to
+yarntown: toe with powerful foes, and uncover Yarntown's dark secrets.
+yarntown:
+yarntown: Homeage: https://gitlab.com/maxmraz/yarntown
+yarntown:
+yarntown:
+yarntown:
diff --git a/games/yarntown/yarntown.SlackBuild b/games/yarntown/yarntown.SlackBuild
new file mode 100644
index 0000000000..da93cea13f
--- /dev/null
+++ b/games/yarntown/yarntown.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# Slackware build script for Yarntown
+
+# 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=yarntown
+VERSION=${VERSION:-1.0.6}
+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-v$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 \
+  -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 {} \;
+
+# Add an install script and desktop file.
+# https://gitlab.com/maxmraz/yarntown/-/merge_requests/4
+patch -p1 < $CWD/install.patch
+
+mkdir -p build
+(
+  cd build
+  ../install.sh install \
+    PREFIX=/usr \
+    BINDIR=games \
+    DATADIR=share/games \
+    DESTDIR="$PKG"
+
+  ../install.sh install-assets \
+    PREFIX=/usr \
+    DOCDIR=doc \
+    DESTDIR="$PKG"
+)
+
+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/games/yarntown/yarntown.info b/games/yarntown/yarntown.info
new file mode 100644
index 0000000000..cbe570e3a3
--- /dev/null
+++ b/games/yarntown/yarntown.info
@@ -0,0 +1,10 @@
+PRGNAM="yarntown"
+VERSION="1.0.6"
+HOMEPAGE="https://gitlab.com/maxmraz/yarntown"
+DOWNLOAD="https://gitlab.com/maxmraz/yarntown/-/archive/v1.0.6/yarntown-v1.0.6.tar.gz"
+MD5SUM="13150ab681f4bf2648c65a89c333b8c3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="solarus"
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/games/z26/z26.info b/games/z26/z26.info
index 1b0730ce20..ff6ff6c1f1 100644
--- a/games/z26/z26.info
+++ b/games/z26/z26.info
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.whimsey.com"
 DOWNLOAD="http://www.whimsey.com/z26/z26v213.tar.gz"
 MD5SUM="0b0b9b42f203f6defca74a85f071f7c8"
 DOWNLOAD_x86_64="http://www.whimsey.com/z26/z26v213.tar.gz \
-                 http://urchlay.naptime.net/~urchlay/src/z26.static.xz"
+                 https://slackware.uk/~urchlay/src/z26.static.xz"
 MD5SUM_x86_64="0b0b9b42f203f6defca74a85f071f7c8 \
                e3e0ba119fef0a9494759a731ceb2183"
 REQUIRES=""
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/games/zsnes/zsnes.info b/games/zsnes/zsnes.info
index ab7ebe77cb..6d36e1575e 100644
--- a/games/zsnes/zsnes.info
+++ b/games/zsnes/zsnes.info
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.zsnes.com"
 DOWNLOAD="http://zsnes.sf.net/zsnes151bsrc.tar.bz2"
 MD5SUM="904ee432f378609176ed30c01cf6ea28"
 DOWNLOAD_x86_64="http://zsnes.sf.net/zsnes151bsrc.tar.bz2 \
-                 http://urchlay.naptime.net/~urchlay/src/zsnes.static.xz"
+                 https://slackware.uk/~urchlay/src/zsnes.static.xz"
 MD5SUM_x86_64="904ee432f378609176ed30c01cf6ea28 \
                c2289a3cbe04b62fda1f4b896c04b275"
 REQUIRES=""
diff --git a/games/ztools/ztools.info b/games/ztools/ztools.info
index 3c0489161a..97115177b6 100644
--- a/games/ztools/ztools.info
+++ b/games/ztools/ztools.info
@@ -4,7 +4,7 @@ HOMEPAGE="http://ifarchive.org/indexes/if-archiveXinfocomXtoolsXztools.html"
 DOWNLOAD="http://ifarchive.org/if-archive/infocom/tools/ztools/ztools731.tar.gz \
           http://www.ifarchive.org/if-archive/infocom/tools/zcut12.zip \
           http://www.ifarchive.org/if-archive/infocom/tools/DebugTool_111.lha \
-          http://urchlay.naptime.net/~urchlay/src/zrename"
+          https://slackware.uk/~urchlay/src/zrename"
 MD5SUM="f5e6abb7011817e48debee828895a500 \
         c815ced0706fc6454bea18d0046c5afe \
         8d86a47b23c17bd1243577db99dc8ac8 \
diff --git a/gis/Fiona/Fiona.SlackBuild b/gis/Fiona/Fiona.SlackBuild
index a94a675f96..e6f26cb2f1 100644
--- a/gis/Fiona/Fiona.SlackBuild
+++ b/gis/Fiona/Fiona.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Fiona
-VERSION=${VERSION:-1.8.13}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.8.19}
+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 {} \;
 
-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/gis/Fiona/Fiona.info b/gis/Fiona/Fiona.info
index 2310e42519..d501116dc5 100644
--- a/gis/Fiona/Fiona.info
+++ b/gis/Fiona/Fiona.info
@@ -1,10 +1,10 @@
 PRGNAM="Fiona"
-VERSION="1.8.13"
+VERSION="1.8.19"
 HOMEPAGE="https://github.com/Toblerity/Fiona"
-DOWNLOAD="https://github.com/Toblerity/Fiona/archive/1.8.13/Fiona-1.8.13.tar.gz"
-MD5SUM="19b13fb5321d9e0111eba7c031c52ede"
+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="attrs gdal munch six python3-six python3-Cython python3-attrs enum34 click-plugins cligj"
+REQUIRES="gdal munch python3-six python3-Cython python3-attrs click-plugins cligj"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/gis/GMT/GMT.SlackBuild b/gis/GMT/GMT.SlackBuild
index 042f30be80..5b8c3dd568 100644
--- a/gis/GMT/GMT.SlackBuild
+++ b/gis/GMT/GMT.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=GMT
 SRCNAM=gmt
-VERSION=${VERSION:-6.0.0}
+VERSION=${VERSION:-6.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -101,6 +101,7 @@ cd build
     -DDCW_ROOT=$PKG/usr/share/$SRCNAM/dcw \
     -DCOPY_GSHHG=true \
     -DCOPY_DCW=true \
+    -DGMT_INSTALL_MODULE_LINKS=true \
     -DLICENSE_RESTRICTED=$LICFLAG \
     -DCMAKE_BUILD_TYPE=Release ..
   make all
diff --git a/gis/GMT/GMT.info b/gis/GMT/GMT.info
index 045746ae49..b1570bb5a8 100644
--- a/gis/GMT/GMT.info
+++ b/gis/GMT/GMT.info
@@ -1,10 +1,10 @@
 PRGNAM="GMT"
-VERSION="6.0.0"
+VERSION="6.1.1"
 HOMEPAGE="https://www.generic-mapping-tools.org/"
-DOWNLOAD="https://github.com/GenericMappingTools/gmt/releases/download/6.0.0/gmt-6.0.0-src.tar.gz \
+DOWNLOAD="https://github.com/GenericMappingTools/gmt/releases/download/6.1.1/gmt-6.1.1-src.tar.gz \
           ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-2.3.7.tar.gz \
           ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-1.1.4.tar.gz"
-MD5SUM="608742883d1f6babc3928bcb32952e9d \
+MD5SUM="f58535b474cbefebcc8646a745e5ca68 \
         8ee2653f9daf84d49fefbf990bbfa1e7 \
         4f30857a8b12af0f910222fceb591538"
 DOWNLOAD_x86_64=""
diff --git a/gis/GMT/README b/gis/GMT/README
index 84875498da..ab4d83c30a 100644
--- a/gis/GMT/README
+++ b/gis/GMT/README
@@ -1,10 +1,11 @@
 GMT is an open-source collection of command-line tools for manipulating
 geographic and Cartesian data sets (including filtering, trend fitting,
 gridding, projecting, etc.) and producing PostScript illustrations
-ranging from simple x-y plots via contour maps to artificially illuminated
-surfaces and 3D perspective views. It supports many map projections and
-transformations and includes supporting data such as coastlines, rivers,
-and political boundaries and optionally country polygons.
+ranging from simple x-y plots via contour maps to artificially
+illuminated surfaces and 3D perspective views. It supports many map
+projections and transformations and includes supporting data such as
+coastlines, rivers, and political boundaries and optionally country
+polygons.
 
 By default, GMT will use Dave Watson's Delaunay triangulation routine.
 However, a much faster alternative is available from Jonathan Shewchuk,
diff --git a/gis/OTB/OTB.SlackBuild b/gis/OTB/OTB.SlackBuild
index 7497beb90d..54837333d5 100644
--- a/gis/OTB/OTB.SlackBuild
+++ b/gis/OTB/OTB.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for OTB
 
-# Copyright 2014-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,8 +25,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=OTB
-VERSION=${VERSION:-7.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-7.2.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -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 892526332f..6d6fe86584 100644
--- a/gis/OTB/OTB.info
+++ b/gis/OTB/OTB.info
@@ -1,8 +1,8 @@
 PRGNAM="OTB"
-VERSION="7.0.0"
+VERSION="7.2.0"
 HOMEPAGE="http://orfeo-toolbox.org/otb/"
-DOWNLOAD="https://github.com/orfeotoolbox/OTB/archive/7.0.0/OTB-7.0.0.tar.gz"
-MD5SUM="3b0706f06ba1ebc145d5ced4c2a89e7a"
+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 217ad4bbca..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.19.1}
+VERSION=${VERSION:-0.23.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/OWSLib/OWSLib.info b/gis/OWSLib/OWSLib.info
index 95184e2fab..0961aa59ea 100644
--- a/gis/OWSLib/OWSLib.info
+++ b/gis/OWSLib/OWSLib.info
@@ -1,8 +1,8 @@
 PRGNAM="OWSLib"
-VERSION="0.19.1"
+VERSION="0.23.0"
 HOMEPAGE="https://pypi.python.org/pypi/OWSLib/"
-DOWNLOAD="https://github.com/geopython/OWSLib/archive/0.19.1/OWSLib-0.19.1.tar.gz"
-MD5SUM="198befd5de54cd909e2efbda45f73e1c"
+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 bf539dd8d3..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="5b0c2645ce4282a1b73012e9a89e84b6"
+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/Shapely/Shapely.SlackBuild b/gis/Shapely/Shapely.SlackBuild
index c42c986d4d..1ae3d60491 100644
--- a/gis/Shapely/Shapely.SlackBuild
+++ b/gis/Shapely/Shapely.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Shapely
-VERSION=${VERSION:-1.7.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7.1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -72,7 +72,6 @@ find -L . \
 # remove unnecessary .pxi file
 sed -i "s/data_files\s*=.*/data_files = [],/g" setup.py
 
-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/gis/Shapely/Shapely.info b/gis/Shapely/Shapely.info
index 43b5fdc1fa..15c8334baa 100644
--- a/gis/Shapely/Shapely.info
+++ b/gis/Shapely/Shapely.info
@@ -1,8 +1,8 @@
 PRGNAM="Shapely"
-VERSION="1.7.0"
+VERSION="1.7.1"
 HOMEPAGE="https://github.com/Toblerity/Shapely"
-DOWNLOAD="https://github.com/Toblerity/Shapely/archive/1.7.0/Shapely-1.7.0.tar.gz"
-MD5SUM="b483706bae23a9ce0c9ef6702d1e2ae9"
+DOWNLOAD="https://github.com/Toblerity/Shapely/archive/1.7.1/Shapely-1.7.1.tar.gz"
+MD5SUM="487d42043d56ee28ad2b5a42bba15db8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geos python3"
diff --git a/gis/basemap/README b/gis/basemap/README
deleted file mode 100644
index 1f96d1c8ac..0000000000
--- a/gis/basemap/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Plot on map projections (with coastlines and political boundaries) 
-using matplotlib.
diff --git a/gis/basemap/basemap.SlackBuild b/gis/basemap/basemap.SlackBuild
deleted file mode 100644
index b61a4f4cc1..0000000000
--- a/gis/basemap/basemap.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for basemap
-
-# Originally written by Dimitris Zlatanidis <d.zlatanidis@gmail.com>
-# Copyright (c) 2019 Cristiano Urban, Gonars, Italy
-# 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=basemap
-VERSION=${VERSION:-1.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}rel
-tar xvf $CWD/$PRGNAM-${VERSION}rel.tar.gz
-cd $PRGNAM-${VERSION}rel
-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
-
-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 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/gis/basemap/basemap.info b/gis/basemap/basemap.info
deleted file mode 100644
index f0db4505a0..0000000000
--- a/gis/basemap/basemap.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="basemap"
-VERSION="1.2.1"
-HOMEPAGE="https://github.com/matplotlib/basemap/"
-DOWNLOAD="https://github.com/matplotlib/basemap/archive/v1.2.1rel/basemap-1.2.1rel.tar.gz"
-MD5SUM="b3c4c1292b36abac27050eb67ada914e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="geos matplotlib pyproj pyshp"
-MAINTAINER="Cristiano Urban"
-EMAIL="cristiano.urban.slack@gmail.com"
diff --git a/gis/basemap/slack-desc b/gis/basemap/slack-desc
deleted file mode 100644
index ef632ef9de..0000000000
--- a/gis/basemap/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------------------------------------------------------|
-basemap: basemap (matplotlib library)
-basemap:
-basemap: Plot on map projections (with coastlines and political boundaries)
-basemap: using matplotlib.
-basemap:
-basemap: Homepage: https://github.com/matplotlib/basemap/
-basemap:
-basemap:
-basemap:
-basemap:
-basemap:
diff --git a/gis/cartopy/cartopy.SlackBuild b/gis/cartopy/cartopy.SlackBuild
index c5ff17247c..fc1fbf84a8 100644
--- a/gis/cartopy/cartopy.SlackBuild
+++ b/gis/cartopy/cartopy.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cartopy
-VERSION=${VERSION:-0.17.0}
+VERSION=${VERSION:-0.18.0}
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
@@ -69,17 +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 {} \;
 
-CFLAGS="$SLKCFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \
-  python2 setup.py install --root=$PKG
-CFLAGS="$SLKCFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \
-  python3 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 CONTRIBUTING.md COPYING COPYING.LESSER README.md \
+  CHANGES COPYING COPYING.LESSER README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/gis/cartopy/cartopy.info b/gis/cartopy/cartopy.info
index b349b33d46..e7c1595535 100644
--- a/gis/cartopy/cartopy.info
+++ b/gis/cartopy/cartopy.info
@@ -1,10 +1,10 @@
 PRGNAM="cartopy"
-VERSION="0.17.0"
+VERSION="0.18.0"
 HOMEPAGE="https://scitools.org.uk/cartopy/"
-DOWNLOAD="https://github.com/SciTools/cartopy/archive/v0.17.0/cartopy-0.17.0.tar.gz"
-MD5SUM="9fe063295a9fd854803d3c01a60720d0"
+DOWNLOAD="https://github.com/SciTools/cartopy/archive/v0.18.0/cartopy-0.18.0.tar.gz"
+MD5SUM="792c63511641c843759c5b774f2a8b33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="geos matplotlib python3-matplotlib proj pyshp scipy scipy3 Shapely"
+REQUIRES="geos python3-matplotlib proj pyshp scipy3 Shapely"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
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/README b/gis/geopandas/README
new file mode 100644
index 0000000000..728f20bca7
--- /dev/null
+++ b/gis/geopandas/README
@@ -0,0 +1,4 @@
+GeoPandas is a project to add support for geographic data to pandas objects.
+It currently implements GeoSeries and GeoDataFrame types which are subclasses
+of pandas.Series and pandas.DataFrame respectively. GeoPandas objects can act
+on shapely geometry objects and perform geometric operations.
diff --git a/gis/geopandas/geopandas.SlackBuild b/gis/geopandas/geopandas.SlackBuild
new file mode 100644
index 0000000000..5a1fdc5d8c
--- /dev/null
+++ b/gis/geopandas/geopandas.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# SlackBuild script for geopandas
+
+# Copyright 2020-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=geopandas
+VERSION=${VERSION:-0.9.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 {} \;
+
+python3 setup.py install --root=$PKG
+
+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/gis/geopandas/geopandas.info b/gis/geopandas/geopandas.info
new file mode 100644
index 0000000000..e125839631
--- /dev/null
+++ b/gis/geopandas/geopandas.info
@@ -0,0 +1,10 @@
+PRGNAM="geopandas"
+VERSION="0.9.0"
+HOMEPAGE="https://github.com/geopandas/geopandas"
+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"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/gis/geopandas/slack-desc b/gis/geopandas/slack-desc
new file mode 100644
index 0000000000..50ab2d22ee
--- /dev/null
+++ b/gis/geopandas/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------------------------------------------------------|
+geopandas: geopandas (Python tools for geographic data)
+geopandas:
+geopandas: GeoPandas is a project to add support for geographic data to pandas
+geopandas: objects. It currently implements GeoSeries and GeoDataFrame types
+geopandas: which are subclasses of pandas.Series and pandas.DataFrame
+geopandas: respectively. GeoPandas objects can act on shapely geometry objects
+geopandas: and perform geometric operations.
+geopandas:
+geopandas:
+geopandas:
+geopandas:
diff --git a/gis/geopy/README b/gis/geopy/README
index a235b18e15..84ec2d8274 100644
--- a/gis/geopy/README
+++ b/gis/geopy/README
@@ -5,4 +5,6 @@ geocoders and other data sources.
 geopy currently includes support for several geocoders, including OpenStreetMap
 Nominatim, ESRI ArcGIS, Google Geocoding API and more.
 
-python/pytz is an optional dependency that will be used if available.
+python/pytz, python/python-requests and python/python3-aiohttp are optional
+dependencies that will be used if available (they must all be built with
+Python 3 support).
diff --git a/gis/geopy/geopy.SlackBuild b/gis/geopy/geopy.SlackBuild
index db10a84030..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:-1.21.0}
+VERSION=${VERSION:-2.1.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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/gis/geopy/geopy.info b/gis/geopy/geopy.info
index 99659a6c76..90061ec356 100644
--- a/gis/geopy/geopy.info
+++ b/gis/geopy/geopy.info
@@ -1,8 +1,8 @@
 PRGNAM="geopy"
-VERSION="1.21.0"
+VERSION="2.1.0"
 HOMEPAGE="https://github.com/geopy/geopy"
-DOWNLOAD="https://github.com/geopy/geopy/archive/1.21.0/geopy-1.21.0.tar.gz"
-MD5SUM="0b7d6f8adc0799a8eef9523514f0fe0f"
+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 edb9e6e00e..935d9c6081 100644
--- a/gis/geos/geos.info
+++ b/gis/geos/geos.info
@@ -1,8 +1,8 @@
 PRGNAM="geos"
-VERSION="3.8.1"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-DOWNLOAD="http://download.osgeo.org/geos/geos-3.8.1.tar.bz2"
-MD5SUM="9d25df02a2c4fcc5a59ac2fb3f0bd977"
+VERSION="3.9.1"
+HOMEPAGE="https://trac.osgeo.org/geos/"
+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 f5304c9ec3..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.2.5776}
+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 aa18283951..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.2.5776"
+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="d11eb3e20e5df44cb92d43077537078d"
+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/gpxsee/fix_font_narrow_space.diff b/gis/gpxsee/fix_font_narrow_space.diff
index 0049c0c31c..0b04d37b4d 100644
--- a/gis/gpxsee/fix_font_narrow_space.diff
+++ b/gis/gpxsee/fix_font_narrow_space.diff
@@ -1,5 +1,5 @@
---- GPXSee-7.20/src/GUI/units.h.orig	2019-03-12 23:00:39.365129810 +0300
-+++ GPXSee-7.20/src/GUI/units.h	2019-03-12 23:00:47.151863062 +0300
+--- src/GUI/units.h.orig	2019-03-12 23:00:39.365129810 +0300
++++ src/GUI/units.h	2019-03-12 23:00:47.151863062 +0300
 @@ -30,6 +30,6 @@
  #define C2FS    1.8  // Celsius to Farenheit - scale
  #define C2FO    32.0 // Celsius to Farenheit - offset
diff --git a/gis/gpxsee/gpxsee.SlackBuild b/gis/gpxsee/gpxsee.SlackBuild
index a048645b93..018ca0c59c 100644
--- a/gis/gpxsee/gpxsee.SlackBuild
+++ b/gis/gpxsee/gpxsee.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gpxsee
-VERSION=${VERSION:-7.20}
+VERSION=${VERSION:-7.28}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,7 +71,7 @@ find -L . \
 
 # Fix display issue: square character instead of a white space
 # See https://github.com/tumic0/GPXSee/issues/93
-patch -p1 < $CWD/fix_font_narrow_space.diff
+patch -p0 < $CWD/fix_font_narrow_space.diff
 
 lrelease-qt5 gpxsee.pro
 qmake-qt5 \
diff --git a/gis/gpxsee/gpxsee.info b/gis/gpxsee/gpxsee.info
index d130b00a85..3a6412fbe9 100644
--- a/gis/gpxsee/gpxsee.info
+++ b/gis/gpxsee/gpxsee.info
@@ -1,8 +1,8 @@
 PRGNAM="gpxsee"
-VERSION="7.20"
+VERSION="7.28"
 HOMEPAGE="https://www.gpxsee.org/"
-DOWNLOAD="https://github.com/tumic0/GPXSee/archive/7.20/GPXSee-7.20.tar.gz"
-MD5SUM="1db4614927b4fcb7175cefda12aee456"
+DOWNLOAD="https://github.com/tumic0/GPXSee/archive/7.28/GPXSee-7.28.tar.gz"
+MD5SUM="4c1ba8939e569c6503b510b54dfa7e3e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/gis/navit/navit.SlackBuild b/gis/navit/navit.SlackBuild
index bdfe25c6cc..fd83e7d0bf 100644
--- a/gis/navit/navit.SlackBuild
+++ b/gis/navit/navit.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=navit
-VERSION=${VERSION:-R7651}
+VERSION=${VERSION:-0.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,11 +86,12 @@ 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
 
 mv $PKG/usr/share/man $PKG/usr/man
+cp -a man/* $PKG/usr/man
 find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/share/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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog COPYRIGHT README GPL-2 LGPL-2 $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING CONTRIBUTING.md CHANGELOG.md COPYRIGHT README.md GPL-2 LGPL-2 $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/gis/navit/navit.info b/gis/navit/navit.info
index b30a3e705f..2feefba967 100644
--- a/gis/navit/navit.info
+++ b/gis/navit/navit.info
@@ -1,8 +1,8 @@
 PRGNAM="navit"
-VERSION="R7651"
+VERSION="0.5.4"
 HOMEPAGE="https://www.navit-project.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/navit-R7651.tar.gz"
-MD5SUM="cf23a4bc24d1b552da80861b93e86343"
+DOWNLOAD="https://github.com/navit-gps/navit/archive/v0.5.4/navit-0.5.4.tar.gz"
+MD5SUM="75e0a62cb9be0776a8634beb02112182"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.SlackBuild b/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.SlackBuild
index c0d4dd0d50..0b0d9cfb40 100644
--- a/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.SlackBuild
+++ b/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opencpn-plugin-oesenc
-VERSION=${VERSION:-4.0.0}
+VERSION=${VERSION:-4.0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -98,7 +98,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 Notes 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
 
 mkdir -p $PKG/install
diff --git a/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.info b/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.info
index 0f968e158f..576e3c446b 100644
--- a/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.info
+++ b/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.info
@@ -1,8 +1,8 @@
 PRGNAM="opencpn-plugin-oesenc"
-VERSION="4.0.0"
+VERSION="4.0.10"
 HOMEPAGE="https://opencpn.org/OpenCPN/plugins/oesenc.html"
-DOWNLOAD="https://github.com/bdbcat/oesenc_pi/archive/v4.0.0/oesenc_pi-4.0.0.tar.gz"
-MD5SUM="20b7073eb235a318d09bbb98330e04b7"
+DOWNLOAD="https://github.com/bdbcat/oesenc_pi/archive/v4.0.10/oesenc_pi-4.0.10.tar.gz"
+MD5SUM="bfd9b8a1a1661990e95ee73bf86e6bd0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="opencpn"
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/ossim/0498f7.patch b/gis/ossim/0498f7.patch
deleted file mode 100644
index 7dd026a5bd..0000000000
--- a/gis/ossim/0498f7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0498f71e811ff3068ba491929c09aa5137ea0cca Mon Sep 17 00:00:00 2001
-From: Garrett Potts <gpotts@radiantblue.com>
-Date: Thu, 31 Oct 2019 07:08:03 -0400
-Subject: [PATCH] Added missing headers
-
----
- src/init/ossimInit.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/init/ossimInit.cpp b/src/init/ossimInit.cpp
-index 9aeec9de..2c2ec2c1 100644
---- a/src/init/ossimInit.cpp
-+++ b/src/init/ossimInit.cpp
-@@ -66,7 +66,9 @@
- #include <algorithm>
- #include <mutex>
- #include <geos_c.h>
--
-+#include <cstdio>
-+#include <cstdarg>
-+#include <cstddef>
- using namespace std;
- 
- static ossimTrace traceExec = ossimTrace("ossimInit:exec");
diff --git a/gis/ossim/c0d975.patch b/gis/ossim/c0d975.patch
deleted file mode 100644
index 31423b557a..0000000000
--- a/gis/ossim/c0d975.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From c0d97536f9ac967941b6ca48a6a7a4dde44f4ee3 Mon Sep 17 00:00:00 2001
-From: Garrett Potts <gpotts@radiantblue.com>
-Date: Thu, 31 Oct 2019 07:42:32 -0400
-Subject: [PATCH] Fixed a core dump
-
----
- src/base/ossimPolyArea2d.cpp | 10 ++++---
- src/init/ossimInit.cpp       | 52 +++---------------------------------
- 2 files changed, 9 insertions(+), 53 deletions(-)
-
-diff --git a/src/base/ossimPolyArea2d.cpp b/src/base/ossimPolyArea2d.cpp
-index 572d59de..3212b74a 100644
---- a/src/base/ossimPolyArea2d.cpp
-+++ b/src/base/ossimPolyArea2d.cpp
-@@ -100,6 +100,7 @@ class ossimPolyArea2dPrivate
- void ossimPolyArea2dPrivate::setGeometry(const ossimPolygon &exteriorRing,
-                                          const std::vector<ossimPolygon> &interiorRings)
- {
-+
-    deleteGeometry();
- 
-    if (exteriorRing.getNumberOfVertices() < 1)
-@@ -107,14 +108,15 @@ void ossimPolyArea2dPrivate::setGeometry(const ossimPolygon &exteriorRing,
-    GEOSGeometryPtr shell = 0;
-    std::vector<GEOSGeometryPtr> holes;
-    const std::vector<ossimDpt> &pts = exteriorRing.getVertexList();
--   int idx = 0;
--   int n = (int)pts.size();
-+   ossim_int32 idx = 0;
-+   ossim_int32 n = (int)pts.size();
- 
-    bool firstAndLastSame = ((pts[0].x == pts[n - 1].x) && (pts[0].y == pts[n - 1].y));
-    if (n > 0)
-    {
-       GEOSCoordSequence *shellSeq = GEOSCoordSeq_create(
--          exteriorRing.getNumberOfVertices() + ((firstAndLastSame) ? 0 : 1), 2);
-+          n + ((firstAndLastSame) ? 0 : 1), 2);
-+
-       //fill the exterior ring
-       for (idx = 0; idx < n; idx++)
-       {
-@@ -123,7 +125,7 @@ void ossimPolyArea2dPrivate::setGeometry(const ossimPolygon &exteriorRing,
-       //if the original polygon didn't have the first and last point the same, make it so
-       if (!firstAndLastSame)
-       {
--         GEOSCoordSeq_setXY(shellSeq, idx, pts[0].x, pts[0].y);
-+         GEOSCoordSeq_setXY(shellSeq, n, pts[0].x, pts[0].y);
-       }
-       shell = GEOSGeom_createLinearRing(shellSeq);
-       //fill the interior rings
-diff --git a/src/init/ossimInit.cpp b/src/init/ossimInit.cpp
-index 2c2ec2c1..787a49d9 100644
---- a/src/init/ossimInit.cpp
-+++ b/src/init/ossimInit.cpp
-@@ -195,6 +195,8 @@ void ossimInit::initialize(ossimArgumentParser& parser)
-       }
-       return;
-    }
-+   initGEOS(geosNoticeFunction, geosErrorFunction);
-+
-    theInstance->parseEnvOptions(parser);
-    theInstance->parseNotifyOption(parser);
-    theInstance->parsePrefsOptions(parser);
-@@ -253,7 +255,7 @@ void ossimInit::initialize()
-       }
-       return;
-    }
--   
-+
-    int argc = 1;
-    char* argv[1];
- 
-@@ -261,54 +263,6 @@ void ossimInit::initialize()
-    argv[0][0] = '\0';
-    initialize(argc, argv);
-    delete [] argv[0];
--
--#if 0   
--    static std::mutex m;
--   std::lock_guard<std::mutex> lock(m);
--   if(theInitializedFlag)
--   {
--      if (traceDebug())
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "DEBUG ossimInit::initialize(): Already initialized, returning......" << std::endl;
--      }
--      return;
--   }
--
--   theInstance->theAppName  = "";
--   theInstance->thePreferences = ossimPreferences::instance();
--   theInstance->initializeDefaultFactories();
--   
--   if ( theElevEnabledFlag )
--   {
--      theInstance->initializeElevation();
--   }
--
--   theInstance->initializeLogFile();
--
--   //---
--   // To do:
--   // We need a mechanism to register factories to the "front" or the
--   // "back" of factory list so that plugins can override things.  For
--   // now we will initialize the plugins last...
--   //---
--   if(thePluginLoaderEnabledFlag)
--   {
--      theInstance->initializePlugins();
--   }
--
--   if (traceDebug())
--   {
--      ossimNotify(ossimNotifyLevel_DEBUG)
--         << "ossim preferences file: "
--         << theInstance->thePreferences->getPreferencesFilename()
--         << "\nVersion: " << version()
--         << "\nossimInit::initialize() leaving..."
--         << std::endl;
--   } 
--   
--   theInitializedFlag = true;
--#endif
- }
- 
- void ossimInit::finalize()
diff --git a/gis/ossim/c45639.patch b/gis/ossim/c45639.patch
deleted file mode 100644
index 10c11aef52..0000000000
--- a/gis/ossim/c45639.patch
+++ /dev/null
@@ -1,1646 +0,0 @@
-From c456397821cf369af4d9ff1fb60a5dfd1bcefc24 Mon Sep 17 00:00:00 2001
-From: Garrett Potts <gpotts@radiantblue.com>
-Date: Wed, 30 Oct 2019 20:43:06 -0400
-Subject: [PATCH] Added new interfaces to support the geos_c api
-
----
- include/ossim/base/ossimPolyArea2d.h |  171 ++--
- src/base/ossimPolyArea2d.cpp         | 1084 +++++++++++---------------
- src/imaging/ossimImageGeometry.cpp   |    2 +-
- src/init/ossimInit.cpp               |   51 +-
- 4 files changed, 570 insertions(+), 738 deletions(-)
-
-diff --git a/include/ossim/base/ossimPolyArea2d.h b/include/ossim/base/ossimPolyArea2d.h
-index ffb1d611..75db23fd 100644
---- a/include/ossim/base/ossimPolyArea2d.h
-+++ b/include/ossim/base/ossimPolyArea2d.h
-@@ -5,10 +5,8 @@
- // Author: Garrett Potts
- //*******************************************************************
- //$Id: ossimPolyArea2d.h 23608 2015-10-28 13:51:35Z gpotts $
--
- #ifndef ossimPolyArea2d_HEADER
- #define ossimPolyArea2d_HEADER 1
--
- #include <ossim/base/ossimDpt.h>
- #include <ossim/base/ossimGpt.h>
- #include <ossim/base/ossimKeywordlist.h>
-@@ -16,137 +14,76 @@
- #include <ossim/base/ossimReferenced.h>
- #include <vector>
- 
--class ossimDrect;
--class ossimIrect;
--class OssimPolyArea2dPrivate;
-+class ossimPolyArea2dPrivate;
- 
--namespace geos
--{
--   namespace geom
--   {
--      class Geometry;
--   }
--}
--
--class OSSIM_DLL ossimPolyArea2d : public ossimReferenced
-+class OSSIM_DLL ossimPolyArea2d
- {
- public:
--   friend class OssimPolyArea2dPrivate;
--   friend OSSIM_DLL std::ostream& operator <<(std::ostream& out, const ossimPolyArea2d& data);
--   
-+   friend OSSIM_DLL std::ostream &operator<<(std::ostream &out, const ossimPolyArea2d &data);
-+   friend class ossimPolyArea2dPrivate;
-    ossimPolyArea2d();
--   ossimPolyArea2d(const std::vector<ossimGpt>& polygon);
--   ossimPolyArea2d(const std::vector<ossimDpt>& polygon);
--   ossimPolyArea2d(const ossimPolygon& shell, const std::vector<ossimPolygon>& holes);
--   
--   ossimPolyArea2d(const ossimDpt& p1,
--                   const ossimDpt& p2,
--                   const ossimDpt& p3,
--                   const ossimDpt& p4);
--   ossimPolyArea2d(const ossimPolyArea2d& rhs);
--   
--   ossimPolyArea2d(const ossimIrect& rect);
--   ossimPolyArea2d(const ossimDrect& rect);
--   ossimPolyArea2d(const ossimPolygon& polygon);
-+   ossimPolyArea2d(const std::vector<ossimGpt> &polygon);
-+   ossimPolyArea2d(const std::vector<ossimDpt> &polygon);
-+   ossimPolyArea2d(const ossimPolygon &shell, const std::vector<ossimPolygon> &holes);
-+
-+   ossimPolyArea2d(const ossimDpt &p1,
-+                   const ossimDpt &p2,
-+                   const ossimDpt &p3,
-+                   const ossimDpt &p4);
-+   ossimPolyArea2d(const ossimPolyArea2d &rhs);
-+
-+   ossimPolyArea2d(const ossimIrect &rect);
-+   ossimPolyArea2d(const ossimDrect &rect);
-+   ossimPolyArea2d(const ossimPolygon &polygon);
-    ~ossimPolyArea2d();
--   
-+
-    void clear()
-    {
-       clearPolygons();
-    }
--   const ossimPolyArea2d& operator =(const ossimPolyArea2d& rhs);
--   const ossimPolyArea2d& operator =(const ossimPolygon& rhs);
--   const ossimPolyArea2d& operator =(const ossimIrect& rect);
--   const ossimPolyArea2d& operator =(const ossimDrect& rect);
--   const ossimPolyArea2d& operator =(const std::vector<ossimGpt>& polygon);
--   const ossimPolyArea2d& operator =(const std::vector<ossimDpt>& polygon);
--   const ossimPolyArea2d& operator &=(const ossimPolyArea2d& rhs);
--   ossimPolyArea2d operator &(const ossimPolyArea2d& rhs)const;
--   ossimPolyArea2d operator +(const ossimPolyArea2d& rhs)const;
--   const ossimPolyArea2d& operator +=(const ossimPolyArea2d& rhs);
--   ossimPolyArea2d operator -(const ossimPolyArea2d& rhs)const;
--   const ossimPolyArea2d& operator -=(const ossimPolyArea2d& rhs);
--   
--   bool intersects(const ossimPolyArea2d& rhs)const;
--   
--   void add(const ossimPolyArea2d& rhs);
--   bool getVisiblePolygons(std::vector<ossimPolygon>& polyList)const;
--   bool getPolygonHoles(std::vector<ossimPolygon>& polyList)const;
--   
--   /**
--    * @brief Gets all of the polygons stored with their holes embedded. This
--    * may be useful if an operation was performed on the original ossimPolyArea2d 
--    * that caused multiple polygons to be created internally.
--    *	 
--    * For example, if a rectangle is intersected with a U shape, the two top
--    * portions of the U would be their own separate polygon. It's also possible 
--    * for these polygons to contain their own holes. This function will return 
--    * the two top polygons as separate ossimPolyArea2d objects (with any of 
--    * their holes embedded inside them).
--    *
--    *  --------------------------------		 
--    * |                                |
--    * |                                |
--    * | ........           .........   |
--    * | .      .           .       .   |
--    *  -.------.-----------.-------.---
--    *   .      .           .       .
--    *   .      .............       .
--    *   .                          .
--    *   ............................
--    *   
--    * @param polylist an empty vector of ossimPolyArea2d that will be filled
--    * @return returns true if it successfully places polygons in the input vector
--    */
--   bool getCompletePolygons(std::vector<ossimPolyArea2d>& polyList)const;
--   
--   bool isEmpty()const;
--   bool isValid(bool displayValidationError = false)const;
--   bool isPointWithin(const ossimDpt& point)const;
--   bool isPointWithin(double x, double y)const;
--   void getBoundingRect(ossimDrect& rect);
--   
-+   const ossimPolyArea2d &operator=(const ossimPolyArea2d &rhs);
-+   const ossimPolyArea2d &operator=(const ossimPolygon &rhs);
-+   const ossimPolyArea2d &operator=(const ossimIrect &rect);
-+   const ossimPolyArea2d &operator=(const ossimDrect &rect);
-+   const ossimPolyArea2d &operator=(const std::vector<ossimGpt> &polygon);
-+   const ossimPolyArea2d &operator=(const std::vector<ossimDpt> &polygon);
-+   const ossimPolyArea2d &operator&=(const ossimPolyArea2d &rhs);
-+   ossimPolyArea2d operator&(const ossimPolyArea2d &rhs) const;
-+   ossimPolyArea2d operator+(const ossimPolyArea2d &rhs) const;
-+   const ossimPolyArea2d &operator+=(const ossimPolyArea2d &rhs);
-+   ossimPolyArea2d operator-(const ossimPolyArea2d &rhs) const;
-+   const ossimPolyArea2d &operator-=(const ossimPolyArea2d &rhs);
-+
-+   ossim_float64 getArea()const;
-+   bool isEmpty() const;
-+   void makeValid();
-+   bool isValid(bool displayValidationError = false) const;
-+   bool isPointWithin(const ossimDpt &point) const;
-+   bool isPointWithin(double x, double y) const;
-+   void getBoundingRect(ossimDrect &rect) const;
-+
-+   bool intersects(const ossimPolyArea2d &rhs) const;
-+   void add(const ossimPolyArea2d &rhs);
-+   bool getVisiblePolygons(std::vector<ossimPolygon> &polyList) const;
-+   bool getPolygonHoles(std::vector<ossimPolygon> &polyList) const;
-+
-+   ossimPolyArea2d &toMultiPolygon();
-+
-    /**
-    * Returns the Well Known Text string
-    */
--   std::string toString()const;
-+   std::string toString() const;
-+   bool setFromWkt(const std::string &s);
- 
--   /**
--    * @brief Buffers the ossimPolyArea2d shape and returns a copy. This method
--    * does not alter polygon.
--    *  
--    * @param distance is the distance to buffer the shape by. Positive values
--    * will expand the shape, and negative values will shrink the shape.
--    * @return A shape that is a buffered (expanded/contracted) version of this
--    * shape
--    */
--   ossimPolyArea2d getBufferedShape(double distance=FLT_EPSILON) const;
--   
--   ossimPolyArea2d& setToBufferedShape(double distance=FLT_EPSILON);
-+   bool saveState(ossimKeywordlist &kwl,
-+                  const char *prefix = 0) const;
-+   bool loadState(const ossimKeywordlist &kwl,
-+                  const char *prefix = 0);
- 
--   ossimPolyArea2d& toMultiPolygon();
--   bool saveState(ossimKeywordlist& kwl,
--                  const char* prefix=0)const;
--   bool loadState(const ossimKeywordlist& kwl,
--                  const char* prefix=0);
--   
- protected:
--   
-+   ossimPolyArea2dPrivate *m_privateData;
-+
-    void clearPolygons();
--   void recurseVisibleGeometries(ossimPolygon::Vector& polyList,
--                                 const geos::geom::Geometry* geom) const;
--   
--   void recurseHoles(ossimPolygon::Vector& polyList,
--                     const geos::geom::Geometry* geom) const;
--   
--   /**
--    * @brief Recurses over the Geometry object to load all complete polygons
--    * (a shell and any internal holes) into the ossimPolyArea2d.
--    */
--   void recurseCompleteGeometries(std::vector<ossimPolyArea2d>& polyList,
--                                  const geos::geom::Geometry* geom) const;
--   
--   OssimPolyArea2dPrivate* m_privateData;
- };
- 
- #endif /* #ifndef ossimPolyArea2d_HEADER */
-diff --git a/src/base/ossimPolyArea2d.cpp b/src/base/ossimPolyArea2d.cpp
-index fac88637..572d59de 100644
---- a/src/base/ossimPolyArea2d.cpp
-+++ b/src/base/ossimPolyArea2d.cpp
-@@ -3,153 +3,167 @@
- //
- // $Id: ossimPolyArea2d.cpp 23623 2015-11-13 18:24:28Z gpotts $
- //---
--
- #include <ossim/base/ossimPolyArea2d.h>
--#include <ossim/base/ossimDrect.h>
--#include <ossim/base/ossimIrect.h>
-+#include <ossim/base/ossimReferenced.h>
-+#include <ossim/base/ossimPolygon.h>
-+#include <ossim/base/ossimNotifyContext.h>
-+#include <ossim/base/ossimKeywordlist.h>
- #include <ossim/base/ossimKeywordNames.h>
--#include <ossim/base/ossimNotify.h>
--#include <ossim/base/ossimRefPtr.h>
--#include <ossim/base/ossimString.h>
--#include <geos/geom/Coordinate.h>
--#include <geos/geom/CoordinateArraySequence.h>
--#include <geos/geom/GeometryFactory.h>
--#include <geos/geom/LinearRing.h>
--#include <geos/opBuffer.h>
--#include <geos/geom/Point.h>
--#include <geos/geom/Polygon.h>
--#include <geos/geom/MultiPolygon.h>
--#include <geos/geom/PrecisionModel.h>
--#include <geos/io/WKTReader.h>
--#include <geos/io/WKTWriter.h>
--#include <geos/util/GEOSException.h>
--#include <geos/operation/valid/IsValidOp.h>
--#include <geos/opBuffer.h>
--#include <cstdlib>
--#include <exception>
--#include <memory>
- #include <vector>
--#include <mutex>
--
--using namespace std;
-+#include <cstdio>
-+#include <cstdarg>
-+#include <geos_c.h>
- 
--class MyGeomFactory : public geos::geom::GeometryFactory
-+class ossimPolyArea2dPrivate
- {
- public:
--   MyGeomFactory():
--   geos::geom::GeometryFactory(new geos::geom::PrecisionModel(geos::geom::PrecisionModel::FLOATING),
--                             -1)
-+   typedef GEOSGeometry *GEOSGeometryPtr;
-+   typedef const GEOSGeometry *ConstGEOSGeometryPtr;
-+   ossimPolyArea2dPrivate() : m_geometry(GEOSGeom_createEmptyPolygon()) {}
-+   virtual ~ossimPolyArea2dPrivate() { deleteGeometry(); }
-+   void deleteGeometry()
-    {
-+      if (m_geometry)
-+         GEOSGeom_destroy(m_geometry);
-+      m_geometry = 0;
-+   }
- 
-+   void setGeometry(GEOSGeometryPtr geom)
-+   {
-+      if(geom != m_geometry)
-+      {
-+         deleteGeometry();
-+         m_geometry = geom;
-+      }
-    }
--}; 
--class ossimGeometryFactoryWrapper : public ossimReferenced
--{
--public:
--   ossimGeometryFactoryWrapper()
--      : m_geomFactory(0)
-+   void setGeometry(const ossimPolygon &polygon, const std::vector<ossimPolygon> &holes = std::vector<ossimPolygon>());
-+
-+   void ringToPoints(const ConstGEOSGeometryPtr geom, std::vector<ossimDpt> &points) const;
-+   void recurseVisibleGeometries(ossimPolygon::Vector &polyList) const
-    {
--      //geos::geom::PrecisionModel *pm =
--      //   new geos::geom::PrecisionModel(geos::geom::PrecisionModel::FLOATING);
--      m_geomFactory = new MyGeomFactory();//new geos::geom::GeometryFactory(pm, -1); 
-+      recurseVisibleGeometries(m_geometry, polyList);
-    }
--   virtual ~ossimGeometryFactoryWrapper(){if(m_geomFactory) delete m_geomFactory;m_geomFactory=0;}
--   
--   MyGeomFactory* m_geomFactory;
--};
- 
--class OssimPolyArea2dPrivate
--{
--public:
--   typedef geos::geom::Geometry* GeometryPtr;
--   typedef const geos::geom::Geometry* ConstGeometryPtr;
--   
--   OssimPolyArea2dPrivate(GeometryPtr geom=0);
--   ~OssimPolyArea2dPrivate();
--   
--   void deleteGeometry() { if(m_geometry) { delete m_geometry; m_geometry = 0; }}
--   void setGeometry(const ossimPolygon& polygon, const vector<ossimPolygon>& holes = vector<ossimPolygon>());
--   void setGeometry(GeometryPtr geom){deleteGeometry();m_geometry=geom;}
--   geos::geom::GeometryFactory* geomFactory(){{return m_globalFactory.valid()?m_globalFactory->m_geomFactory:0;}}
--   GeometryPtr m_geometry;
--   static ossimRefPtr<ossimGeometryFactoryWrapper> m_globalFactory; 
--};
-+   void recurseVisibleGeometries(ConstGEOSGeometryPtr geom,
-+                                 ossimPolygon::Vector &polygons) const;
- 
--ossimRefPtr<ossimGeometryFactoryWrapper> OssimPolyArea2dPrivate::m_globalFactory;
-+   void getVisiblePolygons(ConstGEOSGeometryPtr geom,
-+                           ossimPolygon::Vector &polygons) const;
- 
--OssimPolyArea2dPrivate::OssimPolyArea2dPrivate(GeometryPtr geom)
--:m_geometry(geom)
--{
--   static std::mutex globalFactoryMutex;
--   
-+   bool getVisiblePolygons(ossimPolygon::Vector &polygons) const;
-+
-+   void getHoles(ConstGEOSGeometryPtr geom,
-+                 ossimPolygon::Vector &polygons) const;
-+   bool getPolygonHoles(ossimPolygon::Vector &polygons) const;
-+   bool getPolygonHoles(ConstGEOSGeometryPtr geom,
-+                        ossimPolygon::Vector &polygons) const;
-+   void recurseGeometryHoles(ConstGEOSGeometryPtr geom,
-+                             ossimPolygon::Vector &polygons) const;
-+   void getBoundingRect(ossimDrect &bounds) const
-    {
--      std::lock_guard<std::mutex> lock(globalFactoryMutex);
--      if(!m_globalFactory.valid())
-+      bounds.makeNan();
-+      if (!isEmpty())
-       {
--         m_globalFactory = new ossimGeometryFactoryWrapper();
--      }    
-+         GEOSGeometry *geom = GEOSEnvelope(m_geometry);
-+
-+         if (geom)
-+         {
-+            ossimPolygon::Vector polys;
-+            getVisiblePolygons(geom, polys);
-+            for (ossim_int32 idx = 0; idx < polys.size(); ++idx)
-+            {
-+               if (bounds.isNan())
-+               {
-+                  polys[idx].getBoundingRect(bounds);
-+               }
-+               else
-+               {
-+                  ossimDrect tempRect;
-+                  polys[idx].getBoundingRect(tempRect);
-+                  bounds = bounds.combine(tempRect);
-+               }
-+            }
-+            GEOSGeom_destroy(geom);
-+            geom = 0;
-+         }
-+      }
-    }
--}
-+   std::string toString() const;
-+   bool setFromWkt(const std::string &s);
- 
--OssimPolyArea2dPrivate::~OssimPolyArea2dPrivate()
--{
--   deleteGeometry();
--}
-+   bool isEmpty() const;
-+   bool isValid(bool displayValidationError = false) const;
-+   bool isPointWithin(const ossimDpt &pt) const;
-+   GEOSGeometryPtr m_geometry;
-+};
- 
--void OssimPolyArea2dPrivate::setGeometry(
--   const ossimPolygon& exteriorRing, const vector<ossimPolygon>& interiorRings)
-+void ossimPolyArea2dPrivate::setGeometry(const ossimPolygon &exteriorRing,
-+                                         const std::vector<ossimPolygon> &interiorRings)
- {
-    deleteGeometry();
--   
--   geos::geom::CoordinateArraySequence *cas = new geos::geom::CoordinateArraySequence();
--   
--   const std::vector<ossimDpt>& pts = exteriorRing.getVertexList();
- 
-+   if (exteriorRing.getNumberOfVertices() < 1)
-+      return;
-+   GEOSGeometryPtr shell = 0;
-+   std::vector<GEOSGeometryPtr> holes;
-+   const std::vector<ossimDpt> &pts = exteriorRing.getVertexList();
-    int idx = 0;
-    int n = (int)pts.size();
--   
--   if(n > 0)
-+
-+   bool firstAndLastSame = ((pts[0].x == pts[n - 1].x) && (pts[0].y == pts[n - 1].y));
-+   if (n > 0)
-    {
-+      GEOSCoordSequence *shellSeq = GEOSCoordSeq_create(
-+          exteriorRing.getNumberOfVertices() + ((firstAndLastSame) ? 0 : 1), 2);
-       //fill the exterior ring
-       for (idx = 0; idx < n; idx++)
-       {
--         cas->add(geos::geom::Coordinate(pts[idx].x, pts[idx].y));
-+         GEOSCoordSeq_setXY(shellSeq, idx, pts[idx].x, pts[idx].y);
-       }
--      
-       //if the original polygon didn't have the first and last point the same, make it so
--      if((pts[0].x != pts[n-1].x) || (pts[0].y!=pts[n-1].y))
-+      if (!firstAndLastSame)
-       {
--         cas->add(geos::geom::Coordinate(pts[0].x, pts[0].y));
-+         GEOSCoordSeq_setXY(shellSeq, idx, pts[0].x, pts[0].y);
-       }
--      
-+      shell = GEOSGeom_createLinearRing(shellSeq);
-       //fill the interior rings
--      vector<geos::geom::Geometry*> *holes = new vector<geos::geom::Geometry*>();
--      for (ossim_uint32 interiorRingIdx = 0; interiorRingIdx < interiorRings.size(); ++interiorRingIdx)
-+      if (!interiorRings.empty())
-       {
--         geos::geom::CoordinateArraySequence *interiorCas =
--            new geos::geom::CoordinateArraySequence();
--         const std::vector<ossimDpt>& vertexPts = interiorRings[interiorRingIdx].getVertexList();
--         for(ossim_uint32 vertexIndex=0; vertexIndex < vertexPts.size(); ++vertexIndex)
--         {
--            interiorCas->add(geos::geom::Coordinate(vertexPts[vertexIndex].x,
--                                                    vertexPts[vertexIndex].y));
--         }
--         
--         //if the original polygon didn't have the first and last point the same, make it so
--         if((vertexPts[0].x != vertexPts[vertexPts.size()-1].x) ||
--            (vertexPts[0].y!=vertexPts[vertexPts.size()-1].y))
-+         for (ossim_uint32 interiorRingIdx = 0; interiorRingIdx < interiorRings.size(); ++interiorRingIdx)
-          {
--            interiorCas->add(geos::geom::Coordinate(vertexPts[0].x, vertexPts[0].y));
-+            if (interiorRings[interiorRingIdx].getNumberOfVertices() > 0)
-+            {
-+               const std::vector<ossimDpt> &vertexPts = interiorRings[interiorRingIdx].getVertexList();
-+               firstAndLastSame = ((vertexPts[0].x == vertexPts[n - 1].x) && (vertexPts[0].y == vertexPts[n - 1].y));
-+
-+               GEOSCoordSequence *ring = GEOSCoordSeq_create(
-+                   vertexPts.size() + ((firstAndLastSame) ? 0 : 1), 2);
-+               for (ossim_uint32 vertexIndex = 0; vertexIndex < vertexPts.size(); ++vertexIndex)
-+               {
-+                  GEOSCoordSeq_setXY(ring, vertexIndex, vertexPts[vertexIndex].x, vertexPts[vertexIndex].y);
-+               }
-+
-+               //if the original polygon didn't have the first and last point the same, make it so
-+               if (!firstAndLastSame)
-+               {
-+                  GEOSCoordSeq_setXY(ring, vertexPts.size(), vertexPts[0].x, vertexPts[0].y);
-+               }
-+               GEOSGeometryPtr hole = GEOSGeom_createLinearRing(ring);
-+               holes.push_back(hole);
-+            }
-          }
--         
--         geos::geom::LinearRing *hole = geomFactory()->createLinearRing(interiorCas);
--         holes->push_back(hole);
-       }
--      
--      geos::geom::LinearRing* shell = geomFactory()->createLinearRing(cas);
--      if ( shell )
-+
-+      if (shell)
-       {
--         m_geometry = geomFactory()->createPolygon(shell, holes);
-+         if (holes.size())
-+         {
-+            m_geometry = GEOSGeom_createPolygon(shell, &holes.front(), holes.size());
-+         }
-+         else
-+         {
-+            m_geometry = GEOSGeom_createPolygon(shell, 0, 0);
-+         }
-       }
-       else
-       {
-@@ -158,708 +172,540 @@ void OssimPolyArea2dPrivate::setGeometry(
-    }
- }
- 
--void ossimPolyArea2d::recurseVisibleGeometries(
--   std::vector<ossimPolygon>& polyList, const geos::geom::Geometry* geom) const
-+void ossimPolyArea2dPrivate::ringToPoints(const ConstGEOSGeometryPtr geom, std::vector<ossimDpt> &points) const
- {
--   int nGeoms = (int)geom->getNumGeometries();
--   
--   if(nGeoms < 2 )
-+   double x, y;
-+   if (!geom)
-+      return;
-+   ossim_int32 nPoints = GEOSGetNumCoordinates(geom);
-+   if (nPoints > 0)
-    {
--      const geos::geom::Polygon* poly = dynamic_cast<const geos::geom::Polygon*> (geom);
--      
--      if (poly)
-+      const GEOSCoordSequence *seq = GEOSGeom_getCoordSeq(geom);
-+      ossim_int32 i = 0;
-+      for (i = 0; i < nPoints; i++)
-       {
--         const geos::geom::LineString* lineString = dynamic_cast<const geos::geom::LineString*> (poly->getExteriorRing());
--         if (lineString)
--         {
--            int currentPolyIdx = (int)polyList.size();
--            int nPoints = (int)lineString->getNumPoints();
--            int idx = 0;
--            
--            polyList.push_back(ossimPolygon());
--            
--            for (idx=0; idx<nPoints; idx++)
--            {
--               std::unique_ptr<const geos::geom::Point> point(lineString->getPointN(idx));
--               polyList[currentPolyIdx].addPoint(point->getX(), point->getY());
--            }
--         }
-+         GEOSCoordSeq_getX(seq, i, &x);
-+         GEOSCoordSeq_getY(seq, i, &y);
-+         points.push_back(ossimDpt(x, y));
-       }
-    }
--   else
-+}
-+
-+void ossimPolyArea2dPrivate::getHoles(ConstGEOSGeometryPtr geom,
-+                                      ossimPolygon::Vector &polygons) const
-+{
-+   int geomType = GEOSGeomTypeId(geom);
-+   std::vector<ossimDpt> points;
-+   switch (geomType)
-    {
--      for (int idx=0; idx < nGeoms; ++idx)
--      {
--         recurseVisibleGeometries(polyList, geom->getGeometryN(idx));
--      }
-+   case GEOS_LINESTRING:
-+   case GEOS_LINEARRING:
-+   {
-+      ringToPoints(geom, points);
-+      polygons.push_back(ossimPolygon(points));
-+      break;
-+   }
-    }
- }
- 
--void ossimPolyArea2d::recurseHoles(std::vector<ossimPolygon>& polyList,
--                                   const geos::geom::Geometry* geom) const
-+void ossimPolyArea2dPrivate::getVisiblePolygons(ConstGEOSGeometryPtr geom,
-+                                                ossimPolygon::Vector &polygons) const
- {
--   int nGeoms = (int)geom->getNumGeometries();
--   
--   if(nGeoms < 2 )
-+   int geomType = GEOSGeomTypeId(geom);
-+   std::vector<ossimDpt> points;
-+
-+   switch (geomType)
-    {
--      const geos::geom::Polygon* poly = dynamic_cast<const geos::geom::Polygon*> (geom);
-+   case GEOS_LINESTRING:
-+   case GEOS_LINEARRING:
-+   {
-+      ringToPoints(geom, points);
-+      polygons.push_back(ossimPolygon(points));
-+      break;
-+   }
-+   case GEOS_POLYGON:
-+   {
-+      ConstGEOSGeometryPtr geom2 = GEOSGetExteriorRing(geom);
-+      ringToPoints(geom2, points);
-+      polygons.push_back(ossimPolygon(points));
- 
--      if (poly)
-+      break;
-+   }
-+   }
-+}
-+void ossimPolyArea2dPrivate::recurseVisibleGeometries(ConstGEOSGeometryPtr geom,
-+                                                      ossimPolygon::Vector &polygons) const
-+{
-+   ossim_int32 nGeoms = GEOSGetNumGeometries(geom);
-+   ConstGEOSGeometryPtr geomPtr = 0;
-+   if (nGeoms < 2)
-+   {
-+      geomPtr = GEOSGetGeometryN(geom, 0);
-+      if (geomPtr)
-       {
--         ossim_uint32 nInteriorRings = (ossim_uint32)poly->getNumInteriorRing();
--         ossim_uint32 idx = 0;
--         
--         for(idx = 0; idx < nInteriorRings; ++idx)
--         {
--            const geos::geom::LineString* lineString = poly->getInteriorRingN(idx);
--            if (lineString)
--            {
--               int currentPolyIdx = (int)polyList.size();
--               int nPoints = (int)lineString->getNumPoints();
--               int idx = 0;
--
--               polyList.push_back(ossimPolygon());
--
--               for (idx=0; idx<nPoints; idx++)
--               {
--                  std::unique_ptr<const geos::geom::Point> point(lineString->getPointN(idx));
--                  polyList[currentPolyIdx].addPoint(point->getX(), point->getY());
--               }
--            }
--         }
-+         getVisiblePolygons(geomPtr, polygons);
-       }
-    }
-    else
-    {
--      int idx = 0;
--      
--      for (idx=0; idx < nGeoms; idx++)
-+      for (int idx = 0; idx < nGeoms; ++idx)
-       {
--         recurseHoles(polyList, geom->getGeometryN(idx));
-+         geomPtr = GEOSGetGeometryN(geom, idx);
-+         recurseVisibleGeometries(geomPtr, polygons);
-       }
-    }
- }
- 
--void ossimPolyArea2d::recurseCompleteGeometries(std::vector<ossimPolyArea2d>& polyList,
--                                                const geos::geom::Geometry* geom) const
-+void ossimPolyArea2dPrivate::recurseGeometryHoles(ConstGEOSGeometryPtr geom,
-+                                                  ossimPolygon::Vector &polygons) const
- {
--   int nGeoms = (int)geom->getNumGeometries();
--   if(nGeoms < 2 )
-+   ossim_int32 nGeoms = GEOSGetNumGeometries(geom);
-+   ConstGEOSGeometryPtr geomPtr = 0;
-+   if (nGeoms < 2)
-    {
--      const geos::geom::Polygon* poly = dynamic_cast<const geos::geom::Polygon*> (geom);
-+      ossim_int32 nInteriorRings = GEOSGetNumInteriorRings(geom);
-+      ossim_int32 idx = 0;
- 
--      if (poly)
-+      for (idx = 0; idx < nInteriorRings; ++idx)
-       {
--         //get exterior shell for the geometry
--         ossimPolygon shell;
--         const geos::geom::LineString* lineString =
--            dynamic_cast<const geos::geom::LineString*> (poly->getExteriorRing());
--         if (lineString)
--         {
--            int nPoints = (int)lineString->getNumPoints();
--            for (int idx = 0; idx<nPoints; idx++)
--            {
--               std::unique_ptr<const geos::geom::Point> point(lineString->getPointN(idx));
--               shell.addPoint(point->getX(), point->getY());
--            }
--         }
--         
--         // Get interior rings for the geometry.
--         std::size_t nInteriorRings = poly->getNumInteriorRing();
--         vector<ossimPolygon> holes(nInteriorRings);
--         for(std::size_t holeIdx = 0; holeIdx < nInteriorRings; ++holeIdx)
--         {
--            const geos::geom::LineString* lineString = poly->getInteriorRingN(holeIdx);
--            if (lineString)
--            {
--               std::size_t nPoints = lineString->getNumPoints();
--               for (std::size_t idx = 0; idx<nPoints; ++idx)
--               {
--                  std::unique_ptr<const geos::geom::Point> point(lineString->getPointN(idx));
--                  holes[holeIdx].addPoint(point->getX(), point->getY());
--               }
--            }
--         }
--         polyList.push_back(ossimPolyArea2d(shell, holes));
-+         const GEOSGeometry *ringGeom = GEOSGetInteriorRingN(geom, idx);
-+         getHoles(ringGeom, polygons);
-       }
-    }
-    else
-    {
--      int idx = 0;
--      
--      for (idx=0; idx < nGeoms; idx++)
-+      for (int idx = 0; idx < nGeoms; ++idx)
-       {
--         recurseCompleteGeometries(polyList, geom->getGeometryN(idx));
-+         geomPtr = GEOSGetGeometryN(geom, idx);
-+         recurseGeometryHoles(geomPtr, polygons);
-       }
-    }
- }
- 
--std::ostream& operator <<(std::ostream& out, const ossimPolyArea2d& rhs)
-+bool ossimPolyArea2dPrivate::getVisiblePolygons(ossimPolygon::Vector &polygons) const
- {
--   if(rhs.m_privateData->m_geometry)
-+   bool foundPolys = false;
-+   if (m_geometry)
-    {
--      out << rhs.m_privateData->m_geometry->toString();
-+      ossim_uint32 sizeBefore = (ossim_uint32)polygons.size();
-+      recurseVisibleGeometries(m_geometry, polygons);
-+      foundPolys = (sizeBefore != polygons.size());
-    }
--   return out;
--}
- 
--ossimPolyArea2d::ossimPolyArea2d()
--   :m_privateData(new OssimPolyArea2dPrivate)
--{
-+   return foundPolys;
- }
--
--ossimPolyArea2d::ossimPolyArea2d(const vector<ossimGpt>& polygon)
--   :m_privateData(new OssimPolyArea2dPrivate)
-+bool ossimPolyArea2dPrivate::getPolygonHoles(ossimPolygon::Vector &polygons) const
- {
--   (*this) = polygon;
-+   return getPolygonHoles(m_geometry, polygons);
- }
- 
--ossimPolyArea2d::ossimPolyArea2d(const vector<ossimDpt>& polygon)
--   :m_privateData(new OssimPolyArea2dPrivate)
-+bool ossimPolyArea2dPrivate::getPolygonHoles(ConstGEOSGeometryPtr geom,
-+                                             ossimPolygon::Vector &polygons) const
- {
--   (*this) = polygon;
--}
-+   bool foundPolys = false;
-+   if (m_geometry)
-+   {
-+      ossim_uint32 sizeBefore = (ossim_uint32)polygons.size();
-+      recurseGeometryHoles(m_geometry, polygons);
-+      foundPolys = (sizeBefore != polygons.size());
-+   }
- 
--ossimPolyArea2d::ossimPolyArea2d(const ossimIrect& rect)
--   :m_privateData(new OssimPolyArea2dPrivate)
--{
--   (*this) = rect;
-+   return foundPolys;
- }
- 
--ossimPolyArea2d::ossimPolyArea2d(const ossimDrect& rect)
--   :m_privateData(new OssimPolyArea2dPrivate)
-+std::string ossimPolyArea2dPrivate::toString() const
- {
--   (*this) = rect;
--}
-+   std::string result;
- 
--ossimPolyArea2d::ossimPolyArea2d(const ossimPolygon& polygon)
--   :m_privateData(new OssimPolyArea2dPrivate)
--{
--   (*this) = polygon;
--}
-+   if (m_geometry)
-+   {
-+      GEOSWKTWriter *wktWriter = GEOSWKTWriter_create();
-+      GEOSWKTWriter_setRoundingPrecision(wktWriter, 20);
-+      char *wkt_c = GEOSWKTWriter_write(wktWriter, m_geometry);
- 
--ossimPolyArea2d::ossimPolyArea2d(const ossimPolygon& exteriorRing, const vector<ossimPolygon>& interiorRings)
--   :m_privateData(new OssimPolyArea2dPrivate)
--{	
--	m_privateData->setGeometry(exteriorRing, interiorRings);
--}
-+      result = wkt_c;
-+      GEOSWKTWriter_destroy(wktWriter);
- 
--ossimPolyArea2d::ossimPolyArea2d(const ossimPolyArea2d& rhs)
--   :m_privateData(new OssimPolyArea2dPrivate) 
--{
--   *this = rhs;
--}
-+      GEOSFree(wkt_c);
-+   }
- 
--ossimPolyArea2d::ossimPolyArea2d(const ossimDpt& p1,
--                                 const ossimDpt& p2,
--                                 const ossimDpt& p3,
--                                 const ossimDpt& p4)
--   :
--   m_privateData(new OssimPolyArea2dPrivate)
-+   return result;
-+}
-+bool ossimPolyArea2dPrivate::setFromWkt(const std::string &s)
- {
--   ossimPolygon temp(p1,p2,p3,p4);
--   *this = temp;
-+   bool result = false;
-+
-+   GEOSWKTReader *reader = GEOSWKTReader_create();
-+   GEOSGeometry *geom = GEOSWKTReader_read(reader, s.c_str());
-+   result = (geom != 0);
-+   setGeometry(geom);
-+
-+   GEOSWKTReader_destroy(reader);
-+
-+   return result;
- }
- 
--ossimPolyArea2d::~ossimPolyArea2d()
-+
-+bool ossimPolyArea2dPrivate::isEmpty() const
- {
--   if(m_privateData)
-+   bool result = true;
-+   if (m_geometry)
-    {
--      delete m_privateData;
--      m_privateData = 0;
-+      result = (GEOSisEmpty(m_geometry) == 1);
-    }
-+
-+   return result;
- }
- 
--const ossimPolyArea2d& ossimPolyArea2d::operator =(const ossimPolyArea2d& rhs)
--{ 
--   if(this != &rhs)
-+bool ossimPolyArea2dPrivate::isValid(bool displayValidationError) const
-+{
-+   bool result = false;
-+
-+   if (!displayValidationError)
-    {
--      if(rhs.m_privateData->m_geometry)
-+      result = GEOSisValid(m_geometry) == 1;
-+   }
-+   else
-+   {
-+      char *reason = GEOSisValidReason(m_geometry);
-+      if (reason)
-       {
--         m_privateData->setGeometry(rhs.m_privateData->m_geometry->clone());
-+         ossimNotify(ossimNotifyLevel_INFO)
-+             << "ossimPolyArea2dPrivate::isValid: " << reason << "\n";
-+
-+         GEOSFree(reason);
-+         reason = 0;
-       }
-    }
--   return *this;
-+
-+   return result;
-+}
-+bool ossimPolyArea2dPrivate::isPointWithin(const ossimDpt &pt) const
-+{
-+   bool result = false;
-+
-+   if (!isEmpty())
-+   {
-+      GEOSCoordSequence *pointSeq = GEOSCoordSeq_create(1, 2);
-+      GEOSCoordSeq_setXY(pointSeq, 0, pt.x, pt.y);
-+      GEOSGeometry *geom = GEOSGeom_createPoint(pointSeq);
-+      result = (GEOSWithin(geom, m_geometry) == 1);
-+
-+      GEOSGeom_destroy(geom);
-+   }
-+
-+   return result;
-+}
-+
-+
-+ossimPolyArea2d::ossimPolyArea2d()
-+    : m_privateData(new ossimPolyArea2dPrivate())
-+{
- }
- 
--const ossimPolyArea2d& ossimPolyArea2d::operator =(const ossimPolygon& polygon)
-+ossimPolyArea2d::ossimPolyArea2d(const std::vector<ossimGpt> &polygon)
-+    : m_privateData(new ossimPolyArea2dPrivate())
- {
-    m_privateData->setGeometry(polygon);
-+}
- 
--   return *this;
-+ossimPolyArea2d::ossimPolyArea2d(const std::vector<ossimDpt> &polygon)
-+    : m_privateData(new ossimPolyArea2dPrivate())
-+{
-+   m_privateData->setGeometry(polygon);
- }
- 
--const ossimPolyArea2d& ossimPolyArea2d::operator =(const ossimIrect& rect)
-+ossimPolyArea2d::ossimPolyArea2d(const ossimPolygon &shell, const std::vector<ossimPolygon> &holes)
-+    : m_privateData(new ossimPolyArea2dPrivate())
- {
--   return (*this = ossimPolygon(rect));
-+   m_privateData->setGeometry(shell, holes);
- }
- 
--const ossimPolyArea2d& ossimPolyArea2d::operator =(const ossimDrect& rect)
-+ossimPolyArea2d::ossimPolyArea2d(const ossimDpt &p1,
-+                                 const ossimDpt &p2,
-+                                 const ossimDpt &p3,
-+                                 const ossimDpt &p4)
-+    : m_privateData(new ossimPolyArea2dPrivate())
- {
--   return (*this = ossimPolygon(rect));
-+   m_privateData->setGeometry(ossimPolygon(p1, p2, p3, p4));
- }
- 
--const ossimPolyArea2d& ossimPolyArea2d::operator =(const vector<ossimGpt>& polygon)
-+ossimPolyArea2d::ossimPolyArea2d(const ossimPolyArea2d &rhs)
-+    : m_privateData(new ossimPolyArea2dPrivate())
- {
--   std::vector<ossimDpt> pts;
--   int idx = 0;
--   int n = (int)polygon.size();
--   for(idx = 0; idx < n;++idx)
--   {
--      pts.push_back(polygon[idx]);
--   }
--  
--   return (*this = ossimPolygon(pts));
-+   m_privateData->deleteGeometry();
-+   m_privateData->m_geometry = GEOSGeom_clone(rhs.m_privateData->m_geometry);
- }
- 
--const ossimPolyArea2d& ossimPolyArea2d::operator =(const vector<ossimDpt>& polygon)
-+ossimPolyArea2d::ossimPolyArea2d(const ossimIrect &rect)
-+    : m_privateData(new ossimPolyArea2dPrivate())
- {
--   return (*this = ossimPolygon(polygon));
-+   m_privateData->setGeometry(ossimPolygon(rect));
- }
- 
--bool ossimPolyArea2d::intersects(const ossimPolyArea2d& rhs)const
-+ossimPolyArea2d::ossimPolyArea2d(const ossimDrect &rect)
-+    : m_privateData(new ossimPolyArea2dPrivate())
- {
--   bool result = false;
-+   m_privateData->setGeometry(ossimPolygon(rect));
-+}
- 
--   if(m_privateData->m_geometry&&rhs.m_privateData->m_geometry)
-+ossimPolyArea2d::ossimPolyArea2d(const ossimPolygon &polygon)
-+    : m_privateData(new ossimPolyArea2dPrivate())
-+{
-+   m_privateData->setGeometry(polygon);
-+}
-+
-+ossimPolyArea2d::~ossimPolyArea2d()
-+{
-+   if (m_privateData)
-    {
--      result = m_privateData->m_geometry->intersects(rhs.m_privateData->m_geometry); 
-+      delete m_privateData;
-    }
-+   m_privateData = 0;
-+}
- 
--   return result;
-+void ossimPolyArea2d::clearPolygons()
-+{
-+   m_privateData->setGeometry(GEOSGeom_createEmptyPolygon());
- }
- 
--ossimPolyArea2d ossimPolyArea2d::operator &(const ossimPolyArea2d& rhs)const
-+const ossimPolyArea2d &ossimPolyArea2d::operator=(const ossimPolyArea2d &rhs)
- {
--   if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry)
-+   if (&rhs != this)
-    {
--      ossimPolyArea2d result;
--      try // GEOS code throws exceptions...
--      {
--         result.m_privateData->setGeometry(m_privateData->m_geometry->intersection(
--                                              rhs.m_privateData->m_geometry));
--      }
--      catch( const std::exception& e )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator& Caught exception: " << e.what() << std::endl;
--         result.clearPolygons();
--      }
--      catch( ... )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator& Caught exception!" << std::endl;
--         result.clearPolygons();
--      }
--      return result;
-+      m_privateData->deleteGeometry();
-+      m_privateData->m_geometry = GEOSGeom_clone(rhs.m_privateData->m_geometry);
-    }
-+
-    return *this;
- }
- 
--ossimPolyArea2d ossimPolyArea2d::operator +(const ossimPolyArea2d& rhs)const
-+const ossimPolyArea2d &ossimPolyArea2d::operator=(const ossimPolygon &rhs)
- {
--   if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry)
--   {
--      ossimPolyArea2d result;
--      try // GEOS code throws exceptions...
--      {
--         result.m_privateData->setGeometry(m_privateData->m_geometry->Union(
--                                              rhs.m_privateData->m_geometry));
--      }  
--      catch( const std::exception& e )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator+ Caught exception: " << e.what() << std::endl;
--         result.clearPolygons();
--      }
--      catch( ... )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator+ Caught exception!" << std::endl;
--         result.clearPolygons();
--      }
--      return result;
--   }
-+   m_privateData->setGeometry(rhs);
-+
-    return *this;
- }
--ossimPolyArea2d ossimPolyArea2d::operator -(const ossimPolyArea2d& rhs)const
-+
-+const ossimPolyArea2d &ossimPolyArea2d::operator=(const ossimIrect &rect)
- {
--   if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry)
--   {
--      ossimPolyArea2d result;
--      try // GEOS code throws exceptions...
--      {
--         result.m_privateData->setGeometry(m_privateData->m_geometry->difference(
--                                              rhs.m_privateData->m_geometry));
--      }
--      catch( const std::exception& e )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator- Caught exception: " << e.what() << std::endl;
--         result.clearPolygons();
--      }
--      catch( ... )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator- Caught exception!" << std::endl;
--         result.clearPolygons();
--      }
--      return result;
--   }
-+   m_privateData->setGeometry(ossimPolygon(rect));
-+
-    return *this;
- }
- 
--const ossimPolyArea2d& ossimPolyArea2d::operator &=(const ossimPolyArea2d& rhs)
-+const ossimPolyArea2d &ossimPolyArea2d::operator=(const ossimDrect &rect)
- {
--   if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry)
--   {
--      try // GEOS code throws exceptions...
--      {
--         m_privateData->setGeometry(m_privateData->m_geometry->intersection(
--                                       rhs.m_privateData->m_geometry));
--      }
--      catch( const std::exception& e )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator&= Caught exception: " << e.what() << std::endl;
--         this->clearPolygons();
--      }
--      catch( ... )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator&= Caught exception!" << std::endl;
--         this->clearPolygons();
--      }      
--   }
-+   m_privateData->setGeometry(ossimPolygon(rect));
-+
-    return *this;
- }
- 
--const ossimPolyArea2d& ossimPolyArea2d::operator +=(const ossimPolyArea2d& rhs)
-+const ossimPolyArea2d &ossimPolyArea2d::operator=(const std::vector<ossimGpt> &polygon)
- {
--   if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry)
--   {
--      try // GEOS code throws exceptions...
--      {
--         m_privateData->setGeometry(m_privateData->m_geometry->Union(
--                                       rhs.m_privateData->m_geometry));
--      }
--      catch( const std::exception& e )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator+= Caught exception: " << e.what() << std::endl;
--         this->clearPolygons();
--      }
--      catch( ... )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator+= Caught exception!" << std::endl;
--         this->clearPolygons();
--      }      
--   }
-+   m_privateData->setGeometry(ossimPolygon(polygon));
-+
-    return *this;
- }
- 
--const ossimPolyArea2d& ossimPolyArea2d::operator -=(const ossimPolyArea2d& rhs)
-+const ossimPolyArea2d &ossimPolyArea2d::operator=(const std::vector<ossimDpt> &polygon)
- {
--   if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry)
--   {
--      try // GEOS code throws exceptions...
--      {
--         m_privateData->setGeometry(m_privateData->m_geometry->difference(
--                                       rhs.m_privateData->m_geometry));
--      }
--      catch( const std::exception& e )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator-= Caught exception: " << e.what() << std::endl;
--         this->clearPolygons();
--      }
--      catch( ... )
--      {
--         ossimNotify(ossimNotifyLevel_DEBUG)
--            << "ossimPolyArea2d::operator-= Caught exception!" << std::endl;
--         this->clearPolygons();
--      }      
--   }
-+   m_privateData->setGeometry(ossimPolygon(polygon));
-+
-    return *this;
- }
- 
--void ossimPolyArea2d::add(const ossimPolyArea2d& rhs)
-+const ossimPolyArea2d &ossimPolyArea2d::operator&=(const ossimPolyArea2d &rhs)
- {
--   if(isEmpty())
--   {
--      *this=rhs;
--   }
--   else
--   {
--      geos::geom::Geometry* geom = m_privateData->m_geometry->Union(rhs.m_privateData->m_geometry);
--      if(geom) m_privateData->setGeometry(geom);
--   }
-+   GEOSGeometry *geom = GEOSIntersection(m_privateData->m_geometry, rhs.m_privateData->m_geometry);
-+   m_privateData->setGeometry(geom);
-+
-+   return *this;
- }
- 
--void ossimPolyArea2d::clearPolygons()
-+ossimPolyArea2d ossimPolyArea2d::operator&(const ossimPolyArea2d &rhs) const
- {
--   m_privateData->deleteGeometry();
--#if 0
--   clearEngine();
--#endif
-+   ossimPolyArea2d result(*this);
-+
-+   result &= rhs;
-+
-+   return result;
- }
- 
--bool ossimPolyArea2d::getVisiblePolygons(vector<ossimPolygon>& polyList)const
-+ossimPolyArea2d ossimPolyArea2d::operator+(const ossimPolyArea2d &rhs) const
- {
--   bool foundPolys = false;
--   if(m_privateData->m_geometry)
--   {
--      ossim_uint32 sizeBefore = (ossim_uint32)polyList.size();
--      recurseVisibleGeometries(polyList, m_privateData->m_geometry);
--      foundPolys = (sizeBefore != polyList.size());
--   }
-+   ossimPolyArea2d result(*this);
- 
--   return foundPolys;
-+   result += rhs;
-+
-+   return result;
- }
- 
--bool ossimPolyArea2d::getPolygonHoles(vector<ossimPolygon>& polyList)const
-+const ossimPolyArea2d &ossimPolyArea2d::operator+=(const ossimPolyArea2d &rhs)
- {
--   bool foundPolys = false;
--   if(m_privateData->m_geometry)
--   {
--      ossim_uint32 sizeBefore = (ossim_uint32)polyList.size();
--      recurseHoles(polyList, m_privateData->m_geometry);
--      foundPolys = (sizeBefore != polyList.size());
--   }
-+   GEOSGeometry *geom = GEOSUnion(m_privateData->m_geometry, rhs.m_privateData->m_geometry);
- 
--   return foundPolys;
-+   m_privateData->setGeometry(geom);
-+
-+   return *this;
- }
- 
--bool ossimPolyArea2d::getCompletePolygons(vector<ossimPolyArea2d>& polyList)const
-+ossimPolyArea2d ossimPolyArea2d::operator-(const ossimPolyArea2d &rhs) const
- {
--	bool foundPolys = false;
--	if(m_privateData->m_geometry){
--		ossim_uint32 sizeBefore = (ossim_uint32)polyList.size();
--		recurseCompleteGeometries(polyList, m_privateData->m_geometry);
--		foundPolys = (sizeBefore != polyList.size());
--	}
--	return foundPolys;
-+   ossimPolyArea2d result(*this);
-+
-+   result -= rhs;
-+
-+   return result;
- }
- 
--bool ossimPolyArea2d::isEmpty()const
-+const ossimPolyArea2d &ossimPolyArea2d::operator-=(const ossimPolyArea2d &rhs)
- {
--   bool result = true;
--   if (m_privateData&&m_privateData->m_geometry)
--   {
--      result = m_privateData->m_geometry->isEmpty();
--   }
-+   GEOSGeometry *geom = GEOSDifference(m_privateData->m_geometry, rhs.m_privateData->m_geometry);
- 
--   return result;
-+   m_privateData->setGeometry(geom);
-+
-+   return *this;
- }
- 
--bool ossimPolyArea2d::isValid(bool displayValidationError)const
-+ossim_float64 ossimPolyArea2d::getArea()const
- {
--   bool result = false;
-+   double result = 0.0;
-    
--   if(m_privateData&&m_privateData->m_geometry)
-+   if(!isEmpty())
-    {
--      if(displayValidationError)
--      {
--         geos::operation::valid::IsValidOp validityCheck(m_privateData->m_geometry);
--         geos::operation::valid::TopologyValidationError*
--            topologyValidationError(validityCheck.getValidationError());
--         // if(topologyValidationError == nullptr)
--         if(topologyValidationError == 0)
--         {
--            result = true;
--         }
--         else
--         {
--            ossimNotify(ossimNotifyLevel_INFO)
--               << "ossimPolyArea2d::isValid: " << topologyValidationError->toString() << std::endl;
--         }
--      }
--      else
--      {
--         result = m_privateData->m_geometry->isValid();
--      }
-+      GEOSArea(m_privateData->m_geometry, &result);
-    }
--   
-+
-    return result;
- }
- 
--bool ossimPolyArea2d::isPointWithin(const ossimDpt& point)const
-+bool ossimPolyArea2d::isEmpty() const
- {
--   return isPointWithin(point.x, point.y);
-+   return m_privateData->isEmpty();
- }
- 
--bool ossimPolyArea2d::isPointWithin(double x, double y)const
-+bool ossimPolyArea2d::isValid(bool displayValidationError) const
- {
--   bool result = false;
--
--   if(!isEmpty())
--   {
--      geos::geom::Coordinate c(x,y);
--      geos::geom::Geometry* geom = m_privateData->geomFactory()->createPoint(c);
--  
--      result = m_privateData->m_geometry->intersects(geom);
--
--      delete geom;
--   }
-+   return m_privateData->isValid(displayValidationError);
-+}
- 
--   return result;
-+bool ossimPolyArea2d::isPointWithin(const ossimDpt &point) const
-+{
-+   return m_privateData->isPointWithin(point);
- }
- 
--void ossimPolyArea2d::getBoundingRect(ossimDrect& rect)
-+bool ossimPolyArea2d::isPointWithin(double x, double y) const
- {
--   rect.makeNan();
-+   return isPointWithin(ossimDpt(x, y));
-+}
- 
--   if(!isEmpty())
--   {
--      const geos::geom::Envelope* envelope = m_privateData->m_geometry->getEnvelopeInternal();
-+void ossimPolyArea2d::getBoundingRect(ossimDrect &rect) const
-+{
-+   m_privateData->getBoundingRect(rect);
-+}
- 
--      rect = ossimDrect(envelope->getMinX(), envelope->getMinY(), envelope->getMaxX(), envelope->getMaxY());
--   }
-+bool ossimPolyArea2d::intersects(const ossimPolyArea2d &rhs) const
-+{
-+   return (GEOSIntersects(m_privateData->m_geometry,
-+                          rhs.m_privateData->m_geometry) == 1);
- }
- 
--std::string ossimPolyArea2d::toString()const
-+void ossimPolyArea2d::makeValid()
- {
--   std::string result = "";
-+   ossimPolyArea2dPrivate::GEOSGeometryPtr geom = GEOSMakeValid(m_privateData->m_geometry);
-+   if(geom) m_privateData->setGeometry(geom);
-+}
- 
--   if(m_privateData->m_geometry)
--   {
--      result = m_privateData->m_geometry->toString();
--   }
- 
--   return result;
-+void ossimPolyArea2d::add(const ossimPolyArea2d &rhs)
-+{
-+   *this += rhs;
- }
- 
--ossimPolyArea2d ossimPolyArea2d::getBufferedShape(double distance) const{
--	ossimPolyArea2d result;
--	try{
--		geos::operation::buffer::BufferOp buffer_operation(m_privateData->m_geometry);
--		result.m_privateData->setGeometry( buffer_operation.getResultGeometry(distance));
--	}catch( const std::exception& e ){
--		ossimNotify(ossimNotifyLevel_DEBUG)
--			<< "ossimPolyArea2d::getBufferedShape Caught exception: " << e.what() << std::endl;
--		result.clearPolygons();
--	}catch( ... ){
--		ossimNotify(ossimNotifyLevel_DEBUG)
--			<< "ossimPolyArea2d::getBufferedShape Caught exception!" << std::endl;
--		result.clearPolygons();
--	}
--	return result;
--}
--ossimPolyArea2d& ossimPolyArea2d::setToBufferedShape(double distance)
--{
--   try{
--      geos::operation::buffer::BufferOp buffer_operation(m_privateData->m_geometry);
--      m_privateData->setGeometry( buffer_operation.getResultGeometry(distance));
--   }catch( const std::exception& e ){
--      ossimNotify(ossimNotifyLevel_DEBUG)
--         << "ossimPolyArea2d::getBufferedShape Caught exception: " << e.what() << std::endl;
--   }catch( ... ){
--      ossimNotify(ossimNotifyLevel_DEBUG)
--         << "ossimPolyArea2d::getBufferedShape Caught exception!" << std::endl;
--   }
--   return *this;
-+bool ossimPolyArea2d::getVisiblePolygons(std::vector<ossimPolygon> &polyList) const
-+{
-+   m_privateData->getVisiblePolygons(polyList);
-+
-+   return (polyList.size() > 0);
- }
- 
--ossimPolyArea2d& ossimPolyArea2d::toMultiPolygon()
-+bool ossimPolyArea2d::getPolygonHoles(std::vector<ossimPolygon> &polyList) const
- {
-+   m_privateData->getPolygonHoles(polyList);
- 
-+   return (polyList.size() > 0);
-+}
- 
--   try{
--      if(m_privateData->m_geometry)
--      {
--         switch(m_privateData->m_geometry->getGeometryTypeId())
--         {
--            case geos::geom::GEOS_POLYGON:
--            {
--               std::vector<geos::geom::Geometry*> values;
--               values.push_back(m_privateData->m_geometry->clone());
--
--               m_privateData->setGeometry(m_privateData->m_geometry->getFactory()->createMultiPolygon(values));
--               break;
--            }
--            case geos::geom::GEOS_MULTIPOLYGON:
--            {
--               // intentionally left blank
--               break;
--            }
--            default:
--            {  
--               // might need an error at a later date
--               ossimNotify(ossimNotifyLevel_WARN)
--                  << "ossimPolyArea2d::toMultiPolygon Geometry type can not be converted to a multi polygon: " <<m_privateData->m_geometry->getGeometryType()<< std::endl;
-+ossimPolyArea2d &ossimPolyArea2d::toMultiPolygon()
-+{
-+   int geomType = GEOSGeomTypeId(m_privateData->m_geometry);
- 
--               break;
--            }
--         }
--      }
--   }
--   catch(const std::exception& e)
--   {
--      ossimNotify(ossimNotifyLevel_WARN)
--         << "ossimPolyArea2d::toMultiPolygon Caught exception: " << e.what() << std::endl;
--   }
--   catch(...)
-+   if (geomType != GEOS_MULTIPOLYGON)
-    {
--      ossimNotify(ossimNotifyLevel_WARN)
--         << "ossimPolyArea2d::toMultiPolygon Caught exception!" << std::endl;
-+      std::vector<GEOSGeometry *> geoms(1);
-+      geoms[0] = GEOSGeom_clone(m_privateData->m_geometry);
-+      GEOSGeometry *result = GEOSGeom_createCollection(GEOS_MULTIPOLYGON,
-+                                                       &geoms.front(), 1);
-+      m_privateData->setGeometry(result);
-    }
- 
-    return *this;
- }
- 
--bool ossimPolyArea2d::saveState(ossimKeywordlist& kwl,
--                                const char* prefix)const
-+std::string ossimPolyArea2d::toString() const
-+{
-+   return m_privateData->toString();
-+}
-+
-+bool ossimPolyArea2d::setFromWkt(const std::string &s)
-+{
-+   return m_privateData->setFromWkt(s);
-+}
-+
-+bool ossimPolyArea2d::saveState(ossimKeywordlist &kwl,
-+                                const char *prefix) const
- {
-    kwl.add(prefix,
-            ossimKeywordNames::TYPE_KW,
-            "ossimPolyArea2d",
-            true);
- 
--   if(!isEmpty())
-+   if (!isEmpty())
-    {
--      geos::io::WKTWriter writer;
- 
-       kwl.add(prefix,
-               "wkt",
--              writer.write(m_privateData->m_geometry).c_str(),
-+              toString().c_str(),
-               true);
-    }
--   // else
--   // {
--   //
--   // }
--
-    return true;
- }
- 
--bool ossimPolyArea2d::loadState(const ossimKeywordlist& kwl,
--                                const char* prefix)
-+bool ossimPolyArea2d::loadState(const ossimKeywordlist &kwl,
-+                                const char *prefix)
- {
--   if(m_privateData)
-+   bool result = true;
-+
-+   if (m_privateData)
-    {
-       ossimString wkt = kwl.find(prefix, "wkt");
- 
--      if(!wkt.empty())
-+      if (!wkt.empty())
-       {
--         geos::io::WKTReader reader(m_privateData->geomFactory());
--         try
--         {
--            m_privateData->setGeometry(reader.read(wkt.c_str()));
--         }
--         catch( const std::exception& e )
--         {
--            ossimNotify(ossimNotifyLevel_DEBUG)
--               << "ossimPolyArea2d::loadState Caught exception: " << e.what() << std::endl;
--            this->clearPolygons();
--         }
--         catch(...)
--         {
--            ossimNotify(ossimNotifyLevel_DEBUG)
--               << "ossimPolyArea2d::loadState Caught exception!" << std::endl;
--            this->clearPolygons(); 
--         }
-+         result = setFromWkt(wkt.string());
-       }
-    }
--   return true;
-+
-+   return result;
-+}
-+
-+std::ostream &operator<<(std::ostream &out, const ossimPolyArea2d &rhs)
-+{
-+   if (!rhs.isEmpty())
-+   {
-+      out << rhs.toString();
-+   }
-+
-+   return out;
- }
-diff --git a/src/imaging/ossimImageGeometry.cpp b/src/imaging/ossimImageGeometry.cpp
-index f7b054a8..148aeea4 100644
---- a/src/imaging/ossimImageGeometry.cpp
-+++ b/src/imaging/ossimImageGeometry.cpp
-@@ -1240,7 +1240,7 @@ void ossimImageGeometry::calculatePolyBounds(ossimPolyArea2d& result, ossim_uint
-       }
-       result.add(ossimPolygon(gPoints));
-    }
--   if(!result.isValid()) result.setToBufferedShape();
-+   if(!result.isValid()) result.makeValid();
- }
- 
- 
-diff --git a/src/init/ossimInit.cpp b/src/init/ossimInit.cpp
-index 19b28113..9aeec9de 100644
---- a/src/init/ossimInit.cpp
-+++ b/src/init/ossimInit.cpp
-@@ -65,12 +65,59 @@
- 
- #include <algorithm>
- #include <mutex>
-+#include <geos_c.h>
- 
- using namespace std;
- 
- static ossimTrace traceExec = ossimTrace("ossimInit:exec");
- static ossimTrace traceDebug = ossimTrace("ossimInit:debug");
- 
-+extern "C"
-+{
-+   void geosNoticeFunction(const char *fmt, ...);
-+   void geosErrorFunction(const char *fmt, ...);
-+}
-+
-+ossimString geosErrorV(const char *fmt, va_list args)
-+{
-+   char temp[2024];
-+   if (fmt)
-+   {
-+      vsprintf(temp, fmt, args);
-+   }
-+   else
-+   {
-+      sprintf(temp, "%s", "");
-+   }
-+
-+   return temp;
-+}
-+
-+void geosNoticeFunction(const char *fmt, ...)
-+{
-+   // NOTE: This code has an infinite loop in it!!! (drb)
-+   //std::lock_guard<std::mutex> lock(theMutex);
-+   // theMutex.lock();
-+   va_list args;
-+
-+   va_start(args, fmt);
-+   ossimString result = geosErrorV(fmt, args);
-+   va_end(args);
-+   // theMutex.unlock();
-+   ossimNotify(ossimNotifyLevel_WARN) << result << "\n";
-+}
-+
-+void geosErrorFunction(const char *fmt, ...)
-+{
-+   va_list args;
-+
-+   va_start(args, fmt);
-+   ossimString result = geosErrorV(fmt, args);
-+   va_end(args);
-+   // theMutex.unlock();
-+   ossimNotify(ossimNotifyLevel_WARN) << result << "\n";
-+}
-+
- ossimInit* ossimInit::theInstance = 0;
- 
- ossimInit::~ossimInit()
-@@ -122,6 +169,8 @@ void ossimInit::initialize(int& argc, char** argv)
- {
-    static std::mutex m;
-    std::lock_guard<std::mutex> lock(m);
-+   initGEOS(geosNoticeFunction, geosErrorFunction);
-+
-    if( !theInitializedFlag )
-    {
-       ossimArgumentParser argumentParser(&argc, argv);
-@@ -262,7 +311,7 @@ void ossimInit::initialize()
- 
- void ossimInit::finalize()
- {
--   
-+   finishGEOS();
- }
- /*!****************************************************************************
-  *  Prints to stdout the list of command line options that this object parses.
diff --git a/gis/ossim/ossim.SlackBuild b/gis/ossim/ossim.SlackBuild
index 61475da33a..54c0ff178f 100644
--- a/gis/ossim/ossim.SlackBuild
+++ b/gis/ossim/ossim.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for ossim
 
-# Copyright 2018-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2018-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,8 +25,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ossim
-RELNAM=Neptune
-VERSION=${VERSION:-2.10.0}
+RELNAM=OrchidIsland
+VERSION=${VERSION:-2.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,9 +73,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 sed -i "s/lib\b/lib${LIBDIRSUFFIX}/" CMakeLists.txt
-patch -p1 < $CWD/c45639.patch
-patch -p1 < $CWD/c0d975.patch
-patch -p1 < $CWD/0498f7.patch
 
 mkdir -p build
 cd build
diff --git a/gis/ossim/ossim.info b/gis/ossim/ossim.info
index 76489c6579..4484866bb7 100644
--- a/gis/ossim/ossim.info
+++ b/gis/ossim/ossim.info
@@ -1,8 +1,8 @@
 PRGNAM="ossim"
-VERSION="2.10.0"
+VERSION="2.11.1"
 HOMEPAGE="https://trac.osgeo.org/ossim/"
-DOWNLOAD="https://github.com/ossimlabs/ossim/archive/Neptune-2.10.0/ossim-Neptune-2.10.0.tar.gz"
-MD5SUM="a78f148936ae35a32da5fdb15c1362f5"
+DOWNLOAD="https://github.com/ossimlabs/ossim/archive/OrchidIsland-2.11.1/ossim-OrchidIsland-2.11.1.tar.gz"
+MD5SUM="7a24fe73e990e0d0f286b5675c0ab6e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geos jsoncpp libgeotiff"
diff --git a/gis/pdal/pdal.SlackBuild b/gis/pdal/pdal.SlackBuild
index 3e2e4d3736..0c888539a4 100644
--- a/gis/pdal/pdal.SlackBuild
+++ b/gis/pdal/pdal.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pdal
 
-# Copyright 2013-2019 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.0.1}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pdal/pdal.info b/gis/pdal/pdal.info
index 7754f2a2a0..4de5303903 100644
--- a/gis/pdal/pdal.info
+++ b/gis/pdal/pdal.info
@@ -1,8 +1,8 @@
 PRGNAM="pdal"
-VERSION="2.0.1"
+VERSION="2.2.0"
 HOMEPAGE="http://pointcloud.org"
-DOWNLOAD="https://github.com/PDAL/PDAL/archive/2.0.1/PDAL-2.0.1.tar.gz"
-MD5SUM="787168236b556031e6eeed6ba4dc83a3"
+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 dc552b593d..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-2019 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.9}
+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 3e3d41b8bb..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.9"
+VERSION="1.1.0"
 HOMEPAGE="https://github.com/pramsey/pgsql-ogr-fdw"
-DOWNLOAD="https://github.com/pramsey/pgsql-ogr-fdw/archive/v1.0.9/pgsql-ogr-fdw-1.0.9.tar.gz"
-MD5SUM="0f553c756153a46f13100b0aaec152cc"
+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 1cccd9b781..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.1}
+VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/postgis/postgis.info b/gis/postgis/postgis.info
index ad5bbf3250..5ca7ffcd08 100644
--- a/gis/postgis/postgis.info
+++ b/gis/postgis/postgis.info
@@ -1,10 +1,10 @@
 PRGNAM="postgis"
-VERSION="3.0.1"
+VERSION="3.1.1"
 HOMEPAGE="http://postgis.org"
-DOWNLOAD="http://download.osgeo.org/postgis/source/postgis-3.0.1.tar.gz"
-MD5SUM="93f26f162a3961d08caf3b37a3d5fe5d"
+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 f55cea9df5..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.0}
+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 0241a2409d..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.0"
+VERSION="1.3"
 HOMEPAGE="https://www.osgeo.org/projects/proj/"
-DOWNLOAD="https://github.com/OSGeo/PROJ-data/releases/download/1.0.0/proj-data-1.0.tar.gz"
-MD5SUM="623010e8d864c563fcad6fad0e0f5c0e"
+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 5a0528d547..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.0.0}
+VERSION=${VERSION:-7.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/proj/proj.info b/gis/proj/proj.info
index b44f221a21..56164b690f 100644
--- a/gis/proj/proj.info
+++ b/gis/proj/proj.info
@@ -1,8 +1,8 @@
 PRGNAM="proj"
-VERSION="7.0.0"
+VERSION="7.2.1"
 HOMEPAGE="https://www.osgeo.org/projects/proj/"
-DOWNLOAD="http://download.osgeo.org/proj/proj-7.0.0.tar.gz"
-MD5SUM="5b546675935b930a6266449228c82635"
+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 6c538e4cae..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,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyproj
-VERSION=${VERSION:-2.5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.0.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -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 a9bd577dfb..6586a784a7 100644
--- a/gis/pyproj/pyproj.info
+++ b/gis/pyproj/pyproj.info
@@ -1,8 +1,8 @@
 PRGNAM="pyproj"
-VERSION="2.5.0"
-HOMEPAGE="https://github.com/jswhit/pyproj"
-DOWNLOAD="https://github.com/jswhit/pyproj/archive/v2.5.0rel/pyproj-2.5.0rel.tar.gz"
-MD5SUM="1d5e32caaf1b17f9b15f71beed999597"
+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 fb292ebe3d..79e20d5459 100644
--- a/gis/pyshp/pyshp.SlackBuild
+++ b/gis/pyshp/pyshp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyshp
 
-# Copyright 2014-2019 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.0}
+VERSION=${VERSION:-2.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pyshp/pyshp.info b/gis/pyshp/pyshp.info
index 80feb41b48..3beaa164ff 100644
--- a/gis/pyshp/pyshp.info
+++ b/gis/pyshp/pyshp.info
@@ -1,8 +1,8 @@
 PRGNAM="pyshp"
-VERSION="2.1.0"
+VERSION="2.1.3"
 HOMEPAGE="https://github.com/GeospatialPython/pyshp"
-DOWNLOAD="https://github.com/GeospatialPython/pyshp/archive/2.1.0/pyshp-2.1.0.tar.gz"
-MD5SUM="c4ecdcaf6d4b50377821419cbe331687"
+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/python3-basemap/python3-basemap.SlackBuild b/gis/python3-basemap/python3-basemap.SlackBuild
index 084a3e4703..380a06de90 100644
--- a/gis/python3-basemap/python3-basemap.SlackBuild
+++ b/gis/python3-basemap/python3-basemap.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-basemap
 SRCNAM=basemap
-VERSION=${VERSION:-1.2.1}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/python3-basemap/python3-basemap.info b/gis/python3-basemap/python3-basemap.info
index 256c6f70f8..7b04c1ccc6 100644
--- a/gis/python3-basemap/python3-basemap.info
+++ b/gis/python3-basemap/python3-basemap.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-basemap"
-VERSION="1.2.1"
+VERSION="1.2.2"
 HOMEPAGE="https://github.com/matplotlib/basemap"
-DOWNLOAD="https://github.com/matplotlib/basemap/archive/v1.2.1rel/basemap-1.2.1rel.tar.gz"
-MD5SUM="b3c4c1292b36abac27050eb67ada914e"
+DOWNLOAD="https://github.com/matplotlib/basemap/archive/v1.2.2rel/basemap-1.2.2rel.tar.gz"
+MD5SUM="fe3e9c8ccecb1630a7f44728f48219bc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geos pyproj pyshp python3-matplotlib"
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/README b/gis/qgis/README
index d8f40f5cb6..0a26ed1c80 100644
--- a/gis/qgis/README
+++ b/gis/qgis/README
@@ -1,10 +1,9 @@
-Quantum GIS (QGIS) is a user friendly Geographic Information System
-that lets you view and manipulate spatial data on your computer.  It 
-supports many common spatial data formats (e.g. PostGIS, ShapeFile and
-geotiff).
+QGIS is a user friendly Geographic Information System that lets you view and
+manipulate spatial data on your computer.  It supports many common spatial data
+formats (e.g. PostGIS, ShapeFile and geotiff).
 
 Optional compile-time dependencies: 
- - postgresql and postgis: for PostGIS support
+ - postgis: for PostGIS support
  - gpsbabel: for the GPS plugin
  - grass: for the Grass plugin
  - gsl: for georeferencing support
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild
index f9c9a74866..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,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qgis
-VERSION=${VERSION:-3.12.1}
+VERSION=${VERSION:-3.18.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,10 +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 '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" \
@@ -96,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 -
 
@@ -107,12 +110,13 @@ 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/usr/share/metainfo $PKG/usr/share/appdata
+mkdir -p $PKG/usr/share/mime/packages
+cp debian/qgis.xml $PKG/usr/share/mime/packages
 
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ChangeLog Exception_to_GPL_for_Qt.txt NEWS \
+  ChangeLog Exception_to_GPL_for_Qt.txt NEWS.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info
index 4a3285de66..9c787e8ca7 100644
--- a/gis/qgis/qgis.info
+++ b/gis/qgis/qgis.info
@@ -1,10 +1,10 @@
 PRGNAM="qgis"
-VERSION="3.12.1"
+VERSION="3.18.1"
 HOMEPAGE="https://qgis.org/"
-DOWNLOAD="https://qgis.org/downloads/qgis-3.12.1.tar.bz2"
-MD5SUM="f367300c61b4b4ebb6414d4a04daa4ae"
+DOWNLOAD="https://qgis.org/downloads/qgis-3.18.1.tar.bz2"
+MD5SUM="9d71667d40aa0caf64e2ff0d6e60c5e2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="postgis libspatialite libspatialindex numpy3 qwt-qt5 QScintilla-qt5 qtkeychain qca-qt5 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/QPainterPath.patch b/gis/qmapshack/QPainterPath.patch
new file mode 100644
index 0000000000..7290f76f09
--- /dev/null
+++ b/gis/qmapshack/QPainterPath.patch
@@ -0,0 +1,22 @@
+diff -Naur qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.h qmapshack-V_1.15.0_X/src/qmapshack/helpers/CDraw.h
+--- qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.h	2020-06-14 12:22:49.000000000 +0200
++++ qmapshack-V_1.15.0_X/src/qmapshack/helpers/CDraw.h	2020-06-14 20:55:16.675484111 +0200
+@@ -21,6 +21,7 @@
+ #define CPAINTER_H
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPolygonF>
+ #include <QRectF>
+ 
+diff -Naur qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.h qmapshack-V_1.15.0_X/src/qmaptool/helpers/CDraw.h
+--- qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.h	2020-06-14 12:22:49.000000000 +0200
++++ qmapshack-V_1.15.0_X/src/qmaptool/helpers/CDraw.h	2020-06-14 20:54:50.688816110 +0200
+@@ -21,6 +21,7 @@
+ #define CPAINTER_H
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPolygonF>
+ #include <QRectF>
+ 
diff --git a/gis/qmapshack/qmapshack.SlackBuild b/gis/qmapshack/qmapshack.SlackBuild
index 0fa7de11c3..9cffc01d79 100644
--- a/gis/qmapshack/qmapshack.SlackBuild
+++ b/gis/qmapshack/qmapshack.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for qmapshack
-# Copyright 2015 Daniel Stolarski <daniel.stolarski@gmail.com>
+# Copyright 2015-2020 Daniel Stolarski <daniel.stolarski@gmail.com>
 #
 # This program is free software. It comes without any warranty, to
 # the extent permitted by applicable law. You can redistribute it
@@ -10,7 +10,7 @@
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=qmapshack
-VERSION=${VERSION:-1.14.0}
+VERSION=${VERSION:-1.15.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,10 +46,13 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-V_$VERSION
+rm -rf $PRGNAM-V_${VERSION}
 tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
 cd ${PRGNAM}-V_${VERSION}
 
+# Fix missing header file
+patch -p1 < $CWD/QPainterPath.patch
+
 # Apply patches provided in the source tree
 patch -p1 < FindPROJ4.patch
 patch -p1 < FindQuaZip5.patch
diff --git a/gis/qmapshack/qmapshack.info b/gis/qmapshack/qmapshack.info
index 3575e9631d..97b4d8d9b7 100644
--- a/gis/qmapshack/qmapshack.info
+++ b/gis/qmapshack/qmapshack.info
@@ -1,10 +1,10 @@
 PRGNAM="qmapshack"
-VERSION="1.14.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.14.0/qmapshack-1.14.0.tar.gz"
-MD5SUM_x86_64="9218ac75f61fd8144a2587d2e888414b"
+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 adf0b4115a..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.3}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/rasterio/rasterio.info b/gis/rasterio/rasterio.info
index d7c54aa663..3071637e3e 100644
--- a/gis/rasterio/rasterio.info
+++ b/gis/rasterio/rasterio.info
@@ -1,10 +1,10 @@
 PRGNAM="rasterio"
-VERSION="1.1.3"
+VERSION="1.2.2"
 HOMEPAGE="https://github.com/mapbox/rasterio"
-DOWNLOAD="https://github.com/mapbox/rasterio/archive/1.1.3/rasterio-1.1.3.tar.gz"
-MD5SUM="2aca1f4916287d68f2a1be45e0448d4b"
+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 numpy snuggs numpy3 python3-attrs 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/README b/gis/saga-gis/README
index 9fba69678b..63e9c2f314 100644
--- a/gis/saga-gis/README
+++ b/gis/saga-gis/README
@@ -10,7 +10,8 @@ SAGA can use these optional dependencies: libharu, postgresql and qhull. SAGA
 currently does not build when vigra is installed.
 
 To enable opencv, set OPENCV=ON. By default OpenCV is disabled since SAGA does
-not build when OpenCV version 4 or greater is installed.
+not build when opencv version 4 or greater is installed. For a compatible
+version of OpenCV, use the opencv-legacy SlackBuild.
 
 If SAGA fails to run after an upgrade, uninstall old versions of SAGA before
 compilation.
diff --git a/gis/saga-gis/saga-gis.SlackBuild b/gis/saga-gis/saga-gis.SlackBuild
index 8903f5d2f1..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,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=saga-gis
-VERSION=${VERSION:-7.5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-7.9.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=saga
diff --git a/gis/saga-gis/saga-gis.info b/gis/saga-gis/saga-gis.info
index 9b56c8dacb..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.5.0"
+VERSION="7.9.0"
 HOMEPAGE="http://www.saga-gis.org"
-DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.5.0/saga-7.5.0.tar.gz"
-MD5SUM="36f3a4108eff901e0bb197f5b27d09af"
+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 1e0b9ed4ae..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.2.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 445e40e00c..91df26721f 100644
--- a/gis/whitebox-tools/whitebox-tools.info
+++ b/gis/whitebox-tools/whitebox-tools.info
@@ -1,155 +1,175 @@
 PRGNAM="whitebox-tools"
-VERSION="1.2.0"
+VERSION="1.4.0"
 HOMEPAGE="https://github.com/jblindsay/whitebox-tools"
-DOWNLOAD="https://github.com/jblindsay/whitebox-tools/archive/v1.2.0/whitebox-tools-1.2.0.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/alga/alga-0.9.1.crate \
+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 \
-          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.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/build_const/build_const-0.2.1.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/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/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/bzip2/bzip2-0.3.3.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/c2-chacha/c2-chacha-0.2.2.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/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.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/crc/crc-1.8.1.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/flate2/flate2-1.0.7.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 \
-          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/itoa/itoa-0.4.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/hermit-abi/hermit-abi-0.1.12.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/kdtree/kdtree-0.6.0.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/libflate/libflate-0.1.21.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libm/libm-0.1.4.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.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide_c_api/miniz_oxide_c_api-0.2.1.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.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-complex/num-complex-0.2.3.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.8.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/nalgebra/nalgebra-0.18.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-complex/num-complex-0.2.4.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-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_cpus/num_cpus-1.13.0.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/pdqselect/pdqselect-0.1.0.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.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.27.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.11.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.12.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.4.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.3.23.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/rand-0.6.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.0.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.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.0.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.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_core/rand_core-0.5.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_distr/rand_distr-0.2.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/rand_core/rand_core-0.5.1.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_distr/rand_distr-0.2.2.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_pcg/rand_pcg-0.2.0.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/rand_xorshift/rand_xorshift-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rawpointer/rawpointer-0.1.0.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/redox_syscall/redox_syscall-0.1.51.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.94.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.94.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.40.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/spin/spin-0.5.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 \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/statrs/statrs-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.29.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/typenum/typenum-1.10.0.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/winapi/winapi-0.3.6.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.19.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/typenum/typenum-1.12.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/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/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="8a7d52492dd36b21d11140eeb934098d \
-        94e5e4da83397101dcac50eba7f31787 \
-        7570fe821ac7fac7fc9aaac09e1df5a2 \
+MD5SUM="260ab1a7b97a1526a342084d1205f939 \
+        853b409f126727af3ee29ae2de887271 \
+        1f6ec6a2e7b169d66d6db72cac5f413b \
         711b149cf4767597fc265983750f4da3 \
-        3664ceb4b5c686f1adabe1f57931c425 \
-        b06fb4397c2a873a4034136154da23c8 \
-        39ef2c15a85f895d18ca6088a7a6d0bd \
-        e5ff029879cdacd29148cd31da1f0564 \
+        898079c1c795b5aa847169137918c7bc \
+        7c6515c4b7f4c7723a3c6d1f07acc261 \
+        6799c26a7eacaf8e58d3e45c6c5add89 \
+        e502e6c6b0dca9c1ae2d99e92b26f645 \
         e0bf3b40b2d51cb52f40647b368efb50 \
-        43c46e86e471f6a4e7bdaea0d6505c27 \
-        0b69cb58ef22bbc1ccfed55414d57e6e \
-        285a97bd000d85a77550c8bfb5f77022 \
-        0cd2bb93a82da2e4ca526b40ae8b341e \
-        ed2b1c5fd000f926c2aedb0c3bd1d199 \
+        ff4e1560b7d0ac5c4ae2688bc27f9c98 \
+        af1f1bff38cb52f5836ec9a7957d419a \
+        882dbbc613a93f64c3709b0a2bd0d6dc \
+        a47dd336c3099e7986f926b48c64ec6a \
         1c8b50f8528dd37df7d984e0e4b61bd5 \
-        c07d2bd46a0fb313b00d1241e6024527 \
         3c153e21729b743f5127dec47670de17 \
-        75921f600f249787a5de588658c85ece \
+        897911f15f349a357899045e6b0c04e0 \
+        49b4b022e9fa4cc60376a79ecb39d04f \
+        836bbd6315ea443caf33fe3394ea4991 \
+        ff67cf2eb9668167782b8012d3b48e7b \
+        82241b59d4b793d862900b62220cf05a \
+        5941f4a3d3435767e79260f61093ecd3 \
         27260b46db6b9ac40318143d70a80ba3 \
         916a6c827f4f0f64b7652bebf67d82e1 \
-        557ae69b35db96e1eecd55f0eb7d882d \
-        7bebca3c6217218fb42f89544d1499db \
+        de1228e571c94ef53ec4c21db57279ab \
+        d02ceab917d216ae2cd5127a3f33171f \
+        493f4bd45cf2a6c3963f66f58884f622 \
         412752575d11aefd8c262075407f5cc1 \
-        1c9fee8f180b6f3402849983a45bbd6d \
-        0c5dc0c601d5590f3ec6da338abc7892 \
-        a8c93f9d6a66e262256d11eb95b4166f \
-        fe7ea70517100bd8245a832c8f7b31ca \
+        04fc55fadbdb820a95287bce6c5cca71 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        0f24b5ab599c41a83e973aabe92ac46d \
+        5b23904f9579d1efd0e914257517eeb5 \
         7d95c53a33d0c550267b89a19899a6fa \
-        f5f1c012d3782cc29a313c1f48f16827 \
-        fe33a1d480c7fa982798121af1b52560 \
-        e14545924532043c93b0b66d373c03f7 \
+        0c8b4e7eeaa63e83b705a047d2b8580e \
+        b5cf10e268e8a3bee2de8a734104245e \
+        46fd65cd541fdc547f2ba26b8d400dae \
+        6ad7c30338903afc3521369ecd826cfb \
         c24b5fe087abe69f7548a9e6c8789d61 \
-        67172dd04f8e86193ebfed2883959fdb \
-        226c780e8380cab74202d872d5f3519a \
-        4092ed5c67c6ff1c6a7bcf463bc40a53 \
-        c802dfc397819893a4b50e37aac5fa38 \
-        9fc51e79791f918b643e3802a2e0e88f \
+        e7be05acf53dc7d372d012d7ac673073 \
+        25a9c25700c416af66082afbd9187bb7 \
+        9c52a747ee0325081e566c9f700a8d7e \
+        99e024622d98dc28a8a5f37afccaf20a \
+        c3df6ec550943c6ccd356272db8eb202 \
+        c36d452e37c73b1e99f40bae18cddfdb \
+        899e132d3e99c2d79d0784d61ee8895f \
         7261ce43635fd9c2a009810db04d6901 \
-        38e4f8192b3d45f5858fc1fdd2eff9a0 \
-        4692e7114db87556e0edd3750cdef9ac \
-        ed68fecc548f1bd3e6415764c21af10c \
+        7c4bfd315ee9de1c1b2f2d56163567cf \
+        e0bbd1014405fcdd6aba0b0022c9effc \
+        c36ab58ddd10863b2be0f243917dfbcb \
         7c547f7b390ef6b68f99e4055658c0ec \
         9e99a37f8c37bb953732ef46ac2b12a1 \
         793627c8c18012ad77cb3e81fa4c2195 \
-        11a4a43f912049783610c41f869c107c \
+        66d1cb32dce999907409f636f004b884 \
         3ab5a79607a4d260bf61cd99dc82ab05 \
-        4301a2417b2206ecbb76464241ea346e \
+        0a80ed36a125ac3cdfa09f8707055873 \
         8cab41822d03dfa674870315308fa392 \
-        7058895bdca83bbda052d66b087f902e \
-        f363654e5432d1763b32038d05178ad2 \
-        8abe0a9674c461578988dfac8449f2e9 \
+        35ddcd36701a1a6711cc3aec85909f41 \
+        a0f55fda89c0f97784edb18f4c253a49 \
+        caa57442578f90341a6ab7bf94d4fde9 \
         28b1e6d15e1ba8cf3a2e953ce7fcd3de \
         b269356e8646f3184a0e8d52a58cee69 \
         74b15f1928431937f14ed91fdc12b542 \
         2255d3d9a603e177985602a7df1c5bbc \
         5acfdc8656212bce8df1bcc43db34c3d \
         f9e08a49715c401602243230b28d86f0 \
-        d8680dd5ceb14c15b349b0d784d0d80c \
+        7b0715affe44616a992f113ad7ab7d50 \
         7826deb76941fc36c2391951bd65ba47 \
-        001b4b817de9ee1ddff4bb374b58c110 \
+        d4a05ab09e96ee8767f7409721bf65b8 \
+        d6dae0411ef3346d4ae59498f7d523e0 \
+        74bd9140ed1ed96349474b75a26a45e9 \
         c8d655d206cbe48b84a22544d6fc6d15 \
-        3056ab938614a0a76bd60dff8bb3b519 \
-        93bda82e007e0f4b4d095ca18e44daec \
-        82dfbbc63c5457d12882e389242dc5f6 \
-        0e2785025e684617366cb223fc918776 \
-        6371404de18adcd43f867fdf84df1699 \
-        b90179ab2a10cd69bdde848fc4d5249e \
+        57d8084d93aec796d98691e654c5e0f6 \
+        44d95c1ed46baee736c9420ad1de3228 \
+        b4a0a98a54439a5a37952c8879187ee3 \
+        3879349fe374e764e24f37ce40ac9824 \
+        9b7d58f6341fb619ff2190481ce13b84 \
+        ce76f5430cd6d2ab76d0d86ecb8a4f4d \
         9503719444b058de7c3032aa7dc2b6f8 \
-        6a20f74784be5bc490b3a67e0e3a7367 \
-        3d311d2cedf2d3d7b11b32baf470b178 \
-        8c243967473d6a14ee401073c9c9b83b \
-        5aaf04f9a94a6450e3e4963ddd62b92d \
-        40909511b3d0e2dba891f438715808d0 \
+        376a4faf2a9d5d659dc1f81f88e942b8 \
+        9d66208e00715217a8c1f2e40efe4a0c \
+        55927226b06f62ccbd2890269d68c2fd \
+        e628ca8adb2b572bffb210f014656b6f \
+        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
+        ce68e06a2cd4f180747cf169fc388a95 \
         db96b50050277bf05a3c68534bbb9586 \
         09de9d01e7331ff3da11f58be8bef0df \
         0ac2781d3a2021cdabd68fb7e38589aa"
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 3defc37eb5..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.82a}
-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 9152399d19..26038a5885 100644
--- a/graphics/Blender/Blender.info
+++ b/graphics/Blender/Blender.info
@@ -1,10 +1,10 @@
 PRGNAM="Blender"
-VERSION="2.82a"
+VERSION="2.83.8"
 HOMEPAGE="https://blender.org"
-DOWNLOAD="https://download.blender.org/source/blender-2.82a.tar.xz"
-MD5SUM="3e9d669185b83d5d2cb1b38dcf64d5ec"
+DOWNLOAD="https://download.blender.org/source/blender-2.83.8.tar.xz"
+MD5SUM="1a920506a3a695d629d5f312b9b45c01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ffmpeg jack opencollada 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 d93907048f..e6fe94d6e9 100644
--- a/graphics/Blender/README
+++ b/graphics/Blender/README
@@ -11,3 +11,20 @@ game creation.
 CUDA support is included if a CUDA installation is detected at build time.
 It may be disable by passing CUDA=no when building e.g.
     CUDA=no sh ./Blender.SlackBuild
+
+Since Blender-2.83.0, SBo's cudatoolkit-8.0.61 is insufficient for a
+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/Blender/README.Slackware b/graphics/Blender/README.Slackware
index 62a876851e..2371484de5 100644
--- a/graphics/Blender/README.Slackware
+++ b/graphics/Blender/README.Slackware
@@ -66,6 +66,10 @@ being available at build time, set the CUDA environment variable to "no"
 when running the SlackBuild e.g.
     CUDA=no sh ./Blender.SlackBuild
 
+NB. Blender-2.83.0 and above requires a newer cudatoolkit than available
+at SBo. If the SBo cudatoolkit is nevertheless installed for other reasons,
+please use CUDA=no when running the SlackBuild.
+
     2. the ffmpeg package could/should first be built with additional
 features by preinstalling some other packages e.g.
 REQUIRES="lame x264
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/GraphicsMagick/GraphicsMagick.SlackBuild b/graphics/GraphicsMagick/GraphicsMagick.SlackBuild
index 76ddae126b..ea968873ff 100644
--- a/graphics/GraphicsMagick/GraphicsMagick.SlackBuild
+++ b/graphics/GraphicsMagick/GraphicsMagick.SlackBuild
@@ -8,6 +8,7 @@
 # MIA. Original version had no license; I'm licensing the update under the
 # terms of the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201019 bkw: update for v1.3.35.
 # 20200111 bkw: update for v1.3.34, quit using sourceforge dl link.
 # 20191130 bkw: update for v1.3.33.
 # 20181201 bkw: update for v1.3.31 (BUILD=1 again).
@@ -41,7 +42,7 @@
 # - document optional deps in README
 
 PRGNAM=GraphicsMagick
-VERSION=${VERSION:-1.3.34}
+VERSION=${VERSION:-1.3.35}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/GraphicsMagick/GraphicsMagick.info b/graphics/GraphicsMagick/GraphicsMagick.info
index 4420e7e5c8..fa9006c4c4 100644
--- a/graphics/GraphicsMagick/GraphicsMagick.info
+++ b/graphics/GraphicsMagick/GraphicsMagick.info
@@ -1,8 +1,8 @@
 PRGNAM="GraphicsMagick"
-VERSION="1.3.34"
+VERSION="1.3.35"
 HOMEPAGE="http://www.graphicsmagick.org/"
-DOWNLOAD="http://ftp.icm.edu.pl/pub/unix/graphics/GraphicsMagick/1.3/GraphicsMagick-1.3.34.tar.xz"
-MD5SUM="045d5355aeb70cbb67d898120405a6d0"
+DOWNLOAD="http://ftp.icm.edu.pl/pub/unix/graphics/GraphicsMagick/1.3/GraphicsMagick-1.3.35.tar.xz"
+MD5SUM="e565b6ce1564d62409b3faa5c747096e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/SweetHome3D/README b/graphics/SweetHome3D/README
index c550edef57..7221e81b74 100644
--- a/graphics/SweetHome3D/README
+++ b/graphics/SweetHome3D/README
@@ -2,11 +2,4 @@ Sweet Home 3D is a free interior design application
 that helps you draw the plan of your house, arrange
 furniture on it and visit the results in 3D.
 
-As a workaround for a java3d crash when using the
-Nvidia proprietary driver, try:
-
-NVIDIA=yes ./SweetHome3D.SlackBuild
-
-This will use an older version of java3D. Also, if
-SweetHome3D fails to run with OpenJDK, remove it and
-install the the official jdk on Slackbuilds.org
+JDK is an alternate dependency.
diff --git a/graphics/SweetHome3D/SweetHome3D b/graphics/SweetHome3D/SweetHome3D
new file mode 100644
index 0000000000..0318ac5c9b
--- /dev/null
+++ b/graphics/SweetHome3D/SweetHome3D
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Run Sweet Home 3D
+exec /usr/lib64/java/bin/java -Xmx2g -jar /usr/share/SweetHome3D/SweetHome3D.jar
diff --git a/graphics/SweetHome3D/SweetHome3D.SlackBuild b/graphics/SweetHome3D/SweetHome3D.SlackBuild
index 0a7e238c25..dee7336599 100644
--- a/graphics/SweetHome3D/SweetHome3D.SlackBuild
+++ b/graphics/SweetHome3D/SweetHome3D.SlackBuild
@@ -34,9 +34,10 @@
 # 2.1   06-JAN-2018 version update
 # 2.2   07-Aug-2018 version update
 # 2.3   24-Jun-2019 version update
+# 2.4	23-APR-2020 version update, switch to .jar for openjdk compatibility
 
 PRGNAM=SweetHome3D
-VERSION=${VERSION:-6.1.2}
+VERSION=${VERSION:-6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 NVIDIA=${NVIDIA:-no}
@@ -74,40 +75,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-linux-$TARGET.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 {} \;
 
 mkdir -p $PKG/usr/bin
-if [ "${NVIDIA}" = "no" ]; then
-    cp -a SweetHome3D $PKG/usr/bin
-else
-    cp -a SweetHome3D-Java3D-1_5_2 $PKG/usr/bin/SweetHome3D
-fi
-
-# Set program location and use global java
-sed -i $PKG/usr/bin/SweetHome3D \
-  -e "s,\"\$PROGRAM_DIR\"/jre8/bin/java,/usr/lib${LIBDIRSUFFIX}/java/bin/java,g" \
-  -e "s,\"\$PROGRAM_DIR\"/jre8/lib,/usr/lib${LIBDIRSUFFIX}/java/jre/lib,g" \
-  -e "s,\"\$PROGRAM_DIR\"/lib,/usr/share/$PRGNAM,g"
+install -D -m 755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/share/$PRGNAM
-cp -a lib/* $PKG/usr/share/$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
+install -D -m 644 $CWD/$PRGNAM-$VERSION.jar $PKG/usr/share/$PRGNAM/$PRGNAM.jar
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/SweetHome3D.desktop > $PKG/usr/share/applications/SweetHome3D.desktop
-cat SweetHome3DIcon.png > $PKG/usr/share/pixmaps/SweetHome3D.png
+cp -a $CWD/SweetHome3D.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+cp -a $CWD/SweetHome3DIcon.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.TXT THIRDPARTY-LICENSE-JMF.HTML $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/SweetHome3D/SweetHome3D.info b/graphics/SweetHome3D/SweetHome3D.info
index b2c556c792..8c636e9f93 100644
--- a/graphics/SweetHome3D/SweetHome3D.info
+++ b/graphics/SweetHome3D/SweetHome3D.info
@@ -1,10 +1,10 @@
 PRGNAM="SweetHome3D"
-VERSION="6.1.2"
+VERSION="6.3"
 HOMEPAGE="http://www.sweethome3d.com/"
-DOWNLOAD="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.1.2/SweetHome3D-6.1.2-linux-x86.tgz"
-MD5SUM="afde31a885534d4ec7690f7a5c375ad8"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.1.2/SweetHome3D-6.1.2-linux-x64.tgz"
-MD5SUM_x86_64="297ed2ee1a0351c0bdc5ea56642c0b20"
-REQUIRES="jdk"
+DOWNLOAD="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.3/SweetHome3D-6.3.jar"
+MD5SUM="4f461a8a5e9586537367e8bf75668fa6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="openjdk8"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/graphics/SweetHome3D/SweetHome3DIcon.png b/graphics/SweetHome3D/SweetHome3DIcon.png
new file mode 100644
index 0000000000..7cb7a0e4cb
--- /dev/null
+++ b/graphics/SweetHome3D/SweetHome3DIcon.png
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/apitrace/README b/graphics/apitrace/README
new file mode 100644
index 0000000000..9a194296da
--- /dev/null
+++ b/graphics/apitrace/README
@@ -0,0 +1,15 @@
+apitrace consists of a set of tools to:
+
+    trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs calls to a file;
+
+    replay OpenGL and OpenGL ES calls from a file;
+
+    inspect OpenGL state at any call while retracing;
+
+    visualize and edit trace files.
+
+
+Optional dependencies:
+
+  qt5    - Builds the qapitrace gui.
+  snappy - Will use a bundled version if missing.
diff --git a/graphics/apitrace/apitrace.SlackBuild b/graphics/apitrace/apitrace.SlackBuild
new file mode 100644
index 0000000000..d0f5078f05
--- /dev/null
+++ b/graphics/apitrace/apitrace.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for apitrace
+
+# Copyright 2015-2017, 2019-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=apitrace
+VERSION=${VERSION:-9.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 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDOC_INSTALL_DIR=doc/$PRGNAM-$VERSION \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DENABLE_STATIC_SNAPPY=OFF \
+    -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/graphics/apitrace/apitrace.info b/graphics/apitrace/apitrace.info
new file mode 100644
index 0000000000..f882c4141f
--- /dev/null
+++ b/graphics/apitrace/apitrace.info
@@ -0,0 +1,10 @@
+PRGNAM="apitrace"
+VERSION="9.0"
+HOMEPAGE="https://apitrace.github.io/"
+DOWNLOAD="https://github.com/apitrace/apitrace/archive/9.0/apitrace-9.0.tar.gz"
+MD5SUM="83bacfb35f4f339571702099d283f571"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/development/apitrace/slack-desc b/graphics/apitrace/slack-desc
index 38c63576c1..38c63576c1 100644
--- a/development/apitrace/slack-desc
+++ b/graphics/apitrace/slack-desc
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/brlcad/brlcad.SlackBuild b/graphics/brlcad/brlcad.SlackBuild
index 4cd44015ad..694e2039f8 100644
--- a/graphics/brlcad/brlcad.SlackBuild
+++ b/graphics/brlcad/brlcad.SlackBuild
@@ -16,7 +16,7 @@
 # ... and again to fix tcl/tk breakage
 
 PRGNAM=brlcad
-VERSION=${VERSION:-7.28.0}
+VERSION=${VERSION:-7.30.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/brlcad/brlcad.info b/graphics/brlcad/brlcad.info
index 1ee2dff912..8b220de969 100644
--- a/graphics/brlcad/brlcad.info
+++ b/graphics/brlcad/brlcad.info
@@ -1,8 +1,8 @@
 PRGNAM="brlcad"
-VERSION="7.28.0"
+VERSION="7.30.10"
 HOMEPAGE="http://brlcad.org"
-DOWNLOAD="http://downloads.sourceforge.net/brlcad/brlcad-7.28.0.tar.bz2"
-MD5SUM="bbd56e0c6c32e8433ae328903652e44b"
+DOWNLOAD="http://downloads.sourceforge.net/brlcad/brlcad-7.30.10.tar.bz2"
+MD5SUM="534507304b4943b134d2a9ab49b10ae9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/dcraw/dcraw.info b/graphics/dcraw/dcraw.info
index 435ee45aaa..0129c6c0c4 100644
--- a/graphics/dcraw/dcraw.info
+++ b/graphics/dcraw/dcraw.info
@@ -1,7 +1,7 @@
 PRGNAM="dcraw"
 VERSION="9.28.0"
-HOMEPAGE="http://cybercom.net/~dcoffin/dcraw/"
-DOWNLOAD="https://sources.voidlinux.org/dcraw-9.28.0/dcraw-9.28.0.tar.gz"
+HOMEPAGE="https://www.dechifro.org/dcraw/"
+DOWNLOAD="https://www.dechifro.org/dcraw/archive/dcraw-9.28.0.tar.gz"
 MD5SUM="e89175c1a7551a70744769049a139f9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/graphics/dcraw/slack-desc b/graphics/dcraw/slack-desc
index a88becc7c6..8534120aba 100644
--- a/graphics/dcraw/slack-desc
+++ b/graphics/dcraw/slack-desc
@@ -12,7 +12,7 @@ dcraw: dcraw is a command line tool to decode raw digital photos
 dcraw: written by Dave Coffin.  It supports many raw photo formats
 dcraw: for numerous digital camera manufacturers.
 dcraw:
-dcraw: Home Page: http://cybercom.net/~dcoffin/dcraw/
+dcraw: Home Page: https://www.dechifro.org/dcraw/
 dcraw:
 dcraw:
 dcraw:
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/graphics/fbgrab/slack-desc b/graphics/fbgrab/slack-desc
new file mode 100644
index 0000000000..18d9208227
--- /dev/null
+++ b/graphics/fbgrab/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------------------------------------------------------|
+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 deb8763d91..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-2019 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.3}
+VERSION=${VERSION:-3.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,10 +71,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 {} \;
 
-[ "${EXIF:=0}" != 0 ] && EXIF=1
-[ "${HELP:=0}" != 0 ] && HELP=1
-[ "${INOTIFY:=0}" != 0 ] && INOTIFY=1
-[ "${STAT64:=0}" != 0 ] && STAT64=1
+[ "${EXIF:=0}" = 0 ] || EXIF=1
+[ "${HELP:=0}" = 0 ] || HELP=1
+[ "${INOTIFY:=0}" = 0 ] || INOTIFY=1
+[ "${STAT64:=0}" = 0 ] || STAT64=1
 
 CFLAGS="$SLKCFLAGS" \
 make \
diff --git a/graphics/feh/feh.info b/graphics/feh/feh.info
index 1739698793..5be6bc0044 100644
--- a/graphics/feh/feh.info
+++ b/graphics/feh/feh.info
@@ -1,8 +1,8 @@
 PRGNAM="feh"
-VERSION="3.3"
+VERSION="3.6.1"
 HOMEPAGE="https://feh.finalrewind.org"
-DOWNLOAD="https://feh.finalrewind.org/feh-3.3.tar.bz2"
-MD5SUM="6bc552b7477471f6034796e9cc300346"
+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/README b/graphics/flameshot/README
index d332dcb7fd..ac12cec842 100644
--- a/graphics/flameshot/README
+++ b/graphics/flameshot/README
@@ -4,4 +4,4 @@ Features:
      Customizable appearance.
      In-app screenshot edition.
      DBus interface.
-     Upload to Imgur.
\ No newline at end of file
+     Upload to Imgur.
diff --git a/graphics/flameshot/flameshot.SlackBuild b/graphics/flameshot/flameshot.SlackBuild
index 158b8091dc..1f0df31576 100644
--- a/graphics/flameshot/flameshot.SlackBuild
+++ b/graphics/flameshot/flameshot.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=flameshot
-VERSION=${VERSION:-0.6.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.8.5}
+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
@@ -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"
@@ -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,18 +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 \
-  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/fontforge/README b/graphics/fontforge/README
index 441d7b41f3..218367cd09 100644
--- a/graphics/fontforge/README
+++ b/graphics/fontforge/README
@@ -1,11 +1,7 @@
-FontForge is an outline font editor that lets you create your own postscript,
-truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap (bdf, FON,
-NFNT) fonts, or edit existing ones. It also lets you convert one format to
-another. FontForge has support for many Macintosh font formats.
-
-You can specify an alternate version of freetype on the command line when
-running the script with e.g.   FREETYPE=2.4.5 ./fontforge.SlackBuild
-but you will need to manually place that freetype tarball in the slackbuild
-directory.
+FontForge is an outline font editor that lets you create your own
+postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and
+bitmap (bdf, FON, NFNT) fonts, or edit existing ones. It also lets you
+convert one format to another. FontForge has support for many Macintosh
+font formats.
 
 NOTE: please remove previous version before building new version.
diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index d20e9aa00c..0e5952bb93 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -23,17 +23,27 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Currently maintained by David Woodfall <dave@slackbuilds.org>
+#
+# 2020-10-12 20:48:40 +0100:
+# Update to Version ff 20190801, gnulib 20200505~0747bf0
+# Added --without-libuninameslist
 
 PRGNAM=fontforge
-VERSION=${VERSION:-20190413}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20190801}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ENABLE_BCINT=${ENABLE_BCINT:-yes}
 FREETYPE=${FREETYPE:-2.10.0}
-GNULIB=${GNULIB:-20200127~e313a53}
+GNULIB=${GNULIB:-20200505~0747bf0}
 UTHASH=${UTHASH:-2.1.0}
 
+if [ -e $( echo /var/log/packages/$PRGNAM-*-*-* ) ]; then
+  echo "Please uninstall any previous versions of $PRGNAM first."
+  echo "Exiting."
+  exit 1
+fi
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -94,6 +104,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-tile-path \
   --enable-static=no \
   --enable-shared=yes \
+  --without-libuninameslist \
   --build=$ARCH-slackware-linux
 
 make
@@ -112,7 +123,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 INSTALL LICENSE $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
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
diff --git a/graphics/fontforge/fontforge.info b/graphics/fontforge/fontforge.info
index 3c5cc962de..50f91001a7 100644
--- a/graphics/fontforge/fontforge.info
+++ b/graphics/fontforge/fontforge.info
@@ -1,15 +1,15 @@
 PRGNAM="fontforge"
-VERSION="20190413"
+VERSION="20190801"
 HOMEPAGE="http://fontforge.sourceforge.net"
-DOWNLOAD="https://github.com/fontforge/fontforge/releases/download/20190413/fontforge-20190413.tar.gz \
-          http://unrealize.co.uk/source/cidmaps.tgz \
+DOWNLOAD="https://github.com/fontforge/fontforge/releases/download/20190801/fontforge-20190801.tar.gz \
+          http://studioware.org/files/slackbuilds/source/cidmaps.tgz \
           https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2 \
-          http://unrealize.co.uk/source/gnulib_20200127~e313a53.orig.tar.gz \
+          http://studioware.org/files/slackbuilds/source/gnulib_20200505~0747bf0.orig.tar.gz \
           https://github.com/troydhanson/uthash/archive/v2.1.0/uthash-2.1.0.tar.gz"
-MD5SUM="ac60705cfb74a5b0e266d8455690cd51 \
+MD5SUM="5d845f6092b8c3342473ff64bc8ee70c \
         063691163e592515b31514515bb3ce8c \
         a717e6925b61b9dda946322ecd278a42 \
-        c8c69bfc9e7c137bf196fbf93ada29a3 \
+        82044230e40ba6b43d0aef70076167e5 \
         4d0a33f6393260926032f1fad4bad39a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/graphics/fritzing/fritzing.SlackBuild b/graphics/fritzing/fritzing.SlackBuild
index 496ce634bd..5f8d2436a8 100644
--- a/graphics/fritzing/fritzing.SlackBuild
+++ b/graphics/fritzing/fritzing.SlackBuild
@@ -65,6 +65,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-app-master
+rm -rf $PRGNAM-parts-master
 unzip $CWD/$PRGNAM-app-master.zip
 unzip $CWD/$PRGNAM-parts-master.zip
 
@@ -75,6 +76,10 @@ 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 {} \;
+
+# Patch for libgti2 vesion >= 1.0.
+patch -p1 < $CWD/libgit2-version.patch
+
 qmake-qt5
 make
 
diff --git a/graphics/fritzing/libgit2-version.patch b/graphics/fritzing/libgit2-version.patch
new file mode 100644
index 0000000000..878ee5a348
--- /dev/null
+++ b/graphics/fritzing/libgit2-version.patch
@@ -0,0 +1,23 @@
+From 472951243d70eeb40a53b1f7e16e6eab0588d079 Mon Sep 17 00:00:00 2001
+From: PsikoBlock <rramsch@googlemail.com>
+Date: Fri, 10 Apr 2020 21:41:52 +0200
+Subject: [PATCH] Fix libgit2 version check to allow building with versions >=
+ 1.0
+
+---
+ src/version/partschecker.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/version/partschecker.cpp b/src/version/partschecker.cpp
+index 65daf76e5..36300fe09 100644
+--- a/src/version/partschecker.cpp
++++ b/src/version/partschecker.cpp
+@@ -121,7 +121,7 @@
+     /**
+      * Connect to the remote.
+      */
+-#if LIBGIT2_VER_MINOR > 24
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR > 24)
+     error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL);
+ #elif LIBGIT2_VER_MINOR == 24
+     error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL);
diff --git a/graphics/glslang/README b/graphics/glslang/README
new file mode 100644
index 0000000000..d61381b370
--- /dev/null
+++ b/graphics/glslang/README
@@ -0,0 +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
new file mode 100644
index 0000000000..db38ad19a9
--- /dev/null
+++ b/graphics/glslang/glslang.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for glslang
+
+# Copyright 2020-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=glslang
+VERSION=${VERSION:-11.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 -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 {} \;
+
+# 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_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 ..
+  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.md CODE_OF_CONDUCT.md LICENSE.txt README-spirv-remap.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/glslang/glslang.info b/graphics/glslang/glslang.info
new file mode 100644
index 0000000000..2fd87c7139
--- /dev/null
+++ b/graphics/glslang/glslang.info
@@ -0,0 +1,10 @@
+PRGNAM="glslang"
+VERSION="11.1.0"
+HOMEPAGE="https://github.com/KhronosGroup/glslang"
+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="SPIRV-Tools"
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/graphics/glslang/slack-desc b/graphics/glslang/slack-desc
new file mode 100644
index 0000000000..0693d091db
--- /dev/null
+++ b/graphics/glslang/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------------------------------------------------------|
+glslang: glslang (GLSL/ESSL front end, HLSL front end SPIR-V generator)
+glslang:
+glslang: Khronos-reference front end for GLSL/ESSL, partial front end for HLSL,
+glslang: and a SPIR-V generator.
+glslang:
+glslang: Homepage: https://github.com/KhronosGroup/glslang
+glslang:
+glslang:
+glslang:
+glslang:
+glslang:
diff --git a/graphics/gmic/README b/graphics/gmic/README
index 7d747e8eec..da13ba4daa 100644
--- a/graphics/gmic/README
+++ b/graphics/gmic/README
@@ -7,6 +7,3 @@ convert/manipulate/filter/visualize generic image datasets, ranging from
 thus including 2d color images.
 
 This package contains the gimp plug-in.
-
-Note: When building opencv, make sure qt5 is not installed, otherwise
-it will link against it and cause gmic to fail to build.
diff --git a/graphics/gmic/gmic.SlackBuild b/graphics/gmic/gmic.SlackBuild
index c72fbde487..5c54c3b4d7 100644
--- a/graphics/gmic/gmic.SlackBuild
+++ b/graphics/gmic/gmic.SlackBuild
@@ -46,7 +46,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O0 -march=i686 -mtune=i686 -fno-fast-math"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O0 -fPIC -fno-fast-math"
+  SLKCFLAGS="-O3 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O0 -fno-fast-math"
@@ -87,7 +87,7 @@ cd zart
 patch -p1 -i $CWD/zart-opencv4.patch
 cd -
 
-make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} -j1
+make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " -j1
 
 cd gmic-qt
 qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=none
diff --git a/graphics/gource/gource.SlackBuild b/graphics/gource/gource.SlackBuild
index 42d97e0a69..295a723014 100644
--- a/graphics/gource/gource.SlackBuild
+++ b/graphics/gource/gource.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gource
 
-# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2020 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 @@
 # generated by grissiom's sbo-dev-helper
 
 PRGNAM=gource
-VERSION=${VERSION:-0.49}
+VERSION=${VERSION:-0.51}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/gource/gource.info b/graphics/gource/gource.info
index 387285873d..38b29ef469 100644
--- a/graphics/gource/gource.info
+++ b/graphics/gource/gource.info
@@ -1,8 +1,8 @@
 PRGNAM="gource"
-VERSION="0.49"
+VERSION="0.51"
 HOMEPAGE="https://gource.io"
-DOWNLOAD="https://github.com/acaudwell/Gource/releases/download/gource-0.49/gource-0.49.tar.gz"
-MD5SUM="a5d5895141eae689b3fd6d8fbcbb4c4b"
+DOWNLOAD="https://github.com/acaudwell/Gource/releases/download/gource-0.51/gource-0.51.tar.gz"
+MD5SUM="957723684373e6d9493c4820e9c53399"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_image glm"
diff --git a/graphics/graphene/README b/graphics/graphene/README
new file mode 100644
index 0000000000..08152a6c50
--- /dev/null
+++ b/graphics/graphene/README
@@ -0,0 +1,22 @@
+When creating graphic libraries you most likely end up dealing with
+points and rectangles. If you're particularly unlucky, you may end
+up dealing with affine matrices and 2D transformations. If you're
+writing a graphic library with 3D transformations, though, you are
+going to hit the jackpot: 4x4 matrices, projections, transformations,
+vectors, and quaternions.
+
+Most of this stuff exists, in various forms, in other libraries,
+but it has the major drawback of coming along with the rest of those
+libraries, which may or may not be what you want. Those libraries
+are also available in various languages, as long as those languages
+are C++; again, it may or may not be something you want.
+
+For this reason, I decided to write the thinnest, smallest possible
+layer needed to write a canvas library; given its relative size, and
+the propensity for graphics libraries to have a pun in their name,
+I decided to call it Graphene.
+
+This library provides types and their relative API; it does not deal
+with windowing system surfaces, drawing, scene graphs, or input. You're
+supposed to do that yourself, in your own canvas implementation,
+which is the whole point of writing the library in the first place.
diff --git a/graphics/graphene/graphene.SlackBuild b/graphics/graphene/graphene.SlackBuild
new file mode 100644
index 0000000000..7b0bfa773d
--- /dev/null
+++ b/graphics/graphene/graphene.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for graphene
+
+# 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=graphene
+VERSION=${VERSION:-1.10.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 -eu
+
+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 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 [ "${DEBUG:=0}" != 0 ]; then
+  NDEBUG=false
+  RELEASE=debug
+  SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')"
+else
+  NDEBUG=true
+  RELEASE=plain
+fi
+
+# Don't create the __pycache__ directory.
+export PYTHONDONTWRITEBYTECODE=1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+meson \
+  --prefix=/usr \
+  --libdir=lib${LIBDIRSUFFIX} \
+  -Dinstalled_tests=false \
+  -Dstrip=$NDEBUG \
+  -Db_ndebug=$NDEBUG \
+  -Dbuildtype=$RELEASE \
+  build
+
+"${NINJA:=ninja}" -C build
+DESTDIR=$PKG "$NINJA" -C build install
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CODE_OF_CONDUCT.md CONTRIBUTING.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/graphene/graphene.info b/graphics/graphene/graphene.info
new file mode 100644
index 0000000000..fcc80acf74
--- /dev/null
+++ b/graphics/graphene/graphene.info
@@ -0,0 +1,10 @@
+PRGNAM="graphene"
+VERSION="1.10.2"
+HOMEPAGE="https://ebassi.github.io/graphene/"
+DOWNLOAD="https://github.com/ebassi/graphene/releases/download/1.10.2/graphene-1.10.2.tar.xz"
+MD5SUM="a2c26c4f44a02ca053e0e9afb63cc94c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="meson"
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/graphics/graphene/slack-desc b/graphics/graphene/slack-desc
new file mode 100644
index 0000000000..2815360bf5
--- /dev/null
+++ b/graphics/graphene/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------------------------------------------------------|
+graphene: graphene (graphic data types layer)
+graphene:
+graphene: A thin layer of graphic data types.
+graphene:
+graphene: Homepage: https://ebassi.github.io/graphene/
+graphene:
+graphene:
+graphene:
+graphene:
+graphene:
+graphene:
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/heif-gimp-plugin/README b/graphics/heif-gimp-plugin/README
new file mode 100644
index 0000000000..c72770432e
--- /dev/null
+++ b/graphics/heif-gimp-plugin/README
@@ -0,0 +1,2 @@
+This is a GIMP plugin for loading and saving HEIF images (High
+Efficiency Image File Format).
diff --git a/graphics/heif-gimp-plugin/heif-gimp-plugin.SlackBuild b/graphics/heif-gimp-plugin/heif-gimp-plugin.SlackBuild
new file mode 100644
index 0000000000..6287e24f73
--- /dev/null
+++ b/graphics/heif-gimp-plugin/heif-gimp-plugin.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for heif-gimp-plugin
+
+# 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=heif-gimp-plugin
+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/libheif-v$VERSION.tar.gz
+cd $PRGNAM-libheif-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 {} \;
+
+./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 \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins
+install -m 0755 -o root -g root src/heif-gimp-plugin \
+  $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins
+
+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 $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/heif-gimp-plugin/heif-gimp-plugin.info b/graphics/heif-gimp-plugin/heif-gimp-plugin.info
new file mode 100644
index 0000000000..3866860c74
--- /dev/null
+++ b/graphics/heif-gimp-plugin/heif-gimp-plugin.info
@@ -0,0 +1,10 @@
+PRGNAM="heif-gimp-plugin"
+VERSION="1.1.0"
+HOMEPAGE="https://github.com/strukturag/heif-gimp-plugin"
+DOWNLOAD="https://github.com/strukturag/heif-gimp-plugin/archive/libheif-v1.1.0.tar.gz"
+MD5SUM="27cca588ebc72ebdbfae5b7b5e6ffa61"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libheif"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/graphics/heif-gimp-plugin/slack-desc b/graphics/heif-gimp-plugin/slack-desc
new file mode 100644
index 0000000000..404a4480ef
--- /dev/null
+++ b/graphics/heif-gimp-plugin/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------------------------------------------------------|
+heif-gimp-plugin: heif-gimp-plugin (HEIF plugin for GIMP)
+heif-gimp-plugin:
+heif-gimp-plugin: This is a GIMP plugin for loading and saving HEIF images (High
+heif-gimp-plugin: Efficiency Image File Format).
+heif-gimp-plugin:
+heif-gimp-plugin:
+heif-gimp-plugin:
+heif-gimp-plugin: Homepage: https://github.com/strukturag/heif-gimp-plugin
+heif-gimp-plugin:
+heif-gimp-plugin:
+heif-gimp-plugin:
diff --git a/graphics/icc_profiles_from_eci/icc_profiles_from_eci.info b/graphics/icc_profiles_from_eci/icc_profiles_from_eci.info
index 83b22632f8..6674ba6baa 100644
--- a/graphics/icc_profiles_from_eci/icc_profiles_from_eci.info
+++ b/graphics/icc_profiles_from_eci/icc_profiles_from_eci.info
@@ -12,4 +12,3 @@ MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Klaatu"
 EMAIL="klaatu@member.fsf.org"
-
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/graphics/imv/doinst.sh b/graphics/imv/doinst.sh
new file mode 100644
index 0000000000..7a6eafcfff
--- /dev/null
+++ b/graphics/imv/doinst.sh
@@ -0,0 +1,25 @@
+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/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 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/inkscape/README b/graphics/inkscape/README
index e461bbdb08..1d9e9dd712 100644
--- a/graphics/inkscape/README
+++ b/graphics/inkscape/README
@@ -3,9 +3,9 @@ similar to Illustrator, Freehand, CorelDraw, or Xara X using the W3C
 standard Scalable Vector Graphics (SVG) file format.  Supported SVG
 features include shapes, paths, text, markers, clones, alpha blending,
 transforms, gradients, patterns, and grouping.  Inkscape also supports
-Creative Commons meta-data, node editing, layers, complex path operations,
-bitmap tracing, text-on-path, flowed text, direct XML editing, and more.
-It imports formats such as JPEG, PNG, TIFF, and others and exports PNG
-as well as multiple vector-based formats.
+Creative Commons meta-data, node editing, layers, complex path
+operations, bitmap tracing, text-on-path, flowed text, direct XML
+editing, and more.  It imports formats such as JPEG, PNG, TIFF, and
+others and exports PNG as well as multiple vector-based formats.
 
 Optional dependency: potrace (for bitmap tracing functionality).
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild
index d33963e1e2..4471bf3c1b 100644
--- a/graphics/inkscape/inkscape.SlackBuild
+++ b/graphics/inkscape/inkscape.SlackBuild
@@ -23,7 +23,6 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=inkscape
-PRGSUB=_A6N0YOn
 VERSION=${VERSION:-0.92.4}
 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$PRGSUB.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info
index c206ffccb0..39fe0759fd 100644
--- a/graphics/inkscape/inkscape.info
+++ b/graphics/inkscape/inkscape.info
@@ -1,7 +1,7 @@
 PRGNAM="inkscape"
 VERSION="0.92.4"
 HOMEPAGE="http://www.inkscape.org/"
-DOWNLOAD="https://inkscape.org/gallery/item/13330/inkscape-0.92.4_A6N0YOn.tar.bz2"
+DOWNLOAD="https://inkscape.org/gallery/item/13330/inkscape-0.92.4.tar.bz2"
 MD5SUM="ac30f6d5747fd9c620c00dad500f414f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/graphics/libplacebo/README b/graphics/libplacebo/README
index 8e22d6275a..a6f2969749 100644
--- a/graphics/libplacebo/README
+++ b/graphics/libplacebo/README
@@ -3,5 +3,6 @@ turned into a library.
 
 shaderc is an optional dependency.
 
-libplacebo can be built without the vulkan-sdk, but most features will
-be missing.
+vulkan-sdk and Mako are optional dependencies for vulkan support.
+
+Mako must be built with python3 support.
diff --git a/graphics/libplacebo/libplacebo.SlackBuild b/graphics/libplacebo/libplacebo.SlackBuild
index d15c8a6132..0697bf74f0 100644
--- a/graphics/libplacebo/libplacebo.SlackBuild
+++ b/graphics/libplacebo/libplacebo.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libplacebo
-VERSION=${VERSION:-1.29.1}
+VERSION=${VERSION:-2.72.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,6 +78,9 @@ else
   RELEASE=plain
 fi
 
+# Use an older epoxy version.
+sed -i 's/1.4.0/1.3.1/' src/meson.build
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 meson \
diff --git a/graphics/libplacebo/libplacebo.info b/graphics/libplacebo/libplacebo.info
index 2fd1e11615..51ae650726 100644
--- a/graphics/libplacebo/libplacebo.info
+++ b/graphics/libplacebo/libplacebo.info
@@ -1,10 +1,10 @@
 PRGNAM="libplacebo"
-VERSION="1.29.1"
+VERSION="2.72.2"
 HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
-DOWNLOAD="https://code.videolan.org/videolan/libplacebo/-/archive/v1.29.1/libplacebo-v1.29.1.tar.gz"
-MD5SUM="07815068c92280858a073400f5b6837d"
+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 vulkan-sdk"
+REQUIRES="meson"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/graphics/librecad/librecad.SlackBuild b/graphics/librecad/librecad.SlackBuild
index 86f34f6a96..04a1288799 100644
--- a/graphics/librecad/librecad.SlackBuild
+++ b/graphics/librecad/librecad.SlackBuild
@@ -27,8 +27,8 @@
 
 PRGNAM=librecad
 ORIGNAME=LibreCAD
-VERSION=${VERSION:-2.2.0rc1}
-SRCVER=${SRCVER:-2.2.0-rc1}
+VERSION=${VERSION:-9f2c32d}
+SRCVER=${SRCVER:-9f2c32dd4b9dc2ed5e028b682473b098c48ad3e0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/librecad/librecad.info b/graphics/librecad/librecad.info
index 9a6d6c875e..e59d8f1015 100644
--- a/graphics/librecad/librecad.info
+++ b/graphics/librecad/librecad.info
@@ -1,8 +1,8 @@
 PRGNAM="librecad"
-VERSION="2.2.0rc1"
+VERSION="9f2c32d"
 HOMEPAGE="https://librecad.org"
-DOWNLOAD="https://github.com/LibreCAD/LibreCAD/archive/2.2.0-rc1/LibreCAD-2.2.0-rc1.tar.gz"
-MD5SUM="647891c77aab2f5287dd5c6b1d174738"
+DOWNLOAD="https://github.com/LibreCAD/LibreCAD/archive/9f2c32d/LibreCAD-9f2c32dd4b9dc2ed5e028b682473b098c48ad3e0.tar.gz"
+MD5SUM="a4a2c18da5d06dafb14b60a25efbb46b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="muParser qt5"
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 3126e32743..61caa7cd99 100644
--- a/graphics/lilypond/lilypond.SlackBuild
+++ b/graphics/lilypond/lilypond.SlackBuild
@@ -2,34 +2,34 @@
 
 # Slackware build script for lilypond
 
-# 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
 # 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.
+#    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=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=""
@@ -67,18 +70,11 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-# configure does some sed-fu on `fontforge --version` and is finding a git hash
-# instead of a version/date since at least fontforge-20141014.
-# This appears to detect the fontforge build date, which should be good enough.
-patch -p1 < $CWD/patches/detect-fontforge.diff
-
 # 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} \
@@ -88,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
@@ -97,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/lilypond/patches/detect-fontforge.diff b/graphics/lilypond/patches/detect-fontforge.diff
deleted file mode 100644
index 1d3e546dc5..0000000000
--- a/graphics/lilypond/patches/detect-fontforge.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -9810,7 +9810,7 @@
- 
-     if test -z "$_ver"; then
-         ## If empty, try date [fontforge]
--        eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \
-+        eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep 'libfontforge [0-9]\{6,8\}' \
- 	    | head -n 1 \
- 	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
-     fi
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/README b/graphics/mtpaint/README
index ac2825e45a..14a8a222ae 100644
--- a/graphics/mtpaint/README
+++ b/graphics/mtpaint/README
@@ -7,6 +7,7 @@ painting and palette manipulation tools. It also can handle JPEG, GIF,
 TIFF, BMP, XPM, and XBM files.
 
 NOTES:
-mtPaint comes with its own file and color selector widgets. To use the
-GTK default ones, pass TKWIDGETS=yes to the script. If you want this
-to build as a GTK1 app, pass GTK1=yes
+If you want this to build as a GTK3 app, pass GTK3=yes. mtPaint comes
+with its own file and color selector widgets. To use the GTK2 default
+ones, pass TKWIDGETS=yes to the script. This will have no effect with
+GTK3=yes.
diff --git a/graphics/mtpaint/mtpaint.SlackBuild b/graphics/mtpaint/mtpaint.SlackBuild
index ecffc07a7e..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,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mtpaint
-VERSION=${VERSION:-3.40}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-3.50}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -55,8 +55,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ "$GTK1" = yes ]; then
-  GTK1=gtk1
+if [ "$GTK3" = yes ]; then
+  GTK3=gtk3
 fi
 
 if [ "$TKWIDGETS" = yes ]; then
@@ -71,7 +71,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-unzip $CWD/${PRGNAM}_handbook-$VERSION.zip
 
 chown -R root:root .
 find -L . \
@@ -80,22 +79,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 {} \;
 
-# Bring deprecated function call into conformance with libpng14
-sed -i 's/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/' src/png.c
-
-# Fix build with giflib-5.1 (thanks to Arch)
-sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c
-sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c
-sed -i 's:EGifCloseFile(giffy):EGifCloseFile(giffy, NULL):g' src/png.c
-sed -i 's:DGifCloseFile(giffy):DGifCloseFile(giffy, NULL):g' src/png.c
-sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c
-sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c
-
 # If you do not want the international language support, remove 'intl'
 # from the line below.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure cflags intl man $GTK1 $TKWIDGETS \
+./configure cflags intl man $GTK3 $TKWIDGETS \
   --prefix=/usr \
   --mandir=/usr/man/man1 \
   --docdir=/usr/doc/$PRGNAM-$VERSION
@@ -103,12 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make DESTDIR=$PKG install
 
-# Install the handbook
-cd ${PRGNAM}_handbook-$VERSION
-make DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION install
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION/COPYING.handbook
-cd ..
-
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a NEWS README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/mtpaint/mtpaint.info b/graphics/mtpaint/mtpaint.info
index 3727894968..67c074a32b 100644
--- a/graphics/mtpaint/mtpaint.info
+++ b/graphics/mtpaint/mtpaint.info
@@ -1,10 +1,8 @@
 PRGNAM="mtpaint"
-VERSION="3.40"
-HOMEPAGE="http://mtpaint.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/mtpaint/mtpaint-3.40.tar.bz2 \
-          http://downloads.sourceforge.net/mtpaint/mtpaint_handbook-3.40.zip"
-MD5SUM="957c8035dd62c6bfdb594cd0a4467d22 \
-        d375790c951a90329e708c6ffc517b44"
+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/nomacs/nomacs.SlackBuild b/graphics/nomacs/nomacs.SlackBuild
index 2d471cc3b4..8eaa6158ae 100644
--- a/graphics/nomacs/nomacs.SlackBuild
+++ b/graphics/nomacs/nomacs.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nomacs
-VERSION=${VERSION:-3.12}
-PVERSION=${PVERSION:-3.12.0}
+VERSION=${VERSION:-3.14.2}
+PVERSION=${PVERSION:-3.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,7 +76,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cd ImageLounge
-patch -p0 < $CWD/opencv4.diff
 
 # Fix man pages and plugins installation path
 sed -i "s|share\/man|man|" cmake/UnixBuildTarget.cmake || exit 1
@@ -91,9 +90,6 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DENABLE_QUAZIP=1 \
     -DUSE_SYSTEM_QUAZIP=1 \
-    -DENABLE_PAINT=0 \
-    -DENABLE_THRESHOLD=1 \
-    -DENABLE_TRANSFORM=0 \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/graphics/nomacs/nomacs.info b/graphics/nomacs/nomacs.info
index b8e686e417..94fb09717d 100644
--- a/graphics/nomacs/nomacs.info
+++ b/graphics/nomacs/nomacs.info
@@ -1,10 +1,10 @@
 PRGNAM="nomacs"
-VERSION="3.12"
+VERSION="3.14.2"
 HOMEPAGE="http://www.nomacs.org"
-DOWNLOAD="https://github.com/nomacs/nomacs/archive/3.12/nomacs-3.12.tar.gz \
-          https://github.com/nomacs/nomacs-plugins/archive/3.12.0/nomacs-plugins-3.12.0.tar.gz"
-MD5SUM="7b2160cbcf907ee080d696c61b3dc4e8 \
-        4e174bfa19b695ac7fa6e0010de4d4a2"
+DOWNLOAD="https://github.com/nomacs/nomacs/archive/3.14.2/nomacs-3.14.2.tar.gz \
+          https://github.com/nomacs/nomacs-plugins/archive/3.14/nomacs-plugins-3.14.tar.gz"
+MD5SUM="65bd50be8f611305850d3c071adcfcc3 \
+        52eff2a14ff70e2f439f7f2119d80895"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lcov opencv quazip-qt5"
diff --git a/graphics/nomacs/opencv4.diff b/graphics/nomacs/opencv4.diff
deleted file mode 100644
index 7bd2969bcc..0000000000
--- a/graphics/nomacs/opencv4.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/FakeMiniaturesPlugin/src/DkFakeMiniaturesDialog.h.orig	2018-06-05 18:21:41.000000000 +1000
-+++ plugins/FakeMiniaturesPlugin/src/DkFakeMiniaturesDialog.h	2018-11-28 23:01:53.711000000 +1000
-@@ -44,8 +44,9 @@
- 	#pragma warning(disable: 4996)

- #endif

- 

--#include "opencv2/core/core.hpp"

--#include "opencv2/imgproc/imgproc.hpp"

-+#include "opencv4/opencv2/core/core.hpp"

-+#include "opencv4/opencv2/imgproc/imgproc.hpp"

-+#include "opencv4/opencv2/imgproc/types_c.h"

- 

- using namespace cv;

- #endif

-@@ -263,4 +264,4 @@
- 		~DkSaturation();

- };

- 

--};
-\ No newline at end of file
-+};
---- plugins/PageExtractionPlugin/src/DkPageSegmentationUtils.h.orig	2018-11-28 23:15:54.600000000 +1000
-+++ plugins/PageExtractionPlugin/src/DkPageSegmentationUtils.h	2018-11-28 23:20:57.093000000 +1000
-@@ -27,7 +27,8 @@
- #include "DkMath.h"
- 
- #pragma warning(push, 0)	// no warnings from includes - begin
--#include <opencv2/core/core.hpp>
-+#include <opencv4/opencv2/core/core.hpp>
-+#include <opencv4/opencv2/imgproc/imgproc_c.h>
- #include <QString>
- #pragma warning(pop)		// no warnings from includes - end
- 
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/pcx-pixbuf-loader/pcx-pixbuf-loader.info b/graphics/pcx-pixbuf-loader/pcx-pixbuf-loader.info
index 2b8309950b..9367bad35e 100644
--- a/graphics/pcx-pixbuf-loader/pcx-pixbuf-loader.info
+++ b/graphics/pcx-pixbuf-loader/pcx-pixbuf-loader.info
@@ -1,7 +1,7 @@
 PRGNAM="pcx-pixbuf-loader"
 VERSION="20140824.6211fd8"
-HOMEPAGE="http://urchlay.naptime.net/~urchlay/src/pcx-pixbuf-loader.txt"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/pcx-pixbuf-loader-20140824.6211fd8.tar.xz"
+HOMEPAGE="https://slackware.uk/~urchlay/src/pcx-pixbuf-loader.txt"
+DOWNLOAD="https://slackware.uk/~urchlay/src/pcx-pixbuf-loader-20140824.6211fd8.tar.xz"
 MD5SUM="3754d32e366a6f962765443810040267"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/phatch/phatch.info b/graphics/phatch/phatch.info
index 0b4fea37b6..39897c05bf 100644
--- a/graphics/phatch/phatch.info
+++ b/graphics/phatch/phatch.info
@@ -1,7 +1,7 @@
 PRGNAM="phatch"
 VERSION="0.2.7.1"
 HOMEPAGE="http://photobatch.stani.be"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/phatch-0.2.7.1.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/phatch-0.2.7.1.tar.gz"
 MD5SUM="c0638bcc6510d340c03c40ddfb0a0c2f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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.5.patch
deleted file mode 100644
index 8a10d19e56..0000000000
--- a/graphics/plotutils/plotutils-2.6-libpng-1.5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-fix building with libpng-1.5
-
---- libplot/z_write.c
-+++ libplot/z_write.c
-@@ -164,7 +164,7 @@
-     }
- 
-   /* cleanup after libpng errors (error handler does a longjmp) */
--  if (setjmp (png_ptr->jmpbuf))
-+  if (setjmp (png_jmpbuf (png_ptr)))
-     {
-       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
-       return -1;
-@@ -444,7 +444,7 @@
- #endif
-     }
- 
--  longjmp (png_ptr->jmpbuf, 1);
-+  png_longjmp (png_ptr, 1);
- }
- 
- static void 
-@@ -515,7 +515,7 @@
- #endif
-     }
- 
--  longjmp (png_ptr->jmpbuf, 1);
-+  png_longjmp (png_ptr, 1);
- }
- 
- static void 
diff --git a/graphics/plotutils/plotutils-2.6-libpng-1.6.patch b/graphics/plotutils/plotutils-2.6-libpng-1.6.patch
new file mode 100644
index 0000000000..835ea44932
--- /dev/null
+++ b/graphics/plotutils/plotutils-2.6-libpng-1.6.patch
@@ -0,0 +1,31 @@
+fix building with libpng-1.6
+
+--- libplot/z_write.c
++++ libplot/z_write.c
+@@ -164,7 +164,7 @@
+     }
+ 
+   /* cleanup after libpng errors (error handler does a longjmp) */
+-  if (setjmp (png_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf (png_ptr)))
+     {
+       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
+       return -1;
+@@ -444,7 +444,7 @@
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  png_longjmp (png_ptr, 1);
+ }
+ 
+ static void 
+@@ -515,7 +515,7 @@
+ #endif
+     }
+ 
+-  longjmp (png_ptr->jmpbuf, 1);
++  png_longjmp (png_ptr, 1);
+ }
+ 
+ static void 
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/qelectrotech/qelectrotech.info b/graphics/qelectrotech/qelectrotech.info
index a90397d4b1..ef8a0b7890 100644
--- a/graphics/qelectrotech/qelectrotech.info
+++ b/graphics/qelectrotech/qelectrotech.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.tuxfamily.org/qet/tags/20180306/qelectrotech-0.6-src.
 MD5SUM="4012d9814780be8c7758cf9e1bf9eb55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES="qt5-legacy"
 MAINTAINER="R. S. Ananda Murthy"
 EMAIL="rsamurti@gmail.com"
diff --git a/graphics/qrencode/qrencode.SlackBuild b/graphics/qrencode/qrencode.SlackBuild
index 58272c93eb..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
-# Revised 2018 Lenard Spencer
+# 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.0.2}
+VERSION=${VERSION:-4.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,9 +84,6 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# Do not ship .la files
-find $PKG/usr/lib${LIBDIRSUFFIX} -name *.la -delete || 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
 
diff --git a/graphics/qrencode/qrencode.info b/graphics/qrencode/qrencode.info
index 64bc5d377a..ecdb156112 100644
--- a/graphics/qrencode/qrencode.info
+++ b/graphics/qrencode/qrencode.info
@@ -1,8 +1,8 @@
 PRGNAM="qrencode"
-VERSION="4.0.2"
+VERSION="4.1.1"
 HOMEPAGE="https://fukuchi.org/works/qrencode/"
-DOWNLOAD="https://fukuchi.org/works/qrencode/qrencode-4.0.2.tar.bz2"
-MD5SUM="3eb64357f6fbdb68c27cb2e44e97280a"
+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
new file mode 100644
index 0000000000..415012ab7d
--- /dev/null
+++ b/graphics/renderdoc/README
@@ -0,0 +1,12 @@
+RenderDoc is a free MIT licensed stand-alone graphics debugger that
+allows quick and easy single-frame capture and detailed introspection of
+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/doinst.sh b/graphics/renderdoc/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/graphics/renderdoc/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/renderdoc/renderdoc.SlackBuild b/graphics/renderdoc/renderdoc.SlackBuild
new file mode 100644
index 0000000000..573f723403
--- /dev/null
+++ b/graphics/renderdoc/renderdoc.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for renderdoc
+
+# 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=renderdoc
+VERSION=${VERSION:-1.11}
+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
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  # https://github.com/baldurk/renderdoc/issues/1991#issuecomment-670518428
+  printf %s\\n 'Only x86_64 is supported for linux.' >&2
+  exit 1
+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 {} \;
+
+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
+fi
+
+grep -rl "share/doc/$PRGNAM" |
+  xargs sed -i "s|share/doc/$PRGNAM|doc/$PRGNAM-$VERSION|"
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DQMAKE_QT5_COMMAND=qmake-qt5 \
+    -DLIB_SUBFOLDER=$PRGNAM \
+    -DVULKAN_LAYER_FOLDER=/usr/share/vulkan/implicit_layer.d \
+    -DRENDERDOC_SWIG_PACKAGE="$CWD/swig-$PRGNAM-modified-7.tar.gz" \
+    -DENABLE_PYRENDERDOC=$GUI \
+    -DENABLE_QRENDERDOC=$GUI \
+    -DBUILD_VERSION_STABLE=ON \
+    -DBUILD_VERSION_DIST_NAME=slackware \
+    -DBUILD_VERSION_DIST_CONTACT='https://lists.slackbuilds.org/' \
+    -DCMAKE_BUILD_TYPE=$RELEASE ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+# 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
+
+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/renderdoc/renderdoc.info b/graphics/renderdoc/renderdoc.info
new file mode 100644
index 0000000000..5fcede2da5
--- /dev/null
+++ b/graphics/renderdoc/renderdoc.info
@@ -0,0 +1,12 @@
+PRGNAM="renderdoc"
+VERSION="1.11"
+HOMEPAGE="https://renderdoc.org/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+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="023a7cb3d7980a1aa054695059262b86 \
+               5558ee4e2fcf33b8dceb191ed4795a23"
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="orbea@riseup.net"
diff --git a/graphics/renderdoc/slack-desc b/graphics/renderdoc/slack-desc
new file mode 100644
index 0000000000..4cd1395fbf
--- /dev/null
+++ b/graphics/renderdoc/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------------------------------------------------------|
+renderdoc: renderdoc (Stand-alone graphics debugging tool)
+renderdoc:
+renderdoc: RenderDoc is a frame-capture based graphics debugger, currently
+renderdoc: available for Vulkan, D3D11, D3D12, OpenGL, and OpenGL ES
+renderdoc: development.
+renderdoc:
+renderdoc: Homepage: https://renderdoc.org/
+renderdoc:
+renderdoc:
+renderdoc:
+renderdoc:
diff --git a/graphics/scantailor/scantailor.info b/graphics/scantailor/scantailor.info
index ae2b470443..15146007f0 100644
--- a/graphics/scantailor/scantailor.info
+++ b/graphics/scantailor/scantailor.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Tulon/scantailor/archive/EXPERIMENTAL_2016_01_13.ta
 MD5SUM="90617c2bc82f288bfed472b9b03a1eef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES="qt5-legacy"
 MAINTAINER="Zhischenko Sergey"
 EMAIL="gishenko@mail.ru"
diff --git a/graphics/shaderc/fix-glslang-link-order.patch b/graphics/shaderc/fix-glslang-link-order.patch
deleted file mode 100644
index ad7de1f33b..0000000000
--- a/graphics/shaderc/fix-glslang-link-order.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-Date: Tue, 29 May 2018 07:34:00 +0200
-Subject: [PATCH] Fix the link order of libglslang and libHLSL
-
-libglslang depends on libHLSL, so the latter needs to be specified last.
-This fixes an issue when trying to build shaderc against system-wide
-versions of libglslang/libHLSL, rather than the in-tree versions from
-third_party.
-
-Additionally, libshaderc_util also depends on SPIRV-Tools
----
- glslc/CMakeLists.txt           | 2 +-
- libshaderc_util/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
- 
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..6d0c465 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL)
- 
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV
--  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+  glslang OSDependent OGLCompiler glslang HLSL SPIRV
-+  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
- 
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util
diff --git a/graphics/shaderc/shaderc.SlackBuild b/graphics/shaderc/shaderc.SlackBuild
index 7c39dc871f..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:-2019.1}
+VERSION=${VERSION:-2020.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,16 +83,13 @@ cat > glslc/src/build-version.inc <<EOF
   "glslang-${glslang_version##* }\\n"
 EOF
 
-# Fix the link order of libglslang and libHLS
-# https://github.com/google/shaderc/pull/463
-patch -p1 < $CWD/fix-glslang-link-order.patch
-
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -I/usr/include/glslang" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON \
     -DSHADERC_SKIP_TESTS=ON \
     -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release ..
diff --git a/graphics/shaderc/shaderc.info b/graphics/shaderc/shaderc.info
index 34a813752f..398339dcec 100644
--- a/graphics/shaderc/shaderc.info
+++ b/graphics/shaderc/shaderc.info
@@ -1,10 +1,10 @@
 PRGNAM="shaderc"
-VERSION="2019.1"
+VERSION="2020.4"
 HOMEPAGE="https://github.com/google/shaderc"
-DOWNLOAD="https://github.com/google/shaderc/archive/v2019.1/shaderc-2019.1.tar.gz"
-MD5SUM="cc408cef9a62f498d55b041e61ece2cd"
+DOWNLOAD="https://github.com/google/shaderc/archive/v2020.4/shaderc-2020.4.tar.gz"
+MD5SUM="5c587cb6bd3b7e8745ca2e0dd46bb284"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="vulkan-sdk"
+REQUIRES="glslang"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/graphics/teighafileconverter/teighafileconverter.info b/graphics/teighafileconverter/teighafileconverter.info
index 9cd78e6cff..5ac7e7f72c 100644
--- a/graphics/teighafileconverter/teighafileconverter.info
+++ b/graphics/teighafileconverter/teighafileconverter.info
@@ -1,9 +1,9 @@
 PRGNAM="teighafileconverter"
 VERSION="19.5.0.0"
 HOMEPAGE="https://www.opendesign.com/guestfiles/TeighaFileConverter"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/TeighaFileConverter_QT5_lnxX86_4.7dll.deb"
+DOWNLOAD="https://slackware.uk/~urchlay/src/TeighaFileConverter_QT5_lnxX86_4.7dll.deb"
 MD5SUM="68e6185b3419fcf31d53da1fe34142a4"
-DOWNLOAD_x86_64="http://urchlay.naptime.net/~urchlay/src/TeighaFileConverter_QT5_lnxX64_4.7dll.deb"
+DOWNLOAD_x86_64="https://slackware.uk/~urchlay/src/TeighaFileConverter_QT5_lnxX64_4.7dll.deb"
 MD5SUM_x86_64="a9da11f38a74a767812f1a11d387bbbf"
 REQUIRES="qt5"
 MAINTAINER="B. Watson"
diff --git a/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild b/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild
index f899e3124b..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:-2018.09.01}
+VERSION=${VERSION:-2020.12.27}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -34,13 +34,6 @@ find -L . \
 #the "source" is just data which needs copying to the right place.
 mkdir -p $PKG/usr/share/tuxpaint
 cp -ar stamps $PKG/usr/share/tuxpaint/
-#remove some empty files (should be fixed upstream next time)
-if [ ! -s $PKG/usr/share/tuxpaint/stamps/plants/trees/holly_leaves.dat ]; then
- rm -f $PKG/usr/share/tuxpaint/stamps/plants/trees/holly_leaves.dat
-fi
-if [ ! -s $PKG/usr/share/tuxpaint/stamps/hobbies/music/wind/bassoon.dat ]; then
- rm -f $PKG/usr/share/tuxpaint/stamps/hobbies/music/wind/bassoon.dat
-fi
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a docs/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/graphics/tuxpaint-stamps/tuxpaint-stamps.info b/graphics/tuxpaint-stamps/tuxpaint-stamps.info
index 517c8b6adf..45cfd52869 100644
--- a/graphics/tuxpaint-stamps/tuxpaint-stamps.info
+++ b/graphics/tuxpaint-stamps/tuxpaint-stamps.info
@@ -1,8 +1,8 @@
 PRGNAM="tuxpaint-stamps"
-VERSION="2018.09.01"
+VERSION="2020.12.27"
 HOMEPAGE="http://www.tuxpaint.org"
-DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-stamps-2018.09.01.tar.gz"
-MD5SUM="ac318e01b1f90a29325855e69e2e3901"
+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 3be2b90773..1884956536 100644
--- a/graphics/tuxpaint/README
+++ b/graphics/tuxpaint/README
@@ -9,4 +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.
 
-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 9132dc564d..92dccd38b8 100644
--- a/graphics/tuxpaint/tuxpaint.SlackBuild
+++ b/graphics/tuxpaint/tuxpaint.SlackBuild
@@ -8,9 +8,9 @@
 # added tuxpaint-config 2019-02-11
 
 PRGNAM=tuxpaint
-VERSION=${VERSION:-0.9.23}
-CONFVER=${CONFVER:-0.0.14}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.25}
+CONFVER=${CONFVER:-0.0.16}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -76,28 +76,17 @@ cp src/$PRGNAM.desktop $PKG/usr/share/applications/
 cd ..
 tar xvf $CWD/$PRGNAM-config-$CONFVER.tar.gz
 cd $PRGNAM-config-$CONFVER
-make
-#unfortunately tuxpaint-config does not have DESTDIR configured, so we
-#have to do things by hand. copy executable, icons and desktop file and man
-mkdir -p $PKG/usr/bin
-cp $PRGNAM-config $PKG/usr/bin/
-mkdir -p $PKG/usr/share/pixmaps
-cp data/images/icon.png $PKG/usr/share/pixmaps/$PRGNAM-config.png
-cp data/images/icon32x32.xpm $PKG/usr/share/pixmaps/$PRGNAM-config.xpm
-for i in "16x16" "32x32" "48x48"; do
-  mkdir -p $PKG/usr/share/icons/hicolor/$i
-  cp data/images/icon$i.png $PKG/usr/share/icons/hicolor/$i/$PRGNAM-config.png
-done
-mkdir -p $PKG/usr/share/applications
-cp src/$PRGNAM-config.desktop $PKG/usr/share/applications/$PRGNAM-config.desktop
-mkdir -p $PKG/usr/man/man1
-cp src/$PRGNAM-config.1 $PKG/usr/man/man1/$PRGNAM-config.1
-gzip -9f $PKG/usr/man/man1/$PRGNAM-config.1
-#finally for translation files
-for i in `ls trans`; do
-  mkdir -p $PKG/usr/share/locale/$i/LC_MESSAGES
-  cp trans/$i $PKG/usr/share/locale/$i/LC_MESSAGES/$PRGNAM-config.mo
-done
+make PREFIX=/usr LIBDIRSUFFIX=$LIBDIRSUFFIX OPTFLAGS="$SLKCFLAGS"
+make \
+  MAN_PREFIX=/usr/man \
+  DEVMAN_PREFIX=/usr/man \
+  DOC_PREFIX=/usr/doc/$PRGNAM-$VERSION \
+  DEVDOC_PREFIX=/usr/doc/$PRGNAM-$VERSION \
+  PREFIX=/usr \
+  LIBDIRSUFFIX=$LIBDIRSUFFIX \
+  DESTDIR=$PKG \
+  install
+
 #now sanitize stuff.
 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/graphics/tuxpaint/tuxpaint.info b/graphics/tuxpaint/tuxpaint.info
index 4c2a9c9454..b73b6afc0e 100644
--- a/graphics/tuxpaint/tuxpaint.info
+++ b/graphics/tuxpaint/tuxpaint.info
@@ -1,12 +1,12 @@
 PRGNAM="tuxpaint"
-VERSION="0.9.23"
+VERSION="0.9.25"
 HOMEPAGE="http://www.tuxpaint.org"
-DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.23.tar.gz \
-          http://downloads.sourceforge.net/tuxpaint/tuxpaint-config-0.0.14.tar.gz"
-MD5SUM="5dfc5a710b5550c54bbc8cb7cf06d594 \
-        1d7e81f01c52943ee9849aac5415cd86"
+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"
+REQUIRES="libpaper SDL_Pango fltk pngquant"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"
diff --git a/graphics/ueberzug/README b/graphics/ueberzug/README
new file mode 100644
index 0000000000..47b6e45832
--- /dev/null
+++ b/graphics/ueberzug/README
@@ -0,0 +1,5 @@
+Ãœberzug is a command line util which allows to draw images on
+terminals by using child windows.
+
+Note: dependencies must have been built with python3 support, where
+      that option is available.
diff --git a/graphics/ueberzug/slack-desc b/graphics/ueberzug/slack-desc
new file mode 100644
index 0000000000..0a1189e6e4
--- /dev/null
+++ b/graphics/ueberzug/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------------------------------------------------------|
+ueberzug: ueberzug (An alternative to w3mimgdisplay)
+ueberzug:
+ueberzug: Ãœberzug is a command line util which allows to draw images on
+ueberzug: terminals by using child windows.
+ueberzug:
+ueberzug:
+ueberzug:
+ueberzug:
+ueberzug:
+ueberzug: Homepage: https://github.com/seebye/ueberzug
+ueberzug:
diff --git a/graphics/ueberzug/ueberzug.SlackBuild b/graphics/ueberzug/ueberzug.SlackBuild
new file mode 100644
index 0000000000..1885df6697
--- /dev/null
+++ b/graphics/ueberzug/ueberzug.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for ueberzug
+
+# Copyright 2020 Leonardo Citrolo, Italy
+# 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=ueberzug
+VERSION=${VERSION:-18.1.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}
+
+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 MANIFEST.in 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/ueberzug/ueberzug.info b/graphics/ueberzug/ueberzug.info
new file mode 100644
index 0000000000..1dedf4676f
--- /dev/null
+++ b/graphics/ueberzug/ueberzug.info
@@ -0,0 +1,10 @@
+PRGNAM="ueberzug"
+VERSION="18.1.8"
+HOMEPAGE="https://github.com/seebye/ueberzug"
+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"
+MAINTAINER="Leo C."
+EMAIL="leoc@gmx.com"
diff --git a/graphics/vuescan/vuescan.SlackBuild b/graphics/vuescan/vuescan.SlackBuild
index 1c63f2ac93..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.26}
+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 f83497da35..83e983e8ff 100644
--- a/graphics/vuescan/vuescan.info
+++ b/graphics/vuescan/vuescan.info
@@ -1,10 +1,10 @@
 PRGNAM="vuescan"
-VERSION="9.7.26"
+VERSION="9.7.52"
 HOMEPAGE="https://www.hamrick.com"
 DOWNLOAD="https://www.hamrick.com/files/vuex3297.tgz"
-MD5SUM="79ed5d43fb04a94cdac59ec36be52fa7"
+MD5SUM="7e9f7469b22142f85f46b262baa9f45f"
 DOWNLOAD_x86_64="https://www.hamrick.com/files/vuex6497.tgz"
-MD5SUM_x86_64="de434e6784d7cbcc775aef1dd9f01f59"
+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 9988341587..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.131.2}
+VERSION=${VERSION:-1.2.162.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,27 +59,34 @@ 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
 }
 
-# For best compatibility use git versions which upstream also uses.
-# Vulkan-ValidationLayers/scripts/known_good.json
-# glslang/known_good.json
-# https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/1082
-GLSLANG_VERSION=${GLSLANG_VERSION:-4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3}
-SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-204cd131c42b90d129073719f2766293ce35c081}
-SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-323a81fc5e30e43a04e5e22af4cba98ca2a161e6}
+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
@@ -87,24 +94,18 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.gz
+tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VERSION.tar.gz
+tar xvf $CWD/VulkanTools-sdk-$VERSION.tar.gz
+tar xvf $CWD/gfxreconstruct-sdk-$VERSION.tar.gz
 
 (
-  tar xvf $CWD/glslang-$GLSLANG_VERSION.tar.gz
-  cd glslang-$GLSLANG_VERSION/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
+  cd VulkanTools-sdk-$VERSION/submodules
+  tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.gz
+  rm -rf jsoncpp
+  mv jsoncpp-$JSONCPP_VERSION jsoncpp
 )
 
-OLDVERSION=${OLDVERSION:-1.2.131.1}
-
-tar xvf $CWD/Vulkan-Headers-sdk-$OLDVERSION.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-$OLDVERSION.tar.gz
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -112,31 +113,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 {} \+
 
-chdir glslang-$GLSLANG_VERSION
-
-cmake_build \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_SKIP_RPATH=TRUE
-
-chdir Vulkan-Headers-sdk-$OLDVERSION
-
-# Require an older cmake version.
-sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
-
-cmake_build
+#####################
+### vulkan-loader ###
+#####################
 
 chdir Vulkan-Loader-sdk-$VERSION
 
-ORIGCFLAGS="$SLKCFLAGS"
-
-# Fix build with clang on 32-bit systems
-# https://github.com/gentoo/gentoo/pull/13369
-if [ "$ARCH" = i586 ] || [ "$ARCH" = i686 ] &&
-    "${CC:-cc}" --version 2>/dev/null | grep -qi clang; then
-  SLKCFLAGS="$SLKCFLAGS -fno-integrated-as"
-fi
-
 # Require an older cmake version.
 sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
 
@@ -144,58 +126,88 @@ 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
 
-SLKCFLAGS="$ORIGCFLAGS"
+###############################
+### vulkan-validationlayers ###
+###############################
 
 chdir Vulkan-ValidationLayers-sdk-$VERSION
 
 # Require an older cmake version.
 sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
 
-# Disable hardcoded errors
-sed -i '/-Werror/d' CMakeLists.txt
-
 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=$PKG/usr \
-  -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
+  -DGLSLANG_INSTALL_DIR=/usr \
+  -DSPIRV_HEADERS_INSTALL_DIR=/usr \
+  -DVULKAN_HEADERS_INSTALL_DIR=/usr
+
+###################
+### vulkantools ###
+###################
+
+chdir VulkanTools-sdk-$VERSION
 
-chdir Vulkan-Tools-sdk-$OLDVERSION
+# 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=$PKG/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 95ec646621..879c8f7d73 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.info
+++ b/graphics/vulkan-sdk/vulkan-sdk.info
@@ -1,22 +1,18 @@
 PRGNAM="vulkan-sdk"
-VERSION="1.2.131.2"
+VERSION="1.2.162.0"
 HOMEPAGE="https://www.khronos.org/vulkan/"
-DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/204cd131c42b90d129073719f2766293ce35c081/SPIRV-Headers-204cd131c42b90d129073719f2766293ce35c081.tar.gz \
-          https://github.com/KhronosGroup/SPIRV-Tools/archive/323a81fc5e30e43a04e5e22af4cba98ca2a161e6/SPIRV-Tools-323a81fc5e30e43a04e5e22af4cba98ca2a161e6.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.131.1/Vulkan-Headers-sdk-1.2.131.1.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.131.2/Vulkan-Loader-sdk-1.2.131.2.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.131.1/Vulkan-Tools-sdk-1.2.131.1.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.131.2/Vulkan-ValidationLayers-sdk-1.2.131.2.tar.gz \
-          https://github.com/KhronosGroup/glslang/archive/4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3/glslang-4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3.tar.gz"
-MD5SUM="a52dc382c946eb44ea6f58d5b4dba597 \
-        bf1d5e2b0d9f5cf61ca69ff1db581734 \
-        24e3bb31d6ca00915ec34c6d91a82cbd \
-        1c031843e24e166ba7428dff69778902 \
-        a2c02b71a878ab549afed551a6aa57ab \
-        a396ccd4d3ca4b1420ff0de1fbddc49a \
-        1a2f2327ba83c393525a6d20844a6169"
+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="python3"
+REQUIRES="Vulkan-Headers glslang"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/graphics/wayland-egl/README b/graphics/wayland-egl/README
deleted file mode 100644
index dbd1aeca18..0000000000
--- a/graphics/wayland-egl/README
+++ /dev/null
@@ -1,12 +0,0 @@
-wayland-egl (mesa EGL component)
-
-The Wayland display server protocol uses EGL. If you build qt5 with
-its optional dependency wayland and then build vlc then vlc will
-require wayland-egl.
-
-EGL is an interface between Khronos rendering APIs (such as OpenGL,
-OpenGL ES or OpenVG) and the underlying native platform windowing
-system. EGL handles graphics context management, surface/buffer
-binding, rendering synchronization, and enables "high-performance,
-accelerated, mixed-mode 2D APIs". EGL is managed by the non-profit
-technology consortium Khronos Group.
diff --git a/graphics/wayland-egl/slack-desc b/graphics/wayland-egl/slack-desc
deleted file mode 100644
index 90e73f0ec1..0000000000
--- a/graphics/wayland-egl/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------------------------------------------------------|
-wayland-egl: wayland-egl (mesa EGL component)
-wayland-egl:
-wayland-egl: EGL is an interface between Khronos rendering APIs (such as OpenGL,
-wayland-egl: OpenGL ES or OpenVG) and the underlying native platform windowing
-wayland-egl: system. EGL handles graphics context management, surface/buffer
-wayland-egl: binding, rendering synchronization, and enables "high-performance,
-wayland-egl: accelerated, mixed-mode 2D APIs". EGL is managed by the non-profit
-wayland-egl: technology consortium Khronos Group.
-wayland-egl: The Wayland display server protocol uses EGL. If you build qt5 with
-wayland-egl: its optional dependency wayland and then build vlc then vlc will
-wayland-egl: require wayland-egl.
diff --git a/graphics/wayland-egl/wayland-egl.SlackBuild b/graphics/wayland-egl/wayland-egl.SlackBuild
deleted file mode 100644
index b9837647bd..0000000000
--- a/graphics/wayland-egl/wayland-egl.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for wayland-egl
-
-# Copyright 2017 Duncan Roe, Melbourne, 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=wayland-egl
-VERSION=${VERSION:-17.0.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 {} \;
-
-libtoolize
-aclocal
-autoreconf --install
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-static=no \
-  --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
-
-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/graphics/wayland-egl/wayland-egl.info b/graphics/wayland-egl/wayland-egl.info
deleted file mode 100644
index 49585a2338..0000000000
--- a/graphics/wayland-egl/wayland-egl.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="wayland-egl"
-VERSION="17.0.4"
-HOMEPAGE="https://www.mesa3d.org/"
-DOWNLOAD="https://github.com/duncan-roe/wayland-egl/archive/v17.0.4/wayland-egl-17.0.4.tar.gz"
-MD5SUM="be5670c106bf1e5859e5580f898d688b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="wayland"
-MAINTAINER="Duncan Roe"
-EMAIL="duncan_roe@optusnet.com.au"
diff --git a/graphics/webp-pixbuf-loader/git2tarxz.sh b/graphics/webp-pixbuf-loader/git2tarxz.sh
index eda6a8cec9..ad624a1341 100644
--- a/graphics/webp-pixbuf-loader/git2tarxz.sh
+++ b/graphics/webp-pixbuf-loader/git2tarxz.sh
@@ -35,7 +35,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz
 Update $PRGNAM.info with:
 
 VERSION="$VERSION"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
 MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
 
 Don't forget to upload the new source!
diff --git a/graphics/webp-pixbuf-loader/webp-pixbuf-loader.info b/graphics/webp-pixbuf-loader/webp-pixbuf-loader.info
index 96baf11a22..0328f67fbb 100644
--- a/graphics/webp-pixbuf-loader/webp-pixbuf-loader.info
+++ b/graphics/webp-pixbuf-loader/webp-pixbuf-loader.info
@@ -1,7 +1,7 @@
 PRGNAM="webp-pixbuf-loader"
 VERSION="20191003.fb04954"
 HOMEPAGE="https://github.com/aruiz/webp-pixbuf-loader"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/webp-pixbuf-loader-20191003.fb04954.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/webp-pixbuf-loader-20191003.fb04954.tar.xz"
 MD5SUM="d3e9041ab56b18020c647dcb9f3176d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/graphics/white_dune/white_dune.SlackBuild b/graphics/white_dune/white_dune.SlackBuild
index ae00c54d64..40df579d10 100644
--- a/graphics/white_dune/white_dune.SlackBuild
+++ b/graphics/white_dune/white_dune.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=white_dune
 SRCNAM=wdune
-VERSION=${VERSION:-1.822}
+VERSION=${VERSION:-1.876}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -106,3 +106,4 @@ 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/white_dune/white_dune.info b/graphics/white_dune/white_dune.info
index 1a870659de..780e528fc2 100644
--- a/graphics/white_dune/white_dune.info
+++ b/graphics/white_dune/white_dune.info
@@ -1,8 +1,8 @@
 PRGNAM="white_dune"
-VERSION="1.822"
+VERSION="1.876"
 HOMEPAGE="https://wdune.ourproject.org/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/white_dune/wdune-1.822.tar.bz2"
-MD5SUM="72816f93eaf948b2c25e4cb7e687327e"
+DOWNLOAD="ftp://ftp.ourproject.org/pub/wdune/wdune-1.876.tar.bz2"
+MD5SUM="0bddc4c43586251482f179c1c67e92b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="CGAL vcglib ffmpeg OpenSubdiv"
diff --git a/graphics/wine-nine-standalone/README b/graphics/wine-nine-standalone/README
index e4fc1e042c..1af24f6d81 100644
--- a/graphics/wine-nine-standalone/README
+++ b/graphics/wine-nine-standalone/README
@@ -18,3 +18,8 @@ To enable 64-bit support wine must be built with wine64.
 To build on a pure Slackware64 install 32-bit wine must be disabled.
 
   WIN32=no WIN64=yes ./wine.SlackBuild
+
+On multilib systems pkgconf is required.
+
+On Slackware 14.2 multilib systems compat32 packages of both kbproto and
+xproto are also required.
diff --git a/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild b/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild
index fdd90c3d9b..5927c3191b 100644
--- a/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild
+++ b/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wine-nine-standalone
 
-# Copyright 2019 Hunter Sezen California, USA
+# Copyright 2019-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=wine-nine-standalone
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,24 +57,54 @@ fi
 set -eu
 
 exists () {
-  v=1
+  r=0; cwd="$(pwd)"
   while [ $# -gt 0 ]; do
-    arg="$1"; shift
-    case "$arg" in ''|*/) continue ;; esac
-    x="${arg##*/}" z="${arg%/*}"
-    [ ! -f "$z/$x" ] || [ ! -x "$z/$x" ] && [ "$z/$x" = "$arg" ] && continue
-    [ "$x" = "$z" ] && [ -x "$z/$x" ] && [ ! -f "$arg" ] && z=
-    p=":$z:$PATH"
-    while [ "$p" != "${p#*:}" ]; do
-      p="${p#*:}"; d="${p%%:*}"
-      if [ -f "$d/$x" ] && [ -x "$d/$x" ]; then
-        printf %s\\n "$d/$x"
-        v=0
-        break
-      fi
-    done
+    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
+      ;;
+      * )
+        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 9f6c4be7f1..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.5"
+VERSION="0.7"
 HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
-DOWNLOAD="https://github.com/iXit/wine-nine-standalone/archive/v0.5/wine-nine-standalone-0.5.tar.gz"
-MD5SUM="7b5b4b5a7d5066b9f8d26d884bb0d39a"
+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/xcf-pixbuf-loader/git2tarxz.sh b/graphics/xcf-pixbuf-loader/git2tarxz.sh
index 0fdb9f89b5..32b25e45e8 100644
--- a/graphics/xcf-pixbuf-loader/git2tarxz.sh
+++ b/graphics/xcf-pixbuf-loader/git2tarxz.sh
@@ -35,7 +35,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz
 Update $PRGNAM.info with:
 
 VERSION="$VERSION"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
 MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
 
 Don't forget to upload the new source!
diff --git a/graphics/xcf-pixbuf-loader/xcf-pixbuf-loader.info b/graphics/xcf-pixbuf-loader/xcf-pixbuf-loader.info
index 97dd27326f..f344d6dbfa 100644
--- a/graphics/xcf-pixbuf-loader/xcf-pixbuf-loader.info
+++ b/graphics/xcf-pixbuf-loader/xcf-pixbuf-loader.info
@@ -1,7 +1,7 @@
 PRGNAM="xcf-pixbuf-loader"
 VERSION="20180108.eb42b85"
 HOMEPAGE="https://github.com/StephaneDelcroix/xcf-pixbuf-loader"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/xcf-pixbuf-loader-20180108.eb42b85.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/xcf-pixbuf-loader-20180108.eb42b85.tar.xz"
 MD5SUM="b73f994ba57edcfd25c964bfc1f3680f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/yacreader/yacreader.SlackBuild b/graphics/yacreader/yacreader.SlackBuild
index 6efef20564..baed9b6d53 100644
--- a/graphics/yacreader/yacreader.SlackBuild
+++ b/graphics/yacreader/yacreader.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for yacreader
 
-# Copyright 2016-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2020 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=yacreader
-VERSION=${VERSION:-9.6.2.1909283}
+VERSION=${VERSION:-9.7.1.2009123}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/yacreader/yacreader.info b/graphics/yacreader/yacreader.info
index c33764ae5b..38192aafee 100644
--- a/graphics/yacreader/yacreader.info
+++ b/graphics/yacreader/yacreader.info
@@ -1,8 +1,8 @@
 PRGNAM="yacreader"
-VERSION="9.6.2.1909283"
+VERSION="9.7.1.2009123"
 HOMEPAGE="https://www.yacreader.com"
-DOWNLOAD="https://github.com/YACReader/yacreader/releases/download/9.6.2/yacreader-9.6.2.1909283-src.tar.xz"
-MD5SUM="77ed908eef0267063200eb888e343319"
+DOWNLOAD="https://github.com/YACReader/yacreader/releases/download/9.7.1/yacreader-9.7.1.2009123-src.tar.xz"
+MD5SUM="66df4ee9c9b82370d250547f8c484bed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libwebp poppler-qt5 qrencode unarr"
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/CubicSDR/CubicSDR.SlackBuild b/ham/CubicSDR/CubicSDR.SlackBuild
index fac6a9ad18..11fef3bb6a 100644
--- a/ham/CubicSDR/CubicSDR.SlackBuild
+++ b/ham/CubicSDR/CubicSDR.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CubicSDR
 
-# Copyright 2017 Alan Aversa USA
+# Copyright 2020 Alan Aversa USA
 # 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=CubicSDR
-VERSION=${VERSION:-0.2.2}
+VERSION=${VERSION:-d2f9333}
+HASH=${HASH:-d2f93335236ef37557057d7b71c46969bec14471}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +69,7 @@ cd $PRGNAM-$VERSION
 STATICWXWIDGETS_DESTDIR=$TMP/$PRGNAM-$VERSION/wxWidgets-staticlib
 mkdir -p $STATICWXWIDGETS_DESTDIR
 
-VERWXWIDGETS=${VERWXWIDGETS:-3.1.0}
+VERWXWIDGETS=${VERWXWIDGETS:-3.1.3}
 
 tar xvf $CWD/wxWidgets-$VERWXWIDGETS.tar.bz2
 cd wxWidgets-$VERWXWIDGETS
@@ -108,6 +109,7 @@ cd ..
 # build CubicSDR
 
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+mv $PRGNAM-$HASH $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/ham/CubicSDR/CubicSDR.info b/ham/CubicSDR/CubicSDR.info
index 3b04c54a9d..83ad319d01 100644
--- a/ham/CubicSDR/CubicSDR.info
+++ b/ham/CubicSDR/CubicSDR.info
@@ -1,10 +1,10 @@
 PRGNAM="CubicSDR"
-VERSION="0.2.2"
+VERSION="d2f9333"
 HOMEPAGE="https://github.com/cjcliffe/CubicSDR/"
-DOWNLOAD="https://github.com/cjcliffe/CubicSDR/archive/0.2.2/CubicSDR-0.2.2.tar.gz \
-          https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.tar.bz2"
-MD5SUM="79672b71187837aa5fc9c8adca39705a \
-        e20c14bb9bf5d4ec0979a3cd7510dece"
+DOWNLOAD="https://github.com/cjcliffe/CubicSDR/archive/d2f9333/CubicSDR-d2f9333.tar.gz \
+          https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.3/wxWidgets-3.1.3.tar.bz2"
+MD5SUM="c537c8c99b53ba70bfb4799a41d96209 \
+        f4bfa03a071cc20efba84fbcef9533fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SoapySDR liquid-dsp"
diff --git a/ham/SDRPlay/SDRPlay.SlackBuild b/ham/SDRPlay/SDRPlay.SlackBuild
index e6fe2e9437..c32ee5a75e 100644
--- a/ham/SDRPlay/SDRPlay.SlackBuild
+++ b/ham/SDRPlay/SDRPlay.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SDRPlay
 
-# Copyright 2017 Alan Aversa USA
+# Copyright 2020 Alan Aversa 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=SDRPlay
-VERSION=${VERSION:-2.10.2}
+VERSION=${VERSION:-2.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,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 {} \;
 
-VERS="2.10"
+VERS="2.13"
 
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
 install -m644 ${ARCH}/libmirsdrapi-rsp.so.${VERS} $PKG/usr/lib$LIBDIRSUFFIX
diff --git a/ham/SDRPlay/SDRPlay.info b/ham/SDRPlay/SDRPlay.info
index eb2a100bc4..fc53d87e98 100644
--- a/ham/SDRPlay/SDRPlay.info
+++ b/ham/SDRPlay/SDRPlay.info
@@ -1,8 +1,8 @@
 PRGNAM="SDRPlay"
-VERSION="2.10.2"
+VERSION="2.13.1"
 HOMEPAGE="http://www.sdrplay.com/software/"
-DOWNLOAD="http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-2.10.2.run"
-MD5SUM="2b77d0ce2fbb770e9526b6f17656a716"
+DOWNLOAD="http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-2.13.1.run"
+MD5SUM="6a394db7d5770f11442023ce3ab0ba66"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ham/SoapyRemote/SoapyRemote.SlackBuild b/ham/SoapyRemote/SoapyRemote.SlackBuild
index d3a8cf23d1..9365116325 100644
--- a/ham/SoapyRemote/SoapyRemote.SlackBuild
+++ b/ham/SoapyRemote/SoapyRemote.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SoapyRemote
 
-# Copyright 2017 Alan Aversa USA
+# Copyright 2020 Alan Aversa 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=SoapyRemote
-VERSION=${VERSION:-0.4.2}
+VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ham/SoapyRemote/SoapyRemote.info b/ham/SoapyRemote/SoapyRemote.info
index 2718c84ed4..d2459f192c 100644
--- a/ham/SoapyRemote/SoapyRemote.info
+++ b/ham/SoapyRemote/SoapyRemote.info
@@ -1,8 +1,8 @@
 PRGNAM="SoapyRemote"
-VERSION="0.4.2"
+VERSION="0.5.1"
 HOMEPAGE="https://github.com/pothosware/SoapyRemote"
-DOWNLOAD="https://github.com/pothosware/SoapyRemote/archive/soapy-remote-0.4.2/SoapyRemote-soapy-remote-0.4.2.tar.gz"
-MD5SUM="8068692459939f1e9ed0e833535468ce"
+DOWNLOAD="https://github.com/pothosware/SoapyRemote/archive/soapy-remote-0.5.1/SoapyRemote-soapy-remote-0.5.1.tar.gz"
+MD5SUM="ce017cf0bb53568e0684ee023366a95f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SoapySDR"
diff --git a/ham/SoapySDR/SoapySDR.SlackBuild b/ham/SoapySDR/SoapySDR.SlackBuild
index 113c2294a5..7d75980af8 100644
--- a/ham/SoapySDR/SoapySDR.SlackBuild
+++ b/ham/SoapySDR/SoapySDR.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SoapySDR
 
-# Copyright 2017 Alan Aversa USA
+# Copyright 2020 Alan Aversa 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=SoapySDR
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ham/SoapySDR/SoapySDR.info b/ham/SoapySDR/SoapySDR.info
index eafd41bb12..80c19c1525 100644
--- a/ham/SoapySDR/SoapySDR.info
+++ b/ham/SoapySDR/SoapySDR.info
@@ -1,8 +1,8 @@
 PRGNAM="SoapySDR"
-VERSION="0.6.0"
+VERSION="0.7.2"
 HOMEPAGE="https://github.com/pothosware/SoapySDR"
-DOWNLOAD="https://github.com/pothosware/SoapySDR/archive/soapy-sdr-0.6.0/SoapySDR-soapy-sdr-0.6.0.tar.gz"
-MD5SUM="f662b12c8a5ac7770c35a6a597ef31fc"
+DOWNLOAD="https://github.com/pothosware/SoapySDR/archive/soapy-sdr-0.7.2/SoapySDR-soapy-sdr-0.7.2.tar.gz"
+MD5SUM="9e9f935ec967b746b1549a6456714085"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ham/SoapySDRPlay/SoapySDRPlay.SlackBuild b/ham/SoapySDRPlay/SoapySDRPlay.SlackBuild
index 584691ef83..24c83597d9 100644
--- a/ham/SoapySDRPlay/SoapySDRPlay.SlackBuild
+++ b/ham/SoapySDRPlay/SoapySDRPlay.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SoapySDRPlay
 
-# Copyright 2017 Alan Aversa USA
+# Copyright 2020 Alan Aversa 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=SoapySDRPlay
-VERSION=${VERSION:-0.1.0}
+VERSION=${VERSION:-0.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ham/SoapySDRPlay/SoapySDRPlay.info b/ham/SoapySDRPlay/SoapySDRPlay.info
index b0cb33dd5f..658cc35a7b 100644
--- a/ham/SoapySDRPlay/SoapySDRPlay.info
+++ b/ham/SoapySDRPlay/SoapySDRPlay.info
@@ -1,8 +1,8 @@
 PRGNAM="SoapySDRPlay"
-VERSION="0.1.0"
+VERSION="0.2.0"
 HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
-DOWNLOAD="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-0.1.0/SoapySDRPlay-soapy-sdrplay-0.1.0.tar.gz"
-MD5SUM="e488245671b9b2af603aa30c2007675f"
+DOWNLOAD="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-0.2.0/SoapySDRPlay-soapy-sdrplay-0.2.0.tar.gz"
+MD5SUM="92499f2c4777255d78794cf9eafee282"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SoapySDR SDRPlay"
diff --git a/ham/ax25-apps/README b/ham/ax25-apps/README
new file mode 100644
index 0000000000..1961b5817b
--- /dev/null
+++ b/ham/ax25-apps/README
@@ -0,0 +1,18 @@
+ax25-apps AX.25 Packet radio support for linux (user applications)
+
+The AX.25 protocol offers both connected and connectionless modes of operation,
+and is used either by itself for point-point links, or to carry other protocols
+such as TCP/IP and NET/ROM.
+
+It is similar to X.25 level 2 in structure, with some extensions to make it more
+useful in the amateur radio environment.
+
+This package provides specific user applications for hamradio that use AX.25 Net/ROM or ROSE network protocols:
+
+ * axcall: a general purpose AX.25, NET/ROM and ROSE connection
+   program.
+ * axlisten: a network monitor of all AX.25 traffic heard by the system.
+ * ax25ipd: an RFC1226 compliant daemon which provides
+   encapsulation of AX.25 traffic over IP.
+ * ax25mond: retransmits data received from sockets into an AX.25
+   monitor socket.
diff --git a/ham/ax25-apps/ax25-apps.SlackBuild b/ham/ax25-apps/ax25-apps.SlackBuild
new file mode 100644
index 0000000000..85b06db13f
--- /dev/null
+++ b/ham/ax25-apps/ax25-apps.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Slackware build script for ax25-apps
+
+# Copyright 2019,2020 Gustavo Conrad, Argentina.
+# 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=ax25-apps
+VERSION=${VERSION:-0.0.8_rc5}
+SRCVER=$(echo $VERSION | tr _ -)
+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 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
+
+make
+make install DESTDIR=$PKG
+make installconf 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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README \
+  AUTHORS \
+  COPYING \
+  ChangeLog \
+  NEWS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mv $PKG/etc/ax25/ax25ipd.conf $PKG/etc/ax25/ax25ipd.conf.new
+mv $PKG/etc/ax25/ax25mond.conf $PKG/etc/ax25/ax25mond.conf.new
+mv $PKG/etc/ax25/ax25rtd.conf $PKG/etc/ax25/ax25rtd.conf.new
+
+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/ham/ax25-apps/ax25-apps.info b/ham/ax25-apps/ax25-apps.info
new file mode 100644
index 0000000000..12e104dbc3
--- /dev/null
+++ b/ham/ax25-apps/ax25-apps.info
@@ -0,0 +1,10 @@
+PRGNAM="ax25-apps"
+VERSION="0.0.8_rc5"
+HOMEPAGE="http://www.linux-ax25.org/wiki/Main_Page"
+DOWNLOAD="http://www.linux-ax25.org/pub/ax25-apps/ax25-apps-0.0.8-rc5.tar.gz"
+MD5SUM="e9562dceecae1b47f17088746b2a15da"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libax25"
+MAINTAINER="Gustavo Conrad"
+EMAIL="gus3963@gmail.com"
diff --git a/ham/ax25-apps/doinst.sh b/ham/ax25-apps/doinst.sh
new file mode 100644
index 0000000000..9517f47edd
--- /dev/null
+++ b/ham/ax25-apps/doinst.sh
@@ -0,0 +1,16 @@
+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/ax25/ax25ipd.conf.new
+config etc/ax25/ax25mond.conf.new
+config etc/ax25/ax25rtd.conf.new
diff --git a/ham/ax25-apps/slack-desc b/ham/ax25-apps/slack-desc
new file mode 100644
index 0000000000..f96e865773
--- /dev/null
+++ b/ham/ax25-apps/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------------------------------------------------------|
+ax25-apps: ax25-apps (AX.25 Packet radio support software)
+ax25-apps:
+ax25-apps: Layer 2/3 networking implementation for the linux kernel.
+ax25-apps: See the AX25 Linux HOWTO for details.
+ax25-apps: This package provides specific user applications for hamradio that
+ax25-apps: use AX.25 Net/ROM or ROSE network protocols
+ax25-apps:
+ax25-apps: Homepage: http://www.linux-ax25.org/wiki/Main_Page
+ax25-apps:
+ax25-apps:
+ax25-apps:
diff --git a/ham/ax25-tools/README b/ham/ax25-tools/README
new file mode 100644
index 0000000000..767ed7063c
--- /dev/null
+++ b/ham/ax25-tools/README
@@ -0,0 +1,11 @@
+ax25-tools AX.25 Packet radio support for linux (additional tools)
+
+The AX.25 protocol offers both connected and connectionless modes of
+operation, and is used either by itself for point-point links, or to
+carry other protocols such as TCP/IP and NET/ROM.
+
+It is similar to X.25 level 2 in structure, with some extensions to
+make it more useful in the amateur radio environment.
+
+These are hamradio specific tools for setting up and configuring
+hamradio ports that use AX.25 Net/ROM or ROSE network protocols.
diff --git a/ham/ax25-tools/ax25-tools.SlackBuild b/ham/ax25-tools/ax25-tools.SlackBuild
new file mode 100644
index 0000000000..0689f57a12
--- /dev/null
+++ b/ham/ax25-tools/ax25-tools.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackware build script for ax25-tools
+
+# Copyright 2019,2020 Gustavo Conrad, Argentina.
+# 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=ax25-tools
+VERSION=${VERSION:-0.0.10_rc5}
+SRCVER=$(echo $VERSION | tr _ -)
+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 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
+
+make
+make install DESTDIR=$PKG
+make installconf 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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README \
+  AUTHORS \
+  COPYING \
+  ChangeLog \
+  NEWS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mv $PKG/etc/ax25/ax25.profile $PKG/etc/ax25/ax25.profile.new
+mv $PKG/etc/ax25/rxecho.conf $PKG/etc/ax25/rxecho.conf.new
+mv $PKG/etc/ax25/nrbroadcast $PKG/etc/ax25/nrbroadcast.new
+mv $PKG/etc/ax25/ttylinkd.conf $PKG/etc/ax25/ttylinkd.conf.new
+mv $PKG/etc/ax25/ax25d.conf $PKG/etc/ax25/ax25d.conf.new
+mv $PKG/etc/ax25/rip98d.conf $PKG/etc/ax25/rip98d.conf.new
+mv $PKG/etc/ax25/axspawn.conf $PKG/etc/ax25/axspawn.conf.new
+
+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/ham/ax25-tools/ax25-tools.info b/ham/ax25-tools/ax25-tools.info
new file mode 100644
index 0000000000..8e7c6ff61f
--- /dev/null
+++ b/ham/ax25-tools/ax25-tools.info
@@ -0,0 +1,10 @@
+PRGNAM="ax25-tools"
+VERSION="0.0.10_rc5"
+HOMEPAGE="http://www.linux-ax25.org/wiki/Main_Page"
+DOWNLOAD="http://www.linux-ax25.org/pub/ax25-tools/ax25-tools-0.0.10-rc5.tar.gz"
+MD5SUM="b8cf1495820c445013c3776babcd057d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libax25"
+MAINTAINER="Gustavo Conrad"
+EMAIL="gus3963@gmail.com"
diff --git a/ham/ax25-tools/doinst.sh b/ham/ax25-tools/doinst.sh
new file mode 100644
index 0000000000..1d4adb7a35
--- /dev/null
+++ b/ham/ax25-tools/doinst.sh
@@ -0,0 +1,20 @@
+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/ax25/ax25.profile.new
+config etc/ax25/rxecho.conf.new
+config etc/ax25/nrbroadcast.new
+config etc/ax25/ttylinkd.conf.new
+config etc/ax25/ax25d.conf.new
+config etc/ax25/rip98d.conf.new
+config etc/ax25/axspawn.conf.new
diff --git a/ham/ax25-tools/slack-desc b/ham/ax25-tools/slack-desc
new file mode 100644
index 0000000000..bc8b6f4842
--- /dev/null
+++ b/ham/ax25-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------------------------------------------------------|
+ax25-tools: ax25-tools (AX.25 Packet radio supporting tools)
+ax25-tools:
+ax25-tools: Layer 2/3 networking implementation for the linux kernel.
+ax25-tools: See the AX25 Linux HOWTO for details.
+ax25-tools: These are hamradio specific tools for setting up and configuring
+ax25-tools: hamradio ports that use AX.25 Net/ROM or ROSE network protocols.
+ax25-tools:
+ax25-tools:
+ax25-tools: Homepage: http://www.linux-ax25.org/wiki/Main_Page
+ax25-tools:
+ax25-tools:
diff --git a/ham/chirp/chirp.SlackBuild b/ham/chirp/chirp.SlackBuild
index 94aa62435d..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:-20200227}
+VERSION=${VERSION:-20201128}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ham/chirp/chirp.info b/ham/chirp/chirp.info
index 65b666787e..466cab41cf 100644
--- a/ham/chirp/chirp.info
+++ b/ham/chirp/chirp.info
@@ -1,8 +1,8 @@
 PRGNAM="chirp"
-VERSION="20200227"
+VERSION="20201128"
 HOMEPAGE="https://chirp.danplanet.com/projects/chirp/wiki/Home"
-DOWNLOAD="https://trac.chirp.danplanet.com/chirp_daily/daily-20200227/chirp-daily-20200227.tar.gz"
-MD5SUM="9aae573f0d5eee4c26ce928c18570536"
+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/ham/flmsg/README b/ham/flmsg/README
new file mode 100644
index 0000000000..2098aae612
--- /dev/null
+++ b/ham/flmsg/README
@@ -0,0 +1,10 @@
+FLMSG - Amateur radio messaging tool
+
+FLMSG is a simple forms management editor for the amateur radio supported
+standard message formats. Form data can be transferred between computers
+either using standard internet email or via radio frequency broadcasts
+typically made by an amateur radio operator on your behalf.
+flmsg forms can be very complex and include embedded images and other controls
+that make data entry less prone to error.
+
+FLMSG sits on top of FLDIGI, which does the real signal processing.
diff --git a/ham/flmsg/doinst.sh b/ham/flmsg/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/ham/flmsg/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/ham/flmsg/flmsg.SlackBuild b/ham/flmsg/flmsg.SlackBuild
new file mode 100644
index 0000000000..2afb1e9dce
--- /dev/null
+++ b/ham/flmsg/flmsg.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+# Slackbuild for flmsg
+#
+# Based on work done by JK Wood joshuakwood@gmail.com
+# on fldigi slackbuild
+#
+# Copyright Gustavo Conrad - LU7WA (gus3963 gmail)
+# 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=flmsg
+VERSION=${VERSION:-4.0.15}
+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 \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --without-asciidoc
+
+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 README* $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
+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/ham/flmsg/flmsg.info b/ham/flmsg/flmsg.info
new file mode 100644
index 0000000000..f6edbe1714
--- /dev/null
+++ b/ham/flmsg/flmsg.info
@@ -0,0 +1,10 @@
+PRGNAM="flmsg"
+VERSION="4.0.15"
+HOMEPAGE="http://www.w1hkj.com/"
+DOWNLOAD="http://www.w1hkj.com/files/flmsg/flmsg-4.0.15.tar.gz"
+MD5SUM="abf8c6e99a35efb548502768862b4278"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="fldigi"
+MAINTAINER="Gustavo Conrad"
+EMAIL="gus3963@gmail.com"
diff --git a/ham/flmsg/slack-desc b/ham/flmsg/slack-desc
new file mode 100644
index 0000000000..dc10dbc90c
--- /dev/null
+++ b/ham/flmsg/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------------------------------------------------------|
+flmsg: flmsg (Amateur radio messaging tool)
+flmsg:
+flmsg: flmsg FLMSG is a simple forms management editor for the amateur radio
+flmsg: supported standard message formats.
+flmsg: Form data can be transferred between computers either using standard
+flmsg: internet email or via radio frequency broadcasts typically made by an
+flmsg: amateur radio operaton on your behalf. 
+flmsg: flmsg forms can be very complex and include embedded images and other
+flmsg: controls. that make data entry less prone to error.
+flmsg: FLMSG sits on top of FLDIGI which does the real signal processing.
+flmsg: Webpage http://w1hkj.com
diff --git a/ham/flrig/README b/ham/flrig/README
index 2d1e5d3f4e..71494d54cb 100644
--- a/ham/flrig/README
+++ b/ham/flrig/README
@@ -1,5 +1,6 @@
-Flrig is a transceiver control program for Amateur Radio use.  It does
-not use any 3rd party transceiver control libraries.  It is a c++ pro-
-gram that encapsulates each transceiver in it's own class.  Where ever
-possible the transceiver class(s) use polymorphism to reuse code that
-is portable across a series of transceivers.
+FLRIG is a transceiver control program for Amateur Radio use.
+It is designed to be used either stand alone or as an adjunct to FLDIGI.
+It does not use any 3rd party transceiver control libraries.
+The supported transceivers all have some degree of CAT. The FLRIG user
+nterface changes to accommodate the degree of CAT support available for
+the transceiver in use.
diff --git a/ham/flrig/flrig.SlackBuild b/ham/flrig/flrig.SlackBuild
index 6dfb2a1d8c..27dc5dbdcc 100644
--- a/ham/flrig/flrig.SlackBuild
+++ b/ham/flrig/flrig.SlackBuild
@@ -3,7 +3,7 @@
 # From slackbuild for fldigi Written by JK Wood joshuakwood@gmail.com
 # Modified for flrig by Gustavo Conrad gus3963@gmail.com
 
-# Copyright 2017, Gustavo Conrad.
+# Copyright 2017, 2020 Gustavo Conrad.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -43,7 +43,7 @@
 # that is unlikely, as I am rather tall.
 
 PRGNAM=flrig
-VERSION=${VERSION:-1.3.36}
+VERSION=${VERSION:-1.3.50}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ham/flrig/flrig.info b/ham/flrig/flrig.info
index 230c07c984..d8fad43a85 100644
--- a/ham/flrig/flrig.info
+++ b/ham/flrig/flrig.info
@@ -1,8 +1,8 @@
 PRGNAM="flrig"
-VERSION="1.3.36"
+VERSION="1.3.50"
 HOMEPAGE="http://www.w1hkj.com/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/flrig-1.3.36.tar.gz"
-MD5SUM="a80358fe9ccf00de612fe82c965db0aa"
+DOWNLOAD="http://www.w1hkj.com/files/flrig/flrig-1.3.50.tar.gz"
+MD5SUM="60e4c95555a624b7a45211fb79464115"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
diff --git a/ham/flrig/slack-desc b/ham/flrig/slack-desc
index 3b62f7891f..dc4b2ac71c 100644
--- a/ham/flrig/slack-desc
+++ b/ham/flrig/slack-desc
@@ -8,12 +8,12 @@
      |-----handy-ruler------------------------------------------------------|
 flrig: flrig (Amateur Radio transceiver control program)
 flrig:
-flrig: Flrig is a transceiver control program for Amateur Radio use.
-flrig: It does not use any 3rd party transceiver control libraries.  It is a
-flrig: c++ program that encapsulates each transceiver in it's own class.
-flrig: Where ever possible the transceiver class(s) use polymorphism to
-flrig: reuse code that is portable across a series of transceivers.
-flrig: This program can cooperate with fldigi.
+flrig: FLRIG is a transceiver control program for Amateur Radio use.
+flrig: It is designed to be used either stand alone or as an adjunct
+flrig: to FLDIGI.
+flrig: It does not use any 3rd party transceiver control libraries.
+flrig: The supported transceivers all have some degree of CAT. The
+flrig: FLRIG user interface changes to accommodate the degree of CAT
+flrig: support available for the transceiver in use.
 flrig:
 flrig: Homepage: http://www.w1hkj.com/
-flrig:
diff --git a/ham/libax25/README b/ham/libax25/README
new file mode 100644
index 0000000000..ba4b72e0c9
--- /dev/null
+++ b/ham/libax25/README
@@ -0,0 +1,12 @@
+libax25 AX.25 Packet radio support for linux.
+ 
+The AX.25 protocol offers both connected and connectionless modes of operation,
+and is used either by itself for point-point links, or to carry other protocols
+such as TCP/IP and NET/ROM.
+
+It is similar to X.25 level 2 in structure, with some extensions to make it
+more useful in the amateur radio environment.
+
+This library is for ham radio applications that use the ax25 protocol.
+Included are routines to do ax25 address parsing, common ax25 application
+config file parsing, etc.
diff --git a/ham/libax25/libax25.SlackBuild b/ham/libax25/libax25.SlackBuild
new file mode 100644
index 0000000000..9382367af3
--- /dev/null
+++ b/ham/libax25/libax25.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for libax25
+
+# Copyright 2019,2020 Gustavo Conrad, Argentina.
+# 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=libax25
+VERSION=${VERSION:-0.0.12_rc5}
+SRCVER=$(echo $VERSION | tr _ -)
+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 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 \
+  --disable-static \
+  --docdir=/usr/doc/$PRGNAM-$VERSION
+
+make
+make install DESTDIR=$PKG
+make installconf 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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README \
+  AUTHORS \
+  COPYING \
+  ChangeLog \
+  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/ham/libax25/libax25.info b/ham/libax25/libax25.info
new file mode 100644
index 0000000000..7e62275430
--- /dev/null
+++ b/ham/libax25/libax25.info
@@ -0,0 +1,10 @@
+PRGNAM="libax25"
+VERSION="0.0.12_rc5"
+HOMEPAGE="http://www.linux-ax25.org/wiki/Main_Page"
+DOWNLOAD="http://www.linux-ax25.org/pub/libax25/libax25-0.0.12-rc5.tar.gz"
+MD5SUM="21e64a76d41f3129acc7b540730e2f4d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gustavo Conrad"
+EMAIL="gus3963@gmail.com"
diff --git a/ham/libax25/slack-desc b/ham/libax25/slack-desc
new file mode 100644
index 0000000000..b3d0dae625
--- /dev/null
+++ b/ham/libax25/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------------------------------------------------------|
+libax25: libax25 (AX.25 Packet radio support for linux)
+libax25:
+libax25: Layer 2/3 networking implementation for the linux kernel.
+libax25: See the AX25 Linux HOWTO for details.
+libax25: This library is for ham radio applications that use the ax25
+libax25: protocol.
+libax25: Included are routines to do ax25 address parsing, common ax25
+libax25: application config file parsing, etc.
+libax25:
+libax25: Homepage: http://www.linux-ax25.org/wiki/Main_Page
+libax25:
diff --git a/ham/liquid-dsp/liquid-dsp.SlackBuild b/ham/liquid-dsp/liquid-dsp.SlackBuild
index 986b260b76..38877db7f5 100644
--- a/ham/liquid-dsp/liquid-dsp.SlackBuild
+++ b/ham/liquid-dsp/liquid-dsp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for liquid-dsp
 
-# Copyright 2017 Alan Aversa USA
+# Copyright 2020 Alan Aversa 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=liquid-dsp
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ham/liquid-dsp/liquid-dsp.info b/ham/liquid-dsp/liquid-dsp.info
index b8800b344d..97b18b070a 100644
--- a/ham/liquid-dsp/liquid-dsp.info
+++ b/ham/liquid-dsp/liquid-dsp.info
@@ -1,8 +1,8 @@
 PRGNAM="liquid-dsp"
-VERSION="1.3.0"
+VERSION="1.3.2"
 HOMEPAGE="http://liquidsdr.org/"
-DOWNLOAD="https://github.com/jgaeddert/liquid-dsp/archive/v1.3.0/liquid-dsp-1.3.0.tar.gz"
-MD5SUM="7c9de25c84f3d8e3611115344474463f"
+DOWNLOAD="https://github.com/jgaeddert/liquid-dsp/archive/v1.3.2/liquid-dsp-1.3.2.tar.gz"
+MD5SUM="6b53a66fb1172d0aadaa244dbc77e836"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ham/spectools/README b/ham/spectools/README
index 2a280f07a9..f8130581ab 100644
--- a/ham/spectools/README
+++ b/ham/spectools/README
@@ -1,6 +1,7 @@
-Spectools is a set of utilities for using various spectrum analyzer hardware.
-It supports the suite of Wi-Spy devices (original, 24x, 24x2, DBX, DBX2, 900,
-24i) by Metageek LLC and the Ubertooth. Spectools includes userspace drivers
-for the hardware itself, a graphing UI built GTK and Cairo, network protocols
-for remote device capture, and simple utilities for developing additional
+Spectools is a set of utilities for using various spectrum
+analyzer hardware.  It supports the suite of Wi-Spy devices
+(original, 24x, 24x2, DBX, DBX2, 900, 24i) by Metageek LLC and the
+Ubertooth. Spectools includes userspace drivers for the hardware
+itself, a graphing UI built GTK and Cairo, network protocols for
+remote device capture, and simple utilities for developing additional
 tools.
diff --git a/ham/spectools/spectools.SlackBuild b/ham/spectools/spectools.SlackBuild
index e0f0a778fc..5f2d7aa06b 100644
--- a/ham/spectools/spectools.SlackBuild
+++ b/ham/spectools/spectools.SlackBuild
@@ -23,10 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=spectools
-VERSION=${VERSION:-2016-01-R1}
+VERSION=${VERSION:-2016_01_R1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCVER=${VERSION//_/-}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -59,9 +61,9 @@ 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
+rm -rf $PRGNAM-$SRCVER
+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 \
diff --git a/ham/spectools/spectools.info b/ham/spectools/spectools.info
index 356dc1190c..81ba9d78eb 100644
--- a/ham/spectools/spectools.info
+++ b/ham/spectools/spectools.info
@@ -1,5 +1,5 @@
 PRGNAM="spectools"
-VERSION="2016-01-R1"
+VERSION="2016_01_R1"
 HOMEPAGE="https://www.kismetwireless.net/static/spectools/"
 DOWNLOAD="https://www.kismetwireless.net/code/spectools-2016-01-R1.tar.xz"
 MD5SUM="d1e3d8ea692f3fd4e632c2fe6b0d5a9f"
diff --git a/haskell/haskell-ShellCheck/haskell-ShellCheck.SlackBuild b/haskell/haskell-ShellCheck/haskell-ShellCheck.SlackBuild
index 653337cbaf..cb74d58724 100644
--- a/haskell/haskell-ShellCheck/haskell-ShellCheck.SlackBuild
+++ b/haskell/haskell-ShellCheck/haskell-ShellCheck.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for haskell-ShellCheck
 
-# Copyright 2017-2018 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-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=haskell-ShellCheck
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/haskell/haskell-ShellCheck/haskell-ShellCheck.info b/haskell/haskell-ShellCheck/haskell-ShellCheck.info
index 90c91f2605..6c30cce184 100644
--- a/haskell/haskell-ShellCheck/haskell-ShellCheck.info
+++ b/haskell/haskell-ShellCheck/haskell-ShellCheck.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-ShellCheck"
-VERSION="0.6.0"
+VERSION="0.7.1"
 HOMEPAGE="https://www.shellcheck.net/"
-DOWNLOAD="https://hackage.haskell.org/package/ShellCheck-0.6.0/ShellCheck-0.6.0.tar.gz"
-MD5SUM="570c665dc89d31c5a4e25d52c5790eaf"
+DOWNLOAD="https://hackage.haskell.org/package/ShellCheck-0.7.1/ShellCheck-0.7.1.tar.gz"
+MD5SUM="2f6f8fd74391538f0d0be13f55f6c202"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-aeson haskell-json haskell-QuickCheck haskell-regex-tdfa"
+REQUIRES="haskell-aeson haskell-json haskell-QuickCheck haskell-regex-tdfa haskell-Diff"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
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/BeautifulSoup4/BeautifulSoup4.SlackBuild b/libraries/BeautifulSoup4/BeautifulSoup4.SlackBuild
deleted file mode 100644
index 38b98401fa..0000000000
--- a/libraries/BeautifulSoup4/BeautifulSoup4.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for BeautifulSoup4
-
-# Copyright 2014-2018  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=BeautifulSoup4
-SRCNAM=${PRGNAM,,}
-VERSION=${VERSION:-4.6.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 {} \;
-
-python setup.py install --root=$PKG
-
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  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/-rfI/-rf/" convert-py3k
-  sh convert-py3k
-  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.txt COPYING.txt AUTHORS.txt NEWS.txt TODO.txt 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/libraries/BeautifulSoup4/BeautifulSoup4.info b/libraries/BeautifulSoup4/BeautifulSoup4.info
deleted file mode 100644
index 0d38418d94..0000000000
--- a/libraries/BeautifulSoup4/BeautifulSoup4.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="BeautifulSoup4"
-VERSION="4.6.1"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/"
-DOWNLOAD="https://www.crummy.com/software/BeautifulSoup/bs4/download/4.6/beautifulsoup4-4.6.1.tar.gz"
-MD5SUM="ff719d65b9653b7b56645c7634b6e314"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/libraries/BeautifulSoup4/README b/libraries/BeautifulSoup4/README
deleted file mode 100644
index 41925ef89e..0000000000
--- a/libraries/BeautifulSoup4/README
+++ /dev/null
@@ -1,27 +0,0 @@
-Beautiful Soup is a Python HTML/XML parser designed for quick turnaround
-projects like screen-scraping. Three features make it powerful:
-
-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.
diff --git a/libraries/BeautifulSoup4/slack-desc b/libraries/BeautifulSoup4/slack-desc
deleted file mode 100644
index 2aa7bc4813..0000000000
--- a/libraries/BeautifulSoup4/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------------------------------------------------------|
-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:
-BeautifulSoup4: Homepage: http://www.crummy.com/software/BeautifulSoup/
-BeautifulSoup4:
-BeautifulSoup4:
-BeautifulSoup4:
-BeautifulSoup4:
-BeautifulSoup4:
diff --git a/libraries/Botan/Botan.SlackBuild b/libraries/Botan/Botan.SlackBuild
index f092906fe0..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.13.0}
+VERSION=${VERSION:-2.17.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,15 +82,22 @@ python configure.py \
   --docdir=doc \
   --libdir=lib$LIBDIRSUFFIX \
   --mandir=/usr/man \
+  --disable-static \
   --with-doxygen
 
 make
-./botan-test
+make check
+#in addition to running 'make check' as an alternative way to invoke the testsuite
+#is to uncomment the following line
+#LD_LIBRARY_PATH=. ./botan-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
+
 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 27f0e82067..a7ab7f4c1c 100644
--- a/libraries/Botan/Botan.info
+++ b/libraries/Botan/Botan.info
@@ -1,8 +1,8 @@
 PRGNAM="Botan"
-VERSION="2.13.0"
+VERSION="2.17.3"
 HOMEPAGE="https://botan.randombit.net/"
-DOWNLOAD="https://botan.randombit.net/releases/Botan-2.13.0.tar.xz"
-MD5SUM="9f90c7d523778be5f23f3ce79046ba35"
+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/HawkNL/HawkNL.info b/libraries/HawkNL/HawkNL.info
index b6e846a7a0..1e8218c4ee 100644
--- a/libraries/HawkNL/HawkNL.info
+++ b/libraries/HawkNL/HawkNL.info
@@ -1,7 +1,7 @@
 PRGNAM="HawkNL"
 VERSION="1.68"
 HOMEPAGE="https://github.com/dfyx/HawkNL"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/HawkNL168src.zip"
 MD5SUM="1b5eb1373a4c45dc49ded2c9d89cec93"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/Impacket/Impacket.SlackBuild b/libraries/Impacket/Impacket.SlackBuild
index 1d22002ffa..3f5ab040fb 100644
--- a/libraries/Impacket/Impacket.SlackBuild
+++ b/libraries/Impacket/Impacket.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Impacket.
 
 # Copyright 2009-2010 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015-2016, 2018 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2015-2020, Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,7 @@
 
 PRGNAM=Impacket
 SRCNAM=impacket
-SRCVER=_0_9_17
-VERSION=${VERSION:-0.9.17}
+VERSION=${VERSION:-0.9.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,9 +63,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$SRCNAM$SRCVER
-tar -xzvf $CWD/$SRCNAM-$SRCNAM$SRCVER.tar.gz
-cd $SRCNAM-$SRCNAM$SRCVER
+rm -rf $SRCNAM-$VERSION
+tar -xzvf $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 \
@@ -74,6 +73,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 {} \;
 
+# Python3 support
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
 python setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/libraries/Impacket/Impacket.info b/libraries/Impacket/Impacket.info
index 41652e8617..8b1ba5529d 100644
--- a/libraries/Impacket/Impacket.info
+++ b/libraries/Impacket/Impacket.info
@@ -1,10 +1,10 @@
 PRGNAM="Impacket"
-VERSION="0.9.17"
-HOMEPAGE="https://www.coresecurity.com/corelabs-research/open-source-tools/impacket"
-DOWNLOAD="https://github.com/CoreSecurity/impacket/archive/impacket_0_9_17/impacket-impacket_0_9_17.tar.gz"
-MD5SUM="a53a34898856307c79c02fcd8b8b1cb4"
+VERSION="0.9.21"
+HOMEPAGE="https://github.com/SecureAuthCorp/impacket"
+DOWNLOAD="https://pypi.io/packages/source/i/impacket/impacket-0.9.21.tar.gz"
+MD5SUM="c0a71706c09c7343905c9395076d7e31"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyasn1 pycrypto six"
+REQUIRES="pyasn1 pycrypto six python3-six"
 MAINTAINER="Brenton Earl"
 EMAIL="brent@exitstatusone.com"
diff --git a/libraries/Impacket/README b/libraries/Impacket/README
index 00e4b5f792..6b9de911f9 100644
--- a/libraries/Impacket/README
+++ b/libraries/Impacket/README
@@ -3,7 +3,7 @@ to network packets. Impacket allows Python developers to craft and
 decode network packets in simple and consistent manner. It includes
 support for low-level protocols such as IP, UDP and TCP, as well as
 higher-level protocols such as NMB and SMB. Impacket is highly effective
-when used in conjunction with a packet capture utility or package such as
-Pcapy. Packets can be constructed from scratch, as well as parsed from
-raw data. Furthermore, the object oriented API makes it simple to work
-with deep protocol hierarchies.
+when used in conjunction with a packet capture utility or package such
+as Pcapy. Packets can be constructed from scratch, as well as parsed
+from raw data. Furthermore, the object oriented API makes it simple to
+work with deep protocol hierarchies.
diff --git a/libraries/Impacket/slack-desc b/libraries/Impacket/slack-desc
index 76de7c50f6..90a47a07d9 100644
--- a/libraries/Impacket/slack-desc
+++ b/libraries/Impacket/slack-desc
@@ -14,6 +14,6 @@ Impacket: decode network packets in simple and consistent manner. It includes
 Impacket: support for low-level protocols such as IP, UDP and TCP, as well as
 Impacket: higher-level protocols such as NMB and SMB.
 Impacket:
-Impacket: Home page: https://github.com/CoreSecurity/impacket
+Impacket: Home page: https://github.com/SecureAuthCorp/impacket
 Impacket:
 Impacket:
diff --git a/libraries/Jinja2/Jinja2.SlackBuild b/libraries/Jinja2/Jinja2.SlackBuild
index a800f55027..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.1}
+VERSION=${VERSION:-2.11.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/Jinja2/Jinja2.info b/libraries/Jinja2/Jinja2.info
index ab135713c5..6c63f6d0b8 100644
--- a/libraries/Jinja2/Jinja2.info
+++ b/libraries/Jinja2/Jinja2.info
@@ -1,8 +1,8 @@
 PRGNAM="Jinja2"
-VERSION="2.11.1"
+VERSION="2.11.3"
 HOMEPAGE="https://pypi.python.org/pypi/Jinja2"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-2.11.1.tar.gz"
-MD5SUM="5d88c7e77aa63fc852a04f65dbfe5594"
+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 91b4cbc557..d60e684a36 100644
--- a/libraries/MyGUI/MyGUI.SlackBuild
+++ b/libraries/MyGUI/MyGUI.SlackBuild
@@ -24,13 +24,13 @@
 
 PRGNAM=MyGUI
 SRCNAM=mygui-MyGUI  # Yes, really (github)
-VERSION=${VERSION:-3.2.2}
+VERSION=${VERSION:-3.4.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
@@ -40,11 +40,11 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 UNZIPDIR=$TMP/mygui-$PRGNAM$VERSION
-DOCS="$UNZIPDIR/ChangeLog.txt $UNZIPDIR/COPYING.MIT $UNZIPDIR/Readme.txt"
+DOCS="$UNZIPDIR/ChangeLog.txt $UNZIPDIR/COPYING.MIT"
 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,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
+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 788743a350..48e2964a78 100644
--- a/libraries/MyGUI/MyGUI.info
+++ b/libraries/MyGUI/MyGUI.info
@@ -1,8 +1,8 @@
 PRGNAM="MyGUI"
-VERSION="3.2.2"
+VERSION="3.4.0"
 HOMEPAGE="http://mygui.info"
-DOWNLOAD="https://github.com/MyGUI/mygui/archive/MyGUI3.2.2.tar.gz"
-MD5SUM="0023a689a2a63febc2cc703f81f86c62"
+DOWNLOAD="https://github.com/MyGUI/mygui/archive/MyGUI3.4.0/mygui-MyGUI3.4.0.tar.gz"
+MD5SUM="30e64cdb3dc09a209259a5ffd13dc2ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ois ogre"
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/PyQt5/PyQt5.SlackBuild b/libraries/PyQt5/PyQt5.SlackBuild
index 5ff9ef1202..712a5aceda 100644
--- a/libraries/PyQt5/PyQt5.SlackBuild
+++ b/libraries/PyQt5/PyQt5.SlackBuild
@@ -35,7 +35,7 @@
 # Updated for Qt5-5.9.6 by David Woodfall <dave@slackbuilds.org>
 
 PRGNAM=PyQt5
-VERSION=${VERSION:-5.9.2}
+VERSION=${VERSION:-5.13.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,9 +71,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_gpl-$VERSION
-tar xvf $CWD/${PRGNAM}_gpl-$VERSION.tar.gz
-cd ${PRGNAM}_gpl-$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 \
@@ -81,8 +81,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 {} \;
 
-# This is needed or an include from dbus is missed (tnx, Archlinux)
-sed -i '/target_config.dbus_inc_dirs = \[\]/d' configure.py
+# From alienBOB's SlackBuild
+# Remove code that is unneeded if Qt is not bundled and crashes on python2
+# https://www.riverbankcomputing.com/pipermail/pyqt/2019-July/041896.html
+cat $CWD/patches/pyqt5-python2-crash.patch | patch -p1 --verbose
 
 export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5
 export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5
@@ -93,17 +95,25 @@ export CXXFLAGS="$SLKCFLAGS"
 
 python configure.py \
   --confirm-license \
+  --qsci-api \
   --verbose \
   --sip=/usr/bin/python2-sip \
   --sip-incdir="/usr/include/python$PYTHONVER/python2-sip" \
   -q /usr/bin/qmake-qt5
 
 make
-make install DESTDIR=$PKG INSTALL_ROOT=$PKG
+make -j1 install DESTDIR=$PKG 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
 
+# Remove rpaths (from alienBOB's SlackBuild):
+for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null); do
+  if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
+    patchelf --remove-rpath $file
+  fi
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/PyQt5/PyQt5.info b/libraries/PyQt5/PyQt5.info
index f0991810c9..390bd46fb5 100644
--- a/libraries/PyQt5/PyQt5.info
+++ b/libraries/PyQt5/PyQt5.info
@@ -1,10 +1,10 @@
 PRGNAM="PyQt5"
-VERSION="5.9.2"
+VERSION="5.13.2"
 HOMEPAGE="https://riverbankcomputing.com/software/pyqt/intro/"
-DOWNLOAD="https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9.2/PyQt5_gpl-5.9.2.tar.gz"
-MD5SUM="33d6d2ab8183da17ac18b8132a4b278e"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/PyQt5-5.13.2.tar.gz"
+MD5SUM="c1023cb9c3d29a89fc109b163a0175c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5-webkit python2-sip enum34"
-MAINTAINER="David Woodfall"
+REQUIRES="qt5 python2-sip enum34"
+MAINTAINER="Dave Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/libraries/PyQt5/patches/pyqt5-python2-crash.patch b/libraries/PyQt5/patches/pyqt5-python2-crash.patch
new file mode 100644
index 0000000000..14462f7563
--- /dev/null
+++ b/libraries/PyQt5/patches/pyqt5-python2-crash.patch
@@ -0,0 +1,13 @@
+diff -ur PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in
+--- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in        2019-06-25 14:41:02.000000000 +0200
++++ PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in       2019-07-01 17:06:34.882644535 +0200
+@@ -151,8 +151,4 @@
+     // initialised first (at least for Windows) and this is the only way to
+     // guarantee things are done in the right order.
+     PyQtSlotProxy::mutex = new QMutex(QMutex::Recursive);
+-
+-    // Load the embedded qt.conf file if there is a bundled copy of Qt.
+-    if (!qpycore_qt_conf())
+-        Py_FatalError("PyQt5.QtCore: Unable to embed qt.conf");
+ }
+
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/libraries/QR-Code-generator/slack-desc b/libraries/QR-Code-generator/slack-desc
new file mode 100644
index 0000000000..4b8b1d02c7
--- /dev/null
+++ b/libraries/QR-Code-generator/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------------------------------------------------------|
+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 c8a457646c..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.4}
+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 e5bb756901..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.4"
+VERSION="2.11.6"
 HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla"
-DOWNLOAD="https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz"
-MD5SUM="d750d9143b0697df2e4662cea3efd20d"
+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 8e26524439..027bf390b1 100644
--- a/libraries/SDL2/README
+++ b/libraries/SDL2/README
@@ -1,6 +1,8 @@
-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.
+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.
 
 SDL is written in C and works natively with C++.
 
diff --git a/libraries/SDL2/SDL2.SlackBuild b/libraries/SDL2/SDL2.SlackBuild
index 7fe728b6e2..f8758ec607 100644
--- a/libraries/SDL2/SDL2.SlackBuild
+++ b/libraries/SDL2/SDL2.SlackBuild
@@ -3,6 +3,8 @@
 # Slackware build script for SDL2
 
 # Copyright 2013 Dugan Chen Canada
+# Copyright 2020 Isaac Yu
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +24,16 @@
 #  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
+# - don't copy CMakeLists.txt to doc dir (it's not documentation)
+# - don't copy useless INSTALL.txt to doc dir
+# - BUILD=2
+
 PRGNAM=SDL2
-VERSION=${VERSION:-2.0.9}
+VERSION=${VERSION:-2.0.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,11 +73,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 {} \+
 
 mkdir -p build
 cd build
@@ -75,14 +82,14 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip 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
+rm -f INSTALL.txt CMakeLists.txt  # don't copy these to doc dir
 cp -a *.txt docs/*.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/SDL2/SDL2.info b/libraries/SDL2/SDL2.info
index 20cbe825dc..fb33399243 100644
--- a/libraries/SDL2/SDL2.info
+++ b/libraries/SDL2/SDL2.info
@@ -1,10 +1,10 @@
 PRGNAM="SDL2"
-VERSION="2.0.9"
+VERSION="2.0.14"
 HOMEPAGE="https://libsdl.org"
-DOWNLOAD="https://www.libsdl.org/release/SDL2-2.0.9.tar.gz"
-MD5SUM="f2ecfba915c54f7200f504d8b48a5dfe"
+DOWNLOAD="https://www.libsdl.org/release/SDL2-2.0.14.tar.gz"
+MD5SUM="76ed4e6da9c07bd168b2acd9bfefab1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL2_image/README b/libraries/SDL2_image/README
index efd18ed49e..29cb3e0633 100644
--- a/libraries/SDL2_image/README
+++ b/libraries/SDL2_image/README
@@ -1,3 +1,5 @@
+SDL2_image (image loading library)
+
 SDL2_image is a simple library to load images of various formats as
 SDL surfaces. It is safe to install alongside Slackware's SDL libraries.
 
diff --git a/libraries/SDL2_image/SDL2_image.SlackBuild b/libraries/SDL2_image/SDL2_image.SlackBuild
index 73562ae808..2383fce4aa 100644
--- a/libraries/SDL2_image/SDL2_image.SlackBuild
+++ b/libraries/SDL2_image/SDL2_image.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for SDL2_image
 
 # Copyright 2013 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200415 bkw:
+# - take over maintenance
+# - update for v2.0.5
+
 PRGNAM=SDL2_image
-VERSION=${VERSION:-2.0.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.0.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -63,11 +68,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" \
@@ -83,10 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-jpg-shared=no
 
 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
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/SDL2_image/SDL2_image.info b/libraries/SDL2_image/SDL2_image.info
index 755869fb05..dc9a5639f5 100644
--- a/libraries/SDL2_image/SDL2_image.info
+++ b/libraries/SDL2_image/SDL2_image.info
@@ -1,10 +1,10 @@
 PRGNAM="SDL2_image"
-VERSION="2.0.4"
+VERSION="2.0.5"
 HOMEPAGE="https://www.libsdl.org/projects/SDL_image/"
-DOWNLOAD="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.4.tar.gz"
-MD5SUM="88b9766d5b64a67f82ba511c57e7ce10"
+DOWNLOAD="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.5.tar.gz"
+MD5SUM="f26f3a153360a8f09ed5220ef7b07aea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL2_mixer/README b/libraries/SDL2_mixer/README
index 5d39240c67..c0d858829b 100644
--- a/libraries/SDL2_mixer/README
+++ b/libraries/SDL2_mixer/README
@@ -1,3 +1,5 @@
+SDL2_mixer (sample multi-channel audio mixer library)
+
 SDL2_mixer is a sample multi-channel audio mixer library. It supports
 any number of simultaneously playing channels of 16-bit stereo audio,
 plus a single channel of music.
diff --git a/libraries/SDL2_mixer/SDL2_mixer.SlackBuild b/libraries/SDL2_mixer/SDL2_mixer.SlackBuild
index ff3d6cb323..dbeb3f64ef 100644
--- a/libraries/SDL2_mixer/SDL2_mixer.SlackBuild
+++ b/libraries/SDL2_mixer/SDL2_mixer.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for SDL2_mixer
 
 # Copyright 2013-2015 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +23,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200415 bkw:
+# - take over maintenance
+
 PRGNAM=SDL2_mixer
 VERSION=${VERSION:-2.0.4}
 BUILD=${BUILD:-2}
@@ -63,14 +67,12 @@ 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" \
+LDFLAGS="-Wl,-s" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -84,9 +86,6 @@ 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
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
 cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a playmus.c playwave.c $PKG/usr/doc/$PRGNAM-$VERSION/examples
diff --git a/libraries/SDL2_mixer/SDL2_mixer.info b/libraries/SDL2_mixer/SDL2_mixer.info
index 23ba1784ba..d2806c3ec4 100644
--- a/libraries/SDL2_mixer/SDL2_mixer.info
+++ b/libraries/SDL2_mixer/SDL2_mixer.info
@@ -6,5 +6,5 @@ MD5SUM="a36e8410cac46b00a4d01752b32c3eb1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL2_net/README b/libraries/SDL2_net/README
index 3f3e632887..52a733802e 100644
--- a/libraries/SDL2_net/README
+++ b/libraries/SDL2_net/README
@@ -1,3 +1,5 @@
+SDL2_net (network library for SDL2)
+
 This SDL2 extension is a small cross platform networking library.
 
 It is safe to install alongside Slackware's SDL libraries.
diff --git a/libraries/SDL2_net/SDL2_net.SlackBuild b/libraries/SDL2_net/SDL2_net.SlackBuild
index ac25dc3fe3..d2ed7105b7 100644
--- a/libraries/SDL2_net/SDL2_net.SlackBuild
+++ b/libraries/SDL2_net/SDL2_net.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for SDL2_net
 
 # Copyright 2013 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +23,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200415 bkw:
+# - take over maintenance
+# - i486 => i586
+
 PRGNAM=SDL2_net
 VERSION=${VERSION:-2.0.1}
 BUILD=${BUILD:-1}
@@ -29,7 +34,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
@@ -40,8 +45,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,11 +68,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" \
@@ -83,10 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-gui
 
 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
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/demo
 cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/SDL2_net/SDL2_net.info b/libraries/SDL2_net/SDL2_net.info
index d607b71b3f..94ecc23d2f 100644
--- a/libraries/SDL2_net/SDL2_net.info
+++ b/libraries/SDL2_net/SDL2_net.info
@@ -6,5 +6,5 @@ MD5SUM="5c1d9d1cfa63301b141cb5c0de2ea7c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL2_ttf/README b/libraries/SDL2_ttf/README
index ac5e99801e..156d760c94 100644
--- a/libraries/SDL2_ttf/README
+++ b/libraries/SDL2_ttf/README
@@ -1,3 +1,5 @@
+SDL2_ttf (SDL2 truetype font library)
+
 This is a sample library which allows you to use TrueType fonts 
 in your SDL2 applications.
 
diff --git a/libraries/SDL2_ttf/SDL2_ttf.SlackBuild b/libraries/SDL2_ttf/SDL2_ttf.SlackBuild
index fb3177ba19..14ba2ea487 100644
--- a/libraries/SDL2_ttf/SDL2_ttf.SlackBuild
+++ b/libraries/SDL2_ttf/SDL2_ttf.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for SDL2_ttf
 
 # Copyright 2013 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +23,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200415 bkw:
+# - take over maintenance
+# - update for v2.0.15
+# - i486 => i586
+
 PRGNAM=SDL2_ttf
-VERSION=${VERSION:-2.0.14}
+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
@@ -40,8 +46,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,11 +69,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" \
@@ -82,10 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --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
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
 cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/SDL2_ttf/SDL2_ttf.info b/libraries/SDL2_ttf/SDL2_ttf.info
index e81eed0c1d..cf8310556c 100644
--- a/libraries/SDL2_ttf/SDL2_ttf.info
+++ b/libraries/SDL2_ttf/SDL2_ttf.info
@@ -1,10 +1,10 @@
 PRGNAM="SDL2_ttf"
-VERSION="2.0.14"
+VERSION="2.0.15"
 HOMEPAGE="https://www.libsdl.org/projects/SDL_ttf/"
-DOWNLOAD="https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.14.tar.gz"
-MD5SUM="e53c05e1e7f1382c316afd6c763388b1"
+DOWNLOAD="https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.15.tar.gz"
+MD5SUM="04fe06ff7623d7bdcb704e82f5f88391"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/SDL_kitchensink/SDL_kitchensink.SlackBuild b/libraries/SDL_kitchensink/SDL_kitchensink.SlackBuild
index 60f490be6f..81d6c98b65 100644
--- a/libraries/SDL_kitchensink/SDL_kitchensink.SlackBuild
+++ b/libraries/SDL_kitchensink/SDL_kitchensink.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SDL_kitchensink
-VERSION=${VERSION:-1.0.7}
+VERSION=${VERSION:-1.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/SDL_kitchensink/SDL_kitchensink.info b/libraries/SDL_kitchensink/SDL_kitchensink.info
index 97a2e047c3..2a046cecea 100644
--- a/libraries/SDL_kitchensink/SDL_kitchensink.info
+++ b/libraries/SDL_kitchensink/SDL_kitchensink.info
@@ -1,8 +1,8 @@
 PRGNAM="SDL_kitchensink"
-VERSION="1.0.7"
+VERSION="1.0.9"
 HOMEPAGE="https://github.com/katajakasa/SDL_kitchensink"
-DOWNLOAD="https://github.com/katajakasa/SDL_kitchensink/archive/1.0.7/SDL_kitchensink-1.0.7.tar.gz"
-MD5SUM="32ea019e14b602a5b056075299668e7c"
+DOWNLOAD="https://github.com/katajakasa/SDL_kitchensink/archive/1.0.9/SDL_kitchensink-1.0.9.tar.gz"
+MD5SUM="8e14967c4920fc8e0aa669ebb4139e49"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2 libass cunit ffmpeg"
diff --git a/libraries/SOPE/SOPE.SlackBuild b/libraries/SOPE/SOPE.SlackBuild
index 89d72cd926..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.0}
+VERSION=${VERSION:-5.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/SOPE/SOPE.info b/libraries/SOPE/SOPE.info
index 281ab5f265..50ea51c5b2 100644
--- a/libraries/SOPE/SOPE.info
+++ b/libraries/SOPE/SOPE.info
@@ -1,8 +1,8 @@
 PRGNAM="SOPE"
-VERSION="4.3.0"
+VERSION="5.0.1"
 HOMEPAGE="https://github.com/inverse-inc/sope"
-DOWNLOAD="https://sogo.nu/files/downloads/SOGo/Sources/SOPE-4.3.0.tar.gz"
-MD5SUM="3e372a08141bda7e7263768433546579"
+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 f5664619a7..ee218c1353 100644
--- a/libraries/SimGear/README
+++ b/libraries/SimGear/README
@@ -1,3 +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.
+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.SlackBuild b/libraries/SimGear/SimGear.SlackBuild
index 02e0b04b75..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:-2019.1.2}
+VERSION=${VERSION:-2020.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-${VERSION}-rc.tar.?z*
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -74,7 +75,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 \
     -DSIMGEAR_SHARED=ON \
     -DSYSTEM_EXPAT=ON \
diff --git a/libraries/SimGear/SimGear.info b/libraries/SimGear/SimGear.info
index 8e7ee1bced..e76bcb8dca 100644
--- a/libraries/SimGear/SimGear.info
+++ b/libraries/SimGear/SimGear.info
@@ -1,8 +1,8 @@
 PRGNAM="SimGear"
-VERSION="2019.1.2"
+VERSION="2020.3.6"
 HOMEPAGE="http://wiki.flightgear.org/SimGear"
-DOWNLOAD="https://downloads.sourceforge.net/flightgear/simgear-2019.1.2-rc.tar.bz2"
-MD5SUM="355859dc2b52b4700deb8a9e2a9e5d75"
+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/VTK/README b/libraries/VTK/README
index d24b76957c..30fe0149da 100644
--- a/libraries/VTK/README
+++ b/libraries/VTK/README
@@ -10,6 +10,9 @@ interpreted programming languages.
 
 Since version 8.1.0, VTK requires the qt5 package.
 
+Version 8.2.0 is the last VTK suitable for Slackware version 14.2 due to the age
+of some SL-14.2 support packages (ncluding, in particular, cmake).
+
 Some optional additional packages, if detected during configuration, are used
 in preference to versions provided in the source code. These packages, available
 from SlackBuilds.org, are:
@@ -30,3 +33,7 @@ QT=yes|no       (default: yes)
 VTK is an optional dependency for the opencv SlackBuild. However since VTK-8.2.0,
 it is not suitable as an optional dependency for opencv-legacy. The last suitable
 version of VTK for building opencv-legacy is VTK-8.1.2.
+
+Due to unmet build requirements (in particular, required cmake version),
+8.2.0 is the last version of VTK which is suitable for Slackware 14.2.
+
diff --git a/libraries/VTK/VTK.SlackBuild b/libraries/VTK/VTK.SlackBuild
index e9167ae916..ae29a67c07 100644
--- a/libraries/VTK/VTK.SlackBuild
+++ b/libraries/VTK/VTK.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2013,2014 Youjie Zhou <jmpopush@gmail.com>
 # All rights reserved.
-# Copyright 2016-2019 Christoph Willing,  Brisbane Australia
+# Copyright 2016-2020 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,13 +27,13 @@
 
 PRGNAM=VTK
 VERSION=${VERSION:-8.2.0}
-SHORT_VERSION=${SHORT_VERSION:-8.2}
+SHORT_VERSION=${SHORT_VERSION:-$(echo $VERSION | sed -e 's/\.[0-9]*//2g')}
 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"
@@ -147,10 +147,12 @@ 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/lib${LIBDIRSUFFIX}/qt
-mv \
-  $PKG/usr/plugins/ \
-  $PKG/usr/lib${LIBDIRSUFFIX}/qt
+[ -d $PKG/usr/plugins ] && {
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/qt
+  mv \
+    $PKG/usr/plugins/ \
+    $PKG/usr/lib${LIBDIRSUFFIX}/qt
+}
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
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/adns/README b/libraries/adns/README
index ceaa641cbe..08130226d0 100644
--- a/libraries/adns/README
+++ b/libraries/adns/README
@@ -4,4 +4,5 @@ concurrent calls. The package also includes several command-line
 utilities for use in scripts.
 
 The library is written by Ian Jackson and is an official GNU
-package.
+package. It's homepage is http://www.chiark.greenend.org.uk/~ian/adns
+and http://www.gnu.org/software/adns.
diff --git a/libraries/adns/adns.SlackBuild b/libraries/adns/adns.SlackBuild
index 1664e0031d..69aff465c8 100644
--- a/libraries/adns/adns.SlackBuild
+++ b/libraries/adns/adns.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ADNS
 
-# Copyright 2018 Sergey Poznyakoff, <gray@gnu.org>
+# Copyright 2018-2020 Sergey Poznyakoff, <gray@gnu.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=adns
-VERSION=${VERSION:-1.5.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.6.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -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 {} \;
 
-zcat $CWD/destdir.patch.gz | patch -p1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -86,8 +84,12 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+find $PKG -name \*\.a -type f -delete
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING GPL-vs-LGPL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING GPL-vs-LGPL NEWS 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/libraries/adns/adns.info b/libraries/adns/adns.info
index 6a64158678..b9db6c6b5e 100644
--- a/libraries/adns/adns.info
+++ b/libraries/adns/adns.info
@@ -1,8 +1,8 @@
 PRGNAM="adns"
-VERSION="1.5.1"
+VERSION="1.6.0"
 HOMEPAGE="http://www.gnu.org/software/adns"
-DOWNLOAD="http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-1.5.1.tar.gz"
-MD5SUM="8b6274d314af0de1a00cf3ef49f6dd56"
+DOWNLOAD="http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-1.6.0.tar.gz"
+MD5SUM="b01ba30e4b486d523059bb02ad1441f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/adns/destdir.patch.gz b/libraries/adns/destdir.patch.gz
deleted file mode 100644
index 98bd22ad4e..0000000000
--- a/libraries/adns/destdir.patch.gz
+++ /dev/null
diff --git a/libraries/adns/slack-desc b/libraries/adns/slack-desc
index c45b2be613..6307d33542 100644
--- a/libraries/adns/slack-desc
+++ b/libraries/adns/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
-# 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------------------------------------------------------|
-adns: adns (C library)
+adns: adns (asynchronous DNS client library and utilities)
 adns:
 adns: GNU adns is a C library that provides easy-to-use DNS resolution
 adns: functionality. The library is asynchronous, allowing several
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/aqbanking/aqbanking.SlackBuild b/libraries/aqbanking/aqbanking.SlackBuild
index 09967b2b5a..beddca2afb 100644
--- a/libraries/aqbanking/aqbanking.SlackBuild
+++ b/libraries/aqbanking/aqbanking.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=aqbanking
-VERSION=${VERSION:-6.0.2}
+VERSION=${VERSION:-6.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/aqbanking/aqbanking.info b/libraries/aqbanking/aqbanking.info
index 67161ff410..1a62636504 100644
--- a/libraries/aqbanking/aqbanking.info
+++ b/libraries/aqbanking/aqbanking.info
@@ -1,8 +1,8 @@
 PRGNAM="aqbanking"
-VERSION="6.0.2"
+VERSION="6.2.2"
 HOMEPAGE="https://www.aquamaniac.de/"
-DOWNLOAD="https://aquamaniac.de/rdm/attachments/download/243/aqbanking-6.0.2.tar.gz"
-MD5SUM="73183759493e771415781cd34d4dab04"
+DOWNLOAD="https://aquamaniac.de/rdm/attachments/download/334/aqbanking-6.2.2.tar.gz"
+MD5SUM="a9c236ab4a1088a56c8cb488c2f793fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gwenhywfar xmlsec"
diff --git a/libraries/aspnetcore-runtime/README b/libraries/aspnetcore-runtime/README
index ddde4dad30..c4c5764000 100644
--- a/libraries/aspnetcore-runtime/README
+++ b/libraries/aspnetcore-runtime/README
@@ -3,6 +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.
+If you want to build apps, install .NET Core SDK (dotnet-sdk), which
+contains these runtimes too.
diff --git a/libraries/aspnetcore-runtime/aspnetcore-runtime.SlackBuild b/libraries/aspnetcore-runtime/aspnetcore-runtime.SlackBuild
index 683feea1ad..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.2}
+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 1e1d19611d..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.2"
+VERSION="3.1.13"
 HOMEPAGE="https://dotnet.microsoft.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.visualstudio.microsoft.com/download/pr/2d72ee67-ac4d-42c6-97d9-a26a28201fc8/977ad14b99b6ed03dcefd6655789e43a/aspnetcore-runtime-3.1.2-linux-x64.tar.gz"
-MD5SUM_x86_64="3050ab5cba8ad61e652b4adcffded9ef"
+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/bcdoc/bcdoc.SlackBuild b/libraries/bcdoc/bcdoc.SlackBuild
index f8743fd3cf..34642d6f94 100644
--- a/libraries/bcdoc/bcdoc.SlackBuild
+++ b/libraries/bcdoc/bcdoc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bcdoc
 
-# 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
@@ -24,7 +24,7 @@
 
 PRGNAM=bcdoc
 VERSION=${VERSION:-0.16.0}
-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/libraries/bcdoc/bcdoc.info b/libraries/bcdoc/bcdoc.info
index 1d51f7ae30..e4e839985d 100644
--- a/libraries/bcdoc/bcdoc.info
+++ b/libraries/bcdoc/bcdoc.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.16.0.tar.gz"
 MD5SUM="e84b506c1c73e71b23d9be0aa00f6bec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="docutils six"
+REQUIRES="docutils python3-six"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
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/botocore/botocore.SlackBuild b/libraries/botocore/botocore.SlackBuild
index f7048db35d..64d2b01477 100644
--- a/libraries/botocore/botocore.SlackBuild
+++ b/libraries/botocore/botocore.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=botocore
-VERSION=${VERSION:-1.14.15}
+VERSION=${VERSION:-1.18.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 {} \;
 
-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/botocore/botocore.info b/libraries/botocore/botocore.info
index 4c2ddb8fc9..36b7c0da45 100644
--- a/libraries/botocore/botocore.info
+++ b/libraries/botocore/botocore.info
@@ -1,10 +1,10 @@
 PRGNAM="botocore"
-VERSION="1.14.15"
+VERSION="1.18.0"
 HOMEPAGE="https://github.com/boto/botocore"
-DOWNLOAD="https://files.pythonhosted.org/packages/5c/48/f5776ae89e6b97fcc7d049f6d25262b9ce45ec3e4ad69ba3851e30006597/botocore-1.14.15.tar.gz"
-MD5SUM="d49c411092f3af5d4b42c3759c2522ca"
+DOWNLOAD="https://files.pythonhosted.org/packages/91/4a/05807a7f69d77b588f58bff828904c8528281678a3dda41db5c70c98f771/botocore-1.18.0.tar.gz"
+MD5SUM="59482af8419ceb83114e3d4b3d818f35"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-dateutil jmespath bcdoc python-urllib3"
+REQUIRES="python3-dateutil jmespath bcdoc python-urllib3"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/libraries/bullet/bullet.SlackBuild b/libraries/bullet/bullet.SlackBuild
index 8f278d7f05..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:-2.89}
+VERSION=${VERSION:-3.09}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/bullet/bullet.info b/libraries/bullet/bullet.info
index e0b7a7835e..3f241b0e5e 100644
--- a/libraries/bullet/bullet.info
+++ b/libraries/bullet/bullet.info
@@ -1,8 +1,8 @@
 PRGNAM="bullet"
-VERSION="2.89"
+VERSION="3.09"
 HOMEPAGE="http://www.bulletphysics.com/Bullet/"
-DOWNLOAD="https://github.com/bulletphysics/bullet3/archive/2.89/bullet3-2.89.tar.gz"
-MD5SUM="d239b4800ec30513879834be6fcdc376"
+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/c-ares/c-ares.SlackBuild b/libraries/c-ares/c-ares.SlackBuild
index c468027ac2..9a057c2b4a 100644
--- a/libraries/c-ares/c-ares.SlackBuild
+++ b/libraries/c-ares/c-ares.SlackBuild
@@ -6,7 +6,7 @@
 # Currently Maintained by Kent Fritz <fritz.kent@gmail.com>
 
 PRGNAM=c-ares
-VERSION=${VERSION:-1.15.0}
+VERSION=${VERSION:-1.16.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/c-ares/c-ares.info b/libraries/c-ares/c-ares.info
index ae1ee4424c..5ba5cf6226 100644
--- a/libraries/c-ares/c-ares.info
+++ b/libraries/c-ares/c-ares.info
@@ -1,8 +1,8 @@
 PRGNAM="c-ares"
-VERSION="1.15.0"
+VERSION="1.16.1"
 HOMEPAGE="https://c-ares.haxx.se/"
-DOWNLOAD="https://c-ares.haxx.se/download/c-ares-1.15.0.tar.gz"
-MD5SUM="d2391da274653f7643270623e822dff7"
+DOWNLOAD="https://c-ares.haxx.se/download/c-ares-1.16.1.tar.gz"
+MD5SUM="62dece8675590445d739b23111d93692"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/cfitsio/cfitsio.SlackBuild b/libraries/cfitsio/cfitsio.SlackBuild
index 1d22e45a5b..a03fd5cf34 100644
--- a/libraries/cfitsio/cfitsio.SlackBuild
+++ b/libraries/cfitsio/cfitsio.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cfitsio
 
-# Copyright 2011-2019 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2011-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=cfitsio
-VERSION=${VERSION:-3.47}
+VERSION=${VERSION:-3.49}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -99,7 +99,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 License.txt README* docs/*.doc docs/changes.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a License.txt README docs/*.doc docs/changes.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/cfitsio/cfitsio.info b/libraries/cfitsio/cfitsio.info
index 532076cdc5..57e6cee76e 100644
--- a/libraries/cfitsio/cfitsio.info
+++ b/libraries/cfitsio/cfitsio.info
@@ -1,8 +1,8 @@
 PRGNAM="cfitsio"
-VERSION="3.47"
+VERSION="3.49"
 HOMEPAGE="https://heasarc.gsfc.nasa.gov/fitsio/"
-DOWNLOAD="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.47.tar.gz"
-MD5SUM="a2b266abb75ddbf71a29362a599a86ba"
+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/cgicc/README b/libraries/cgicc/README
index b7c6e61d4b..22b13e067e 100644
--- a/libraries/cgicc/README
+++ b/libraries/cgicc/README
@@ -11,4 +11,4 @@ Web. cgicc performs the following functions:
   support for cookies.
 - Supports HTTP file upload.
 - Compatible with FastCGI.
-- License: LGPL.
\ No newline at end of file
+- License: LGPL.
diff --git a/libraries/configobj/configobj.SlackBuild b/libraries/configobj/configobj.SlackBuild
index 155ef66a64..36c9405498 100644
--- a/libraries/configobj/configobj.SlackBuild
+++ b/libraries/configobj/configobj.SlackBuild
@@ -6,6 +6,7 @@
 
 # Modified by B. Watson <yalhcru@gmail.com>
 
+# 20200811 bkw: add missing "six" dep, pointed out by jc_anatole
 # 20200117 bkw: update for v5.0.6
 # 20140915 bkw:
 # - Took over maintenance
diff --git a/libraries/configobj/configobj.info b/libraries/configobj/configobj.info
index ce83c43e7a..184913bc65 100644
--- a/libraries/configobj/configobj.info
+++ b/libraries/configobj/configobj.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/64/61/079eb60459c44929e684fa7d
 MD5SUM="e472a3a1c2a67bb0ec9b5d54c13a47d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="six"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
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/ctemplate/ctemplate.SlackBuild b/libraries/ctemplate/ctemplate.SlackBuild
index 9b2d60abc1..5c81b06458 100644
--- a/libraries/ctemplate/ctemplate.SlackBuild
+++ b/libraries/ctemplate/ctemplate.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ctemplate
 
-# Copyright (C) 2012-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright (C) 2012-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=ctemplate
-VERSION=${VERSION:-2.3}
+VERSION=${VERSION:-2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +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 {} \;
 
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
   ./configure \
diff --git a/libraries/ctemplate/ctemplate.info b/libraries/ctemplate/ctemplate.info
index 2e987f4fc5..1d5e72a30e 100644
--- a/libraries/ctemplate/ctemplate.info
+++ b/libraries/ctemplate/ctemplate.info
@@ -1,8 +1,8 @@
 PRGNAM="ctemplate"
-VERSION="2.3"
+VERSION="2.4"
 HOMEPAGE="https://github.com/OlafvdSpek/ctemplate/"
-DOWNLOAD="https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-2.3.tar.gz"
-MD5SUM="3b91f3c1e7aa55cb4c2957acf77d6b9a"
+DOWNLOAD="https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-2.4.tar.gz"
+MD5SUM="4dae8e9d3329d20826a94dcc092ce65e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/cyrus-sasl-xoauth2/README b/libraries/cyrus-sasl-xoauth2/README
new file mode 100644
index 0000000000..7edd227f2e
--- /dev/null
+++ b/libraries/cyrus-sasl-xoauth2/README
@@ -0,0 +1,2 @@
+This plugin is for the Cyrus SASL library for implementation of the
+XOAUTH2 framework.
diff --git a/libraries/cyrus-sasl-xoauth2/cyrus-sasl-xoauth2.SlackBuild b/libraries/cyrus-sasl-xoauth2/cyrus-sasl-xoauth2.SlackBuild
new file mode 100644
index 0000000000..32b6c1fc32
--- /dev/null
+++ b/libraries/cyrus-sasl-xoauth2/cyrus-sasl-xoauth2.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for cyrus-sasl-xoath2
+
+# Copyright 2020 Ebben Aries <e@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=cyrus-sasl-xoauth2
+VERSION=${VERSION:-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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./autogen.sh
+
+# Patch Makefile.am that autoconf does not figure out
+sed -i -e "s/{CYRUS_SASL_PREFIX}\/lib\/sasl2/{CYRUS_SASL_PREFIX}\/lib$LIBDIRSUFFIX\/sasl2/" Makefile.am
+
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL 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/cyrus-sasl-xoauth2/cyrus-sasl-xoauth2.info b/libraries/cyrus-sasl-xoauth2/cyrus-sasl-xoauth2.info
new file mode 100644
index 0000000000..c17e8fd63a
--- /dev/null
+++ b/libraries/cyrus-sasl-xoauth2/cyrus-sasl-xoauth2.info
@@ -0,0 +1,10 @@
+PRGNAM="cyrus-sasl-xoauth2"
+VERSION="0.2"
+HOMEPAGE="https://github.com/moriyoshi/cyrus-sasl-xoauth2"
+DOWNLOAD="https://github.com/moriyoshi/cyrus-sasl-xoauth2/archive/v0.2/cyrus-sasl-xoauth2-0.2.tar.gz"
+MD5SUM="c0a25ec411c9ad2ea95da338d14c87d1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="e@dscp.org"
diff --git a/libraries/cyrus-sasl-xoauth2/slack-desc b/libraries/cyrus-sasl-xoauth2/slack-desc
new file mode 100644
index 0000000000..baa1b9ba93
--- /dev/null
+++ b/libraries/cyrus-sasl-xoauth2/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------------------------------------------------------|
+cyrus-sasl-xoauth2: cyrus-sasl-xoauth2 (Cyrus SASL XOAUTH2 Plugin)
+cyrus-sasl-xoauth2:
+cyrus-sasl-xoauth2: This plugin is for the Cyrus SASL library for implementation
+cyrus-sasl-xoauth2: of the XOAUTH2 framework.
+cyrus-sasl-xoauth2:
+cyrus-sasl-xoauth2: Project URL: https://github.com/moriyoshi/cyrus-sasl-xoauth2
+cyrus-sasl-xoauth2:
+cyrus-sasl-xoauth2:
+cyrus-sasl-xoauth2:
+cyrus-sasl-xoauth2:
+cyrus-sasl-xoauth2:
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/README b/libraries/digimend-kernel-drivers/README
new file mode 100644
index 0000000000..93d7b7c8cc
--- /dev/null
+++ b/libraries/digimend-kernel-drivers/README
@@ -0,0 +1,29 @@
+DIGImend graphics tablet drivers for the Linux kernel 
+
+This package offers better hardware support than the drivers provided
+in the Linux kernel, such as pencil's pressure sensitivity and tablet's
+button mapping.
+
+List of supported tablets can be seen at
+https://digimend.github.io/drivers/digimend/tablets/
+
+NOTE:
+This will overwrite some existing kernel modules in Slackware kernel
+- hid-kye.ko
+- hid-uclogic.ko
+- hid-polostar.ko (Linux kernel 5.4.x+)
+- hid-viewsonic.ko (Linux kernel 5.4.x+)
+
+You must rebuilt this package if you upgrade your kernel.
+You can simply remove this package and reinstall kernel-modules to
+switch back to original kernel modules.
+
+If you are rebuilding  this driver, you can simply run this command
+to reload the new drivers instead of rebooting the machine:
+
+for stable:
+   modprobe -r hid-kye hid-uclogic
+for current:
+   modprobe -r hid-kye hid-uclogic hid-polostar hid-viewsonic
+
+This driver is tested on Huion Inspiroy H430P
diff --git a/libraries/digimend-kernel-drivers/digimend-kernel-drivers.SlackBuild b/libraries/digimend-kernel-drivers/digimend-kernel-drivers.SlackBuild
new file mode 100644
index 0000000000..7c9121b038
--- /dev/null
+++ b/libraries/digimend-kernel-drivers/digimend-kernel-drivers.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for digimend-kernel-drivers
+
+# Copyright 2020 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=digimend-kernel-drivers
+VERSION=${VERSION:-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 {} \;
+
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/lib/modules/$(uname -r)/kernel/drivers/hid/
+cp hid*.ko $PKG/lib/modules/$(uname -r)/kernel/drivers/hid/
+
+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 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/digimend-kernel-drivers/digimend-kernel-drivers.info b/libraries/digimend-kernel-drivers/digimend-kernel-drivers.info
new file mode 100644
index 0000000000..f57b391071
--- /dev/null
+++ b/libraries/digimend-kernel-drivers/digimend-kernel-drivers.info
@@ -0,0 +1,10 @@
+PRGNAM="digimend-kernel-drivers"
+VERSION="10"
+HOMEPAGE="https://github.com/DIGImend/digimend-kernel-drivers"
+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%"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/digimend-kernel-drivers/slack-desc b/libraries/digimend-kernel-drivers/slack-desc
new file mode 100644
index 0000000000..892ac4c16a
--- /dev/null
+++ b/libraries/digimend-kernel-drivers/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------------------------------------------------------|
+digimend-kernel-drivers: digimend-kernel-drivers (Digimend graphics tablet drivers)
+digimend-kernel-drivers:
+digimend-kernel-drivers:
+digimend-kernel-drivers: DIGImend graphics tablet drivers for the Linux kernel
+digimend-kernel-drivers:
+digimend-kernel-drivers:
+digimend-kernel-drivers:
+digimend-kernel-drivers: Project URL:
+digimend-kernel-drivers: https://github.com/DIGImend/digimend-kernel-drivers
+digimend-kernel-drivers:
+digimend-kernel-drivers:
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/efl/efl.SlackBuild b/libraries/efl/efl.SlackBuild
index 356c593ad0..9bee1447f0 100644
--- a/libraries/efl/efl.SlackBuild
+++ b/libraries/efl/efl.SlackBuild
@@ -22,7 +22,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=efl
-VERSION=${VERSION:-1.21.1}
+VERSION=${VERSION:-1.24.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,13 +53,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ -e /usr/bin/elementary_run ]; then
-    echo "A previous installation of efl has been detected."
-    echo "Please uninstall it before running this script."
-    exit 1
-fi
-
-DOCS="ABOUT-NLS AUTHORS COMPLIANCE COPYING ChangeLog NEWS README"
+DOCS="AUTHORS COMPLIANCE COPYING COPYING.images ChangeLog INSTALL NEWS README"
+LICENSES="licenses/COPYING.ASL licenses/COPYING.BSD licenses/COPYING.DNS licenses/COPYING.FTL licenses/COPYING.GPL licenses/COPYING.LGPL licenses/COPYING.NGINX-MIT licenses/COPYING.SMALL"
 
 set -e
 
@@ -76,26 +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 {} \;
 
+meson . build \
+	--prefix=/usr/ \
+	--libdir=/usr/lib${LIBDIRSUFFIX} \
+	-Dsystemd=false \
+	-Dbuild-id="$ARCH"-slackware-linux
+
+# 20200416 bkw: vita_cell on IRC reported missing DSO errors for -lm
+# and -ldl. efl has a LOT of optional/autodetected libraries, I couldn't
+# duplicate his problem, but it looks like some optional library normally
+# adds the -lm -ldl in its pkgconfig file and he was missing whatever
+# it was. In any case, adding them here won't hurt anything.
+LIBS="-lm -ldl" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-systemd \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+ninja -C build -v
+
+DESTDIR=$PKG ninja -C build 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 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/licenses
+cp -a $LICENSES $PKG/usr/doc/$PRGNAM-$VERSION/licenses
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/efl/efl.info b/libraries/efl/efl.info
index 6ecc703b39..8f3836e1d5 100644
--- a/libraries/efl/efl.info
+++ b/libraries/efl/efl.info
@@ -1,10 +1,10 @@
 PRGNAM="efl"
-VERSION="1.21.1"
+VERSION="1.24.3"
 HOMEPAGE="https://www.enlightenment.org/"
-DOWNLOAD="https://download.enlightenment.org/rel/libs/efl/efl-1.21.1.tar.xz"
-MD5SUM="275ae48d6fdd1ebd47c1f2d0426d5dfc"
+DOWNLOAD="https://download.enlightenment.org/rel/libs/efl/efl-1.24.3.tar.xz"
+MD5SUM="6d0d60b8bceeb1749f4ac66d910486bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="luajit bullet"
+REQUIRES="luajit bullet libwebp check meson"
 MAINTAINER="Erik Falor"
 EMAIL="ewfalor@gmail.com"
diff --git a/libraries/enchant2/enchant2.SlackBuild b/libraries/enchant2/enchant2.SlackBuild
index 46308a938e..66366b399e 100644
--- a/libraries/enchant2/enchant2.SlackBuild
+++ b/libraries/enchant2/enchant2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for enchant2
 
-# Copyright 2018-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2018-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=enchant2
 SRCNAM=enchant
-VERSION=${VERSION:-2.2.7}
+VERSION=${VERSION:-2.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/enchant2/enchant2.info b/libraries/enchant2/enchant2.info
index b0f60126a6..54451cc932 100644
--- a/libraries/enchant2/enchant2.info
+++ b/libraries/enchant2/enchant2.info
@@ -1,9 +1,9 @@
 PRGNAM="enchant2"
-VERSION="2.2.7"
+VERSION="2.2.8"
 HOMEPAGE="https://github.com/AbiWord/enchant"
-DOWNLOAD="https://github.com/AbiWord/enchant/archive/v2.2.7/enchant-2.2.7.tar.gz \
+DOWNLOAD="https://github.com/AbiWord/enchant/archive/v2.2.8/enchant-2.2.8.tar.gz \
           https://sourceforge.net/projects/slackbuildsdirectlinks/files/enchant2/gnulib-20180922.tar.gz"
-MD5SUM="a4af0a6d751cf95705594c4278c2d72c \
+MD5SUM="8f812cc3b39571a716d0553a92817952 \
         92f099bb383ba5e706c7c78a437b2222"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/flatzebra/flatzebra.info b/libraries/flatzebra/flatzebra.info
index d39ae556b4..93437c966e 100644
--- a/libraries/flatzebra/flatzebra.info
+++ b/libraries/flatzebra/flatzebra.info
@@ -1,7 +1,7 @@
 PRGNAM="flatzebra"
 VERSION="0.1.6"
 HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/flatzebra-0.1.6.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/flatzebra-0.1.6.tar.gz"
 MD5SUM="68cbaa37b88de639ceb6e4c46807fc01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/flint/README b/libraries/flint/README
new file mode 100644
index 0000000000..39a3a1a4cd
--- /dev/null
+++ b/libraries/flint/README
@@ -0,0 +1,14 @@
+FLINT (Fast Library for Number Theory) is a C library in support of
+computations in number theory. It's also a research project into
+algorithms in number theory.
+
+FLINT supports arithmetic with numbers, polynomials, power series and
+matrices over many base rings, including:
+ * Multiprecision integers and rationals
+ * Integers modulo n
+ * p-adic numbers
+ * Finite fields (prime and non-prime order)
+ * Real and complex numbers (via the Arb extension library)
+
+FLINT was licensed GPL v2+ up to and including version 2.5. New version
+are licensed LGPL v2.1+.
diff --git a/libraries/flint/flint.SlackBuild b/libraries/flint/flint.SlackBuild
new file mode 100644
index 0000000000..4bbb6abbc9
--- /dev/null
+++ b/libraries/flint/flint.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for FLINT
+
+# Copyright 2020, R. Jesus, Portugal
+# 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=flint
+VERSION=${VERSION:-2.6.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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# FLINT doesn't have an option to set the library path, so we adjust it here
+test -z "$LIBDIRSUFFIX" || mv -v "$PKG/usr/lib" "$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 -av doc/. $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -av 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/libraries/flint/flint.info b/libraries/flint/flint.info
new file mode 100644
index 0000000000..3226b5adf1
--- /dev/null
+++ b/libraries/flint/flint.info
@@ -0,0 +1,10 @@
+PRGNAM="flint"
+VERSION="2.6.3"
+HOMEPAGE="http://www.flintlib.org/"
+DOWNLOAD="http://www.flintlib.org/flint-2.6.3.tar.gz"
+MD5SUM="ed3a6cab37fe2298d9cfaead6ccd1dc7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="R. Jesus"
+EMAIL="rj dot bcjesus at gmail dot com"
diff --git a/libraries/flint/slack-desc b/libraries/flint/slack-desc
new file mode 100644
index 0000000000..3e3df86d46
--- /dev/null
+++ b/libraries/flint/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------------------------------------------------------|
+flint: flint (Fast Library for Number Theory)
+flint:
+flint: FLINT (Fast Library for Number Theory) is a C library in support of
+flint: computations in number theory. It's also a research project into
+flint: algorithms in number theory.
+flint:
+flint: http://www.flintlib.org/
+flint:
+flint:
+flint:
+flint:
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/gloox/README b/libraries/gloox/README
index 5d05d9bff0..7433d7ecdc 100644
--- a/libraries/gloox/README
+++ b/libraries/gloox/README
@@ -2,4 +2,4 @@ gloox is a rock-solid, full-featured Jabber/XMPP client library,
 written in clean ANSI C++. It makes writing spec-compliant clients
 easy and allows for hassle-free integration of Jabber/XMPP
 functionality into existing applications. gloox is released under the
-GNU GPL. Commercial licensing and support are available.
+GNU GPL3. Commercial licensing and support are available.
diff --git a/libraries/gloox/gloox.SlackBuild b/libraries/gloox/gloox.SlackBuild
index 7f7f9c498c..9e1c7c98d8 100644
--- a/libraries/gloox/gloox.SlackBuild
+++ b/libraries/gloox/gloox.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for gloox
 
+# Updates since 2020 Copyright 2020 Tim  dickson.tim@googlemail.com
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-
 # Copyright 2010  Binh Nguyen <binhvng@gmail.com>
 # All rights reserved.
 #
@@ -23,9 +23,13 @@
 #  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.
+#
+
+#note update to 1.0.24  breaks binary compatability but maintains source compatability.
+#ie. you'll need to recreate packages that use gloox. eg currently 0ad and licq
 
 PRGNAM=gloox
-VERSION=${VERSION:-1.0.13}
+VERSION=${VERSION:-1.0.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/gloox/gloox.info b/libraries/gloox/gloox.info
index 471ed5ebef..396b0c8bf3 100644
--- a/libraries/gloox/gloox.info
+++ b/libraries/gloox/gloox.info
@@ -1,10 +1,10 @@
 PRGNAM="gloox"
-VERSION="1.0.13"
+VERSION="1.0.24"
 HOMEPAGE="https://camaya.net/gloox/"
-DOWNLOAD="https://camaya.net/download/gloox-1.0.13.tar.bz2"
-MD5SUM="953b96ce14c9c1b8a262b52fce9e757f"
+DOWNLOAD="https://camaya.net/download/gloox-1.0.24.tar.bz2"
+MD5SUM="7311ab0456f4459be7b5a86f9008af03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
diff --git a/libraries/gnome-sharp/gnome-sharp.SlackBuild b/libraries/gnome-sharp/gnome-sharp.SlackBuild
index 6f595fb23d..903202d9d2 100644
--- a/libraries/gnome-sharp/gnome-sharp.SlackBuild
+++ b/libraries/gnome-sharp/gnome-sharp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Gnome#
 
-# Written by André Barboza <bmg.andre@gmail.com>
+# Written by André Barboza <bmg.andre@gmail.com>
 
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
diff --git a/libraries/grantlee-qt5/grantlee-5.1.0-install_headers_into_versioned_directory.patch b/libraries/grantlee-qt5/grantlee-5.1.0-install_headers_into_versioned_directory.patch
deleted file mode 100644
index 8788469924..0000000000
--- a/libraries/grantlee-qt5/grantlee-5.1.0-install_headers_into_versioned_directory.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up grantlee-5.1.0/CMakeLists.txt.orig grantlee-5.1.0/CMakeLists.txt
---- grantlee-5.1.0/CMakeLists.txt.orig	2016-04-19 01:33:17.000000000 -0500
-+++ grantlee-5.1.0/CMakeLists.txt	2016-04-19 06:44:06.371122149 -0500
-@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define
- set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
- set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )
- set( BIN_INSTALL_DIR bin )
--set( INCLUDE_INSTALL_DIR include )
-+set( INCLUDE_INSTALL_DIR include/Grantlee5 )
- set( DATA_INSTALL_DIR share/apps )
- 
- # set up RPATH/install_name_dir
-diff -up grantlee-5.1.0/templates/lib/CMakeLists.txt.orig grantlee-5.1.0/templates/lib/CMakeLists.txt
---- grantlee-5.1.0/templates/lib/CMakeLists.txt.orig	2016-04-19 06:44:06.371122149 -0500
-+++ grantlee-5.1.0/templates/lib/CMakeLists.txt	2016-04-19 06:44:55.763336264 -0500
-@@ -107,6 +107,10 @@ if (Qt5Script_FOUND)
- 
-   target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
-   target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+  target_include_directories(Grantlee_Templates
-+    INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>"
-+  )
-+
-   target_link_libraries(Grantlee_Templates
-     LINK_PRIVATE Qt5::Script
-   )
-diff -up grantlee-5.1.0/textdocument/lib/CMakeLists.txt.orig grantlee-5.1.0/textdocument/lib/CMakeLists.txt
---- grantlee-5.1.0/textdocument/lib/CMakeLists.txt.orig	2016-04-19 06:44:06.371122149 -0500
-+++ grantlee-5.1.0/textdocument/lib/CMakeLists.txt	2016-04-19 06:45:56.268598553 -0500
-@@ -43,6 +43,10 @@ if (CMAKE_GENERATOR MATCHES "Visual Stud
-   endforeach()
- endif()
- 
-+target_include_directories(Grantlee_TextDocument
-+    INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>"
-+)
-+
- target_link_libraries(Grantlee_TextDocument
-   LINK_PUBLIC Qt5::Gui
- )
diff --git a/libraries/grantlee-qt5/grantlee-5.2.0-install_headers_into_versioned_directory.patch b/libraries/grantlee-qt5/grantlee-5.2.0-install_headers_into_versioned_directory.patch
new file mode 100644
index 0000000000..ccc4577a31
--- /dev/null
+++ b/libraries/grantlee-qt5/grantlee-5.2.0-install_headers_into_versioned_directory.patch
@@ -0,0 +1,79 @@
+From 9dfa187569e4c9c4e72ace60c051cbfa79434d77 Mon Sep 17 00:00:00 2001
+From: Troy Dawson <tdawson@redhat.com>
+Date: Fri, 14 Feb 2020 13:43:27 -0800
+Subject: [PATCH] install headers into versioned directory
+
+---
+ CMakeLists.txt                  | 1 +
+ templates/lib/CMakeLists.txt    | 6 ++++--
+ textdocument/lib/CMakeLists.txt | 8 ++++++--
+ 3 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20edcdc..8df3dd6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,6 +80,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6
+ 
+ set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
+ set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )
++set( INCLUDE_INSTALL_DIR include/Grantlee5 )
+ 
+ # set up RPATH/install_name_dir
+ set( CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR})
+diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
+index 5058481..c4262f3 100644
+--- a/templates/lib/CMakeLists.txt
++++ b/templates/lib/CMakeLists.txt
+@@ -106,6 +106,8 @@ if (Qt5Qml_FOUND)
+   )
+ endif()
+ 
++target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
++
+ if (BUILD_TESTS)
+   set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT")
+ endif()
+@@ -152,10 +154,10 @@ install(FILES
+   token.h
+   util.h
+   variable.h
+-  DESTINATION include/grantlee COMPONENT Templates
++  DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT Templates
+ )
+ 
+ install(FILES
+   grantlee_templates.h
+-  DESTINATION include COMPONENT Templates
++  DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Templates
+ )
+diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
+index 2c5a96f..bf56052 100644
+--- a/textdocument/lib/CMakeLists.txt
++++ b/textdocument/lib/CMakeLists.txt
+@@ -35,6 +35,10 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio")
+   endforeach()
+ endif()
+ 
++target_include_directories(Grantlee_TextDocument
++    INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>"
++)
++
+ target_link_libraries(Grantlee_TextDocument
+   PUBLIC Qt5::Gui
+ )
+@@ -59,10 +63,10 @@ install(FILES
+   texthtmlbuilder.h
+   mediawikimarkupbuilder.h
+   ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h
+-  DESTINATION include/grantlee COMPONENT TextDocument
++  DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT TextDocument
+ )
+ 
+ install(FILES
+   grantlee_textdocument.h
+-  DESTINATION include COMPONENT TextDocument
++  DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT TextDocument
+ )
+-- 
+2.24.1
diff --git a/libraries/grantlee-qt5/grantlee-qt5.SlackBuild b/libraries/grantlee-qt5/grantlee-qt5.SlackBuild
index 1fae96c48c..a6632677d6 100644
--- a/libraries/grantlee-qt5/grantlee-qt5.SlackBuild
+++ b/libraries/grantlee-qt5/grantlee-qt5.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for grantlee-qt5
 
-# Copyright 2016 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2016-2020 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=grantlee-qt5
 SRCNAM=grantlee
-VERSION=${VERSION:-5.1.0}
+VERSION=${VERSION:-5.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,7 +74,7 @@ find -L . \
 # Install headers into a versioned directory to be parallel-installable
 # based on:
 # https://github.com/steveire/grantlee/pull/1
-patch -p1 < $CWD/grantlee-5.1.0-install_headers_into_versioned_directory.patch
+patch -p1 < $CWD/grantlee-5.2.0-install_headers_into_versioned_directory.patch
 
 mkdir build
 cd build
diff --git a/libraries/grantlee-qt5/grantlee-qt5.info b/libraries/grantlee-qt5/grantlee-qt5.info
index 6d49364b8f..3fb2adfd2f 100644
--- a/libraries/grantlee-qt5/grantlee-qt5.info
+++ b/libraries/grantlee-qt5/grantlee-qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="grantlee-qt5"
-VERSION="5.1.0"
+VERSION="5.2.0"
 HOMEPAGE="https://github.com/steveire/grantlee"
-DOWNLOAD="https://github.com/steveire/grantlee/archive/v5.1.0/grantlee-5.1.0.tar.gz"
-MD5SUM="3ce1e53cca2b5cad27d07ee82880e4c3"
+DOWNLOAD="https://github.com/steveire/grantlee/archive/v5.2.0/grantlee-5.2.0.tar.gz"
+MD5SUM="da76560384bb47ddd4e0dce07c0bdd8e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/libraries/grpc/grpc.SlackBuild b/libraries/grpc/grpc.SlackBuild
index ac9cc25af0..8e689190a9 100644
--- a/libraries/grpc/grpc.SlackBuild
+++ b/libraries/grpc/grpc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for grpc
 
-# Copyright 2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2019-2020 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 
 PRGNAM=grpc
-VERSION=${VERSION:-1.24.1}
-UPB_VERSION=${UPB_VERSION:-931bbecbd3230ae7f22efa5d203639facc47f719}
+VERSION=${VERSION:-1.28.1}
+CPP_VERSION=${UPB_VERSION:-20200225.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,9 +64,9 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-rm -rf third_party/upb
-tar xvf $CWD/upb-${UPB_VERSION}.tar.gz -C third_party
-ln -s upb-${UPB_VERSION} third_party/upb
+rm -rf third_party/abseil-cpp
+tar xvf $CWD/abseil-cpp-${CPP_VERSION}.tar.gz -C third_party
+ln -s abseil-cpp-${CPP_VERSION} third_party/abseil-cpp
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/grpc/grpc.info b/libraries/grpc/grpc.info
index 5047b17c49..6844e6e0a1 100644
--- a/libraries/grpc/grpc.info
+++ b/libraries/grpc/grpc.info
@@ -1,10 +1,10 @@
 PRGNAM="grpc"
-VERSION="1.24.1"
+VERSION="1.28.1"
 HOMEPAGE="https://grpc.io/"
-DOWNLOAD="https://github.com/grpc/grpc/archive/v1.24.1/grpc-1.24.1.tar.gz \
-          https://github.com/protocolbuffers/upb/archive/931bbecbd3230ae7f22efa5d203639facc47f719/upb-931bbecbd3230ae7f22efa5d203639facc47f719.tar.gz"
-MD5SUM="907baa235c152a05e83a198403f336c6 \
-        bf1e541dd7467e0621e2c2e6241ced2b"
+DOWNLOAD="https://github.com/grpc/grpc/archive/v1.28.1/grpc-1.28.1.tar.gz \
+          https://github.com/abseil/abseil-cpp/archive/20200225.2/abseil-cpp-20200225.2.tar.gz"
+MD5SUM="db08d431023d116089bcaba4059bc583 \
+        73f2b6e72f1599a9139170c29482ddc4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="c-ares protobuf3 gflags"
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/gumbo-parser/gumbo-parser.SlackBuild b/libraries/gumbo-parser/gumbo-parser.SlackBuild
new file mode 100644
index 0000000000..2bf238d264
--- /dev/null
+++ b/libraries/gumbo-parser/gumbo-parser.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for gumbo-parser
+
+# 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=gumbo-parser
+VERSION=${VERSION:-0.10.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-$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} \
+  --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 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
+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/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/gwenhywfar/gwenhywfar.SlackBuild b/libraries/gwenhywfar/gwenhywfar.SlackBuild
index 3d67845373..b4cbc20ae6 100644
--- a/libraries/gwenhywfar/gwenhywfar.SlackBuild
+++ b/libraries/gwenhywfar/gwenhywfar.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gwenhywfar
-VERSION=${VERSION:-5.1.3}
+VERSION=${VERSION:-5.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,6 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --with-qt4-includes=/usr/lib${LIBDIRSUFFIX}/qt/include/ \
   --with-qt4-libs=/usr/lib${LIBDIRSUFFIX}/qt/lib \
+  --with-guis="qt4 gtk2 gtk3" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
diff --git a/libraries/gwenhywfar/gwenhywfar.info b/libraries/gwenhywfar/gwenhywfar.info
index f86a5ac2d4..39c49db817 100644
--- a/libraries/gwenhywfar/gwenhywfar.info
+++ b/libraries/gwenhywfar/gwenhywfar.info
@@ -1,8 +1,8 @@
 PRGNAM="gwenhywfar"
-VERSION="5.1.3"
+VERSION="5.4.0"
 HOMEPAGE="https://www.aquamaniac.de/"
-DOWNLOAD="https://aquamaniac.de/rdm/attachments/download/242/gwenhywfar-5.1.3.tar.gz"
-MD5SUM="9cf13e0e0075912117e5912d8f712c9c"
+DOWNLOAD="https://aquamaniac.de/rdm/attachments/download/331/gwenhywfar-5.4.0.tar.gz"
+MD5SUM="af3d547d46920964f25af853b9efc9f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/hdf/hdf.SlackBuild b/libraries/hdf/hdf.SlackBuild
index 4a087e3bc6..1c57e91ef9 100644
--- a/libraries/hdf/hdf.SlackBuild
+++ b/libraries/hdf/hdf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for hdf
 
-# 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,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hdf
-VERSION=${VERSION:-4.2.14}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.2.15}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/libraries/hdf/hdf.info b/libraries/hdf/hdf.info
index d3bdddfd68..fef5d9dfeb 100644
--- a/libraries/hdf/hdf.info
+++ b/libraries/hdf/hdf.info
@@ -1,8 +1,8 @@
 PRGNAM="hdf"
-VERSION="4.2.14"
+VERSION="4.2.15"
 HOMEPAGE="https://www.hdfgroup.org/products/hdf4/"
-DOWNLOAD="https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.14/src/hdf-4.2.14.tar.bz2"
-MD5SUM="3f3bd5da84015e9221d26fb5a80094b4"
+DOWNLOAD="https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2"
+MD5SUM="27ab87b22c31906883a0bfaebced97cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/hdf5/hdf5.SlackBuild b/libraries/hdf5/hdf5.SlackBuild
index 8e2eac6a13..6be8848d8d 100644
--- a/libraries/hdf5/hdf5.SlackBuild
+++ b/libraries/hdf5/hdf5.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hdf5
-VERSION=${VERSION:-1.8.21}
+VERSION=${VERSION:-1.10.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,7 +85,7 @@ CPPFLAGS="$SLKCFLAGS" \
   --enable-cxx \
   --enable-fortran \
   --with-zlib \
-  --without-szlib \
+  --with-szlib \
   --enable-static=no \
   --build=$ARCH-slackware-linux
 
diff --git a/libraries/hdf5/hdf5.info b/libraries/hdf5/hdf5.info
index 11ea1eff79..6638941c58 100644
--- a/libraries/hdf5/hdf5.info
+++ b/libraries/hdf5/hdf5.info
@@ -1,10 +1,10 @@
 PRGNAM="hdf5"
-VERSION="1.8.21"
+VERSION="1.10.6"
 HOMEPAGE="https://www.hdfgroup.org/"
-DOWNLOAD="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.21/src/hdf5-1.8.21.tar.bz2"
-MD5SUM="2d2408f2a9dfb5c7b79998002e9a90e9"
+DOWNLOAD="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.6/src/hdf5-1.10.6.tar.gz"
+MD5SUM="37f3089e7487daf0890baf3d3328e54a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libaec"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/hiredis/hiredis.SlackBuild b/libraries/hiredis/hiredis.SlackBuild
index d122932035..dc6096e3fb 100644
--- a/libraries/hiredis/hiredis.SlackBuild
+++ b/libraries/hiredis/hiredis.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hiredis
-VERSION=${VERSION:-0.13.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/libraries/hiredis/hiredis.info b/libraries/hiredis/hiredis.info
index 291fbd9767..d4af21387d 100644
--- a/libraries/hiredis/hiredis.info
+++ b/libraries/hiredis/hiredis.info
@@ -1,8 +1,8 @@
 PRGNAM="hiredis"
-VERSION="0.13.3"
+VERSION="1.0.0"
 HOMEPAGE="https://github.com/redis/hiredis"
-DOWNLOAD="https://github.com/redis/hiredis/archive/v0.13.3/hiredis-0.13.3.tar.gz"
-MD5SUM="43dca1445ec6d3b702821dba36000279"
+DOWNLOAD="https://github.com/redis/hiredis/archive/v1.0.0/hiredis-1.0.0.tar.gz"
+MD5SUM="209ae570cdee65a5143ea6db8ac07fe3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/hoel/hoel.SlackBuild b/libraries/hoel/hoel.SlackBuild
index 23ebe60caa..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.13}
+VERSION=${VERSION:-1.4.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/hoel/hoel.info b/libraries/hoel/hoel.info
index a100be51f0..90fdbc3d7e 100644
--- a/libraries/hoel/hoel.info
+++ b/libraries/hoel/hoel.info
@@ -1,8 +1,8 @@
 PRGNAM="hoel"
-VERSION="1.4.13"
+VERSION="1.4.17"
 HOMEPAGE="https://github.com/babelouest/hoel"
-DOWNLOAD="https://github.com/babelouest/hoel/archive/v1.4.13/hoel-1.4.13.tar.gz"
-MD5SUM="44082ee8192d6dc4dc0ffe3a70629e6d"
+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/README b/libraries/htslib/README
index 05556cf5bb..0ec918852b 100644
--- a/libraries/htslib/README
+++ b/libraries/htslib/README
@@ -1,8 +1,8 @@
-Prior to the introduction of HTSlib, SAMtools and BCFtools were distributed 
-in a single samtools-0.1.x package. This old version remains available from 
-SBo as samtools-legacy.
+Prior to the introduction of HTSlib, SAMtools and BCFtools were
+distributed in a single samtools-0.1.x package. This old version remains
+available from SBo as samtools-legacy.
 
-HTSlib has been distributed as a separate package to facilitate the writing 
-of programs against the HTSlib API. HTSlib also provides the bgzip, htsfile,
-and tabix utilities, so the installation of HTSlib provides these utilities 
-as well.
+HTSlib has been distributed as a separate package to facilitate the
+writing of programs against the HTSlib API. HTSlib also provides the
+bgzip, htsfile, and tabix utilities, so the installation of HTSlib
+provides these utilities as well.
diff --git a/libraries/htslib/htslib.SlackBuild b/libraries/htslib/htslib.SlackBuild
index b45a1bac01..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.10.2}
+VERSION=${VERSION:-1.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/htslib/htslib.info b/libraries/htslib/htslib.info
index 79a3d799d3..6254e8b507 100644
--- a/libraries/htslib/htslib.info
+++ b/libraries/htslib/htslib.info
@@ -1,8 +1,8 @@
 PRGNAM="htslib"
-VERSION="1.10.2"
+VERSION="1.12"
 HOMEPAGE="http://www.htslib.org"
-DOWNLOAD="https://github.com/samtools/htslib/releases/download/1.10.2/htslib-1.10.2.tar.bz2"
-MD5SUM="9b03764c4809388625ab0b6352b13c93"
+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/http-parser/http-parser.SlackBuild b/libraries/http-parser/http-parser.SlackBuild
index 81e4b6fb4d..f4d9f81cda 100644
--- a/libraries/http-parser/http-parser.SlackBuild
+++ b/libraries/http-parser/http-parser.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for http-parser
 
-# Copyright 2015-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2015-2020 Larry Hajali <larryhaja[at]gmail[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=http-parser
-VERSION=${VERSION:-2.9.2}
+VERSION=${VERSION:-2.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/http-parser/http-parser.info b/libraries/http-parser/http-parser.info
index 4d446dc1a2..1b3db0879a 100644
--- a/libraries/http-parser/http-parser.info
+++ b/libraries/http-parser/http-parser.info
@@ -1,8 +1,8 @@
 PRGNAM="http-parser"
-VERSION="2.9.2"
+VERSION="2.9.4"
 HOMEPAGE="https://github.com/joyent/http-parser"
-DOWNLOAD="https://github.com/joyent/http-parser/archive/v2.9.2/http-parser-2.9.2.tar.gz"
-MD5SUM="aaf0421392e1c0d1f2d51ec9f0e08cc1"
+DOWNLOAD="https://github.com/joyent/http-parser/archive/v2.9.4/http-parser-2.9.4.tar.gz"
+MD5SUM="1b0f2371aabacbadaa03cc532cedcf92"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/iddawc/README b/libraries/iddawc/README
new file mode 100644
index 0000000000..0965f44159
--- /dev/null
+++ b/libraries/iddawc/README
@@ -0,0 +1,6 @@
+Iddawc - OAuth2 client library
+
+Handles the OAuth2 and OpenID Connect authentication process flow from the client side.
+- Genrates requests based on input parameters
+- Parses response
+- Validates response values
diff --git a/libraries/iddawc/iddawc.SlackBuild b/libraries/iddawc/iddawc.SlackBuild
new file mode 100644
index 0000000000..e5df2f49e7
--- /dev/null
+++ b/libraries/iddawc/iddawc.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+# Slackware build script for iddawc
+#
+# Yth | Pont-en-Royans, France | yth@ythogtha.org
+#
+# 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=iddawc
+VERSION=${VERSION:-0.9.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 -Wno-error=maybe-uninitialized"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=maybe-uninitialized"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC -Wno-error=maybe-uninitialized"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2 -Wno-error=maybe-uninitialized"
+  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_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_DOCDIR=doc/$PRGNAM-$VERSION \
+    -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
+
+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
+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/iddawc/iddawc.info b/libraries/iddawc/iddawc.info
new file mode 100644
index 0000000000..8e5e882da7
--- /dev/null
+++ b/libraries/iddawc/iddawc.info
@@ -0,0 +1,10 @@
+PRGNAM="iddawc"
+VERSION="0.9.9"
+HOMEPAGE="https://github.com/babelouest/iddawc"
+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"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/libraries/iddawc/slack-desc b/libraries/iddawc/slack-desc
new file mode 100644
index 0000000000..d537d9b08d
--- /dev/null
+++ b/libraries/iddawc/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------------------------------------------------------|
+iddawc: iddawc (OAuth2 client library)
+iddawc:
+iddawc: Handles the OAuth2 and OpenID Connect authentication process flow
+iddawc: from client side.
+iddawc:
+iddawc:
+iddawc: Project URL: https://github.com/babelouest/iddawc
+iddawc:
+iddawc:
+iddawc:
+iddawc:
diff --git a/libraries/imlib2/imlib2.SlackBuild b/libraries/imlib2/imlib2.SlackBuild
index 8c6b015521..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
@@ -23,7 +23,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=imlib2
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.7.1}
 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 xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -92,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 fba6524b4f..68960a8fb1 100644
--- a/libraries/imlib2/imlib2.info
+++ b/libraries/imlib2/imlib2.info
@@ -1,8 +1,8 @@
 PRGNAM="imlib2"
-VERSION="1.6.1"
+VERSION="1.7.1"
 HOMEPAGE="https://www.enlightenment.org"
-DOWNLOAD="https://ufpr.dl.sourceforge.net/project/enlightenment/imlib2-src/1.6.1/imlib2-1.6.1.tar.gz"
-MD5SUM="f803909b3b482cdb47e8e94f942d19fb"
+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/imlib2_loaders/imlib2_loaders.SlackBuild b/libraries/imlib2_loaders/imlib2_loaders.SlackBuild
index 87ca14d778..3e53be2e6b 100644
--- a/libraries/imlib2_loaders/imlib2_loaders.SlackBuild
+++ b/libraries/imlib2_loaders/imlib2_loaders.SlackBuild
@@ -22,8 +22,11 @@
 #  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.6.1 by Igor Alexandrov <igor.alexandrov@outlook.com>
+# Updated to version 1.7.0 by Igor Alexandrov <igor.alexandrov@outlook.com>
+
 PRGNAM=imlib2_loaders
-VERSION=${VERSION:-1.4.10}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +63,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.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -78,13 +81,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-static \
+  --disable-eet \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING COPYING-PLAIN COPYING.loader_xcf ChangeLog INSTALL README README.in $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING COPYING-PLAIN COPYING.loader_xcf ChangeLog 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/libraries/imlib2_loaders/imlib2_loaders.info b/libraries/imlib2_loaders/imlib2_loaders.info
index 8d5350c15c..351dbc3802 100644
--- a/libraries/imlib2_loaders/imlib2_loaders.info
+++ b/libraries/imlib2_loaders/imlib2_loaders.info
@@ -1,8 +1,8 @@
 PRGNAM="imlib2_loaders"
-VERSION="1.4.10"
+VERSION="1.7.0"
 HOMEPAGE="https://www.enlightenment.org"
-DOWNLOAD="https://downloads.sourceforge.net/enlightenment/imlib2_loaders-1.4.10.tar.bz2"
-MD5SUM="0c5f36bb2bc52179280536fc4d9a5636"
+DOWNLOAD="https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.7.0/imlib2_loaders-1.7.0.tar.bz2"
+MD5SUM="7e5f5daf3ee29bdf57782341e3d5e03b"
 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/jsoncpp/jsoncpp.SlackBuild b/libraries/jsoncpp/jsoncpp.SlackBuild
index 472f66ab38..a9b756b096 100644
--- a/libraries/jsoncpp/jsoncpp.SlackBuild
+++ b/libraries/jsoncpp/jsoncpp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jsoncpp
 
-# Copyright 2014-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2020 Larry Hajali <larryhaja[at]gmail[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=jsoncpp
-VERSION=${VERSION:-1.9.1}
+VERSION=${VERSION:-1.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/jsoncpp/jsoncpp.info b/libraries/jsoncpp/jsoncpp.info
index 30c14c01e8..9cb4cc1677 100644
--- a/libraries/jsoncpp/jsoncpp.info
+++ b/libraries/jsoncpp/jsoncpp.info
@@ -1,8 +1,8 @@
 PRGNAM="jsoncpp"
-VERSION="1.9.1"
+VERSION="1.9.2"
 HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-DOWNLOAD="https://github.com/open-source-parsers/jsoncpp/archive/1.9.1/jsoncpp-1.9.1.tar.gz"
-MD5SUM="da9e0427550e1377d88b471265a3bb3e"
+DOWNLOAD="https://github.com/open-source-parsers/jsoncpp/archive/1.9.2/jsoncpp-1.9.2.tar.gz"
+MD5SUM="e31da248a8765597d79e94cf304b70fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="meson"
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/leptonica/leptonica.SlackBuild b/libraries/leptonica/leptonica.SlackBuild
index fb1e02819e..27f7fd1a2c 100644
--- a/libraries/leptonica/leptonica.SlackBuild
+++ b/libraries/leptonica/leptonica.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=leptonica
-VERSION=${VERSION:-1.79.0}
+VERSION=${VERSION:-1.80.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/leptonica/leptonica.info b/libraries/leptonica/leptonica.info
index 671aa57f1d..1e4b2eba23 100644
--- a/libraries/leptonica/leptonica.info
+++ b/libraries/leptonica/leptonica.info
@@ -1,8 +1,8 @@
 PRGNAM="leptonica"
-VERSION="1.79.0"
+VERSION="1.80.0"
 HOMEPAGE="http://www.leptonica.com/"
-DOWNLOAD="https://github.com/DanBloomberg/leptonica/archive/1.79.0/leptonica-1.79.0.tar.gz"
-MD5SUM="22f87191b5f35161598734a413d20cc2"
+DOWNLOAD="https://github.com/DanBloomberg/leptonica/archive/1.80.0/leptonica-1.80.0.tar.gz"
+MD5SUM="12fa1e165f7ad0bd2f49423669a62143"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libQuotient/libQuotient.SlackBuild b/libraries/libQuotient/libQuotient.SlackBuild
index 20e9ce0447..52327eb8fa 100644
--- a/libraries/libQuotient/libQuotient.SlackBuild
+++ b/libraries/libQuotient/libQuotient.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libQuotient
-VERSION=${VERSION:-0.5.2}
+VERSION=${VERSION:-0.5.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libQuotient/libQuotient.info b/libraries/libQuotient/libQuotient.info
index 29942b6e77..9b78bbda9d 100644
--- a/libraries/libQuotient/libQuotient.info
+++ b/libraries/libQuotient/libQuotient.info
@@ -1,8 +1,8 @@
 PRGNAM="libQuotient"
-VERSION="0.5.2"
+VERSION="0.5.3.2"
 HOMEPAGE="https://github.com/quotient-im/libQuotient"
-DOWNLOAD="https://github.com/quotient-im/libQuotient/archive/0.5.2/libQuotient-0.5.2.tar.gz"
-MD5SUM="88eeab54ac747e362f077519ee9d8b57"
+DOWNLOAD="https://github.com/quotient-im/libQuotient/archive/0.5.3.2/libQuotient-0.5.3.2.tar.gz"
+MD5SUM="21d8b4840f489715676e380517880f34"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/libraries/libaal/libaal.SlackBuild b/libraries/libaal/libaal.SlackBuild
index 53ed14a9ed..d0f14c1998 100644
--- a/libraries/libaal/libaal.SlackBuild
+++ b/libraries/libaal/libaal.SlackBuild
@@ -2,10 +2,8 @@
 
 # Slackware build script for libaal
 
-# Written by Kurt Erickson <kurt_erickson@att.net>
-
 PRGNAM=libaal
-VERSION=${VERSION:-1.0.6}
+VERSION=${VERSION:-1.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +67,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 BUGS COPYING CREDITS ChangeLog INSTALL README THANKS TODO \
+cp -a AUTHORS BUGS COPYING CREDITS ChangeLog INSTALL NEWS README THANKS TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libaal/libaal.info b/libraries/libaal/libaal.info
index 2e9c3d748f..64fd1ba232 100644
--- a/libraries/libaal/libaal.info
+++ b/libraries/libaal/libaal.info
@@ -1,10 +1,10 @@
 PRGNAM="libaal"
-VERSION="1.0.6"
+VERSION="1.0.7"
 HOMEPAGE="https://sourceforge.net/projects/reiser4/"
-DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/libaal/libaal-1.0.6.tar.gz"
-MD5SUM="6fd5c2471e1fd3972fb23ac5dc1b77e3"
+DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/libaal/libaal-1.0.7.tar.gz"
+MD5SUM="144b5ef9f13cb43cb053cb09aef63390"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Kurt Erickson"
-EMAIL="kerickson@lavabit.com"
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
diff --git a/libraries/libaec/README b/libraries/libaec/README
index ce12cde722..7b877fef1f 100644
--- a/libraries/libaec/README
+++ b/libraries/libaec/README
@@ -1,9 +1,10 @@
-Libaec provides fast lossless compression of 1 up to 32 bit wide signed or
-unsigned integers (samples). The library achieves best results for low entropy
-data as often encountered in space imaging instrument data or numerical model
-output from weather or climate simulations. While floating point
-representations are not directly supported, they can also be efficiently coded
-by grouping exponents and mantissa.
+Libaec provides fast lossless compression of 1 up to 32 bit wide
+signed or unsigned integers (samples). The library achieves best
+results for low entropy data as often encountered in space imaging
+instrument data or numerical model output from weather or climate
+simulations. While floating point representations are not directly
+supported, they can also be efficiently coded by grouping exponents
+and mantissa.
 
 Libaec implements Golomb-Rice coding as defined in the Space Data System
 Standard documents [121.0-B-2][1] and [120.0-G-2][2].
diff --git a/libraries/libaec/slack-desc b/libraries/libaec/slack-desc
index 991de83c37..8d3b6ceb9d 100644
--- a/libraries/libaec/slack-desc
+++ b/libraries/libaec/slack-desc
@@ -15,5 +15,5 @@ libaec: instrument data or numerical model output from weather or climate
 libaec: simulations. While floating point representations are not directly
 libaec: supported, they can also be efficiently coded by grouping exponents
 libaec: and mantissa. 
-libaec: 
+libaec:
 libaec: Libaec can replace SZIP.
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/libaom/slack-desc b/libraries/libaom/slack-desc
deleted file mode 100644
index 59c23736e0..0000000000
--- a/libraries/libaom/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------------------------------------------------------|
-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:
diff --git a/libraries/libbluray/libbluray.SlackBuild b/libraries/libbluray/libbluray.SlackBuild
index f0b5ad6834..a7817f828b 100644
--- a/libraries/libbluray/libbluray.SlackBuild
+++ b/libraries/libbluray/libbluray.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libbluray
 
-# Copyright 2011-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2020 Larry Hajali <larryhaja[at]gmail[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=libbluray
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libbluray/libbluray.info b/libraries/libbluray/libbluray.info
index bde3dbcde3..4abbb88185 100644
--- a/libraries/libbluray/libbluray.info
+++ b/libraries/libbluray/libbluray.info
@@ -1,8 +1,8 @@
 PRGNAM="libbluray"
-VERSION="1.1.0"
+VERSION="1.2.0"
 HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-DOWNLOAD="http://ftp.videolan.org/pub/videolan/libbluray/1.1.0/libbluray-1.1.0.tar.bz2"
-MD5SUM="ba1aa5803a55e89f813090ec6d238635"
+DOWNLOAD="http://ftp.videolan.org/pub/videolan/libbluray/1.2.0/libbluray-1.2.0.tar.bz2"
+MD5SUM="c3a8485ed713fc09c26d24cd1e022e0c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libbson/README b/libraries/libbson/README
new file mode 100644
index 0000000000..151c173687
--- /dev/null
+++ b/libraries/libbson/README
@@ -0,0 +1,10 @@
+A cross platform BSON Library for C
+
+libbson builds, parses, and iterates BSON documents, the native data
+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
new file mode 100644
index 0000000000..77fccbf0aa
--- /dev/null
+++ b/libraries/libbson/libbson.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for libbson
+
+# 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=libbson
+SRCNAM=mongo-c-driver
+VERSION=${VERSION:-1.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 $TMP/$PKGNAM-$VERSION $PKG
+mkdir -p $TMP/$PKGNAM-$VERSION $PKG $OUTPUT
+cd $TMP/$PKGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+
+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 {} \;
+
+PDOCS=""
+MkDOCS=""
+if [ "${DOCS:-no}" = "yes" ]; then
+  PDOCS="-DENABLE_MAN_PAGES=ON -DENABLE_HTML_DOCS=ON"
+  MkDOCS="bson-doc"
+fi
+
+cd $SRCNAM-$VERSION/build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_STATIC=OFF \
+    -DENABLE_TESTS=OFF \
+    -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
+    -DENABLE_MONGOC=OFF \
+    $PDOCS \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make $MkDOCS
+  make install DESTDIR=$PKG
+cd ..
+
+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
+
+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
+
+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
+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/libbson/libbson.info b/libraries/libbson/libbson.info
new file mode 100644
index 0000000000..91ce2421d6
--- /dev/null
+++ b/libraries/libbson/libbson.info
@@ -0,0 +1,10 @@
+PRGNAM="libbson"
+VERSION="1.17.3"
+HOMEPAGE="https://mongoc.org/libbson/current/index.html"
+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=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/libraries/libbson/slack-desc b/libraries/libbson/slack-desc
new file mode 100644
index 0000000000..291f5fe177
--- /dev/null
+++ b/libraries/libbson/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------------------------------------------------------|
+libbson: libbson (a cross platform BSON Library for C)
+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: 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/libcapsimage/README b/libraries/libcapsimage/README
new file mode 100644
index 0000000000..e34dd5f2a5
--- /dev/null
+++ b/libraries/libcapsimage/README
@@ -0,0 +1,12 @@
+libcapsimage (decoder library for KyroFlux CTR and IPF disk images)
+
+libcapsimage is a support library that allows applications to access
+low-level disk image files stored in the IPF (Interchange Preservation
+Format) and CTR ("CT Raw") formats. This library is also known as the
+"SPS Decoder Library", spsdeclib, and was formerly known as ipflib.
+
+In particular, this library allows hatari (and various other emulators)
+to use the low-level IPF and CTR dumps found on many ST archive sites.
+
+This is not free software: read /usr/doc/libcapsimage-$VERSION/LICENCE.txt
+for details. The short version is that it's free for non-commercial use.
diff --git a/libraries/libcapsimage/libcapsimage.SlackBuild b/libraries/libcapsimage/libcapsimage.SlackBuild
new file mode 100644
index 0000000000..879f493111
--- /dev/null
+++ b/libraries/libcapsimage/libcapsimage.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Slackware build script for libcapsimage
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# This software goes by many names. I've chosen to name the package
+# after the shared library it installs.
+
+# Currently this only exists for hatari to use. If you're going to use
+# it as a dep for your SlackBuild:
+# - You'll want to make sure it looks for headers in /usr/include/caps5,
+#   probly with a -I option in CFLAGS.
+# - The library is in the normal place, /usr/lib(64), so the only linker
+#   flag you'll need (if it's not there already) is -lcapsimage.
+# - Some software might want to call it -lcapsimg, just sed your Makefile
+#   or whatever's needed.
+# - The license for libcapsimage isn't GPL-compatible: it's "free for
+#   non-commercial use". This shouldn't stop you or your users from
+#   building and using packages, but you should note in your README if
+#   the package is non-redistributable. I don't know if this affects
+#   other licenses such as BSD or MIT.
+# - The only other problem you might run into is that your software
+#   might be written for version 4.x, which is totally different (this
+#   script can't build it). If there's any interest, I'll do a build
+#   for that as well.
+# If you do use this as a dependency for your build, let me know, I'm
+# interested.
+
+PRGNAM=libcapsimage
+VERSION=${VERSION:-5.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=spsdeclib
+
+# Yo dawg, I herd you like zip files, so I put a zip file in your zip
+# file, so you can unzip while you unzip.
+INNERDIR=capsimg_source_linux_macosx
+INNERZIP="$INNERDIR.zip"
+
+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
+cd $PRGNAM-$VERSION
+unzip -a $CWD/${SRCNAM}_${VERSION}_source.zip $INNERZIP '*.txt'
+unzip -a $INNERZIP
+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 {} \+
+
+cd $INNERDIR/CAPSImg
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+sh ./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' is useless, so:
+PKGLIB=$PKG/usr/lib$LIBDIRSUFFIX
+mkdir -p $PKGLIB
+install -s -m0755 $PRGNAM.so.$VERSION $PKGLIB
+ln -s $PRGNAM.so.$VERSION $PKGLIB/$PRGNAM.so
+# The .so.5 link is made by ldconfig at package install time.
+
+# List of headers came from peeking at the windows binary build. Also it's
+# the same set of headers hatari's readme.txt says it needs. I'm installing
+# them where hatari expects to find them. Since this stuff was ported from
+# Windows, it's littered with MS-specific __cdecl attributes which we
+# don't need on Linux, so zap them.
+mkdir -p $PKG/usr/include/caps5
+cd ..
+install -m0644 LibIPF/*.h Core/CommonTypes.h $PKG/usr/include/caps5
+sed -i 's,__cdecl,,g' $PKG/usr/include/caps5/*.h
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cd ..
+cp -a *.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/libraries/libcapsimage/libcapsimage.info b/libraries/libcapsimage/libcapsimage.info
new file mode 100644
index 0000000000..92883471b2
--- /dev/null
+++ b/libraries/libcapsimage/libcapsimage.info
@@ -0,0 +1,10 @@
+PRGNAM="libcapsimage"
+VERSION="5.1"
+HOMEPAGE="http://www.kryoflux.com/"
+DOWNLOAD="http://www.kryoflux.com/download/spsdeclib_5.1_source.zip"
+MD5SUM="27710eb05d4391560addeeb970ea1d45"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/libcapsimage/slack-desc b/libraries/libcapsimage/slack-desc
new file mode 100644
index 0000000000..43795935b2
--- /dev/null
+++ b/libraries/libcapsimage/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------------------------------------------------------|
+libcapsimage: libcapsimage (decoder library for KyroFlux CTR and IPF disk images)
+libcapsimage:
+libcapsimage: libcapsimage is a support library that allows applications to access
+libcapsimage: low-level disk image files stored in the IPF (Interchange Preservation
+libcapsimage: Format) and CTR ("CT Raw") formats. This library is also known as the
+libcapsimage: "SPS Decoder Library", spsdeclib, and was formerly known as ipflib.
+libcapsimage:
+libcapsimage:
+libcapsimage:
+libcapsimage:
+libcapsimage:
diff --git a/libraries/libcbor/libcbor.SlackBuild b/libraries/libcbor/libcbor.SlackBuild
index 9af63b8ef9..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.5.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 9d598f3678..cfdb88deb7 100644
--- a/libraries/libcbor/libcbor.info
+++ b/libraries/libcbor/libcbor.info
@@ -1,8 +1,8 @@
 PRGNAM="libcbor"
-VERSION="0.5.0"
+VERSION="0.8.0"
 HOMEPAGE="https://github.com/PJK/libcbor"
-DOWNLOAD="https://github.com/PJK/libcbor/archive/v0.5.0/libcbor-0.5.0.tar.gz"
-MD5SUM="801a17e95592b39beecb2406604f5ba3"
+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/libcec/libcec.SlackBuild b/libraries/libcec/libcec.SlackBuild
index 7c1d57140c..1e3d3ed19e 100644
--- a/libraries/libcec/libcec.SlackBuild
+++ b/libraries/libcec/libcec.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libcec
 
-# Copyright 2011-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2020 Larry Hajali <larryhaja[at]gmail[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=libcec
-VERSION=${VERSION:-4.0.3}
+VERSION=${VERSION:-4.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libcec/libcec.info b/libraries/libcec/libcec.info
index 9a7551bbea..b1b08d4473 100644
--- a/libraries/libcec/libcec.info
+++ b/libraries/libcec/libcec.info
@@ -1,8 +1,8 @@
 PRGNAM="libcec"
-VERSION="4.0.3"
+VERSION="4.0.4"
 HOMEPAGE="http://libcec.pulse-eight.com/"
-DOWNLOAD="https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.3/libcec-libcec-4.0.3.tar.gz"
-MD5SUM="37671243f29241ca070c8c795b265b19"
+DOWNLOAD="https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.4/libcec-libcec-4.0.4.tar.gz"
+MD5SUM="68bb5aa90857fb5436795f2cfc163e0c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="platform"
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 e9b12c4503..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.4.1}
+VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libcpuid/libcpuid.info b/libraries/libcpuid/libcpuid.info
index 322b1d6c7b..7863b7c7e9 100644
--- a/libraries/libcpuid/libcpuid.info
+++ b/libraries/libcpuid/libcpuid.info
@@ -1,8 +1,8 @@
 PRGNAM="libcpuid"
-VERSION="0.4.1"
+VERSION="0.5.1"
 HOMEPAGE="http://libcpuid.sourceforge.net"
-DOWNLOAD="https://github.com/anrieff/libcpuid/archive/v0.4.1/libcpuid-0.4.1.tar.gz"
-MD5SUM="e9ffa7413e14039823ddd7452500ded9"
+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/libctl/libctl.SlackBuild b/libraries/libctl/libctl.SlackBuild
index 9169f4aca1..bd05d8284f 100644
--- a/libraries/libctl/libctl.SlackBuild
+++ b/libraries/libctl/libctl.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libctl
-VERSION=${VERSION:-4.4.0}
+VERSION=${VERSION:-4.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,7 +74,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 {} \;
 
+
 LOCALCONFIGS="--enable-shared"
+XDBFILE=/etc/sbo_pkg_options.conf
+if [ -f ${XDBFILE} ] ; then
+  LOCALCONFIGS=${LOCALCONFIGS}" "$(grep "^${PRGNAM}:" ${XDBFILE} | grep -v '^#' | awk -F: '{print$2}')
+  echo Build options selected by file: LOCALCONFIGS=${LOCALCONFIGS}
+fi
+if [  -n "${SBOPTIONS_LIBCTL}" ] ; then
+  LOCALCONFIGS=${LOCALCONFIGS}" "${SBOPTIONS_LIBCTL}
+  echo Build options selected by environment: LOCALCONFIGS=${LOCALCONFIGS}
+fi
 
 CFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
@@ -103,5 +113,6 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 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/libctl/libctl.info b/libraries/libctl/libctl.info
index bc3b1e4ae5..3a33956139 100644
--- a/libraries/libctl/libctl.info
+++ b/libraries/libctl/libctl.info
@@ -1,8 +1,8 @@
 PRGNAM="libctl"
-VERSION="4.4.0"
+VERSION="4.5.0"
 HOMEPAGE="https://github.com/NanoComp/libctl"
-DOWNLOAD="https://github.com/NanoComp/libctl/releases/download/v4.4.0/libctl-4.4.0.tar.gz"
-MD5SUM="948a818ddd6dfb8256dcdc1e9fa1dc1e"
+DOWNLOAD="https://github.com/NanoComp/libctl/releases/download/v4.5.0/libctl-4.5.0.tar.gz"
+MD5SUM="5ea178b99c2b79e1e5f51ee616007757"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libde265/README b/libraries/libde265/README
new file mode 100644
index 0000000000..a52dbf5699
--- /dev/null
+++ b/libraries/libde265/README
@@ -0,0 +1,10 @@
+libde265 is an open source implementation of the h.265 video codec. It
+is written from scratch and has a plain C API to enable a simple
+integration into other software.
+
+By default, sherlock265 visual inspection program is not built.
+
+Building of sherlock265 can be enabled by setting the SHERLOCK265
+environment variable to "yes": SHERLOCK265=yes ./libde265.SlackBuild
+This requires ffmpeg or ffmpeg4. If qt5 is installed sherlock265 will be
+built with qt5 instead of qt4.
diff --git a/libraries/libde265/libde265.SlackBuild b/libraries/libde265/libde265.SlackBuild
new file mode 100644
index 0000000000..6f19eea06b
--- /dev/null
+++ b/libraries/libde265/libde265.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for libde265
+
+# 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=libde265
+VERSION=${VERSION:-1.0.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}
+
+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 {} \;
+
+SHERLOCK265="${SHERLOCK265:-no}"
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --enable-sherlock265=$SHERLOCK265 \
+  --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 AUTHORS  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/libde265/libde265.info b/libraries/libde265/libde265.info
new file mode 100644
index 0000000000..dea33b2de1
--- /dev/null
+++ b/libraries/libde265/libde265.info
@@ -0,0 +1,10 @@
+PRGNAM="libde265"
+VERSION="1.0.8"
+HOMEPAGE="https://github.com/strukturag/libde265"
+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=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/libraries/libde265/slack-desc b/libraries/libde265/slack-desc
new file mode 100644
index 0000000000..348db4000f
--- /dev/null
+++ b/libraries/libde265/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------------------------------------------------------|
+libde265: libde265 (open h.265 codec implementation)
+libde265:
+libde265:
+libde265: libde265 is an open source implementation of the h.265 video codec.
+libde265: It is written from scratch and has a plain C API to enable a simple
+libde265: integration into other software.
+libde265:
+libde265:
+libde265: Homepage: https://github.com/strukturag/libde265
+libde265:
+libde265:
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/libedit/README b/libraries/libedit/README
index 026d498ff5..b1bcec0aea 100644
--- a/libraries/libedit/README
+++ b/libraries/libedit/README
@@ -1,11 +1,12 @@
-This is an autotool- and libtoolized port of the NetBSD Editline
-library (libedit). This Berkeley-style licensed command line editor
-library provides generic line editing, history, and tokenization
-functions, similar to those found in GNU Readline.
+This is an autotool- and libtoolized port of the NetBSD Editline library
+(libedit). This Berkeley-style licensed command line editor library
+provides generic line editing, history, and tokenization functions,
+similar to those found in GNU Readline.
 
-The slackbuild has a build time variable called LIBEDIT_WIDEC, which if set to
-`yes', turns on the wide character support of the built libedit library.
-Although the support is there, initial testing shows that it acts weird, and
-displays Unicode byte sequences instead of the real typed-in characters. You
-can experiment with it, but don't count on it until it is cleared up.
-The default build option was and is disabled widechar support.
+The slackbuild has a build time variable called LIBEDIT_WIDEC, which if
+set to `yes', turns on the wide character support of the built libedit
+library.  Although the support is there, initial testing shows that it
+acts weird, and displays Unicode byte sequences instead of the real
+typed-in characters. You can experiment with it, but don't count on it
+until it is cleared up.  The default build option was and is disabled
+widechar support.
diff --git a/libraries/libedit/libedit.SlackBuild b/libraries/libedit/libedit.SlackBuild
index f27b861524..d8786407b9 100644
--- a/libraries/libedit/libedit.SlackBuild
+++ b/libraries/libedit/libedit.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware build script for libedit
 
 # Copyright 2011 Mikko Värri, Finland
-# Copyright 2013-2019 LEVAI Daniel <leva@ecentrum.hu>
+# Copyright 2013-2019 LEVAI Daniel
+# Copyright 2020 Donald Cooley, South Haven, Indiana, USA
 # 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=libedit
-VERSION=${VERSION:-20190324_3.1}
+VERSION=${VERSION:-20191231_3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,7 +87,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --disable-static \
   --build=$ARCH-slackware-linux \
-  "${LIBEDIT_WIDEC}"
 
 make
 make install-strip DESTDIR=$PKG
diff --git a/libraries/libedit/libedit.info b/libraries/libedit/libedit.info
index c9a4f11e3e..769d994479 100644
--- a/libraries/libedit/libedit.info
+++ b/libraries/libedit/libedit.info
@@ -1,10 +1,10 @@
 PRGNAM="libedit"
-VERSION="20190324_3.1"
-HOMEPAGE="http://www.thrysoee.dk/editline/"
-DOWNLOAD="http://thrysoee.dk/editline/libedit-20190324-3.1.tar.gz"
-MD5SUM="bec755c8044ad84b752dfe49a0b371d8"
+VERSION="20191231_3.1"
+HOMEPAGE="https://www.thrysoee.dk/editline/"
+DOWNLOAD="https://thrysoee.dk/editline/libedit-20191231-3.1.tar.gz"
+MD5SUM="2e22a51131de94ff2df24901f7cfe416"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="LEVAI Daniel"
-EMAIL="leva@ecentrum.hu"
+MAINTAINER="Donald Cooley"
+EMAIL="chytraeu@sdf.org"
diff --git a/libraries/libedit/slack-desc b/libraries/libedit/slack-desc
index e500ae85a3..b2d9e4a965 100644
--- a/libraries/libedit/slack-desc
+++ b/libraries/libedit/slack-desc
@@ -13,7 +13,7 @@ libedit: library (libedit). This Berkeley-style licensed command line editor
 libedit: library provides generic line editing, history, and tokenization
 libedit: functions, similar to those found in GNU Readline.
 libedit:
-libedit: Homepage: http://www.thrysoee.dk/editline/
+libedit: Homepage: https://www.thrysoee.dk/editline/
 libedit:
 libedit:
 libedit:
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/libev/libev.SlackBuild b/libraries/libev/libev.SlackBuild
index a740e2ed67..54cd2b7b44 100644
--- a/libraries/libev/libev.SlackBuild
+++ b/libraries/libev/libev.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libev
-VERSION=${VERSION:-4.31}
+VERSION=${VERSION:-4.33}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libev/libev.info b/libraries/libev/libev.info
index 1e9e187cf3..a603f1c17c 100644
--- a/libraries/libev/libev.info
+++ b/libraries/libev/libev.info
@@ -1,8 +1,8 @@
 PRGNAM="libev"
-VERSION="4.31"
+VERSION="4.33"
 HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
-DOWNLOAD="http://dist.schmorp.de/libev/Attic/libev-4.31.tar.gz"
-MD5SUM="20111fda0df0a289c152faa2aac91b08"
+DOWNLOAD="http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz"
+MD5SUM="a3433f23583167081bf4acdd5b01b34f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/libfixposix/README b/libraries/libfixposix/README
index b106e433a7..8f5f59c171 100644
--- a/libraries/libfixposix/README
+++ b/libraries/libfixposix/README
@@ -1,4 +1,4 @@
 The purpose of libfixposix is to offer replacements for parts of POSIX
 whose behaviour is inconsistent across *NIX flavours.
 
-Libfixposix required by 'iolib' common-lisp library.
\ No newline at end of file
+Libfixposix is required by the 'iolib' common-lisp library.
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/libgee/libgee.SlackBuild b/libraries/libgee/libgee.SlackBuild
index b9c5911fea..628ce277e2 100644
--- a/libraries/libgee/libgee.SlackBuild
+++ b/libraries/libgee/libgee.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for libgee
 
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
-# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2011-2020 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=libgee
-VERSION=${VERSION:-0.20.2}
+VERSION=${VERSION:-0.20.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libgee/libgee.info b/libraries/libgee/libgee.info
index 66009642dc..1c5edb8e8c 100644
--- a/libraries/libgee/libgee.info
+++ b/libraries/libgee/libgee.info
@@ -1,8 +1,8 @@
 PRGNAM="libgee"
-VERSION="0.20.2"
+VERSION="0.20.3"
 HOMEPAGE="https://live.gnome.org/Libgee"
-DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/libgee/0.20/libgee-0.20.2.tar.xz"
-MD5SUM="45db478f2b300ada8e039ebc6c9458de"
+DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/libgee/0.20/libgee-0.20.3.tar.xz"
+MD5SUM="e574b3952b93d219b5ec7c74c5892c33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="vala"
diff --git a/libraries/libgit2-glib/detect-libgit2-version.patch b/libraries/libgit2-glib/detect-libgit2-version.patch
new file mode 100644
index 0000000000..5e285c9cff
--- /dev/null
+++ b/libraries/libgit2-glib/detect-libgit2-version.patch
@@ -0,0 +1,141 @@
+diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-clone-options.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-clone-options.c
+--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-clone-options.c	2019-04-24 04:18:53.000000000 +0000
++++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-clone-options.c	2020-05-02 03:01:42.273450898 +0000
+@@ -149,7 +149,7 @@
+ 
+ 	if (error != NULL)
+ 	{
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 		git_error_set_str (GIT_ERROR, error->message);
+ #else
+ 		giterr_set_str (GIT_ERROR, error->message);
+@@ -191,7 +191,7 @@
+ 
+ 	if (error)
+ 	{
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 		git_error_set_str (GIT_ERROR, error->message);
+ #else
+ 		giterr_set_str (GIT_ERROR, error->message);
+diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-config.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-config.c
+--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-config.c	2019-04-24 04:18:53.000000000 +0000
++++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-config.c	2020-05-02 03:10:08.034437972 +0000
+@@ -191,7 +191,7 @@
+ 	if (git_config_find_global (&buf) == GIT_OK)
+ 	{
+ 		path = g_file_new_for_path (buf.ptr);
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 		git_buf_dispose (&buf);
+ #else
+ 		git_buf_free (&buf);
+@@ -224,7 +224,7 @@
+ 	if (git_config_find_system (&buf) == GIT_OK)
+ 	{
+ 		path = g_file_new_for_path (buf.ptr);
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 		git_buf_dispose (&buf);
+ #else
+ 		git_buf_free (&buf);
+@@ -303,7 +303,7 @@
+ 	ret = git_config_add_file_ondisk (_ggit_native_get (config),
+ 	                                  path,
+ 	                                  (git_config_level_t)level,
+-#if LIBGIT2_SOVERSION >= 27
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 27)
+ 	                                  NULL,
+ #endif
+ 	                                  force);
+diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-diff.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-diff.c
+--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-diff.c	2019-04-24 04:18:53.000000000 +0000
++++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-diff.c	2020-05-02 03:04:17.745446924 +0000
+@@ -786,7 +786,7 @@
+ 
+ 	if (ret != GIT_OK)
+ 	{
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 		git_buf_dispose (&buf);
+ #else
+ 		git_buf_free (&buf);
+@@ -796,7 +796,7 @@
+ 	}
+ 
+ 	retval = g_strndup (buf.ptr, buf.size);
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 	git_buf_dispose (&buf);
+ #else
+ 	git_buf_free (&buf);
+diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-error.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-error.c
+--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-error.c	2019-04-24 04:18:53.000000000 +0000
++++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-error.c	2020-05-02 03:05:09.952445590 +0000
+@@ -51,7 +51,7 @@
+ 	g_return_if_fail (err < 0);
+ 
+ 	/* TODO: add more kind of errors, see git_error_t */
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 	git2_err = git_error_last ();
+ #else
+ 	git2_err = giterr_last ();
+diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-message.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-message.c
+--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-message.c	2019-04-24 04:18:53.000000000 +0000
++++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-message.c	2020-05-02 03:05:44.877444697 +0000
+@@ -46,7 +46,7 @@
+ 	git_message_prettify (&buf, message, strip_comments, comment_char);
+ 
+ 	d = g_strdup (buf.ptr);
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 	git_buf_dispose (&buf);
+ #else
+ 	git_buf_free (&buf);
+diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-patch.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-patch.c
+--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-patch.c	2019-04-24 04:18:53.000000000 +0000
++++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-patch.c	2020-05-02 03:06:32.489443481 +0000
+@@ -194,7 +194,7 @@
+ 	if (ret == GIT_OK)
+ 	{
+ 		result = g_strdup (buf.ptr);
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 		git_buf_dispose (&buf);
+ #else
+ 		git_buf_free (&buf);
+diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-remote-callbacks.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-remote-callbacks.c
+--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-remote-callbacks.c	2019-04-24 04:18:53.000000000 +0000
++++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-remote-callbacks.c	2020-05-02 03:07:14.164442416 +0000
+@@ -160,7 +160,7 @@
+ 		{
+ 			if (error)
+ 			{
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 				git_error_set_str (GIT_ERROR, error->message);
+ #else
+ 				giterr_set_str (GIT_ERROR, error->message);
+diff -Naur libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-repository.c libgit2-glib-0.28.0.1/libgit2-glib/ggit-repository.c
+--- libgit2-glib-0.28.0.1.orig/libgit2-glib/ggit-repository.c	2019-04-24 04:18:53.000000000 +0000
++++ libgit2-glib-0.28.0.1/libgit2-glib/ggit-repository.c	2020-05-02 03:08:08.018441039 +0000
+@@ -1013,7 +1013,7 @@
+ 	if (ret == GIT_OK)
+ 	{
+ 		rep = g_file_new_for_path (buf.ptr);
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 		git_buf_dispose (&buf);
+ #else
+ 		git_buf_free (&buf);
+@@ -3684,7 +3684,7 @@
+ 	}
+ 
+ 	ref = g_strdup (buf.ptr);
+-#if LIBGIT2_SOVERSION >= 28
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
+ 	git_buf_dispose (&buf);
+ #else
+ 	git_buf_free (&buf);
diff --git a/libraries/libgit2-glib/libgit2-glib.SlackBuild b/libraries/libgit2-glib/libgit2-glib.SlackBuild
index 6c30ce25b8..037d117b38 100644
--- a/libraries/libgit2-glib/libgit2-glib.SlackBuild
+++ b/libraries/libgit2-glib/libgit2-glib.SlackBuild
@@ -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 {} \;
 
+# Build against libgit2 version >= 1.0
+patch -p1 < $CWD/detect-libgit2-version.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 meson build \
diff --git a/libraries/libgit2/libgit2.SlackBuild b/libraries/libgit2/libgit2.SlackBuild
index 1415b0a664..03a124fa8a 100644
--- a/libraries/libgit2/libgit2.SlackBuild
+++ b/libraries/libgit2/libgit2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libgit2
 
-# Copyright 2014-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2020 Larry Hajali <larryhaja[at]gmail[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=libgit2
-VERSION=${VERSION:-0.28.3}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,10 @@ cd build
     -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DUSE_ICONV:BOOL=ON \
+    -DREGEX_BACKEND=pcre \
+    -DUSE_SHA1=HTTPS \
+    -DUSE_HTTPS=OpenSSL \
+    -DUSE_NTLMCLIENT=OFF \
     -DLIB_INSTALL_DIR:PATH="lib${LIBDIRSUFFIX}" \
     -DCMAKE_BUILD_TYPE=Release ..
 
diff --git a/libraries/libgit2/libgit2.info b/libraries/libgit2/libgit2.info
index d41170e588..d32bf1ebb1 100644
--- a/libraries/libgit2/libgit2.info
+++ b/libraries/libgit2/libgit2.info
@@ -1,8 +1,8 @@
 PRGNAM="libgit2"
-VERSION="0.28.3"
+VERSION="1.0.0"
 HOMEPAGE="https://libgit2.github.com/"
-DOWNLOAD="https://github.com/libgit2/libgit2/archive/v0.28.3/libgit2-0.28.3.tar.gz"
-MD5SUM="f9f2a2a2da09b4cdb8b1a596eb799179"
+DOWNLOAD="https://github.com/libgit2/libgit2/archive/v1.0.0/libgit2-1.0.0.tar.gz"
+MD5SUM="5ce9b630203573e544d663cbd750040f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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.SlackBuild b/libraries/libgltf/libgltf.SlackBuild
deleted file mode 100644
index e3359ce345..0000000000
--- a/libraries/libgltf/libgltf.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libgltf
-
-# Copyright 2015, 2017 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=libgltf
-VERSION=${VERSION:-0.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 -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 {} \;
-
-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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog LICENSE 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/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/libgltf/slack-desc b/libraries/libgltf/slack-desc
deleted file mode 100644
index a83e233a21..0000000000
--- a/libraries/libgltf/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------------------------------------------------------|
-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:
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/README b/libraries/libheif/README
new file mode 100644
index 0000000000..f94b3cc95f
--- /dev/null
+++ b/libraries/libheif/README
@@ -0,0 +1,13 @@
+libheif is an ISO/IEC 23008-12:2017 HEIF and AVIF (AV1 Image File
+Format) file format decoder and encoder.
+
+HEIF and AVIF are new image file formats employing HEVC (h.265) or AV1
+image coding, respectively, for the best compression ratios currently
+possible. HEIF is the default image file format on Apple devices. This
+library comes with some example programs including heif-convert that
+converts HEIF/AVIF images to JPEG or PNG.
+
+libheif makes use of libde265 for HEIF image decoding and x265 for
+encoding. For AVIF, libaom is used as codec.
+
+google-go-lang is needed only at build time.
diff --git a/libraries/libheif/doinst.sh b/libraries/libheif/doinst.sh
new file mode 100644
index 0000000000..aa30ae34d7
--- /dev/null
+++ b/libraries/libheif/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
diff --git a/libraries/libheif/libheif.SlackBuild b/libraries/libheif/libheif.SlackBuild
new file mode 100644
index 0000000000..dce2a3567b
--- /dev/null
+++ b/libraries/libheif/libheif.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for libheif
+
+# 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=libheif
+VERSION=${VERSION:-1.10.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 \
+  --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 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/libraries/libheif/libheif.info b/libraries/libheif/libheif.info
new file mode 100644
index 0000000000..bef047e2ef
--- /dev/null
+++ b/libraries/libheif/libheif.info
@@ -0,0 +1,10 @@
+PRGNAM="libheif"
+VERSION="1.10.0"
+HOMEPAGE="https://github.com/strukturag/libheif"
+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 aom google-go-lang"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/libraries/libheif/slack-desc b/libraries/libheif/slack-desc
new file mode 100644
index 0000000000..5cf3783bd3
--- /dev/null
+++ b/libraries/libheif/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------------------------------------------------------|
+libheif: libheif (HEIF and AVIF file format decoder and encoder)
+libheif:
+libheif: libheif is an ISO/IEC 23008-12:2017 HEIF and AVIF (AV1 Image File
+libheif: Format) file format decoder and encoder.  HEIF and AVIF are new image
+libheif: file formats employing HEVC (h.265) or AV1 image coding, respectively,
+libheif: for the best compression ratios currently possible. HEIF is the
+libheif: default image file format on Apple devices. libheif makes use of
+libheif: libde265 for HEIF image decoding and x265 for encoding. For AVIF,
+libheif: libaom is used as codec.
+libheif:
+libheif: homepage: https://github.com/strukturag/libheif
diff --git a/libraries/libinput/libinput.SlackBuild b/libraries/libinput/libinput.SlackBuild
index e40c11d35b..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.15.4}
+VERSION=${VERSION:-1.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libinput/libinput.info b/libraries/libinput/libinput.info
index fc07556178..4a64c2eb96 100644
--- a/libraries/libinput/libinput.info
+++ b/libraries/libinput/libinput.info
@@ -1,8 +1,8 @@
 PRGNAM="libinput"
-VERSION="1.15.4"
+VERSION="1.17.1"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput"
-DOWNLOAD="https://www.freedesktop.org/software/libinput/libinput-1.15.4.tar.xz"
-MD5SUM="76c5cb1a55f5098ed353ae7d4e054c50"
+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/libinput/slack-desc b/libraries/libinput/slack-desc
index 385f7da66f..bd32ce654d 100644
--- a/libraries/libinput/slack-desc
+++ b/libraries/libinput/slack-desc
@@ -11,7 +11,7 @@ libinput:
 libinput: libinput is a library to handle input devices in  Wayland compositors
 libinput: and to provide a generic X.Org input driver.
 libinput:
-libinput: Home page:  http://www.freedesktop.org/wiki/Software/libinput/
+libinput: Home page:  https://www.freedesktop.org/wiki/Software/libinput/
 libinput:
 libinput:
 libinput:
diff --git a/libraries/libinstpatch/libinstpatch.SlackBuild b/libraries/libinstpatch/libinstpatch.SlackBuild
index 01705e3e25..72f1e900ed 100644
--- a/libraries/libinstpatch/libinstpatch.SlackBuild
+++ b/libraries/libinstpatch/libinstpatch.SlackBuild
@@ -3,12 +3,12 @@
 # Written by Michales Michaloudes korgie@gmail.com
 
 PRGNAM=libinstpatch
-VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.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
@@ -18,8 +18,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"
@@ -42,23 +42,15 @@ 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 {} \;
-
-LDFLAGS="-lgobject-2.0 -lglib-2.0" \
-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
+ \( -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" \
+	-DCMAKE_INSTALL_PREFIX=/usr
 make
 make install DESTDIR=$PKG
 
@@ -67,7 +59,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ABOUT-NLS CVS-HOWTO INSTALL NEWS AUTHORS COPYING ChangeLog README \
+  ABOUT-NLS AUTHORS COPYING ChangeLog README.md TODO.tasks \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libinstpatch/libinstpatch.info b/libraries/libinstpatch/libinstpatch.info
index ab654aec86..9fe279a2eb 100644
--- a/libraries/libinstpatch/libinstpatch.info
+++ b/libraries/libinstpatch/libinstpatch.info
@@ -1,8 +1,8 @@
 PRGNAM="libinstpatch"
-VERSION="1.0.0"
+VERSION="1.1.2"
 HOMEPAGE="http://swamiproject.org"
-DOWNLOAD="http://downloads.sourceforge.net/swami/libinstpatch-1.0.0.tar.gz"
-MD5SUM="eca9c505fd0c47fd1f59d40598e8eb63"
+DOWNLOAD="https://github.com/swami/libinstpatch/archive/v1.1.2/libinstpatch-1.1.2.tar.gz"
+MD5SUM="1987bec70432b308ad161e0618c51160"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/liblo/liblo.SlackBuild b/libraries/liblo/liblo.SlackBuild
index f23fc1bdfd..c526bf9916 100644
--- a/libraries/liblo/liblo.SlackBuild
+++ b/libraries/liblo/liblo.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for liblo
 
 # Copyright 2007-2014 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2018-2019 Matteo Bernardini, Pisa, Italy
+# Copyright 2018-2020 Matteo Bernardini, 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=liblo
-VERSION=${VERSION:-0.30}
+VERSION=${VERSION:-0.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/liblo/liblo.info b/libraries/liblo/liblo.info
index e211518857..ddbd4f1e34 100644
--- a/libraries/liblo/liblo.info
+++ b/libraries/liblo/liblo.info
@@ -1,8 +1,8 @@
 PRGNAM="liblo"
-VERSION="0.30"
+VERSION="0.31"
 HOMEPAGE="http://liblo.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/liblo/liblo-0.30.tar.gz"
-MD5SUM="fa1a9d45f86fc18fb54019f670ff2262"
+DOWNLOAD="http://downloads.sourceforge.net/liblo/liblo-0.31.tar.gz"
+MD5SUM="14378c1e74c58e777fbb4fcf33ac5315"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libmediainfo/libmediainfo.SlackBuild b/libraries/libmediainfo/libmediainfo.SlackBuild
index 2212fe6f85..901ef2efc7 100644
--- a/libraries/libmediainfo/libmediainfo.SlackBuild
+++ b/libraries/libmediainfo/libmediainfo.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
 # Copyright 2012-2017  Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-# Copyright 2017-2019  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2020  Jeremy Hansen <jebrhansen+SBo -at- gmail.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=libmediainfo
-VERSION=${VERSION:-19.09}
+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 0361c4f9af..4169ca961a 100644
--- a/libraries/libmediainfo/libmediainfo.info
+++ b/libraries/libmediainfo/libmediainfo.info
@@ -1,8 +1,8 @@
 PRGNAM="libmediainfo"
-VERSION="19.09"
+VERSION="20.09"
 HOMEPAGE="https://mediaarea.net/MediaInfo"
-DOWNLOAD="https://github.com/MediaArea/MediaInfoLib/archive/v19.09/MediaInfoLib-19.09.tar.gz"
-MD5SUM="5d24b2fcc3c551e070b5dd6192424a4b"
+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/libmicrohttpd/libmicrohttpd.SlackBuild b/libraries/libmicrohttpd/libmicrohttpd.SlackBuild
index 668f5f9234..6ca580d061 100644
--- a/libraries/libmicrohttpd/libmicrohttpd.SlackBuild
+++ b/libraries/libmicrohttpd/libmicrohttpd.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for libmicrohttpd.
 #
 # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015,2017 Kent Fritz <fritz.kent@gmail.com>
+# Copyright 2015,2017,2020 Kent Fritz <fritz.kent@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=libmicrohttpd
-VERSION=${VERSION:-0.9.55}
+VERSION=${VERSION:-0.9.70}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libmicrohttpd/libmicrohttpd.info b/libraries/libmicrohttpd/libmicrohttpd.info
index 1d20cf833e..c265ec1471 100644
--- a/libraries/libmicrohttpd/libmicrohttpd.info
+++ b/libraries/libmicrohttpd/libmicrohttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="libmicrohttpd"
-VERSION="0.9.55"
+VERSION="0.9.70"
 HOMEPAGE="http://www.gnu.org/software/libmicrohttpd/"
-DOWNLOAD="http://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-0.9.55.tar.gz"
-MD5SUM="1c20f84a8b9cf692dd50b558b3571a3a"
+DOWNLOAD="http://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-0.9.70.tar.gz"
+MD5SUM="dcd6045ecb4ea18c120afedccbd1da74"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libmrss/libmrss.info b/libraries/libmrss/libmrss.info
index 63f054ec2b..b26195ac28 100644
--- a/libraries/libmrss/libmrss.info
+++ b/libraries/libmrss/libmrss.info
@@ -1,7 +1,7 @@
 PRGNAM="libmrss"
 VERSION="0.19.2"
-HOMEPAGE="http://www2.autistici.org/bakunin/codes.php"
-DOWNLOAD="http://www2.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"
+HOMEPAGE="https://www.autistici.org/bakunin/codes.php"
+DOWNLOAD="https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"
 MD5SUM="a6f66b72898d27270e3a68007f90d62b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/libosinfo/libosinfo.SlackBuild b/libraries/libosinfo/libosinfo.SlackBuild
index fc3de0b18b..ee066ea588 100644
--- a/libraries/libosinfo/libosinfo.SlackBuild
+++ b/libraries/libosinfo/libosinfo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libosinfo
 
-# Copyright 2014-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2014-2020 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=libosinfo
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,25 +74,23 @@ find -L . \
 # add slackware metadata
 patch -p1 < $CWD/add_slackware_data.patch
 
-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 \
-  --disable-tests \
-  --enable-vala \
-  --enable-introspection=yes \
-  --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-  --with-pci-ids-path=/usr/share/hwdata/pci.ids \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+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 \
+    -D with-usb-ids-path=/usr/share/hwdata/usb.ids \
+    -D with-pci-ids-path=/usr/share/hwdata/pci.ids
+  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
diff --git a/libraries/libosinfo/libosinfo.info b/libraries/libosinfo/libosinfo.info
index 2ea47982f4..ead4925ad7 100644
--- a/libraries/libosinfo/libosinfo.info
+++ b/libraries/libosinfo/libosinfo.info
@@ -1,8 +1,8 @@
 PRGNAM="libosinfo"
-VERSION="1.6.0"
+VERSION="1.8.0"
 HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/libosinfo-1.6.0.tar.gz"
-MD5SUM="f6d92dc26b1b641f59679e5eecb37887"
+DOWNLOAD="https://releases.pagure.org/libosinfo/libosinfo-1.8.0.tar.xz"
+MD5SUM="e64964aea86e40afae2ad9b5077c7378"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="osinfo-db vala"
diff --git a/libraries/libotf/libotf.SlackBuild b/libraries/libotf/libotf.SlackBuild
index ce9a3cc154..ba01dc8340 100644
--- a/libraries/libotf/libotf.SlackBuild
+++ b/libraries/libotf/libotf.SlackBuild
@@ -2,16 +2,34 @@
 
 # Slackware build script for libotf
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2010-2020 Larry Hajali <larryhaja[at]gmail[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=libotf
-VERSION=${VERSION:-0.9.13}
+VERSION=${VERSION:-0.9.16}
 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 +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,10 +64,10 @@ 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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -62,7 +80,7 @@ CFLAGS="$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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libotf/libotf.info b/libraries/libotf/libotf.info
index 494221cb68..ac064f12e4 100644
--- a/libraries/libotf/libotf.info
+++ b/libraries/libotf/libotf.info
@@ -1,8 +1,8 @@
 PRGNAM="libotf"
-VERSION="0.9.13"
+VERSION="0.9.16"
 HOMEPAGE="http://www.m17n.org/libotf/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/m17n/libotf-0.9.13.tar.gz"
-MD5SUM="99ca3857016e0bb8944776cfa16e6b2d"
+DOWNLOAD="https://download.savannah.gnu.org/releases/m17n/libotf-0.9.16.tar.gz"
+MD5SUM="9b0b708ba5de53bf83e1cb09c6a6e100"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libpaper/README b/libraries/libpaper/README
index 78db9863a9..d583e23e02 100644
--- a/libraries/libpaper/README
+++ b/libraries/libpaper/README
@@ -1,7 +1,8 @@
 libpaper is a library for handling paper characteristics.
 
-The libpaper paper-handling library automates recognition of many different
-paper types and sizes for programs that need to deal with printed output.
+The libpaper paper-handling library automates recognition of many
+different paper types and sizes for programs that need to deal with
+printed output.
 
 Pass the variable PAPERSIZE=letter|a3|a4|... to the script to set the
 preferred papersize (the default is a4).
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/libqb/libqb.SlackBuild b/libraries/libqb/libqb.SlackBuild
index 5f74f868f1..3d014894f2 100644
--- a/libraries/libqb/libqb.SlackBuild
+++ b/libraries/libqb/libqb.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libqb
 
-# Copyright 2019 Jan F. Chadima <jfch@jagda.eu>
+# Copyright 2019-2020 Jan F. Chadima <jfch@jagda.eu>
 # 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=libqb
-VERSION=${VERSION:-1.0.5}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,6 +86,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+#remove unnecessary stuff
+rm -rf $PKG/usr/bin $PKG/usr/man/man1
+
 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/libqb/libqb.info b/libraries/libqb/libqb.info
index e1cded63a6..519c01a8d2 100644
--- a/libraries/libqb/libqb.info
+++ b/libraries/libqb/libqb.info
@@ -1,8 +1,8 @@
 PRGNAM="libqb"
-VERSION="1.0.5"
+VERSION="2.0.0"
 HOMEPAGE="https://github.com/ClusterLabs/libqb"
-DOWNLOAD="https://github.com/ClusterLabs/libqb/releases/download/v1.0.5/libqb-1.0.5.tar.gz"
-MD5SUM="1495874e4a16e6e785885d7d69c26c45"
+DOWNLOAD="https://github.com/ClusterLabs/libqb/releases/download/v2.0.0/libqb-2.0.0.tar.gz"
+MD5SUM="861761df624d8f575f8010c58f52f9e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="check"
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/librsync/librsync.SlackBuild b/libraries/librsync/librsync.SlackBuild
index fc556ebe5c..c5e72154dd 100644
--- a/libraries/librsync/librsync.SlackBuild
+++ b/libraries/librsync/librsync.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for librsync.
 # Written by Lyle Sigurdson <lyle_s@myrealbox.com>.
+# Copyright 2020 Ricardo J. Barberis <ricardo.barberis@gmail.com>
 #
 # Free for any use; no warranty.
 
diff --git a/libraries/librsync/librsync.info b/libraries/librsync/librsync.info
index 518b4a653d..7af0bd8e88 100644
--- a/libraries/librsync/librsync.info
+++ b/libraries/librsync/librsync.info
@@ -6,5 +6,5 @@ MD5SUM="24cdb6b78f45e0e83766903fd4f6bc84"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Lyle Sigurdson"
-EMAIL="lyle_s@myrealbox.com"
+MAINTAINER="Ricardo J. Barberis"
+EMAIL="ricardo.barberis@gmail.com"
diff --git a/libraries/libsass/libsass.SlackBuild b/libraries/libsass/libsass.SlackBuild
index f360fe2acb..1bd0d73920 100644
--- a/libraries/libsass/libsass.SlackBuild
+++ b/libraries/libsass/libsass.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libsass
-VERSION=${VERSION:-3.6.3}
+VERSION=${VERSION:-3.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libsass/libsass.info b/libraries/libsass/libsass.info
index 92c7309d24..9ed96c3c27 100644
--- a/libraries/libsass/libsass.info
+++ b/libraries/libsass/libsass.info
@@ -1,8 +1,8 @@
 PRGNAM="libsass"
-VERSION="3.6.3"
+VERSION="3.6.4"
 HOMEPAGE="http://sass-lang.com/libsass"
-DOWNLOAD="https://github.com/sass/libsass/archive/3.6.3/libsass-3.6.3.tar.gz"
-MD5SUM="8604ef0574e18fd020ca0463f3b33b43"
+DOWNLOAD="https://github.com/sass/libsass/archive/3.6.4/libsass-3.6.4.tar.gz"
+MD5SUM="602f7ff300f41f9d456c60a67270e3e0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libseccomp/libseccomp.SlackBuild b/libraries/libseccomp/libseccomp.SlackBuild
index ef2cf5d203..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.4.3}
+VERSION=${VERSION:-2.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libseccomp/libseccomp.info b/libraries/libseccomp/libseccomp.info
index 09789a6afd..5a949e37e5 100644
--- a/libraries/libseccomp/libseccomp.info
+++ b/libraries/libseccomp/libseccomp.info
@@ -1,8 +1,8 @@
 PRGNAM="libseccomp"
-VERSION="2.4.3"
+VERSION="2.5.1"
 HOMEPAGE="https://github.com/seccomp/libseccomp"
-DOWNLOAD="https://github.com/seccomp/libseccomp/archive/v2.4.3/libseccomp-2.4.3.tar.gz"
-MD5SUM="3a2c3b7539c1b6a933c20cd1fdcb2252"
+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/libtecla/README b/libraries/libtecla/README
index 861f45758b..bcc22d90ce 100644
--- a/libraries/libtecla/README
+++ b/libraries/libtecla/README
@@ -18,4 +18,4 @@ can easily be asked to look up and complete other types of files in
 any list of directories.
 
 Note that special care has been taken to allow the use of this 
-library in threaded programs.
\ No newline at end of file
+library in threaded programs.
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-legacy/README b/libraries/libtorrent-rasterbar-legacy/README
new file mode 100644
index 0000000000..f961dfe51c
--- /dev/null
+++ b/libraries/libtorrent-rasterbar-legacy/README
@@ -0,0 +1,21 @@
+libtorrent-rasterbar is a C++ library that aims to be a good alternative
+to all the other bittorrent implementations around. It is a library and
+not a full featured client, although it comes with a working example
+client.
+
+*When upgrading, please removepkg the old version first or the python
+module will try to link against it*
+
+OPTIONS
+
+  To build examples and copy them to /usr/doc/...:
+
+  EXAMPLES=yes ./libtorrent-rasterbar-legacy.SlackBuild
+
+NOTE
+
+It is possible to build with bindings for python3 rather than python2 by
+setting the $PYTHON environmental variable, but this would involve
+rebuilding boost with bindings for python3 first.
+
+Go ahead and make my day.
diff --git a/libraries/libtorrent-rasterbar-legacy/README.SBo b/libraries/libtorrent-rasterbar-legacy/README.SBo
new file mode 100644
index 0000000000..739d87d23b
--- /dev/null
+++ b/libraries/libtorrent-rasterbar-legacy/README.SBo
@@ -0,0 +1,9 @@
+libtorrent-rasterbar 1.1.* (packaged here as libtorrent-rasterbar-
+legacy) is ABI incompatible with libtorrent-rasterbar-1.2.*. It is made
+available here because it is a build and run time dependency for
+qBittorrent.
+
+In summary: If you would like to install an older version of qBittorrent
+or tribler built with qt4, install this package.  If you would like to
+install qbittorrent-qt5, then do not install this package. Instead,
+install libtorrent-rasterbar.
diff --git a/libraries/libtorrent-rasterbar-legacy/libtorrent-rasterbar-legacy.SlackBuild b/libraries/libtorrent-rasterbar-legacy/libtorrent-rasterbar-legacy.SlackBuild
new file mode 100644
index 0000000000..5c72ee2bc7
--- /dev/null
+++ b/libraries/libtorrent-rasterbar-legacy/libtorrent-rasterbar-legacy.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Slackware build script for libtorrent (rasterbar)
+
+# Copyright 2019-2020  Donald Cooley, South Haven, Indiana USA
+# Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, 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=libtorrent-rasterbar-legacy
+SRCNAM=libtorrent-rasterbar
+VERSION=${VERSION:-1.1.14}
+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) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+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.?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 {} \;
+
+# https://github.com/qbittorrent/qBittorrent/issues/6383#issuecomment-281535787
+sed -i -e "s/+ target_specific(),/+ target_specific() + ['-std=c++11'],/" \
+  bindings/python/setup.py
+
+EXAMPLES=${EXAMPLES:-no}
+[ "$EXAMPLES" = "yes" ] && examples="--enable-examples"
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var/lib \
+  --disable-static \
+  --enable-python-binding \
+  --enable-encryption \
+  $examples \
+  --with-boost-libdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-debug \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS docs/ tools/ \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+
+if [ "$EXAMPLES" = "yes" ]; then
+  cp -a examples/ $PKG/usr/doc/$PRGNAM-$VERSION
+  cp -a ed25519/ $PKG/usr/doc/$PRGNAM-$VERSION
+fi
+
+find $PKG \
+  \( -name .deps -o -name .libs -o -name .dirstamp \
+  \) -exec rm -rf {} \; || true
+
+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/libtorrent-rasterbar-legacy/libtorrent-rasterbar-legacy.info b/libraries/libtorrent-rasterbar-legacy/libtorrent-rasterbar-legacy.info
new file mode 100644
index 0000000000..62fc8caab7
--- /dev/null
+++ b/libraries/libtorrent-rasterbar-legacy/libtorrent-rasterbar-legacy.info
@@ -0,0 +1,10 @@
+PRGNAM="libtorrent-rasterbar-legacy"
+VERSION="1.1.14"
+HOMEPAGE="https://libtorrent.org/"
+DOWNLOAD="https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1_14/libtorrent-rasterbar-1.1.14.tar.gz"
+MD5SUM="2955bfc076bad6dfacc62bdd7d9a4cdb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Donald Cooley"
+EMAIL="chytraeu@sdf.org"
diff --git a/libraries/libtorrent-rasterbar-legacy/slack-desc b/libraries/libtorrent-rasterbar-legacy/slack-desc
new file mode 100644
index 0000000000..30eb117aa2
--- /dev/null
+++ b/libraries/libtorrent-rasterbar-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------------------------------------------------------|
+libtorrent-rasterbar-legacy: libtorrent-rasterbar-legacy (a bittorrent C++ library)
+libtorrent-rasterbar-legacy:
+libtorrent-rasterbar-legacy: libtorrent is a C++ library that aims to be a good alternative to all
+libtorrent-rasterbar-legacy: of the other bittorrent implementations around.  It is a library, not
+libtorrent-rasterbar-legacy: a full featured client, although it comes with an example client.
+libtorrent-rasterbar-legacy:
+libtorrent-rasterbar-legacy: Homepage: https://libtorrent.org/
+libtorrent-rasterbar-legacy:
+libtorrent-rasterbar-legacy:
+libtorrent-rasterbar-legacy:
+libtorrent-rasterbar-legacy:
diff --git a/libraries/libtorrent-rasterbar/README b/libraries/libtorrent-rasterbar/README
index d4f79cb88d..98bfe50926 100644
--- a/libraries/libtorrent-rasterbar/README
+++ b/libraries/libtorrent-rasterbar/README
@@ -1,6 +1,6 @@
-libtorrent is a C++ library that aims to be a good alternative to all the
-other bittorrent implementations around. It is a library and not a full
-featured client, although it comes with a working example client.
+libtorrent is a C++ library that aims to be a good alternative to all
+the other bittorrent implementations around. It is a library and not a
+full featured client, although it comes with a working example client.
 
 *When upgrading, please removepkg the old version first or the python
 module will try to link against it*
@@ -15,9 +15,8 @@ OPTIONS
 
 NOTE
 
-It is possible to build with bindings for python3 rather
-than python2 by setting the $PYTHON environmental variable,
-but this would involved rebuilding boost with bindings for
-python3 first.
+It is possible to build with bindings for python3 rather than python2 by
+setting the $PYTHON environmental variable, but this would involved
+rebuilding boost with bindings for python3 first.
 
 Go ahead and make my day.
diff --git a/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild b/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild
index 0501141e52..637abb7229 100644
--- a/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild
+++ b/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libtorrent (rasterbar)
 
-# Copyright 2019 Donald Cooley, South Haven, Indiana, USA
+# Copyright 2019-2020 Donald Cooley, South Haven, Indiana, USA
 # Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libtorrent-rasterbar
-VERSION=${VERSION:-1.1.13}
+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 d6c78127df..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.1.13"
+VERSION="1.2.11"
 HOMEPAGE="https://libtorrent.org/"
-DOWNLOAD="https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1_13/libtorrent-rasterbar-1.1.13.tar.gz"
-MD5SUM="a3eec8d384f0343df1fb417c14c4e20d"
+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/libuchardet/libuchardet.SlackBuild b/libraries/libuchardet/libuchardet.SlackBuild
index aa2b6cbbb4..48b7948773 100644
--- a/libraries/libuchardet/libuchardet.SlackBuild
+++ b/libraries/libuchardet/libuchardet.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for libuchardet.
 #
-# Copyright 2015-2016 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=libuchardet
-VERSION=${VERSION:-0.0.6}
+VERSION=${VERSION:-0.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libuchardet/libuchardet.info b/libraries/libuchardet/libuchardet.info
index 1a881d06e5..95bdf158b5 100644
--- a/libraries/libuchardet/libuchardet.info
+++ b/libraries/libuchardet/libuchardet.info
@@ -1,8 +1,8 @@
 PRGNAM="libuchardet"
-VERSION="0.0.6"
+VERSION="0.0.7"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-DOWNLOAD="https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz"
-MD5SUM="03425c0bbe5faaf399e15e947d3e03c7"
+DOWNLOAD="https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.7.tar.xz"
+MD5SUM="623406dac5c5ad89e40eedd7f279efae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/liburcu/liburcu.SlackBuild b/libraries/liburcu/liburcu.SlackBuild
index e1f82d09bd..0836db2705 100644
--- a/libraries/liburcu/liburcu.SlackBuild
+++ b/libraries/liburcu/liburcu.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for liburcu
 
-# Copyright 2013-2019 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.11.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 653bf7bee8..fa100760df 100644
--- a/libraries/liburcu/liburcu.info
+++ b/libraries/liburcu/liburcu.info
@@ -1,8 +1,8 @@
 PRGNAM="liburcu"
-VERSION="0.11.1"
+VERSION="0.12.2"
 HOMEPAGE="http://liburcu.org/"
-DOWNLOAD="https://www.lttng.org/files/urcu/userspace-rcu-0.11.1.tar.bz2"
-MD5SUM="91c75d5902127f94ab556ce039b369ca"
+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 c193c346c2..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.35.0}
+VERSION=${VERSION:-1.41.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,6 +75,7 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make install DESTDIR=$PKG
diff --git a/libraries/libuv/libuv.info b/libraries/libuv/libuv.info
index 534a11e723..c4c5764a4d 100644
--- a/libraries/libuv/libuv.info
+++ b/libraries/libuv/libuv.info
@@ -1,8 +1,8 @@
 PRGNAM="libuv"
-VERSION="1.35.0"
+VERSION="1.41.0"
 HOMEPAGE="http://libuv.org/"
-DOWNLOAD="https://dist.libuv.org/dist/v1.35.0/libuv-v1.35.0.tar.gz"
-MD5SUM="6b0ad0df2cfe90ed556a500423d6f1b8"
+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 4ab5729ef9..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.3}
+VERSION=${VERSION:-1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libwacom/libwacom.info b/libraries/libwacom/libwacom.info
index 6b403adad4..01d4b9bca4 100644
--- a/libraries/libwacom/libwacom.info
+++ b/libraries/libwacom/libwacom.info
@@ -1,8 +1,8 @@
 PRGNAM="libwacom"
-VERSION="1.3"
+VERSION="1.9"
 HOMEPAGE="https://github.com/linuxwacom/libwacom"
-DOWNLOAD="https://github.com/linuxwacom/libwacom/archive/libwacom-1.3/libwacom-libwacom-1.3.tar.gz"
-MD5SUM="37afb3880bbb454e813069992ee523ea"
+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/libwebp/libwebp.SlackBuild b/libraries/libwebp/libwebp.SlackBuild
index 7e4da7c575..7f941c2246 100644
--- a/libraries/libwebp/libwebp.SlackBuild
+++ b/libraries/libwebp/libwebp.SlackBuild
@@ -4,7 +4,7 @@
 # written by powtrix (@gmail.com)
 
 PRGNAM=libwebp
-VERSION=${VERSION:-1.0.3}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libwebp/libwebp.info b/libraries/libwebp/libwebp.info
index eb0e19dac9..ac10fcac7c 100644
--- a/libraries/libwebp/libwebp.info
+++ b/libraries/libwebp/libwebp.info
@@ -1,8 +1,8 @@
 PRGNAM="libwebp"
-VERSION="1.0.3"
+VERSION="1.1.0"
 HOMEPAGE="https://developers.google.com/speed/webp/"
-DOWNLOAD="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.3.tar.gz"
-MD5SUM="906ad85daaaa2eac97c8aa2dec9e8b77"
+DOWNLOAD="http://downloads.webmproject.org/releases/webp/libwebp-1.1.0.tar.gz"
+MD5SUM="7e047f2cbaf584dff7a8a7e0f8572f18"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libwpe/README b/libraries/libwpe/README
index 86ad9304f4..a72bfacbb6 100644
--- a/libraries/libwpe/README
+++ b/libraries/libwpe/README
@@ -2,4 +2,4 @@ WPE is the reference WebKit port for embedded and low-consumption
 computer devices. It has been designed from the ground-up with
 performance, small footprint, accelerated content rendering, and
 simplicity of deployment in mind, bringing the excellence of the
-WebKit engine to countless platforms and target devices.
\ No newline at end of file
+WebKit engine to countless platforms and target devices.
diff --git a/libraries/libwpe/libwpe.SlackBuild b/libraries/libwpe/libwpe.SlackBuild
index ba22651c31..42f4a123be 100644
--- a/libraries/libwpe/libwpe.SlackBuild
+++ b/libraries/libwpe/libwpe.SlackBuild
@@ -91,4 +91,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:-tgz}
\ No newline at end of file
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libwpe/libwpe.info b/libraries/libwpe/libwpe.info
index 8b57026b62..16d3b84f87 100644
--- a/libraries/libwpe/libwpe.info
+++ b/libraries/libwpe/libwpe.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libxkbcommon"
 MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
\ No newline at end of file
+EMAIL="willysr@slackbuilds.org"
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/development/libxdg-basedir/README b/libraries/libxdg-basedir/README
index 779e88ba69..779e88ba69 100644
--- a/development/libxdg-basedir/README
+++ b/libraries/libxdg-basedir/README
diff --git a/libraries/libxdg-basedir/alloc_buffer.patch b/libraries/libxdg-basedir/alloc_buffer.patch
new file mode 100644
index 0000000000..4726e58dbf
--- /dev/null
+++ b/libraries/libxdg-basedir/alloc_buffer.patch
@@ -0,0 +1,13 @@
+Index: libxdg-basedir-1.2.0/src/basedir.c
+===================================================================
+--- libxdg-basedir-1.2.0.orig/src/basedir.c	2014-02-11 19:56:41.702376488 +0100
++++ libxdg-basedir-1.2.0/src/basedir.c	2014-02-11 19:56:41.698376482 +0100
+@@ -574,7 +574,7 @@
+ 		unsigned int homelen;
+ 		if (!(home = xdgGetEnv("HOME")))
+ 			return NULL;
+-		if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength))) return NULL;
++		if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength+1))) return NULL;
+ 		memcpy(relhome, home, homelen);
+ 		memcpy(relhome+homelen, relativefallback, fallbacklength+1);
+ 	}
diff --git a/libraries/libxdg-basedir/libxdg-basedir.SlackBuild b/libraries/libxdg-basedir/libxdg-basedir.SlackBuild
new file mode 100644
index 0000000000..3961105469
--- /dev/null
+++ b/libraries/libxdg-basedir/libxdg-basedir.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for libxdg-basedir
+
+# Copyright 2013-2020 Heiko Rosemann Germany
+# 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.
+
+# Modified by the SlackBuilds.org project
+
+PRGNAM=libxdg-basedir
+VERSION=${VERSION:-1.2.0}
+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
+
+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" = "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
+
+# Fix upstream bug in wrong memory allocation:
+# https://sources.debian.org/patches/libxdg-basedir/1.2.0-2/alloc_buffer.patch/
+patch -p1 < $CWD/alloc_buffer.patch
+
+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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./autogen.sh \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --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
+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/libxdg-basedir/libxdg-basedir.info b/libraries/libxdg-basedir/libxdg-basedir.info
index c1c8c17721..c1c8c17721 100644
--- a/development/libxdg-basedir/libxdg-basedir.info
+++ b/libraries/libxdg-basedir/libxdg-basedir.info
diff --git a/development/libxdg-basedir/slack-desc b/libraries/libxdg-basedir/slack-desc
index 0b859196b0..0b859196b0 100644
--- a/development/libxdg-basedir/slack-desc
+++ b/libraries/libxdg-basedir/slack-desc
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/README b/libraries/libxnvctrl/README
index a2add064f9..eaf307278b 100644
--- a/libraries/libxnvctrl/README
+++ b/libraries/libxnvctrl/README
@@ -1,13 +1,14 @@
 libxnvctrl (NVIDIA NV-CONTROL X extension)
 
 The NV-CONTROL X extension provides a mechanism for X clients to query
-and set configuration parameters of the NVIDIA X driver. State set by the
-NV-CONTROL X extension is assumed to be persistent only for the current
-server generation. This can be useful for programs such as conky,
-mate-sensors-applet, and xfce4-sensors-plugin to allow for realtime
-monitoring of your NVIDIA cards temperature, fan speed, memory, etc.
+and set configuration parameters of the NVIDIA X driver. State set by
+the NV-CONTROL X extension is assumed to be persistent only for the
+current server generation. This can be useful for programs such as
+conky, mate-sensors-applet, and xfce4-sensors-plugin to allow for
+realtime monitoring of your NVIDIA cards temperature, fan speed, memory,
+etc.
 
 This package is version independent.  It does not have to match
 the nvidia-driver or nvidia-legacy packages.  I try to keep it
-in line with SBO packages, however it is not requried that this package
+in line with SBO packages, however it is not required that this package
 is the same version as the binary drivers.
diff --git a/libraries/libxnvctrl/libxnvctrl.SlackBuild b/libraries/libxnvctrl/libxnvctrl.SlackBuild
index ba8aeeb335..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:-418.43}
+VERSION=${VERSION:-460.67}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,7 +70,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 #patch source to build static and shared library
-patch -p1 < $CWD/libxnvctrl_so.patch
+patch -p0 < $CWD/libxnvctrl_so.patch
 
 cd src/libXNVCtrl
 make clean
@@ -79,8 +79,8 @@ make
 
 #install shared and static libraries and headers
 install -Dm 644 *.h -t $PKG/usr/include/NVCtrl
-install -Dm 644 libXNVCtrl.a -t $PKG/usr/lib$LIBDIRSUFFIX
-install -Dm 755 libXNVCtrl.so.0.0.0 -t $PKG/usr/lib$LIBDIRSUFFIX
+install -Dm 644 _out/*/libXNVCtrl.a -t $PKG/usr/lib$LIBDIRSUFFIX
+install -Dm 755 _out/*/libXNVCtrl.so.0.0.0 -t $PKG/usr/lib$LIBDIRSUFFIX
 ln -s libXNVCtrl.so.0.0.0 $PKG/usr/lib$LIBDIRSUFFIX/libXNVCtrl.so.0
 ln -s libXNVCtrl.so.0 $PKG/usr/lib$LIBDIRSUFFIX/libXNVCtrl.so
 
diff --git a/libraries/libxnvctrl/libxnvctrl.info b/libraries/libxnvctrl/libxnvctrl.info
index ccef787408..d63632e285 100644
--- a/libraries/libxnvctrl/libxnvctrl.info
+++ b/libraries/libxnvctrl/libxnvctrl.info
@@ -1,8 +1,8 @@
 PRGNAM="libxnvctrl"
-VERSION="418.43"
+VERSION="460.67"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-418.43.tar.bz2"
-MD5SUM="3076423b9ac51e6e9de6cd52a88bfa35"
+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/libxnvctrl/libxnvctrl_so.patch b/libraries/libxnvctrl/libxnvctrl_so.patch
index e6b6497325..664ab98225 100644
--- a/libraries/libxnvctrl/libxnvctrl_so.patch
+++ b/libraries/libxnvctrl/libxnvctrl_so.patch
@@ -1,68 +1,36 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -106,6 +106,8 @@
- XNVCTRL_DIR             ?= libXNVCtrl
- XNVCTRL_MAKEFILE        ?= Makefile
- XNVCTRL_ARCHIVE         ?= $(XNVCTRL_DIR)/libXNVCtrl.a
-+XNVCTRL_SHARED          ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0
-+XNVCTRL_LIB             ?= $(XNVCTRL_SHARED)
- XCONFIG_PARSER_DIR      ?= XF86Config-parser
- COMMON_UTILS_DIR        ?= common-utils
- COMMON_UNIX_DIR         ?= common-unix
-@@ -280,15 +282,18 @@
- 	$(MKDIR) $(BINDIR)
- 	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
+--- src/libXNVCtrl/Makefile	2019-07-30 00:26:56.000000000 +0200
++++ src/libXNVCtrl/Makefile	2019-08-02 14:08:56.963744238 +0200
+@@ -50,8 +50,8 @@
  
-+$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED):
-+	$(MAKE) -C $(XNVCTRL_DIR)
-+
- $(eval $(call DEBUG_INFO_RULES, $(NVIDIA_SETTINGS)))
--$(NVIDIA_SETTINGS).unstripped: $(OBJS) $(XNVCTRL_ARCHIVE)
-+$(NVIDIA_SETTINGS).unstripped: $(OBJS) $(XNVCTRL_LIB)
- 	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
--	    -rdynamic -o $@ $(OBJS) $(XNVCTRL_ARCHIVE) $(LIBS)
-+	    -rdynamic -o $@ $(OBJS) $(XNVCTRL_LIB) $(LIBS)
- 
- $(eval $(call DEBUG_INFO_RULES, $(GTK2LIB)))
- $(GTK2LIB).unstripped: $(GTK2_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
- 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
--	    $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK2_LIBS) \
-+	    $(XNVCTRL_LIB) $(LIBS) $(GTK2_LIBS) \
- 	    -Wl,--unresolved-symbols=ignore-all -o $@ \
- 	    -Wl,-soname -Wl,$(GTK2LIB_SONAME) \
- 	    $(GTK2_OBJS) $(XCP_OBJS)
-@@ -297,7 +302,7 @@
- $(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
- $(GTK3LIB).unstripped: $(GTK3_OBJS) $(XCP_OBJS) $(VERSION_MK)
- 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS)  $(BIN_LDFLAGS) \
--	    $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK3_LIBS) \
-+	    $(XNVCTRL_LIB) $(LIBS) $(GTK3_LIBS) \
- 	    -Wl,--unresolved-symbols=ignore-all -o $@ \
- 	    -Wl,-soname -Wl,$(GTK3LIB_SONAME) \
- 	    $(GTK3_OBJS) $(XCP_OBJS)
---- a/src/libXNVCtrl/Makefile
-+++ b/src/libXNVCtrl/Makefile
-@@ -55,10 +55,17 @@
  .PHONY: clean
  
- all: $(LIBXNVCTRL)
-+all: libXNVCtrl.so
+-all: $(LIBXNVCTRL)
++all: $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED)
+ 
+ clean:
+-	rm -rf $(LIBXNVCTRL) *~ \
++	rm -rf $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED)* *~ \
+ 		$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
+--- src/libXNVCtrl/xnvctrl.mk	2019-08-02 17:04:08.216230565 +0200
++++ src/libXNVCtrl/xnvctrl.mk	2019-08-02 17:08:02.563660632 +0200
+@@ -39,6 +39,11 @@
  
- $(LIBXNVCTRL) : $(OBJS)
- 	$(AR) ru $@ $(OBJS)
+ LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
  
-+libXNVCtrl.so: $(OBJS)
-+	$(RM) $@ $@.*
-+	$(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
-+	ln -s $@.0.0.0 $@.0
-+	ln -s $@.0 $@
++LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so
++LIBXNVCTRL_ABI_VERSION_MAJOR = 0
++LIBXNVCTRL_ABI_VERSION_MINOR = 0
++LIBXNVCTRL_LIBS += -lXext -lX11
 +
- # define the rule to build each object file
- $(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
+ LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
  
-@@ -68,3 +75,4 @@
- clean:
- 	rm -rf $(LIBXNVCTRL) *~ $(STAMP_C) \
- 		$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
-+	rm -f libXNVCtrl.so libXNVCtrl.so.*
-
+ LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC))
+@@ -47,3 +52,8 @@
+ 
+ $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
+ 	$(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
++
++$(LIBXNVCTRL_SHARED) : $(LIBXNVCTRL_OBJ)
++	$(CC) -shared $(CFLAGS) $(LDFLAGS) -Wl,-soname=$(notdir $@).${LIBXNVCTRL_ABI_VERSION_MAJOR} -o $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $^ $(LIBXNVCTRL_LIBS)
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@
++	ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR)
diff --git a/libraries/libyang/libyang.SlackBuild b/libraries/libyang/libyang.SlackBuild
index 7cafc85c8c..89ee182434 100644
--- a/libraries/libyang/libyang.SlackBuild
+++ b/libraries/libyang/libyang.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libyang
 
-# Copyright 2019 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2019-2020 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +22,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20200103 bkw: Modified by Slackbuilds.org: VERSION can't contain hyphens.
-
 PRGNAM=libyang
-VERSION=${VERSION:-0.16_r3}
+VERSION=${VERSION:-1.0.167}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVER=${VERSION/_/-}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -63,9 +59,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-$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/libyang/libyang.info b/libraries/libyang/libyang.info
index 8fe1081f1e..e66a32012e 100644
--- a/libraries/libyang/libyang.info
+++ b/libraries/libyang/libyang.info
@@ -1,8 +1,8 @@
 PRGNAM="libyang"
-VERSION="0.16_r3"
+VERSION="1.0.167"
 HOMEPAGE="https://github.com/CESNET/libyang"
-DOWNLOAD="https://github.com/CESNET/libyang/archive/v0.16-r3/libyang-0.16-r3.tar.gz"
-MD5SUM="a7cc2cc10de2ec92a51eee69c98566fa"
+DOWNLOAD="https://github.com/CESNET/libyang/archive/v1.0.167/libyang-1.0.167.tar.gz"
+MD5SUM="686c11a19dd62e1cea863c67a8b3e125"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cmocka"
diff --git a/libraries/libyubikey/libyubikey.info b/libraries/libyubikey/libyubikey.info
index 1e3b1379c6..f070210905 100644
--- a/libraries/libyubikey/libyubikey.info
+++ b/libraries/libyubikey/libyubikey.info
@@ -1,7 +1,7 @@
 PRGNAM="libyubikey"
 VERSION="1.13"
 HOMEPAGE="https://developers.yubico.com/yubico-c/"
-DOWNLOAD="https://developers.yubico.com/yubico-c/releases/libyubikey-1.13.tar.gz"
+DOWNLOAD="https://developers.yubico.com/yubico-c/Releases/libyubikey-1.13.tar.gz"
 MD5SUM="6e84fc1914ab5b609319945c18d45835"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/libzen/libzen.SlackBuild b/libraries/libzen/libzen.SlackBuild
index b989c7c418..679d1914ce 100644
--- a/libraries/libzen/libzen.SlackBuild
+++ b/libraries/libzen/libzen.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
 # Copyright 2012-2017  Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-# Copyright 2017  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2020  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 
 PRGNAM=libzen
 SRCNAM=ZenLib
-VERSION=${VERSION:-0.4.37}
+VERSION=${VERSION:-0.4.38}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libzen/libzen.info b/libraries/libzen/libzen.info
index 1181659e0d..e5c9102b31 100644
--- a/libraries/libzen/libzen.info
+++ b/libraries/libzen/libzen.info
@@ -1,8 +1,8 @@
 PRGNAM="libzen"
-VERSION="0.4.37"
+VERSION="0.4.38"
 HOMEPAGE="https://github.com/MediaArea/ZenLib"
-DOWNLOAD="https://github.com/MediaArea/ZenLib/archive/v0.4.37/ZenLib-0.4.37.tar.gz"
-MD5SUM="31bd9badb2587e8a087dd0889e19b609"
+DOWNLOAD="https://github.com/MediaArea/ZenLib/archive/v0.4.38/ZenLib-0.4.38.tar.gz"
+MD5SUM="0933664e0dece16a9e8dfe019028ce90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/lilv/README b/libraries/lilv/README
index a0fe1622b3..4ea88690c0 100644
--- a/libraries/lilv/README
+++ b/libraries/lilv/README
@@ -3,6 +3,3 @@ possible for applications. Lilv is the successor to SLV2, rewritten
 to be significantly faster and have minimal dependencies. It is
 stable, well-tested software (the included test suite covers over
 90% of the code) in use by several applications.
-
-If you want to build language bindings for lilv, pass BINDINGS=yes
-to the script. This additionally requires numpy.
diff --git a/libraries/lilv/fix-python-bindings.patch b/libraries/lilv/fix-python-bindings.patch
deleted file mode 100644
index cc5aa50bd6..0000000000
--- a/libraries/lilv/fix-python-bindings.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 438eefdd67368dbd8fb8a6aa7ab207aac44e9715 Mon Sep 17 00:00:00 2001
-From: David Robillard <d@drobilla.net>
-Date: Fri, 9 Oct 2015 17:02:46 +0000
-Subject: [PATCH] Fix Python bindings
-
-git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@5759 a436a847-0d15-0410-975c-d299462d15a1
----
- bindings/lilv.i |  4 ++++
- waf             | 10 +++++-----
- 4 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/bindings/lilv.i b/bindings/lilv.i
-index 8bbdd3f..f6254a7 100644
---- a/bindings/lilv.i
-+++ b/bindings/lilv.i
-@@ -40,6 +40,10 @@ namespace Lilv {
- 				self.iter = self.plugins.next(self.iter)
- 				return plugin
- 
-+			def next(self):
-+				"Python 2 iterator protocol"
-+				return Iterator.__next__(self)
-+
- 		return Iterator(self)
- 
- 	def get_by_uri(self, *args):
-diff --git a/waf b/waf
-index df0c1d1..cfddd87 100755
---- a/waf
-+++ b/waf
-@@ -33,12 +33,12 @@ POSSIBILITY OF SUCH DAMAGE.
- import os, sys, inspect
- 
- VERSION="1.8.14"
--REVISION="bd8d497537f4e38e5a6e5ac866ef0959"
-+REVISION="1d629e2af929e93b3210957e709a6c76"
- GIT="x"
- INSTALL=''
--C1='#3'
--C2='#+'
--C3='#&'
-+C1='#&'
-+C2='#%'
-+C3='#$'
- cwd = os.getcwd()
- join = os.path.join
- 
-@@ -165,5 +165,5 @@ if __name__ == '__main__':
- 	Scripting.waf_entry_point(cwd, VERSION, wafdir)
- 
- #==>
--#BZh91AY&SYߢxÿUCÿÿÿ°�ÁÿÿÿÿÿÿÿÿÿÿÿF`#&
††"ª@Œ#&#3# (b<÷{ì¼ò#&#&#&#&#&#&#&#&#&#&#&#&#&#&#&#&#&#&#&#&#&õ>öNjÁžÇv®ºõ£ÖÃ%èÓ§Û>YtÔ´‘¬µèzêQ5¯®¯¼Ý³v[·e¤MYXö7-�x}Ÿ8�õ¬Í7•ÂH
¥ÙíÝí‡vÓSȦ•ÎÎ]Ö§G'G}=\[zkÛÖo¾ú=÷Þk×]Ö箾ûãµ�tóÛ§Ïoƒf}¤ûã{^µG{Û�ì¾Æ÷Þ—œ’ûw#&#&#&7°#&š#&î©!¶ÀõÒ€£ÞlÍäÌ#&ªm06m&»¶î¸Í´
F�³»·l<�¨¥ÕiSm([#+#3`hon½ãET*Š#3
 ¯#Tõ©#&:#+LH½ƒ¸çÖ®ž´}½ÃÚ½žj/7vnô¯6 m5ÛUÖ]š•¶·ÎÕzÚ¬5Qôg_=÷ß:÷=Ø]¶¶·z[�ï/w±öi·3ž÷Y<ßwÏ»½Ù“É—qŸ_{{î=w3U£ouöèõ]=ì#&>¼¹é¶`T¨
^”PzvÀÖí·w.{Üžì:
Z»vúè >MÛÐ×=îK¼#&4‘J¥A*D†‡¨Ø8vÑO¯®¬ÛïµÇ‹]¹·R…]ž#+½{^õ÷¾kï°T.ɱ]ÛYìc×\û
¯c£MÝïSzÛn¹#&wÝèûcÖןxíßzCÛÎo†é¤Ü�^ï¹õtëÈÛN…#+½}÷xò»sÖó­yM¶«ØæÛkͼÞ÷ÝÒìÍbÔû�¹Ž÷[Þ;sß{Ûr{Gvæù÷›Þ[››™«ôucºû±¾0÷zöà»Õºtw·ÓïµaW§l§;7sO£ßKÐå¾æ½õ#&D²«–æwŒªÔ�öooU¾ï¼½íÝ­‡¾á×We�s&÷h=›—½ç»{‹q÷ºõ§[Ûâæ#&/»Ý¸ózzYèwÏ]Ô¼#3ª(#3#+`(#+i¬¹­ïjOm�鶺Ûhú{�vû}:È}¹ÆM{Î=ök¯¶Ûy±¢»–u˜weÝo]›c¨5ëݶúÝèï€#&7¹ÕÔ€#&Òûï�Mí©|»Þì¼»Cv©ì_yÒ6Þïn;ztù®™ÎDåÜÄeØWÁs»wž÷¹*÷mÙ�Üå°Â³)Ûª½ó>'¾0j½<U#&õ··½ºžÞÜôñõõB—ßOONl¾º{nõ›ï{Γíëïsî÷/§å½ôq÷–áî·­¶7{|Çz÷Û·{Ko±òñÐó:	Ï£®Ïn�Ö.ë¹Þ¶#+›Nƒo¸9Ñí/–—{®â³/o}w7’Ùö€0eV#+¬úòƒ¶¯wÞòzŒ>ûo¾Nv9ö;g¸ïwÞ÷»>¾·©÷¾šûÜç#¶ë·}¼çÍîûìïv篫[EdÐ#&¶ÝëÞ5îvµvõãêƒÁõ<àj€†è㮾޼ö{èhì×ÐVƒ¹‹Ûq�Û½cC­»Œzí»ß	ö`-€îÃC ÐRt}}íÑå
�××.<IÛ©÷µ]õÞŽŸ}óí¯¾åk—.vnÄU$\»‹»¶h•‹båLÎ=�ïv�²·Os}ïO¡£ç1ëÞï«Þ¾]ï�¶^ÏFË>zg¼çÞï/=œ;5¸äÍ¥;½í}Û½îÝrî«»ÞÕ‘÷Ùuè‘õ=k#3ø½]^g—ºÛéøû¦�@
#&#&š#&F€�h56€B§é=M ò€Í@õz�SOM4‚S@„M
#&šÓÔ	´˜I馌�$i Ð#+#&#&#&#&#&
 ‘A4˜M	“F‰‚šž¦É‚£òI£j<™M=OHÉšž¦€hÐ€#&#&#&“Õ)"L¦
M¡OM §¤4z†Ô#&šhõ#&�P#&#&#&#&
B@ #&�
2$Ú#&€Ä™4ɦŠ~MM1OQ #&#&h#&#&	5
4È#&˜#3©øÔÕ?Ñ4õ<(ÓõG¨ýPÓÔôƒÔ#&ÈÈ€#&åÿò­j´¸"þ2Õ¹m»’ý}Vœ¦&˜_V—20Ñ 0VEb0É<–#&‰�‡¼ùü~«Kþ»O?®V"¢#3šÂMvö•áT+{«ÅŠ¢k�äÍ<³.îøÖQÐ}§ù]áÌDÏT’œ@œ808!Å€-¹c1E0œ;B7Lé™ÇUâáE,^.¦¥=àrj¨¤ô®]®j¦wSOOŠ.^-ëq5scÛ�2ŽŒ�	””0!±¶¢ÕZ5­EkÓm·76­ËV+Õ»U®í«[”Wß[6ES˜Uàh@#3‚!!‘
È„AlET„|¢X
R!kݼòÎ�Q¬hµ&Õ«[_n¶ÚÕI�¦$‰cL³@bd53I²˜’$¥H–2&)E1M´¡Š„†™2QEa4›R£l”DJ#&™h*PÚ“-™`‹3D±¡4Ʀ”Q¥Æ’)6"ÑŠ!%*S#lJ#&Yi ©$)‘"ÛIªƒlRÄÔRŒPR’Ši0³5�Ei¶´Úµ)&”Ö&L’H¨¶#-JÖ3L3fS-Ic)¶ÄÔ¶&6U&ML-"‰&¢��‘%HÒ´VB6M&ˆ¥$¢ÄbÒAh¥-Œ’›˜!bŒÍ114Ø¢`•)±�€Ä1M1
#3™&D¢$¡dÚ’ŠX€„dÐÉ0�‘¤Še)b“$TRŒšR[BQ¢Á°Æ¥¤T1d˜h£J@€I(“H¥,LT&Sh¤Ì´†’™ Å‘¦FI©¢ŠfÒaHijDšL¡$#3lF¤¨-AQ#3D”TZ"#3‰)#3fÄ’jHÅ$iH™‘Œ“
c0Œ›fTÈ�	ŒD„I	Rl!"L“I´“%R˜6Z#M"ˆÑ"‰¥$¤ÍD̪Y°#JQ`ÆR,²Mšf4¥ŠK265+$ÄÄ’(Ú•YRI’ÙeHY³4b£HØÊSK)­¦ƒC’„Q¥jL”• i¤Â¦£IeJ�Š&(¤¨"bL ’”c#+$™!¦E	‚LÍ´�Ã5�†idi2D‰M¤©(¶HÚ4“$’„³ɦ¤m„ѲC&QCd“eF™šˆÄc4¨e3Jb#+Lš-*(³Sc$£Œ‘%#3l’Ce2,4Á@ƈÚRd²’C#+“dÑ“!PÒ B6„“2²“#+ ²d¤„d–L£!”#)”Œ°cRR©³EFÑ‹™"RmF-�$†²(PÌhÂHaQ¤4@eLš�E¥&²¨™™‘3FI0’ȉB¦ÈѤÈLÌf’*kT­¶‚‹e0d©¤“A²“,S%2LcY52Íb“1”Í4Ù,¥‹S#d”hjYƒ&”ie¯äõÛdi+AHJ”RSXÚ¢,ÄÆ�Aµ#3Pš1H£Ih,FÂ5$µLE5,E,¦�šH™´ÆÆ‚¡›PšÑdlÖL†ÆQhj4l�¡`™3¥¦�1’I¤£a™”ª�±Md5dlŠ¦+#3Å6Q%$Ù*5š›hѵ¢š´•’*„Ö²Ò”¦˜©¶€ÌP³",kFš•m0ňËŠÅS*6ÂUbfتÂF¤£m�£cd£Tf�!ª)#3ƒE¬ZŠ†jCkšÉ#3Vh†SIE ›6“fÄÄf¦‰fÔªMFÉ&±YEi“6µ²Õf‚4–†¦ÔY¤L²³ff¦”Œ“-ªZŠZJf¦›)­*•&J©˜KYS)Iµ4­6bÑF†¶k32HVXÐËA©6ÒÖY#+ŒmšQD`2C5i‚�1,Q°$„†!A¡$ÀÙj-HJJŠe5I´¤ÓcQ“&�&”È¢‘K6#b�ZjTˆ4S%2cfYM˜bÄ£%#3‹E™!ŒSY©,,–HASLaDÁ)J#+2LY†³ÁŒm2””c,Í"Ì£TÈ1LS&“hÅ0™d#+*,f©š �&ÌŠ )ji´S3h¨±±±F‘-4$R`¶Bʃ“Ed‰IHÌÙ#+%±”š”D™6jQ	UU3(‹Cb¥4›#i2�4šØ‚C!Œš$fM”“BT›I™Š™¦0&¥³MŠÁY–h¢(щ´b’Z&S&Š™%ZFL¦(¤¤HÍ‚‰(2Æ&MŠ2ˆÅ5–M’”11RBE£QBlj*4QµHÒaˆHf�))4‹E0	QI&‹³iI&¤(#+�²e%6fa­6´j+E‰4X%#+´’ZKcPXƉ#3#+I¬¥$¨M”µF”™¡#+‹$&Ó"¤‰64ˆ²Êµ*5F12²lEÙM…I¤l¥4d•,’¤¦R”mlAT‘$Y4l›F£dÚ�%E�µJb’Š”Û)[#+$Í‘)6(i",–-0ÉHÍM¤£jJh`ÕJM0šSYˆ¥Ú5’l2J(‚(ÆYQ¨Ú6™%�#+QIBI-i ¤´¦ØÖJÔ[Y#’Öi
Z6Á©(±LR�’2ƒ4"e	FÉL0ehÅccV4¦«#-V05­6Ë-±¬m±’KjQ•6CK+´mËR¤¡¬£,lR‰¤Ù©¨´X¨‰¡¬–ŲQb-&¬RhÙLÖQdÚ,¤Z2Q£cFª©kiʆ“DIY”Z*6…´BÒÙ«&21bÖŠ"Ú+F¶-ÛFÕ²mlEªjVV‰FQ@lM’cÊÂÊX©#f‘QA&6#I”“"HmI¶)š©��ý7õÓovñÄ¿ÊÛ#ú5þ|‹MH@ä�?ÜÄmé�¶±¯æ¯‘ãh·6=»²YzÝQª�ãÝý/éEÂmœ[£‘?÷çC(Ùþ÷ÜDV½aùîæòEäÅXšk–CrX)\¦tÄWâwvd*_üÕ?&¸AhÒîƒýzÏãùl²ïó¥$É¡2ꊦ#3YÛ]¬´b<ŽËH„ˆhžåÓÅÛ_¦÷hû¿vï\8˜F½ö#üヲiÇX;£‰F‘éæíi�r7¨F܆ìzÂ]U`²®"­ÑmŠ=)`ó©N#3ˆÖ*…Wd4´ÈÙ–œ00ÒE¡¶G~”ÝÖÜ	—‹Ù^7ºáWº½—¯çõêW¦¯eÍÍ£Qk0±#31ØÀlc7R&숟âu½üê™{74š,‘Fwž^
éÀsª¨?ûÐÿ%#3ÌaÞ¨�q'ØäÙ–1TTöÑ–Æ
WáþË–=µ£0#3�FõH"z™BaC
Iá�#3ÇúœÀÆ•ª¤–IJ¤1›8Îý‚‰Á™`¡ØbM=†ž­L‡CJÙ±Y´”=:Ù®ŸÝ{{%m
lkƒ@°×[µ":dÏ=¼Þ	Mw\è»�ÍÌšB“ZHŠ‹�¶_DƒðOJ§…uة١ŽR¢†È…@SÙAP˜”›ñ°‡ÆËÅöíÁ¨%µ6]yg³FÉ¢‰IpUDA´ó2MÑ#& a2Ê+u)†*Pø}ooK#"©F�ŸQVŽZH�Å#+5¼¼W{÷SºŽ•Ë’në±:ë¦(#3¡ª@»¯üG¬Q‘@óJÍ#+¤ØÑñÊï‰uòžzí¹±‡ìwIž”V¿•kŽ´ÿsÓËýu)6JªãšÂ‹‚–Ñmz`E#3€PDj,'è+y's÷f—QMLüæa€2ªÓ#3b}•[{U}ºý±søúu™¸ŠÕgˆV{õsÏXÆa´¦£�«—û*w3Vp£�C¿�Gj<xë~ôòAÅ„´¿okìKHìe'Îçkºh88À)ì@å0gƒ†gLÕŠUQ*žËœµΨg¤Ð®ˆ£!Þ–êÖÃüïažÊEÂO–¼õ¼}oÍŠ0ö TMSV ØÒƒtT[òLã¶óhëU«>s‚(f®Ê[±¿ôÕ¹2+"ÄgW´Ù%ïõÖû×tlÏiËçë©—[®Meh¬T9]("ÿài{ʤyµ½ðäÈáem¦ŸìêcmOĆÛ$ÑF4kÇ3,›Ç1r±ªþ±yJ�>ó‹znWæs&gû#+õkÚù¯k´G-Ê×uuDcEˆÆ#XÉëºåyçmmÓ¤ŠshdUœøÖ	‚'€…	-’�“	cçŠMš@U«–ããq”oäÍr–É…í×*Ǿy(±¬Y*ùçõRÓD)CÁ TX]Q5£ÕzˆzóFBï%6 ¨�R¢çÙ@pÓ'҇φE“F"ºÖönÏ$“R׏L”ØJ‰)¥>4!Ö¨Rpx…¡Â¨.µBà°v¢‰-í©JÇD¨Ér×J_kµ¾,Ìß¡îÞÐÛðwÒ¨œw»è�XøíÏ`;Wÿ¶í"$ÉTŒãTqaª™E#Æ©+å3Éâ-GÏm•†ÚZq«9¥Ô!¥JUNÆ�Ó|BѸ5Ý‚…DaåÛPäÏS3y p¾¼¨Ä‰áTòª1ßEùUQÒêññ}¾3^™÷p÷r?•º}c´ºe�8(Òãûaõç•3—w¿3GxC—ñûf6o‹–é)!ªTCĪӕ–#&¤"ÅNê¤PO´®Í%bQT‹’‚“ Æ/Š#ÿb®á$Ç5/šfÅ�oŠh þþg±4äàH5§	®C�Ͼ¿XåÑá­5›°éÕ“X3V´²œÔóB…m˜ó£±cU�»»•Aã_]L²ozˆl¬ÈD�n}oY
¦A¤Þ=kùtf‡¾E×Êtß>5sgÁQN�ûÍLL³äYC³F+žÚü4Õöwí¸kX�¥ßn	3¾m¼c+®ûMIŸEMN~®#&Ãc>ê;dµ�•Š¯ZÁ�Á'êÀûÊ©=L6D|‚QçJKcqa0‡éøAïȵüÉ;#=‡þêÇ\.G®uïÒð¯Á¦é¡ªãµÇÙw—¹ã|*¹Fgž	#8e³Q籑ã6çà¢	ù¿wXd�Š~{h cmjÚ0®4ÌŠ0oïû¥~ö‡-xª”$µEyÑúý—ÿkÃ6è‡:òO…ÞïL\®ðð"ä+:Dw_j"]Ÿs-íobž…`¹I¨хôq¸à¸¡·}\SØÐlýLë®ýšÀε?ÀÂÛª2’졺}²U8âU¼:%H$¬{NƒÎ{¦��ì¾Y~³µ»CÑæö,`sâ+)wI&['ããon—MjjÆ2(!±Ê¸®µ•«o�³M%Íj´Bþ�Ã÷É”AÃcVéªæâég}]œo›Iaœ„³)«9â¯ñÒσ�÷³³¿<õ5õO·œv3Ñ»jj&‡ëuÙéCzKa`¹Áœ)’óµfçcì#+–ÝJ‰ÛžkÜþÑ�ŠµB—_QÂþ]!§Ógòæ+j!=ÎÇtH™Œ+M#+ãÐÔL\0ëa¦q}ŽŒ4Ì<R›[i#+*n؉»m°cªßó¿Áß{â�Ù#Y>»§"íöçá�ÙÜÙµ^Ê+…g’b[ Ò5#3# ²#Hhžýâ¼½:"Š0ù7zU"wÐQAzieˆ9JôJpÊîj--ðWDI¢@ìJøòþËÓÇþí³ßüÞW…ú¶¡ºz2PÝPµõÑV¨5áajËaVÒÏs=ƒc÷?ÀºíwlR¨£…#ëM+‰@¿ÒYì{öcgŽLásÑTBºgÐ÷¥›±«ª¥S¶#µT8	9ºù¾Vc¶�~ª+>§‡Ó‘d#ÓŸ›t){e3C‹÷¾ï϶Ê,ªEºRQÑ¡:9†Zä×_çÊT×ãã½\h&ÈÍBœ°/ð!âDãÇ5¬Ãò“Ćþ<y`i�Ý �1"ÿ¾´úêotÅØ©w@ ‚Á@rÎøb¤úå=µ4`yèÍÀmÇ<ý׶E±5åÖÔü8ãíÞÒ¾m¹ô>9¹©ß0l¾pû9õiŽ›ª&y¿k˜FI‚�5âÑkÃLl8ÉQý*÷Ï!˜å%wvcWúRv4ör©®#3b½ÝµjoµË:¡H‚rrÃbìÄÀŠ(‹) \µÎî�íLj0”«¥W].N.9s«8´‰5«¿ÑÜÀ:}¼æYDÆ'"ŠLd�Ó!"Õ@éNm‹ ”†B©É<Ó†�'kq<a¼êþnÓÁºwa᪆#+Ö�sá—ÖYü¿s#+JäÑ3>þ'\A|¸ü;Ë�ßî�¢D{£/òª§A¤«*,<	Ö¡kÑ”¢±LÐIpxãÚr?ž2…q<Á÷$¤GðXòÚ™Ñ#&‹Ýòo@|ÓýNyßöDtÑ×B>wÿ&ÎZØÙ²xW�l¹	ý–dtÒ¡}ê<o佨Êø;˃›-™´½bÎe=x’#361†ò:âí�z‘CŸ÷bßSç»Æ¹K‰´K⸀±Òt�ßǤc¯ÃlÄcáëú>Ýö÷õÊXÌ‹î:#4ãÚÚfHäVê[)NñòëÔ ÕG“W¦¦Ô sVÍrW#†ÀÂT)l*èï¹Âå&FB[iˆÓbö~®³´	ahƒ[‘}ϰ©õ¦lRÐT\L�ŠSš‘ä=èÚ¼¡ŸYïiÚ�ùX»Ç¦×ä®ÈM*�iæ›mSWÁú¾øÔ!×´¯¦Aàçè¡îñî)·|ä¹ç/êw¥éû÷V|&ìzÏ.ÚÓôœØ¸u÷~>�¿#+¹“žï¾ðãÆPB9ËÒl$[‹RÇ/…bø»Öÿ8cñ¿B1°ìès»¿´êº•VÞ¾ªÞ¡ÇL–dy9UÉ^‘qäùÁ#3+¿‰>Ÿ>,>íKõnäÂ%vGJçÅÌÊ,†[…nû!hT#›‚)Æ€Rtæ*Ï:�½ÐV”O*ìN’ƒDo�»´»?»úg[=·šáJ6ïqý¾ÎÂL,!ÄùqÓìÙAsêðˆJÃÝ¿™üm²…xÛÊ�4¦}SX|GX#Zh#3Ê¢›¡åÇ¿<'Šf׌H0†ÎW"™Š»…ïƒÍè8Ó‘)�í•«�ˆWPÏ­#ló`y7¦vĉE(•�YO¹:»b�ãT¼uôÎr’éÙëÓ5B-B.Ftû¹	7%L’&Ë#Ç$ç\–|äæ æǸŽ2Üæ"´ÀüYð)ÃolÃÈŠ6ÚCym/·Š‹€ÜoöóR#ºÝ.r¼{?Ùfê7Ìk¯5)n�%kžýãt*“DÈ�¦6Åa{“MlPù],Ê‹þ´Þw˜{ZX‘×Úïë5ÌÈ\NîÕvQSR—z‹í•xqÙ!Zu	ŽÜ¼‚`ª::é‹-(Aª¤¦»?�ŸS㤠膰T`‹Çb¹"ÆôtókQ#3ÉJéw̯ëÌæ™?–šÖ—Š†„§d¨œPý�ÊC§y)#+¢úáåûÛ„)^jY":KïúÚÁ4];áÉõsn˜!ŠAø	‰[„þ]øËãJ]ÂXFaÚjT_ß?[£ø&FÇ¥ÁÊWö2«>r"é}fr¸‘íœ[,âc#3ÄD³òÔ��pÞ}ZÀül©ã#P2qIÔdêª,O®—Á-öï^UÆò:U;psŒ#êÖËM›eUoÝ–à`ÅfâRMAù[Wàçy�ñȯkƶ‘X6g:üì�Y­™)�ɱž·ßJ}½=2bGʃq,â׺‹²„“3¸ë]C}9ÀsøìÏNǧ-0r9ˆ•ú‚ç.~ÔßÞ�Ý´ŽÈ5|\©Uï9ôRš…¨¶ƒæð�¦t\9ÎuÙU`A¤„Ìè…ñ^4Þ¥é]HÉ’YbóËÇUQwPìCDt(ö>¬ÅPpv*¡ô¶a÷¡®ùš‰ë×�áYÑ” ŒÚª¦´lÃÇ+`«!z½l¦&#+›q‰g·Ñ†ÎB¢Î°ÒÍ*¢een¬]qË”y¸P Î!•Èù³€Ø7Ëå7Žµ×µ7­KØgY¡ÊGbÒ¾æ”f¤>Æ�ÏñÂX{A}s!³¿‹-„¸sÉo‚yÌ”$8V
d"ª‹eÙD£Û·f%DƒLÉb%jV•MP-R‰¦˜.ð€èÔdNdƒM(#á“LbcZ‰A²A@‰<õÃ×T½`º¥+*UâØ£Dc`ÈÜ
džs€¿løël‡y!ÝÍ£|f¦Ìí.~χ‹s=©ÍJ¢ê‚Id�$–뢧Û®-fu×LÆf	“G
þ<íd‡-ŽÛÖÀ1[#&Åz'q¸‰vÛ{N~»7)›(¸âf‹½�}�ýžúÿnZ¢æ.¸9±vìsÇBYASñÖ–¦ÁioNÅÄ
õD´S„~16Ìæq¶U•âåº2›ÖŠ{Nhé¨ô^š¬:œº#+�VºF2#+m¥$diÉ‘.ÙGÇShíû\ì¶SýyQ9p–%Q+šÁA°¾ú ½Ÿe‹Ú#+ Kw|píºm¼—ïï-|�žº9(®^”ÍÇMmî/sØ¿®Ø]${”»�¢¤þK†�7©Q"î#3=9ÇßTÈn¦yLŒ¾0´åè¿Z¨[þ-ÇÃ-Ü~-5ËÕ8"äÀۯ눭fÅMQÓ,ƒY¶¦b1[§]?Î÷—_MîÓ¯*ÿ�ⶖ…zñ#+	·MÿëšoUË'£‚sgrÖñ~²×‚|þÉšð¡‡Q¨�’n)¼C_gk·Ø�ðüÀGUq߬øx=%»s/f¢dŒŠ=î¤ð�¶³sÞö1‡£"N�04Iª†èô”,EãA[¡Ële ¹î8—-6÷ö¿0¸Y#+NÍäåòüwçŒqŒuÑ‚>+rž]¸§f¤:a´ºËµ¦3sîs‰¦ŠÀkú""Yœ/¤"íãWÃKM�Jãîô¾Ÿ#+#+Yص‹&x|.Ü4€(°pÍ,ÃMÿc¯«ꔜo#3Ý&AÛ_Ð]ª»Õ�§(-H—‡ÔSŽG??ÌÄa¡þ]³'¾ú¯b"º5\'ø{ó2¿ö)BK¸ô£«¹mvDõô67o…ã„ß	š±·�z‘Òxç^Ãe°¬;Xx‰—-ïdAkrô÷¿hDÊ0áIœ³Xil‚¦´�óÜ×[÷w]yëçËW�»#‚y�Ò’Jl’ÀàÈm×’\Ù¨ªw+�E$ßÁÙ̳…ùkxva¢9t^òU¨KMP¶%Pê•L¦gÌð¥ô&h&¡ù܆¨áèîã–¹ÚïÉ*r�#3k2¢ǜ_I¼­ÎÉQLÖSz9ŸUïgÕ¦Ü"N&6f?¢ù $@vz�7X8~�FrvéŸ<œ£LtVãÖVñ"¨›Â"­Sõ,´Â¦ø 7ž–»«#3Ñá­¾P¡KèÓþ–i®žÜí„m,…mŒ‡a3"0=ô¡oð£§Ëßa\Ò"~è©·¢—”Bd©ZE#&çÐÓ8to-µóíJ0ÒÚ>¯ô,7Æ&ÛД{ú3„.–¢|yÉß…˜•<ž»ÖwùF)ï_¸Ÿ~ùûq„oÇÝ3lú‚ù—jRl¼ ÔǕ¹�Ô|Î�Ø•B¹o.î›lìZ1—Á»?Ó>"ë®5:¾”íõÓO7ºÀ·ì!žç4[t*ƒ™îÃQCÜt`Ôéú¹ÊåžèØcT‡ÇJMNŽ­B£û;¢úÖ:G×”f:JŪBÜÚáG+GšÁB–·¨”•7”á>݆Î^ÊÆÍý´¶Üë$I-¯òâtz㱸ÿa§Û¹G×;gƒÏǬl²º‡r•�§Ž­­»Ÿ¿�Õë·BÃ^µF,x»$`ʼn¨¡ú“J¸;B±Gs-RŒ:9ï#®Çfµ0׃¶?]m�ï2¿Ÿ›š3a{Q’š¢ØB++Ý«¬ïDé脦ùhv呶‚)òÛ2œýžõTZ|»#F•~–gòF%O¯ßn_Fì|ˆèW3s4,úWõÓE£Ëÿ`QšÝÖú«—<?Ê~Žj4¨ÄLÉ�„´6Ò!‘Û9CÓƒ*;>¬æÛ®jš7—¦C¬�EŠÇ—ŒrõÑՅ̼œÝמŽ–
‹}Ìðb
çv/Ù I�&'&3ÿ-lÄo\ZlŠ›óyëÛSÖÓìµ@ƒD$üû‹Ž”E4x�;Ã\ý­5ÒQ9C¯Ù£Ûãúk9º:ö›
˜oÚœ£w3¿w®¹žäß�jÖüåh™|n±ÊMШQÈaNæÆËú\¹ï÷Mv(	ƒ#T.I	ffdÌ
óÿ«ÆcÏùj#&ǂγû¿Ó8å¡p×dêóðŽ–‹1É0Õql¸ƒ1~tþxÛ,Áå÷NÌÞd·éB¢°£®ɾç,¿åÊæÎé±è€‰�¯ÁQª‰ *±b€îü¾U!ýu½Õ&�SBN:	&h¦9׬˜óô”—žNª¯ašVüÝ%~(•B£ä³›žtEç-Ô™¦òB€„l�ÇNÜ}ÍóðøóïÎIÃm"¤+«p EÇ—Mס˜N>yù÷¥¡Ú„šqÉq+©iŠ*L$VÍ%ÍÞþX�˜ËꀕõíÖÙ ü=ÖÃ�eµA³Bó�äÂÍ~Éû'T趩eò�þÉš
3¡2m=Ãèá“{;ô£–a´ |=Ø^®¥®ë8V,b—óúíëñ0¨4Ù™[#+íòþÎí"î8~Zš’8¯ä­nSj§?¿É#3rÆBvû|r)ßf°¾ï-Ë󺤹ÔöÖÔY„±UeWŽŒôé¦ßÅt›w~¿æcy¡öéÝÒsü:vW»Åm„¿Òî	´è«Ë»Œïkû~ÿ4äPɸ]!¬¯Eù”ÝWi »»£¶º÷¨2	0#+FÈ7´øÆÖe¦iUÖÿ‡ÓÓlꨊ#30b}.ÿ‰å|1þEá7¯n™¿çƒì¿ÛÕ�NÆ\Ó-YX ^dC�¥ÒƒýΙ²²aÔܹ#3›·øO.¾¶¿ÈRÂDꔡ¡‚†¼¬üsÏLnàÁ-(G£ˆš>ƒuV›”UÔüÇžÂú±Š.tDÂpjÒI
…)ÝÚeqóÌ�R&šmñ!Ù ½0!ÃëØrÞH˜†#3\|º|%¨ìý|ûú3DmM‡#—ª#&ð™Ð3fœÆIvšpÙ®�ªKL+b#+X«qÓ–ÃÚò€ BEs·££ÁÝ—yÍ)?oƧ=ºDJÀsÕÂ’EJë®hpF§ÎeØþÿä¹hQn¢%ïm‘Žžî?'‹H@ûÏ“Ž¾\m¦DÍ2ª)	†PÄ—–¾ý\‰Xý oôl÷�$‡ðÑÎûz]ŸH³ML`ÏœU1œ¶~æ±g
�™ë×½y[£ÛÛûŸvçõi8Ó¸Îâ«ÄüÉ<4Û}¶wO”Å	‡ŒÑoÀXÉ­%ßâ[ž—e³ÛNbÈÄ÷ÿG×öâ3ˆCÎBT›û8@]« gü9 ¦§±7‘î;iÒ~»Ôf�,»–wÇ0öý÷Å}6�šF©êý¦Ïø9jí³eÊUÕ±µÍUbÇMCV¨ŸÍ¥û#~«"XQ\=1žEÐ�J¹u^»jü�Ÿ&O¢á± §n#3f5÷§LU³¸¶fúǬvùX6;\…k“œ #3)ÑMýê2Õ†è)‘3â!8ï寇éuzD?Þ·ß›�öT›?ʨ԰Îì»âA¤œu˜c§á6vþþ‰jNCö"”´*�¶v€°�ñzf)ë�ý™in^c¢5!Ñö„ÎÑ·ÚÔ„%òÁƒå—Qµ¸Þ8ªìèê|œÙGòîwRVïÇCyÖMä!F¾åñ7½Ö¿SÞ–¹DH夈!¾g·­»¬Ͼؘ®fVû9f‡={QLk'ÇQ�+r‰UÛpq)˜2]²ó?ÃÖþIÃQö+¡›ŠõÄîm&¥4v	¼ëáfsÅD‰®‹]ßtëPœ)æŽi¦×äô™³X™„!‡Û ñnhßò¬î©«¡éi¥¾ŽC,wrJv¤ÁFºfvÂ÷b}טî£Wç´;f�Ù+7†?ºp]2eêX-‰�Ç�ZÎÔë_»ô÷µäˆ–ƸiõQvN°ðÐZ£M“vZîçl¶D†ÛXí ÓlÒk£ŽDÛ‘ÁFƒ1åš-mèpÓA:ò¿ÈA]7Jé3ïº�û—ü’Á&�”mwÚ©�„ð*1",‡À¼[¯iÇ®(ì=Åi©ëÜçôÿ
Œœa��sÉ’IàHI„4¯œÃ,&¤IuþmÓ<š²LÖèy+:$�ŒaÜc”èq¦1¦Qô¤ûân[TÄ�!A�!›LæM6ª©bë)Ým›ó$¦lCÏ­i•´UløÅèÇy:Y;’‹M�tÚI^_ÛÁ�ög¦^Ÿðâ˧‚³MYW(%+ˆ	«µÌDQÑÆ©Ú#3¬缆ÿ6ÑËw=-Îޓž1.ww´ÚÛ0!{¼ÆíœNÖÑí¼¢såÒe›_3Ñ–™Ûµ>+˵ÌÞ:·§>)¹žY³üªqMÜ[­Ê;…Åål£¿]ûg¹WÔÙÛ²f~)?2¡ù—KĽ¼GZÞ¼q%±Â6Ludà˜èv#+ÙÖw½”㇈}æ#3‘Ï‘9òïmˆH›óŠÒ)¼‘„ƒ¾�ÈpX§	e��91¿IÌ–IÁÃD\?#¼/Þs5^ZvßCÐÝ™ÆDQ:ïù>Qº§óåóï«8©ñ×�õë;a,fxÇF7nBGŽ‹sìéà½Ã6Ž±ï×&ÆãóH“Y‰ª!½jF†2¯Lã4Énz5^¢H”Óæßœt‡ã<{Q[è__ö*Á/kg‡dÁöœÍZ#+@üuð3”‘`9“dµ_M© ?°‡É,ù™œô:Ä�㽚ù¾ÍÆüè­b¾ï”žÒß²õ]pS#3ÿMš·�k#+9oœL=‚÷¢�ÒW·–ô¼za�Ó]Ú¼îFbH¤VªTV’S
H [µ¾7 ™ï5«Ûáµçåê9×»L¾üÜù3C!Õ%0Š(5aÛT˜ž"˜˜ëš>½{°3[DÔ…´¨¢âH)º•¹BeÉVX”	‘_Ÿ—�ðkŒg½×±ÂXdU¡ä#aÞ÷†0ëV-	íLŸíü·²ÜÀìyr²s~pc.dü­Àê]ÊÄ7ªhŒ?´’Å‹µkƒÖa(p*ë{â'£çsvÝzÍ@߶.ìtÒ‹ˆ›I6ˆÐã‹ukúKH–@�¤5²Šs1#3ˆ$QµðÔ·uå¨Zf…©�˜Á‡t…�Lʼn§CÚ;O¯{1,NtÉ�adKuÂ}™R*ŠÑ;uD¶„‰Ùéo»ÏÔسF%³³;mÕ?ñ±ðwôÖ†­ï¯ÛldŒ×§—á�`áÞý¦’5È\;3�¹£ßC±ˆ"Øÿ‹èÍâ"3dÐëX#+Ý4�õâø³Cœ¬YaÛס1Ž”Õ#&èb»ÕU�’fmv-Þw_&÷o–¥Ì‡Su)#3*ÒZN,)�CP¨ºTÓÙ#&CZ*­¸•Z(Nr¯–²¼U—J‹L XÈêç¦qÙÒº#ôk{ëÈw¸êÉ:h$ònš½#júÛo#&¢™cY©ªôM®m�}[àoŒË…A�"È€�Ø¢j´�BeVŠ@‚2H£"9ëW¾êϱßç™»Kí�ÓžV¿~©F!*�ÐêÌ»­r¬VµÓlõZQfòFo˜ÇÞ¶×6"_ª1ÐwÛô¿�c]qÍîA/Ùå€�;—æÆïÓ'CÍ_~UQ·­�·m¡TIÐð4¥#+¤#á·ÇýŽ#3+núŠe]�AÕ"ß‚“¾G£>{²Wè3�í6â”"Λ²nSðäÁ¥®¥IEýz©w«Éè–ô®l›—#3hšº(-Q«†fUŸ>C¾þÌõdÝf+F¢do¦ufDaHÕ`/Ììk±åœùòY)iÜKîÙœÊîJÖuœ¥ÆúrدÉÍI!ûÿ©Û<oÇ—)WØú®3–Ãß¾IãwNÿ¬yXKõÖÚqÒ¼CZp’w#+x´…<5ðµRÌiG›@“0Yh;Fž3'ñ€´Íl9G—7…êPÔU�!ÜÔT{'Á€b©é/*¤Žq"$AÇ_.–ä Øi,B$EÅk*êÛ©._SƒN†ÄsÁ*‰#+¿I$«ÀÑ,B¶<‰Ñ,gü•Û±�Oß®({ä!‚ž„-·=/Z­[”ˆxÜ\¹Ñ(`ˆ4ç9¡±–6½N‡5^y'í!rŠ‹ˆñND'rrrœ®¤#3¤ÿi6ÁLÊœ=*Ã)¼Mê<é˜àûŸ|iò½(Tÿ�ÂÍØ”!Ð	2fPbVøÉ–@­.†ZóPÄ´×X`PfÂrV­ˆ{kI˜Ãad¥ÖéØž×j÷ôËQ]lz›Õ#&€ý$Æ#0€DdJ•¦Ñi›…H«¥E˜ªPL‰„Ñ°ùTÑÐ2#+¢‰À²�#+«––.UdD‰’ùšXÓË,£; 2)%¼ªZšo:at è"dûQgès5>ÍvW]¹*Šc^eÀÔÜ£é³�«P4K·ÒºÀh+ÂlÚ2•Iø¢!cˆg§è£Ç^›Ç¿C�²ä8�Ų÷æ91þ6ꪯ3Òv¦Cãúùr©™#+Ü�“	³Ù¦MKd5œíªh%4+²]dÖ�=Pg*:-Ó–…„ÚL%
g}ªüE…qr…<ÃíϦô“â<Få-ž†«ÕéQRø_érð_9jL‰ùUEfldµ‘èãT»]õ}!DCáè¶×zQ²ègÚÉK-–ãEmxýhÉÛÖ}¬úvÎÁœ»ÀŒa•œôæ镦_�0ƒEÎO•±¦uÐd´8ý^êº2¹&C^	‚ÇŒH�¤Á<>)Í›.±X‘! 1$¦r"|ñë{4µ]î43Cj¿iD1­…�©Eé±M.šÇ`óÛ¦l²`ƒA[¾¼§è±£ÛwÜÿ(#oŽç*ì­j×s®wXçl©I4Ðî×8ß7íÚý}¯8>ÎãqI·NN>z£6ܹ2­$F(³(„nª�/V�ó,4üC�˜Á‡ËP°Â*ªƒ®$âòëÛiìßl”²‡÷#38³èl£ä®•áÏn*þzøšaSòlXÝbÇ7r£2åMt½ñÛý]Vþ3v^áÜÁT˜
ûô©cÜ(ùK�‚üà¡×¯ºxðô’é<76ÇDÑYhCó9v«Ê#+€õÜZ6"M¨Á·6Úæѹ®F´ksktÖ™§3Ñj1€¡EÀUS¬°b P¸î’H“¢PÉcé½I¹®CïÕam˜q#&…1ÑrT’’b4¾J�Šj�&teÔg[t‚£ƒ#&Çœ`aØ3Ða×ñÞL#”üºCænG›ØÕðŸ%l†R&íÐôú'#+ÞÙFïtê§ÇÒVÇTõ—îuÌ\ÎF³®û#3¬g³i*Ô}ߟk~�Ôœ´Ÿè{tuÞw+Oa~ÔÇ·{·R0o]'‚W_D%öÊLCÑýÞŽZ>]&Šô�wêÜ´ßöï vûsøŸ5�[WL¯?û· [ÒÆ¥G=ª#�rÊ„ÙKý))Cû*Ú\Åå�»_—Àp�ß!û$}‰Î#+]:ðß¾„`­#3„zXâw”ÂÿÇŒ$_m¼£"âµ—»äÒb~Z9ü~˜kéÔ+6xCJ.ññi¾Ÿ[áËgœÒcg7Vÿ£‰"gõÓÚþ�§Å©#()˾ªJ¬ùRèòguV|µ´‰)?”0êϳ·n6侕O#§¼Æ؇‹-‡U”U;¥Âî’Ñ¿að`>ÙPnß¿ò=§îÊGæ<dzã>N¾Kúø¾ëü_ÇñÉ´fhìÍ|>˜ì:~#¾’³µxˆA�qëgw!MÔ#+ш”Ze¾#+KIÃAæ<.;ãŒöåe&#+yBXŸ¶Ü«¯‡Ãú_#+Ž$ên�.•^ŒÁ~WOŸZ,º™«¸dq0Œn9Œ Û#ŠÕ[EÇ:é{—ü®k'có/§ñxôÙÍeÏÔWx5#´±ÓÍÈC;¤¢î0ƪ2˜ýÚ÷ªÜѵQF1¦•)˼oC5HÈ2ºrLa*…1Ë
:£ì³é.vsþÖ
ˆÂ-ôÁåçø7wI¦’»âû/Õ¾î¦
ŠpèŘwv îà–ŽŸ1y„¨<1}gÖ÷~·íðõûJ=fg8yGÕt»ýÏI‹,„ƒ$HF±í;lû:Ü"™jK'+™˜�Í•,eIù\f&’Ò£kûOnvÝlhÖó«ÅçuÀâa�3A$ F^©¡[÷�ÝÜ\Y-ŸËóªƒnzM¦v¶�K*©‹„–ÓL,û¥ä7¦ýÏ>¿7»1Š"wUÝ@e’ØOxb¢‘}NZÎÄ#+ú~éû|¿£g÷_ä¦B‡wV��áøÔÝ!SDFDE>{ŸsþŽ§ÙF“»6Ž‹Fs9vÓK~ûs^×ókµoÒפmÄa†ì#3aâøÊ8!¢
þv‡	ƒ2`¯–¹¾•kò¯Mé·K^¦®¦L""’McÖÀ†#&dÈ�B”d'°Á?ÍøcîL<eZ¨8kL˜Mâ-¬pÐ2!)‚�ã†]J�o�¥ØaŒ‡ð"#+ç–°UÐKûâBùÀCŠ8ÃøA¯šJOõ—µaôŒ²ÿYýþ6¬Z÷>û]M˜u�˜1†Òʳdïâsÿ~lv‹ŒûÏ•?cNˆ‘G/ѼhG�rX"ô7¨›±B#+ïÀIž<û±6üë§ÃºÂÜΔ…Zd²ªŽlá0P§¤>(\:#+%T®™åmwýx±7¯z>”øe‚0ÀþÖN§#3©ŠÔB‘`„J
ØQŒ.ð±Vc©WŠ;z^?´7oN¹->Hc¨îøÛ:;ÑH(ôÝT¥'Ø“ñJV«B<hà&´VOò{WÀ[Ö)eø’þÍ¢¿vkÙvçòX¤“ˆ=p({X÷´=óöü´ôÏÍ¿ù0>Iÿw–„ýun3uWysÇÅ|\¤êÄ~OG�W¾›f~:¢þ¯&æ^­}¯«.ý3�?=¯±O£ä=Ä#3ñ1…ºŸGÔí/“»¢²9[âªÎ~óZlî²4š»ÿ#3"("Ãq©•�gCè�©á»žËn²ˆäMAtŠ©E?5Þ]�ÑÕ•T~º\:EQÇUöÞ‰AÎ6¤Þâ­6~+f}Ñ⸭pz¯þ’òxQÂ�t-Ù©Êc¤ê?L5LUñƒU–¸G�vUÙ²�E‰^“°C#3]Û®Jpëe@‘òЦwÐõÕZLn×ÒËQluµp&pp)Ç�Þd�÷wS²44ÓS¾NCõWUash�ÃÑul¨²Ýo§†Z¼ÒœÛʸ6Z55üòïE‹ e7x<ŠÍEúPQ›áÝ~j(ô¯K·îW#Zo¤ï<çÌî@öAJ­19QB-x;=ìrĉtªcwÆ»³_Ç_Y°ëØÖ†=q,!x¾C?©ßT8#+V±M-|2€¤ê×C­g6Äq`Þ±@m§aœ ¿ØÜ™³TØÇú�›#3þïíN*·!~ÌxÞZ°ðrLdiˆür4¿Œ“¼?FÌ*gî„cwQYÐG-²DÇŸìÅjM#êÓÉì}]Œù?ð~Í{d¦FïÇI;)�`è,×_1kýÇp±	2‘šá#&*ðq�ã§ÓW|k‰„¾Û®U£G‚"¨@OeÂ')ø¢åIÅò#à¤ÚùÿwÏCU[Ô< }âZUàؾÑ÷Ií1ñü4ÐÓO­%2Š¦3v„'œ>6Fʳ?Wᆉ¢(ª �Ú‚„æڟħÔô4)Õ@X	’K:–+‚¾Íµ¼CÌÿNp—^‡n�Ý%÷-"I1"§×vµ	³ûOäžO—ßÞ¯Jê�çt±e-Õ@KŒ ªY%@Yˆˆªü}¾0Á?Ë;ûNÿ�¢2Ó£W×pß©™‘Ÿã‡R‹1jaÌ÷¹h4?&��e.α]Ë�ø3^H×<UÓnš¯ Â_©õH8dÂy¡*#3+%Œ›–áñE‰–f˜2ÍiŒ„X€ÿ�÷š/ö'Êùµlñpþ9xwÿùsÕíó`ßg´ö û#&íå_V•Þß#+µûõ7³ö[îÕòœ%×úC]ôžìí…ÕÞm™£ÑTâQ¯<1“úE3»_ÎóõíÕ¦ÝF›#M׶ž­Ÿ’Œª6ß·ñÂåE©ùä?—#+ü9gT#3ï9Köÿ)RO>‡½nû»½Ý4ÿ~*uj±o™¶eÃc�—Óâ½$ó‡\ÎF_9Ä£æá_ÙÇw’>¾Cý®ßùÉwþž¾ߟ¿×ÄŽÝúÃ^oÓñQG—u=~žF“¥cãÚZ�ßf“Ó£N³ã«¾Æ]|›àþ^ÿN«®õÖOÞÔ²nÆð*«’üV¿?Õ¦Þ�·óÕ*/ÆÝNÚòôôÿ>ÿ%Gk‹-µhok·¬®©Þq,:Ç'Ç¿‰¯Ù¿«v>á§ÇF®ªtm§UrhxëŸ	W#3ša‘;º©�Ûú8wXy7`×ÿ:/†T™íª[i¯–­K9Ód®4=RG(ù¥k^Êåß½¢QÉúOa|Ÿºÿ%¸ù•4ìá=þ!Q²;)ª;—OßEðW{ì3¢Û8_D—–ÎødæTïͬóÕO¢~\zŽËéèô]×óØdg°ß¿ Ât@¢qõ�²‰¢¹J2yCó|Pmß)f½´õyºîêág¦œû~#+:R³Pþ4KâøvsÙ¯ÛÏ欪a†¼ž^—!˙ͧ໗.]SYǚϓouõN[aZe>ΠêÓFÄz+Œ‹�ÙCgûczÃŒ=›#�:•Rœ8K·n†²7Q“ûÿL�¿XÚG¬ösöþ•WÉíñŸGÍhFOu4KFõí§QŒËÎ�“³ãœiëÀëx“ÙEåÕ¾ÚµàYf»Ž¯§RôÆrMygšýóœh[ëë® êžÈ{sÃü>a¼ƒÂ�ÎA�xþ½Ø_¦ã~Œ©ßÂ;ý×ÇÚuï×júøy¸¿¹SN.Ý?¹ÌÑèMu-Õ�ÿ•öü{þ½8µÒ7?×ó/‹Õ~›4jR-œâ¿˜ó�e:°ó¾Ïp]³¦Œ>UÝðUÂe†¬xgá*?—ËœŒª¯ãêøg­b`Þª|¿’W–ìñPÿ¦:ÿ	CäÝ’Ç÷uõðé�4DÆ=‡Ál(¼ZKÝL69þÎËé+É“psÂ%¹hÒa?‡¸èG‹á»G�ØǃÙü¬ºïFžÅ§Ž˜Ÿ!¿ý¿Â<>oÙóÈ8%÷¿�×O½EÃW�×O_ˆçÛ°š ×bA¼?“Éø·sþj¿nµ&=‰Ù .È°ñÇa!hÕÙáîªpñ>îü‡ØnÅM§»ï¹CHÁ5¼xèÈ=† ¬þ¢qü·öÿ7óݽàÖÚ¯û;ƒ#+j
Ëd#3dj1ѸŒ~o´G¼ÖƒO?&oÃÄU_Wˆ§³_Õéå‡#ü=¿U;{t÷žŸ7?T�ý†]×Q¶¨íXö»aö³•WÒöç³^Ý[>�³Êµ!÷s³çog€Þ	�¬]¾+ÿ†¾ãÉäø#3|9wkž>£Åïýqésâ?YÖx�iF6øåÚ~ÁÏT�«ËµC?Ý^Ý<Å4}…­VÿuoÛøhhyÌO›õ{½}m¯/×N‹4}Tóųn;5Û–øÚ–Õëoçw�¸¿uÙö+�|üŸCp^}º³ê4Ôz<ÎRê…Äø‡Õ!Ùa¯Ðýüç ø~¥èjÛ·¿ŒŸ“é˜ç̽Ы¾‰7h�ÛY¾iÙ#3�Þ2�Çñ~ýwÒYä¥øSÜÌmhÁšÑ¦ÍÌCú·IÑ—ò‘®û;ðï8—%·ææj‚òÿ×Núýê	ÿ,9GX½XwøŸODU\l©*_æ^:®®–_<ŸËû°²¦¥O7\ëô¾:pôÔaÑ°Tñë÷ó¶¿m”qÖz`Í[5Ym0÷Uª¡j½à0ˆrwc¦U#+Ó²Ž]~Þº´àdÔ½M‚€èÆÈ¥vmH9¡YÌ+%‘m‘zZªVÄôTðºOn¥Õ�-Sªº1¹/‹]þþuEÓ§UÝy[Ë9”n;S¦×7ãŠS” ço/²¡¸ÂÌ›šS¯øq�â‹ÍÉ$œ…„›-âvæê(ÖI~ÖÝú8ìôÖU§°e�Ñölû¯÷rî뢎÷¬8J�i¢�QAÚ'òD¦“öKtª¥«3‰Îž1ü}ñÆb;>ÿ_·ãÒ:Þ‡Ÿ
Ê›¾‘d©g|šÌ­ŒÔÅf²\/Wã9ÌàÓÓÏ#3>×u/ŒC95˜ŸìÆ1«?yˆõöÍ¿Zí8íÙú„ó~bd7è~¥@ΨqÒâÓ-ìÄ´[¢“�ØŠ …Âúó¯Š_—঱oË‹Yl綌0«D&fH|'™^f�<Ó¯e‹íÃEsG«oŠ&¯ŽÏ²ZöX]_ð$Ø“&„PàçåíaUö/vîE›¾òþtj<þAL½q¨Ù¶²·{wŸ/áºá	é§é¾ó~:Ξº¬*z¹Äߌۻ]4è£Ìl¿¶uÚg^ÄjæÀœvýQªBîq9¥QM8yh¾é}((2͜׬-Ù‘Gîí¯MØVÝ¢ïñž4uÑô¿ÝMz;R«�[wíá/�ã¦Å#™uíJ¸BZ1x‹ÅUÐ |žÎÒ£>Ϭéõûóñîõœí7—™ˆð#+kïõÑ#+�=t{óØ>èªäŸû¹{0ŸÌçM¼®îôݲ-ËWdåGÃ{/$;êšMÇo-º’—�ÇŸõK×�óñzv~ª�ý†ÃT¼aèÖqSì›k:|é$Á+tŸ›ÛIXš‚}#ÇUý’ü#3$Aª§<õ}|ˆ©—v>Û!©tá.œþ‹rÿÑôDÛv=Nß;³…q‘~òÐÌË�<#a[r7+C>sÅ–�¤¡‹LÁ_>pKALІ30Cia#+#3+EJ’`ã@VˆliŒp5%Ë(ih,–Bîà©HÙ©±!Œ6Î^šÛ[k[‰ÑÁ,UÁª²–©‹PAÅi6dš1*™‹*ÖÒL²ª¤0‹tˆÐZWNÍ,uÔE"�Þ0À°ŸN+ù`¶çàÀ8¨HÛì‹B{`ZœY6�u£åÚx3Y�ÜŒà ƒý¼ÿ­ÔkÈ4iLd“?LUÓö‹1m?/óZÔfYá5!àñÑa<ã$#Ó5Ô#0Š0!¢3öû|ºç^«är£«ß©zq.bñˆ²Èp‘&Ù$"Ê…Scràgzd™"‰CLFÅFÚ’$ÐÐÔRiÚ™‘G`å%N@C»‚e©ÁH¦§G¨Ðß=ÿ>åáMû8ü…?l¾9ö.ÎA¡ü;°®ìèj%Æšµ-:bY:3ù)¯ŸmzM¢9ÿ=•g³b_³Ùß™ç=K×èû=:"~Ì+æå³ggØB†"kÅ»?VrŽœZùË�v|÷-œ¤|>',´ñÝ#•Õãî¦dÿl1Ã꤉RnØ—u·™¤Ô$…g<}j>ƒ´úO7g·ôþ‡þ”û5kõv&k™]	þc·”A´«îüœ ×\µý=y|“·�žÎœ(âµÛB6~²?ÎM)<¥(F/£H<ÞËøöù'å£òúfšW	¢qîþO‘åùkÞŽ™/ÃÍïüôWU]>Øuº{º*î»åfìÂïÙWèÕꨘRyÈJ§>²â8úx3sžo‘È� ¡S¿ãÄUû÷¼Í8V̳Ò�Ç�hê!…aé‘–ÐB—J—Æê¿ãLtÁJ¾JÒIÉ#&hi i¤`ñ”h’,!4Ùˆn ̘Š¨˜#+1%›µâ®S6¥I²2Wnú<·ªôe`Ð.˜•Ô1xjLÚ£1•U#&b`=÷kl¦˜)Â
BË–!KX°dRƒcbC�*VM07q`Ø𬵥<·‚ÐŒç�Êö¤ÞàQÎ÷ “#38²X€¶Ê#&An�¸Å!"ãlN…iÑÅv“yÚœjŒ£f‚¤â‰àÁJÃc‚`¨D, M¤]H1¥˜(&‘A‰¦ÆÄ›I6‘‹½+çQl—M�d@I¥Ù�cW#3ÔâФ]T¡¤IŦ°¥Ê"”¶â–&Â@…¡Ã|è\e K¤@aD¨ÁQ§(KXY­man]WCI"e: ª*r¤6ßùð‰é>lzQ7çE“ /6•F“5kVWe@Õ(¡ã†:Ñ€L´N²²P~¡B3$ôc—Á#3¬0ò"�UL´»ü Šœ`”S‰(Á˜Î˜b|]O\ÅòJaL¶nuGåm7:åÕa*00‹Ù.›d�pçsÆ7¶Ó²ƒE™öøõQgÑßGÆÞ#3F­ÿ:Çìò3®/Ý£ÍEñòl=ÒÁ·èù�®&ÎܳÇ+-·*u�d1ÿÙzëUBP%œrÖÐá„þ­xÙôÛëü¦°ìæÙÝøâmëä¾ü]·~nÇê;Ÿa‘½Ê¾Vzç„jT3³ò·ÏKýYww4TQëÓîô¿—]—Þ(úösê"ÎM{^µšÇ÷ÙÙ稄jÛ×V8²>#+7�i¤üKÇ[È—vøjßã4þÒ{±ã"/~èJÏÙ×ý²•bã)YàîcIãñG0ð‡l{¹‡KM#+#3æp_¾Q;gÆ#+5L‘±,¾'1 ]“ \ˆ=°<jƒä¿<½-²7£f2‡¿jŒKŠ˜A$”bîñ!âe#+açf].Ù�°&Ð�%ò=�êœHz×RÅ—Ûý)õ\õè5}ê ˜p๲xQ#+ãꞧ'ÑÎøû7Ñ?wNýþ1²ÎEÌ?äUÛlõÜÖ×C.ݱ†äÝRJ…ÀÜ2åÊ#Õ€"0{#³2NÉÞ½*—„h»$Žl4Oçœ#3ýΖ¸”<éÈÝ{Öæ%%T9n&ga,Jñä!À{g¢Fô’¦æ�
ºÆ7H}{ùºŸ)6xTc¿äç÷âóî£Ø�XœuÕãŽ‚0x8îåÕ–&�?Ï[1žý•·£çuïO…$B�ÅÓÙë…¶ê·@YŸ‰´½Y‰		ù©üpháT¢ç†ªp‰ž¼z6¶Íšª'ƒn\òU»ùc$’Þjºæ¬5îZÙ᧟R„¶=[V2j¯ZÙ¨>Š�šwaº…2(–àBrÐTíÌJ‰GÃÂËþ�¡Ç7&tA
ñ‚L…ÀH˜á?¿+M–#+6Õ#c$#ˆÔˆ±#+D¿Ôb¶
?ÕÍcÙ¤laYœBYN˜�¿5n¯©�|ÝÇäó=÷Nþþ¯¦^©“5­6$‘TŠ#Dò5ÅXyd”+z&‚ß“Ñ4Ø»�½“bF†6ÑÉ«i”h­ÉôйMî­ÃœB¸eŒ1A'©xåŽ/ª�Xaƒ…a®8cÁÄŽI]ËB£†DZ‹#&«æô=H¦å<M ­#+0ŽHž¯Nz#+W‘ÅkÔ1g|Ãèb&’<h3ÈñªÆŠPãÈlÃ4FkÉ£*%i¢®å‚ešEJñnrl‚«@ggÀ32:È9iëC8ÕCÛ$;Â,ÊÁŽ„"Ž(ÊŠÀq§V'H0lP‡&,#Q9eK¤íJm98$5Þ�,5ˆ©#m´Z1"”w¦êÄŽC'l
œ0ÓT†*ëÿLþ¯ö0ÃaÏ}¬®9½3%i¥Øª,T2ÖD¥eCoÑÌŠe‰P€ŸƒÂÕ»¦j:üh”#+˜2è<·Á„y8Ëjt⢳¬A„éÚ,(#3žªuïóÊ�R�_`xyaáGéÒ­q$g8y¬à”°s»3\ùºçuî§Úe#ÒR9d&—áÍƦ9Äið=g«ÓwBü›4×Syëäf»¦•~Ïb^Äoù¶ÛéÄïnæK´^!7Š/~˜Â.ÓIV춑SýÐÙT#iî°Ç§YŸ¤5ø01q#Ò‹«Œ/N	)iÄêdjÇR#ƒN@‘‘"FÕ†³~–:Þ’�EA³¶hk»¼Z4” õø9ÌïcKki” xíšx�/+€Æð uR¥ư丱 Ú­i½-a�#&ª2‡K¤\·a�¹Î®ÕV¸5bÊå¿«h¢P¢©E"H±‚¦µ4!lšhˆ(Éþ¿«?.ÿè~êêçÆš~üÞtPt}מú5ãõ·‹Àבèþ^që² Ç& ×ßó”GßMþP\=-]q&‚EËJ#sc`Äm»>&;›L9%ÄÙ#3`²#3	\F4>Iêê˜HÙ5¡‘�¸2g2#+”dè�¥¹F5¤ÜqŒ†ÅWäHX°Pm•Ê‹XäiÄRòrAcxâVDi5�ùÌìÔ8�£‚�``ËÈ“0,”Ê�¶#+ªwcy%,
B7Õ4CÓô‚ˆuTÐÒ,¥D¯½3#+—„±,Beœ�±:U8!ÄA‹»Ì]Í“¿<ï‚#34à2�p9bC0QÝÐÆ0íšrqP¢�^ÍL™Í‹L´ƒ�Ë.b�Q‘Kå\¨§š äR,‚ŠGbݲÉÑ'Ià¹<庨v5.ÙN}cNa®R!êƒ}ùú1~w°v8ŠQ±'ñ)�ªñ«‹5[#+ŒÅBË^Jéæt�[Üh8Mi«�‘Ø2³MØa¨Û0qvwùM¼(w¡VdþȸÖ-ú£¾Lå;VÅL�ÐíÁZMQÔób°t±ï¯‡kh»Ô„¿8	K:ˆèN„‰3úŒ7£¹i¥€àçs¡:ä3ƒ0àž,&¤®X�å2™B#32Ž…ÇyÊÇÚM8BFš[F榴Ù#nFÍ*U¼Ã2°i‘¶F«-*¥V"q’lpÎ’ƒ˜:³[,Zc4ä'_š�{Ýûµí‰Ñ{Û—ëcaP&3…Ûå“J°M,gHm0Jd¬ÃjÀ -4‚ȪU ™Mµ�sX±Gºe! �aÿÖªB0Pi1õ$‹á�ò€0#;�Ų_#3"߃lí’™¤C1B4'snd6Ý›˜¡4§'	–3N&$@ìeÙ´VlâýÆÑK/ÖÃ}7».d”mƒ‘ÊW:Å´ÎÌ0�6’fšNÕÕÙ¬˜�µ§l3îFöi•Ót‡c¹èvìx;&fÊïgk¢…òßb°l×Ãç;nK^
ñ‚BÕš¾{¦^‡^'UªYKÆ•W h‚ÒÑÆíHl�’Ÿ€Ï•Ø)ÝuÃpÂàß¹$kY×›?Dno£bö‚9x(Ú‹ŠœâÙ7fÖ»W*"	A�†½È…²(Lr9:ªŽÛj`ë[k{9tO#&‘Z7˜–K�‡1ƒ�ŒœÖÍÑ�·A|fÖ+!4S]`âÛf <±ŠÉrãý³Òk6ÎptÍRܬ5(ò(¡¯£Á’¥Ó¦Ú'XÑ“�¤¶Cµ-ÊÆ6íÝNqÕÉ0âÞäÉ=k»e…JMÆŠÌäÍ&##&Ÿˆ‘ë§}»=ã}W~ƒ‰ŠÈ¸é·¿ù9n‘0~%µ«5¡ùÑ]	å·Ý]#<fü1‹c$AçGw…L¦#¿Íb{[zÌŒ¶sáQÔX�·³8¤c#á®ÓãF#*Zë߆í¬Yâãè}#3	|ìHæ÷XÍë—ÿt›êp±í—Øx#¬8q%gò]¸.ž·ŒÊü]×£ó»Ë0ǽÒöj­÷¸Qo16å,Y�fYÞ#3xÃeE¿]N³�í’f«;4ÛJ;»¥)áÌÛ¦Te£0<~uäó\¸lbQ(çv«/¤Ä9—¥5)™Ð’@(Ÿ§LdÌÐç×C£Õ¥tã±áœÆAA¯xà‡%2íÓý‡}ŸÊ/´Í?~&µ–ÙßOÔóv€·ÅÄÅO'Vpeñšˆ˜CÚòF.™6‰òÈCæDt� Í¦þ;,ÏiJZ'1Á�uyÁ¡éžiÿeâNm¾Ì5­;ž¯„gÎ�>-g;x¡œyPöÎ1â9y¸N%ÔÉ-‘•£äùf4óNìerçl¥z…_SÛôãŸÆÓY}”©Ô0Jë'Åé¤y¢Pth¹ÆÖ؆ò$ðڔ£ŒÜ¶[=�&ÍúhLfˆRp?Õφû¢	 Ó'\Ý‹»„Û9µë@=	Ó¡ÖIÓ­å,á‚ص*³¤�Û¦ƒÓ¶¹wÏ?v¼Õú�Ú'¶ÙìѪѲ/ùïʼ3P˜ÂkëÇòŒ‰<‡çEù�•Ùɉ�ŸÅN¹å†¯ÎÖÇ%\áòãM¶<«gðòÁÿÒª™´Öî)L�Ü:0ﶔ‰Ó­bkñøÀá‰ó&$9ÆÑ’�æ9ý>^#3û\µ5ËÿŠ&)ÔÞY¬�_©Yñê/V-ÎÚYÁõ�úXx#+áÀœY„ÐtÄ vÚE¾XjçVU‘j{×¹ÁâÞ¿³¦™Ì§Û†‹¸E£b„¾oj…öøÈ->I×t	£ØñŽPª/å^>1ã¦Î…‡šD£(UYéÆ~uœëî+„9³ª×2¹>EïgSño@ùýy¹ß*†ð�].À‘é¹¼1#+¥«}׸ÈZ4eo§èû,k”ºN>S%ä+Ë·Çà]uŒ’Z—èv CV‡J-!œLSã§ðÂû‹?®­¥ššè8á± 7“„äMÛ@äÜÔ#+6ðÜÆ¢šE®tÓeì™YãiTs:gIÂåjkHD�_.ˆÆüZœ°9úzaÙzV9@¨¨�nWŸ†9ΤbÖ†®¥VD_)–Ö&]ŽÇ?1µ·2mÖF‹’ß“djRדă»Åƒ‹¹íÑ$îÀsyup¼ð‰"ÑÀš¢j‚+J®�óòË8~ÿ$UQRr0Œ5Ùþ{Ž*¨‚¦Þ…#+ÆÇÏãl„ŸFç`ŽÜŽÌ&b©òƒuódÜ7ïÇa²ô­Ýöd·g!š�‘ˆ%Qhþqé¹nþÆ#+¸Ù“4Åì�ó„¾—r È›±—bŒ�m”!(#3Fãð1. ÐlzÕuØ@.sR™-�{#&ÄðD¢eß"mìº4¨xïù,¨ØÛ#3§=½(«í¬!#3”¦Ý¢>æÝ1¸¿ñÞö—#+&Qˆ³?øÿ×W)^\žŽmŽ!(»ë(¡¼L¶ ##+èŽ6}(¢ý§uI<x¢Ó+u´z@´ßóQD|Ë#Ò›½^†�×ëVOf÷-�؃cß$n:Lö-K÷ÉùjÇíΑ¢õÓj‡±#+b1Z‹Âvï™L–›#+é¦l-�—'š(“‘zb>}VÞÀô%$öܯdn=D,-úÂC t“
áx2mŸ8ÜÏcFÙݤ§n5×CGô“™Ø~{'ÍonÏà?;Þù¬Ÿ>Òîx²tÒÓDÔ*lså³+ÑQ¦DŸíOL”!4b7“‘¶}['pæ3Â[ÝÙö²~¸®§Ãñ%ñÚ¡Õ×áœýíü¼Ã³úZarçQKdüŽÃóD÷:‘Ö³‘:jbV{ë7‡õé�M[¯h&Y‘ Î΋¶�ÑMô'…#&Ÿà¸nïl{÷ѯVå“D`ÂaÅÙ¡kÓ/m‹Ì2C9&^óMÐe­aÏ¥�56‹L:8t×X¬¶¾mÜ*ßy}…ꛞdBLFXÏ£ml_ûˆÊðUi²WÕ¥Ãâ«+9ZW’óZ¢ž(rì·#+äè£Í‘&•i‡JCáo]u|gÀ�Óª�Ð!s@�yä†Þ='<´Ê’ò-¶�"-Ü/×`üÜ$p�´Þ�ÏMúðl)>‡ÆžØû<ÜÀ™;á‚[úí×@'¿}ì—j¥Õ¡ÌV²h„¡i‡‘æ\QE|04ÇF1H(#(…mÊBL9g.e1çJ0a·Vï|Uº&•e]*™žt�§Vâ윜¿Cóëí-âœï¦‚ƒ"•E%BltÊKk4ÎÂ~2ÊñnLÙãÍïAk	ó/rªê¤õŠ‡+öGÛšàs#+�¤MÀ›JQ°ûìK�—ŒÎÛA”ßçgfyt|½cŠõ¥Øó;�¹¡†³7¦•Ù»	¡Üè‚wHîv±b¯cLI¼½çä=‹ÆÆ>]ta]ªVwå*-ˆåµ*õÚå+€¸ßR»·w’ˆÚdv[{'»—Îlô,%°–OÓ«§¯¤%ø¼Ô?k9cßçá±íîǨ÷dN±«–“ûÜC<¼g¶RÆ/hÖZX«Jðöíwn ·ìøn³=§aó$â%ä¤�—<YCaÛ?ÖÇ5¡ýë)º»…pâÛ)ˆênCí4Q²ÇâæcŒN·Ùu[Ãm1ø@NN#3³l#3ЕõÕ¬�§Ó<ㆺNk-·UyUD/±ê¤€šDW~`qw/(Tü¨ÝëåÒÉ/··^¢ffÜ@ÌÁ‘#+ìÍ¡y&õAPo<5ù^øÙRíÄø[ÝÑ­ÑËoå-¾˜ÊÔÕ�ñÏÊ¥m·Z6Òü�±œ«hºèGÓCàÂÄ6Ë•Zjw†íÔA˜´ÐôS]ƒDêh¢Áë‡òˈèh;c#+OVϽoBè'ò×…4‡À÷æžM®6~·âËÙÜE—$˦¬dóxÚ2ž)ËÄõÆÚ^�vù¯óĵk‡K-¶|²m“R„C²Zðß‚,Æ<ÝcÑ�È0Ò]²Q³a–U3cϳ¶2¯&BD}M¤Z™£öÕ‚½ôôÎ8«pˆ}BL@­ËÜs^¨Õ]ë¾â"käR¬®2Qj»SP:Ó£#Ü@¼‘XÄ_Þµðù:wNéüÛ_Õœm³h^®qgHÀ‡‡´ #+I#37ÕÉ#�÷#øCäÍÿ-óÞ¼ó/ÇLÖp ¹r|%Ô±ÔÜñŸëKdK-µÙ(�FÕçVïLxªœz¿*ŒÔŽ`Šq?ˆy÷Œïžp4›&Û:¶2Z>q�ýÌí¼Å7¢Ø³hâ\tËyE²´rƒ¼W5gLjÏQ/sY쾯¡†ì_ëú�»ã¬	u#©ÊÚG/y:õå-vqVa�é¢4í%O™©"ú¶óŸ	Ñé�tš–^�éG=®#3~<ó–°Ëa“ðò»™¦÷T?±‚ÍYQy#3ëÆS2ÊZÁís}œËRt³þ£ü+qh>:æZB-k4Ô T±z3xÊ-F>�T2Yµ}5�uˆÞ°4¾#+aÎþçRó&kÛÒÀòE˜¿L“cN©1Þ\ŽŽÎš‘/Ÿ�Ž‹äŸ;ðm¬£`XO<b;™™•xh ã!¡œ]Ÿ(“¿C׈ç¦#+#¥XG]ÙÚÁ7[Â*ßE¡}Mœç�páÙðS�«RŸTásgùhÊÆ&/¥ÏÑ/‘‚H“½>¢S—ëù¨³c±Q^%¶F¾�ì6H¥#+¾Z¬®vUç–w¤Eí¡ÑÞò„÷Ñœí 6Sü´�†îM¹Ö³WÖÖV%@¢_Œ'~®{IŸ+cj}t/9¨©¡Ó‰užßñH‰60çÃé’åcžŽÜ”Tjª˜ÛŸÛêU#3r¥CŒŸ¯¦yS|(1wÅT}›ˆÓ2Ú(æ)5Ty A¢¨…„�øÿ„u–éÚo�’­ðç.æØD’¢ìj4h”�ºä†N¤ü¨Ê¢-TìPÞ¬fÑŒ¯ÎºÕ¡];¹¸Óq׎¿ÏU¼r¦#+ø²¼»ý#+Mæ¥]sOIqsÓò°¼ž®zuÜþø®ñßae±è£]´`)Ñ›ç„h/¡‰ñ­ðU$â¹}¾ìBF9×á·†­|xë°¼½ýe&÷ÓšÖP¿]#ѵC…æéíê�Ç3óÁÊZŒj(‹ß–VWT–ú\ûmÖUyåâ·ö9+Åã¡»‘×èLï]&P­æþ»«ÿ‡î£¿·oPã2q¤õÒ&™”‰ìÑáL¸„ÛÜë?Úõ×ßeaøÛÓ~6¬,z?Œº«Ö8®üLïK¢„W»n/]õƒBÇ‚�·Ã›|?ÊY³eæ¶úš)ï©S¢éÁS"1£TB•#œÝÕS ]»(àj³»¢ŽÕçŠõsܹF–}ó߃®0oÛXaü®èñ\q„z¥WWvÝTÙEµÄ¸NVj E7(Ïl#3#3°®Ž•ZŸo7*©7ŒDa{C×ot’JEó°¤MûýÑ?‚üêYs°ñãÈÞ<ùÛºÛE«¼\¨+ñ§Téܬ<|¨À—­bÞDÿdmÒýè“ÝšŒï½3`K³·Ë&úÖ8mßml%àÉ7ßÊÓ]ºp´•prŠ¥WWå¨æ�o#+ζ†[ÅIhcJ=_*ÍÓë=”PWHù¬ÞjáדÏ*»Î­¾~�:ë1JúÛi¡tÛô›ó’ôb£I?	ng¼õßZ˜ÊrNWb} ï}#+;>ÏÉnhÓb7½A£™&èátÛ¢Ûs‹,â;­ ,eà8‚†3Q·‘�¶$ÜÓ±úÎ?Æfo¸ž#ßÌ*~û‡Æ.j\ðVôѮ٧MtQ{”U,‰‚ø$^WÄÝÂ0îø÷*Âa§~q¿Ég†ßW�Ë>´üFÃãñ²;>Îû®°cܲFëæŒz9T›G\Ô×/ñ¸Ç»kx#«?e¨}³¯O”n~Õ…å#ñ¿´W	3§ŸÝÌ4¿’ŒìQ´ÐŽàw|ñz ZÔ¨¿œ{tÖ>{̲·Ú]Õãß´›éÒƾ7¶õ¾¼óåbí¼F‘¥å}ñ1~Y“SoP«ÙL&—ey<C§;ý¼OsóCëKiQ>Ž{u²�ŸK>Ëôâ½—�µÆcŸÉØŒÇ#ô5\í�K:C츈Úúúzh¿Nݶqò‡;,ÃÍCY…4ã!×™î‘Ñ;,�-i2RÔš„qÆób×k^YMÞŒ9Èüò¦§~yþ;®lZtðH…;HM•Nfý¼§�ÍEžÎ}ÅïÓÇÙY6Œçhïr¼íÂœ¼ûð|n¿ÝÃn¬Ðu퀟v³™¯/A£»^ÊÑÂÛÁ)£Ê_g‡ññúóŽ‚3×*d}ø¾µ?¬Ð¼É¿%ûu±…ÅrOÜ.vÎpe|‘ñØÄk¤g�‚y«ã'XI•Ýâ�_+xzóôn;çÿ£g·ø`Í¥dUs£åCV×ÑL[}#3­«,ðcmºm¨wÆw®i!CO"ºöHü3ŸˆlåÏ�å�/>w‚:yD1c7¬3´‰.},í©aÇzÐM*"’˜ÓXC¤I‰�X19¡¡,Ðæâ³ãž©òtM¶÷'—Æ#3Œ%Hü±ãÕñ¯~Ý$éÃ>å¨h­Ï¤k¿¬c·#íÛçzíµu¦©ç/<E:Š§Ÿe�žNcˆóúAåÐ~#'É:ÔÅöùž¼×Œjcn¾O¹Ú>Û×Yí½•F¥”©™šÂìñ}ÖSFyØŠE§½YE~ÖWOŽ¾ñçöÉ`¥?’9©÷L“åñÏ{,ÝûFyÞçŠ<q¦‚—ﯢ¤�#+\(ßµŒ"çL31®¬6Ö¶ˆoZ߬4èþ0¹øýc¥ƒHù0·‡'\¯žÕ+ŠÔŸý¸`µÇÀ"1;q$#ïV»'Sêí犥”£OÓIÈéÆßuñ‡íñœü¢�ý¿¾xÉãĪå¶Ô=ó?}ÌÔþåY<ž/´6eu{‘Îëí]E/†ÚäûºÚR�èX(oÂòuó÷Q:y¨®è“‹•ñ#kÈü¾µ¾¼Ùè´¡+4í¬sÈ;££šÎ!œ+®úB‰ÅìƃU´ŠÇz¥dx½zîm”ÕXÛa]ÞßßÆÝa�xZò±:½Ç«¦fȉ8lZ´Ù	Q¦¨§	0hæe¥É½vqÙmv±&:áè�0—Èzƒ#+ù¢~új.·�£{9z„ÄÀñùbaž«‰h—diÅn¸ð×즃„mÏ›ûß\«ãcâwz1ƒ®«»—÷]l¤�¹j#3ìGí–ð�-=<~­Reîy§f">ŽmÉE#3ý9ÁR£áqSÖ.¥Ü§L$(—‡u½1Ü¿%Î&7ïØïð¢q®qõÇI÷Æ»f—TÓö;mÓÈŒd®c}î|~QÎ3^J”ȺLï—ú¿²ó�cd}„’qó8ÁG«{TKªhŽ#+ä_ß¿¾ùGºó¤¤ãGìšdÃ7öeÀï‹ãB^ÏÏ¿ŽÍuŸ]¶‰m¯¨ª¸jæÓ~Û̲”[J7ÞvlmãÏß)V5�Ë}bzGÛ�ŸÓãÓßW�MÞvÚw–è¹ûU!EU«£÷ØRR½H‚2XVM0KÖ¥º!¶Éцt>»b(>ÍÇWǯjÖÉÕïÔåzPõ÷&Íæ>ìÉäž58#+uoe˜ˆ†Ob+([+¹RîâØûi•¬SX§üDjO­Û#3+†]Ïm‹²�˜µõ?f¹ºn²Û3ñyÙ
Öî]xý»§IîL¿Ñ‹n{w÷½1ßʦ¤Rª¢À¢žèð†©j½sát!Á^¡²]ñœ'#+–þ$¥§àð=±Ñ¡0Rô"³´¶SñR][»ÌAÛ¹]hGQW‡?UöÒµÄüš®Mf˜]Ÿ¥XXX¦@tyj…¨‘ WEÆrL¢¡Ìázƒ»‘�(N‡ç�6›óÝnÌÿ_âô%t±Æ¹Ý+ì§Gø¬Æ–¥#3úzn™$?CÀ£«MŒÆàüø‘+~ù�–ÈįÔù˜G»�­q¾°�¶�}IU¸ðGäTñåK«è„£oË\N¬!IÐQ‰×‘E—¼HSR°1Fp�å8^G°Ò‰I©OT*¬Ì‡W¦‹è¶o‹g\±aÕ;/m9»ÙÑ	Y„²–bƒIõA²Ê‡kMÕ:ð…%•ÜåÀñD“âÝßÛÓÆ‹0îèøyçk8¶o±ºéIñÞ¸¦³)ç'ê|ÑB=ÿ'¯+yéÂÛ××®vž|Z–lÚ߃iá/�·þ1ß_H©áã¿ÇTŸ÷cÆ~†¿ìÛm	{×µL5DÝ®ðÓG_ã$’Ûm$&ËÖÄž˜÷Õìrâù-mu＿³¿¿_Åg1¶nùá�åÛÍar³Ó}ÞÞµðÆ$¾zDàtÕú»u­ÙŒ?g/÷¢7ÚžOOÃoÑNpø38•Ö»Ñ}©·ÖÛ#+øÆ
.øôóÙÌ’®º`X‰ZöHå”ÔGâxaI]JÅE0NÐŽ²͸‡í0·^5…Km/›Ý(ë^xþå¯3¾e©ª DÜUh!ãåãÈ:ѶÈTÑx/‰Ù«GŽCòë¿ ‹4·c4i¿ç’ñ8A‹3WÆÍ´h�ÍaMÄPÝIö"劈vl¯Éˆï¤§½Fî‚N>#¾pÓ°Æ—��<#3h…Ûö]âO;%G†¡}°Ü¯Ë1sUŽ%��C§d¦›µìªR#30Ý_^/=;«^�u[q¤:šÛü9­¹Äd8Øq]0Ž“2™RtSÇ\󧆓â+ù2ÆÛ�ÑxXu‰rm˜ÂþnøØèì8má`ÈÛ»AqtÕOa�ë­êk�,ëÞð­Ýé~U	*θF•ËLg\ ã�x=	ýÎù ŸZn8Y#3ë{j©ì4µÊ#•6W–Ò^—àºöçžz.ë-ÍÔHž‡v^ÿ·Îä¯'ˆAüƒO~#3}â÷[†üÜ:ÇEd‡7[b·‰„m—Tìó‡„yr]ŒUžÛ>ïÁðŸæÅzu·ŽÑ²1Ê;ùIdÌ!K„úÈY:(òo�æû-属Ñ÷™Þq××ÃmA’Ÿ_O_�ë‹8ñ¢go*"l¶~$ÇÅñ,×ãæßGÁò³I”4>wîJ¯h³¤úAƒ-ãÝS£É_L½+·ãÒ&DáÝóKç›ßCÇ#+,aQ+ŸÒ²ºØ5ùVDQÆ1®ýxDÏP?ÊvzB^˜âÉ!ŽØˆÝ�,âx”äf]º2yáÏÒ욤Dz㴇ö}”Í‘4Ç,NŠeÊq%˜†…Ë®±ŠzùÿIðìòWCÖ§®-ƒÁõU6lÓ5`ÍEÎøp™}üȼÃ]l:Ð"øxóâI^<—‡Ž«•òÆao…œoxOéàØÚU<A§œÍˆ´R:¬"çü°8»&ò XxI¯ìÔl4›Ç¯9jÇñ‰µÞ)u){\¶ôœ×¬å}{_dO¯&E%b²Ùµ#3{5÷—Õ6U£e‘kw'+LZŠ)s{Ž×&�FW[m“5—:*ºjÛ¢:å$s׎ԣ>}*�1°øĈëçU³ú„\Ü(C£càsí_2øÏÆœM׏ëÃÏWŽSÊCôx^ë<"ú[ '7±<äÉïðm&æS3²G÷?·Tatwh“2rÇ�–*¨FxÁ4w¦Æ)ë)hKK¤Há‰i¤ƒ©Wx{û«ñm�¤è-F±qh>j΄<	�vçpô@Þ#+’tˆB—zÔ:h^×´g'yi.Jý6÷NÇcxÇÍÛÆÕ|gÖcÓgós[1ä‚ñö¸æü±i©à<¬¡�2aé©i³ŸF/4“²)61‹-ú‘qˆ\ÄylÀÞ‹~Ïé”ËÖ[‰UÊ5›FÙ-AÂu±/õVÕyÁk—ß¹J#EB™1…°–»î“±ƒN¬‘–·×cܶÒ3¤2€	[‰èMƒ<+�ÁxAõՀ勾cŒŠh1ßýw]nÎȇ‹ë–âÁ¶Ue}išbo6ƒ£(èÕöÂý²_§Ë#3ø¿iÍÇ¿ÈLBVPÏ+n­£míT³ÒÁÛH룻ý.é7†¡Í%þ|h57ÎoÝ?/­|F³æWÁà[�#+*"%;o/’7±ä\]ëR?ÆŽtSó¢vw[Vó£feÒ¥@YǦ1Ó¦^íeÊ‚4Se~Gz;ÞY"¶š\m#&»;�tîZŠ[nþó›?“ò®™NF£‰rˆßwºcJ	w<) Ë´LïS�Ýüﺯ·85ûêÿ=ÚÚ†k½™}YgãW¸¿ZJ…äCXî›é{�M<¿æxþr±°Þo.�õíóŸ6ßÄ|}›�çŽyèNµ_»)Ùß»�Ô³âA‡óYñTS„“NSìôC¡öJ:mO)C©�ø}klïði_úe®R\«Ù­3Dɾd7¡}çå?>_P»ùR$%#+p¼�IJû¸šÊê¶0D:�G'¹ßDGMO¯¾Vºpgô©í†4%1?nÎëè~#&úzïel.†KúNÐ9AIôÿiérrF	t’(Œ)…ïî«éí¢¢f#+¤«XµT›™¿ž·U<âÓ,–„#3Œ8oAE!{£órs	®l9t¡FR45mH™½7½nõQǴجA„ ±‰#3�ƒ´E4Ê[Ž2€`Vm¦§&t%�xÝX6îCŸ°c|zéÛ;vVÕjÑýj‹6">Ãg#&ú7I"�Ø]¢)P=#+yòÄj+Òë§ÎÜÚ
Ùƒ#+ø¾<£®Ä´&è*’3Z˜UaÞr™D1‚Äî{~Oê/2Ťo[èjHÔ™#f²?¥óÔõ]Å…bBÞŸçfmp®é�ÈÏ?‡cI´Y1¨ÙPmÏ£ºïˆÌ×p`£Þ -uPúêmf×);ÙNÞhÏ=B&ÒLí1Ê”'Í;xšu6ÐÁßg‡+¯=â».fŽ‡ûN�0ü—A¿âfâ3µÖ\#+-¹=:pµ­ïéj6¾�Ôœý”DŠk�z#æ)‘G¾‡�zmt:ëƒþó?@b88�6ˆ“j#+‚e§	qàú™oÂC²ÆpÛ:?cö¿z«¤D3>%âÕ›M/†s”�ŒõëR‘Tvš�Üp7¦¥Vˆué«žã‰6Ò·=o'¾GŒø|Ïõíöý©<a!E'„çËšæFèÓd[{ö3>z%êßDTÄ'Öð稤9Jpè0¶*žb�¢Å§–e¿Êª<såŠõáB2d !áÖS‘LµeŒƒ�‚dý½ïÅÓEì‹çBˆGœ�ëaºIõ!îTŸ¢}I&ÉÁ2ÒC�ývij#3‹²ÿ·þkn€TE{€<vÐ)çÕLÔå(š%k8²F{S,‹ÞA3dCqûšš »¨j 64³Q@{‚
Ö¤ê:#& ·jX#3ÖŽò‰Gº6‰ê›¨¥_tBð#+aw#+nÖ®2Æ„Sh¾¿ëLè7Ãl�v2»€ú¯<*ü¨ê‹<Ý©-!'Jý­ $3nÿ%ÙÜo<sYÀ}¹˜Ð�ŒP‰�n^Äöq•´õ¢c0Q}!©jX'¯‡Ý$Öš86Kï'²:Ùj´60“Ôw�C#+i%|(y¿6bæCò5ðÃ\´£‰|LOŸ„ñ¼J‡æmºuã–þ-geíÞãFu*U¨ëÊ”<Ÿ¯ˆ7O¯AÇΑZ6ÚÜ$ÐéÃ-™»Ïà‚4_; ˆl	79¸ôBê¨/*yIã)$Ø´ r“>nà³;!~rb¦96q¬N[õA¥BxSDËÕÀ€ÿ4r#ì"¶4ÀàŸ,^Ϥц˜á)£È‡l¶”ïÁDª!bœÎyzȯ¤ÆÄéÙ‡$˜ÝþºŽ‡Ž�·æÍS"x¼‰Ó>äuIs×”#+s×j5 ‡#+-#+9#i´ˆÙê.ªÇiÞŠ5Z¸–ôxÒœ3� ˜”}|JGÊ óÓN«ïõÌoÒåùwU‘~e®¢!²ç#3Æ‚ãE†²¾Êe®˜vQ¦k‡]Lo†mya3ÚôæùG·×°¦©Á]ÆR)†ý¾›][3�>ÉDKž¶»½^š(/Œ
rëÌZSLhñíÂE»ê]'”q§”Œ`­²XÓ&3^‚Hv~ÊÑ»=‚S!è„ìb’)a3ˆ|ýïmu	0Abé!¼X~fB²‚Ο#ÃKƒu#3-·Éºk½«õ¶	#3í�„ŠLàZÍ„iÿ_ÇœcÖ#3`dÆËí"Òô“ÇŒÕ�0•&ƒR)/�hÇeñÒÒ!90ìÆ/òŠ‡¼=8_†z›Anž§$×`çtÒ‰ÞÀ)CÄMÄQ�/Žz¨Zsæ«
ÐB-k¥·ª|g^ž½:ì&ËS(�ÍN‡ÁRb&”4}bN<…aÑ	èÇm°²©†n3ùÙÕ‰µÅå¢6ö‘òÀnÍ”Y‚•©.y[:�8ÙIÇš&˜ˆ/|èÓ>sè9>}Sߢ¶EŽµ‰[š¸¥çã§*^ýµ^â×#+´Ž^ß!¯"K8<èzl´‰²V3jŠ™ªýT˜Ë¥ióôáÃŒâl(Ó�ƒ[ù²–OZÇ*«‘dæüßà\¤¹–	@Þ‚fi¤àR—Ò�+-ù]ß=^“y¶â›”бûeÂ,E&®Ç_{`c­Îë7öˆÙ¼[êOr1½pÝÀ®%�Ü¿~ÜmŒ¤Ýψ)á(ÐF:)lÚûq*G’äRd%�NlÛÜÆXK5ÇFŽ¥Æ4\j;Ÿ#3Ùu™¯!sÓ¿\c§lŒ•Û>I2®Ül¹“¨hEÁmÔن߅ã$Ѻ^æFEÌìôwmœÁ.ä5s¾è¾Däâ4÷a×GLw@‚ž[ì°"+�W›�Bñ5DžÒ‰uÁ¬7æBZc#+WYñw¹ÁqÛ³ÁÂf÷‹æ@ì$0p�ÁLÎÜFÄ¥¶«"ƒj}“Ó­ÚTÛ^!(ç«2S Æ�U·9¢½Ü´[fÙ‘Ú³™®‚äÒiã>¼(#+qÐB1Õtq°b~3­Á!¦î’Úáºl힊3|„⯖ì~Mvc»øÖo¿�¸8³µ#,×x;ôQ«ï:묑SµeTê–3,Òð#{ï,,]€üp9ý'#36>“ä¯wÐBó
_2Ž²úbjr“¥5 ¼Ñ'³â'�…6Ç"4o’ŠdÒq"ˆ}ˆÇg-5âž#+Cû‘"·@†Çm͹ûzìWK²X…Wé³±°�‚ÂÒ4˜†eÑ7$|=¯¡Œl¾9̃g:ßvve"
”�(séV;�Ñ”F+BQ%¡¨¨ƒèó#p³²Š4lçÑ-7ºwXÞ8fFȸ;OL�—dÇÈ-0gFè8š½êt°e¤A¾q¼ÞÚ¼¦àm±ˆ^÷Š²85#3™'JO�uLNzÀž¼a¨KdBÐS…mø�^ƒGŠÀ’:†ß°…T�ö#)ïˆÌ�äÊ#Ÿªèü‰~¯N뎛ŸvÒÉÑ¢xô×fã´xym<�é¦ë3Ê’‚|M�!M=lñ ã`„¹ p5Òéˆ~šê©ztöM…ï{çetÈ�ßZÛÆ™¹CÞéÿcø‹‡Ni(X—�9ÇXýJÃì,¢-luËŽ#3,C!ùAôËÉ“»—¯Wl#+‘Ÿ8œÐS^)³,»3ïæeE½»wŽ¯¹àö»ÉÛ5…†xå›dêùû5®rlýE³=ÔϷɈo"\9ñ–Mº+¿ˆé_gìÆÆïÙV×çóðñµdè³Ï_<9A×ôwU¶ª�¡Šv×p\e8YNêp¸Òt0%®ëMþ#+q¯v¤™#ç£d)ñ—~Ù˜–S·~)aòÁ #3ÀÚ	úz)™Ø$¬h÷Ý�Y×…Íï;r)Md«ÓÉpxi}]-c6œ8”VúJ—59�ÀƒjÌ�‚rÍ>aååÓ
ÃPDióÙÚ´XUÛHÌ»fr(TåLj�Ãupßm3q,ÝÊš[ÍE#+ï' #©«K-…%§>ü7Ùæ+å�1„Ýx×&æ‡Ó�y—h¥ˆ¾£e“µ‚ù(#~Þª2•»±{ðMtív¥4U¢'$=ïPñ$¦Á¢Oö½ìgÖÐЉKñ•ÆÛ£Í?]•x¢ÏÐÿZUBU'…|ýß#ùPytØÔÍÙOèyüwõ}xÇ÷íÏÏ-nòÝÂ0Ê*‘LmÍ3›Å;u^^y^S�Àé$†?wãüýèÖ�Ó£j>a‚ŸÉjGcÀö´;‡ýb"Ïóõ’òú¾Œ®sï°H8ÖÀ1þ"Ö€µôbsЬÌówñäÒMþ8&ùý|µöh"ÅEU„4IþÚˆZè5åÌÓeô&#3?±÷}Í>Y1�>A7»×í‘>a¾Œ´³´=šëç«€3|6‰»EÄŸ½¼áÝ#+~
³¿‡É__Ã|I%a|z®Ë6‹še9ªÔábcV°ü˜\šq¹êI0W…AçT‚ˆŒñy‘·Þ¶[ì0}œýîêçÏc§(:ü2±í¯q$…ýßQeüIÞ•‘ä–+˾üǵ+©ì°Ýj|éˆÈȃ¬õäkÚ�õZ»#3/²ƒv|U²ýºïˆì;j*"¥dBdO†NAÈ›Æ�íJ¯Cy�nZjº–Þ&"¤ÎD?6ð¡µl¢ÔDiÐ1%{kÎ	6mK¦°xêØM¸¢‚e©Ñ�ù‘$$’·'®·0~€Žl?O1®ÂéÃÑÑ$ôx]YIœ¢ü“GaèýUÒÄê´÷ÓN¼j H��!_”»hò‚>•Ñ¡-cšbh`ÃŒ–aÔAŸóžl‰óûRL®Óë‹FípüS{±OQD(·¹?tþÌË¥¢špèüÑ<šÑ|<a…�Kô~ൄÛuw£&;�‘š#+Ç€8Ùäû¬š.�"�Ôº!ì(2@ËY‡±Š&³· ¾Öô™”!%t�µ²•±¸»³L@ j–RÒ¶ž¹@]6"#h£M$14‚‡9P¹B0¨(‘÷Å#+-�®à!zrk`¥lƒ°¶Æ·¼]�1»E@#&Y0‘¡èaƒ�¦àÒ#&šíaH ŸÒ�Ä › Ö˱%ðxÝ×öéÛªöÃØìcÌàjMô8äÌ’|…_L£ }|µ¼—ªùQc/8…VœÍWÖ—�r~y,y…ÈΆ4B}‡åþEÉ‘7ÀÈpë� 3±5ëF·!(ÊøMƒE5¨¥0­â33ªª™SÏ“ÆÈIŠ}É­2^—˜ã1¡]gùª£š‰ŠÆ¶z"È�ãùøg*†Œ]$¹óÚ>¸xâ‚¿}9ATÚRA—s“vh¢¹WkŽòQ£Î—œvKD�Ç•.",Ž!ÀÏ:7RsäWZkÞ?_o#3¹GJ¢Ð¹þb©Nž&ì1Ï0P¡í;®àl…uÎ#38!sV¢;ÊâYBÆ&tAt¬'ff#+@ÇÞžŸ½…‘MÒwÑÕQªË)?Æï~W)ž#+ƒßêß
ÜG&ñ;5¼Z_X‡TÖ÷Š1àoé¦'aò7m?Æl@î£=öÒá÷Ðc&…íêýZêð��ýw÷çÁØ1.ÐuöÚ!h‡Dª]84jX²#d´–Ñ Á"#&ÁƒÖõ�L`éD@Ziª)¨Æ$(ªNÎZvæà#+[�Žóœ3›7›¬ÑíuGvµ‘¼¤¼$ÈC]ŽVã‡|#&�nAl-Ã8!QB,‘M!¶šh)«%p$,BÝT¸‹y*úWqŸ<�Øz·y÷˜\<b0Üó»ä£GQ‘
CÙ֙yÇ£úwv#+¬'¸ž»0ã!lŒ¤v`ÝZyît‘]§XR’Å}èxõk”÷¹‘:Ô ù¥¶™@ìb‘k(=1Lwv@Û¹Ì64m–‡)†!0ÞkÁîúÎÖÃO¢­|Œo	ˇYÍ}+˜Î§D4,�„(â‘=õƒÂÇk2=°â›[ì³Ç¶ýãa_Ï�œVítøö—‘ÆG�õÛv!±
®Ý©DäBžšj«�ØGC|C¢2HŒw@Ý…«	BI7KHDdÖ-h¶ÚJ¯n–ÜÚõfî»õ;&b!�6�†ÐÙPÅAŠj�+k–+t¯2ÖñVú¤ÑŒj”¶a–„I>WÕ/+mmô‡Âù´…á„jPû#�$�Á•£=½—‚oG£~U×^ü‡c.1§*”4µº4áÙ7w#&à8Ä‘”>ïÕncºHÚ©÷Ù¦\£®Š“�µ«uuÐwè}ÝvÄCæjK	d¨ßs[s&ѬQí ÓG¨˜˜ãЊڇ&;mÈ[ÉmÖûp×ÀÚ_ìì�UòdR¤-†á‹J&Øó¥pem¥4€£ç$b‰¡/Ìâ($æ«#¼™èaÄvÉrsHG@9{ÍpCF#3W*8‘7�#+Æ8J’S6Ü5h©+r­ñÛÞš5…¿ð‰h)‘#&�»íí5#3¾ºÏ}—¯m\#&ߺ µT±¢ºíÆ°BɵOD‡1ÆìÃÃ\F•,œCŽ:dé§}üŽ÷Ì#+3§o6 ‡•*ÊNN#&X$èÈ(jÖç¯Qe:®|skcdg¡˜Âò܆´7ɪœZ!ÚBÈR@4$H¡G—ŸEùîå �§G1Þ€—aî›îœcž×¦†ÚRô‹ó¿C	Ö¨T{uÕm1Æ„äT#3Y$DOi
 J`ÃÎêu7Zç3Mð€4.è…¢»úºt¸‚wLŽU7nóá�µ‘¼‹,#*ÁÓ:@¹�Rfy¦«šW¾åR´³ÚQéeL¢*pEåà‡c'÷$X�0¢wŸ†^½%Õ¥r®L¸O]ä×;&Ø”²VÂ]7^v�Ô#3ºpj�`Á«T�
¢7Ì¡‚©¶è³lÉIJ(McŠ­úØ�‡yÞ\Dígé¹ï¦
|ì™c8Ä{£x-D}UNDï¾S ÂÀ‹ ñ#CÏgª;ÌoÑF}'ª†¥ÎnË<¦ì éÐÞ¥lÍ�ùcM,êê-öl|&
0!œU`­	 ;ž¯L(Š,C®³Iêù|ñŽ%9åú
dÚìˆ0Üyóµ7g›Žž” ±ÜÉæ#&£ôôñÆO70Q-	ê…a„g~"¡ÇN¸„ý…Mã
øu>O­eÑùîÐC¬(„9Ñ÷DŠ?µu§\	ÈJŽkÏ(fÛñŽ$n
b^ˆQ=¤Ø(<;»ö¹ñsØk6¿�NÜ×ôŸN{ñ\딿pµO#+,FšZªQâëì×�¡«ÊQ±²†‘o&û|葯;q‘Þ¯9å4›æ›E¹°üû~çàœ7š3³;;ÒqȸP÷ô"	'ãÆÀÆ63Ttúþœ]²eRvD^oCAi;¨krèê‹'Ïwnq#3dˆ.P V(ZZH„¦†Ç„E ,˜i*¤u×ZhÒZØ7Ö‡:ا„¸‘3A™ã“0x§º�ÉÄ@(¦¿#3–ç-yÞÆd�;‡Ã(¹¶êvHüöj|é“£m„')}K@¿"Š%%ˆL²R‚=“‡ g®¼½ú=]þ�ºscÖÖú�–¢aþϦ½UV2_Çå$Vߟ=úf¶Æùüøâ”N9Â¥ïw”SãŸcçÇ™l®.Ä+Tì6‘�‘jO/<LAêë4œ8
ê|K#3Q(Ø%¶w+Ø«î 5}]”p“ݦↅT‚Ydgí�Ï£wä‚:Tq.ÉÛœI	YùC	ÉÏ­F>iðïöÔèéㆿۯª…-æa%ê„#+æ!ë#+4œÜjx
FÉbÄArœzÖ•AÁ4†ÉµøEÑÃÞQ–,Škª‘b¥c_I
Då¨c�ºŒ‰Î	¢pË…}_/óY×2¹mÕ€xD]Å¢vò[D‘ GÎQ#+¾ø—Š¯k9¸Á‰&O‡ÞT$óÑ¥SHNIbu*{Þßòô_¦»œ0|,§ã©tiy1é±¥…A÷_®¼Ø¯žˆày}rxbO£Ð„€ÐS¶úQæûe¶ËpßLìP`@»NÛ·—˜Î#&Å=ÌE¥¥œÎ#+”píûñ¤›½œ;3Èôàèˆõ:xÆõn„“ôj¤5^k8v šW¬ôàZÐBo2wD4~©�€ÒÐå§[Ùü­a¼w6tâý½ÏÊÈvÇJØí¨ˆô¿iñçs ‹¼,tÇJ¥: ½±d2dÕ9zC¼…† ú‘5®õ‹árFê3Œ7©Ç3Rç
"M#3ªâ’ЊƒÅG¦ê¢Ì‰Jf…¯„0N¥ð«)j”ÎKÐlMT¹ÂˆrQ	Œ¹ÁnÁ•#&Ø»¯�l¸~«Vº¢‘ªjÂ󘓋eŒèN�š"Ћ“ Ϲ›^&”>@:jW#§E�{„ž‰ß
%›«ðÈ‹¢Äê¸�©j í‰ó7xÏewírA[ãç±ÀÞîÏÀþ¬h°’0‡øôù{,pRƒQ<�‘êæ–±Ñ1Õ¤s €>µÂØQð˜P-"ëM±#+J
&b•‚N]k†]¶ïÃî•,m÷ö#&@`üXÅœ8¡˜co¿×m«Å»èìäÛ¶ý¸1ã3þ‹÷Óü¸}¡mÍ‘¥ƒCé±Fy#3„Ш“ÉãxÌÍÎËæ÷Ô5$ÜÍíø3™iûÜ÷Ì¿/¹
?^z '#¾ËãdN0=t?×ß‹#&Çx®=™¡´x}�9Êc;»qe‘Öüª8þ/#&ü±òŽÆÖyùï?¾e)fžfyÆ<³|SG¾ÓFéÈ¿@¥Ù ¥±#+v?hirVn%#+pBªù%B	H«ÃƒUþ¨WßÂS4›,¡Šd^ú x¦üÀ`LŽ �Æ$ e¿Ù5ô�Úˆ'm³,BJ6 1ÏïÔ¼Pù÷Ç÷AæBpœ�å¸À
™›éû­¦t) É"Ì^›ÌgGÝû¼k}‹ë³`t½±ÝÛ¯ÂðOüH‘[@>S$×}Œ:¼]¢“Eǻю�¬ÚÞ==]¡7çéaõœË–þ‚¶HH×ÝÑ·Ð}âý)÷h¿QÏÙ­ø`àÌݵmP™¥öþß»Þ5ý>ùº¹vN)MÇ?Í)ÆTQE((* :yÆ¥CÏl\¯î�é²›+¦º�Ó =“¶=º²5‡÷33!#&3ÿu
""•kö^_ÆùZj�¨*w aþ�x�Þÿ#3lM""aÖ¦ªßbïã1œ�j3œÆ©ÛLÚ!1__ΤüVŠ�R5:B™õSöúý5`»i”ÀÀÞ“Ó�¢2—ùÞcˆÊLÄTPLÜüùyø¯—•âÜtí ÉJéwŠñ9äaÍ#3HoÜ\¹],;6+Ÿ3s7Úéà8“ ¥f@=ÿD#‹ÔS±ê#+BùÝ�žïˆIÏe%GgRö";+çj	†G÷;}Ñ—x\tÑ"5ô¥¦RÆ»#3K0Âö¬•ÖuµS°j´t“oÔ»pè@ïCVÅâsw7G^xg«uPÿ¯ó*é~=}wÙ	9âävôS¶Ì¯;«( ´uo®é[f¯+#+Rfšf²çVÑ(Q^;6›5•®ÞUÒ(ßn¶ïšLEž”s¸«©¢‚‚�&0z)„'/äÏAîfîFûÛ“Ž$ƒA몿;à°””}R¯é(í¾A䉜7Ñ@$�‘Ú‡Už'vëgvêõÙç	&mú])_Grņ“2«±®·Âfãø®ÿ¿«š÷ŽŽU’“_êý^hî¡ß4â@$“Ô&o;bãmLoL4w–›hõL©ßÇþ¨�ÝK™1jߺ€ùÐâáXÅ,P18s�~:WWó|Z-ªè³QZ€•J˜h×ð@¶ ¿óS¿owayøÍwú¹[áûÌ*\ͧK@€Í§¯Ct¯c0‰ŠÇ×sÐü'3³±YÛÏ­EÓõú6ú¼ŸŽ6<‰Ð©NžÄå#3µ0gyÝéU_ŽXË6²ZÐÖu댑óøføåiJ.ø¿/ï8ÁvúÇ<�Íq]O½ö\»�½”¡Râcôf<#&œxwt
Ø7“ªeîˤtLxÇâpü«…~oÅê`ü¤˜ÑãKËæh&ÍÇDµàDOê�Ü߇TXkfŸ¹�ÚØ!Ogb;Ÿ¶ñ<“Ò<#t8vjê„6õr9zG:çÓ¼þ”nºqÙ¬õãù¬»ÇEUºâHýÆ훟}�Ï/XÞz|ä9J5WÍd¬‰?ÃER—0ÞCö¸ß?nøÇøo'ïŒ(~¾<«õÙ?B\h]�„¦_·ˆ·¾*"Á43fÌÆ9ùl÷Ò3y³sW¦†,§ž0ºï¾5]Q�]Y.š¹SJ™N´Y/B¦‡,…3¦QS"„Ã#+Â[~ƒ�¯y»Ï¶g óz%åÁV‡=Tz´óläüüÈ¢�™ #+ºÉF2 ŠÓ›Õv"¥AÐìã*fÇ"Î�…qºLÏßDoþ÷#3}–üÞÎ<·Òr-sÑ£«o:PГqâtgÍÏÛÏJîz±�	¡Òùû\®ST‘rŠ³Üå�&pÄucƸa|>ÜòîŽƉ¨‹…ŽýÿËÕV-Òú¸×Ñ.žýYà÷ÕA°L™bÈHž=Ó~WŽ~7æ_žh;X¤E€¦*�E"ŠÓ7^ÓW�¼�ÿeKŒ÷3ë½b™ÞcÍuøuo¦ùô\”mLgËF!á
«½sÂcÑGøc¾×©…“}£�}R>æ}r�ø)ÄSí÷tÈ70Ö­:Ž6J.ewˆ6x¬Úfa­		b\*;§J†;9û¼ö^úd”´AˆEyí°›œq)÷wªŠæÝêHúô­½�höþM�¶¿ãfˆõíŒH¬­ó54ùrÝ33ÉÇÏ»H—¡½gŸÛÆs>•RÚh¿…Œ>£ô�$pãùƒ2ɳû{ušêvò®X½«Š¨_°´ª¬McŠPø飌s1ñxK¥ÜÆV++Þ�ÏÜÙ6þ_é}¶ëÇF`oµŽg#+žníuoÕDVŸO:C¢Y™tä #+>AM4ÎÁ�¡|›)œÑä}X­ž˜ßâ`Ý;ˆ3uà�$�ûMÒs™aGë»;ìö£ÕÏÍË‚Ö`Ò›O£Þ73h´e»úÕ´âÍÛŽ�šJ6[ˇ5ª5iúP³VšÒ¼EÑú6:�ÆiUžÜxcsç¾�ˆ#3<#û&™{>^xôÿäÞtÒ˜&~ß·óÆ”#3û¨o‚(nÇ{!/Ÿñ¾7Ó…UòxÊúhÎ_­Ë†gÖ­¤²M"Çö�	ëM‚º�0Ðî�)wì«×1	.ØþølýË4ò­Pv€ÐдƨÎQ!žÓòe)-Ùµ0Â[à9]�œžˆœL…o’N­pjw3W·¤aɹ·öÏ1�¿±:U“ÕXÊ&}âSK$›^í8¡ÐÞÛΪÞ,ÿW>õ]nÉÛÊmrü(óFS)j
虂HJ1ôœÞËÛUï$Œ*?Â7þ¹o_–r–ŒÊ½U:T2:_œ{°é#3dEÄ´añ.üGhºV—ù¥±XF^_#32qäñt!ôÇ™[g\gµF÷|cÒ5üÃ�0}ñ’_Xé—ÎÜAZ:ªPë7Û¸ÿ¿¥�²}ä1ÜqÂ^ù¬U(AV˜’ƒÏd+ã	Ì]þeÊ~›ÿºò£ãáê»Eöá#+&J‹�‹<‘0ü^¢i°áRó9dv¹íüÐmúÒ·š'ÕK²Šèw´1•Þ™xºÚñ¦4 ©š–ÍA¡ä�—ø©¸èrãsÓÐ^—²_­ÃT8ë޻̉z`}­ÄFð|#Ö€“ªuù"ÄêwÞzN,w©í—cË—:o¼nú:mxâ	Á˜I£F­­‹W—Ý{c´tß}‹ø¹¯]âYÆû”Qø>ÇTÝ*Ê™ ØŽ˜¢+Óz�¤°¬Kó—©híØwÍûhÇRN],ÜyXUcyYò�,\QäŸM^÷µÌa¥A>WINÞQg^ºÏlëµjuF²u‘Xª!VðOG‘}úqÈÕ¿§$õÆØÿk2Sc«æ:Å#á™P™ØK«Ä1g½3ç“	gw�o\Hâ—Y‡o}ä8L3¥®ï^u·½�3tr~†Ôk‘ŠºuóØHŠ‡>_4ø¼0œžäÏ)60Ú‰^¾»÷½4=‘ç$Œð�Ûê�>“–ÀPó™yŸ�T¸÷æd�¥S!×YÓÐBÌ\kL|l—Ñ}öuzêïĤ…ûãd[gý_h*êàu#÷m"ߥÓ)îv#+j“¹òòÊðN®·b~IáŸfråÝÈñù¾›yÄ¿žg9l°jvöÃîØ~ÉsÉq}ø,�££ÄÄ:íû¾}Ș쵂QØ#+¨Ø¿ŒâYsÅ•Gh±3GŸÇAÇåï$ž0^͇ƒâÊ�·5Š=¼ê`ñ.(œy4ú�¹ãl�!Êg±û§ö½œþhJ>Ì^H•Ä’;ššØ…G)©S§´þÝ_ã·îÌCɃ#‘é–¢¹¨�|ü§¬ßóCù’Ž<ç4îø+´Ç“<­/©�cé'-ë	ûx,Ê^®ez.›³úqPg¢éŸ³¬6O·ɪƒÞkKÌàB":—»Î±„ìš#3\K©N#áËì¶Lå'ê�ôÍKü÷{|9²ŽxÄÝ8ÿUÓæyšöãBàÎÁbyš!AhúÐþHº	Ž;>Kr-ÃS±ã[¿‘zý�ñŽ¹#qÍ­¾–,Ö4c3†é[í=´Cvâø¯BÞ?<ŸJ¥îÌ#+Ù�»�1#í’Iêã²WõÍԶϴN$¸x—û%÷>í´šù>Ëë§<ù­öªhчþi~ù}6sÞ[G:ˆ)Þ#3ÈA8G$ßÆËVŠ•Aâïxm×ÀëáœMÿUXŸC%Ó0hè2£M⧷‡‰ñuëm	LýµQX`‚ùò…ñ†¯†ç¾,¦ÕŽf�öþYENÏpøòˆ;爔a~g6Yßm#+³QÒ诇M{"ÆuzJšm„åâ"©‘#+ŸÑÅ¿øyžwzV¥ÆmO¤màᇛH~:×Ñ5¦)i—ܼŠ¯„ƒø‘á´Àâg2O•ÍGÂÈêr&÷Té/®×æ'1ˆƒÜžœü8|un �A#&²ÿ†œác´å\S
ø¦)›dtEwzÏxa¡Ba|ørJ}¿)D1O䤎ØÕn¨Y>™æ[æ&h߶ù~Eœí§ßDÑ\õs|?¬?“â9è±êý©·å#&){ÙÂW÷þ/Ó9"Ùø?JbZܶŽg'Ü;NW‚L‡K­Ç$?1‘1À¢œl¢#3ü~S¶‘î‹hËý&Œ.÷W”üýÕ0�í%%%5+£ÄÁÏ™¾¾—Zôž—µ:+x0ùS|C¼Ããª6“åÆ3[Î;ÃgñÛ8Aå­×\PkX†ÂcŒçQ aMcÐa¤>¦É;Ù�k²mï£dÂN§»xãP#bˆ‚Ï>=Ñ؆ËþG9¬‰¿†¡£ƒ{bÕ@Q\¬ã¿ÉÀ¢‚úíd°‹“w†NiY»ƒ¦¹?€fË£>PíýKâ�}]†è�Së4MÐÊ;ëfÓŒºZtºÒÇfªX’S&ëFšPiŠå”…0êš	£ÝúW1/¹ÎU»ŠUPãÖ�öjx<rŸÚåÕºÈD@­!f8 
´§óÄ�à#L#&†€ÖìHçd´n@?T¨"èVH¡‹Ê`�µt86�Uõ5w¹ü²¾ÉÐ+|<uÆ6#3>;0&O"Þ29ûUEÓÇåó}µ›ÏŽû~ÒÄÇ.e4yd&Ve¡¿rØêínºhó¾Neß+âB«KËØ>Z2Ò~SÒyMujxÿŠŽÝ©æX.¾aÐÀ°”²«ª0ß){aß{•ƒ‰†wÞ}DJý~`œÆCsæðD�sðXs6}æÈÅ=ûà?°³Ÿ÷ñNT«›]²)#&…ÒÄ.rës±%ºü!!ö!ߺ-9IàA}3vçLßÚE(ú¾™‹XòáÌPïŒ_O7��fu{ xÅ©[aˆ¤UTË•¯�¢ÐD9�ʳKÀ¸5“Ï9^£S?0òñ~p	äm³XÙš*jb‰üïñôj�|ùôŒùþ»&ánÑßýøvVO¿15±ÖY¿jâ]‚·¾.(q*DÀ� Ö£#–´ý·†„ÕM,q9º}éªàÓ§ÖAªµŒ2%#&Ž/(	:£ûÃcÉ]oê¸ífÕb	~dgLÐG«Ô[´:[Nï1•yŸ/Å/T�/|ƒûâ`S¤Äñù2.ú~~¬º4#+A�@ s¸°Ñ òÍ¡ùÒ‹%\èêΗ_{s£uuW¨EH-d5	̼ìv|l#îë!:
عÂbb¸hœ«­‰Ií}“{9¾Š1$�'Rƒ#+ïÂïÌ5?™—·®dýÕóîñkºLTãFÖ?3À;Ä:M~DLMÉœÿ^¹j'Gý$mŽ¡qû,OðAYñ¹ý\*JFßÇ–§ ìQJI#ËìÇ)ûþ)¼"»‡âÚÖ£F¾ÃÂïyüÛJÕ	ï-ZýI@ùÊ„Hâ7NÊÆÜØ›±l\½kˆ4õHŒyÓ3D>T9:0rã«å�d¨»®9ÂÌV.ô½L÷¼UqLÌ�(‚é(üÑ’=ĸ/³òë·9϶>èæÅâáp·Å¨6;{ò";2ä¤îB.&ÕMtÀãÞÜî:cŸ¨q¬§FŽùЬÏ#3ìI4ÑQ–ª¢Çt×¢Ò1òy_÷|VùòÉNÕ^û[FD�‘^®êé´îÕŒš+ï}�x{v¡Ó«í«Â>ôzg�¯,C,�OŽ#Þk¶ %ÜI0’1Å®Ÿ#3Kè´ª÷øÁ6…¯y…(kl¬ˆ†DC	bH9·Jë(¾Z\¸dLÄE”e1…ˆÅ#+mû.VÏgbO槀¶‡Š{Š¸àÀµùBëÇc_ƒ:\|>
Ò4µÙ·zÓµÖ£òÈëóŸ¤NÎâ|ˆ?ÚŠå¸áHPðéȯYUÙágG®­²®©3»m Î6¸Óê#n½JIý=Ùm#3H3„ãñÀ�ÑFkçúÿ>v6Ö�µgEÆÍÇ«G3^JL`feG#+k5ŽÉá.‘ƒN6,�†rGDùlð‘¶Ù—¤;Ÿª7ÝüÁvø­Ú›ßÎó®&:3#+‡/c±ëZE‰i:sê¹7’:ï.CªefÒT#+HšäÂ#)¦¯o¤³És_Õà­	Ìmm2f´Þc2E‰?S[¿ž¹V{{!m¼#+¦Ó£p@�&6eðóì׬{©9a)FyÙ=Rª£M3¨ï°²”û(	aE:²ì«E…zqê^·gi	§Êl'N…ájçÖ¾ô2M7p¹ÙŒÓA‘c˜YvØ5*”>çrOÑ^øR¹ý“™¾V†¨ñ°íZszˆ!+=m‰Ðº/¾I·õ¿Jûu~hb©<#3íŽ25"×ÓåøOUûÓ{Ñx磵ü’xuÀ¡þö±W‘7«EPM/·9ÓÓBðÍ_WZÇð=Q‚!g>óßU®uþ�t©�õ¶,¾wU‰Ü"&õ[IU.‘ã/!#PÏ´_#3—?zjF¦#�tÅw–øPÞxî*G¢š¨ÀsEÑ/jð–Q2*)NË4Uo©˜#+ûÏ(ß«ãwIéu*“¤™3ºT—é³kgëèáâÓ³ÞŠîF VûúàÖNÍoINpF>�5·tñæÓ(±¥WyëErÄ%›ieQà]�Ü�úôô¼�Ém?,Ž¨âÒ¡ëõëUUîúÞ=�ëÒN­öqÂ8«Ùj¼Y˜Ñ³Ü�%
²šÌí´Æ}¤]VnzFw¦#+Ó]@=m¬ÏÅØMU…3â•öc"Ž½ÌîÈŸ£¦”˨býYu_Ur}±+Ò9²º¡¢Wè¢q°uýч(ªãJè³Eøí�åøä?ÆNÜ|Îwí˜J¦5ƒÈ”yÞ“ç:¶�W¢èÚF,£”¡ÏQ—©êqßÍg»ä‚ŒN�]�öR>ñtÎ~�U&#“™oŸš6µzß[KÓ¹³÷ÞZiÝ“gŸõBåå´ÃüøçšÌú(ë¹£Ô�úLãV!ñéåQ®'�£WËø†áþ›ÔT9çôNÝz	Ç[åsÑΣyíÒâV]öZ3nt7#«}µ†-ÆöÆÂì9dRÈU&‚M½«zEÖ¦É]*=0vlWWêd>B¾Õá––“œ	–£ÚGÏ0þj"Rêöªtï�Ðäfsb–D«�új�3‡&«öõú7ÆNl7`åd-$* z2�3ðýþ“+¦<?°ülDíyiÀÅ�•‹l¢B¹SÏ�‘V—ÚdEw?ü23³Ðã5×ìúd_|†³xüŸdBJ¿#+|þ˾q¡&§ÜúnóIĘ:ìç[5)7„Ûl8eÙÑ#3 sO¾�ÈÒ#¯ÛÛ:ió/˾ªm2IÔ›b„“\wBFdGØ1rPÞæäPÁ�Ta…ôô4‘ËÉ†zO&n†ž¸hCh–×ΟøXhMýIN"Ä9‘ïéÊæc*´N’ÊÂÅ““]¦”ï¾onýÿ>YCòüäiÕ"¼/Û{"Ç`ƒÍyfƒM/Kø©¸[hO&Â[i/™îø¼ù_J­•e–CÝ>¸´¨ÑIƒªG|ˆTj'	¸$ߣÙA[¥‘WDj(;7\+#3ðõcPÖ#H“wÞHÖa[/]•Á‡¯9šj›W2Ô)¼Þ+"O¢;h`ª˜èÍ4¡®Öõ§¢T‡DôÈ��CfÐñ"#+RÒgP«„ ÐîwBM¥Ý¥7bÕ
QdxJaäÓª³Å:ªÐàÛ]ÆM®éB#3j%n|Ƙïx\×6@…*ﾎǠ!±"ÔÕÂ'Æ©³%±vî»äŽ#+U™—:½	˜á²‹2�åç(fÑÕtS¬)´‚€ •Ð›vTØΊ/Ý_}Ïu`ù•s›a×DæÔÁˆd_EÔ[¹_Ûí>ŽªWLÆûæVòÝ7†ù6´ßDíõj¥£RCMmÕ~Ì·[D³†»ei…ˆr#+&+T³�=�ZX†þ¨ÕÓe#3qtAö ¶»õ£5äãõéžÕ\OÓ�±õúoc±ãÓ„qφdVE¬!W#+ÆT?eÖèZ	À:{-åˆLð:ohÀëºPb�Ÿ]Øhj÷k`Ý6ŒçmÍŽ—uFw^î-gÓÐ?Íö.³·=úpDoçÜxÏg‘ß1î„Ç,»O¡½üî–åëV4TwÝûy7®Z¨kŽ›Ëµß*4NÇÛ#&’‡BKhe¡2cs•M#3ˆ¦ÅŒ'Ô-ÆÒ
W^�¼œ¾X¼ŽÜbb·»åäλÌÄxh¿b6š6±{uFlNb¦aÛ–4µ’/(á0H'FE’>6“áŸ�ƒß!¿”rzÛB¦Û#½=J]¦:&ÓVcÆë”[!ʯàbv#+ÑMY‘…IŠÐ—õáscå(c”nNTép,¿Àõ;‡>âò‡g¥÷Ÿ›Åë9¥MöÃÂÛÉBÍdIìv¥Fà¼Àb3¸�ôMá*#+¶ö×Á[vlc:ŸÛC®ž¿ë_XÎã³³¾å‘\±Œ|ã^ßã;É$–çœdª€8êp›È vFû:!ºªì¦“Í|‹4S˜�9‡—(p£W<Ÿ™Ò9_>ˆ“¯ÝtÎæ…šéÝKÐ%ßžÑ=oÇx÷�&g·O¾iæ3=Y¹|Çiú˜‡âsç­Š·tž;^}Ñi½š­67¨ÔtåAVR»u׺ӆ67úWߧm³Ç=œ>—è†ÃÆ&Û àe²|(­Á~tøCí¡7Ô´s&üüü³½íó0Ü69<;9«”j³,::”C~~$ì35	™¹ëžN›±Ôfn�øcø�,¹û,‡GGe;Ñi¾©Ž|ðY=TQˆ¢Ï«yúQ²Ÿ‡=Î
Œ†CÏ!fïoÒçJ*IŠªŽúdIK^ÂŒåŒ5bèÎÁ1KôR5éщ	ÂÈ9'ï#3+òLÐ_«¤¨'Y“�›e ‰#+UýƒÒÒÇCŒ�RpgžÝùÉîÓé~äÇ¿Ã�ôL`–ò²�Ø–®m8a^%—ÍÈbúPX™43«c[aÍœ~[ÞÝ3³�b|CÚVîL?�W#¸y�. rßÁðçÎ[ÍÛ"˜Ý–…Ýúââºô²î2ÜHøô1ne¸]áªùÖúLjÏ¡Fé-F½å€öaºj¤vöî}}PB²zšfêlKuT3ÃMÕËÀ�¼Ð¯:KN=÷ÐÊÖØPå;uN<°�z`ÒÈ›•‘gÒdÎ7O	�Ï‚£kåùŒ{ºH’‡cº›<vÉ!ŽÓLwÝøÂ9]ü¶âþÞa—ÍÉŽ#&‹Ý‡Ø"GÃF›¸)úmÄ®,*žfJ{ÓݵŒ'
ìÛ…²¡ŒëÛ~Û<>7«7wmiµ Ê4g•%
<ëÒ¯­æ×&z™ø¢º¢s(Ð>�ì€=ï»øýÚ¹¿'»Ü{{ÏoÓà^Ž–:!óÅþ‚5|‚[³#3OþO<ôß1ö‰çÕZ*§Åa(.^Y>ߟnXœ>ú§î~¢%¦ZŠ«j\iêgÃqh£Óª¦UÂÂ>X	ʽ½£J~9ë¹Åu…ѵq9�%ú>.o,cpÝÍÑ#&%9üuÝ›Êt>¬í(ÓŠõÔW,ž_n�î‡gŽþÿ?7/ÑöÕú;¼û^Šð�íhoj‹©=jøjµâkõ©_~ÌN$Á�Y[[i‰ý£Ù®ú~bqj±oáÆÿôÙ콿g�)ÙT*™@Æ‘å(¢ÖûþÄë³àþŒ)eü0ø#3û¾•h/½ƒô„÷²X[#&¹�c9ÆVðÈ"ÄÊ”UU¥ÿ#.%”D;ÿÒj¯®ˆ
Çúš	7¡É#½Rä¢Â˜#+¡�#b„Øÿ�¨3@ÀÁ§û×ô�-u{»°\·Ûb›�ÛEÒO÷p¤Õa™þûX ý
“â™�€™Ž}Úƒïêð8›
0wIÚÜ©¿‰Ö3>I[{0oO¡â‚&#+w�§“"ÏJ5Uãá™Ø�d=¿b‡rxñ–&34#&/ýüÇÔS°rñhâ‡JcÜŽàì“—À;|zϪްÉûÚ~'@QÐÙÏj¦Ý”§øÄÀ½�áj¸|‰Ö¦Ê�e²91¹{Ÿ;¿íÝLÀô¡Ô,ÿìÙ�ˆûH7½±$d:º¿F×DÁ±<Ñ=«Ð8þL•DüH|ÌÕÿ†ÝÒf/bdY#ƒ4´œÖïò«g´€&JH «ì#+“™ÒŸ¡t£sjÙ7TiyIâ]#Ý�3\ƒ	#+]`–Yj‘4™Ð:<‰‡AA^(ë‹úKâõÌåó(}º/0¤vm¼Úy@}\c©˜nÝGÒ›~ïSÖ„ÑA`­'’> Cì‰5¡±ÑÂA"c2–¢z­Ïú�z’B�H;{ˉ#3¿ˆÑ	„vÄx˜.pc«öCÇZa#3‰Do\ìȺE)z2­ôšÄt˘*~VãP33°vt¥�<d› �ß c¤*HÈI˜ƒÕë¾Be§ó¹RÎÊSË’Ne¸‡_#3f'¯�ÙÝéÍÚ(:		l<hì� v#Ì;È„{ƒ€í8w¶é#&Ø´_�¹•;6¦Þñ-Q¿84vTf¢Z ¢Ÿ}Ýk_3òêZW,½vˆq\½BkÁì0`â4¥²@öžÒÙŒ&@x[Àò6À“eÓîKn!a[@ÊU©A®/hÂQhê¤OÆ|îzî«$#&„Éo‹Ä+veç!öõðý\µP›œïá¿jLŽ
�¨«¡#3)�¦yÿÕC/ÍÌñ#&€qQÂâ ­%h+|Ÿ®Ú¡öýq¶#+€’ ûŠm/xB“V&äN¿Ï
˜ÑßMGUp&aå‰ C¨I¥M*ÿ~Î×yÃ(ÁäFQ|ó2Æ1zçÝÑ@™Ä	$_ÇÛ__—rv˜¤¥a„ÊNÞnÀ:Ó¿i¸A#+Ú€;ÛêEâ+ÔŽÃúϵ�û}xi�Ú‰žù½žÊKéÄ[b0s6µ•2ŸzS¶Ÿ"ALQ‡užÇl¢× �MôÞ{•'¡šFÖFâ-éÒB„Ž{Í>{ÏðUPJ.äôåÇÈ\§9fáèp‚Mú؉Qx´Hþætv9›N´#3C?Írª�Þ‘à-	—è<Ê"ª„J©uNEÍ:MÎÁÔ6B›ô–pÿ„¸ls§"¸9&éïòºÿQyTBY»þÕ|¤’e&0Ṛ´D%2HŸ&	J”åîÞ’N‰Pœáè²Î’³¬æíÝ$’ó‹ˆ2ÃÓþÞßÂ<vcxôùoÕ‡ž‡®r½Ò?ÜçèkÉêä:ðÍõê|º)⹼݋,xwm<´z§"Ž&IœNü9—v%›aȳb0Àq‡[ö÷ÏÅÙ¶cÈxŠž~ÃÞ{ØoyûДñT¦
„ßïñØ'„îúÇÏ×KIk>‡ù YeC#3]}&”ÿqûA©#&ZÓ`øŽMUÇÐMR‰Cße¾o~4ê÷v-‹ÆÈDÕÝÝ1	‡á3‚ú´£Qg˜g"¹u1‚	ŽB¯ûøùþ¯¬½„[……È¿Wu‘éGSbô&¨ˆ›0û,í#+ò_rt»AÐXX"@µù#+ä.Qðc¦-OÍDPA+­e™n³fM˜Ã…¸v·ƒƒŒ)€EÈ6¿�`>œDwoÚ£^Ò¾~M&K¡ЄÜÁ8Dü:Œ ¢Ë<wüÿ?÷5�ËôÓ³q€¥RBS �jn7¦Ïá̼`frS¬î8DÚ€H7^™/Mä<rÀ†ScÏ‹C�#&hÓ?2Yñ.–Cm9,O#3´;æV%ªq�:—è\²�[Îü�Š.fIQI"
„Y�Š#38Hdò#+jjlÎÇ3!ï:ÿ¶ßÍЛ¢Pöõ8’!R(Íõ¹ÿ3ïåUT"'°6œ)Ýê�;ä�0‡oíøž�–°Óz�êY¢ÜÆä7°DÅ!Æîe”É‹#+¢ì!áÈþ3°àt©þË�·‚—Ž!ùBÒþ|šw~f¤©!o�þ¤Ð£A�#+òI»K#ÿ7èæâ9®ªû«¿Öê—qWšèÝO
½iŬŒœUY©&j£YšÂWÎ2<�ŠQp{d4Þá$×*ß#3¦oF³sc?¹¢äÐ6žÞllË836Md9Z�¬Ó�#{%µ
K�¦LHø´«2¡¦¢¦¤‹'òÀ¥ÌʤjT÷ûÅèˆÄ€ç‚ýò
Øk‰Ê#&1™¢[A¿S)ëͬèá�Õæç�ÒÝuÐ<íúá÷W·ŸÚªßW¤ÐÙ¦bQÞw©ÒK™WâÈ*ª«tR¢¾ÐüÀÆ‚¥~��¬zíô°díŽ!�K(#Ô#=ä¡1¼®-“RI9Š€¤%û9zir¿/ËÛŸßz¶zmi.KºHs�˜f‡§ÌßFöu‹˜þi<¡í_Õ,bîk%Ìñ˜…%¸š¬—Ùoß›½òaH8Ûm¶¸(�¸íƒåw²’šÎÝ+噞%¡X(I<„êËJ«(bÊ°Q3±ŸÛ&ÞTt	Lè¥?“f]™~u°øå—­=y	’ž°þ@¥¢ŽCæ&AdçÂ�.uðÔ7&ö	$’,bFG�úoÖ®t7ji¹¶h؃ J íÆYXçó€}s‰—Ñø¿^£§?ßc&õáP‡·ÇÄ¢°´>òµ»^(}Áé	ÚÉTôD#œ|öê?âÔß«ó#3êÉq$=Ã#3÷‡Lv›.ûHÆ/tj�å‘°N”3Þªt»#3—²k‹ˆß0Pá[Ý«`Vð@1‰JÔ5”™.füú¹‡•Ý ÿ8‹m¦ÿ·˜û"]+õú¾Ó ébž¨É3¥êH‰æ„æ"Œ#â(rÐl�ÂAàyz¯šÓ@!£•„Ù¼<O®èß!hØ£°ÿ.ò�Èî .Vú÷e„¼|¾—AЀ.Â0 Œù‡ãí>�>_YØ89w—”y´úïÀHÝæžÖù­LÇŠS}Õ–v û›Xö½ ‰g¢…Vˆ¤KqÆÐz0 o[B£æo)/"]ìYŒ˜3o`ÐR?«@í%úH‰ŠE`þ^”�?3ÇkÞo?$Üð?šˆÆ4æÝÀý4ûøm-gB#3îþ»?JÓvïü§CÒžǹ´ˆ4˜Gx_D˜™­Gò•ˆ¤PŸ#+Ÿ-y#�b×3“ ÜÆò«2±‚„Ø
Ýë}:-iþÓ©ï&Ý¢p·óÏ|ö…©ABEBF1„’>'r3,õ©ýgRÜB#3#ï2)TÛçc¥è|¿#+#+ï`fGj=äñf*’›ë;÷úú~q˯Ä#3LxùŸ·ài¶Þ²ÈT¿¼(?`Æcä¡üã&éJŠ»afŠc¬7‡»¶ã_�yxœÞ(П’š†Ç#+¡÷›¬ÄεMÈ„…ýl!$÷‹uõ‰¡ìåû-±×(2TѲ´
d€ž¿æý`þ`€I÷ø žD0íTU½´ÃÇÅgéQÖt5"4å[Vé‡$äæeYäÕ¯ƒá‚³R5cvz/=T‡Š‡âöòÃh¢˜?è}Ž“ÐPxý¡‚¼¨÷ ‘fòìúŠ¯écë;‘Žè"~6IBN#&wxXÜs¼àS±Ï$#3O¨Ô°t–¡Ó wxoèï‹0ù@з#$O¶ê§8ø˜‡²Zô×rå»Q¥$ÇÔ”­‰œ	¹mvÑ1#CL«Ø°ý•D峩­B‘Hb…€©î÷u�Ì@LÃ3ÑDc ’*‰‰—xÂø,Íֺżw^bÁ›Ò£Föµë4êMϱ6sàb€€½gÞxôLðb!òè#3D$+ÛÅè;PÅÑD>îG2ñ>Q­ª]ª¬«(ºÛŒãÙ$>>÷w_‰è£âCàhÙ›ÞÀ¼8ΓR >(q¸3ïõ”§~ö?•:]ÌR!#&9‘¡Ý9³³ÈÖ7Ô0Bè)�ñÑÙ¥�Tá	#+€t¯Î·óý‰?ÐÂ)*ŸñYmÔOõܺ²ÓýÆ°Á@Ú0ÃŒ´¤ÍP120¡u½‚_¡1Öµ¡µ…!V›ÜÈpöi÷øx÷OYÝ'dó¶È}Tv)u6 hý¥&Ëx>�/:Z¯�uU[5Ž b®`¢ÿ÷ÄÛîw¡À·fxÌñŽï| SÜ£|äCfÓ_ŸØn#+«¯¶¿25uNjºmß·k�÷
ƒïÈW&*m¸v”§Kô	Ÿœnr4 Œ‡** @‘&ñDÕCýqoU�Tû#3™±#&8#+„�ZœdãÑIÐàùõàlZؼ-̹p¸é7!ùËD÷Q#30UÄÌ,fr�‘Ï—ó�½!üÿ×7î‡D>sÛãfLÔ)}èŒh¢	îaBE¢²*q33¤Ò`šCXÁ–.¦³iáX¢ik¥ÜÈô'áhRŸQGu‚ 'qý®`ný�øX.À@ÞE›ÏªÆö
l-	%&5zD‘_H€wåL„Q€”P‰±9&‡¢§ :Á:&Ð!±©k÷x#+¡O#ÝŸÉC@�ŒÎ^˜£úý—ÈÍ36éjˆµM)aÁV”¢¹…”ê¾ô.jž
ù¢S»©¼†¢~nkTb#9%¤B!×û‡÷úΤê÷~nUã	–AóJ©:¡d“k>Ï׺æ¿7j½ÚÝ®©FI#i2™ ËãÞm¾»lîÕË^vⶮdP#DL,’ÔÛ]מ:Öy�W£óz?!ðÈÒ›£§—ª­òFο <A d#3–	4ú6Áöœ>#34áp̺àï$[ë(>dÁ˜W£ÄHj›R9€vã°üE2wÝßRñ°!©¹m½Q H’ „(€Ú$2¹g]é¨H"tÑ©±#3"öQŽJ\[h§“x‡�P•áи÷ºMB'«NšWv}bóG@þ1ZC!éR££wfEwoO×?è­‘
_¼(cVzà3¦ #@ãhØ9a½0= C§š=ÎYÎßi;íÒÎÓ+OÇÍGŠ PÍ�q¤¬àè0õm/¯Ãã’'Y	Û�">ãÒ¥	d²z�ʱiJÒˆá»)Uݸ`^ÝvSçzŸßUü’ýu¡ùϹ/+¶r5¶ü[ª!B¬õò#+5®.Î}š^NŸlhc#+¢lüÂØ«KO	 áÜ(å£m–Ëö—ÅW§¸¢!›³e`B#3vYãK‹¨4#Aª´Ì#+f‹Œm��´…1÷†îGË…¿XF꣧$ØJ	LÏ,ƒ!Æ}OùœdC�
·j‘©	‚U!�†<€8Ü 5SÓßïfø25JBÀߎ6t#&{Ï3ÖK€€TÏ—=Ð`‰Øtƒj³sÛ
ÍÀ’‹ÛÞç�ò'¬±™º³ýhX;DhCÅ°®”ÐøÀb�l㶘Á€HE
buo¹#3‚2["ÔÁS»ÏK’fy–0Íâ'%é=�=¢ú�žÀ‹ùÊ™§ð°7¯ª�ÍÊ) Ðu�¿á®ZL dB“û=ç³`�ÔÖ¸9ù[ŠC2Ýè(0bŒGÈÆ1Œ…SÞp¤Ü‘ÐÒÂæ„v&Oóh÷@˜éeþM¤`û<2]˜¨ŠÂ²(DG$ d‚F"#+ÑïK(ÍX2ªÐʪ𬪯vÈœó„˜Ndú‡ØçÕÚeó#3;Îáð;#+|Ñ€æsU¡R– §@¶L#+#ŠÊ€aòÁÒ|5(„Xd7:TtMMó}àXí¸k>�»Ñ¿¸ÛÀN
{Ž#3wï80#3@[vú}ÖK«#&‰=âùõœŒ•éMºPHuç¾3^‰…€éú¬©�	°ÍB<${ìRõ\ß`ÝtㆈW»H�rœÞ#֚Ʉ„’%Ì1#fÁ¯¸8x|šïõ”NžÞiWò�ÐS	|8dÆYLé�Ù™´�]yo>Î3ørYº6­å„O…öë#+¯åÆõŸõdß¡�>ˆð¡Ýè·b#3¤½¯—Ѿ�Ÿ]§zVY±‰m5xïµTˆ¸¯Ý܃$šMd&ëxšHˆpm°q™ŒT«ÔŠMÚ¢l$Òÿ0�ã”lY>˜wmQ‡&Ýú�ç:¹�Òâb–žõ°/NlÎÛvV¶'iêð97_z"YOï7õØê6�/YîIwkšüÛ8	r#3”A%bw-#+`vâ!M¨t¨ÀH@ýƳ€käíA=Q	Ú1˜H¾‘·…øŠOe?ÅžU$“¶¡Þ¤­hÐoáÌÞº~�on6™£³Pʇš4¨AúȨ�ËÌàÜ{Y’ø6ÕŸ\ïMVñW’]l9‘tGóåBäÄb`>&AÝ “IɪÁj‹`«#+ÏwÎ%qæöêu»�{#3(#&Ì?Qèš™k€§ÅD÷;££·­<¶c¿’&�âw'唇’Xòõ�XÈ¡}L‡”MŸÁÊE‚Š\»�²A}ؘ›3	7Á#&üéø}Äðí£»û…z¤Ñø™{µŸâf3=o®Öbô®zOçHø¨¸€õ}ö?ɉÓàÇ>Ÿ¬Ï�£=ªÏƒ_ˆTûêT=ÿF·0i£kaøѤ܌SvHñ£´ê¡9Û2LÐ!l+xQ-QýþGÅÙÕ�ÆDZ›
ùà�önóu@&)`há5ËCþxãŸÕS†­vmš]¿¨@q9‡±lbŒ˜WrЯ¨prCª¯†—ñ�Šs÷øtü
Ñ#3~ã2ÇB4™±‡×„´Þ:\£)` jÊ)IöLJ‰‚¯tw=dÀqCjƒºH™p‚
Æ	Ÿ»¨ñ°.ŠrmKÐôû“>ò�ÐÉmBƒg˜t›NŒòh*~ÏË·xMÎÄ3gê°—_AÜss¿¯ çË¥Ù_£"×#+ê)šÇý»𓸷颶=¨}~иæ/Â	�JlaŒ77ð9�ðy9#&ó3Ád*3îö{�¨ó«ÒŠóÆÆH‘5~šP†…¥—ë1cXi­CY¦c�¹æ«:sê>o6Ä�34ŽÉ!Ý ª5œ`˜OU­±}ÓÚÞü}|ÍUÒ!)?eeï{+Ûž¶º
“Æ�ˆ­�4–#3܈’2I*X ^‡YoeÊH¡FXÝËU„û�†þ÷NÀtÀxýϘ<Yó'¸jìµö^”öiñþBÈ0h¾ðX�qD„>‰`ˆšüPí„!î>ç‘ɨ
´ùÈÍWêïøÝ^!¼âäŽï˜Ópýžº=¾B£¹�I!]>—â:½¬CS:ø:”‚aBBÛ>ËuŸ÷¶ßz>»¯)ytÏÑÓe24&hÊ2)Ñ ¡iˆÏ´¨ÐòuÍBSbhÉŒŒ#K#sø±JôÅ57Çï(-07¢%½ÿ^³öœA앶«m!°ÇŒªHÇ* â¨¼i‰%ÅŠýrE,fKôa?»+Šò裏ʪª«¸#&ºžŸ¯H}‹wê4'ÓúWFߤކ¨€y<³«eWÏV¢q–0Õ#+ÎZv”s¬Kü¸Å/¥ØçI¯áâýmA>^*S
÷¦@W=ÛP.¤ç[Ɔã´`bf¬ëi·s‰3’½	2=-¸fh	ÂѶãß^J+'�Õa—X:CÐE4Š`ñ»Švüp‡s+>ëzMð‚3b£jEŽ]øÂ$ÏÂ͘F]„#Ddq¦Ù°ýl"ÅþýG“Ú4¢�){‹ÿÖ`’€1,AÚYâ‹-ñB/š‚ëà?º%öÿl:À��ÀbXL×øiÙ˜¥H“P#+Ið7›àòÇà§|Š*w$�ó9ò·†¶Îé;­õ;€l##x;£#Þv
׃ê“hA Ë#&¹ï/ÂÍ#Á!CD±¾	HP>}v&Ó™êõXsÕ¤=‡ìo�×ÉÜ”EÌaâò£Ó7ñ0¨ùé’%ïô��âp¹"O†(µb#3Ë,£IŠBhj‘ÆàÆ$ˆØ2êêä-°ŠŠµ`É”P¼He
B`£6	A¬*"ÄY4ÐV’SÌ€+“JHiuD!F#&F�¦ÐâÀ€ŠÆ2…©Q‘ P`Œ#3Há0+NjŒUé«ÚæìµëÙýÍ�ßáW¯®ƒ7!#3ÿÐ:ÿœâ¤-æøÕ”H�$¹råÒE$Wè#•ï†FFã ¿ÑbÕ`¶ûh¢eÓp�UDéœsI›†Ø‘·h€(ˉQ‚FÃreœ$Ř-AÇH va¹x›™Qýç
ˆ¬G'#33Ž4²¶•ã»96DWþñ|ô¶_)?ÈÜ<Dg«7cÝñÈb"ó ¹\ýý#+ùŒZ´}å¿ì? ïáj÷ÊÊ#+Ol9×é:Ü­ð2cYšüßÚ‹I•.ÿšÔµû?DÙ«¾g³Ÿ	Û…d®ÂeǺGýÿˆ‚%ÃdR�´&œÚ�‡wtF$ª’²éo·ïHIê™H:I™ßw½S™¨½ÈIÓï "fؽY�Q†÷Ëy]‹×”vGZ£.ÚnÈáT4BsÛ™­ºn«Í…5˜ü=en#3¶…ÖË4ÚJãÊ#2·ìÀ|<©“1=Ä^¿ŽUŽ78O¨÷Óô õÙEÄ2‚"Ú#3œ¢ˆHTz;ÉëݹŒH11* µªˆ„U扢3!A߇t™½:!“#Â#”�Ë„j&ó<ã´!4ñÜ‚¦àxMšŒõí«ûNp «…p°”-:Lå©éC’FyW!Pd2¼o³ÒìÁ-ãÊ“�#&v5CÙ›µXÂîC²GXQ!&Å:¹Qªø’”à	Ü ²D­=8s‘m–姜�ÃÛ,Š#3^ñu&¦r…#&n ÞÑ&Ÿ.T–´�3h>Áˆ²#3æ$HŠ	Ô…¢YHÂnJ†‚XOˆŽ’bc×2M°�z‡ùžÞ·#hkGC“éU›¡Vhxº½èui"·!|^dœO¹AV|¦ÔrÉô«ÖRœ}·}.ïšÓð�Ž�©G9*v\W¶fòDñò2~,ÇãxC<÷JÉ–‘áSáXßÈåµwvÍ‘U´ÊL1\ÉcÒ#–vCÝã¯Â™gBÙ™b#3¦ŸºuGýÚ9§K`wÿ¯Âöýù«£öb—òNÁ÷Û»ïïl¦ŸèõtQF9¤mF´�Í"ªJçáN•k%¨N]«Î•ç„ ’DÍ$¦DSañf1­‹‘Κ»}%ð§w7XC@µÖCd]Çx?i3 ™ùo6ÀuÒÿ›üÒcRŽÆBÐ~MMKªa^MDã>�/b$�?‰ï…×5éŽ{û›-s×B0¶‰iô±²ÿ…‹D‡³Õ‘oór§þ:ÎG?Ç/ñP®Ó”në¶5YÊy¿p´é5"ªïØðõ5üÚW¡A¿Tj3ø—Œù`ˆ¿�=\ðmÉ)Å|™@3%WÓ"­{åJ;kú!ûì„ò9d@ª¼‹/—âMô-X™^ñ|å�f$¨Îá£
Æ«2ˆ¯¶ênÊ–HÐ(DpÅÕÖYK/5g™ß#3?Ý^‡ôgm¹Óñ×ûæ5Ô�+Ú[Ð’»Ëªqr•	¹\i…¹©ý…ƒÃvŠãœù¬´Õ#&Ø‚”mU Î½0mÐÂåT(S8Wnxe#3ª‹ì·Ý¸ÈL<DqZ辫7å¼Çã²ÖÎÔ_‘r¥^€¤Æ“QÝ�táûž5:Êm~Yé³ÚÖt¤+“ÄÊ#&õ¶u@hz\’h&ÉCŠÙ[ðÏE¦��½Ø{Lá¦-MSüJ'žŠÓôÓ²¡4°Â
|®…·E½¼9]PæÉû?¤_2ÉFÉÅâ<¹òƼµ¼Û‰�û#+8$†©Ýªüä;Èú|TyØËÞ}{Ùç}µƒSÒ=a‡¶àÉ؆+�œ`Sîwn^ºÍ5&£1‰QS4h0D#
NzÕšO4ᯚê½ÕÁ#3“hä‹Ó×Р±1ë½GÓùg–Ž);sUÿ†«"ÑÕ°pÉU±Ei®•žµyÕò˜Ö�c&+æ?NÿÝåù­?º¿Žìš3ƒA£Çµá\£ÓǦª_ž4ð0™CYO'$.èS™mÓ©~{9í®Ýç(cMwžZ «G„ËäWk‰dEvl·t~­4ÅÅïU£hÛrV¢>]¾“)nŒiÝNü(Ê¢ÿçhòk?`¹éy«ß9l¼`X©Š%Oeð‹~‡{Iï¸ÓmÌP;‰
{¼áÈDSæãF·db,v7Ãë³€~ä×æÿáÕ�éS=Ï^ICÃÆË
NL cùTŸaÆqÜ…!‡ž"ïn<s|h°š ØîV‹”è7 g%ŽÎ™Á1_K�Ò(ËïÜÓ{‡Ôß�òW|ïðµ£ç[fJâŽm—må‰Ê6vØLXsá3ĉ-λÇ�[Iésʽ–TÓ²•dzOJBâ^¡éc}ä½d\æ¯NìÔqgÉzåÛ8Ú3Ìý®ûÐã7á¡È`ÙÂA��}7uBíñÈiÝëàãšGç$"›Ëë��ÃÙ¤FöÐsñ˜º~gì缆ýס#+õþ~`æ·ìŽÕ]ª.Ëoycã.ÙÌ@ôFÐ-6D6AÊ+Ï ÷ÙçãH‡c#&¤#&4ŽÆ#5ávÚ˜fÙ�ÈQd_Ö�U%³ù2–œtCèÔÙjÛ9G [¯OñTƒ0�ÂmÚEîBÐÂB�ïw‰:2tô*qf[èV�Ù¡Nãeìàž|§e±Š<þu§ q2‹V¤‰PÊeÚ2@嫸ÕÖŽÕgú6ÒÏNW]ÆpW²d4xl‘³‘äý3+µ–¬Ó£4Û¸�Åe\ZœeÌw=ŸD+Üw<Â轈ŒÛ®1l Î4QÔÿ±¯RåDþú¢—_Ö÷¿ÔýYЖ9NÒÊ.&îq3	$ÞdÉçé7ñGNòm¢'8~«ù•à5(L„É0*c._ãÚÄ⿣шýÓ•k�Ѐ°c vËþ/#v ™R"õ`ÿ?äþ�>_ØwÞæêø÷ÿº¡÷2Åþ�º½&v"lœs�šÉ‹uáÁº÷Wëü­Î4˜oÄÈ91OJ<YðȯJª«l´©ƒ
ïÿXÀ±¸wÐÖÖ±rc1îÀZI…!f“ò�+-&¨¨Jðshtaáµþ2Œ9`âèB�’„#
ˆÂ�ïl�ÓY²kXµ‚53ŽÐ�¢IB&¤	ôlv;\¡„Á°ÁdšÏTðcd’ä;#+:žå;4,†�ÝÝ#+€j\#¼âJ/[\Ëë—ʨ-’¹‡3•¨ª*»ƒÑ8qÌ´!„½úS¶·ƒGø.an´;Ññ{Kr¨7#ÛÕ~|¯A]ô!!G®"¬H £`—! lY�ç9�ç°Ø#+#3ªŠªˆ<ê–ª•:¬`:vðg-�$€{ü|Ù1ƒ¥7'#÷=?½Oñ~3ù�±ráfÒ”‘i©‡€w³’qòŠ#ø†edé±e6žØ‘DËIßÌj

êÂBàô~]ßC±ðòÌ5Þ’¶ç3W²9=šúÈwÓ[Ú)�™V!‹:”l±ß…g÷99™ŠdKÃ…Ã
%ea†…R#&ÃÆ#+@ ZTÈr{Í…òIŽÊ)®{ØAÄTÈ¢m±s"‹‘˜Å¯¼xt/™sh¼¸»È#Õ¼mìû±–îá	OXº(î¿1¶š~¾ž“-øÑÚÜx�çV;¯»ñ<v7ährõû½|ÛmHu×�²Õ[ëÛòwáy7ì�ø6î Út}tp��Ùa£M�ÛŬ€jv‚(~#{HvÜ®ê¢+¶5TÞrD¬$„ÿ¡’ðd,e»-È”,¦R ‡¨­$³?P%ØÒ�ýüS	)£cl„Šêþ÷ýOèû[Úf²–#+£ûîS"Œ#3HÕHÑAúŠ¢YHŸ?ëu‡Ó*IóHur¢"µwmÙ“È„í;ƒA6yOÔˆ÷¹ƒ³f�ìÉ[•œ&ïáâeiúìý|8g„“v¦lþ'ƒÏ™sÄ9·’aæµ&Å›ÂsüÖŽSI©ÀÜ7²#3¬#3ÁC¥�‘Íî½úVÚ¸6‘íG·OCÇÛàÈX!žAqØh†«,ée{B†çBtš*QÈÕdI`û¤ú¯r#+ê°‹×xiƒ£À™#3ŠÎQÇjÔ0|ÀQYrQ"4€ÅCø–u5&L‡°ccÛååßmÞÁåíÝ#ž½þ+·Àf³%0Üc“l	™¥ÝÞBmæk2¡)u�+¶ÑC¿aÖx²º¹PÊïØfï-“ΰ
Èk;&¯nì…éaUkß«t„4M2n'.úBî_ÊQÔ@n s58½	~dêä¹AÒ¼<üä²íû¶<LÍžÆU^M*©¡WÆMg3Õ(ñ:ðyƒbòIsó­ý-¤û`}yVnÛ7ékiñ“Œ‰ÌÍ…4å“®~ðMÚ¬-òÖ=d«[š,qÆ…�‡®WQÊÜ–Í[v^ú;SS™xZè|þ3Ä#+~ªãY[š:s°º°ÒtŽÕ£àÍvÑól—’DœõSi�9Оv³ bôJ´ŸÔuf�3¬Êç¼1`š`‡¨ºðr6°²20z‹º ؈o#Ó.Q»¿ßðÚgÛÁ§e½NÃ$±˜r‹#&»!f�W«èߺ‹j¸wfrUØ(E�3ÀbmFX�ÌŒ1bÓ¿?Nµ•ë–{1š¼mÓ‹†�7f‹Žñ0Ãh9<Ôìƹ9à$0¦¡!“^«5yÄ4zlC,ñŒ©Ï:Ó‘¬Œ2“P:÷�`Û@™%—o(ê±0CËÇÝûw½bC‹´Ù¶1Ú7æÎôîåtr:У„¨2ÇÓ©³Š�0ýÍæû(äDÙBÁõu=ó¿Ú_Âç	Ü$ #+!|ÎÀxcõIa©oÖë¹s2, ½tØ(‚°0cmfaâjL¡æ©ÊxO#&åë—ô‰Ù.V0önÉ^ç'ƒf;1}=þçFËæÍäæ–$9VÁ�â0/°XÇ&&E‹í¸Š3 n[ªDø ªéuL(qfvÜ(í™ê{]¡I¨`:^³#3\›�4&¥—¹â&×y„¦Ù†tpÞdæîo*¹”=–päPŠ��ÉA–mEÁÖr¬I­v#+œŽ¾IPQ�¤õˆQŒRƒVD¿}‘Oô›§@cBðÄn÷Ÿtܹ~äó)Ø! HÇ(æÝÖA:!g5U2‚ݦZ]n‘<ŒÆÒà=ëéæ&†;…|Ö5]>ýF¨Ôš#+eåòuÔ*‡©`p1äJ”È k4¬:ð^±ì2NEŠÎÒ¶'}²"¥Äƒ`ãXÚi{Ñ^£rÜÝr&V$Ê#3˜‚4œ›It ¡UMRu#39ž£J;=!ÇUôt`ÎãKùáà7õ|ùÖe1–åXæeÇ™™2æffXÛ2åX²æct1æeôKÏ_–wm¹ðÎ�R$*º³IÊ&!` #3`€‡�R�ƒ&7…]Á¢h«æxëÝY‡…3ÆDÇ™`B2yû«g�Ùh—ÏŸwßX�ïË…F44ÐÛ°™	r]v�ˆ€ø‡öÕT³‹KXÌÝ3t‡<“:àé’ë/E•ª"3­L²Äuŵ¥#&�S9#+¤®ˆÆ‡Åb˜fìÌÁ
òäÝ¢‡)@ì9ï¼QÕX×Ýw[êúöî̦$œweÓ¹¨" ÅÜ.rÌÃÏã¿nŒÎñƒ'³…D�vñ#+	�Œ\@¨ÈjRÚr›(Û[7gÏ\Aq¼)M¾aïg¥Tm*£©–a²áL¦šmÅÜÄr¾ ÀTÏq¸Oú(T‡I¿j**ð,gB¼„á¨#&p(¨ByX¨{w	sþj{M#&Ð@Ì©9�.tá$oD·ÂÊFè»Á.¦‰éRˆN¤«zêÖá}…9§ŒÚ’ó§#&É�6Ó ,#+16m�kؘ�q>”x7m@�“N6&"‰6P›œ^R¦21»æŒÙ´æ±­ôLÌ­"H†íÉTÛ�­™s„�¤…Ù‰€4`-#+ucŠÉe„jô?—GB'ºlÇÁA©í8„Ôâ£]ðªTU´Ô²<ûQs5 clÄ¾N†¤!k…HAœÿ­ûƒÈCˆŠ Î�¢4ó›“]b!ÕWjTŒ	2XÙ/¹ÃLÙ‹4�¿îJÆ£¹Ý\š:4)‡��ÌŽ|ÉeÔ!,Ë2#3=#&q‹4BvΈø±Tw/Öe!#3ÃÂIàÜ�8H#1°ic3ÝàƱ…EÐA™bÊD#+È„&ÀÃs¨÷°` û£Mµwš§‡%™‚‘HTÓ°=¦¶#Ôzzùšo ›C]ŽÄâp7ƒHl=Ø«†¡9Ü:’å’0œDдÃP©Ð¾,;PLuÛF0Œ�®6×4†1“"b‰Y¹-’M]£­ÆË�l,)ªÀ•T™ Q.KR˜¦ÁØ’A�<:Y)ÎØE2…2ƒ3§¹²…ÅÖö.ÛR‰:2g´1}W ´Ãì;0‡nÌå’Ê ©�d@‰™ÏÈzÎcŒÈ3ƒJÍæH4êé5>'Mq)ö“Ùvs59æ	ÀAìíqGU�ÌÊK/A¡o'ù#+ChXÚî €\±Qz¤ÓRºJª³`—Lí‹ìöRpÂÙø&©O¦gq#|Éd®#+º|­¶Ûm$“ú:KòEÖ	HAÅ›`OŒù–˜Éb	¼‘3ÊP’ý›ã‹m]\Mc]û�ïnãÝ\6jcÇôÏК«|ùÇ-€Àiž>i7ô#+‡¡ötÍèT.	GWK¡½óÄh#3	=¹£É‘ó03�dof
�§$$`ü»íúÛ9kAi¤cHÇóÿrðívÖ‘º¶¯ÄcŽe3$Ç(àx©ýð ñ}yúÊeõ»tVíRWʸÆÞú¡1`@MÖ<HþaD?ªˆ»4Ó\ˆì›Õ^«vÇù#÷ ±ª¬EäC(;#+VS¾WË?>ænkgq?Ó1dUŠÈ¾c?e6,‹Ëh&œïóÓz†æ`¶#3,@l–^Ððçí»ñåõãZÌ�GØÃï03(˜˜ˆÕ7h#+‚#+]OJý[‡Øª%(ß¿ôND�ç;®�n}ú‡ªêò¼¥º�SWe¨é°…ÑaÑæådà�qþL¿Ö½äúÿõX&¦Ì«yéô– د‡©Ug›.D)ŒD„¥(ÿL–{;=]ãÜ�Ô¤†ßÏëh<YMȸé#&)Ó¥ó¸ BTlÛLU(16ó»[)‚#3Hu#39í˜Ñ')sMåà@*³vYˆú½Õa#&P  Š*唪¢¨s	ZêÁƒ³¯�N¨ÎÄ’’zÅøe¦*�*'åý2D»S"H–BÖ 
² ÷¨#&C¯aÒ?ðêþ“ªÂ`høX«Ã4]”HŽ§:ç\¨�"|Ñøòü��.S›u¹x´„B6«D�[*f"/Ëaê! „OçH%:RùÂÇØÒPÁȉ±T*wQ�O!DöÊÚ1@�
T€{ÍÕPûõ$À?BK£�+?GÁ|7¶­·^&.]¨f-˜›6+–�E"U‚llc}r¤·=Æpr ÂPÆæ@Ų¨Ý#+{|Î0ó•�MÎ3ñ@õ„ÊÐ0=e—¤%ªÌ™!²Æ´AÓ0ƒô*ˆÑ*vzŠ[D Dz
"�í4:‚X_ÉO»6šŸa×E¡�€[ËXXÔGIc=5°&¤dñJµa×n�ÜwðÚö´GÎF*®Ëæ1À"wÅV E—ß=÷Õ­¥-«Š¥¤²¥¥O `7à€p抨Â"b”AAE0lC"âRˆÝ XB#3ñ2ùÑ<ù$ž–ßc}‚X¦ìļ¢²W¿¸ŽF¥ŸpZZ³ â’Ø�j°Ö*iB Ð4X¢æRiw"!ýáþ¬Ø�0¨Ú
y¦ô\ÝI&�zë·�MnW©wuz—.L×Mt’ó�c\?†óµçuҹУrÉY»¬\§Êuå.“¡×½´–ŒønBO>Ýku%ïeµ5|»:ùäÌ‘°©$€B,Yä=B­•¸)ì âkþv€°#3ãÝ#þAEEG ||' n~KÉɾ†]ïr„@Å3°q›Rg¦y†¿ló°ï&;¿DcBÇQø™}G” Ä,]CQ9%`»¿RŽštjÒum²Ã&Ô\{Ä‹Ê¢ªQsŽ1¯ÌÙk�Ï|ÓoúéàÚ(ä«T×Å�U‹[תï=nfS"£k³ë§ts9šÐ#+¹	n´ö
UþbÔL‰}îƒÌž†ñéj429‹ã™•±�Y¡pÊE‚”8Hó•9‚fäÈLíʃ�ÉYˆJXPÒÚo ^#+Â:)d°
Ÿåb fäQ“Õ#+¡¸áɺ—8éJ�4~Òæ×#†º¦aáü…¸]'‘'¸p‚i«JSVðÞW#+,u®dÇX@kð™ÜM{„ãÉC3Y�xæì'g#3yþûKó]]ù@@{0ww§‚sáÿXèO#3TGX˜?î�’<°þYØ¢�Ž¾5¡ÌųE›é“} Ö"t-R{ñÄCçõûc#3)„(¨QRŠN¾Þ�éÌïYG4TõÒéKâþjö¾2©5WM’Õɲ«†,#&°€èVIö„Bã¬"„ÓH/­G�!aœ¨œ£Eª¤;/N¼º–­9§ùš]V)ß)öépµ¡‡`Ù΋qMþ;òß[ƒ¿O—_Á�öÙ°åÌ�Í%ݭͶ¾¥>šü“õ4Úæ·òתõUû1šÕ‹m5Q‘R‰6ÅQ¶mµ™#3[%KlVJÚF¥E&f#&„*¨â’qŸ9Êßd*Npá´ùm¾¥Xµ¬Jüͪܵ‹UʦÞå(ÔAÈê�”�rŸ†¶1‰Íg}|(еŒ9Ú+NþÛ�¥FÃL´YÒë´`…¥Y#&'hªË*Ý
CAÈ’,§fC¦|4¾nAoìÙô±J*8†ª\ÊÂdÅe6Hlˆ–šÙ…XnhÔIVUA 44iT 1 Í«K�ÁáY�’d#&{~íí�³Š¢«"*mÜ!H­¢¦à–5a¸�øÍ”`ÐæålMÖB;rVÈÄ8L²‰,ÿ=ýÖ1Ñ
öù'‰#&¾e#3¡U@n7o$áÄ꜈§·rr¼¶Ñcšj,Í·Þ®íQi)š­Ê¹µÍ®Ò™±dÐ#&ªˆ{ÁHBС’pÒD÷µ�>›¹™(p›X²E	SDPñTz[íê}{ÆÖÝì<=øäÞQ¤³c|´‡í2qp‰¿êUzº¶ÚuHD9•ëò‘O·Æ"`¥8†cØšÐncÁB†ÈëHíÿNý¾Çéãý?µ……UÁ™˜9�ÇBÊn$H„!˜†{KðºÃ�)2…6ŒT–Âev„$?'®ªÒÍûÕòÕ*Ó5Ërê�^ú¡Øz÷Z­¼í:ºº,fë
6:4#3TÙT‘ÎM Q·ËdÂ#&ý>�<C¦Ṧ–*ÛvC5vC)hcè¢[íÿ›pðò{>'û�Ä�?M";àB*oˆ‰—-Ÿ¼”�ÍûrUó<¥·y#3zƒ Öð’ðqŠ¿ÍzDýuƒ·ªØ§)™
ú²:b�@øhêY ÝØæÛùwô¼Ó·åÖtý(íŽì¸KUP»¢rÈt“ mƒN“êéݶ‹Ï»:q#+5 ’B¼]Ì{Ÿ�÷Àæy;—ú4ns}®6¨IÏZj“`i#‰Öµ©W[Ôoð�¤Œ	Ò;!bþu‰6BŒb?ÎÌél¦q;CKHxÜ¡ÍmºI]w2¨£aª
Y¢¦`n»yrSÏôD¸dK©€oà˜f,Öj	0ÔO#Ç•ŽÌHú˜†ÐC¸•ôB\–ÛL)—SfX RBŒ²€F`¥ZPµ>cŠŠ†ÜŽ“ûÛ4µ³v>}µ.rˆä‚\3‡ŒD„#3¤"b1¦LáëœÑB”?µæøã3g‘¢±`H+�M6W’Vã+‰…J8kyXÁ¤&j£u	+õ$QI#&@H@yIQPö>AåGzo=}ÏÀAÛä¶�ñ¥-oÇŸEf¨}Ÿð³ü(ù±ƒÂb?įú5¸+8,]Æ£’V,¸ŒFÒU¾ÿ¯§SÔ‡X #"ž¸U]¥»,š£–ºX±«îýÃoj sPr‹\Ð'~½�ævߣ—DÁA–tØ#R—äˆ1Öˆ{%^«�‹Y j‰�ËúžY”pUt¦ï'|@úÁ›™yè�M‹ 
Ê’Ë&�3"E …YƒIïAKVÖêæwí‹’QAvéFí™#e0ïÓ‡ñÌÎn!á·ð{AÑ–4O”uI·8Àãóh¸ƒåØ´c{h¡¡sà&R|mÇæžžM�I¶ÊÂèÒ¡1�Í"|¹'§—ÛÎ	Ò-õó{|n7÷k[k¦c<xRÐÆíÖÿQÖ�‰ð˜\tCAåZÀèðüsMÇiê¸çÆñs¸kNO[êÑÐÛú4�¸¶É¢Da0”²;o�ù߀�£‰×G;pCÙÊåF?̺³¦y6duëÛ�ýÕÑji²sÍE"j äAþN‡­·LOjíÐ}³¨#+´8¾{3û�<ëM¹.˜Î­ï>íæÝë@´Oiá–ßt;fqãÞ›ÏÜ«ÜèZ;ät$z3#c¨k¬vˆô¾øÅa�5·4ó·g/…ˆ�-ÿ~3aÃôáÝßÒ�ŠÑÁÈÝ[Å�X!¥fÊm1©öiz5ÐÅH/¢ÏG–ÀI‡Ø6£±t!ê:ÎÎ(vø”°+7*ÊÚÐVš¥U—ú‘èÆòzîß«Kkwt©ç²AòSàͱ&&Ü™¾>UxÛ°U0ÆDzŸ°ŽÝzýrÙ,ÑÔxG <HlÛŒò·±?c[ßUò�÷€‹#&#3†C3QFtÔƒ#&AÍÃÑ—MÚ·;PðÅœ=9
Üv°W3Ùj®gF§ËÙY•HsvÝ£Æ�âö:fy‡+Üø8#+ÆÖéà0Q&‹
]€µÖ ƒ,o`ÂÌ«kÀóu]‡¶Ô\ëÑÐ:bî,mVðäs,¢Ô_A™pFóhâH3g	µ°ê¥U4ØŒ#˜\]ƒ¿f£,5﮸0A‰ªU)AX_wÃßõièzÑ` ÏfÛä0dD$a†	�C± °#+|s¤}vV¡rôMX’fÏX܈¦E�Ç.FFÁú²¬4ëbfúëÈù¹¶s}Í~� „C9û‹ÃV¨wü险¯¬/x;�(°ö¨¥huH}MõSRÍãódy˜è@“ŠÎƹßIqЈì•&ŸãUÉr完ªÌÂâÈCiÉ�?ÉíúoPŠH…½Ýz›cæuÀ“«áÙ]›„N�„;CÑ}(’˜çuYGs`�k+…È›fÕ^UÌRÈÊRljénÁÝ]Nšíw[WT­w~%œÝw]kÊ_ªñ¼‘´r×¥×�™†G{˘	M$^'7vp¹#+•à\;Ž²XÁ+[
£q7о»ÝCR$MY‘j£}?±ïôrNÕx‡ð]¿4Êõ‹={*ÿ-æáønô]Ôüy[Çç°zºN¥¾ëÏ/%1f
dü*éh€ÀТ™;ª‚5UïµXJX¥)R1hœƒÜ;Ñ:×Ù~ŒŠuþsRý,ûì>Æé›·p»Qˆrí’
 #&èâIºJ1ʇTAaL&nwÖ¡¥ðš5ù�2�}�-¼ÚÑHÇC`ECD0–@¼Ð°×O®­$t†Sf»ø-|ixn_TÒ#´Ø0ýÙ×##&g’;¶QÍî#3«jzgÇN[�=¢xšíÁÒ¼ºlúQ™P��\†ÍÛ«­n[·-ÖêÝ­ÐT’#3R»[Š„`
DÁZˆ#&D%„‚-�…Ÿq¬¨W#3$#3!„t4$‘ð %Ž¦ê[U›‡3 �5-ÊÕt¶Šßo­~ʽšŠ£5ËHÑa„C±ýtcsâ=k
rîãÊ�'ÞmîšçfÐ-kk™âÛçâm-l8zwœè+„]Ún	")ÝØqˆBñ;p`éŒÏ–(qŒ½
·EUÞ殺ɩءØE$R$={´<Äç“°¿‹¥®ªÂ(ÄY;ròç.-Ö#·;®ºei-³MeÔÉ€iLTŽÍ¹¹£A^\h%0ßÎÿ¦Œ°¶y¶[‘Ïßͼױ·±à†f´�ÑZ±ß ñîØÚ' wäü�ëøà2‡_Ž÷ÈÓz	IZ¢ÄHu„húÏ-²9<1Ó]âÉ#ˆsTšã¸KM÷ŽÍÊ÷#+°¦/¡-­;=#3-ü¸H‚¼¤†R WÄàèN¾ƒŒ78VÎfÖ¶¢ÈôÑC‘~#+Å»�¸ç³“M¾ }ÜÎ]˜œ1�A¼À¸síÓ²:ÎÂ#+q¨`–Ã�EÑ¡\çOÄ÷VÊcR^9n÷(µ$’AÌk�²ìb
¼k—dIZÜ4›K°lèÏTÑ-±EK·W	u>Üé\�3	�­²l‡Ì,°V‡ ûn<�@µTAŒ~loÅ«Ž�½ší€K dNoõ9évW¹ðìøÑf{”42©Äôc+ö(,ˆ
#&׬¬Ð
ÕN$Ñ"'‘±¦	Æ’ ÄPdJ´
’�\c Ã_qa
Âz@ðÕÚ™%l=‹UM#’„GäR*ž)+EªÕM’ÖqKc��‹ׂ
ä‘`Âà‹IÌÙ[4¶ôÛo‹yKÛ·úRBnü»Ý;¯n�—khZßð¬GÝ„mÈ—ÊP:qd�§�ŠÒ†TŽ|+.L÷˜éè¡,AÛ©IDŽÝ¶
*	lë´Î+�‹¦å0\õ|#3”M‘za¿9�Î$Œ~§À´Wœ\ÊRÕJ¾Çêø�ƒõ{}fpñç¿U‡…ú”Ê`7œ#+Úˆ|œƒrÈõÂ2¢;ICØ/óìÎd°Éf;Í/ð€3h§sß°‚H|}X÷ø#îGçÐ÷ž�°nÜÉsÌ£¬·_ÇœMŠ¨áÕ² rûºô'fÁ½�dèUÔºêÛu�›ö?%ý#+-	ª!Ø=$Hu*JÚ|½;¶¾î8¶ûG3†Ãí-}-2«K¼ß‹—Ï:¼$¿³ÄÙ´zèóá‹4Ôï²G|ªh™ ˆëÏı�‡z·o§ÕåíY)‰mÃרãs¿Ãœ~qQFªªXÄD#�{è(MŠ¦e¡	ù]-HÆÚQÌÁÈ6OÀdwR£�…\PT‰ ˜…•Â�4&#&—€9÷Üë$$�º!˜U²ìÀ&ppÅMR:8œÚé;9«’³¥ø_KHLPPP^½Û~Ý““ì�Q¨ÖtNÜæ#+ ƒ†÷�"Pü­Òä·á#+1.!¤nªTz®8/t1l¯hxa6*q¤å	<K‚2,S¨ãÆ‹DØB&K½ÐÙ>‰m-!J¢ÎC5Íš³ãD0šD	ïˎɳ:ßm}#�Á¶ÜmðYÏ·:%‹l³EP‡åØ�´PF‘¹(8ÃÃUR$AÞ¼? ÓØ|°O$A¢#3h•£%n°ŸÉ¦—É£Õ5l8“î-:‡v#+&Ç�E¹²æá~)ñ\€ØÙÃŒîS¹.†6‰Ò‡3C(ȵ$5Vè~~pÙß\b�†WÞètÌõklòy¬)YׯbÔ³PŒ*öJFÂF¬ÈÕ•j°>Ærîêž�Þv½K55µ•A„AHc5˜Ýc@랓㛄u(3©‚çDBsu%µY.qEÂ`œØ@Ôƒk°îâKÕ¢�·¬ÜÜžW_Õ¼5Û‹º@›g7œÜ+ÄúÀ=½y7H%1*bTzѶ‡¤Üæ;”œßøœýíÆÙÁ
«õ§•*#+‚7¿kQž�YáÞ¸ís³î{¤eèloÄ”q›ª²çûŒTª7™pS#vƒ0Û+†Î�x�”Õ·ÇVëtÑDNTÕ—e” 3¼dÇF¸bÅu£NÄ”PVEuX`¯?)@M†5B¦¸RPìÛ8bê6
 Hb�H˜m!\â¶#‚)PLdVj©"n¥D½ŠÎP4DÅVJ™DQ¤lB„ÒŠƒC%¢Ì�±!ªv`‘CH‹M°ŸVí>»³iÁãŒQìFN4íwF#0m9³TÎ¥¢%v6“#3“|Q�ºA7׉%ÓC7ö°ÔÉÄ@€v‡¡©ÍÁÐzË9r¢Þixw’a˜!¢açï(�pˆ]¿4w\ÕC¦¢^q!´Ì¹ßË^ÂKª�ÌʺŒ¨6e@/Y-‹‘_"Z#°Û¡ä\M„]‘9E´Rú׶(n8Ò_yµ°&Àˆu›\óÛ²“|¸pàTþÈû½úºæÆ÷1æE3Ýw¨�tVŒ Ôç,ÓDÛ—V“8‚ÅS]ál�…AÜÅ	Öm�Fy’™ÖÁ³=怫pß_œ¶ì¼[lA´"½Îi劰{Ô»	àâ²qnØfüÞsJÝ°�Pl‚	0ød”ƒ.šƒäI4ê‡kcLØCàÜ	°
8œ¿#&Mpo,w±ÍP2Ô‚l8ü÷š^t�Ë:+˜Ò#c#3Þ(qCÌãõü;ÇÒßÈÞØpN‰Q"ÀQ³
bí„àÂop
v�4Z°¶Æí�ÎŒ*ÃKDIÒj#&—&&›:É$sqc#3DD°�±Çe“2€÷7ÕldGb@I
¢ŒsÚÌ›é5HÈ\"0‚�>²&¡F0¸r‚ïèÛOÜ ¹µi™�û`¶Cªm_ciƒá�«¥3‘“©G–Ù꜈ô#+¹0�¡”�Å‚–M†…žB…{ö:ueÛ#+¦±Å»æØ1¦Æ�î�þŽ4ÅœŒ~Çš¢1y¿�±–‡MMÜ®iÊa/´ŸàYBIäª{¯e“ýï› ‡L„T„ERçtì,,‡O]jÛ÷”–Eš-oÉÝžvܤ“,JÑUE«ÆÆ·-ª¢ªÔ[>•jñª¼jÆÖѨªqBB�¥Ü}35mÜwï'®®`Â2$�~GŽ-a8V‡¸Iecz#&ãÍœÐlïé©#&ß+.ÊÀ;çÎxPØñ�¡ñ>ÑíPëUø䦘b	L”MR’m2–b’¨ÚLÔ~§WJBÛHdŠ6šT!%š#$,IY’5ôv鉒´š4M)KYf˜™FHÌŠ4ÔIJhW˺€,T° ‘¤”–ƒj)&�A•&K)LQ˜ ÅY¢md%,¤ÐY¤²)¨ÌHe„‹##3,F"Í#+gz»ö•;O`?·qk/æ@£¬‹¾s°i‡Û<»[œLiª›{#+24!ý­&ÞØ5‹×"ð”5-gX÷V‘˜Ã?W¶lò;X%mùnD†ŒoIaýFxÃ#&9†ú�ž#&òè't¢¢~iÓèú¬˜æpàN¸QÂÝç|LÌ,èØ#ö¼ç’_^;V7(5£•
Ku†#ËÝ¥›F’þ¡gÛøƒ}œôüá”Qä²TÚCm†2•¼PcL2:JÐ#”¶zöKòE^ú×Þ¶ü,�…RÍY­&ØMe5™iŒ’Á#9tuBŒÎŠ×#+kãUžb#+@:e3ñdןF³À™ñU ¡(Ç šá</�ŽFÑ‘bì-a¥=¹þ}Û³2úV[ÛÔµŽÀUèz~bD{esøCº‘–wµîÜ{;çëx+øB�ow¿‰B%�Á¨xUFW€˜£Ö™&y?«åvÁx®ôϲàv69Ò"XÁì€nÈù·ÕÝ#+Z!;¬–�ZÚÊSHA¢Aº¡`ÀÏ 1<zCÃñ YëIo«ú+ð¯ÊøñöfTg¯¬YÖ1.:Ôpm3°ª� ï<a¾«ŒL--³˼8÷.óƦ1י݃m�ìÏ¿Ëîf¤Ë»M›6šXÏ‹1®£R#+ZÊ9r×·$vþ#3Ä@ƒÑ¦”â<“6áþ»LÏÔºyô§òXöøµ1”õ˜é|ýœ¾;kׯ¥Ó‰r5€7äßih'¿G#+õqºaÇÛh b餅£«4P¸=¶žvû>\óƒg¡pb ”C�&P/œížûk˲ù>­u‹Æò8Ï­–ù�ôÃ8LìxÓ˜nZžó]Ÿoæ—fƒÕ$Ü	·2¼ö&²›|'gw]1J#+êx;ÌëD$n�¨µ«@3Ë~͆#3À#3•|`é=5–ΚNH""#3V<#3í+�frŒ Æ2chN3V*YtÆ{ã¸o„W
vÛó/|ÌQðÝIr=çyÖ�ÝÑ8f({ú”`ÌÌ|ºl­sÝŽø‚ߤfÐXì&`�Þ1lzš¡Ž·á¸¼5k�ëèfa 6ðXpIüþ�Í‘ænz”k]M,!;2èÃCÓôà{ßë/»k.»ÏIäĀĨ¼£Òç¦ÇÆ=ÀÁÓ´G­�)�(å©HÚ,ªüüTÛZõÓ}|Ó0ÝæT�½¾6öF£°ªÐƒPÄ#3‡É¤•€Ä79òèF™ÛÃÃÇ>¦¶Ç‘ ;~W4Ay *lwáé2„³¦£¡–›ÈîÎùÜ{LŒÎ¯�øÂI¼$yºÉ!Z„ùWù¡ÜŸ\«èü¼VOªªîìõ·tÔŠd	¦D<ŸA¢:3iÂÌ̲ÆÆÓÊ;Z#…â¨XAãàfµ'Ý‘Þ,ãSl|H·£M™&]8ϪœͶeɃs.æ=Ꮂ0å•iþ¶f•.¥2^%Ë¡äÔ ÇJ[…W,ºýÚ•éJ<…R¥b{Í) ––O¬ÌÐõˆq*ME/áD™—¤â$q¶ïx#+ó•½#+´ZÃ#&ÙËL#/‚&vÒ…Où¹—¼™‹B…ÅI‡ID=Ùh„Á)ÐÒÉ®�âî(Y8rQ¹Oµ˜²ö¶¹wÞfLK¬»EKåH�J˜ÂÁµã³9í«€š(t„sM	S®×L9ÔyŽõ³~f1<KtŠ“�Þ._07#3ˆÜÇG“h¯ÀÀåô¼ïB1ïÄU7QÙñåˆìºò²Ì´1g$"ÅÐvŠé¢6Dä�"Ô”0ø{^ÈA•®5B¯WLÈZO�¨¤"&y©µRv‡ÜÙ·Á™:ß\^_bCຼßi¡/èèáÕm³$ææ3¨Þ3€ËÒÇdJ·ç3¶[¤1a#3.70ì…®®U™	—[[n¸ÖòÏ׋”AÚYÞ#Ûš�.ºÕÅÍõ¦Ö´ÆêS¬ä¢+Š4m€ÒLY9ü{¬Í|ÿØ:œáÅ�öÚ#+-ª#+ΚÖ$<ƶ©Ú$Þ•õß}ï8�KÞK»×lG9Ór-™’I­0êF¶BEWqºVg’n³ŒÄ‹mà­Ùù:A‰qvè�-Èx¬TÞÎÐk‹“S[ÜÆÕ‡" ìú~$àìØl»1h$GTÆ×µåB8庯^&ß í�‰Ù÷ömËvîƒ7yOeS.(Ù¥:n›î-;CJ¬9cŠ¸]Ö±2éø.i,a±4QŒfÍδûÕ»Qu°í1PÄ‚’@i¤%\"65LPM3‘‘´-j›rd€{Ø.˜ºÃbã#3#3ØýÃH�Pé�ê›òÆ&]Uuî×&6Ñ^³lÜ&(#+t᛺®Òž¶åDVIss3¤ÅéØÄ6S$L…záî•ÐM^þ83aòµÞ,º�”îeÍ#3^4ðÂl	q�#+Ж107p$É’¶Ì»ò‡uªM¼ê¦ú`¤LŽW<LøÚÃ#+N"Ù.[Ù[<`ʕú0dƒ�ßuÊ%r"ræ#+Í©åŽ&¹ÈÜt7Áƒœp.M¨î¾º~cFy‡#ÜFBöWw-RTòRg7w6U8“nØ™]ƒ`³'FÀûÞyT^xs˜zeÌ,’f6DÍ‚!6´óʲb6§lHe§4P°Ðà­¯.”½pÑÏYÊ6Õ‹Um¼åCöè}×AA"4ìh!LŠ#3Láœ&zv¸\Žn…‹D“¥Ónó„Ðæ;é(ÇN<s¥R¢±«tÎÉ)dâ�(i�ÚC‹O§+û\B>ë—‰0±ÆO¼¶Ë_NÙKk)>t]FÛ%„cÞ£ü¸âìÒsŠéÄÓo#þ#&áš�ɘ7Æf£$&8ÔZr¹öë+¬šzlé†,aÅ4œraN$çsGœïšuðÈ.y–FŒI·Žcs™#3<k@ÉaZ(ÃQ]e4H&3]Lk5²–9LÅ“cÖ™˜7Iˆ|I¼”5]®88îÛÑ[Õ±™1Ï2Çbrwg¼;Ç»ôß*:)Då‘ÑöÄâ&䢈˜j‡ŽŸ%ß0Ó'‘ |ägæ†1ÉÓƒ~ÙoxÙÅá]µuïÍëM6›�Șìƒv[Zß•#+0m6÷
©Ü)xÑuŽL6XÜ-÷1¸3Eš‘3–.3u7LYm·Ã‡†y„)Fs’³7©†jø7§£$‘»¨ò¸á™Žå³NQé²»=akD¼’¡³õu4µ¯ÛF²¢¢ŒÍjÝ”¡)™2²‡ŠEš	#+<‹(tÙâ"/S…�À³†@ãqyéœÄ)r�g»î[Îïd²Ù*%#38rŠR騶(‰=Áš{ÃÔåì¬aFç|…bŒÅœU­hœ(qÍ\k4v¥ø’fɸ›LmRØg}ì;XmX&‘&ï(¸±´ÅMLÔå`i6i„#Q‚جQ†Šä@�IRNêɸ‰¨%1„Zb2a¾qÞ±C"Ö	BGªœ“N"ñ’=ö4JÄAÇ3ùؽ—é¶ç+ìÌrM1ÓUWJ31bI­h©Ê&àZ6&ñp…\¨qN¨u†[œÐKYA’la¦	a�FòùÎÞ½[Á°d ÓR¥NçbK¦p.†´t)L7â¸D/ÑÂ(h¾0"<ø6Q�Ú�òá¸q€¦àØC[dÌ/|ÄKêÙc`!	!ÇAh‚ÝØÿÜßY�†¬œ…dR*’LŒŽ4­Š?KìÖ­Fø"T†þÕn#32J¦‚CÑ%Ö釅[Z“b–;DV#M;D^Cj±±Fu ©¦°Á¢VÔ�±Gá”ÈŒ2Ì	V5ö£d… l¬|µ½ÁCj£d-ΔdJd9&ŒÙ-!„¤ÓNBc)šÐA‰s…ºl&d‰$ìæù	ñ¨<Y–eÐÚ9t™ŽÛw¥ÑŸ¬S»³ˆzYRô¤àyFæ
Ë@l„„&h6Wœ9Ô)"bG% õ±òõGë´p0ØТèf,l+šÓˆt7­­2b�Qa×x|­ }k8½–6b¸}
¬¨é}#Éöd;;³§¢¾6^8Ñ#3¡À ù¥âÀh2¤ÓhwXŒÑ0*4¡Á¹µÆölšufx®ú«‘ƒr 0K	M)$&7}U¼¦&M¼aÑȇß<„›Áxbk… ¤ˆMÌ�Ap€yfµ®8(|t±K8º’J¬P5¾P˜A`(2”šWoÂ}ÎüB¶Ì’ÆL6Áe$›2B‘`,Dðz+ªJfÝ™èpÜ‘9Ę8TîЖۅŒE7‡K|ÞáN-wÖKHˆ8=ÏöÕ#+»Þ;XT‹‘
ãÑ°,¦ìëB#&ÞôÄ»ÀXry	‡Š##&ev=hlb86‘@Šï3�ñPÛ#+·ÊM ÐA#+63Ò^¢;�!ª>ÌKÒÅÖ•DB9ö‹
“2òm,®ÀÕw¹†)ví^#3� ä㤧†4x#„ʪ;tŠß±ÉHSE#3Ý‚@†�Ž‡#31¦Î.àdAPÎ2¦”Ų ‹Žp6*êØÐÛîÇ6Ä`Elð'¹D6%l0æ»�Ì5¦j9!ù ÙRèÀ[ÔkÕ½tAZ9±8ÙcrÎ@’ÆÜmÌÔÏ-l�˜ÒPè é”Ï{„ß¿94¿"«1W�¸M¶w#3™æÉhA‡l)XÁ`uO46tŽÚ±t3…
#&aõÁPŒ�ßÜRÿ<$XE֚Ė‚›�5)Í)
b 5þÃgò¼Õü^!õuûê­÷›ç×ã£kò]­Ù­H¬T`}UGûŸÝ�f0IØ#&¬ØE(
Ò�вE+üèt�¼XÀŒ©QfeÂäbŒ@Y¥Í#&’`˜¹!Ý!*AÝ–—Ä_°>]ŒÆ£L›!}k¿wF®¢ë#�…'iäv·‚p?K³ý(vZcæ/¾ì}úãpÉÙ9Ñ-¼k8c6jŠâÃR“†&Õ�'ÛqE­g0K!\æé*—·‚Œ]�ÝŽƒ$¨Ð[FF#3p˜$o</D_™èaé“–Yk<˜ÈC`ãu˲­Œa*ÂÑÕLà9öý¯¦q“Î$%Þw)X’#ÀGû¹î°#&#&`i©Ö:ŽY•·â*%U“ye‚TK(6åêˆka¸‹Ð–.Ñ/N]|]É�™äN�”›(RÅ’Ú£™¡æ½D�­f�¬Egêý_@6…��ꔡɳ~�
TÓôhž¸4‹mý“^6òð—&™�%uÝ™ÍÑ*5º_ݯ5/᧬�µñk•ù#+N¸b‡1àO•¤U'ì;ݺª&ôCr†õàä„GŽF\Ž!Ͼ'¸‹Êr€p�EzK¨Ü‹î"?Æ�C‹ù!(±ú1&Âïéþ£0Fè¿Àäýéõä{ºW6¬Íòd¿úä‘ðÓJ׃�ÕANé¨k,«‚ÇMJ™e¼—5^:nø<ód‚B�âà%”.Ǿ@ƒÜŠõý»ïa±´;¨»b"4cÑ#3¯´6r±2m[)4¤Ë®1¤„NŽ²¾3žAœX{ZJ†£CÜ~Fj;ã_£ô…Š¶ÐD²—–2Øz�u8DH¤Œ @XÛ%JkF´Z£QKLÍDT­JùM|6ÑP#3¼â»ý‡†™è(};#&ï ˆ—ëSá¾ý~I�d¼‹£Ý¸
û·š÷ªv$=Æt�ÛqãÁ±÷"ŒÓ*…¸ˆ‚ÀPZ*ZoÝ-€Ì¤ó{|HSånã½Èè°,0�	ÔomnA.eK7шäí(9ªb¬¤(b‡îÉ	�Ôž
ýI:í ¦xóÚÁmQWC‘⨙ÀÁ×`/ÛtJ²´&Ði€¨Ð.ìGM‚æH €Ò²ipóD1–!pBO‰�â^ÇQŠëW•{Jù³S6Mˆ+â¼b3}÷)A5˜ƒ‰s·±‰~nA7»5o>X´˜×>½»ëhäR(àôã;¬²r3­Çƒ�w¤IQp¡t9|=wÑP±¶ÈWÅ·¬±Š½+Ô®kàì¯
 6ÑvÅ—ŠF’åÁ¤g$IpÔ¾F1Œ‰Ôd¨‚$[¢…U¤¢Š'ñ|9fnî1ñ’.8à^zš0	/Ê Z%“#&;´¿Û<þ/€x	Ûæ>ÖPÆzýÅLb€-’¬¨(Œ#&È~+¡bĶbÈ4­%EÀê² +˜#&Œ¢èr#lÓ÷HíÁú69âëjTÂû»/&Ó‚©(Ûà$ý·(ccF˜OÛ#&åiÁ¾ŸXhAsˆŒ‹wbè4›_c•¥´}èÝÓ •J
ËyÎËR‘Ö¶)M¢üáœCÈÝÜE–ÐÈèQLŒ7ªÈéË8ácMjµ‹X‘™ý,<Žzb™ÃÒ†r«	¨\$èÝÞLç3ºæ`¤ ho(hxò”ÃsNªP£9’<ÿ+#&­ÓòM1H*¿˜MR«®Lì�‡;d²HC²ï60ÙVÒºpÖ�ð?a°d;Þ®tÎ#+E„I‘pLhè5åÀmPn„.ÕÉq¦ùél¸lFð1‡�MF¨Ñd”FÑtìýpÎT�„Âo–ìÅ…1Íê�óC#+*&¨#+4@\è"Ѥº0ÌÐH`�K#+#&q„Œ¤‘+A
(“i6(&€k0]ù°-
!
E‚–@�šèv&†áÈ™Ó
¬Ý–·4@È?®æKƒüá#&ˆ¡æxó#3_‡Ïð­‹û=—õ+šÁÂ5"ÅvP0z�ôŸéfoôÕ
¯ÉÙBáøÃŽ`°Ÿ»êP”Ô	·þ¨®aÆ×ùJz8
"´8‡ÏáØÖ=÷Ý1ˆFjäzýíH¾Ú(Èä•©Q�$mý”«"ƒ"Œ"*HŠŠ‹êF@�÷>Bf‡Þ‰™‹zÍ–§„•ìé5¼‘Ÿ“åJ£ñ‘mjl›ûÏé�ÑÆ1´”Aös1¾!ááX²ó•þ,Æõ­uNðuZjß‘±Ul‘r É»—ÓNÞ#JÊ®K4·¬fªµ:JIajå:¬Sj°˜|§¼j±e"3¨"¬ÔÞ��d¼LXj2†r®^s6á¢e)D˜ø¤¥Ö;HÄ”Êi)�ršu-)¦â¢Ô”ô=ãŽ/ÉlŒSN±w�èÝš¤1ˆ7·aÌ+4¢Ã"+3gŽ€Ñ�-3½´jF>wi†»Å»–±9sŽý!°lû�ü\ƒ¥ÁÊ8¬ÂäQ¡3º6ñaÊl.T…(HYªL(¨ .“ƒmõÑÚ÷)áÆÓ3©ÞÒ÷¨¢i½ð½,cÔØÂð”G3š>fßl¥8�Ã3<˜Këjá$ȆÒH¼wד ]i¢J<*d)7ÓçSº8\—–”æ†:LþN(.æ™}n#&ß22"° ($9˜²€vákeAE’J‰ Z‚SÄC$ˆÑ„Éø$ømk4š��Gá!¥[“ÂD,y•&Ûk¡¢žX­®³TÑ)`‡!VÃ#&‚D#&[cL±ˆ‡£r‚îw³³“õìo]ü1¬ÀSU*"!#+½Í츻k,.î.Ýq–Îv½NuΙÜ윘ë¸S�kÌó¨‚2¶Àm´J#3¡W$m1ÙIbA¨8”Yd–�AR„«»¬Ê‹dЖvuü_}¦›Û{U×oÍÅ{[¿y\ªÞ¦ÆSlÓ)DÙXÛ•))Mu-q$H¤H@bƒ
Xz¼øîa�tÔZÌÐ`4jHM¶’	#&	"@$P„zü}þ…mrNÄuï%õÄ­bÜJAï`ˆ‰‘“2*K#+¨*è:a#3ŒQ„ˆ¨³46Ø8Äz`X‚û#á`2혞²gV‡êa@ËNî[,¦aŽãoß’¶#3ö !¹åȪ,UóŠüY ¤0™™Á^#+`_—<7‘q‡(¸"UEÊxØ↡²8îÎó;Ó¦I#¸Ùïæb˜#3gÚM¦#3ø�ï“ó\P;"	‹Ò˜`!h„a‰#+¿ÓD•aŒ Ò¢$(3N™ ”R,S�¯�¹q;îñáBif´.ÃN;,[ðÍÐ�oÏÂÇÒ!·^�ÈãUÆì�¿Œ¸ÆüQ?#+xJ¢y­KZ™L‹åÁÉ�%Q›’_=~GØÊÌé¶õàéÌBÂü1)¬ Ïc6§âjÓ�¡÷¯Üܽîj0ä˜;ÄÀ\aƒz(‘EÓ†ØwÁiሬ#+ä°Æ„Ð@.Dv°£K�ª«èÍY'fiÈ+SéQÁ��]pVC#“€5’ÌÃd†d—ù¡b‘(#+‡WPMO¦ßÃhÞM·©)ßô-jNv¾E„Û&#+üüühÿ#3Œ"EQñ÷}Waõ�§YÁN>™WªøQĦýÚŽäj~ù–!¡eAV#&}¾ÕZñb^�HËcZÆ´‘JQ-'®µÕA$£x®mi#+¡XbÔó*·YlÄÒÚK#+cH¼rS(¤ÐÓ&šÆ`ÅXbIO®°›VTÅ•‘‘SMEÛ-jX¼î(©­Js¦¬‰óí—š½º»TÄ&2’Ö¦%²Ê±­Š*Y1f«÷Ö·jù�’*™¤• ­�I¬Í­­’4Õ+V÷kµ*6RMCV<ó¯#+4™e¥”flÚÀ¶²Ù­ìêÖËTE£Æè´©¯:ºy×F›TÄ7úoy¬Õ&ô+¬µ5%Ö„«q-ÈF³U¦ò½¾�ß;}>ÖuœòÆt•’á�#+üe•þOßÝüf6ä¬Qèã©÷}ßÜSå×ÄíϸS¼�í!¸cMÙ©ŠK$Âw�~–M*ÐJ>ï-þ¯ž¦Ð) Õ{KW)Ì&hÃ2‘E’š4HHM†ÐkÓ¦m6•Ã4¶™¡E‹ ˆ#&Î#+‰þve�ôI%2RY•²–·²ÖÝ6ÖAá#3b!f–†¢ëT–Œ!D-nVæ¹FƤشZ±¤£…"6$B m¤DÒ�¥Ð}óy#&\Ä€¦ªA*
 È¢AbÉcd™%«Õ¦ã!F¥l¦­i¶TÍi5SJh¥IllÈ¢ƒªmbm¥0”PÚR”È–’0²™–!L›fS$¤¢ØÔ–6DÙ,Ë2£T›eQf•	RS6Y‹(£D¦#+‰©¦Ócf“Z2T’˜Æ“ i"©M*l%FªPl¥H”$’e’“)3’fM³k-ŒU+A‘1ªI©MY¶[mK2bÆ”ÉR•Rʶ+j½íZîªÆÒ³j•“Mµô-«ÆÕ¼•)­Í«u+[&¶ÕËš«Ù«ÖÍQUæj±ZÑl¦Øß2ªæÚ©D4Š£PC6Q™°ô›ø_O2‹[\g'”˜V6­ŽÃm¢Ô¯k
¶Ë%ÍP#&ßKBÝë$ãßµeLÎY›Ê°š�Q,Ô+†*TžÀñt<»Ú#&¨uq•iB^O—�û�UNј½1Çà”ƒ’/E‰´¡"P0kB ‹@Å~¾ýÛ][:ë»m¬ ™�9tvmÉr9ähéË#Ä.Ëä–|ÿAOóph÷æû0vYÖÊ�¨É	fŠ•F˜¡3uŽ´âê¨DD‰¨X¨ŒUPMú#&v‘í#&ù¯ì.Áø@/ºˆX?ÐÕÚk¾6+hnˆc÷³Ë›\ÃïÌ;P�‡òö¦„Z¾íùIÜ�”üt*d`Žµ¦·aû|Cà›,)t’Ä (ªàoã)3A._•$ §qOh�CÓž7:xžÞëw¥ªŽq9¡\”f×ZñHX–�bk"dÏ>‡·”s•Òg¤Ò_J‡Ô¬²(¡þxm•¸ÿ]e�€ÎÐköóœ¹(öayé	ZšÔÐÐ5ÔÜM¡L=M*’«É(°AÕ<BöfI_™Ìc¨ã°awaÔZ)Ý ûË9|¯eŽŒìteˆüH#&U'Af
æ	º“wLf¤•TXÔ€!˸#&
j*¢µF#&Û|í]×mq�¥rÐNp ÔMÒ\ù‘U0É#&©ÃA#&­111»›^h)¦7èÙV(°Ágºw_—3Ô…”XFEÐÕ¦1ú÷EmÒDºµÊ‹l4Ök^4Ñ#+ï-ëpßí69¤Ü…çðãË?LEƒ
Ov�ÈÃÃÉñ|S�W¬#+¤‰³/s®‡}ïÖ0ŒC`eŸ¼nn#+¡ÔAUÁYÚa#+ö³Þüè+½&	ýÇý(zÊ+#&SX—(DZ5Ír7N'ó¯]�½,E”Šòoò^#+x‡]ìåü¦åI‘V~#3#+R|åË"—Ž2–Cm¥dÙ‘C$šh£¹•%¢Iðó­x¨Ý“×nò®Õ£GõCF ÊåaÝQÈFŸZ©hk6I,„g6vd#+Ä6ƒI�Š³F¶CQÄÛlk-p¬-"M¤ÜsÕÆ#0�\1·rU[Á¥o΀Ê#º€�/¿Æb��l€äª5rŠ!¼3´,m=™ˆ›¼7l~Ô~rCJÓ�‡¸¤hÕR“ŸL>m|F)ãÓ¶Tï~Ó-NÙÅ,u‘1lÇêj§�܆k¢KñYRäÉØy­˜äK�’€�%Õ#+`!ÙÔg娣r¶÷”Ck<¯W’>@ï>Æÿ´²ÇP€Ñ Dë,¼WêAª#+)yjòyC[yªz&ä�Žš?~iÔGã甽ï^ⲕî*â›ÆµŠï›çj0xþŽ·‹¬4."ók]�ÒǵpU¥Ý ¨k_/%•·…»(Æsï>[«¶ÛÞªÞ{Éh#gb”œw69„#T_ÐFXM�úÕ£¾K•&cö@ÌêS2wЉ¦ÿ­É4`ÏÊ‹E½¹Èß»Lz,É•„Ƶ½Q'c�K+­¯ç.N)ö`¡ø¢ÎÒd|—“�F¤£¶E°°E…T…Õ]?8#3ƒ,	�!2(¤Zƒ›#&e”s*fj‰YÍÂàÙ£aù‡
¸u;>zúçd—|tÁvÀõ¢€Ìhz*C!«
…‘È®wÊ<‹»#Le^Ñ{g3—Y²J�°ø¶š%¡'WETR 4'Œ%kÒ²k…4­7+µ÷Š¨"öœe©çÁXtEˆ’7�CÆ¡�©ßp<Û{Û¶£�Y¿¬e‹‹b44,SPuÔ°!“#3EQ UKS %œELQA	oÌ™³ny æ4ø±”‘É(92·ÄMv÷6D‡�zzdÂP‚]lV:N’¡DBœoOC…rEïã#3Û&#Døgž¼÷à8z6ëT�׎«Z‹F”ì'*ÆΦŠ#ª#&0Œa³ç—­Dw^—åÅó Ø—˜Ž\»˜ÄtÅŒŽUva�d…¸3þ¬JBŒœm(ÚÎ+’jGDØÈ üÞÉáåPœz«õÑJ¼§&OgY¢\–i¸°ÓèÝ�“7kZGY Y•9+üCeÎG�#&„FtˆQ‹J¤J¤+-OR]U³ä¼¡‡éÜ™­à�OÖ•#+]$°qQÏÔÍc±�RŠÛô™å°G‘Ä�B'0mb›Pän(lIC›.ÖµöSmÔ×ÕóÞ\±µŠf÷ÔçÛ+ãyß9qð´äa)ð	ÛFžœ³I¬mXFêf”ál" ‚
^ìv_�æ¼ñQ¡mTäœiV#+ TrÌÜ+#+"2ªÜWíöíçi×	1ã×G�ºë…®“)º]6#w�<ìïÐÝ“lfLUB44“„vÄJ7*QÄÁ¶ÓLï!›ˆÕ‹Gt[Ъj?­1#&UðbÇÇÍé9§¢‹°ñÓeáÑ%¨Áèú‡dE*B#3CÂÈ:ÝÆ{—¹¾Û¡¿/	ϯ—_ulܺõŒ{Ž`¡Ä¦rf¼ñJxanˆsŪbš­ae0›ÁQ+ÎkZ˜9Hz1a7Þ%ÏÝÛÚ˜‚~ÞŽAæÂNtSa²:'W>^Ìûª�Ëä;ο<ŽÄžOh¦Õ
;x4íÊBûAïÂ'¦0e’¶2E³ž#3=ˆ¦c&H#3)1TÁPd`ÉÌäpóêÎæâÀHRT’Äéd Ù¤0õÛ ¶Â[h¼[EÝ×Hmõöæ“^8„óÏ+ËÞµÕÓuVŒ "(H°’YXÅ•š(hjlcQ�#+2Æ¢*"¥#Et¢
2
5ÙƵ.á"Á@÷S‡V{VúñyKß»3ˆ*‘#&ǼCKwu;¸GµRãMß¼úQêÕÔ\Yh«ªDŸ1šµIƒê.ÐET1ùÚ7ªk&±\µªšÆÚ�êÈYfS•É †±0|œ¡#&XBÙ1`mù›mWŠ56Ë#3[MåÑr¾-¹Ló®”´m±ªüŽ[EDš±¾•«áJ5···W´ÖSZñ]*¯ç�Þ5©5k*�$"ÿ¶–"`F9àXkˆPæ‚x$Ê~¡Ì¡fñ˜ÒÂe×k3‚LŒ–€,�c(aoSÓmt‹	÷!z!Q—J_-€àu�ž1 �•B“(m)Êœ�Hx‡ÏA5OÀähUa„ñbØ!,=§3s¤ìëZ)6$û�š¡û –RÁ§eÓM#+°×RxõZÇâª�c‰#É£;-M³B;"'¨º!®ngŸ²Œ�þMÕM+„H•T²!H$‰¤Š)(i
7ü	è9âý¦Y}^0ש»D¼Ä?²oÓ[;+²±Ì<X@‰	Á€èP¡ooÊüOi7m&ú#&¨€ôlU$ ÒRE¢Å‹SÐ'»oxˆfyßñÿÇ#3¦#&]¦�Ý¡�ÁÐÀ¢£áõ›±€Œ”V´ˆ–Tçù¢U�ÆJØá×g¾ýM†›x;åðTfOã;–"Âj�†ÈH’ ?N€v»Q¾÷Õ§Ë\�A61jF#&4zäP×5u'8zך˜½žŠ´p'#öÉÄÕù[ÇØÀÃÐqvä™±�唶‚ˆ�荒T±úå_Gyâ.aÆñ² ÆÓ"{«èl¢ˆCvò‘J‰;~Þ¤wÎÅ¡€�®¸ŒF%��ú!*ŠMÔ‡s3íC>°¤Ê¦bÍ8±#+3Šj”>ðþØiYN€íÒ2?pC°€t¦õ3ç#3jŠlAêó=CØXòPúOh{úŒ-Õ;½ÊZ
àA@a‘Pï"`ÔR†RµQ´•ÖU¹­­©|5¾ªÞ^fÛ^•S5¹V�b®›u"’k#&
£:'®û‚¢X]Ùz?¼Q{PLmŒ”¥L°˜ADq!Éä´…
™´ÐƃÂÖÌ{ý¥¹X8À8BS÷�"oOSïhÙÔÞF£ÎÎEbÚC¯yë±C¾ÕA`#3©CWßëïÓε}·¦~ux,oä B'æ=&Õ#(@ù‹Î" ÷²Ö4Ùiôç¦�r)¹’Ô˜‰ázyèaýu~Ÿ\ŸÅXu7·ù�ËHï¥yT<NxÝÛc	¶Ð£«©�p„C»œ íÊD„„#&¸�’hÃå­À£¥Iuq¸Z�U…2¿*#3C)?²'õñJ̤&âÓlm°�FM¨ÓKCiM8Ôm#&ÄÉÄZ40˜O¥&ˆ)&µ¯ý:ìC.Â#$ÈÒX„¤”Èé)J761ŽiaFJÿ�Dˆë–#V	cm6'F€#Ã!i²B“m«.ˆ¡–’B·¢Z,: °zhlpâ³IŽ¤R¨Æ�]y-%ëÇV-yÍܽž¤xˆ†U#3
�] żÄHA@#+ºÐÞqbbÕ.Œ® Æ�iÕÃhÜÙ-쨷“g·W»jöA…E”ÿ†ËÖ¤�7™,C@EÈj9lŒ­0e²#&NHvf›zš�éædUŠµ�rÄJ›Õ
½dNå‹Ù¼b¯K×�SÛ¹ÉÎF¸jåͨ*M¹lV¹LÞ½w§¦Ó€¸i1�°Ç3r#+ç2Lá«NÑimÆcAn È»ÿµ¬ÃL°‘ƒ\H#+#+ÖTv„Z}ÄÕb¬îÖÙÆ c·n˜Û1t‰Ä@p¡‹Ý+<θ´U6¨’,¥‰‰¥«~)?´4î=`°ëJ˜È¨9~sm'™öÕ�²yуEÕ?[Á5!s÷€ò<¢T„	ýs]Bj”¦V ÔLš¢�ã­·oí‘åÔ×[·e^­‰oœþ͉K¤C ¬Ôþ8ôâ·Ÿ�©ç<ÜÕâ�	Ý4w#3 ~AÌå?ÂO½ýRPÚÄaßu{ÖÓ,jÉd«M¦²¬¿Ðú7é›kN¸Öõk)iSÚ4ÛyZŠó«’dÚ%cÑ‹›Uu*-±«–íl˜"�™X‹@Š‰©,ªŒRA#& vŸh75
͈ ”Þ-£éÿFó�÷=˧ñEX�•]#‘¯Ò=éÙïðÊÛ#3h¹½Ëîö›Û˜›ÏTP÷jM­ºî­]þW)­¯®»†tX#d!cWŽ†qs2›woùüöéŒôÒ|aòþ÷²{Ï€îHpCðyÆOÍ ^(¦(,!õ´ä¨P`d#3aI²Yu@„P�·9™²Ê¹SáÛÆÕé[ëV¼¥ìëE“Y66¬´Íl]+(%
T„6ÔÓ&)š%D-|¥[yž#F˜”’YMj5Z%Ÿ·¿Ç·¢jß
ª÷›RÄ
S®ñÊ_=Ò™
ç<`ÐêjÜTΆŒÈMVaÄÒÀÙ‡ó#3ˆ•dµ%A0¤öG4	ˆ$C2$™3Ä™a&Y²ÄœUE	-³6H%IUÞŲ"f ‹Sù¥<B��‘?˜8z¦v1¿eîoZ성Ér) a‚üd€&àÔa¢76«NjŽW_'\l´ÔKÎz)dÂ�V�ÝB‰”{oíÓÎ.Ϥ}šá	à3ÊnHƒL,Žá(MD@™²ÚÆ)  v0Xu¾ø@=‘‚?³d´ÅÀP:ë>þq7»8FÜBÙh	œ•­ã déÕÁp ‡š”¿¼¯Áwä–¼s«¶r6#Rb”ͪ*6Ì×½Öëki¦²ž¥vMd KÃHHDi�½×(#+Ü{øoA¸3²dm3~êP( ¹Vܳ}žRtêû9^Ú»KÑõSî<lÓUÒ†­£·ãkfâ{ˆI¹~›áËÕ" »f†´iç³øJ¼¦SžxÑu¾E
lG7ŽºÓg§7ft$Á�¤��£rA¡ïbT`Æ-²¤Rò«ì40Ù1hÊ#3›Á’ Ø1zð÷¨'‡“Ý܈Àì$I$š(©ûñ°aÃíô׆^G§ã·»’7Ù²l�¢[v\áÎáõ­2%�A-	Tµ$•]�L/ô|w#3»M™ì8ü–:Ìö£§[†Wq5llúfR—¦ÖH°¢z"†ô=‹%UBƒúÍ­#“6d½+.Rs-6Özå#‰!ó�Ô4#3LG(›³1&A4É»‘R™GÀ�“ò߇õéÊ|ä’|ºMg¦ÅÀ„Ë#&§Bìû&ΖœÛþš #&þlZ+ÎËü|¿·E¤²ÙâM	;csµ½¡¡Ï\ô>ØΤû¡«'gX?r{AÜüSf‹Ñ\u2ùôŸf´rHÔ+kgÔÉ­EI#+±£R2%S#M‘¤Ú¥¶ËRZ5£(£3_«7Q!Bj5,ýÖÕÍjfm‘S%X¨¢™¥²m˜Öd&¬ÛiT�¬©¦¬šÑ,EF£jÍXi¶Ò)šËfÊÛQ¶"TSåûª×ÍL"~çèÒrþŒ›;jÙh�‰�> ¼Œ(� ¬€L¨ª$ŠÅZ+v[Zæ·Mn£�Ò#& ;ÀƒÖ='WÐ8"ŒCXš-2m¿&¯.Þ­WÜ“_ÁX/ç.S7ó²¾ÍÔœ1¦¢èPJB¡úÚ`xQO�ÎäÉ\O�¡5‚Ü£vÒí‚+rœý`#&wáCÏÃýn‡& ñˆÈ-Djûb½ˆi³zÄ䥟ØB\ý«ø‰‚)UR¥#&yD*	P)„’
øA¹#&m½él�¡Ê•ô	â³�à[Ç¡â{1œÿV„­Æóv¹ÞÈ	(ã2P{¢öÂC²Ô.ØI •æ6+Hš�hÒg–L<O׿;¢9þu "hh#d7Ÿ,¯ù½Š§¬‰Ú0ó<½yúãÈõ�©Dk™Àê•TÙ3‰ª|MåÃ’ªöt3´f�'A#&b�M¡9í#+�Ôé¥ðñÁ¤49#+¶›Z•
Ø 8ßI8	6OëhÛOÏ(R«Fˆ¬BM1IRŽ$£¼CŸòN¢šœš¢Š/Œ±Ê׋Ïõ|vÙõE£à‡åý%Óð‹ ’9iŸVÌœ±*!ˆêº¿‹�ÍûäüÝ=y–ÔlSOrÌ¢uÓ‰,Õ´e‘$CL[Çïàè™$Á!$×}F›wcu­øèí8Jœ)#&_1Gœóõ‡Njš«ÇŸìp!9°�Œ‡­-Ýj˜avá´[J
ŒTGJ-)=ù¨Ä&K>oKîÛm]§Ê‚ýX¤‰t"‚�©KQŒFÅ	à&-Üùo{!úfÍhûÏg›ÚeóÿjÑŠì¨Óåû™p…"((°Ñ!”¸©Ö©˜¢bîʦìÍy—�®ºf&~nÞ¿uƉâSELÚoYi	]M	2
H*DB›ÆjD.€�KÌ@¨¡|²¶r{ÈhÃ�[ê¸Ab—o©TQ�E#AúÖ"˜ý9Ù�´?qJ&Ø`ˆ˜�À„ƒÔ#3e� �7*]’Nä;ôRsGç\SMáÄ@;;2>N˜S¶sˆ÷õ±Q­F4�¸j6ÔjQÙ¹xÄ B˜Ã²vZBõñ–Fº�çÈ>랸-pi^W·fÄ2é":0± B+L!AŽe‚„�ŠÄ!ei€
OS`³‚„_#Øtr±Ú)à�Ñ3H>˜ñ¤°&7#&¹Žá?Ã5>±=Œ|j¤Œ€Iâ–AÁEEª<z¥?Bw¨eÕ½�†.vY`-Ôõ‰Ðh#Ü£N;¶f"ôfhg@lÈO(¸šM0“,P…Š1€"Ì%"02šŠ›b>q¿Ÿ3Çú-_…­õ*Š#+ÍÒ²¾½ÚÛȲΔÐ¦Äe”¢©MÝ탊Y‹¡0Àä·.¥Ð{òP(|ÛG̤TB´ÝMT:ÎF;»ZZm¦¹Ò¦ðÐjt]­llm'ˆ»˜´ÂÜ$ƒP®×¢+¼4}úZÁ„(…pqŠ,55ÆIÌÁÀqsgý§Ì’¡ÐâGê8p/CF
Îà~	QbÆ`1žØèˆ2�™Ù±’µ
T™8àìöTÁºÅ“73z¶b
ìH$õ‘h×ö~­¯s'r?§rSðÚoöwæ6ËJ_WúNÐõÈâInÈh—çÆ„’+@™Ä„…‡¼4ÂŒ–ÑŒ*‡A"3ÞG„‘džµF˜òE>�̇Ç^•¯âÍõˆ^ú8عsߥۊ!yƒB<ó³‹�áð2�ÕƇxh‹£5“Ñò‚M…Šf‘?_‰7F€ß`^ö¨„˜.ÙKŸ¿<y(ă#+/.™–k9·)+½�zãÞðÙ¦_«£¸x5F¾í©„\KÎ^Ç…�^\såfšgy†²áõ2 Z¡šuþ¿ðf�ý�ê¥è0‘Ôî°XlÞDlØáz¯V×wj¥"‹kÖneÓK³h¶X ðK–*@‡aŒ
d�çäPvì¦AOyµæVAب¸÷Îϼ
86cÜ�&l#3ÿEE¯6Uˆ¬M10CS¨Ï�ž=ú^hó:z˜\å×ìnªœâ€H0‚‰´ã¤:÷*ÌŠ~÷nã"´#+Ë(èxYnÐ	y€r5DŽÇíh8ü8SöbtnmQÔè9?�º#&{g›¹ä›‹4Ñ<Ä}$‰þub'i’Í#&…%BÆ`iVeéÓm×tݼóÅç;k¶^v·m©5[Fµ•1Öà1•¤”R#3UJ†À!BPÙ+çöjjm( ¶d+?ö\vúÕƒÂ�«aɾ›QU*¨¨ ’«ï!å/û+½�FÙÜ¥×À•†š16VF°E™©CwÇ…Z5œ®8U£ÖÛ†\ˆAcl/PQƒbg™o%�«Ë�ÊM|QG¥«ÓÙ9º«Y!¶rÅlIæDFb|c‘�À‰ŒÓ¨.¨–šb}3:Ü.÷LÁV·ËÁÕÃ9ÈšiµŒŽî”éé#+äƬ†Ýl±"&F›lÉÀ`E�ÃBÿ“µh¡°Ã@oG›°E"«UB#&aØ”¹x±Û"`A‰¦å=qüÜdí8‹—‰v:„"ŽÈÔEŽ@¨×Ö—77¡å:˜þA­ˆ“íõVFª¯Q2Îí/òõ¨^�¸dÿ¦Ü5²¨ÏÜàÓN&ŠÚxGR#&û(Jé‰y

ç®­)6ÌÖ”´i*f­€±shèÉQ‚À�õ®lk˜ÕÓFÜ®U–¿WîÀù08îOËÀaö�ê��;–Z.qêmSŸÖÀ
E‡¯¾ÖjÈT„ÙåØkÏŽó™G³«]5#&•s#3Ñ>¿ÿ ²²Ùö�PU°XPîÁ‡ÖbÄÓ㉹óÎr¬ŒÚÿz#+¯áõ"Ô‹þ;ôVÐYg„ûª²CÞµÛÆkp–J¨iL×w{¯y¼ã´ûë×…ì1!Þ{#+sé&Xáë(0o×7Ü7äñ#&¢ô&pP9ˆ�@Þ…` r:òN´áL¦iÝ4ô�[„/^xì1L,ôTmÝÌÓ�M”Å%1R yç¤àx\°ºD¹–Üó�Üi¿ž¾¯É#&ɶ´ºÞ.ªÝ…çªôâƺa¡òøžE[Ÿ¢ó׃�éµØ�ŽÔn9܆Ÿ;°ÉÖ1‡‘ØÃ@È3#·ÕàâH;|äî»BiŒY\%š¯$sÛ1å½ÂOoÃx†žŠ‡¨ñ
ñ`(Ó9ÜÌlm}¿w|{DFÁ°û{ Í@MŽb”MŽ©¸W¢ä•3ñÎö†µñƒRûiÙF¦ÁŒ¸Ñca2æsúX,ŸVcSWn;>†2}^4Ð0Ò—?¤m›ø)Ý”9¿t#+[#+‡ú‹â!ÅMà(¬T÷Èü44L	¿K@^ðg'’ëýü»©Áª¼»f>‹í‚z0>÷çrè#r³ív�¯±m|ê«—ÓÜm½›k…ô±/4IDPDL0��qRP!Í#+'~wéߢªÂô�ojê­}þÒÉþ1àN~wì¥h²"ŒbÙⶋD˜š²¥
‰ƒnŽv"È;�`ŒUo(€ÔÄH��	
8�ZIØ�åG„_2'Q‰Œ¸�,r�,Ž.Žþ¥Zßþ›·�õL÷å{—·kI~Kï?Æ#3üqìSO¯£w>¿LúM“c{˽g…rï`~ccÖÐÖ�]Ñ1jÖHAÈGóB“-Lç­ul‰Ó$Î#32‡Q°ILjQxšŠ8»—u÷ÿ«þà‚#&œ5Ó»X#3æÖŽ>CÜ}9š ÏBÿ¯rHŠþë$;„Ža½÷œi”

#3)¨gXLZÉh¥j”(¨1�i(b$eYfÕ3jdÚm[3mn«cF锼\“Jí­|%¦hX€,Š òø\ë9±�ÙêC·å=m#+?e²¤ÂpÊf#b,¦GEEJ´¸ûaA‰°9¸~©Æ×#$]¿+I§sÐû­þ"
¤Hî,~vv–�Ì�‘�hñ_>nÛ–%Im-0¿Ùº#+£†–’Ö¢I1VµešS€õìµgF$RÈYJcO�Õã¹ãý~Kóˆú1Þ#&Úñånݸ£#v‹•ûÃQ¸6uâø†ðred­|
¦˜Û8|k°Ý¨(«#&TþOÌ[ÑÈ7!îoì÷­Œœe·-ŬZhä<Ï~ô}\Ö(y£ä‰"@1{06oÐm¬¦§Øð{¡ñïßÔk¶Š`¨b¥r•¾Õ0¬¶~·®€k“#&ÝcÊÌÅ›$!l54¬œá¯G
K´ÈRÉl¢sùþÿÃû×ü!û¬OêšµaÐíã#+hŒ0ƒó3©aÄ^اϺ–Õ!JnÓ=…bKu†¢6ÄÂñ�)#?i«X–vk¶�زéî�ÖR•äË{#&Ü‚ƒ8Êš› n<&q¨¸¤_f?2øÃkz*ˆ}ÏÐ�5‹ÁäH˜=ïËmÏ(¤RAÅìX÷ÓÓLè68‰;n˜±¸Ðh

ÙÉ?ˆ'¡îjRL¼UõAÒòB¹Ä43NA3#3¬ï,dZsËlnêr´Èö›†E½Ñq߈©
SÔ!å‘€v؆‘Wx*!Þh�ÌÁËyr÷Ü8	ø1DaÜÐkÙ¿OJë¾ïviäƒSq]ämáÀù4Т|,ü.òé$½ýÆ!`?fT†=rÍaú�âƒzÍ“Ö2"¶!�NBh*‰÷dÙ0¡”Ì÷Oc·¦™�kzqðIqØéhbÓ	òþ®tÃ3¤n‚ˆŒ-©ô‘´Bä Üû
”͉api†sYàÞ9­þ Ø8áØøX¡Œ±°Ð©¡Â L5þìR‰¾J=”úrzq8±�ÖÂënÉ¡”t'„A¬9ƒH ´Ï†®W·5´ñH~Ò²*µ$!:¼Ýà]Pg¿|2P"É¢S!…TV¯¶-m¢Ú5j5µXÛLÛY-µ¼sV¢Úå[_"e.ð #+¦z�tçI€ˆé`?~`L%Ê«X]Q¹f^z¦þ®¶eÁ#+¤T{{ņàu•ï5U»$DHt#={.7 Ä•¤�šÊè*ôȶsB›¯ž8óN9“î#&¦ž‡Ð"0·�ðZØÁ$2ŠØÓAÞÝ=ÏGÄHÐ&G½Û`w†°b•a¹3·úuüËçdÀ0²šAˆ€ 4T£‘ñ�½þ<øÎIÌÖP©/0�ä�Ÿ�8Á¥ð2M£€äÀˆâ5>"B*L:ôb”üN1…mŒïq˜œdü�Ïä9F1îÙ‡=c›1=î<6}ôIæeÖ¹Ôi4õov"–„û“WmÚU¿v÷¶Ú`”&ÿÀÒlrìOaÇä XÐ2¬ÚÁxûâ�P6Ä«�W)!#pûƒèßÓë¶3ìSÓà ‘¤1æ"@m¢tD~’ÑCb@6E¨÷— ”Š©àé yq)VDQ#3@i#3¹;�§Ãgïìtöï#&J�ÙV JDøÙpE.ì©YR5#&Ïl>~]RÝ0ñ¾�„ªîäUÒ?µŠÐPÊ#3ªw\]Ù|}ìÚƒ)2j߶,{=mË+5TÕÕ²Ü~¦L\EUÍRcÞk“®7}zÕFéÚ\œà‡çýû·CC•Tz°çÀÓÖä•ë¸öûYœørÔ²ØïšÀ»nÐ$ìÎîC(Æ-
6eÎÅkµÂ¯çËÕÚ
êñ
ØwUvКX®7äK¬îk»,+�6®­MUçÚ`ªóBî‰O’S#+)Î¥,
IlŒpŒi üZËÀR%«_24±èÐô£}1’&Á¢C-(FãŒ`ã¹7@Ze†BŠ ÀRIÈÚÌ™¬ReEÛºŠ®Þ	Sâ¶#¸2˜\00Ä=¸šÕ`ccbiÇZTÓQ¢ÍPqF ǘ4›dr#+[Fä2ˆ±Ñ­Ê#+"P	#&­KC!j	K!ñ¢¢�ñ¢CíªËæ+zèf?¯z—3þ<f·)*‚A$E©TÍx’¯žW‘²Õ™µÎ‘y×S·vÊ™K&–îìº<›|×¥I
ŠA`«mË)3P¡ÂŒg#&xÖ” W9jǯ�æÝM¦ÊfbŒ´–›Y¥¢RJ(ÆÒj…–f£K!›Q‰†Û)©½w§[+Ï<^w]®J“M×nF‹•íÝ�׉.êæ*ÁYH¬BóDËœÔ`¨)È+z¢]]FE"hc™f&ÖÞÖ3‡U#+"º–`ð|¸i$ÁiXPiˆn2�¸]\ÛÉ%dØé±Û”LØEQm“<¹%	Œ0GQÖ.cJï!m„6œ+Éq$ÎÔ@Ã_:.6ˆÐh‡E8ŸŽ0Èä7”á7ßHÛ)�±Ž8Çï$D)Á¬zo6Ô›R5I{msb‰¥�F8AAÁ á…cÒ)�5Lúµ ¤ÊÈ®jôÃmÉM,J1FYIb#3Á¬ÿ—
¡Á3¬ãˆj„°VJ,Á�lº0•´DAXi±vÊ@P¼%ÕBбHÀbáZH]ÒêÁˆ¡¥ik¥iirºœÑ¦H,‰mHŒ1†îÑiÇ�j†7‚Ä0¸ÈÚe!” ØÙÃ	¡¨ŒmZ¡	¤Ò­¹†|m?7!¦xuíîÀÐÉ7Zj0§½ÄG€Ód˜<S!çoÐÉšÝiÖÓÃ&A]é~ZKŒ<üæ0Ï8«m épª,2á¨yì^{†iè{ïª.ZJ<M"á–±oO(A‰²e¿x±ß�#JT,fA6'àl²™IP­ž»#+í¶( ™‡ãäÌË_Wrð“3ñ-¡mæü©&PÙÍT®ê‰·ÇX½Ä–ÚQ¥[xÅQ®XcŒÅ+ÄIæ¢0,m&‘’LÚIbÊÍõ ¦óY	ˆš™~hC³”W·¥LUfcŠêÊeŠò¢ÖºMŒÙ½‹fi”z;z«H_·E¨�ètB¬Ÿºô(\% »ÃLì=4›4MA9C™ 3(VéK`ß ››€ûàßÛô!R”EI¤1…¥@ Іƒ+È(2’Ê#3VÁ¶a‰	èD"â#+(›F•!@ÀhU1¡#+‘±¢].BId2qüí	ÌAîã˯󯇃¸�_Óü¼¡^>—~êS?UÖ<}¬¼ÖhÄÎŒ8ƒåWb}ÔN1…¢8>¦4fM{+o«¹k´«ºUHlŸÌ†#$"�ï=…6”SV2]ÔePüÝz—Ž2±á4<ZzY�rkß[i·fÝÌpyâS�ݘæR%פ´bV…ƒÝfòú§ºÂS+tÎÃÃÃJZššŒ;«º4-K7žvÚ'>åþ»þù1�6¹7éѯô‰ê¶-tu#3)Ó’@‡uqrz“™}ã†õªï®'Ôß|hå‰kÜvŽB,“Y.LÏœ'¬�æûvlÒÀ¢`aE˜s°÷2’t;löÛ¬ Ö:d=e¯=»w=æöm¾™Ë~ôíÆͶMç‰F	7縺(4P¢�-¶WT•GOªµ#+Ô‰-úM1Þ¹f?CxgkÍç¨õÁæˆ0³_N­${�JõMÓžH…œ¸`pøc9Â:âùQÊ•êòBý7²³‹1AË#3âB0Gcá7Ís3ìÁxÆ›oÓ«Ôöо?«ì:ï¤@âÆù‚Ý÷#jÃn1GŠ°ìÏ&ªe>Ð_`zôûõ¬½lÀöƒÄ}`[Z¦ÑIT4ª_5¿gTkVöÜc#3#ai.�†Àt`XìˆU
æÑ´—/;õZ(G&‚'c'™yæñå«ÇM&ñ[²¶á«rÆÖMnñÒlkE^]¤µÕ·J»·9ÌÊí׊Ñ]\ÒË4cR53*kœ6wm¨­%RÙµ\µÏi·M„„m)h…¬@$Um”R7#3Ãä28dEaõØ"5„loZ¤dÏQÚ©Ms>ì!Ûs“”€Ä4ƒ—ªšÖ]U—ÚÛu-µÒ•4Å#&‚X°)=L$Rº7#3iVÛëo6_5Ö»Þ,5<é.r³^Û^LÑ-šÚ^V¥uëÈ�ïyï�Êk… SD€’¡2ÂëF×�º�Ûú.µ¢¶*S,¦Ñ¶5¢1YF±cTV©›D�ÍdÔS4‰l¨Ñ­3Xf2ÚÍJ¤_eÂ$ˆ��#3^FI×ò$RMT¹�X##&Šˆ*ˆÀ—'ÔwñÇÐþÞ¼z½­¡¡ÉÑÔA ~ý–‘r!¥6æ)®ÉÑ5ÕIy›0
´­oÊ©¦Ö’™j?›y³Fªü“[ð*ÕÄ«d¿O;vH•¢•ë.“cS”›]»Ew[i•d¬›^7žk´¥µ¦ÕJõÖ×k%Dj®ÚîØÓOûä9ÛÑö³#&|Ê4ð*I䔀�Ès`åÄŒ’(Žâ�Ò.ÅÛ®HŠ«‚À#&Ú� é ?ævthÕ=……ÊÁÀ¯©ÕAá
€F(f]ì‡dhèaxÈj¶„}nàŸªÁñÜÔú‡WÕν{—Õr�Ë®GÃ)*1î HŸd$%‡¼ý®´©ÀÑò±5aqѶf,FZ#3àú.®(¢2Ü
�ÊUÀ2)#3fV¬ÅH=²º$šhÁŒŸÜÅ{q\Œ�[wO¶V2Í»ÎG‘Û‚Ã2[ü#+Llxwbl"(nlU°Ü1`—v"#Û½©U,¡:R!@šð‡6?#3èK„ÑÊQ‚��C‚(œ2:Àá�ïGê]·lªg>nâ%:ݪíg[Îf‰·ie‚÷º	j±wÔAk0~þ÷vheJ¸Æ[z~}Æ…ú¡ÝqPDúÉ×Ê€ì†Nîìwð+ŠWß[�Öí�Ø‘]êxÕr¨G÷1¸·ú$Ϭ„>-�Á´Ô÷#kùÝè±Ø„$sñy4zW“è�Ñ^ÄÞ9Ÿ#&Ô¡ˆ…_¹-’ÛXÕa-¾jo¹­¯ˆ…ˆ ¡ÿ@gúDš¤!¢¡	blí«Å²o‡u�µcZùÕ\Ö«#&U‰3Îf'ô qíü¢÷§õbŸH†ÚûìÜ>±÷Çß+ë ½Ë[”T»±
„‰GÌ°TÊqA¨•
o#&qäißÏK†¡V#3Ê4¹9óÀ{])DoòÞÍlCCŒ¿H@È
ˆaQ¬5l@ ÕªiIŒQ­¶í±·¿¬m^wnÚ{.ñ«©F²åyå×úžc-J¤ `À]õ.í¬{ÑUi«‘”H#@i˜6Ò�,f­R��EdF­#+aÌÇ"J€ÂŠ¤(‹*	X°/å÷ºh¡Š‡ò�‹0BÂ#†r` :5#&½³üõÅà
Òˆ,‚ÁŠ(Œaï&ò‚
žoñâëë•Îo#&8QòÐõÒYúÏËú"-ªpø5¨~Gâío[áóðK»U�Üq±Âú•È!­2dʶ9Çüúcœ°G©Ü�$�Ú$€
æ\EQFÂ[t
Ä Wõv9åø¾É:B«Ø‡äªc#›oÈoUÏû )‘TL©=Ÿ{&’eø0v�ŽîËІu*AïªlQFtó癟#áŠÍ;`Çá#J&}>É:Z²³“Íñ\]ëîF0±£‡=òâˆÎãÊä¶YYÒ@Š§<Nƒ›æDÔrÂãÙÛdÓ&9õ¬¿Ò:²•Ù%!„HCÚb™v™Ø¹´ÕÎ $6ø„ÅËÚøÄŽqøÓëGk#&ò¥¢Á¢–¦’Øó’‚áÐàôc~£#+£m#Š´0�Ö²ˆØtlhxü…C(Ã0? YAÊ*ÙЯ>�ýÓ¿·ÝÚIvV‹û§'ÊÁêmgá†fm›;/šÖ�X>ÊgDÅp°oOyý#&›k#&‡t¸ÑŠ�Q(AhR!#&æ S`Q°ÿªç}TJ€çrf6œ¿‹Aò¸”pUùÚî%J‡kX3iÙVé3â.Bt?�ÍÌU‹#0šJB®®îi•pÒë¼óy•#3Z^sLÔ’’±Ë©jñUÛ5bÑ É°Pl–ñ�t­%c¹Õæòu.Øw\—6îíÒ+¥âÞ6¯sR‰^^]kœ¶e�’èò¶í[m[Ë»[ETÓWi©2V�^7q™uÝnì®»nŠ[;®×*ê;»MF±G5Q[´µs[/âêÖ¯¨l¢—A_DõÀ6`6™&Ð`€öc×ÁO;	”}ÁnÖD,gGîó sC½OíïÑQc˜¾„#&	Êw1Â#3óûÔ|�æ�y#&_š>õî‘A°¥ ÜTñ�"0X¨rìéöWmS^Q½{ͦ߿#I&Kòêh‹íÞ!é¿Å~*(?OÇ‚~ž÷­;x;}mÁW„ˆ¤ˆÆ2I  HF1‰Èb "8ˆ…Lá((#3RÖ¿ï(¶¤`¡¤ëør²#&˜�’•²jÅZ¤´&Ѿf÷šýkò¯J¿«Jß]¥s«ÆÛ¼âéË*TlhÍÝk¼»Uä‰ã‰jŠˆÀø•F^uR®¡«#&ïȨI#+“VJ@#3º�Ê*¢¨�ˆ ½+¦¶¯ŸãW]-^&¨¹4¸˜¨ŒPŒX€°¶bʵ¨�­]uWm6|ÍåOitê‘$•QŠIJ#+Ì‚x?GN�ØÔ(O’#3V”IþÎ%íÇÚP¬b#&8ÁJ�¡D@ƒP�Œ]¹_öÿØ{+
¹C^�ÚõE#&áE‚±Dƒ	"‘"!#&)	8#&åmÛ~³Apu@Q6 è+#&!€ŠjLÊ£ZØ›j¿™Ý_oç¿4@êCŒ»<"¡�… ƒeLR™6ÕüFÕÖ†� ÀË.*ÿ¶Í/5½3ë®{h=QÞ‡²(JM%@K#&ÑÃÐ?Óõć�Xg@‘ã#3É–wãÙ‹Q««‡Šën�Ɔ³È#+ì#Žj@Ì QRZ‹Õñ?=ºIÏP:T䢂°å¬ð
ƒB!#+mà#3ØGé⋳4Öò!"3eƒ�ç¾Ük³‘Ò°?59$‡é¦eXxu õLvvFž]ªU‚P_ûä‘ŸŠìQßR4%‡±#3)$aY&³hÂÁ8é$H …Ä‚µePiorU	Œ(*Ы`iÖ#&Ú)³tKfHJˆAµ�#&W±âÀ»¶™Q=zy®ò¼­â-£ÅWBÑj"Ô00A-@´bUé¢Nýç¬m©�Lœ=hûÛš½k{	1ŒÍÁø‰FàœE‘2‹®„xL²Hk_ÀUhÓTZ4ôÛ]uPµˆ#3å)…Y9¨˜3’˜„$uFÕ%mŠÚ·ªÛs¥Ê3RP ¦-06ŒìQvw#+ÇpÆá!4hšÈþ…Ýɨi9îJð™¶?Q_°ÆCµDr$£KMÅ(1A@pU¨Á1A��Á¬	ñúßÙNå”Ãx§·ETü	ÂHA‚4è‚õïƒ)‚„"¤HÈ@:=Ð#&�05I!û$�HÁ#+ˆ"Q‚#+ª#3RZ#F¬I
ZBlQ“®}ïÌŠN�¨|NùŒ°
O"ŸôŠ"mxò$úŸ•o�†v,Q´ª¢î °ô¢fK�‘c,×#&úêç¹36¨ûqkC7OÛJÊq“C
DH£Ôh&4C‰43a¦A¶Ô’É2P„'5B62	ƒZx8Ûƨ˕»$"¥v`n–¸™Fa‰@­>¿›Ä‘ö*”‰ðmóÊq%Z·“6öç#­Óoý;˜lƒë/ñžGHô¼©Û–Ì)Ø	æ¸"y½KÃq¡ÞzÐo&�¨ëÐO¤v£u|áQ»«óU #¸èÈDMè²*þX"& Ô,@	+°¤D¢#3È«'@Nð�cª³È+‘ƒA÷Ù¸v?ŽåI¥#&„1HAÂ/²ø4kÔ6?¶Öö2 ÖÚCÈÒ’h±I#+JBSö¶	‘XM펈‚f"†Äùˆ#°-ñ‚èŇ—Kvª)½£Ô���›Â‚—ñP‚�ÁÊRD¡DÀK~_hX�7Ý7Édæz%á°É]ŽúÌ°:®ÿ±f793WN’JT«xâ!](#3ÈlD­:s®=.«+w1WO¥äÌ¥(zÅŽ±4µ‹¤ƒˆ1J1 Úy3-„+ƒ33ä-�iœÐ‰ió¢ù¡ù;�;À�JyÀx»¿o7B燗g²J[~ö‰l\ßÕš/Ä!�äåð8AY#´,vfo�10qÇ�S÷¡%t¾2�k‹‘Gº÷™ôŒ(Çi¼z_Çë2ªª–ºí#3-”b*‡óY)ð[΢°ä·èô˜þ‹¤ßv%›ò©;VÅ¡mVO,)‡
×áÚaÊ 	€ÀdkSAqRîÂØÓXH¤´””XF+,ÇÑÎDÒ2´Î�ÂÒÓi5)>öv$’"qwÝ�̕ל¼˜‡×ö8A¬Á™3TÝãXÁ(z¸õåœÔô¹ö-ýÊDîÁbÞ¥tçÔrø°3Þ#3õ+¯g!nÍö»1„aϺâ{îíÔ[æøãnRÛ}Âœ“H6ÄiJôO]wCŒ¢�ñV)$I3䔶ó�þšÖþ#&¶–Z€¬ä=µÞšq'Å@ôž"Ñ¤ÈRòC™i/ìX®ž^q.¨óþŠ Ô»ÆÛL7¯@åÛst¡#+‚BCID0…1P¤Àغ{Û6"#3G Aˆ°ÓÝ‘ÚÃk:#+ÂsIpƒ¼9BŽºãìR…0©ï͆¶ÙHÈmúôé¾w€‡^Ä&f±‚$BAÊcȸn—8L#´ÒU§Iȹ‰T€×Q›G˜Â4,ï#3ùØ�-Üæúšên$˜<…$tƒÄÿWnÆȨä–#{‹›‹Ë�ôÑaã_äèBä9@¾TÖÏ;\+žyyåéx¨¬y4#3Ù¯3Û€hl#1E%²T›1*!™|)ÏÃ5¿ÖÃæ0á´ñÁ§õ°[úæÓR@¤$†-ô÷g@Ò¦€‡Ú�¦#3°ú›Ap2Hr,[o&’ÖÚ¹]êû/:�œi�‹njì{P&š…ú»žÎSàM³0rO6†#+kF­qðÉÇ»¦\�rJÇeþw4»«C&Ä»Xª¼§ŽS@óʆ2Å­É$ïU#3Ó_v½¼ç�rTA÷A˜ø£šÇ±Ô“KM#3펓LDD@Ê#3#PÒúŠA(Ff"&4üÏ^/ZãÞµŠg¥7ßx1ˆ@“ð›F<©šR;­ÞÊòèô¤Pªx–SÀù¹ÞÚV«¡¥’ÂXJòÛ¸rðU!ŠbuÇ�C”Lµ�ÝŸc­´ÃÑ–§1‡A²æ!#èØQUwòOW³­î	Ó×Ï#&Œ‡«Ÿcäbé”/<KÒw	®º§péŽß””+-¿W/Ëâø©’ÒëÔœZ{¢ÈdÂa@BÐ@„
<Ôý‰¬„>¼~x}¨‡ù­e½·ã–ÚÚ#+bÑb¬DÃC¿yj¸‰¸|¼îq‘›�ÍO©õ&CrœuêàHÆ'0Ø}ÿ2cî>)Ù20¢ý�ö!¼7Ì™p331AØhÄ`�¾šQ¥k=eAd—³•Kû‚ÔiTjg³½vŽ�Ï3Ÿ˜n‚¡‹#cÞ3·)%*z¾MKT“´5�ðim¦×£4¬W�EvÈqx#3	=q�ž$Oj(btý¯ßz²/0B£^'Z��(ÊÓ&`nuÁ€©ºsvÉÂ儳!LÝ ’‘9½^U;zDÞdV#&ÒÙÄž@[|¦|öÈ€$€#EDð€°B!HÁ6‡@Ól¥:ß>ãÓÇ«k�@¡Ê;óûèˆP“¢JZ‰�§ŽŠHd úÁŇ¿•£¥8qŸ¦¿åž®æ~O²Ä&#3zéɱx–Ö„#3±R)Dô… ZlµHGPüwí܆J"4¢UH! @@°¦ÁèAá–�
ƒ³±“Ô0íþ³™žÍ…�¾ê«¡V¼i}¸õÙ�Öf~wLʸƒçGÓ™óly†‡§Ï¢ƒÿɬŒÈPmÚ?ÒìÊk®‡Œ#A²Ì¡é
J‘ë@/#&‚ÎéƒÀûÄzÊ\}h2?õý-ŸTÜ“;Øæ–éèÊ
¿:vP– 
à›Œ©	±B0È%2�(F@D#3,óùè{X-`i¥Ú)»äÕv¦6õ?º­Ó%4d$$MÅü‘V›q¸£ä@¹‘f®±)Š%þŸÀÇ�}²Û�8˜(íÛ„
2iÊlèFÒQa«¯¿'‰ È<´'FÐö¦1 îìµjDµº¬¿XÔ‹=#+hm“½A&%‰�!%ia¼¾¢(Hˆ°Ô'VQ64!°àe>9@I´¿Ë¢sfû-b¤G„q
{¾ŸiÀrý­Ží¶Ü¨…d­—òæÕ!X¶Ù¶š³R±©©–Ö–έûl÷�(Þ‡# 1á–Ÿ®”ÁE?#3¥]Å�¢-_Ÿ×›ö¿oéÞ{Ÿµùo<ÀM&ÌÌ“*2Aa	¦’„SA15)´2hÌ,Ù’K˜³*B¦¥*i#3Q$í^:ÏC‰¼A7ü©5€r�‘=d3Š}èLJ>ߺës˜¥$›6í™ßÃa Ñ2[e�ƒˆ£cS835ÍàáH¢cÓ\¥ÃÞÜ´ªüêæü¾“ï1»Ì¦áµUÓñ8t:©=Pç*LkzHå‚JKD8õŽ XP£ŸIÈ!ï2�ô›=YÅØšÒŪˡ[¡D,ÒÅ®ÁØ=áCFŽG(¨7qù˜c#&XÖXØFrŠ$bE¢ãÛ©À÷ˆ=
Óu3Î&«hjßZ#3ÏØ)˜*¾‰¶#+\PíÒÌÈ|bL­‹Îó»…í((¢$‡)ùþ�2›ùS¬"UÓµS˜!îGc2F1ÿuÀnÎxÿ#+﹓µCah�ÿ-VÚŠÈ2Ø7X!¦Fˆ22)i0RaA�RHQ‹+6Ñ$š(+€ÚA†¡#&Ä¢|››¤»nÉ;Þòï!m&Û]�0¬ fkAL+lÆ0m£
VÛx¨¨Öç5ŠßG«ªÓË­#3#3<îHnb¬`¶„5ÇáY@U¬jfÔʼ[’m˧*w#3#+#&
9û3@¹1oÉ�ÌZcÒ>S B™‘„I²B¤t¹«2¬{K#3µŽÅçŠ#+bƒ8q…®ÿxa�êøÀÉü=äU×ßC°.šì©¢ÆF–�
äÇå¿�x*:„ùklF£m£È8R1A6:V!O4Ò,T-NÖjhh¨´œ!ˆ$ )–†B lJ¸Á»[»1®]HdRë§vymÜ©Üš¼m_dôá[¼½·†›^RÑ	¥¨¢©²„>£È�DCT#3Í&¤Úƒ„DŒe‘¨¤ŠT¨áÆ2–¢#FKj‘‚D8–@€ÆP�ak(D¸UZt±æA“+0nG‚#&M›ˆ…‹¤FQ§»A,Y¬&8ÚY!!�#+½e¥ÔpÇâ‰AŠR0b�uWÀôóšªm»“fÇ5¬ÞQ<ÕÞõ»	½iæš#+P˜›„™w‚—3KW#4| ÇAéä'9}–�µ#+òç$’ÒÖ6T«#Œd­àÐV«ŽdKc¹�¦AÐÆ£nÖ#}#&öÔц3l\{7ø‘paÇ#AŒÈur3tM1¨ÖØfA2³ª 9#Cº¡»#+k­×F1'›”a�€a¡ÚÐc##µÕ&&⎳[nh£Z!�£pæá.rèxQ‚‘æª\•cá°)ƒ|§F²£*4œj�†A1:-À¦PkfQ‘$âa²i6°Gs#3™ËÀÉ—(Î#+�„3Åv}ªƒÛq×%ê‰l#+£Qj´²#+”0:�Ö°NDQ•£O†#3´#+…z[Å"©"Þ T#3‹¬�*šª«ÕÝäm,³º®›¥]=ÛƳ}#&a�¾Áä`µp‘	J¢©ÚFœ©&È/NÞj÷¶ÊÌ×J»f×—Z¨‰0YnnY¨áÑ’ƒz=¬3ƒ0T<¸µŒ:j'·Ö`UdGêhÍ‘c5î¦5�.­"}h|†#X´ÓJš¦6żŒ±¸ÖéŒÁŒÛ=lzi-²œZash(Ë°Öšûá
ìbÂ…toŠ#3!egÛ›ÃR�#&l›¸Š©	ç �ùÏ=ºãq_T#&ì·#+ôM¨­e–éTˆçl�ø#+´œ‘�êé£q1lÆ*’(€ÙÝ";[1ÒZ1�ð*@À#+%Ä0€Ð	”7«ËxÕ IYo[oVòשr¤Á¡#+en£‚l�
MDüBW�Äz%J�úaQ,_Þ©#3Ix•r†H±¬Qø¶UFPŽeS0ËK[œ!àAEÚ‹m�SbZfÄÉmjT@ªÕP?÷w YCøþü×–j†
ÉÕ	<§èá]jÈ€ïhO> �0wd ê}ÿÌg•ïr† /ÀÅ+ˆì„õÑ¥�O´„(£@À.ð<ଠ H,ŠˆQ°E7‘åƒi¡{ò"{Ê!CD˜x•ë4ŽcÀšgñ±¸KÊ„Œ�#.EiIùiëùoˇPØ·Íéa Ñ&¸8i¦›DÏX’D^«e±AÂÒÍãÓŽk¹ÖÄmºº¹¶·¶ã©’�ø)#3×Ñ5Š#+†ªÒNÙIë¯<”›%±¾;äѹs©Ì!ûªÙÌ wwQ%îjnËp‘a³x‘âivÂœz?ãüËAn—ϵÑ�½äRKX×	p#‹×#+u>·Òû€Ä>‡IÉXݦ;„²Ñ¦Ì�ë\¡
¯Þ×f,4Ç̵€±ú^ú@Š`“ìmÛq=Š‰6¿W3±@ÓîÙÕ©�ÑÍä[	ļ¹k”DÊ2"uBæNd•ŸÌí#&8ÄÄhüsê�­A¹œÝ#&åÄD ‚ Wj½Ùú̪uõ~ͽˆ~ߢáM½Ÿ¥?€öeàˆœù|ŸGV##+u	bs×¼Ca꣙VL°dC¤ïƒT±	Æ2ðªžXäAω¢¦ßv#+‹|BQê Æ0ˆí¹—¬p‰ÖD
�`Œ‰]DíS Ï@©äØUé½qO,¸Ë2éZ#&ÿ#&
ËÀ=³Ã±Ö\$Ûz˜T7°w”k¸5÷ær)ž]軪¹Ð–ÖF(Dë0ȇo3¸Ú&!B l¤£ 0U�OSÜ’`4-TNØÏbF}¼ýxñxkUc	DNXi¶IhS#+�"04ª†Íñ7³~q8� 8™ßõºB’’IÌBÙ5_åERª™Òƒ,–çr«ßÎñŽº®€¬ž›š6ËL%°9‰!”#&ÄQ6‹#3d!ã•sTQ¼W-xªÅMR­ÒÚñ«Å¼mb�[†¯.ê#FúÊ’…‚LkõÛcãl5¦mƒ‘cH�"a`y/f0¶ƒ‚�°#3„Š*ó¯Ziì#1»§�‡R	‚ô
€‘ �â"àŠŠ”€^…}�òá-"€Ô¤JZb·~îʯ�‡çÍ<WZOR¡ô‚t žø¥#&?1ÿ2!ö‘@Âl_ŒýÑ#3J±òS¬S	¾�Ó…Emji“w…¬n¨Ü–·f–»‹n»¸nÍS¢¯Çà\+ë ÒâTñT°#&Gª´kRkSMZ´kmÖØŠ…ƒ$ˆ@M¨ÚD³e`¡K€nÙf âÄ:£H�‚ÉÓü¼|ƒìD#&ƪ©´ ¿öÑ
6¯WMUº#3?5œÖKD2ô(¢6“ÖZˆœ#&: Ž	3ˆ() ½Ù³7ï=B(w�Æä¬=ha~ã Éêû#3$¦—¤÷mا‰J”:Ÿ1…Ú�"1€ÔˆÚJ6ɲ”hŠ4Òa±£B¦ZM)2LØÚ¶Ô[Qm±kckSiT[-E©jƱ´Mhh(}ãÉó°
±¼¬3 ©‚AªÂB…-ª‘A­p`¼FPåYabƇp¨Žä…Ib5Hî! %b€ÐI1cª2"cPRÀCC+c"+•¢±²È«d‚J˜PË#
ă� ˆA¨µj 0#&¢#&€F"ŒQk³@¢ùP(H„ú~þvº ã¾„´ K@—mr˹D]©úŠízêå5]J
…ÌP¶´;@ãt´ÝR¸ôÖGëÒkä¬<©÷wËü¼Ìú«Kž:*©M+8�íÆ#&@ñ#+#+|t4„&íšÇÆ!8K#3 é.-Y®]²ŽQö7Â5¡ØD2VrÀ˜µH„LloTÚÛªb=ìFh„Ç*L
‰ªšgÑP´Ë�m¸R`øC”;à||¤'hb¨b‚Ë´¦ws‹½<ò릺¼Ú\©³3/5íÞ/Ùî›Õ[–Å[b¤URA¢
Qª®R„‹„,Ü`xzæK;ƒôf©ñ*Cq–3ο\౧½4¼ZÅ�fÕH¡ïûõÇClq×"AŒâ�Þ#+ úGÖ
ÎGvûÎý¸Ä×ã—	—”÷Û0E(;ž»Þ&§'ø±qPâFH2UÂ?u¹l¢T:E¹tóÂ"yÜÆ*>«>º#+¸�I²ë>›Nï…Õ9¿=7£�¤¸C¡ãY{pq+Q	ÐÈ!#+u…7PŸO½\m^[õÃ�ÊÏG}L§ü©r‡B¤žPdGêèü ã�4qnÛ©ácÓ˵‘'Éš¼™Õ:‡A u:&yëp2†ºé�H‡ë¼F/ÙÊS—~ÚóAÕl°».ÉŸ/H”‹Ìóš2Ì6|g²7¼0tÍ6ƒo|�h¼#‚˦m‹Ët�û>¶­×,3pœ*S£¾¨É—¸õÇu‰\Â|¼?„ý~ï=Ç88{ÃV“#+'n]²"yÓ–È:Ï+Ÿw±¹^Z#Ê©¸Ñ[¹^ç�7wvë,Ùðt¯7Ã]¬cih·‘n@÷Þ#+ª¼¸{’ùeÃP!6^<ñE§ãK¿YÚÍ©ÆT0k&WUŒÃjDí zåJ½ÛÓÁÁlpªœqëÖÖ…0<ꚪSy#&uŠ
¬Y$êà7d0Ñ+=œ‚_oùµííaiÑÍo+Áìí8’�«¯!s0 Z­W.\Ëçý^¡Û²°û C]e6Sº0ÂÁå±zˆèÕƒ–o‡N¦øG°lwèü)WoÞårÝM}y/…Þ#`Ú¡Iôö>u=HÏF¥æ¾¥œdôÁÂ=êÙ=©[÷Yµcu™ÕöDTVJÅ늅às¯Ç¯]¦¹Ëø~)Ì"Q8j€;=)‰æ%Ž‡ZÕ›…¦:k@vÁp1ÆÃ(°ÛöÅ÷/1¬æ0K³×pû}0Œêé™Á0’c„FÈo¤ê”·W2ƒ‚²qñòìÆ6qÄ!ueÒ9\<ÈtãÌ@�îèæV•;UVlÏ\ZŠ€&àvÆG)È„ ¯(èj™ŠlÒc
Û�÷’̈µB‡:f0Áêw¬hÆQT4™«÷lÍI»`fÅéÇOãm]O‘e“ru£6ÁhÄs£ÄÓ·|(6ƒ¹p9}3ñÕ¾õÝ7#¨òKÌ’®LmÁ²Îk®+Ʊr‡¥ˆŽ/ri`Èd8åMu8ú‡ÀêÔ‚¢Þ¦£Ü)PæÑØýS:É0_ûÌ"}Óëß$6#+Ç< ÙÁ\]�)kžT<닶B.¾ØÁÍ·5ÕéìV•Êò˜é1@ñîíDzݬ’B]þR<W«ö]üƒte0t·�/ßY#uI§�û#‘ºl9ÍÇ£>ðl)¶|[“~™iS\#ÆÑBuhò’%C÷ÞºÚ¼a‘o¿,¤Îü‡C¬6¯�#;Ç~N¸ž²åj"8ÿnT£ÉP@»áÙº´µ¼¯ÉJ]/s©AZá­�1~ªË†8vqëêÆ¡[»˜mèìKÐÚ˜yÌ7’T™+t�ŒŠ2Ya#‘–G6œmŒ­(ÖeŠ|N³S�ΤÔ#&ýJ€^«DoÔÌ7¨µÐ‡Ez�ä�Fªj"
¡º½ÆVOYBN8„ã*dI\íŽ3€cÑÜ΃F"¾ìÍqÀç£ÖKªÔ#3„ˆºô#&t,DL#3|7™aÄÖI¶Û†¼Á‘MRº½£Þ/º—–j‰éâŒÌy/IL�%™ÒCq�P�ŽÕ±•B"9¥4a\7rVf—šò3æ†C~HäÙ%Œr.;€Ä‚l×µÒጳ@'NÀwXi…(bŠ\{½Û\]·=�i¸‰•°pÞDÝε�pܶËÐØ…æÌ�J$ÐÜåŒ6‘ÈÄ7›Óhë`=:s<6µ®‘*_s¢H8'+ŠX„’�èŽÂãŠìrns((zè)ÌQ(�ÂÈ
(¤`"†ÊPêÞq�;Tv8èß]·á³-šaiå
áÔA#+IgžCJô]®ëÌËN2IÐuhÛ±ÔECvH,e‚@0`}ÔãµõòáM°IÎ9Ä3bF÷K8q‚Û'…ôIy¹¹‚Oå‘ë2D=†ÎÕ‹‡žÕ#&´ÃbÎLœÃ¦üI¥…zWV­³!Íõ;=‚Q‰¡4”‡ÀAÆŒ%ž‰^…,:º¡OMÏLa:ÑŽS�MÞS-�Cñ—ÎœÇ0ç‰õ‰]'®Ÿ±]#²!.1Q•¸~‘å	ûÛ:‰x†@þÏÅg™ž¸l·µÇ>1ôa‘;®cÄsáÛIÖ¼¶“jbm†ízFŠc~X(	˜‰AªÉ¬K9j­±½ï¥(ÚWTÄýd)ܼ&~ŠûÈR�ç	�TÃH„¼‹u¿'ÌÇfjã�?6¸êåŽÛBÕTªÛˆ¢Ÿgw³¶�‘UóŒ$–ÝNm©c6ð!F#&¡I¢9íÄ¥!ë»Fä§óàU—¦¦~œb7â¢ú@šïÜ0½¦º“�Ê:Z>û½òs¸pÈ&tÍ.+EZ2‘^hû tµom�óꧽõ´/ÂÅK*1¶¹¾MvØ’#+˜kºœèÁ#+HO<oªçZN²hc#+ª—\Ü™èÐdî�e»üs
Ã.76"1RØ7óë^úÓ¢šýº7³ƒÎyÑGžŸ²<ãPt:wŠwÕß<yÁimQ2ÿÏ$¯^ë9nût�<a¥Ƨƒ§¿afsjês{2*‹vŒÚMÃ#+‰¤ùe¿C›‘®ÒÅ£G2ÖC¶ç“×GP²©#3Ê�—LZ°F˜ ŸŽ>tž’Éx͵­a‡œ²ñ\ðΊD£”–8ÍXƵ•BªqÜ2ì<„´Pþ‡¡³eh¬aô#Ö핺ñê——CcÓ¡ù�ð#&—>¿mEsRI]à-›àãR-2dá°¬¼6S˜”åÕ‚�uY‡™põ¦:p.YÑbζfàê13±ÃÚëe:44Ò…ÝÍvmà ¢ëÇ~¬‡Œ*¹”=ÅW+…ÃSn*9]q1˜sÌYï¥Z…Ìh�k\ÉK)¥›u&DBÈ\ÚH	À^'ZZÂn91„“‡	5»Òƒ â:§0Ú‰#&ä=¶z`:ã<̱áì/Ç.z[KíådvYÚ¡�Iõ¿Gé�\~¯‘|Úµ¬%šQMñ½èœä=pÅü1Lp1­5Ñãg�Ï`JA›…^ü‰“¥„�5¹1Þ¿|C4q[~i�dìý¸ÙÑ&® ^(x{ÃÞ½¥°sC3â–ŽêU¹®E•õ
¤51pÌs!«#+eÃiÚ¢[Øv;›"È‘#&PRÙ)!oÄ.'Ê̘Ã5ljàÑ45‚Öª›DDkc�)Sun÷±wd®S��]uŽÊ»×W›Õx¶ôÕIA¬[šä»µºRm3Xô»vž1W–ÛÓVÆ-¯ÌÖæ¶dZÕzUËhµ¶0¡FØõ:ÈÙ€@ÄV"‡Ü"ª:aATEDQTQ�©A
óH>[ç.+ä~†zlÛÍ*#&;˜Ù6ýÑ”	ÔauyVL¯ÔøÑ¢/M‹Ò¼ZénNï6‘KRÚ­~ªÚ-m¶Ê&��V
¨¤ƒš>ýPÆL¤aW*ÝŸŒ3_uÖ<rÙ"á¥(¿�ÒAÿL;¦vã·*1`ù„nBÄ~œ˜tÿ¯÷Ì8[$Vt™OÓ4*¹$Mê#~7·bEd¥µ61 k
ž–ºp5”¼yÚòh%  ÈH©#"�WÊ £ÃåÆž¤w¼+¶ˆÀƒ	‘*ÃÛ õ!ã¯Sf¹QŠÞ+¥:õyx"ÈTåK2!ÝT3™i¹‘ [,¢Ñ…K‘§™˜«m¾Lêuµ¢yNx‰õQFûvæî•,mƒiiPit”L#+T°ÄfK-FK[@Ʊ˜ô;ÃÕⓉ“Šc˘G!\¬#p·^#+âç5/”FÆn£fä#3#+#+³fEŽ±µÆ°Ö§&fñ&äMÍͺd�¶¢m¥jZÛT‰¶«Ã²LܵùïwZäËØ‘‰	f­’Ψ];U�T†¬"0¤­Ï–{­äë·Jê†î¹–>Óe#+HÃSK½²‚!¨0bìI‡¢¨x`IYœq,èf›51¸dÍšØÞB.¥I³ih„
³�«\ФIÛR¶Â7vÕÛmá¦o¼¨#+)Á6Rš�6S#¦‰Æ«K†Ju&D¡°2V{‰A…%KS)TTT*ÃÞ ÐÓMŒ+ÛÍE—#3BFåë‹¥£†r#<aÀÉB³™…i50um#+7I€Â-ó`îÛº+fÔpX4Áã
À!œkZÿ¢rae÷†Þr.5*"Úaoûr¶�9#c˜¨ÝNÙåËÎɤföÞÆ3´3Lé­:‹Q�½åƒUƒ$‘@š‹0h‘¸àf›d…d V†Âw2ÖKhÇ¡jèÞi�¶pa<µ•°sVê‘^Y‘â(ÄÛ×#™Ã&FÔ¡—e�©G
ʪ©µ@¡èk@Ïõ$(ñjr«Ë›Š t|&¡X‰ŒUîE|Z«ŒoRëiUãÄ\œb[ŽZr<bâs[u¡ðÖÞ–Ì¥08f�M„/’mã\Cðµf@”�3»¸Iׄ¦Öi‘Ôàâ¬ÓÚ™E’Ìpactá/B‹rášDZIò**5ÛV­õN³h#+³³â�ÜÌLÀuõ'A›{RœaÈC‚ž²pÜxøHsQô§ TUA`²#”½…˺61&#+¯Ì6ø ̯}8h-LÞnÞKùß­´“W/«]ª…(�×ïÝì°ëÚx>�Ê”èsÐÕnJgtåS…Nñ pÆ(0¦Û‘UUŒ9˜	ìó*Ô•ñ4Ö¢s:iŒ~U§	#W±j˜¾ßw	ð;‚¾#3³æ	²~/æ‹ìA"qm!£Ï‹Ûÿ'àøo{À¯ŸSf‹f,6q¿RÛŘL‚Ý…"jZ	—»Í3Õ¼Æ?MB8†d©ªàñÖð‘�¡©9UHÄUª˜o½q�+®�aQp%-SLHIXÜ{ã	,wOIѹåÉÊ.ié~0;|âzò©C'�¢,ˆ á6o-ÕA‘óŸž$Ÿ‘ßë<õÎÔ¾dñ觴ªúRÕÐõƒ;‰	0|‚ZJ-”%¶j™²Ûr´kEÉ+¦«š«–¨Ô^-­y•Uo½«~ÿëst$î5©âzvú4pnª+²*­¬¨ÙI¶´V”m“aFÉJL6ÔÍl²´–¦š6ÚÆÍ)-‰-$Y“&4³TR”ŒÊ†šTȦJƒe ¨›$FÆš’šh¦¥”­¤Y2Äü‹1‘”ДŒ ŠUS"€þÃg�^©…AèÁïy‡^ñÈ_|r øôNÖto?	½_~¨nÁ°O‡GíyŽ¦Ý‰Ã¸EÏx9Lý%ˆÃå8hžI1Ad;ï@HuàA-�ùV)h	#áÄËÞ‘;ìg|�Áº1³È9EºÂùé©oJ¾ÎÝ'|��"°�Ńy¸®ƒß×Á#×mÄ	l¢ûO$z̶ÂK†Á5ÅúWŸ†ŠƒîÛÔ<¬ÙÂ$˜"RVèœì:g?…@”.…êŠL™½^ˆ²c#3]™%6üžB#ÒEAAHDINJÖ¹l߳ݮUÅ&ˆÕŒ·Õ.Ò+É­º©z»mv[$¤}Å¢ÁRaÀaâñĈÂ�_aWÛ´TnX#+X¢&©K›û†¤ôu2¢?œ©nxq¡ÏÏ—FŠÓQ3¦VsGFZ.™]¤ÄHÙ¶ðqÆ6ÄT.ótL»*X3„¦L¡
 àqTI„Кb‘AUžÊ™eº%	1T#3ƒʲÃQ0V©I™qrÈ&øßÝV†�1n=ÕŽ¦¨«.xÒk8”¢ZhF1£‰"	”•.ˆR,“¸ãŒx¬ÖŸ™Â#3“Ý�âżTÚ©R#(	9à…a0±ªZ£_2Û³&%sk‹ÊoÅåŽ,¯þ[€ùYAíàÉ“$h�¸8â½4`va@á.ÈF¸Üy%ÐÌ#+®`ˆjHÚú46Ê["¤Ð°wp*[ °¹ûú„„I$’&J#&žÍøì“¡H	¦�€�)E"HªÏN¶ÀòAÌzhø	Ùå"o˜vúÐÞ¥‰Ï¿Ne)—Ðæ:Ïv,<Æ®?|âñA Nîâ‚Ë¢ñõy¨AÙYÒü‡J$ª Lõ¹q—tÒA!í¡a)Z(³až4î�v÷¿#&òQù³•dÐÜD!½ûÈkbð:}>;8Jþ´-¨¢ùÕðÆLV~>/ŽºèjUQM¾xØO‡­j3Í~%AÛ~@A"šM,#¢8|[DGí$¸`&adÊÄûàæQúß‚”¦aÍÜ®’¸òVÌŒcÔÊ¢Ù®xÂã¦	FDM ]‚�\¹®ÊñWœ!:`„ÍÓÐu@*LJ݉}ŽÏb�$ú�p£îO­3µÈëcOCçJ#*\»Õ™™'Á�$2"F/™‘C®7ì'Œ·O|šO|Þµ¹7#3}Ü^Å.o!æÄ„�à¡äpäúJ�#Ûäc„4,T´ŒBeçWûE0 ($„Í•ãîêT;×f^ʱ5»(5ï2Wåø7M“@áUÈ`ÃòÝø‘º|"*eñýûöÿjû[R´4k	"lŠi/?dz¶©E£S§Ûî¾ÑEƒmT
èxR@ÂÃ?…Ö¾Ÿ¢‚Þp>�÷æ§íja³“¨#3ÃJé¢Ã1£#3ܘû¿4%è}ŒýŽ~�i‚ˆ˜™#3ªñÁ{ÝÑͼ†á€c—ÒpNíO¥§Ûmýˆ/–l×fšåxësãSûjóª×jFÞÛ<øØtkxë[2¹�Ôkl‡#3¡)ñ�•0¢éuûUg=NëÀ¸#+èJD±U•q;�)ÇßXãZªá;)ص,6ŽCˆ *…R,Š$ÛufDÈ�‚D 3«6ÔýÅ¥hZA²A%EQ¦�N².'ßk›Øi/&^év	$˜‰¾9„.ˆEuRxÅFŽ™|¨@íbW˜q#+qš#&ØÃІ™rãaiÃâXÛ×äv„£HASÄd5ÔGo.ÞFÍ/Lèã�F]‡8¦Më§,YÉt=†„-Qf©Pd›”l{ØÈ` bA(i4ÍH1‚[ÂÓ‘Wiž-ÐÑ´$¥@Êô7•½2#+)
l@Sh¤³¾Ž|ʹ­#²Eƒ%™Zk°½òÈ�g%LÐĆ2dÛPÎ6²™©#&îƒy“œÎM".?�¦ïyÝÖC<t¶æÛ|rü”u�‚šVPö¥�ŽÎèó03äKI„jæŸÃ?ó7è¸æ\ðs¾jÁt|/U#u4΄Œ·9q´<·i1Íb3�M¸œ”#+,èJmÁ§IPpÛ ÁPÎø.5¤€ñœ'½‡m%#a½thÚ0•$P¬Fѵ'$Á"RDŒ(´7©+0­
‚É
ˆk½#&eE³�ë‡
�xõB6ï¿0ÍÆMÁå£É^®ƒZ„ÍïG®÷fQ’K"cLruybå”hGw«Iž°JstÄ4±PÛ1·$ÛšA68 Ñ•ÁA09ì‹ã|˜lkn؉„iaL§¢j‰Fض×LÐѦ	w†ó�FWƒ8Y…åp"ŠrMšðk�Äu¾R§jr•;®ÑQ3šU&òæv'cYá®ÜéTçA’|ö³sZFDù[r“Û·Q`LО�Ù‘cp>™7NGÛÖW&ƪZ"0"ÒÙ¡–$·‹e({¡VªvÆ£;L”T@nÌ|a+oò뢯MMú’U؆ÌXÊq‹Á�˸¾º‹Y6|)¬ÅŽì”ѳ�#3YÊù£ìæFÇŽ[9¹^¤Ó—Î|‰ŒòT¢Ó/QöœÖÓµZZwWnû°©¥»¨Æa¸IoNlˆ7‚mû˜>xL&jÝÌáë¬8ºÖ»á½l#3ùpæ›"¹*„ªgmW8…ÔòL\BÔ¥˜ñÇ ;ª¶”±ÇšUÖz¦ÕQÀ&rp6:M!%4ø2�£vbCtÆCŠv¾w1¿É*�ÂÐ(qtœ#”@…Œ·Tc®-Dœñ×�†0Ͳàc<å0O²'è±^âß•#3vÕѦÈ'[­øäqã
€ë¨e”R!�4Ô$3±&«IBÃUÕšmùÝ�­ñA•£¬ÃFØ´*4¹ÃCm$::p#«–y¡iä¶#+p4äM†ä-f@˜.Ý‘,}Žÿ’ãl1‘ÃO¸Ä‚ߥqÒ™ÎÃ�‚‰fhc* ˜ëlH¬’kŒ6Ä¡Š!Ûiá šèuÊ7FÏù¾æŒÛg)›"‡)éÎŒï‡åì4&þ�6{¼€‰¬"-ÚNÖj¾'w3‹œ�=z–ïŸj[\5Œ�X·Æmö!òsrÍ«ñåãÃg0¶C`—ZzÝŠ&bêItnïA2{xÎ8Ëfmwáeo�VˆS#�%dyãúsº4›XB‘`¨6Òæ%)b„¥—¦ÒÑù†i®8‹I…½½‚›÷¢1šˆ¶çÄT²cË«éRiúX˾9ÐÓÏŽqioœ8ÖŒ½ª “Aƒh Ô(ÁŽ1#+¢µ÷îoƒs—8Âð†,Ȥ;ïACfṤSî˜:k)�{:Ír‰ÊIK(ÔìÉ°´ïK/˜jªDîón˜W}ˆL.¼GIÙaØÊa	§�ñ‡fn#3k8Ìw«xi³»&²íл°“tò‚÷Kp§.Vàé¿’�Ùdã0¼Ý€;‚d�KÁ	S&¸
¢ù2XØVŽ¤Ài~Ç“ÈÅnœ`ÆÛåMjÒ"2hbêšyÐhY–Ò®j”4©ƒù³gç%î³ïD¥vÛÒM
“³;��wžâÙaìʘ�˜oº%È0FA#+�	w6ï¡ß\…0Í@Ì™›š
¦èň#3¨Æ2†Aª™%ê²nrƒf&ˆ"«@&âà┆‚xÆҀ؊�¡$)"ß^�¿R0໨ˆXšh܆#+¶MÄ̆ChR%(]ŒÃÀàg—ªŒƒ$#"‹ƒ¤`.p.褀1Kš�LL�…ÇsE¢9¤bÙØf$Ö#+
Ѥ@ir¨°!âªlîvðG;!Üèìªéˆ;d-‰#3$…EÙ2T,,B.á±"‡D¨I=^œCå�m”¹F	Æ츊Æ>½_Ó†hº®ý=;d÷#+ƒ7d@Hv„ب´D„‚š¢ƒPQzH®îêôÛl $êÞJúBƒÉKÉô‚'Î�"}V0×,~ø2Í�ûµ)6…„lß°�}9:˜j7š5Pbq'±#+Þ™g€l¸’ ÓpR$ûÒØc~5M�	œ�ö;¡‰6)§ASy{£Y1MǬQJ(k-ñmÔÌ£wgʪ}¥¨�ú8ÈgqP÷‘QÌ÷U€é¢™Ö¨#+ñ7‡E;`p4Ȳ}½{š`à][*Ê”	¿É�5C€›cm¹í¥¿A­¬�¾¨ô$LdÈzîiE¡d–ËC7MÑú'·ê6žS-‡u»©GS0lR2SøÄ3nÈ_ž6 eeoM’w)tÃóZ'jN÷y›"*nëÙ™#&–”\‰Ø?Ð0=Ê{¼A,Šú/—#ä}ˆ�d1¾AË‘VæZÚî‰Ú'Æ#3%”Ÿ½Ýaw™9Dè>Zd�!©B¤>S.íc}ËËx�¦N³®‹ºéH2#&†½ç€(g‹Ã1Ûw˜ÌhÄó¬‹K±8àÆ"�ƒØ9-q«Î𗛺Œ´®TZç#+ŽÂ˜ä”c#�€J Ä#+‚2Í ¶XYŠ­‡#++(Ð?%&fC|˜÷60æÉ(A§q.–åTQ{Þ	Š/j0LÌ—F€áR[1*B)#‡ùõ‡gj{û¼B|f^~Íw#H}ª�\#&{ vƒ现ô@Dûç–t²˜á+q}1ĦŠ àJE-ÌÆ2ÔQY]ƒæ^p¦ôp&¨’9S÷4rQO‡¸E€õõÚ'IÑÊFPàÄv£È%¦mµ5Æc²I9³Æ²ž#+ˆ„ʇHhëÂ1ŽÙ³òH1`…A;èzÃóˆ{7„g”s×N’'<í�ïî²ùµ´)ùõªcUØÈ\`ReË9Lßjj}bTÄ›sŒ›¹a¹âO4ÉŒg(�:�¸#&œž4wÂ׿\#&b‰"T¤ÏDtNT÷ú¥'Ëç‹hfÎZ•16ÅÈzÓÖ™AªR*¤dð4s¼tÀg°ÊŒÈ£r§w#3é®Q û`˜Šžø«qHÀXE"¢�#Y[&Úi_¢–É­I¶“á 2"9‘дWo(€@ˆâÙ–*ˆ6HƒvˆäÅB$T€À7#&¾QÞ€“Òeˆm¡Ú.fOîÉE~*‚nÔðÎÛüÍã;SÂ�°t8¡Aƒ`°X„„ '-pãǧ˜dú)¢¶€¥|N71˜'ëƒ#&‘�Q$
uÇÏnWÇ|1ÎÁ³N1:KÂm˜¼WÏ­+�_[ï�’UIxf¾
Ó ÃBóŒ58à�P¤h©Ê¢Yreˆ’Th(íCNE�Ò«­ãZ押òéx¶Åu涗M¬ËÌÕÙlò¸�¶#&‘Ä{�Üväéšn­@ÜTmµÈ\Ô^#&…‘¡wÜȳ
Ò²µ~$
éöÎÓÓ‹É9¹U�2Ÿf	Õ÷ü(™f2Š.š®(3ƒ	ß	íÊ/l¶Åº¶5[0sêMêšö96‘
¹YH0{â�]Ó†üÃqeš·aÈ£îh³à¨³}@àDRRˆŽâHh`ÓÆ$Aší#3Å¢öÉéä;‚y™Ôî›,@@‹a@ÒÌ™Ä~¯ãéµT’£.7Å«çvœÝxô“ÓƒÁ#+àR/éÙjÁU#+äŸMúz¶ÍÇ…ÏGhÙ�£^ØêÌ9#j‡^ŠÄ÷^P™Â/}Ž&<ö5l™·¢¡ÃO>ú±°í>žÐ>ØûȨ'ŒPO€X‚¨h#.T(H…PiÏ‚#Ó�âÇ$¾öÇØçØŸQëô_
ú¸#&YA.›Þ¿7«Òi©ªÌÖY©¥*fѦ’²PÍVÙŒÔ2¡٬ƿybµºk¥&ָΕй­Ú›]ú­Kë¯�üˆåð9™�¯ŽªðT'Ó¦O3�¸õj퓵#&ñ=àqê1×‘Ö ö5GŽî™‡²²sH)Dš¦Àýã3#+ŽôÓ_�[TåÎéµSÁ`}_V:‘ˆ”bËE‚Ia7nŠaÀÚ“pé�#3$@D%#&‰w%‡Šàƒír}páFòÿ#‡bŒ!H癃ÎûK5V=PM1F+5c§:‚ Ñ^,�á�ËK㫧ÓU05̼î£Yœ0·LЫçØ(„†xÎ[‡¨9q°p†ÒalÙ†…¤3¦–Ýï4fCpÑ0š·–ê]?FšvI
ØNfvœN¶ÊŽ·¾²¤d
IA%‰°°¦ñØl,´~­®ÿH©ÄïðYåT
$H
	Ûåˆ:hP¸¡TNºS�J†zÍ=¶hÜ6.�–íUú‰»’’¡–JeŸie�´LÉ‚ZÖ#§¯’”‚õ�m»VW_@Ù@îµþÁÀ#3ëYôéϫ윯%Ø#Ž�y7 EMbUšÔäk±3±ŒF9P$ A#&p #&ÄPÞñ�_<'Èò£ÔlO—¡B	]§3�P6…BQ#3‘arAÔu Õ¥è¨Ð×·—hIÑÓq`[¢š˜Ä“ÇÝã°øTo,áX¥)þÈv̇µñ‹ŽVA‡™³G	Á{`÷1`wwyvÝ×|ª• ‹9åfST»~C?1¿ °B¿…ÿÕ9þKßïüýrü°<£+ÛU¸y
�©ƒ/î¢Ã�7‰o‰þªZÜæ½þe�?BÖ…ÁÀ)õÀÚEAû{ÇtD,‰Ä_î€vY»bkðý_>¶Ù[/WÕ21 Ú+(J(=w4ߥ�Q6Ø‹bU¯Ü5aj.ZÆ€dF´ÑÈÒØAjõ®ÝQ°yA%ašÑ‘QU˜„T‰Ja
ý(P0¨=âð$Sp�A0D#3†óýønû¾føyú¤‚€Cv—‡€s›Æ@eØ„ž¡˜�t•y£J5<ˆO0òóbÅ1T$aR2#&Á	ð>’4óŒ’ÅI«&šd¶i&¿_ò£c}z¯åWÐR(ØÄÅ ‘D„#&‘"@C¼õ¿œdBC`gQo¾–»þ"Mò.£Âœ �*d�’|#$Žd=Znë›162jlÛ¶‹JÌ�¤õçžj¤Ú¤€E�#&^þ6/¼Q ÿ<CùoØ¢›�ø~νCo`{~ÿÚ]×Ä’z•õ„]^OïžAïýí§ãÐÐ’Ä7?“mØZ!Ðrø>RH÷Ë�{+;tši1Ù¢•Ì÷€æO¿2†½ŸÊï2’HÅIØÓõˆ}……{¡†¾zX:As�ZhhKúz�pÜ4öhÁ$çdSLèMp`Û
Œ
�žL½åÅ3:Óâ0@aøÕWZµ»|­ä¾Ž×imIW#+Åj›Z6Se´§O|Þf‹j´$
!æÖû8“#3#&?ÐE]�J$ˆKŽåV’¢{ÑHA`'}[!`zøzq;þº"�d¿Åó½<Ë3ec5gˈ˜Í Mgfq-)Ÿ•	åú/@ý¢èè
x›Æm<‰{
[´ËlKèf/òãÆv_ÄmÕoâ´ì£iÆ�Ù¯ÜhK#3ƒò}»müz­u~{ä±}<t`©‘6T‘aX¦‹QAQV2m°¦Ñù•¿3WŒÔ(¶‹b ¦§à•ÃhMïÅTUQcað
,²O´:dÝ	ˆU0(AbdÆ�*)¢iËË[²PjnÚ	ë|'Ý.í²ÑßqÐF(ŸØRDD¼­´bÔ•¥#3Å	lE�$Š2¤H‹‡Q¥·rÞiå{ÛJ¬²R@ӗóIô²L²ØBq7”ŽO}ãa­‰c";³†SÒ�©<â#\µßóD#òmø>»JÄV�´2Ó#&²¦ÀiBÈÐøxzdd#30™Oôbå{µn[W6¹%j½çž.Æ­Í«|¼ê¶ñX±i’fZ÷šÕè—äu#+Œ	âöŒv"´-#à`.îQ°!=†‰~2Mé'5FËèÏ/õMj*1V&„Œq 	$¯£BÃé£=†41R™ø02Å#3äTƼ3‚Rm}š^ykÇ�×Ø·Tج¢”P†H†ŠÁˆmHÈÑU4Ì[²Ý›³2«¹ÖÓMT¤më»\æ¨ÖTÚjJ65¬‰‚e#3#+ⵌXí"lQ2-)k(µL­54ËfZé·nêÜåqJ%o¦ñ]U¹&3«DÚuÀêËa’Ü Aï#&5ÿ)»?Ý…\Bâ/iG³h\óëF­Ç#&�å¶a[Ç ÈAP;ªs¨2k+²,XîÖuoñ|D EÐ̇©CT¥]÷zÞÌï6rhŠ±§#3}~f³vBÝYÃêÜõDB(£š†#3µæqǨ±š�þYÈÐ%Êi‰¯9Ô!$hŠ’À›C{¹’f¢vŸ2ÂöI/ñ"†@›CùEM™Þ_ÍU+0œMuÛK#+Üšm°´w·iªÔ&©êÁÙÆ Óñû“/Žt�£BQ¦B�Ä�Æe«ßè‰@È}קSsH“
\‹ñ,™`æbx’´Á'Âý‘]§83~½bVRÞj*B	Z£ñd\”+œ;Y—òƒFeåðd\3È z…½fe£ñGX›7F`lØˈ@ýWê™sKsx}$x¢÷PÜ,‚(É-Àžiha„ZB% 0ÀPžH’M•Èý¼ß#+¾¤¼Wûlc¢ï8Ø�Éÿ%Ü¥ANç›ñ%þŸIƒe_¶ÎYŠ“;@Û›yðd�0à7.ðÁætM‰}+RKÆ`f�íÏ3°ð²ÕÏjS¼îÐe†4?ÍÊ­!üíÞ­+u4層¹_UZέ,Å2q¢†	×føLBÙ£QTšÑëFoàj]êÛ£}—.F”Jc¡4…jSÁ®ãâ“·:3`„hˆã¬ï�[ð@]t…0 )ب’W~ó>LA?Ô?c�#&ÉSP6Xf&å¦Gä=Që1Žô›ì2=ç&üÑ7½ €ŠfíD&×n²bš�Vv¢ÀZŸáؼ¿O¦æÙ5Þ!ùP�?ââ’Ñ%¡#&Êå¯ÜvŸVC’ªk“Õ@(çÅ	ÄÏ@ñþ¢YÒ¸™qR6o#+d¿#É3ëqì€'Ç,»öë—¿#@#&À@S»L;-bcø"®ø€R€_ðãþß¿ÿ‡üÿçÿwò÷tOù»,<Ÿoû¿Ýÿ�äëÿ‡ûÿßÃýýÿŸûýÿñû§üwÿ®6hþÿÛÃþ_÷öj÷ËôËâýýÞŸüðÿýÿOü:¿gÿßòÿ§üÿïÿËÿß³ÿ?ü¿¿þŸ	ötø/üÿ'Ù÷~G ›ÐÔ?ÃþGþWúÍhN¨–ˆjœ nˆj›J¸xæž�aÅ(,Ä,DpcûjRG ]òHBE#+Å�õHZÿëOáXg?ãnwu2d�&S>­oÅ{Z»Uö0€s˜#¦wÈH#Õ¯‚ðÓh†¸ó4(³k0Ke¦_é»û¿Æ†*§pÿÏÃMɳq \Ûö	n!º¸‹ÔøEÿŠ•D»JÎV£Ùöï–<4ÁÁȹâÓž3(Ï@<€µ œ�°"ÿÕ#&�Oú‹#Xé3üã»CÙGþî¸ÍmÃlÊÒmfÅpŸï.†Ø,R�#+$!”„	c+Co†ýXÍÆ„\qwëÞÿùk¦¹á‘ñ•V˜á0j5Ø«3þ·i`Ýi…R_{#Oᵦ65¼šÑd(ÁÀñæ•Åï„#+ú°kp†órÎeغjá×Æ=¡ÙTx>ìîÙi•bÕP)Ɇ5>fœ&Y¢iÆ©0›k¦‰¹¹-r¦R¡/†lÌa­¦`ÚD2ÕﳎMmnÚp81¶˜ÛG§¼vKŽ~v둳ÁÞ)q�æA¿�FªÈØ7Le`P)Óå4�Æ£©™ÂúèÊ´ö}йcÙow—e1+r,:Eã8Ûñ3¹Œ¶A†08kLÈï{”löîZ.¼[Ép#%µìéxƒlüòÆ-Ç#&@î[0Óæ#3Œu=Ïü•Šw|(q\FËÙ·–ÞèÚæ––›Ïˆä%ƒ²HBPÊY›°wÍ(qaÔ1,!Š¹^	ÍíñùhßÎr¼7µø.#+Ý•vDÚêç~½¸v~å"J|•~¸i	‘N2$ˆÂiÝT¤�P¾šñÝqNíÚ–L€ˆ9ÂFA5Üï—�3ˆíX#&ƒà¬‚$Dñ:Æ‹ôÙ°�‰"¨H2b¡$&]£)O#3ðÍjY#&3$†w{„O¶bX™šGô@ýp°@Oœ#+åm®Cå¸8a†sÛJf™š–íé­‰ÒF#3�MZÊ#Y¼\J††¨*�jReZMRU$L³�•óݪê¶×ßmo&­cå	þè|ˆÄ¡Ý³ýò+Žš©bŠ´:Cœ¡A"a‹ úâŽ
¤�©""¡C«p}ˆ	ö'w�uÃûã$‚}#3ÅU”þZòƒïÊhYþî51�_‹”ô�¼bù	W�:G?ð#+䲑PGS(ý’­©BŒ }¦”ÿ¦ŠûD1àÂR³Š#+jܧ…г[²žê±š÷�879qXfa”Eäã¦#þ°åþÎãŸäIéÕ¬&XäM0Ò¤ÓååM5ÿ¶A³d4Oº‹#+ÀO„Û¯jyší4Ø4#+¯ßêMëEÝ—´á"6&YvTCVzI”D%%ÝÂ,”ÀÂÛÅ´²£”Ö×�ìÕ_W®µ%E±¬Q�eb1V¯t’��.‚f4Ì¡ŽлˆbØóûvÖ^ñ(ÌÏþÕ!ÿItä@’D(x—w;ÂŒ<Št¥Ãâ*¾à†	by�"G$ûzºÉ/·Ä„ÏTªÝUºFF{©iâ$OoûÏ]»¢Žˆrð°ë$YBoNCæЄMH‰ø>‰Ý•x#›îæ'”.‡ý À(â!È~fÁÿ¢(�$ˆ,H*mv£�›¯ÂùkHêÑvÛi6©á·Ñä’Æ0XȃfÈ÷¢ÁA�B<HŽjwû»~ß‘±ó²þþ`§j	¸e¯™2áÅ9ÝÔ§<É4.„¹6-`4Xb)ƒžÇcöÄ¢ùžàþ_êP©üZþ-4¦·M…‹žè#3H§øu­I_øM5ì˜ý?¸ª‡ÿž_íÌHNÞ¡A
*xø†?P÷Ÿ»müÊÝ%¾Q·?þâ³þz<_êûá«Öÿ7§è†Z¹jjºò⎅®¾h@ñ_×J<þˆŸ|ˆ%Ì [êöyø›Òù(5o99ÿæÓÙææ6¼¡7Éõ»z�E4Ð!ŸÍÿš€êÂÐ#+-ŸÎqdYõùk5ÿõ[Ï(Ó]2‚‹�Û~¿øûJ7|äÂRóB	ÅÄ+“¨$ƒê¥ÉR�ýtZ÷`t®Þ12U3‚®«Ž2Ð`ÔþAÁƒìØ�;h�œLed§0/25Ⴜ^[Q¿Ñ8¨–³hÄ!
k¹åÛéÏ,�›å6#+�>ý¬§àÏ[=Ú6³8Jä#3êíã.1$CèBž÷!…exšå3éŸoýÏ!X:½“X‚“ÄGƒA$“ BY†ºêüÕʶöŸ!2_Õäfcÿø»’)„†ýÇø
-+#BZh91AY&SYÒ—Í\Îÿÿ°�ÁÿÿÿÿÿÿÿÿÿÿÿÆ`#$
††"ª@Œ#$#&# (b|÷)÷9#$#$#$#$#$#$#$#$#$#$#$#$#$#$#$#$#$#$#$#$#$ù÷dæ¬�ë¯Z=l4^�{;�>ßs/¶½†lß1ë…=c+l±Õ·e¶ëvF«nçz3Í9÷|}ôÔ››c[wG¥p”#$S“Þol=ÛÓÜtPtÐó³½7¼ë”4>^{Ï]w®·×ÁÚùô&÷qèÝ4£Zy·ÞßÌßi7ÆÚÖ¯³·»¶=pö6ï³Âí}·Þà#$#$€håè#$^#%¶#$‡×J�<
§>óÞm÷¸#$u€Ù½Ðí=®5³TÐì	]ÚnÁô#%vom#$Ù•;ÙJÐÑF€h[QEI#&#&
 ¯{(¥#$#$QP �ZÑ%µàºûî•SÑöîêr÷mׯ{Û¼¼ö LÔ¶6Õ#&Ñ¥m«åÖ�èÚhÀJó{Þ¾¯=ÆR—ÓºcNòï^ëçi·™ÝçwvÞwÝçݽ׶²–mr}}Úûã®ìeÓ®Ý×Ø:úéèûì#$>¼¹é‘[@ÕP	ì¡Ñ¥#&ça›l¹çºdô
¶óhTz7²Ú%èn½ï$÷�#$)T*¤P¢š¢´kU.ºÞ·uî;»nlržšÝ°{uêç¾ùí¾ú ièm•¥Û�÷rn˜;®î€ßÓ£'g»îú©o{ÛW½èó¯_v®šõô;ï¾½>Ë{Ç»ÍZ4»Þó¥£{]>½Øí“С�;{ëÇÊY»êöq]ª/¾÷{|^ç�ôgÛ÷;©Û¾y½^ë{Ç:÷Ûì÷¼Ú2mñÅÝNvdúv÷Zö;¼î_k°·C£½¸.õn�9>žž°«éÑ—óÝÁôóé¾ãûšñò�#&ЮNvóî}:bö÷iõe½Þž[ܘ}½l­½'I¾µÔ}7›ÞñÒöÛÆî>÷^´{7Ŭ#$n«ïkËÓ£>¾�uãÚ«k�åE#$„P¢ #&ôªìÛ»ží{cͬ„ç]¶�Öæî÷ÞtÐ{˜äëÙêí÷k´ÓnØes›u_{Åæ¢õ{w+N±«¾ç×Ýéß#$#$o®ê2#$W×ÖûãÞÝÝÞó¾y¯o¯}�¯¦¥Þ}z]½ß{Î{ŸXÚ§Ÿ{Ë^ê¼îNíUu ^>¹éç'ÙÛŠ^Ã2®î‡zê®÷j¯vëÅï};ê¶nŸ#$¤#&ï]»p»Ó˜¤èç×Õ>µXtÛ}}ºÑÏmâw=÷­±íÎõ�Ú½Ì�–{Obë9õÙ½š3Ï›ö}ÂÅ__>XëO9Ðmϣݒ
ç·N—£woJ·´ð9eÐVEZ}¼/¦ºòû³¾<Óí«ìÞŽ�¨­_VÔŠµ�|û`õ×ÞyuÁ}ö÷Þ«ˆÛ¸m·Å罟pÎÖù÷Ó.ÍÞû�»¾÷®÷¹Ïšú/½ï»Uï>ª«Ó—;4=#$\ÚzSZ«¸5moyç|{�ßvöàuCL7êœvèï>CÉè¡ eWy»Ž‚÷¼š-šñêÛ•ãâëló¸#$
òU;S¶ú)Í#$áõ÷ÝçžÙ5öîï¶ïn^ÍÞOiæéÙºwFèÉQ$‹uÞ³³ÉÃswÜÕï9�³u{½}ÉŸN_wÙÊù#%vûÏ=öûÝç^׋£ï¥2N¯‘�º7vâEÓ“¶¾Þ¼"ö|¶mÀµKííÕÞûÏ|úg¥Ó{'Û+šwe�xºvñ<Þt­ŠøŽšA#$#$ #$€Ñ d#$aЦ�4ƒÊ#$Ú�êhõ¡èi¦�A#$@  #&zhCiSÕ156‘“Ôi #$#$#$#$#$#$	„#@šhÐMSĦ~¤É²£zSjzzSÔhÐ)êhõ#$dF�#$#$#$IꔑDÈÊiè4“Ôô§£ÒOÕ<¡ú zž¦�#$=@Ð#$Dh#$#$#$#$#$Hˆ@@
#$h#&`L�=#%)äFÓ!¦ŒTÓ™4#$#$#%#$#$
&¢ €@ h!‘”G�šeGèÕ¥zŸ•�~¤¨Ó@#$#$#$#$>oÿ“ý:Õ¥ÁúæÕ¹m»’ý­9L#%0¾6­.f…‰	ŠŠE*ª¥`ˆ™ù|O§Ïêµ?®ÓÏ땈¨‚¦ˆ™I®ÞR¬*�Åoux±T=bn¢¥L<ÅÅâ§úÍÌÿ2MÃŽ½Æ{€!ÈA  ïßß„@ÌĨÇT.�íá3¦guQÓ#&)bñu5)ï“UE'¥rísU0©¦î¦žŸ\¼[ÖâjæÌCÏ�‡2ŽˆB0",)(HkcmFÚ­Ö¢µéU\ÜÚ·-X¬m«u«]ÖÖ·(¯¬«bˆõbÄ#$¨¢Qm‚-‘U!ã(ˆ–ˆ©5Z÷o<³£Tk-IjÖÖ×ÙUmª’	LH3Æ™f€ÄÈj,f“e1$IJ‘,dLRŠb›iC	#%2d¢ŠÂi6¥FÙ(0Š%#$LŒ4(mIŒ•”°E™¢XКcSJ
¨Ò†cI›hÅ’•)‘¶%#$
,´�T’	‚”È‘m¤ÕA‹6)bj)F()IE4‰Yš‹F¢´ÛZmZ”“Jk&I$T[–¥k¦³)–¤±”Ûbj[*“&¦’Q$ÔQ°2$©VŠÈFɤѤ”X‚ŒZH-ÒØÉ)Q‰‚(ÌÓMŠ&	�)±�€Ä1M1
#&™&D¢$¡dÚ’ŠX€„dÐÉ0�‘¤Še)b“$TRŒšR[BQ¢Á°Æ¥¤T1d˜h£J@€I(“H¥,LT&i´RfZCÉšYddšš(¦am!ŒMš$Òe	 Sb5%@©h’#&ˆR$¢¢ÑTIHS6 $“RF)#HbDÌŒd˜Ë„dÛ2¦DhH´b$"HJ“a	dšM Ä™(²”Á²ÑiF‰M) e&h²&eRÍ�¤¥e!’Ë$Ù¦c@jX¤³#cbVI‰‰$Q´"IQe•!´™-�6T…›3F-M#c)M,d¦¶šBJF”©2RT�¦“#&š�%•*6(˜`¢’ ‰‰0‚JPiŒh4’d†™$M36Ò4kÖB¥‘¤Èi%6’¤¢Ù#hÒL’JÌ&š‘¶FÉL™DE#%’M•fZ#ŒÒ¡”Í)ˆHl-2h´¨¢ÍMŒÌ£Œ‘%#&l’Ce2,4Á@ƈÚRd²’C#%“dÑ“!PÓ!BI™YI†ÐY2RB2K&Q�ŠJC$e2‘–jJU6h¨Ú1b"‚dJB#%¨Å±¤�ÖE#&�I#*4†ˆ©“Q¨´¤Â–U‘©™4d“	,ˆ”!Šl€-L„ÌÄ4‘SZ¥m´[)ƒM ´š#%”˜Ñb™)’cÉ©–hÓ™Œ¦i¦Ée,Z™¨[$£CRÌ4 CK-+®Û#HYZ#&BT¢’šÆÕf&4j#%¨R„шšEKAb6©%ªb)¨Ø©b)e4„ÒDͦ60„Ú„Ö‹#f²fcc(´56FаL™ƒRÓF˜É$ÒQ¨e2š¨ÛѦCVFȪb°¬SeY&ÉQ¬ÔØ“F�­Õ¤¬˜ªZËJRšb¦Ú1B̈±­jTI´Ã#,V+L¨Û	U‰›b«	’�¶6��’�Qš@†¨¤*#%±µ†jCkšÉ#&Vh†SIE ›6“fÄÄf¦‰fÔªMFÉ&±YEi“6µ²µf‚4–†¦ÔY¤L²³ff¦”Œ“-ªmE-%3SM”Ö•J“%TÌ%¬©”¤ÚšV›1h¢([f³3$…e�´“m-e‘#F6Í(¢0!š�4ÁF˜–(ØB	C†ÐhI06mE©	IQL¦©6”šlj2RhÒiLŠ)³b6)¦¥H€SE2S&6e›6a‹Œ”*-d†1Mf¤°²Y!Le0Y„¥(4É1fBÌKb1´XÊRQŒ³4‹2�S Å1LšM£Âe�4d¨±˜b¦j‚4P›2(€¤a©¦ÑL,Í¢¢ÅFÅDlDd´Ð‘I‚Ø(Bʃ“Ed‰IHÌÙ#%%±”š”D™6jQ	ª‹*™”ED6*SI²6“(ÓI­ˆ$2É¢FdÙI4%I´™˜©šcj[4ج™fŠ"�›F$´L¦M2J´�SRR$fÁD”c&Å™DbˆË&ÉJ˜‰©!"ѨŠ¡65(Ú¤i0Ä$3@””šE¢˜¨¤ˆE‚Ù´¤“R¢Ô™BÉM™†˜kF�„(±¨­$Ñ`Êh"	$´›fmŒa(� Q�ÔšÊRJ„ÙKQTiIšØÑi‘RD›ÄYf­J†#%FÑŒL¬›E6SaRi)M%K$©)”¥[U$IB�“hÃ4l›Q¤¨±¶©LRQR›e+b¡¤™²%&Å#% „E’Ŧ)£	´”mIM©I¦Jk1£[E³!†Ã$¢ˆ"Œe•�£i’hÔ€h"ŠJIµ¦‚’Òš£Y+QlmdŒVKY¤hÛ¤¢Å1JHÊlЉ”&�’˜4b2´b�±±«SU‘›DŒMF„+DͲȭˆÚ6�XÉ%µ(Ê›!¥•‰Z6ŠeŠ©RPÖQ–6)DÒlÔÔZ	,TDÐÖ¶-’‹i5b“FÊf²‹&Ñe"Ñ“F��ª¦ÖÒ1•#%&ˆ™Y’bÒL±´(‘h4…¥³VLdbÅ­E´V�lZ-¶�ªdÚØ‹TÔ¬­Œ¢€Øš5’cÊÂÊX©#f‘QA&6"‰$ÊI‘$6¤ÛÍTÇÆþ‹úOè·»xæß⟑¿ÏÅL²¨ ÎÒóÿ;0Õ¬Ã?’ÚE¶AMÍ�nì–^·_Ò_é#x÷Cú¾_#&mÑÈŸýùÐÊ6µö‘¯d"=ÜÞC¨¼˜«MrÈnK•ÁgLEuÁÉc¥ÿÒ©ùµÂ@~—tëÖ?Ée—¦”“&�	Ðî˜RÎêîe£äv´ˆAˆ†‰Ý7q8ú¯v�·ù7záÄÂ0÷XŒgñ“N:ÁØ­J4�O7kL{‘½B6ä7cØÖ2ʬUÄUº-¸£Ñ’–:”à¨�b¨UvCKL�™iÃ#%$ZDZôyMÝmÀ™x½•ã=úáWº½—¯çõêW¦¯eÍÍ£Qk0J¯•#&1ØÀlc7R&ìˆöD·z¦^ÍÍ&‹$Q�ç—Š{:œêªý¸Ž��f0ïTÒ\IôirÕŒU=Ôe±‚ÀUøÿ¶å‡—uhΙ#&R™FõH#=L¡0¡€¤ñÎ…cü\�Æ•ª¤–‚YR�Ë8Îý¢“ƒ2ÁB#°Äš{M=Z™†•²b&³i(zu³]?Ù{{em
lkƒDXk­Ú‚‘93Ïo7‚S]×:.ãD\Üɤ)5¤ˆ¨±´}’ú%HH|ª§Jò²Ÿ4…š4È°)=µLa0%,›ñ°‡ÑeâŽ{w`ÔÚ›.¼³ƒ	Y£dÑD¤¸*¢ ŠÚ¯âm½ç¦÷Uu-½›¥‡�¹¯]¸|>··¥‘‘Ô£GÕÔU£–’#qCMo/ÞýÔr䛺ìNºéŠ‚¾WžwûWÊï"lUö®öéÖé64|r»â]|ÓÏ]·60ý¾é3×EkøÖ¸ëOû˜&X?ô*Rl•UÇ8– ‰$#&#&[‹x¦P¨F¢Â~¢¹ï~üÀÒê")©Ÿ™˜`ª´Â˜ŸuN}j¾ƒ]~è¹ü½:ÌÜEj³ƒÄ+=Ú¹‚g²10ÚSQÆÕËýµ;Ù«8QÆ¡áÆ£µ\u¿‚ü‡qC¡-/ÛÚûÒ;Ió¹Úî‡0#&Eû�9Bâá™Ó5b•TJ§ÙaËQ<ê†zM#&è��Ê2»-Õ­‡ø¸CñfR.x–°X%ç­ãí~X£d#&‰£JjÔPnŠ‹~iœw^mjµoçœàŠ«²–ìoü*‰Þ™‘b7Ôí6I£#}}v¾¿yѳ=ç4Q4vºäÖVŠÅ•Ò‚/ü#%/�T�uðäÈáem¦ŸíêcmOĆÚî¦ÑF4kÇ3,›Ç1r±ªþ™yJ�>û‹znE÷9“3ýVúƒµò½®Ñ·-‹wWTF,XŒb0EŒž»®WžT„”4$S›C"¬çÆ°˜H¼¡<et·�¹[z^O·×E)|\¨*úžÏ3�ÆQ¿•5È|\R[&·\¨_øyä<¢Æ±D@â?復ˆR,‡‹@¨°º¢kGªõ yä£!ö’› ¨�R¢ëß@sÛ6O¾‰ïé¡pÊ#]k{7gšI�‚ˆ©#%kèl)’�›	Q"…4¢GÊ‚„:Õ#&N
�´8UÖ¨\ÔCÖ’ÞîÜŒ÷]™.ZéKìv·Å‚ù7çtfEdóª-¥Q8ïwѱômÏ`;WÃúí"$ÉTŒãTqaª™E#Æ©-Ú'7J»‡«4KCFL±«9¥Ô!¸£m³Øá¶ëXÆçg=p¡Qy÷T93ÔÌÅh/¯*1"xÕ<�ÈèrÝËéÖð…ÖÏ–ªF{6Ü=¨Šîç\{24>=ô£K�ê‡Ï<¨@᜻¸E÷1Dw„9²cgYUsb8dL>›ñJTZÆ%/¯¹¿vï¿ï»Ö•×rX ì”Ò±]“öçyaðÚ»Ù;!¨ã…vfÿ…qf™… ¡æÐ ÎiGÙ^μ£ž=·\Ç××èòɬ«Z…ÙNjz!CnµŸ(b™cU�»»•Aã_]L²ºf ¥¦(©é^·8 bPȸsŸÓ&0iG…TßÒ·oŸ¹³â¨§G‡ûíLL³é,¡e9/Ó8û^Ëÿ
¬Ebw.ûä“<fÛËXÅxnu‡?¥n¡ùõ;4
Ž�~è{R­ŒŒÉ<àȆø?–!ö•KãhBw£G…H7*âÂa«Êˆ[§2íõB7T�ãA#K˜m räpêç_#%/#&üZnš®;Tþ–éú¾÷´œ‹3Ï„‘œ2Ù¨óÔÈñ›sðQû¿“¬2GÅ?=t1¶µmWf*Rñ÷Õ¿‡-y*”$µEyÑûþè§L ¦‚çÖ�ò$ÛuQ8¬ ð92øC%Ò‹‘N9‡+å¹±³æL*Œí!¶ˆ5óyÐð±Co#&¸§µ Ùû×]ûk:Ôþ¶ÝQ”—H1¦÷ùå1êo]ìf<ÞÉ·{óÚš6‡eóËö�Û±¸z<ÞÅŒòHVRî’cÁ®^Û')zkSV1‘A#%ŽUÅu¬¨í[yTîši.h›U¢õ~¼OÓ&QgmŒA[¦«›‹¥žvpe¾�$Y†r̦¬çŠ¿Û¥Ÿ;ïgoí½gƽÛaºN«wpi•=¨Ç]ž”1צVŠ#%ë#%cf‹®fªö? öqü«±DÏo>kêŸ+ÇÑíèyÞ@¯¿¯�YðÛ„xôŠÝƒîÇ‚$LƦ†òô5Ó
Îéà!L¡û�i˜y%6¶ÒTݱvÛAAŽ«zßÐü›ðu²�#&¦b½w–ªpû3ðÈlŠˆnrëmû!;Mxf*Ðœcšë6�“I!¢{÷ŠòôèŠ"ñÌ>fïÉ}�]e´”ú}ü,AÊW­)Ã+½¨´T·Å\E&‰²WÑËú¯O/úN¶Ï‡òùÞìÚ†éèÉCuBÔCÙEZ ×�…«-…[K=ìö��ÞþÂ빩@Hw­Ð·¢o¦P/õC;ý˜Ùä“8\úü¨•á]ëJ†¬.ª•NèŽÔePì1y=šü?*g¶~¨LúžLE‘G§>íÐ¥í”Í/Þø»?m!IØÄ1½ÆC͇æÏ7¤iÏwÅkür•5ùxïW	²ú4 YËÿ)÷ G69­f¦OyëÏ
”,#&bD_ØËá‹O¶¦÷L]ŠVÀ0m#%€ôÎøb¤ùÊzêhÀý™ç£4G
·óöÞÙvÄ×”Dc[Sðãß²íš:üâ'âzͽ?8�":¹òÈq#%HPn¨™æýlZa$MƒcŽ|+}·œ�4Tu^ùã¤3¤®þØÄÕþd†�š{r©®#&b½ýÕjoµË:¡H‚rrÃbìÄÀŠ(‹) \µÎî�îLj2))WJ®º\œ)ç£ÁÂt!°ñÅh�tûó™eœŠ)1’L„‹U¤-9¼]¤2NIéL: ‰»SJÎõž9ÓßS�,â‡&\[aÜ°ˆ–øÿ½y[É‚ž¹DÌuüy�rAôqùy�žßÊŠàϪó>ÍkQ‡L”‰´{Åé[óe(¬C“4\ºúcb¼uÙ.ô+]=É(D�Ó: |=´¸­�øíŒO÷&9mäMôŸùc]÷´¾/ó#%I	ýÖdtÒ¡~*<¸ñ^Ôe|]åÁÍ­³izÄ/w˜;áÝÆt„ ¹s�b-î;ÿö]¯OïÃƺ%ÌÚ%Šq+‡'HýüúF;|qÈ·˜ŒbS�ÿ�ïËYf”K·ÚtFiÆ3´!´Ì‘È%
‰0`å}Q�QV#$-Œ0Q¨VjÙ®Jäb°Â˜CA`Š‚Å-…]#%Î(A0�22ÛHŒF);Þͦ…°�Ž4A­È¾×Øw^¶<øé.4ÃÙM]Ðm63O9ÖæÎÚõªq#&}Î>aþ¶[Ÿ>oÍ]�šUÓÍ6Ú¦¯‹ö~Ø(ß¾­Ý(x9ßût=¾=¥#6W<åýNô }¿ugÂ\:©éº¤âù‡l(\.~.G¦úIÓÁøâxÊGL½&ÂE¸°å,t|+ÉÞ¸úC�ú�ŽÎ‡<ý§Uت¶óýõVõ:d³$Â:*èW¤\x½4‹Æh‰ÍÊÙ†÷v’ï±ÈB%vGJçÅÌÊ8�gÂçãÄH¼–õù#=ð#&�9/³°jÜ&ÚßV¢º’ÉB…œ²'3èø£Esg›iV¼k··wýO”Ch;>9„eky2Ĺa¼õx#&Ä%qîßÌþVÙB¼oÆ�4š¾Á's
ô°F´Ð•E7CË�‡SNÌž}°\1çöùÆ‘×ç#$>ždô›œiÈÀõÊÕÈD+¨g�V‘¶y°<›Þ¹ú´)J%G«)÷§g|P<ª—–»ç9LSR³åš¡¡#:~„›¡S$‰²Èòè>k$?¼œÄØ÷Æ[œÄV˜“>#â8mí˜3G1–« ¹»²ûù\/#$´¿¨££�;•Hœ\¹hØý,P4½0«¥¬N’š»,¡b¤©4L‰ÜclV½1¤ÖŦéfPòuOòµïß6môøÂ?ÆK#âf¼©´ÁÝÓ͆w‹[²Šš”¼*/¼FUáÇd…iÔ&;ôy˜I#£®˜²Ò„ªJk·ð³ì|´”Ö#&Œxà¬W$XÞŽž•N¢’•Òï™_Ó™Í#&¿…áä¢%Àq8‡YC²8Aý#&Ñe!Ó¼¿Œ†âûaåü-¯5,‘	�%øý­`šÀ±nðäú¹¾¸!ŠAù	©J)oû/ôxs·Æ”»„°ŒÃ´Ô¨¿¾~·GðL��K‚!”¯èʬùÈ@ˆC¥õM™ÊæG¶qmgV Ò1Ÿ§R65ÃyïÖåeO�“ŠN Ó&�Ù&Gét¼Ñç§õ~"Ž_ë\+™B÷Ì‹JRêUQ–ñßÚÂÜ#$Œ¢,ÜJEÀ?;jü2^óOòȯk¼3m"°lÎuø²=FS"Θ-PoQ<®‘ã~éfY¸T"‰ù98�™�ÇXºìiÎC§ç¶zv=:4ÁÐs+ô„9Ó.~Ôß$ÞžÚGt¾nTª‹wŽ\ú©fFõÍé,÷Õ Ã¤Òèç¶ýœçQ#%Ôfåãâ¼i½KÒº‘“$°Ñ]–ÐUqEÈhŽ…×ÅÕ˜ªÃeT>¶Ì?5ß!¨žÍyÞ�BͪªkFÉÑÿ#%ÁVBöse10ÐlÛŒK>rЄ{rv†–iU›++…bíˆÖ\£ÍÀû
áÉ„î³+à�%”Ò\º×^´Þµ,gÓ¹ÚØå#±m_V”f¤8hñ|ÿ,%‡¬ßÎg»dGM³�7â¬(“ØÖ7³ÀVÔ ¬ÈEU˲‰GÙ׊Ö(˜‡ÑDJÔ­*š Z¥M0^!
ѨȜÉš,PGÃ&˜²onÛ¢î·DI箺¥ëÕ)YR¯yÛ“µÈ¥ÇT©E$6À?ewçã#&¬¶_Ï×Óç�&‹N}ŸÝô¿#$Ûëhòw.þ›UîiUõóæëæ;KüûøpÛHÌÁ2hà"ÿÅ�¬�å±ÛoâûF+¯Dî7.ÛoiÏÀ÷æå3eLÑw³¯£ñ³á_ðËT\Å×6.ÝŽy(OäË(*~ZÒÔØ#ÌC£[4�#%̘‚f/Mܘáaa4[Û˜©#ÆÞêˆ+Æ0¥1¤Î¬�&†N]Ç«Ý#¶Ò’24äÈ›rí.�”¨d˜ßísºÚŸêʉˀd±*‰]+!Ä|oôÁ{}¬^àÒ¸wÇ.Ü&ߊóå…I‹Ê÷"‰\í%¸é­½Åï{øam…ÒG½Wèv•Oûz#%9ꨵ$»‚Ÿ¿Æ{õK#ᘷ«&¾0´åé¿Z¨[þMÇÇ-Ü~M5Ë×8"äÀۯ툭fÅMQÓp¶-nÚÙˆÅnœº~S¶.¹­œÓ­þÚe\´+ל4&á4Sü“®”ÞÊ#%¬ž®	Í»–¸‹ö–¼é÷LЀ§…:�D“sMå}½Ü.ße'Ê…ô{·Žþ™î”øbí̽š‰’2(÷º cʃFcJðt©I:4ÀÑ&¬#%Ñé(X‹Æ‚·å¶2À¼T¾#RlÅtuý‹¨D�îSí)|¬®xÏ8çí£{®žQxÔKL�§é‘m£�ϵÎ&š+
¯íÈÁ“ô¢úÑS‡,ß&L©½W®ú|t5ge¬Y3Ããvá¤
Eƒ†ifoú�}X·T¤à›xÖé2ÎêúA�ÍoUà­ñÆÜ†Žð­Å8ätúqúŒAFçß2|/²ö"'ü‘¨Âå?Çá™—ê~N^â²ßZ£HÝ�’úùÉÃÊõÖ.±3co õ#¤ñνFËaXv8|Ks ôûÝíZÅ9zrã£ó&„L¡ã™É³Xjl‚	&š©È«	íÉav¢ìê�∭(ØfΉüɲH#‚n¼’æÍESìyŸŽÆ•úªQ–p¿-oÌ4G.‹ÞJµ	iªĪR¡HÓ73æxRúÂMCó¹#%QÂ9ÑÝÇ-sµß’T徫¡QcÑÒo,s²TS5”ÞŽgÕƒÙöi·“†‡I�M�†=@2ú„ ;ŽŽÓn6ÿW�Ž†²xm¯VŽ‘ШVãÖVñ"¨›Â"­Sõ,´Â¦ù 7¢–»«#&Þ‹p†Vß(P¥õiÿUšk§·;aK!F[c!Æ
ØLÂÃãJýÔvz~6+ªDOÛ#$xuÐ�2Š•¤PqÝ#%3‡Göð嶾}©F[GÙäž�ÕÓ…†øQ·¡(øug]mDøó’*ÿË…˜•<ž¼VxùÆ)ï_¸Ÿ‡ûñ„qÏá3lú‚úKµ)6¼`ÔÇ�ʹž|Î�Ø•B¹oã®»Û„«F2òC®ïõÏ”]vƧWÖ�¾Úié|,�N„3ôsE·B¨9žì5=ÇF#%NŸ³œ ŽYî�†5H|t¤ÔáøªÔ*?³º/­c¤}yFc¤¬Z d-Í®r´y¬ ékŠ‰ISxÀþI÷Ü`ýRöV6ßÒû–ßMd‰!eµóQ�tbX?AS×f‡°‘ÏMtÚiÑ®ªV
mNIYÚy*ÚÛ¹ûøÝ^»t,5ëTbLJdŒ±5?RiWhV(îeªQ‡G=äuØìÖ¦ðvÇí¡í²æWóósFl/r2STB{Ee{µu�è�=�ß=ܲ6ÐE>[cFS‚?³Þª‹Oƒ×dhò £¯ÔÌþXÄ©õü-ËêÝ�•#&ænf…ŸZÿ#%4Që<ßö­Ýoª¹pôCüçéæ£JŒDÌ™KCm"³”=Px2£±£ëÎmºæ¡‰¡“yº`Ä:ÈÔX¬yy/]X\ËËÍÝyéé·Þ01o ‡a°ó}ò˜a"rc?óÑÖÌFõÀu¦È©¿7¢½µ=m>ËT4BOϸ¸éDSG‰¼5ÏÓÐjÓ]%ã”:ýº=ÞO®³›£¯i±†a¿‚r�ÜÎýÞÊæ{Ó~%«[ó•¢eñºÇŽPès¸Èvå ÔýÒIù~+z<†(³lB@™™™3#$}?ôùyÿ%@ðYÖ~ßõg´.ì�^ŽÒÑf9&Z®-˜W‹ó§óFØYf/Ï8W2ârcÂ2D£É?«žÚÕíƒS¼ï@†·~*�TM
U‹wéújBûk{ªM+y	8è$™ "˜ç\f²cÑÒR^yzª½†i[ôt`•ø¢T	#&�šÎmü~™Ñ|˜·Rf›É#&²?-;qÉ.~}ÙÏæCÇ0ÛA+«p EÇ—M×æeønÂàu@]8d¶Ð\1E.!¶“�NbjŸæ•ž	_o¢Ïãyt#&ÓŠ‹hBô�æÆÍžéû§T販gô
þÉš ™†#&Й	·>
öpƒÅ½ÝúÑјm(v«©kºÖ›3Kú½·íô™T?¢nÔ­Ï7ôþ¾cð"ñ9þšš’8¯,ä­nSj§?Ûæ�9c!š;~/,ŠwÙ…ì/Ñç¹~wT—:žÚÚ‹0–*¬ªòÑž�4Ûø®ƒSnïÙýCŒo4>Ý;ºN“NÊ÷x[a/õ]Á6�y·q�íoíóÎE�k…ÒÊô_™MÕpàFš»º;k¯zƒ!0“
#$Ôl�3{OŒmfZ`6‘…]oúþ¾›gUDPQƒëwý§�ðÇö¨Ï)½{ò”ÍÿLuþÞÌêveÍ2Õ•‚æD9Þ](?×Lé‘Wû!Ë&MË�©»ŒðÂëëkñ¬…,$NFÈ846x§ð×–ó§†#&²~opmôûª´Ü¢®§é=ÕŒQs¢&ƒV’H)Nî+�¢dj‘4Óo‚šÕ>í‡-䉈`¥Çêçç‡'Mtvõw-ÞüºÑ|«9#$ì�D]³FºÖº¤¿3Ï··®CT¼ãlCl[qÓœÇô½@ BFïœRŽ¯ƒ/	Í)?oʧ=úÄJÀtìáI"¥x`ð=uÒ‡a‘ª|æ]�ìþõËBˆs…/{Ú1×ߟÔñhHyòq×Ë�´ÂÈ™¦UE!0È	fn•ö¢%Ù¡×gülò/J3{ �¾‘fš˜ÁŸ8ªc9lþ#%bÎ3ׯ…xÛ£ÛäýÏÃtÁ}šNtî3¸ªñ?BO&›cO½»§ÊcC¼Í÷»@lMm·búoÆ.È�ãg¶œÅ‘‰ðÿs탋qŒÄ!ç!
*N=œ .Õ�3þ])©ìMâ{‡�´é?)Ýê3N–]Ë<1Í=¿‡¯®çm#Tö�Ÿ#%ÍŸñ2ÕßluQ—)o^Íëk\.þzkþ_7ü¦{ÿwpcqü$ï~Hƒ+¢ì½w«ñ4L}ŸUËcANÜ”Ì4kñN†"U³¸¶fúǬvùÆ6;\…k“œ #&)ÑMýêe«#%ÔS"gÄBqßÇ_ãuzD?â¸ã¥È{*MŸæTjXgv^�i'¦ëùM�ÿ³ªZ“–Ñ;%-#&£m� ,G F|^™Š{!ëvZ[£ÌuF¤:¾á3´oïjBùàÁó˃(ݸÞ\Õwtv>nmGópx)+‡ç©Ä릃‚¢½++wp›ô+¦¬°âpl Æ–÷<{Ä]`þŽ7�éŠé2¸Û–hs×¾šËaò|µèñº,x•]ÐG™ƒ%Û Pÿ+û0x} oæœ5oô]ØäW²'{i5)£°›Î¾1öç0ì¨DMtZîû§Z!8SÍÓM¯Éé3f±3C·Aú¾#%7üË<*jêzZio«�ËINÔ˜(À÷LÎØ^øŸ{Ìx(Õùî]³Nì•œC#&Þp]M/a`¶&tGjik;PS­'è;ïk’RèGX¡]-;Ùp8Ä.ÚŒC,—AFV»¹Û-‘!¶Ö;H8È"Ù¤Ö;ã‘6ƤpQ Ìyf‹[z4ÐMt�â8×MÖºÌü.£C¿ÿzX$Ñó€¡
í¯#%ç1x•‘Ãâ^-׸ã…×v9:#%özþá�ŠKh`b«®)"FÑ!&4Ví1ƒ,&¤IuþmÓ<º²LÖèy+:$�ŒaÜc”ø¼[ŽÓ(úR}ðA7
-ªi#B`L3iœÃaê¦ÕU,]e;­³~d”͈{üW�s�s>X½𓭑˹(´Ù×]É+Çü|™ãlôËÓý˜²óò\yëÃu	WB#%	·Ë�Äcîùêù#%X9Ïy#%úZ¢æÈÕ71ÕTm¢.dï4ÕWL-ºFïœNí¢Ü‰Ï�Y–lY}'«-28·j|W�{™¼#&t/EáקÑ[T›)ˆþÜ#JabÄ#ÄJb“e¸ïŸ¯±·Ú;¦hæÓô�ïÖ]/){x�WåÌ–Ç(Úc°{'ÇS¸pγŽ1µ-8yCñ0 TŽž$ëÇÂÚ¡ÆÒæÍïÏ7Ù›^¬åƒàñ r)ÂYccNLoÙ9’ÂI88b‹‡ØïÁwœÍW–�†7Ðô%8—bu×ô>Q§óèùøU�„Ôùvä}zÎð–3<ã«7!#ˆÇ.�ͺ{ºùÀqæЪ¸¬°{©k15D7­HØPÆUéœf™#mâ�T”TÓæߦ:ÃóŠž}¨®4/·û`—µ³Ã²`û‡Îf­ #%~zø™ÊH°É´µ_]Ó@,Y’Yò(#39êv‰:ŸË‹5ô}·8w󢵊ü>r{K~ÈÂX‘ÓýÐaDüÓΪZWq/$Z‹ßw·–ô¼za�Ó]Ú¼îFbH°î݇-ÍEŠ¼Y…é"¼Œ<g혯ÃÜèÿK¥ç�»§)¬”Ã�ÎÂ( Õ…"²ÊÄq1´HÃמì3¤+5E´¨¢âH)Ê•¹Be蔣 3"¿W—�ðkŒg½·±ÂXdU¡Ë‚wH8Ž!ŒzÆ•‹EÂ{S'ü£‹-ÌÇ�E“¥ùÁŒ¹“ô[�غ#¢Ã„7ªhŒ?´’Å‹½k“Öa(p*ë‹æ'«gƒ†á|sT_Ég2#¦”\DÚI´F‡[«X7Ô™…]PSº�ÚŠs1#&ŒÕ¢(�ç‚ßnp™¡C*d&0aÝ!cÓ1biÐöŽóëáf%‹ˆtÉ�vâN}bÿ/�ôÑ´_>’[BDŒìõ#&7ݧYY2¢�	VìÎÕàŸá=*™ê¯cW7ߥøo
™#5Ç�å�`åÞý¦’5Ð.'s£çsDGµ§ýÿÏW�(1®YÁé0i{¶ñ˜á4ˆ‡:,YaßïBciª
ÄC=�&s›(µXÆB¢’®¨Ýš3x	̇Su)]w‹x·Î×6•êî•ôJ€Ú{HH[–­I`K	ÎUòÖWŠ²éBµ�A~¯-ë=žsÍ�êÖ÷×�ïp)Õ’PÁTFÆP�Â,•õ6Þ#$5E2ƳSUè™*+"qŒƒ¬LCÅà±1º¤.j÷[³xÚöO~¼m)kÖ0ÔVñ�¯F¶»•´ÆÀ‰#%9åa+÷ê”b©Ý¬Ë±J×*Åk]6ÏU¥o$S;¡GZ®«¦"/‚(¼w¯×>!EXQ¶Ú‚/‹Å€�;—æÆï#%¦N<¦š¿fUQ·­�·m¡TIÐð4¥#%¤#ã·ÇýÎ#&+núŠe]�AÕ"ߊ“¾ŸO§>{²Wè3�î6Ý(E�7dܧãî�â„óÙ>•Åc#$%`±Â‰0…23ráM^uÕà�æ½M{7°ß<‡…ýÙêɺÌV�TJ]ÓzJ–˜¨`²–„}T:m�'=rY)iÜKðÛ8¢îJÖuœ¥ÇrدÐæ¤�ýÿàvÄßËOsãÑ*ûŸUÎr¸›ùáž;Ç'í&>®s²÷=î°â<b^£DáB´ì:Ù<–ªY�#qæÐ$ÌZñ§ŒÉü -3G;Çîñx꣌65Ø¡Üô4Eü†5~gSY'ÆI ç’¯£¥ÁvK‰q@šÊ¸kPÌÙý:|œC–Ìgª$6ý$’¯F"°o±êgF#ŸãªoqåëƉ°þAWËb+¯^w‰8uF0øX¹s¢PÁ–Ÿ´÷Ÿê�³Û•j-%]Â~â!A訸�Ôä0Ù¢Õ$[ÑúÑI#¦¤�ü‘¦E½ÔyÐ7'àücO•éB§üþ;;‹d`6še%oŒ™d#&Òèe¯5KMu†`l ·%j؇¶´™Œ16AÀhd!lz"#%ãKQ]lz›Õ#&ê}]ÛIkҮ按R´Ú-5Qm½Â&Òmd�€ÚZŒÛ¡ùI¢- dE€3dH�#%«–”ÂA¤ÚÐКœƒ?;£ÆœÄ°ÉJI|MW’ýö÷˜éHt2}¨³ô9šŸf»+®Ü�BLU¤œ“\ŽjÜÆU@h—o­v€<ÐW’lÚ2•IùQ±Ì3ˆ‰ÓõQ�
קðÐç|¹#�m|3uºª�«ÌôÎÚL‡·¿A§ý¿8^bõ/†„ÙËLš–ÈTêÓAL4€ô4XñRõF«�cîçÎ8´p@›ÌíP/¼¨ëýG#%Ë�‡ ê$�çµÒOˆñ”¶z¬wW¤.®²pÿçC|òåRdOΪ+3c%¬�G8r¥Úï³é#&"E¶¼(PYF×S>ÖJXw–Ës¢÷Œ~´dŒoÖ}Ùõï�†rï1†VtëÒ镦_žb\ú<Ng7]KC�Õï«£+’d5à˜,1"I‚6½sm—X¬H�Œ‰?ÜœˆŸ:Aû×0òÞæNwI~ò×jˆ4‘Ã"£},�lv=õÍ•dˆÁ$‰púñŸªÆ�nƒü@�ü¸:(oºµ«^lð±ÓyR’h¡Ý®qª�žcê¼õãîy�!÷w›ŠMºrp!óª3mË“*ÒDb‹2ˆFê¨bõiß2ÃO¤5ÐÂ>Z…†UTq'—^»HŸMöäÓå“êsgÔÚ�šºW‡=¹Åã鯑¶1·ÿÁ68t£SMûcðþžÛý‡>#$£ÅŠ²'²ùEŠ"ÖœaÆ.5ó€ú!Ö½±·CÉ%|uònnmŽ©¢²Ð†9+ètv«Ê#%€—t†#%ˆ“j0mͶ¹´F×5ÈÖ�nmnšÓ4æz-ׯUÒDz®î|»Ëʉ…]¾½êõ-†K^*N#%tÇU…¸dÈ+¤”“¥òTx¦©
BgF]@áÖu·H*8z�‡ÏA‡_Ëy0ŽSói¡¹kWÂ|x”~H›·CÓéœ7{¥½óªŸ'I[SÖ_¹Ô31s9λì*±œjͤ«Q÷þm­ú7RrÒ¨÷hë¼î#&Vž8Âþ	�v÷n¤`ÞÊO®¾ˆK𔘇§öúyhùôš+ÒA×uDWæìéïYí²Uʺ�x×½ç;%4Ñ᛾>+*e/󼤥ì«ræ/+ûü~#„ùØ)#îNrhŠëÛ–ù=õ#hV#ÒÇ“½@xßø±„‹í·”c„\V¢2÷à\šLOÍG?“Õ#%}/ú…fÏiEÞN-7ÓäË|9lôK±·ŒÛ«Õĉ™3ü+ˆmHÓˆbÔ‘”åßU%V|Ç)tysº«>zÚD”ŸÌugÙÛ·r_Z¿§‘ÓÞâlCÃ-‡U”U;¥Âî’Ñ¿añ`>éPnß¿ñ½§ñÊGå<ç·å>n¾Kü<?=þ/ÅòÉ´fhìÍ|~¨ì:~<#¾’³µxƒóØÎîB›¨$£(´Ê|–’ŽƒÎxÜwÇBíÊÊLò„±?…¹W^&‹9þof­ÎDìpN·J¯V`¾7O§Z,º™«¸dj!(ÜsA¶Gª¶‹ŽuÒö¯ü[í·íŒ~UõýÞO£U¼öÙý}…˜R;K-Pp}@‚fwLÎÖ1ªŒ¦?]{ÕnhÚ¨£ÓJ”�åÞ#&·¡š¤d]9&0•B˜å€ã'OßgÖ\ìçÿ�ˆÂ-ö_OÓïßß&šJÿ‡áù>Ý÷õŒS�N,û±w´õzÌ%Aä|Å÷sÝ󷟇Ë_¤³älw'¹ŸCþTð3r(¤TAuˆÏiÛgàëpŠe©,œ®fbC6T±•'åq˜šKJ�¯àöçmÖÆŠ¯¯�׉†tÍ��ùSB·î>k!»¬¸²[?¦æUÜô›L6ím–US	-¦˜X3ùòÓ3Ï«ÍîÇŒDbˆ�ÕwPd¶à¨¤_S†‚3²ðó?’ï„Ïríg‹�#Žã…ªÙ?Zo,‹(DdDSê¹÷¿êì}Ôi<3hèÿ]Y¦“ !>KM-ûíÍ{_Å]«1¯HÚ-ˆ‰‡ëm‡©ô•8¡ª
ýÍ#I“|µÍõ+_´½7¦Ý-zš("â„‚º±TA0A&HJJQ�Ÿÿ‹ûqû™VªÅS&x‹k4†ˆJ`§ˆá—R [æivQ�ãþò ÙËX*è%þˆ�¾CòâŽ0þ_²-…b¡«“Y}ñ–¿ÔÉOçjËƨþÖ—aÛv^Ì80ÚY@Öl�üN܃¢Æ£>óÒÏÁ”˜0žÿ�ⱪ~/½ê�~óJ†( ‚ ÑÎõˆiYvqj}o>p)5î¡#&
 x#E$‡“]–lù£ñaQæ8Éó׊ç»õåzø#âI@ÿÔ"ÃúY:œ*¦+Q#&E‚(pbŒaw…Š³J¼QÝÒñüá»zuÉiô¡ŒJ£¿è¶tw¢�QéºAqoÒ·/ß\5úÝ'Ï×Ê_»ÒûꪓA"yµ?È”È(~bH:íÏæ±I'{`:Pø˜ùZ,ýß==3óï1~Í?Ûæ‡ïŸ²­ÂænªãÏ.xøBßRub?§É«áM³??¿ê¿«À“s/Ö¿Õ—~™ÆŸ¦Š×Þ§Ñóòx˜ÂÝO£ìv—Í�ç謎VøUg?y­6wYšM]ÿ¾ˆ‡J°ÜjcÇYÐú#ëxnÃ'²Û¬¢9P]"ªQOÍw›d4ueU®—‘TqÕ}·…é%8Ú“{Ê´Ù÷[3óÇŠâµÁê¿ûååñ£…ø[³S”ÇIÔ~˜j˜«·ŒZ¼µÂ<{¨®Í”j,JôœbS¢n¸í7tü©!üEÌiƒt=õWK5÷ÚÆ•>*4Ãé¸aÃA¸#%B^ó0¤°7`dŠ†šjr“�ýUÕF˜BÚ#ñô][*,‡w[éá–¯<…'6ò®#%–�M<»ÑbÈMÇ^/"³Q~”FføwGŸšŠ½¯ÔíüUÈÖ›ë;ÏAô;�=°R«LNTP†ýÍÕ]5‹?‰Ád‰„ªc‡Ñžÿìïßùkì7Û”ä×ÞÑF/�¯áÛQ{¤Æ6æG?½Ç¿@h#&N¬Üm€¦×Cu#%n…Î%±‡fN8¿×à™³TØÇúO›#&ÿ'”{SŠ­È_³\bמFS�ë1–F—ú�áú6aS?’�ÝEgA¶É|k³q©4|�~žOSMdv/Çã,é$ȱí¾#C¿Š™a¤Us¸LBL„R!À³\ ^.1üôú Jï•q0—ácµÊ´hñC$U	죘Då!$v@­@_3¹ñTn#&½Çé¡©­ê<¢ ‚ú”¹#&ön$z|Ó™9÷¡F¡#MtàÁ|‘øÑ:JkõwÖ4m›a
…@Ä©©«G«zû�>šÖ^ÞZ‡OØÒ–.u¬—…»¬x†+�þ½—`‡n‘Ý%-"e†MëÓŸ£z3ýgôoGÓõø+Òº z],YKçv¥æj:»�·j6²IôrÔÄFü­£#Gb¢2Ó£WÛpß©™‘Ÿâ‡Z‹1jaÌ÷¹È%ÿ§ÃÐ8íR’(U%5æÛX‹#&mˆ´DH-øÏ&1q#%$ƒm*4º+âq£A±§Îi3ÛG!v ?gaQ?*zWÑ«g�ç—“¿ù÷Ëž¯‹Ñƒ}ÿîA÷�Ûʾ­+½¾Kkùu7»÷[ñê÷×úC]ôžüí…ÕÞm™£ÓTâQ¯<1“ú…3»_ÞóõíÕ¦ÝF›#M׶ž­ŸŽŒª6ßÃñBåE©ùä?›#%ü9gT#&ï9KøIRO>‡½nüýÞþšч…:µX·Ì‚[2á±ÈKëŒq^Ÿó‡\ÎF_IÄ£èá_ßÇw–>ÎCýZ®ßù‰wþž¾ߧ¿ÙÄŽÝúÃ^oÓòQG›u=~®F“¥cäÚZ�ïn“Õ£N³å«¾Æ]|›âþŸV»ïöXQðj™»ky#&ªæ_‹ìÙèäúõ[ÓºþŠ¥AeøÁãÝ©Û^^®¯ëáæ¨îqe¶­#%îvöÕ;Î%‡`äøøq5ûwõnÇÈN|´jê§FÚuW&‡–¹ð•p¡é¦Ó»ª˜¿£‡u‡›v#%õ¢øeIžÚ¥¶šùjÔ³�6JãCÑÕ$r�¢Vµì®]ûÚ%Ÿ¤÷Àú{¯òÛ�¡SNÎßà*6Ge#•Gréý”_wÂÃ:-³�eôA¹y¬ï†NeNýúßEuz çä˨çüž®ŸMÝM†f�§&¢xt¬…”MÊQ“Ê—áßñkÛO_Ÿ²î¾z¡iÏ·âÓ¥+5Ò‰|ŸÎ{5û¹üõ•CŒ0דËÔä9s9¢4üWråË£*k8óYóaÍﾩËl+L¢GÛÔZhØ�Mq�bðçvPÙþØÞ°ãnÈÀçN¥T§íÛ¡¬�ÔdÿÓ#oÚ6ƒÓì=¼ý¿¥Uó{¼‡ËóZ“ÝMѽ{©Ôc2ó§dìùgzð:Þ$öQDyCõF¯Â­x[«Mñ£:þ½‹ÒK9É6%Þ|wÎq qc_]uTöÕvx�Æ­(øxRÈ3¢¯'Û¿ôÜpÑ•;øǾøûŽ²ýúí_o?÷ªiÅÛ§ø¹š=)®¥º²ò>ß—Û§ºFçû~�éòaš¯Ëf�JE³œWõqì§V‡Ùï¶tчλ¾*¸L°Õ�üeGôøñs‘•Uü½_õ¬L×O›ñÊòÝž?鎿ß(|Û¡óXþþ¾¾3¦ˆ˜Ç¯÷üV‹Áu¤½ôÃcŸìì¾’¼™7<b[‘F�&øûŽ„x|whòc»áñ{¥—]éÓØ´ñÓæ7ÿ·ùG‡Ñäûþ™—ì\:7Jå‡^¢Šá«É짯ÀçÛ¸š ×bA¼_?›Ë÷nçüµ?‚L{S³@]‘DÂB#%¡±ŒY-=ÿl�>çî÷h;ê‡û‘r¾ßäªþ‘¡œ\xèÈ=† ¬þá8þR4øü_&¤~9M4ÒÈ°kP[ S#QŽ�Äcô~>´yûù3~ÿªú¼#&{5ýž®Xr?ÇÝògöS··AŸyêòCqõHßØeÝujŽÕ�a¶ƒ9U}/kç³^Ý[>¯¿Ìµ!÷s³éooˆÞ)�¬]¾ÿ-�Ç—Ëñøñý½®y:�‡ë�KŸ!úγÀñ6”co’]§îõÈû<ÛT3þ5íÓÌSGÞZÕaOí¡‚-ü?~†‡ Äú?W¿ÙÖÚòýtè³GÙO<[6ã³]¼)o•©iêö7õ»ÉÜ_ºüûçÂ~_©¸/FÝ!Ùöj=>"ç)uBâ|ƒê�ì�¼×é~þƒ�|bôµmÛßÆÏÉôÌsè^øUÛD›´Gð¬ß	¶œ/qþ¡…0Oõ×ÕßÏc‡Ûµz6ù©ââ׈軽f?ÁºNŒ¿¤�x[ß�yĹ-¿G3P¼W›ùÖºuWðPOù!Ê:ÅëÿÁôôGõUÆÊ’¥þ…äªêéeò£Ëý?nTÔ£‰çë�~§ÇNªŒ/ú¶#&ž=v×:ÏT«cè«-¦úµT-W¼NìtÀj¡ºvCãq˯Û×Vœš—©°Pٮͩ4+9…d²- ƒR/SUJØžŠžIíÔº±åªuWF7%òk£ŸáΨ¢Zt껯+ycG r�ÇjtÚãfüqJr„íå÷ÂT7Y“sB#&uÿ.1ã<Qy¢¹$“�°“e¼NÜÝEÃI/àÛ¿GžªÊ´ïöŒ³º>ÝŸžÿ.îº(ïzĨ֚)Õ¢,Ji?t·JªZ³8œêˆEþ¡„aNYsôð¾N¡çÈ:)¾1Öf"rT³¾MfVÌØÅf²\#áÙùÎs84ôóÎ�½ÝBËÄcÎMf'úñŒjÏÞQ#%{)›á,cF8¾
§¤L†õžÁÆ%B'IÔ·¶%¢ÝJNCb(L>Þœ;ø{—û“nìË‹Yl綌0«D&fH|'™^f�<Ó¯e‹íÃEvÑëÛáWËgß-{,.¯ùlI“B#&¨p	iÏdÂRèZÇ",z‘}2*†�ó I–º*…mµ•»Ø#¼ùÿ~ë„'¦Ÿ®ø|#%øë:zê°©êç|R3ítÓ¢�9²þÙ×i�{«›#$~qÛõF¨U¹Ä@æ”Da4áæ¢û¥õlx  Ë6s^°·fEǶ½7`u[v‹¿ÊxÑ×DWÖÿžšôv¥W¶ïÛÂ_/ËMŠG2ëÚ•p„´bñ…W@�ó{x3JŒû>Ó§ÙðÏÉ»Øs´tÞ^f#Ä5¯Ùì¢ zVè÷ç°}ÑUÉÝ~ßo2ÂDè‰Óo+»½Tl‹rÕÙ9QñàËËú¦„SqÛÆÛUÔ“ü˜à4<ÿª^ÌoŸ‡«øçë¨Ñ¿Úl5KÈ�g>ɶ³«Ð’L·Iù}Ô•‰¨'Ñ‘‚<‘õßÑy/ÞQ"#%U8½žŠ¾ª¾dTË»u°Ôº#&ð—NU¹ÿÑõDÛv=nßK�N‡o11‹Ã¡jÕ-[õVÅ–�¤ƒMÆ°Ÿ£X*Á³PašX#iaHƒ†…¢¥#$`ã@Vˆlq�ãÓÁĪ£J7Šˆ¶¡´¤lÔ‰Ø�ÆLåé­µ¶µ¸�Á¥\«)j˜µV“a¦I£a[M&“~˜ÎtÞ1.’$c±Œq“ÓÙº;ꢑd8F–ÉõÕFnqML
ÀÍBFßdZÆ©Å“i×Z>]§ƒ5™#%ÈÎDîçýn£^A£Jc$™ùÅ]?i¸³Áù³hkQ™g„Ô‡ƒÄgE„óŒ$#Ó5Ô#0Š8Òfˆ`ÏÝëòëï^»är£«á©z±0Ã#$�‹ÄE”‡	aÝ’BYPªln\âÏ^I‘2(”1Äh¨ÛRDšŠM;S ò(줬ä;·ø¡ÆZœŠatqû#%#%òóßôá^^4ß³�ÈSøKåŸbà}$Ë»#&îΆ¡â\i«RÓ¦%“£?ššùöפÚ#Ÿ÷Ùí«=›ýÞÞüÏAë^<¿GßêÑ÷a_7-›;>ò1^-Ùú³”tâÐ/Î\k³é¹h”å#ãðrËO%ÑÂ9]^>úfOøCì>ÊH•&í‰w[yÚMBHVsÇØ£é0kO¬óö{¿Oèï§Û«_¯±3\ÈBèOô¼¢#%¥Xïwãáºå¯ëè+Ëæ�¼xtötáG®Ú³÷ÂÈÿY4¤ò”¡¼jŒ- \@óøß/çÛ埚�ÉêýÚi\|f‰Ç»ú>G›ç¯z:d¿Ÿáù¨®>ºº}Ðêþwt÷tUÝwÎÍمߺ¯Ñ«×Q0¤ô•N}¥Äqõpfç<ÿ3�5;AB§Ä7ì*ýÛÞfœ+?Ãg¤60ÿ� ÑÔC#&ÃÓ#,1 ….•.1%�Ô1©1Ó(.ù+I'$
¡¦�¦‘ƒÆQ¢H°„@Óf!¸ƒ2`F(F¢`4Ä—­ÚñW)›R¤Ù•Û¾�-ê°ÊÁ ]1+¨bðÔ™µFc*ª#$ÄÀ|.ÖÙL%0S„„%—,B—X°dRƒcbC�*VM07q`Ø𬵥<·‚ÐŒç�Êö¤ÞàQÎ÷ “#&8²X€¶Ê#$An�´Å!"ãlN…iÑÅv“yÚœjŒ£f‚¤â‰àÁJÃc‚`¨D, M¤]H1¥˜(&‘A‰¦ÆÄ›I6‘‹½+çQl—M�d@I¥Ù�cW#&ÔâФ]T¡¤IŦ°¥Ê"”¶â–&Â@…¡Ã|è\e K¤@aD¨ÁQ¦P–$°²7ZÚÂܺ®†’DÊ: ª*r¤6ë3ƒÿËHž"GÕ�J&üè£ÒdæÒ¨Òf¢¢­jÊ죨¥9ÁaŽ´`-ˆvVJ¸@:2OP�±:>Ua‡‘‚ªe¥Øx‡å«˜JÌ„’æ;39Žçõ}ßÛøØ¿ÅVËfçT~FÑcs®]V£½’é¶H÷Žw<c{m;(4YŸo“U}]ô|­â¤jßô¬~ÿ+:ŸwhóÓMü|»|­mú>ƒí‰³†w,ñÊËmÊ�cYÆùZë­U	@–qË[C†û5ãg×o³òó›gw≷V,Ý’‹Cu#%Sw›[¤™sMü Ú–ôÎ�A¼!ãL{æ<ç9ÆD¡#]7õj£Œ¹ë]b‡>.sˆ™qVÉЦÓ*£é³³ÑQÛ^ÞºñÅ‘ñiÀè·M'ܼ•¼‰wo†½ð^CWð'¿2"÷ýÝÛ)V,:02•ž.æ4žOæ0—l»¹‡OM-#&Bæp_Ý(�Ó㆚¦HØ–?˜�.É�.DžèEAó_ž^˜Ù‚Ñ¿Ÿ3Cáõ<³ßÍ­¶ó$˜\žŸ…?>sø$ÿ˜½Eò	´#I|�l:§ÅÔ±eø}>Ëž½¯ª=T6O#&!¼”5>§'ÑÎôtYQ«òË„+TÒ+ ýħ1«­å‘¿#%.ݵÖsôT’‡¡p7¹A„…2ˆÀµ`ŒÑ…Ù�)'ià½*—„”]ŠÌØpv€ßøïÓg‘›ü%uòç[èé1ò­GÓàYãÁRÍs�Ç0'S³1tÌÐ[Ñ@\
b�Ï…û¨žÎörÐ!Gù³û¥ºð£Ô�Xœv?2²ÂHyv;µ¾êüR3ß²¶ôãî½éñ¤ˆS¸º{=�¶ÝVè3ðm/VbBB~j8U(¹ãªœ"g¯^�†í³fª‰àÄÛ—<•nþhÉ$·š¬ºæ°5îZÙ᧟R„¶=[V2j°W3P}T9;4îÃu#&d"Q,#À„å ©Û˜•���›0ú¾§‚n^*þ2|+»']üîñ‹Î˜o.1’ÄjDX†¢_ò­€OëÍcÙ¤laF‡ì„A¦ BïËG£Ý«ìG«EŸGqøüïEW=:}¿Oùóû´4<ßȪE‚"y˜—€õ¡œIE¢ÄöÑðEäþ%ˆŒ¢Riƒ#$Ðàãmš¶™FŠÑLŸ^…ÈÊopEnâÃ,`AŠ	=HcÇ,q{è†8V‘Šã†<Hä•Ü´*0hdE¨°#&¾§¡êE7)âlEhi„rDõzp[Ðj¼Ž+Xî (ñ‹;æYˆšHñ Ì#Æ«)C�!³ѯ&Œ¨•¤FŠ»–	–i+Źɲ#&¬
�Ÿ#$ÌÈè/ 姭ãTUl�ï³+:Š8£*+
Ä2�X� Á±@xV˜,°�Då•,z“µ)´hðUÙˆã¨n‡	�±:']p¬i‰²麱#�ÉÛÀg4Õ!Šºÿ þçüÜ0ØyuÍ'}]é)½Ú6ØÚm†œÐÈÛP�mú9‘L±*á�xZ·cÔÍG_��³]–ø0�#mNœTVu�jqb?—?¯øk�†·Ãøþaãæ‡�§JµÄ—CªÚ“ƒt˜ÂÞþŽ�ù]{éÁv™BÓò6(º#&ˆÌÿÇß¼:	§Äö¿UÝñìÓ_×[zlæ4.ú³ÝîKÜŽNë}y#%ÞÉwö�~Ü™'äòäæbU»
m¤Tÿ|6UÇG{¬1éÖgé#%~,\Hô¢êãÓ†‚JZDÀ±:™±ÔˆàÓ�$dH‘µF¡¬ÁߥŽ·¤§QPlíšÃïï�%=~.s;ØÒÚÚe;fž#ËÊà1¼T©F4Ö—$BÕ­7¥¢Œ ±à& ÷cÓ´0uyKUV¸5bÊ忇«uÖŽwÎÊq�¼äË»dÓDAFOöógæßýçñ¡~®|i§ã�Ñã×EGÕ�qéï£^?kxxšò=?ÓÆ®=v@DäÄs¸t�ç�>×…&”%Dš	-(�ÍŽƒLuÚ~&zºÌz™|UÍE/NW&Ÿ¹<ß50�!²kC#pdÎd(ÉÑ#KrŒkI¸â!+Š¯ÒHX°Pm•Ê‹XäiÄRòrAcxâVDi5�ùÌìÔ8�£‚�``ËÈ“0,”Ê�¶#%Ö¤qßo€43¿Z4šÌ•ša¢Ç­*°|·£èiW2·Ä±	–rÉÒ©Á!Ä7#&e¸,~3›ÀåpH8±#&!˜(îècv‡M9	8¨QN¯f–�j�Æ«Ó}�´ô›††Ëâv,AÊqi¢E"È(¡v-Û,‘�ÒBA=JþÙ½gö^]ìjþJ]²œú(ÆœÃ\¤C×ý™êbr�a‰l$¡Yà"S«Æ®,Õllf*Sth¥3¦*#�a“I4#[„`‰%"IÃÄ[f.Îÿ1·…ãT*ÌŸÛÅ¿TwÉœ¡Çg¤v‰ˆ^eæÔ!Pz1X:XžâÐím¦øW=C¶÷uú4„‰3üXцôw-4°�!§HµILl%<(,XL!H-µt�αf)ÈAFQÃP¿Ž¥më¥�¼šp„�17Â755¦Ér6iR­æ•ƒL�²5YiU*°!Œ�cª6éɳƒØ–ÒŦ3NBuòY©×Åßůx�ű©~ö6cš@Þç)¬{±ôÅÒSHæ`ØM ²*•H&SmdÓ×A¿^0¢„kþ åR‚ƒIˆ¹$_,ï”
�ànm’ùQü›ÎòS4ˆf(FƒiÃ’ÜÂßIÝÒòºÇá§Ç5Ž#%0ˆæ%ÐhÖlæþšY~Ø4ß¸	’Q¬)\ëwé@뚆¾~­,Ó‹^‘-™6£´í†}Ì]ƒ‰‘#&�Íœ�ìäØBfl¡�;Ý/§+Úù|ç|×€|`�„“ayñâÔºœxœyV©e/U\ɳª휸ؙ̤)ùøÝ‚žl7,.N<	#ZιÛõG6C¾àŽƒq„¢â§8¶Mݵ®õÑDA(3±¯‚!BîŠ'UQßz˜;VõÅ�]SÀ$VŽ&%’Æ#c˜ÁÎÌ�+mÕ�ð‚ùͬVBh¦ºÁͶ؀ñÆ+%Ë�øOY¬Û8MÁ×5K‚°Ô£Ä¢†¾¬`CHj—N›q:ƈ,œ#%%²©pV0)·o9Çg$Ë‹“$­OX‹›e…JMΊNìäÍ&##$Ÿˆ‘ëS½x¼è²©exâbTŠÛëßè¹­k„Áè ž„Ôó?šËŒøóû§škÞÐoWß™]äç0÷ä/µá[)ˆðú¬O{oY�¦‡>7,Nø³8¤c#á®ÓãF#—*Zëá†ï¬YÜãè}#&	|ì‘Î.±›×GÿA7Øåb5Þ#/±àŽÐáÌ•8#£oIOÞ13˜¸NÏë0òJ»‚6#&Õ[ñp¢ÞbmÊX³̳¼ñ†Ê‹~Ú�g!ß$ÍV{,ÚÆ{do°çq§£•y¤¿~½fS˜n‘ìÄ¢QÓ†«/ª˜w2ô£ËR™�	$B?�Y¢šÎ�¬ê»'I_<êM2a2�¯ˆä‡%2ï×ýw}¿Œ<_yšfµ”�»àIûnÃ�ø¸˜©èsÙg_¨‰€Ä=¯bé“hŸ„>dGXÜ´ßËc‹3ÞR–‰ÌDrgGm^phzgšF?Úx“¥·Ý†µ§sÕðŒãaô§O‹YêÃ¥ž(gT=sŒxŽ^n‰u2Kdehù>Y�<Ó»\„yÁ[)^¡W½íáÚqÏé«á×3jTê%v“äôÒ<Ñ(:¿´\‚cvÒÆ’b÷ó1¶<ÕUª×ÓÍau~{jŒì�>îˆ&ƒL�sv.îlæÔc­
Z´�²N˜}o)gÅ©U�$Ý4Ž�µÈ„á||ºóWÞ†Å=pˆ¶ÏP~�V�‘xïÏ~VøKCb„iáo¨dDÌ{ª'¥š•‹‘„aË‚�\ò�CW‚gkc’®p„yq¦ÛlŸûöÿ?<Q¿£²‹meÎâg`¤~ñÕ'�´ ÌNç½Ä9Ö-ãõ›îŠ¨Àá‰ö&$;cq’—êþÿŸ©«ü<é­±/ýȘ«Sz=„~Ò5~¥gȨ¸dÝ#%“8>²[
¢8‹0š˜”xsH·Ç‹#%\êʲ-OcšãAw8<[Ù÷ôÓ9”û£c0Ñw´lP—ÓîíP¢Þß!§Ë:î� ôûvBRÎÅüËÉÆ<uC	бóÈ”e#&«=YOдA®¾â¸C*ë |[‰Á«=W#$�xù(j#7EÀ›S³T#&=˜9a³ºå…Ìp24�¿Ûú¾Û7ýšÐÅ•¼Æj‚¼»|ž%×XÉ%¡9s;¡Ø�#%Z(´†q1O’Ÿß…÷†­¥ššè8á± 7—„äMÛ@äÜÔ#%6ñÜÆ¢šE®tÓeì™YäiTs:gIÂåjkHD�_.ˆÆüZœ°9úzaÙzV9@¨¨�nWŸ¿çR1kCWR«"/”Ëk.Ç#&c˜¡çZÛ™6‰ë#EÉoÉŽ²5)kÉâAÝâÁÅÜ÷h’#&÷`9¼»	ÂóÂ$ˆHsG"j‰ª­*º/Œñ©œ?»Ë•tÖœŒ##%vÿ§qÅUTÛС¸Øù|­‚€‘kÉØ/·2¤`ÚòåÙ/¾3”ýšò&³j¥nï¶K†r9©	Ax‚U�蛣r7õ°o�²cm1D;'|á/­Üˆ2&ÁleÁØ‘I
6ÙB€¤n7ÿ#ê#%Ç­W]„ç5)šùYÜ)©KŒÌ“‘®û7£§¢Q’~§Ë»7…Sžþ”U÷Ö…JSpˆÑs	î˜à_�hÊuÅÃI”Bâ,Ïþ_õÕÊW…'�c›cˆJ.úÊ(oÔËÝ
oDs·ÒŠ/ÚxT“Ç•™[­Ç¤MñþÚ(�¡dzS`׫ÐÒýjÉîÞënìA³á$n:Lö-Kø#&dý…òûó¤h½uÝC؆±˜­Eá;xfS%¦Ãzi›nË¡æŠ$è/@ŒGÓ«ã§KãØĤžü•ì‚ÎG£Ä……ÏxpHt’"/MçË·<ð4o<4�Üðç]´4|œÎÅÖÇÂê×j÷‹¬qZ_ßoüþ“5&œ†l“èÙ•è¨Ó"OóO\”!4b8“ Ý§Gô²wc<%½ÝŸc'ëŠê|?"_ª]tFžt¶^±ºJ¡Õ#&ç0Xˆ!“Ú=�tˆä`C	S‘:jbV|+7‡øtÀ¦­×´,È�aÇgGOqú©¾¤ò üW!Ží�‡5êÝ4F&]Ú½2öؼÃ$3’eï4ÝFZÖúÙIª&˜t:v:kŒ¬V[_	¶îo¼¾ÂõM…Ï2!CMw¾­»bÿÞFW‘U¦É_f—’¬¬äyi^+H©i@“Å@Ý–ãã•â ^Ÿ< jD˜ZU¦!)…½uÔz1Ÿ7Nªw@…ÍäG’xôœ8òÓ*KÌOVÞ"rÒ‹õÝF¢Ê¦ŠV.[1×NÚšñ=`ñ—ÛÍÌ	“±ŽQÃNJoêî O‡‡6KµRÓC˜8Úðh�¾ROÕ|Ñ�üŽ;såÙ†2#&xHVú$$Öts)�:Qƒ#%·{ñ­Æe!tiëÏZJW¯ïa:„ëp~Çæ^xa²-¢H¦#%“´T¨)*c¦R[Y¦vòo¸)ïÑ0sÇìñ{ÐZÂ|Ëܪº©=b¡Êý‘÷æ¹Ã`iBòiJ"v?%�ÏÇË3½Á”ßs;3ÅÑÇ\-–¹(OI�Ö4ÊgSEb‰£4;·TÂG�ÜvÄTˆf½šbN Åñ?1ì^[1óí£ÝÚÊíÐ1nÿJÇ29Ζýys+!þwÖ®íÝå¢7—CžBúU1 Àƒ�8ðtý’Œ”·¸ñꦱìC¡^"3ñÙíï�QîÈ�cW-&ø¸ªd¼úrßoµë•ˆÖÉRn¾ön-ïqÓsÙ0ݦ{Î,ÃæaN&žJHÚç—‹(l;`‡ûXæ´?Áe7gp®\[Êb;ûš(åYcós#&1Î'\mv\Cncò€ºp[=àßwvãqáÌÿ7ó_”÷õÉõãžzoÃXŽ¼>²@šDW‡H—�yB§è¢ÄO^w̉<va€™™¬#$Å"c5BÍ6´ãË_‰ñ�ª]ùŸ%ÅÝá�‰n4ÆV¦¬ê—”K<{*•½ö£zC¿‹¶3•m]Húè|X†Úè«MNðÝû3-h|éºIƒÊôÒŽØä?¦X”GCAÛøè²z¶h*×:…xŸ:´(É�ïÍ9&î6ý¯ÊËÛ¸‹.H8—MXÉæñ¸Êx§/ÛÒô{·Í‰jÖ=¶[mðɶš”"’ד~H³tðqu�Fw ÃIvÉFÛ´²©—E;EÇ/|L9ïl¡©š0�mX!¼–•#†·…ö€ù1þùLA·:¸ç¯¤é¼Gãס"n´dq¹¥,ªíE@ëNŒ�qñEcŠ×ÇæéÝ;§ómƒ8ÞÛBõs›:Æ8$=¥#$jH˜P9Æ®IÀ±Â&où¨˜ÏŸç™~zæ³…#$þÉñ—RÇcƒË>RëKh–Z8²Q1ë³q�J˽1çU8ËôT`ðR9‚)ÄþPóðß=04›M¼êØÉhø™Æx÷gn&)½Ë7œËŽ™q(¸VUqF!=Cá¢Äm�›$ÑÍ´ï"D�d>Ns¨ÂXÀ¹WËâNݺ%®î*Ì3½4F�¤©ó5Ê¡´/³s:òVÐç¤o´Ô�ŸÒ](ëÍÁOÏžrÖl2~Cão3MîQPü÷Æ5daDâ+¬#uLË)kµÌaöæZ“ûË?é?²¸ƒã£©G>'$KrÍj*X½¼e£Vª,Ú¾šÈ:ÄmàNÞPÅÐò>¤µ>Ï:Å�¬¿<#wNG¦�nBùÅR%â3ñ1Õ|ÓçŽMë(Ø#&,¬�2ÇÌÌ7)�À^®åÄYììÊ>'|GN¸4Žµa¸gkݯ«|#%„iõ4Rs·MM¯Í˜¯Vúìvú®²kýg.#&U9“ú”¦‘2E;çõÆ*ë¿õýY±Ø¨¯Û#_G“÷$R†ß#&­VW;*ôK;Ò"öÐèïyB{èÎvÐ)þšFˆ†Cw¦ÜëY«ëk+ Q/Æ�?W=¤‰Ï•±´O®…è54"j¶.©Çõ�„JÌ9ñ_\—:»t(¨Ô/U1¾Ÿ·ÔªÖT|éÿ¾ò¦øPbøCY÷î#TiÏh£ Rj¨òÀƒEQHòÿ6ë-Õ´ß;%[áÎ]Í´‰%EØÔhÑ(5'uȬŸ[Ωβ-\íPÞ­fÓ”°Ñ]kßpYVþ~U^cuÊê§ãEµoAvÁÇ6W—�ØÔÞjU×JzK›ž¿§ƒ©~ßv}º?«…ÄwÂYlwÑ®Ú0èÍóÂ2EðbvÕe¤“Šqzúè‚EUÛ^†•\m±g»¤Û¤åUeõÒ=T0XP>nžÞ¸Üs¿8l¥¨Æ¢ˆ½ùeaµ`’²¥ÓÛqಫÏ/DZЯ+ÇS‡#·Ô™âºÌ÷qðõú¡n/õhóÌѳ=auQ.†q0©�Æ)É¡¥F.!7½ŸæúûïòÁy~œ{sÓu…ƒ×Gå.ªõŽkÇ™ž CÉtPŠøï›×Ž°hXó(ßsyõÿ‚Ã÷óêi'¾¥N‹§TˆÆŒy¨5#&TŽswUN�vì£�ªÌ�1–Š%­ÍªäT©Ý­0¢‚Ìj ACç8½á.8Äþ¯Ãô{úgŒs¹:	Íž„›é7ï#%vÞ>Qã{ô|å¼Ü¨äæ1…í^òI)Ö#b‘7ìs÷DþKõT²é±ãÏÈâ=:oÁoE«¼\¨+ó§Téܬ<|èÀ—µbÞDÿto­üQ'Ã5ãŠfÀ—wo¦N5®ømáml%àÉWßÊÓ]ºp´•prŠ¥S«ñÔt£Ûɺkpˈ©-qéOç«ç­YÂ}g©’Š#&ëE›Í\:ñyè«Âpeoéé׶±×¡q­îh]wüfü佨ÒOÊ\ðžÜkSNIÑw'ÚêiÙöýsF›Åê#%$›£•×}Vø9²ÎcÁnÆ^AÌùõ1š�ø˜ÞÉ84ì~³ŸÊ1™ƒÛð®oïæ?²áñ‹š—<U½4k„viÓ]^åC"`‡¾I�ó7pŒ;¾=Õa0ÓÇLqóYå¸ÕãáóÏ­?1±ñùÙßnü.Ð[ܲGèŒz9T›GlÔ×Gù\cßvðGf~ëPûν>qÁûVŒ�ÏÑ\Ü$ΞwHiÙFæ„rÿÁóÍè�kR¢ü¯8öë¬}8™eo¹wW�†äãN–5ò½ñQÃáOO~"0d�/ðÄÅøæMLoŠ…^Êa4»+É布Ãïé^êCïk‰Q>Ž{w²�§k>>%ús^ËÏzã�N{¾cIÜŒÇQû®»À¥�	!ö¹ˆÝôõôÑ~œ¹ÃmÇÊì³=#%fÓŒ‡^wºGDì²4´<a¤ÉýkRjgo6-w6µF�p£r?<ª­ßžŠÛ›&�<!EÒe§3~>3Ï¢Ïg?øëå÷VMÆs¸ñr¼íÂœ¼ü0|®¿Ñ†áY íß
>úÎf¼}w�½«G+~D¦�}¼?—ËíÓDg¶TÈüs}ª6þ³Bó&üWíÖÌ.k¡?€ºo9Á•óGËf#]c=6Ò¬Kœu �`U$zWƒÄ{>V?õéõn|3Œñþw{ŽÑŠVEJêŒH_•#%[_E1mô*¶¬³Á�¶é´Z¡ßÞ¹¤h…#%>þbºöHü³Ÿ+Ä6s|È,ëX‘óÄ×Æ!‹»í¥`Ûò�U6œ7V„4¤*#%FT¬@ébA$NhhK49¸¬ùgª}.‰¶~ˆõæùÁQ„©£äÿ.Ï�|7ÖN¼³ðZ†ŠàúƼ=cú¾ÿH£×qßWZjž™yæ+úôU<û,mäéÇŸÖ£óÑ>)Ö¦/¿Ðõé^XÔ#}¼_•s¸>ùÕ„q²Ê£RÊTÌÍavx¾ë)£#%<ìE"ŠÓÞ¬¢ƒ¿ko?³~ç_}#&SóБÍO¼É>?,øYgÞ3Ó‹žhòçM#&¿ÞßÝ�vt6ãv;HzÞcÄ]çzíï°�´CzªÌ Ð3è¡]ÙB‹ä:#&‘Å…d�W.[©\оÄùq÷áƒ~~!™ß2B?kºu>®ÞxªYJ4¸¦NêZá½\Ç…âsììëþOÙù—ç—øñMWQrÎ|f~Tý#%ÔþåY<ž/Â2¼äsÅ}ëªH’á]Www[JBR^N½=ÔNžj+º$âæ�Ó$ÉkÄüž¾ÕƼÙè´¡+4í¬t�î‚!\ÕbÃ{ë�ÅËñߧ9ú®'áõõèÞÙÔrÆÛ#&î·ÝýÜnÑN9Ù�Ï+Pã¬zºalÈ“†Å«."±ç©N8TÁ£¤ËK’'zîã²ÝÚĘ퇢Â_1ê7.æ‰øü)¨ºâ7YÑêÇèÄÃ=W2Ñ.ÈÓŠÝsä×즃”o§›ü\š«çgÈðz1ƒ¶«ÁËü.¶‰#ðZ‚»‡Õû弑㧧�ÓªL½Þ@„©Ùˆ�«›èQ\§Ç¤à©Qñ¸©íRîTC°�ž^×Ç�~*+¦&8ðîx|hœk¦>ßÇ�v¿Œqáº]ÓOÞíÏ"1’»G\ùþ˜ŽAg®Ê”ȺÌñ‘â>è“ÝzF±´}ä’sõ9ÁG³{ÔK²hŽN$_8ãÃã}ïyÒRòÑûf™0ÍÊý¹p<1|à¨KÙú|9î×YõÞâ[wØU\µt´ßºó,¥ÒŽ8�¶7çÏá)V5ž}bz–n#&y¹øOt§F«5×"׫º_UÔS²UW#u”u¥%+؈#…Ûe¦#&ü|$=ø¼vñÃë¾"ƒîàu|ú÷­m:¾0.Z¤<§½u&¦t�TuSË<6jpêÞË1žÄVP¶Wr¥ÝűöÓ+X¦±OùˆÔ.Ÿc¶WºžÛo+ÌL\�#&ß’4.~«íº˜†µ|D Ð}~JMÊm̉/’0PnUs«ã¢×mh¥UD!�E=ñã#%R4Õz¨èÂèÊ-½Cd¼(•¢.û’–Ÿ‹È{£§J`¥èEgql§ãIunìmAnõu¡ʼœüxáWáJ×ñê¹5šav~µaab˜Y
Ñ窢F�]É2Š‡3…êîF¡:¢4ÚoÏu»3ýw©+¥Ž5Îé_e:?É´#%7P¯§¦é’Cô<*:´ØÌaω�+2¦5ªÑDW{æaüý«ž5„}ôkìJ®‚?A§Ÿ¦]uÄTóþ=ÉÕ„):#&1:ò(²÷‰#&jV(Î’ ‡ÈöQ)"µ)ê…U™�êõÑ}Íñlë–,:§eí§7{:!+0–RÌPi>¨6YPíiº£É^¤²»œœ„ˆ‘Ñ7wÙ«F‹0îèøùçvslßr>Wu֓㹦³)ç'é|Ñ!¸¼³›ÆûUzõáMbÓN‰¨³S5f…¸‡ª]qü¢3ƾ±SËLJËTŸ÷cË?Ë_¿öozø/j˜j7/}xCM¿”’KorBl½l“Ó#&½�5üÖæê:qÄ¿³¿Ã_5Ífó&âï§,66¼ß+¢×[áíë_bKéÖ'¦¯ÓßµpÌaû¸ùÅÆéäôü·üês‡Á™Ä®ÕàQ}é¸Öö7ç¿Lýÿn>©-ï0pŠåø£éSb©àýâ¥Ó+º I„íêG3n=þ7lÊÀ­n¥ô=òŽÅé�ñ[4-MP™&â«I*æòä��HÝd)h¼ÁÙ«G–Cóv_ÒEš[±�š4ßôÉx¸A‹3WÆÍ´h�ÍaMÄPÝiö"劈vì¯Íˆð¤§ÁFî‚N>#¾pÓ°Æ—�Æž4Bíû.ñO;%G“P¿ÂØnW嘹ªÇÆ�H!Ó²SMÚöU)n¯¯ž��U¯NºŒ-¸ÒMmþNknDq6WL#¤Ì¦T…ñ×<éá¤øü™cZÔÍ|­1X¥ =û“@ÎMZ/²øË-¤fÄAÓU=‡cú6únqøü^6îù¦„ƒ*9½Äå}<æ÷Pã�x=	ýîù ŸZn8Y#&ë{j©ì4Í\ˆQŠ“R³®$ê]‹nºëÕªÅK]9B"u!;-Ý:gY¼Bà4ørSñÂà0÷æáÚ:¨ç$9ÂÞ+ˆ˜Fòê�žpð��öÙŠ³ÛoÃòBü§ú1^�‡ïåÞ6ŒtG‡Œ�&L¸O¬…“¢�ú^oºâ['±�|w¨2Sëëëñ=qg"~tLïƈ›-Ÿ™1ò|K5ù`|Ûèø¾Vi#º†‡Ïªö‹:Ϥ2ÞX–ì�(Êúåé]¿8¾±2'Î_ÆlöG}4±…D®ZÊë`åXUGÆ»õá: ?îô„½1Í’CñÃ:YÄó)ÈÌ»udòËŸ¿M
DeŽì=]°Çå™6‹çnf<ÚYˆh]vŒS×̇úËáÙ䮧­Ols驳f˜á«j.wÀ3„ËïæEæëaÖ�ÃF›bEyx¯'ŽË¢ùã0¸ÂÎ8‹<“úy7*Ž^ ÓÎfÄZ)7e„\ÿŠtÞ$	5ýÚ��'ëÓ-XþQ6¼"—b—µËqIÍzÎWÛ½÷Dúó¢dT¡p¸¶mBžÍ}åõM•hÙdZÝÉÊÓ¢Š\ÞãµÉ„£Ñ•ÖÛdÍeΊ„莹IõÀÆ#µ(ÎíR�&6>1";CĹÙmýB.n¡Ñ³âtö¯¡|çåN&í�âÜõåç³�GDò�ý^½žH¾¶ÆÐ>nY1<i)!Ú#&âXR™�’>‡·ËTŒ.�í‘üö÷qâïªwö¶cØÎØk€qÚ^|iC@‚°†jbiÜ*.O.=Dé#núQ¬]Ù¶CÞÙ6ÜJ±€öç|CÈJ	àpZRÑK½j4/kÜç'‰i.Jþ;÷��Î#Go-ÕóŸY�M¿›šÛ(!Ï(9Ÿ½Ç8ä}–�êžÆÊÓ&š–‘K9ôbóI;"“c²ß±�ÕÌ@y�Ú€!½>Œ¦^²ÜÊ®ˆÖÎUtçsQÛ{ת]=ËŠ”FŠ…10¶Ó¯æìbÔWš3ÖõØ÷-´Œé3 H#$•¸‘„Ø3¸ûï>º°±wÌq‘@í;ÿÃuÖìì€8x}²ÜX6Âʬ¯­3LMçÃ#$°t`¥
Ý£žØ_¢–@kõy¡_í9¸÷ùIˆJÊåmÕ´m½ª–zX;it`W©Ý&âPÔ9£„£¿Ñ�¦úGߺ~obùk1ne|+†•�‹·—Ïò®.õ©åÊ t?̉ÙÝm[Î�™—J•
g˜ÇN™{õ—*ÑM•ù]èì?¸²Em4­®#$±w/Ó¹88¤«±÷LôwJÓ‘'!T-ÈWî½ûñxÚ+¦H{žæ+”Ÿ7œO~òR馂¯<§ácM¤3Nu²çñ&vÊvÅ%¡±ôlé³.—º	§—ýGŸðƒªÇz<¸;C׿Ò}�0Ëc]dmºëÈÕT·¼æÉÙuŽd¢ÏD ¡ôªtJAE1˜I1å>ßL:d£¦×õr”:�HqO‡Õç¶Îÿ•ÿ¦Zå%ʽšÓ0DL›èCzQ‡ì?!ù²ûßÊ‘!(Ðk…äx.%—ÝÀü¶WU°!‚!Ô‚9=Îú":j}�òµN±#%/[·#1�2=¸çÏ0#vøF™$@.ˆ·ò:€â’ËúÏ+^0‰¨,„#s]?{u_{¶Š‰˜6’¬TE T›™¿�n"ªzD;æY-ÔáE!{§_—“˜ L®@”¥Te3CW7?.•Æ«�ö»�€êÄA�R‘` i@úÄÛlÙ¿¡X훧նôEŽ„±ï«ÝÈsÈ1eêv¦¼TÚSSGȤL¬„7Ô&Ú…nqU.š©¬M›ŸŒè>	©Æaü‚]tú›@`"›0a¾ï—(ë±-	º#&¥PækS2¯ó”Çkí„R¨j¡¿§Ý?ŒþNâËYŠçD¥e$’dÐg™ú•g5ÜXV$-éþ‘Ó\+º`r3ÏãØÒmÖCŒG€ª+^ð…weÌŒ­%iA#à -vPúìnÍÝTÄqŸ¬ã½>D[Rgk©B|Ñã·‰§Smöxòºóà+²æhèÀáyÇtñ}ÀlÜFvºü™ñ-5iFõ#&ãˆ-Íw‡SQ¹ôï¤èí¢$S\€»Ô1ALŠ>Z@½4ª#&ƒçq#&Ž‚=�ˆàâÚ"M¨4V#%> d%?•úp=‹Ãl�Љûß½ü]"¦ü˜I6ZãuT‰ÙžÍjR*€NãB±ü…
ìfÈ/!)ýÛü®8“m+sÖòp@îð�‰Xkäp(χÒÿvß‹ñ¤ñ„…žœ;nk™£M‘mïÚÌùè—³}SŸ[Þ¢�å)À¬ÂتyˆVB‹žY”jÿ:¨,òÏ”^+Û…È9�X€„;‡YNDM2Ôm”¦@ª_‹sw0l)“Í‘«””#;˜Æ¤Ÿbñ5IûÓìI6gËI7öÙµÐS&èsýŸã|�*"½ä7AW£…ž®Ú]ŽM�­žì�QžÖEË"øLÙPZ{™Y(›ÃˆfÐ4"ã4ÐMpPÊA~£¬#&@ÓŽòÀ­ôy 6J>¸ž¹ÆŠUøD%
´Oã×r϶«ªfd&c�}¿Õ˜3ÔoŽòØÊîì¼ xUù9QÙy»RZBN•û[@H1xW¦\ðª	ÕáÛ¯,í¨{¶Å„ˆšh¦#%n^Äõq•´õ¢c0Q}pëŸz{§vÚÑ–òáA6ýúw`ôG?¢¶™Ø(…Wa½³Få[âÑÎs†ªŸ‘žìWhµqWƱ<N~Æñ*smÓ¯ü·ñk;/^÷3©R©œ¥ÒAßôáÄ øPcÞ¼­ݸIÑUÛKÛŸ›Ô�-�ëâF ÑO™³›�D.ª‚ò§”ž2’M‹B)3æî3²ç&!jb8Z½s°àÏêÅ®ý}9ÇÆÏ7p ?º9í*]Ó
0•é‰Þï`Ê(Ô£Ü'£{SË%¨…”êuh[ÜE}³9¢¼úR‰&8Gö£©å׿,Õ2'›È�3Ûº†wqÑÏ:íR³ÂÆd(Õ“#6)bÈR�…ÕXí;ÑF«@÷Þ�@¸g ÐÃsà;#%Å06TÓ¦7s�º˜‘ÇkÙæZê".p¬h.4Xk+ì¦Zé‡ef¸p5ÔÆøfÐ’a¥�HMÛ(ZË-ô‰"´•BgBDT8î¦êÙ˜õ
ïì”D¹ëk®Â¯MÆ€¹u¿æ-)¦4#%øöá"Ýõ®“Ê8ÓÊ	F0VÙ,i“¯Á©Œ}©'*O …E<¢=1�SILE#&!]½V×P“.’‹Å‡àÆd+(,éÌÐÑaÐX¡C¥¾2CðšïuúÛ	„…vÈBE&p-fÂ4ÿŸGòóŒzÁC˜ÚûÈ´½$ô’Ó{åÆ,)Rj1"’ùQ£F;¯–œÌ™…Hdÿ9¨|¡êÇüpëÖÚKuu;ù`^»;šn6„À:‡�›ˆ£^¬õP´çÍV!xœ©}]Sã:ðöi×a6Z˜éDnjt>#&�s4¡ ƒèqä+ˆOF;m…•L3qŸÐάM®/-¶´�–vlÝM¸©Òê¢÷•Ðc¨Õ•´œy¢jˆ‚÷ÑF¨Ø�ôO ÐùõO~ŠØm­Ð•°I«ŠQn~:r¥ïÛQUî-pÛHçøvùMyYÁà'CÓe¤M’±›P<TÍWê¤Æ]+O£§gaFœßÍ”²xªÖ9U\‹'7º}„â’çˆBy“h¥¢yX¦î…¿IUßó«Òo6ÜB“rš?ªQL"ÄQ¶g±×àƃísÂÍýâ6ÞVú“Ýâ¹o#$+™`w/Ëñß;ÆRn©g�Dð”h#T¶y~æ‘û`ÎE!vBXæͱ0|Ë	f¸èÑԸƋŠ¡‘¾U¢®³5â!zxvÆ:÷ÁxÉ]óâ“*ïÎ×JuHèÑ#%M˜a#%ø^2M»¥îdd\ÎÏGvÙÌîCQ;à>‹ä@ÎN&ÓÝ„_]1Ý#&yo²Àˆ®\{ðìy1DÚ)à÷1_€ŽÍÁññ"#%yÌ5]dOËM8œ�/·j³’Q'¬}å• rB�0ÈíÄlJ[j²!(6§ÑY=:Ý¥@mµáÂŽz³%:iÕP;sš+ÝËE¶m™«9šè.M&ž3ë€×#WG'ä:Üné-®¦ÎÙè£7ÀhN*ùnÇæ×f;°Ï�fûñ8�ó‹;R2À]wƒ±¯E±Nó®ºÉ5;VUN©c2Í/7¾òÀ±²ÀeØÇŸÓàáFÇÒb\•îú^`+æQÖ_LB�NRt¦¤”DØø‰çãM³ ƒ#%d¢™4œÈ¢dc»–šñO¡ýÑ"·@†Ç~#%ôûŒ»l®·d±#&þÏ×nÆÄ|V‘¤Ä3.©ºñö¾¦1µòÎd«tñ�Ý™H€e
B9õÕ„ÀÎô<;°C‚!EZŠˆ>�9B7;(£FÎ}Ó{§uE�µ™¢àï=rw]Ó00L´Á� æjø¨—K³/1ùÆó{hnò›€-¶Æ!{Þ*ÈàÔ)2N”O!ÎÚ¦?¿žÐ'¯,5	m´á[üÈ: ìQá#&àICoØ#%ªH{Q¿”÷ÄfHrc‰¨æ‹#%à(éèÛ©µºì 6hgLÜ4=ý6›¿ŽÓËšn³<©('ÄÙÓÖÏ
~0FKš].˜€©æ«%ªý‰¨[žwP5(2L±Rk®Í³^‡�	ë#ùEç4”,KƒÇœsÞ?J°û‹1-ÌøWÏšŽCòƒéž(“'w/^¾Ø#>q9 ¥õ"•,»3ðæeE½Ûx¯½à÷;ÉÝ5…�¹s“Z:�ÝUu%o€«b£l™ëâÄ2.h¥“X‰e¢Ë‚™lÃ)�Û1²ƒµ*m=<´<+•%ê›°Ó‡(:þ÷u[Yª¸4qNÃ\jÝMwN†µÝifö†ká©&HǻѴ)òË¿|†ÌK)Û×J»|ðh°6‚C>žŠfv	+=÷gVuáFs{ÎÜŠSY*ôÄr\_WKXͧ%¾’¥ÍNd0 Ú³ 0NY§Ì<|zà9bê‚M#à{;V€í£¦¿<ŒË¶g"…NTÀv¨7W#%öÓ7ÍÜ©¡¼ H7¼ž°F1SV–(#&[#&e§?#%gËÄWÑ�1„ݹ×CƒCéƼ‚#%K´RÄuÑíÄí`¾Jß·ªŒ¥nì^ü];]©Mh‰ÉBëPx’S`Ñ'—Á¯‹õ¸hD¥ùÊç|#Í?m§ôBMë?Å»¸‡ti~¼ú�¡Ã]ô”dÕ&b+÷CþËýo^1ýËsóK[¼·pŒ2Š¤SsLæñNÝW—žW”Äå©ÒIÅù»Ñ¬5;§FÔ}?ŽÔ"Ž<ljÅ8îóÈ‹?»¨¨0D�¯§ìøÖ2¹ÏÂÁCÝXÀÇùX"×щÏB³3ÏßÇ“I7ø à›¯}´p÷‘„µî·ùªûêñ­}3²þÊLÍ6_R``¡ƒûŸó´ùdÆ4ùDÞÿgºDù†ú²¦#%`t×_*Ú@PÛꙋe4Í$=wÇñ"¾Ð¿ÛßÂd¯¯ã¾$’°¾=We›E‡M2ŒœÕjp±1ª†=*å8Üõ$˜+Æ‹ óªADFy<Æ_T䶸Üdûz¾.XïuêÜíÓËK }Õð"¥ýÿaeüZIà•‘ä–+ËÂýÕ+©í°åu=õ	“�Å!8?X¼ø]y”cz#%ØxõòTRË÷k¾#°í¨¨Š•‘	‘>99"olkµ(V½-ç=ØUiªê[x˜Š�#9Yʽ~a«Ýá¯`tÔLÎo]Èõ»TxŽïmÅ-Nˆtỏ!$…nN+\)n`ýð€Žl?O1®ÂéÃÓÑ$ôxÝYIœ¢ü“GaéýUÒÄê¶úªTáÖ©‡š	_gÜâ[;2Ûµwì7fQ4ÄÓ0aÆK0ê Ïù�>DùýÈHÚ}‘hÝÓ#%ˆõ+Ú¶.qÄ9E“oBý´b	˜§#%ôÇ&}7Á3ÆÙ
¤¿GñXM»^”dÇsŒÐn<B‡]p•£F$Q˜D=Ê…ˆeaîb‰¾xhàâ“R„$®À ÖûR·8r–ÓÒÕ¹å�·²PMÉI¢Y©0,6Å£²&BÄ�Æ(lZÙö`D1@qMö­…ÁÜ^æÛâ/!v0íž;²#$DÓ)Q0†X0Á#&p#$ýðØøo„� ‚R‚nƒ[.Ä—Åäw_Û§n«Ûk±�3�©7Ôã“2Iòu}rŒ�õòÖðv^»åEŒ½#$Bq=nïä’r®3ÙrÉdâa-sNó
“…ýg§ñ¥"Bo‰�á×@gbl�n2BQ•ðš.Sc•¦¼Ff`ÕUS*yðxÚb„‚kL—¥æ9ÌGÅhWYþz¨éQ#sXÖÞˆ²!ž?£‹Fr5r»sÑ<¨ã­©sŒ¯3È[Z/uÝлœ›³EÊ»\w’Œ蓹›¶ÁLûªL°E™N†ºÑʘËð”F�wå[Áœ½Ü‚7æÒ/ÔT˜�Ò‚…qßwd+¨–pQÁšµÞ5Ü„LLè‚éX.6NÌÌ�Ž1½=>_¶íIÁ'€Í]‘F«,¤þÇ…ú\¦y0ißóëÔg™ÞÞÏjÙ.Ùý–Áú5¹¥Ô2ktÚ*8öÀí‰à}gøMÈTkÊö±Øüh3£Bøv‡žö»}¿�Ž¼ÝÃ#%wÛãW�_[©tàÑc,Y¢$$A‚F#$Áƒæõ�L`éD@Ziª*Sˆ)E>Ûzk2	ƒÎsÝîMžÎW(÷¼a9Ýhp*E'(	¿s¥‹�ËÊ€H8 ¶.X!QB,‘M¡Âšh)«JæHYí¥Ì\IXÚ½F½ÚÖ|9{ýfdÃÆ##%ÏK¾J4uˆB*vò:*7‘5î®îªC~�Ž¢VzT7@—	¼&3´wdã[z¸»H¯¸)(š¡$çŠ'_?S™­J” ¶Ó(™ ÉX(ƒË	q:ŠàÁëƒÆÎví¼áf»Š2‰qÙØxû1¿Hš|jäï1¹Š@;úh¸›é\Æu:!¡b�GX0ùø„ég³+?1ÃN¡»T€íÇ„lD×ô`gUÃ_Žk_LV#&"w•žÜ`›À%zm<ZÂTð©U]O fÇ6{D`¼‚ì-Yn–Ûæ^-dÛXµ£Ud´fâ´Aj)��Q_9uXÂQˆÈ¢HÅæ–åt·{uË¥mrÅn•y–·Š·Ó&ŒcT¥³´"ˆŠ"ëaÐK#%£¼g©�œ�¦U‡¶šÜqT$¶îíx †ôqz0çç]uðÈveÆ4åR†–¹2¦fï#OP!ÕICæc±÷ê<d�Õ?i�Ý(ÌôÊ¿*QŽùóò²=H‘Q" ,ña%1„P=7#%åùŒaËȺÝ& Lwß@¶8’ÛW¼ˆXfõ>[f#&¾CŠT‚Å°Ü1iDÛ`t®­´¢M‘3B#$j¾rF.ö,o݃6´tëŒp;ÑÇcN#Ã%ÉÞ���×êbF-0¡\hà0܃#$7˜…+QV¤ŒŠ‘©-‹\«|v÷¦�co_ÙÚñdЀH^Wï7…c~ùñµïáG7§˜»ª¥�×n5‚MªxŠ$9ˆ0ðZVäxd&)� n‰ëG[ò�Àò^à]_‡DÈô¥YB"pBpÁ'FAIªN]þxXb‹)Õsà››[ 3>Æ–à”5¡£6wXˆØ"‘&09ËvqÊÜiØg�Ü„>–ªp:cž÷²†÷Rè±+°ì©!„ëT*=Úê¶Ìq¡9…‘  H‰ï!DD ”Á†v›¼i³�àçê6â;ˆBñˆ\W—ofØPO¡ÓS�W<ð­DX1`)áV™ÒÌj“0Í5\Ò½÷*•¥žâ�]•2ˆ©Á—Š™8ß½"Äi…¼ûeëÒ]ZW*äË„õÞKs²m‰K%l%ÓpµçhÝ@«§¨ÖµIÐ#|Ê*›n‹6Á,œK"„Ö8ªß­ˆØw�åÄNÖpÁ@N›žú`ÁÉ–3¢#ËÆœÁj#ëªt	ËÍ+1IØe»‡Á›ÀÔ˜ãF¾Z!UD¦‡ÞòÓMÜAשÄZ7¶lÑ�4°¨/°¸Ûcã0R8T»Èö5‚Ñïð”„$$È;a­½ÃòsÆ8”ç—èh“k² ÃqçÎÔ,Ýžn'w¥(+ó‹àÀ£òywc'u¶Hn(¡¸‹7UHaá­æ覞V×aÌðÔ>®§º·ßjO»Œ²éˆC�_„H£óíWZuÈœ�”¨é^xAC6ÿ;ã�â0½ PúG` íëìÚßtÏI«8X¼#&!;³_Ì}yðÅs®RýâÕ<4±ik¸¿ßGn)¯CW”£`²†‘o%}žtH·�¸‚ÈïWŽ MÓ�Ù§p={�8äœ7š3º#%¸Bîºùù–’OË�¥�±±š£§Ïëâè”t.Up…NŽcÒwÐÖåÑÕN"$Ï_Vp•Œ GHP+.\‘	M#%žqJ€²e¤¨zÑß¿}4m.ò\ô™=LÆôÑ&(A™ä“0xOu“ˆ€QÏoÛÓùÃÄߚឦã�>¢èvÛ©Ù#ñ³Sê¥#&Áè’@¢¶^×@¾òŠ…°Ũ�»o�Mñ_­®Ë_žúô±ëvú�­DÃýß]y*ª)ŠŸ2!:ü.Êúe]Óám´¢qΨ}/{¼¢Ÿû?ŸÕ{n\hÚÁŸcÜ™âD×ÚFf–¼_³$N#$'Sâ0K#&Q(Ø%¶w«ÙW“�BÛ‹•³r�BA1ݘJ–E'L,9›+ˆ¾£™vHéns$%g膓ŸZŒ}áÞ>ú­tZÓò×Π¢ÚJP†´ ¸m"#%á9µÊ4ô�FÉbÄArœzÖ•AÁ4†Éµø—EÑÃàQ–(#&kª‘bƒR11²È€âÆ°•å®LY!ŠX¾w¿‡æ€W@øÙ[ 7°“‘l=;
h{Ú!·Ç_"ñUîg7#Q$Éñü#&�æž‚úÚU4„ä‘V&·2ËòÞ–œ#&*+‰Ï
×Mœ$Ôj¬©P¤Sׯ6+é¢9_]&$ú½H#%;q¡eo¼¶Ç†²Ü8Ó;.ó¾ÇÌM°L‘ôL…¥¥œÎ#%”pîû–ñ¤›½¸2¤‡l€tBü§OÀ¾­Ð’~�T†«Íeú°b—½’?.…Ú@yšNL#%§Úë`l…Øí·”óC7cˆñ nìÎ<<Cë´<í[ž#$ö‘Çî7÷OŸ^‡a
glwU)Ýð‹!¤]aËÉ<HXa$Mk�½bø\‡�ºŒã#%êqÌÔ¹ÀH“Bª¸¤´" ‚¤PÓuQfD¥3B×·Õyòë)j”ÎKÐî¬	©åê—8Á‘r¡ƒõp[°Gu@6/ãÛ.ªÕ†î¨ôx»w‡3Öf‰áÁ¨J‡‡fÅ×’÷ô�°�´ tÔ®G�N‹ ÷‰=iá
%›«ñÐdÚ1;p o.ˆ<"}>‰î¯ü#$ÙWÑÛ¼µ�½ùo?!ýXÑa$añéòöXäÊBXò†G¯šZÇDÇT~‘΂#$ú×aD[Æa@´‹­6Ä5(™ŠV	9u®vÛ¿/ºT±´LßØ

ƒîÆ,áÅ30Æ߇²ÛW†ï«³“nÛø`Ç�Ïä‡<ÝØ9&�hT)“~«¨!H>Â÷#&‰0üž07ŒÌÜàñ¾�…CRMÌÞß‹9�^¼®Sý
ýývN“Ê×ÑtNq2=Ô�Õ~!<"¹öG“ìÓ�áÛ›(„Ž×ãQÏð¾tÜÇbW3N›#çŒR‹4nŒn¢ƒM,ÜG¾ÓFéÈ¿@¥Ù ¥±#%v?hirVn%#%pBªù%B	H«ÇƒUÿL+ïá)šM–PÅ2kßT	¿ñf&v„~q!N^é¿Û<w¨'…êY	(à žÏ×Ý>»þ/<eâô1WŠ¬iðÅX¢¯ìþdß#%ñ¨)É$Á%(»EJ‡=‹ƒÝ5ÕPhm‰­Ù_l`Ÿù˜08�RÃùÎæsþÂRNªaf(¡yþ7‚“ã
ñ›ÃV·h&ðÕ0ç�1r`¿ÉM�„Š­†Hf�¾“öô§Ý¢ýG<cf·áƒŒÃ37m[T#$ffi~Ãóüê¿ßÿn�÷oýÕù\¥n9ÿE+šÆ1�(Pµ§¹ÒÃß¼¹_ç�é²›+¦º�×dí�n¬�aûY™�˜oý"	#$T«Çy¦&=Òá…¨Š§ŒêÑWˆýïñ¦ÄÒ"&jj­Í—)Œä{Qš“8Ïù�´Í¢öüÔŸµh¨Õ#S¤)Ÿ`M¿gª¬m ÃR˜Ôz±ôÆRÿMæ8Œ¤ÌEEJçåËÓÉ|êé¾}¨2R¾wx¯#‘þ–Ф„ûÛ—+¥ƒGfÅsäÜßÅítyË„�ýk2
ðú¡üž²˜E�X˜jÒì}0÷ü‚Ižëz$”Œ\qEæ"©Ý\‚"Èúº¡K¼4Cˆ�})i”±®Â’Ì0½«%u�mTǬ­$Ûõ.ÆÜ:;ÐÕ±xœÝÍÑמêÝT?ëüªº_�_]ßöBNxr;z)ÛfW�Õ”PZ:·‡Ût­³ט¤—8­�HqþZàÖÓïŽïäÌÃO�‡/¥i˜cÃN™†ÍšêhŸâ¬‹ÑQŒš¡	Ëú3ÐN_µ›¸=;ðnN8’#%ß&zæ�&ž‰¤DCõ¹Ÿƒ‡Ë6`‘Ã<¡#$I!"�UžíÖÎ2ìü0”»-ôƒÓ6ý×}çR»¹bÃI™UØ×[à3rû®#%èèè½ã§ž¡âòRký«\wPïšq I¿ê7¡±q¶¦7¦;ËM´zæTïäÿ‹TGóÄ’æLZïß@|ÐâáXÅ,P18s�~�+«ù>MÕt#&Ù¨­@J¥L4kø [P_ùJ©‰_»»°¼üF»ý|­ñþã#&—3iÒÐ 3iëÐÝ
ìØÌ"b±è×sÒü( ììµûyß«Qtýž­¾¯/Éä��"t*S§±9B­LÞwz¦ìti�3»ƒ%Ü{·c(ú¾\�å.R‹Ê/×þâ·5Ž�‚f¹®ßÇñ}®Žä/eçET¸„˜þ,ljâ�î€;òõL½ÙtŽ‰�á×ÜQÞ_d,óýÞ¶ÈI�>T¼Þv‚m8‚%¯"\öýýpm�±š~öCk`„|z»{QÞýЇ‹É=#Â7C‡n®¸Co_#—©Ôs®}1KÓÖ‚í×N;5žÌ-—y(ª·\BÉÄݳsï²åìÑO ‡)Fªù¬•‘!èøèªRæÊå‡ðßÿ-äþ…×Ç•~Ë'éK�±ð”ÃÍøcqøBÅDX&†bÀyØÃg?-Ÿ#&Fo>njõPÅ”óàæ]÷†«ª3«¡ë%ÓW*c"4FU"¹zU9\)�2Š™!˜nÛñä{ý›ÍÞ�°;='ŸÓ/6#&´89ë£×§–Î/ÏÎ�š(’h6èo%ÈTF‚+NoT1ØŠ•C³Œ|èm›‹:>5Æé3?|y¿ù|)öÛô{xòßIȵÏNŽ­¼éCBLUÇ£G7?lé]ÏV1¡4:_?s•ÂŠjƒ.@ñBCv{Ü ÑâÄÎ@·V<k†ºyáÞywG8c	¡Â Ñp±ß¿äùúªÅº_Wú%Óß« Ü#&¨6	“#0ã	˾oÊñÏÊýôÍs‚¨°ÅTQ,(­3uî5xÛÁYá÷T¸Ï{>ØPÉ3¼(ÇšëðêßMóè¹(ژϖŒ4BÂVÃs¼‡»þÊþ¸�cÂaY„>㟅R?}tH|â)÷øuÈ7(0Ö­Ý(çd\>Åwˆ6ñY´5¡$µÅGŒìPÏWÃջ؋ ,¥ ¢A3<÷±7Ls)øz§®…;Ô‘öê3[{Ñíýí›Ýù9嶈õïŒ	!VWªš|¹n€²N~ž#%ñ	z[Øz=Üg3â‰U-¦‹ñøØÃì?HG`gÕ/Êcžm£ÍMuÖlÅñœ`ø#$1d»ÈºZNÀcå�âºLT|ž님ÂÅb¥|ú¸ýÍ“Íý÷ÞûGHê7ÞˆGIÀƒo7v»4~š$4úyÒtK#S.œƒõ"
¯èÎføf™Gø½®íµý;­ž¨ßà01ºwfëÁYö›¤ç2Â�×vwÙîG¯Ÿ›–#¬Á¥6ŸOÀnfÑhËwøU´âÍÛŽ�šJ6[ˇ5ª5iúгVšÒ¼EÑú6:�ÆiUžÜxcsç¾�ˆ#&<cû¦™{~~xôÿ;äÞ„Ò˜&~ßÃóF”#&üô7Å’7c½�—ÓøŸéªù<e}4g/‹ØåŠÃ3íV„RY)“�~“¡Ž¹š™êUšë.©¥ÅWg>{]«Û_ó\Û©S'Šµ(&€Ðдƨ9ÎQ!žÓñå)-Ùµ0Â[às|EÉè‰ÄÇöW$ìקƒ5{ôŒ#ÉÌœþ|s½x—;hm
÷^-4î¼3Y¿«z¤on'Uo§Ÿ‚®×dïÆn"åùQ挦.RÔ>Ñ3�”cë88½¯mWÀ’0mQý‘ÇõKzüó�”´fPþTéS2:ßœ{áÒÈ‹‰hÃâ]ùŽñt­/í–Åay|ydçÅâþ0èCé�2·�sžõ]ó�HÔíxëƒñŒ’úÇ\¾wÌ£²¥°t¸7ÅAǦV~$1àqÂ/9*!T£iZbJFÈ6WÆš�rŸªÿÛyQòü¿�O.¼ö�/k%EÆË<Q0üÞªi°áRóðÒ�2Ê8û Ûõ¥o4O²—eÐïhc+½RðëhCȘ҃LÙo#%$mr‘‡.8=01=Eé{KÅ©uA÷¬å-t�dÜD-�Â$LS®äBÙ:ž8žÓ‹ê|"rìyWH:ñÄpû:ñyñàÌ$Ñ£Ví‹W—Ý{ã¼uã�—ós^ÜD&³ž8(£ò}�“u¨[TÉÈëŠ"½x©#&_µò°%úéîZ<<}_ÃF;’ut³qåaUŽ%gÊ<±qG’|v5|^îc#%(²	òºJwåví¬÷λ֧TaK'P÷úJÅQ#&¸‚z¼‹óÓˆ÷F­ýzÛÇ÷SY�웟1Ú),Ê„ÎÂ]ž!‹>UéŸ<˜K<<kŠæG¸èBÌ;||8�äY0Ζ¼¼ëz<c9òº5ÈÅ]:úl$EC§¯š|^NOrg”›mD¯[õÙ”êh<Èi‰žó@ñ†›ãKP&s“3íÖ©‹�vfAùÚU2u��=,–ÅR,xìßcý­^»;òá)!F¿8Ú-Š³þ§´up:‘üH·ëtÊ|á­Rw>~9^Dêë†3ìr©ÙCy ™‘ãò'}6ó‰œå²Á©¿>–µâz6/Ã’ÈÜux˜‡C½¿ƒçÝÖ°CAê;
º6_Êq,ºseQÞ,LÑˇ§ÅñÔqú=࣬“ÎÛaßâø‡r„£ïÍb�B/º˜<¥ÄDãŧÐàÞqhtÇ.e‘â~çþÅf~®<‚NL�«jE#ToŒð-ÉÍ™sMhקZöðýˆy0dr=2ÔWJ�(øAÓç=¦ÿžÌ�Œsç9§wÁ]æ<Yåi}Œ{'I9oXOßȳ)z¹•èºðÏéÍAž«¬t?ohlŸ~¡ªƒàkKÒp!Z�!=³:âë‡TÓñ‘ãƒ>¿)ÙöjsÑîMKý8{|9´	9ÄÝ8ÿe×èyšöçBäÎÂÄòÿDB‚Ð%ö¡üQt÷|–ä[†§g—·'©núþK.¹#qÍ­¾–,Ö4c3%Á	mührââù/BÞ?VO­R÷Ì#%Ù�øq#ï$“ÙÇd¯í›©m¾âq%ÃÄ¿Ý/Ãùø6ä×Íö¾ÚsÏ¥qº¦�ç—ðË鳟	m5S¼�‚pŽ„ßÊËV‡gpôZ‰P±ævó©kAÿÀ�É¥•¤8y�é{ª«Ïåî—=×Ó¯ŽÕo3ñÖ®°Áôñ…ò†¯�Â,¦Õœó«§�øß;ENÞáèÎ2¦ØE/é–wÛClÔtº+áÓ^ȱ�D^’¦…ÛayBøˆªdBi]Ùb__›a§#&•ïAL<·hÛÁÃF�üu¯ƒ4a—xý/yœû0ႯTÓ	œ€ñ|®•#°UȘKÞ§I}·qÆ`aBsˆ=ÓÓŸ—/ŽĮ́ _òÓœ¬wœ«Š`?4Àe3mQ^Yð† 6/§.IO¿ÉÊ@‘Sø©#¾5\*O®zK}ÍaÖþ ™ijœ}ÐÌŒ‰]ƒ–Púàù½ºõF·ÆMeÈ
Eç[„Kéí{褸‹gâý)‰krÚ8Uœ�J[ˆ4"ù~¤¯”¿:(AJåD9<L•#‹ xPÚDùüç�£Þ,mÆ_ë4JÛî^mÇèí(c«3¡ÐéÙú®I:õ5�„>;?XÜ‘$ö‚ðä´F\’9Ô	3,§B+‰Ç„6=ç<uÂíŠ#%kØLsœê$#)¬w	Nƒô&	Gª<“C#Üì›|(Ù0“©ïǦ5Í)*LtÕ£«)ŽLƒ‰l)Œ£ŒÖ©Â#%Oø¢ÕÀQ\­ã¿ËÀÆÛå’ï.[¼x¹è¼�ÁŽ\ŸÈ3e†Qªë©iö¾i¿Æ¡:&ù¨uf‰ºG}lÂZq—KN—@ZXìÂuKJaæÃ]h»p¶NÉ*Lè1Ù&�xÇÖºD¿L«w=h„×RvZ”j_&þÇ.­ÖB 8êi1À@#%¥?Œ
8ÓÀ!…@®äº"§TU�Vã‚
ù`#%Ab²\€™Ä¥ÓŽïiö[Ùù9îuÍ8¥Ïæ•öN�[ãä®1°ñxQòØ9@™<Ed)ò©Btñú>�½fóåá²OÚC¸˜èæQGŽBefZ÷*Ì¡hciÕgqt]é\UiyxÀÇÏFZOÈz�1®­OòQÛµ<Ë×Ì:€–UuFãE/l;ïsx'IËú�ã0oü¿Oæ$ËÜ{{a<»dNFÄ´Ú�ò�çÀYn¿ìèN~š@5k1A�¼@",@C
N݈1-Zü^SïC¿tZr“À‚û&íΙ¿´ŠQöýr"	±æØ<Áß¾žo)"$ÌêöÀòR(#&&¶ÃHª©—*	_E ˆs;•f—‰pk'žr½F¦#&~qåáûþ8àÿÌÛf±³4TÔÅú_åèÕ:îÓ|)Óã20#%óv†_õ@£¸z²~9щ­‘¥›ö®eØ6ýeÅ3H°$(på¨Àˆå­?uᡵSKNnŸIúj¸4éýåÍÇÍí}Æl1Ú³bÒOñJÊ#ó¯ÝÌúãj±¿*3Ž¦h#×ë?•­Ú-§wœÊ¼ÏŸä‡ªG˜ï�c ¡²&:LO'•ã"ï¯éêË£@Ôô#&;‹#%4Ú�a-(²UÎŽ¬éuû�«ª¸B*Ak!¨Neèc³åa£¬„èbç	‰Šà9¢r®¶%$cµô>Míæú¨lÄ’@�J4¿}ß”j+/w\ÉûëçÝᯥ1§`÷cýg€ý"­ÃDÄÜ™Ïõk£Q:?èEt`¡ÇÅQl´�*tX{íT”�¿Š7-OAØ¢”#&’GšߎSø|“xEv»kZŠYü¦ø¶ãñØ8|¨HÛƶ•‡ä�	„PÍÓ²†±·6
¦ì[/Zâ#%=R#tÌÑ�NŒ¸êùàY*.ëŽp³‹½/S=ï\S3#J ºJ?,d�y.ïüšíÎsí�¾9±x¸\-ñj#%ŽÂÞüˆŽÌ¹);�‹‰µS]08÷·;Ž˜çêk)Ñ£¾t+3»M4Teª¨±Çuè´…|Þgþ?%¾Œ²SµW¾ÖÑ‘$(¸wdÌ'v
B,F#&»¨µÍ@)�ç\7ÓTù§–yòÄ2ÉØùb>#%®ø2€—q$ÂHïݺ_Ë%ôZU{üD`›B×¼‰„B”5¶
¨C0LLbŒM#%6ôÃÚ±àC7Î�"Ýš9háñxж¿vñðæ{"0þ�J
ÐàÑOiV0HAy<W;+îF„Í�O@ëZîÜ=iÚê¨wR:ð�4#[¸ž€P�úá+šÛQå…œŠõ•Q#%ž3ÍãæÛ×½n:ªgv÷!œnÝ\k#&#|¥z”“ú{å´( mœ'wŽDpˆª3_O×úºlØ~´}ë:.6Üó
ÑZ:Mx©1�™”v5¬Ö;§„ºÆ#%8زL䎉ñÛÂFð>ÑzAC¹ßMh¬@ü�cÁXÒm×Y­Œ/f‡'Y‰ëZE‰i:sìºI¸—!ÖkŽÇJ°6D×&¸Ô3КÍÞ¢Ü{%Uý^*Ð�lÆÖÓ&kMæ3$X“õ5»ùë•g»²ÛÀÚm:7cf_>ÍzǺ“–”g�“Õ*ª4Ó:Žû)O²€–S«.Ê´XW§!.©ùi§$tõh’¥B}8Ïg|þ¨2:U
*S®4i<)…—mƒR©Cîw$ýï…(çöÎfùZ£ÆõiÍèf „¬ôñ¶'Bè¾ø&ßÖý+ðÕùaŠ¤ñ+¶8ÈÔ‰ÿ‡«Íñž»÷¦ø"ñÏOkùdðë�Cü®/	©à„’\xU_ÂÈ”Ø^ýžyîÉ„ ƒ¦Í7Õ߯ì\ë¥Lï­±eóûú¬Nñ7ß–ÆûRŸyЄh�C>Ñ|j\ý驘ŽAÓÜf[ãCz#¸©šj£
ÍD½«ÂXIDȨL¥;,ÑU¾´j ,Ä¢›‘f¯TÓËLáËJÆU.W÷p›ð¡›û9]œ¢K¦p„ýµ‚¥ö˜7É'ÆŽ×pÿ›Î¶îž<Úe4 áëï=‚È£NX„³m,¥#%Äó B>Ý}/'�-§èÈìŽm*± OnÕU^ÿkÇ¢Ó½zIÙ¾îyG5{Z¯+36Ä7B  vSY�îc>Ò.Ë7=c<S	® ·¬Ï?ÉÝ­k¶oæ—[1‘G?ìs;²'éé„%2ê¿V]WÕ\ŸlJô…Nl®¨h•ú(œl~ØÔUq¥tY¢ükÛ+ÊYñÈ~1»zår¦©�`èJ<ïIó�[N«Ñum£ð'‚:Œ½OaÇ5žß’#&1:uvCÕHý¶¾íCùÖµ&#“¤·Ó͵zã[—§soáÄ´Ó»&*&Ï?ðBãã¸&1‡úsÓ¥f}vàÑêbxëUœÙY‡Ç§�F¹ž›�_/å#%Ëýx¨¨sÎ8ê�»už×Ñtê�$tÔq=úÜJ˾ǖŒÛ�Nìß}aŽ{õnü;&4rÈ¥�ªL9›{Vô‹­M’ºTj Å¨–�H{‡NÙðŽîí†;ߦ#&Û�׋w…u{•:xLØ´'&¹2DCÁƒ×A÷É«µ;ûwî"U&7DñÅ.#&S#$òŠ\9œ»óü�0™"óþ³?´gHGÉ{5æj njuÉì‹?�i}†F!Dþ#%ûåѵBtV¿_Æ]¾ÎåMÊ趈IW寧ÝwÊn`t$Â4ãÛŸ^i8“{n~Ø7)¯s]û�9j9Þ2»Hu<tw/L¾Ÿ�lèm§Ì\¿.ú©´É'RmŠMqÝ	‘A‹’ííÝœ‘†$’;ö)˜Ê‘̆zÏC7COl4!´KkéOü,4&ÿSˆ³nAbòëW3U¢t–V,œšî4 ?Mó{xoùrî¿íÿ1�µH¯öÞÁDˆ±Ø óÞY ÓKÒþÜ-´'“a-´—Ì÷üžŒ¯¥VʲË!�vŸdZTh¤ÁˆU#¾D*5„Üo�Óí ­‹RÈ«¢5›®…xzñ¨kinûÊ=NÛeüün}øÙç«mÙʽ¼¯ŸÊ}ðÁ¬ÎŒÓJíobz%Hq´OL�ØùT6m
�AªZLêp�tÎèI´»£´¦ìZ * ì�L<ºuVxNª´86×q“kºPòÆAUdîÑÎj�…áusdR¯(ízR-M\"q,j›A-«»}ß4pj¬Ì¹ÕèLÇ´Y”#%¼åÚ:®€Šu…6�PºnÊ›ÑEû«áϹî¬2®sl:èœØr˜1ƒK躋w+ûc�§ÕÕ@]53ï™[Ët^#%ã¾#%­7Õ;}z©hÔ�Ó[u_³-ÖÑ,á®ÙZabƒIŠÕ,çOcÖ–!¿ª5tÙBœ'"@:	´ç®E2ÍÇÂúq”­Q溺9ù¬…íQ‰£WãŸȬ‹XB®6Œ¨~˭д€tö2[Ë™à"tÞÐ!�×t Å!>»°ÐÕîÖÁºl-ÎÛš‹îêŒð½ùµŸL\/@þØ?­v�ó×Ñï¯$G~Æ{¼ŽôÃl2Æ;åÝu�DZäQ„JŠ‰C'óC,s6o\µP×4?7›k¾Th��¶
%<„–ÐËBdÆç*šMŠ7O¨[�¤(®½x9|±Gn11[Ýòòç]æb<t_±MX½º£6'#%±S0íËZÉ”r˜$£"ÉIðÏÏÅï qã[hAÒm²1ÓԥЊc¢a5f<`án¹E² Jþ'`ÝÑÕ™T˜­	q^6>b�9FäåN—ËüOSÀ:{—”;=/ÄýO¬æ•7ß~*k"Ocµ*7æ�Äï¢o	Pm·¶¾:Û³cÔþêtðáÿZûFpç=Ý�Î"¹=cúF¼Ÿác<I$–çœ2U@u8M‰dP;#}�Ý#%ÕvSI�f‰¾Eš)ÌNœÃÍ”8Q«žOÌ鯟B‰:ýüc™ÞзeB;©z³¿(G
Û¶Å#%çDdU,ð댞0ªéb½0Ê=%wø몲®Ï%¯>‘i´àÍV›Ôk:² «)]�:÷!Ó“–6qö¯};o<ôîáõ¿D616Øë#- £|‰XÂOBº„ÜäÑtK-á�6N¾E#%i[c¡äìæ®QªÌ°èìQyùùIÜfjNÙè_c–3^ý”Q•°Î—<“ è½ÙFÉwntÅÚh(žÊ(ÄQéÙ¼ý(ƒÙOǧ�È1�Èyä,\/Cý±[T­1½ÏÇ4R­{ñ®ñéÝÑãÀ˜ËôR5éщ	À²E’~ð¢¿,Íú±#&J‚u™8ù¶R�Ðä§Ð<•J‹Ê#%�(–”ÝŽWRm©ê^dÆí2b‚[È\#&ÊwbZ¹´á…x–_7!‹éAbdÑã¯f	oc¥œþŽ/}s·;DùCÚVîL?—«‘�M�"ê“}û´Å´»Pâ$À&ÅT,Ÿ:'	a|Éη>M[™nxê¾u¾“³ÅBèQºKQ¯C9`jáì¤[]•ŽÞíãð¡pªVOcL¾›ßUðÕupÅ‹`NÞhW�%§ûèåkl(x*vêŒya:ôÁ«Àï“(“‚ÙëÌLãuòLr|U^ߤc߬‰(;!™©·H…ÆLecÚ	„\²Î»gÓtrr0´NÆ°„Ga£MÜýVâWO3%#%½éîÚÃá8�fÜ-•,g^ÛöÙãò½Y»»kM¨eQ£<¨‚ O{ó]vöÝ>™þhÞ¤ú©ÀþCñ?Wø£óêæü~ÿyîï=ß_‰z:Xè‡ÓúˆÕónÌ)?ù¼óÓ|ÇÚ$|£ŸehªŸÛ	Aró3xõÓlZ´ç•ÝypÈ‚e¨ª±1ƥƞ§·¯.Ó	Øä};Ç…ñ1úìNUîíSñÑÏ]Î+¬.�«‰Ì	/ÑñÙsy£‹†înˆ
)Ïå¨îèÞR´-YÚQ§쨮Y<¿#%¶žKûýÜ¿GáWèî=^Šð�ðhoj‹©=Šøjµâkõ3êWß³Ó‰0`VVÖÚA¢ËûÌ£Ù,®úþ�`Îò‡Ó+¿XyzcRg¢‘ïªU	ÔP§Fr}ƺñ«ù¥O�èþô<%—òÃâ+îúÕ ¿cé#%ðf 3@IpešÈÆ2µÿv�fcþ4¢ª«üïüLÀ–€¡åþsz¾Èq Gô´4rC¥#ÉS¢Å2@F#&Å	¹ÿ+PfÁ‘ƒOídÏùËN5ÖÛvȉ4h›j1"Â_Ú÷b¶dP•ÙAúƒGК�˜šξ;Á†9vùœÁMÈ�Ô'%ô˜
’úžDs9òJÛÛƒz}g’˜5Üõð	ì4IšªîíGÞU£¢ÑŒÑÀ®<iW!Œ¨ÌÿoPäŠwŽž†Ž„;{ßx‡x=.Ÿ ï>1î>«ö�Ú¾ó÷‘Gct5=êœ7RŸáï; Ã—ÒNå7T[GF81ƒé‡ûÃWyª
®Ô;Âßñ>íÚ�¼ƒŒPo‰#!ÛÛú¸;&MÉêD÷¯XäøôU÷þÜwÿo�–TæšR83KIÁ—ó}nÿ:¶{Hd¤‚#&¾ÀÐù0i�)úJ1‡1­“qF—”ž%Ñ¢=Øó5È0�ÕÖ
Ye–©I�£Ê˜t⎱ Q÷|¾OdÎ_B‡á Âó#&GfÛͧ”ÑöÆ:™†íÔv‚f§Ü°7‚M#&Ñby¡sì?#$ý†ói˜"DÎ¥-Dö•¿úû·’¤Ç¸).¹œŒ’Ìÿ1¢íˆ&ð`¹ýᎯ´ˆ5Ù¶»!˜¢8®«]¢”½zW*Mñ´ê#$¥OÑ0JCS[?\ÛÚ¯$‚sØ3à¬Qu{}˜ÐM6þ‡C#&[º”ûº¤£«È¯°…OÝŠ)§ŸÆ¥UmßS|Œ‹è}éæƒôÌ“¸<ˆ„|C˜ð9ù7Ø
¹h#%?/‹*wðNB]3HtÚoLüûŽ-‚  í!Pl H!I
:ɧÀ‡“ÌÈFàiJ‹iÞ{ËÔHÀ;³‰Ô‰¼	6]?·²C»ìpÝL&„¢ã¼9¿|OÊŒñ{°«˜
…fyâ°»2ô‚ü:ø~®Z¨MÎ
‹£¾ëS/	é•Ø‚…ÀÛ]à†Ÿ§¨å
_¤ÜYÀäh6’ä?·þ/:�õºy†ì$ˆ}„Šm/xB“­�y×Bõ–<�-�ti…$Ò¦•Ó³½ÞpÊ0_øQ”N0]UKø{ø¸1ˆ�$‹ù|+ìôø§�šJV/_Ä„ªùw"!»S
Þßb/^¤v3q@y1¡2,LìÏtÞŒOe%ôâ-±9œÖÇTZgò2>wÔ1€!"8X„Æp4ü6Ê-z	Ôß]á—½R~2dõDõ˜Ÿ—ˆoz©ñèxþÞ‡õÕPJ.ãåLJy&ÉɳpyÒ†ÿ]nD¨½#%?˜Q×Þê~s‰Þ�hmúpfîÐæ¡è„×õAOYDBP‰A0©Ô`Û´ää3äñCt!¸�in_î˜#%δèZñ9�;ô߇Òëý%ãQ	fïüj0ùI$ÊLaÂs5hˆJd‘>L•)Ëݽ$�¡9ËÐ!e�%fYÍÛºI$,;çe‡§ýÞÿ6ja»jª·—+ƒå“I2é:1‹	¿‹QÒW‹iÄj+“•a�Щ¼-žAì›ÍرbLJ~ÓÏ@硪v(êi#%Rvœ²êaÜ–Þ]lŒ2î~ÿ¯O§Ë>ãì1‰<ýÇÊ{”Øo”þä%<U(`a7ÉýÚ©ÒÙ÷‹f÷J’Ö2}Oì@²Ê†º(úÍÜAøË#$µ¦Áòš«�¨š¥‡¾ëŒßéÕðì[�¡WwtÄ$N”ÎìÒ�EŸ¼g$rêc„gú8ú>Ï´½„[……È	.ìà2½Ì#&KК Z"lÃ|wÉ}éá8„Ø‘,4„ºôÄÁCÌ=1j~J"‚ȱ]h[,Ëu›2l±:_OI‚m4ˆT¤R	@àþbÀûúxòåQŽN‡™À¯§¥¤Ñv"î0;Ø}Ý„Yg–ÿ—åÿGX¿p~îÛŒPF¢�ëîS‰É7¨>CS¤ãÄç‚
 á{$Å8�ôhá•ª¦ç«¡¡Ð@6iŸ¥}	6w‡Ÿ°¥Ï×+>otp‹ZûdÇZé¤{˜6òÉ	¢êh”È, ÀBG;”oS!;•©©¸W[:�Èëž¿dô¿°5›&ÚOO•`1”Š0ß[Ëöñªª!zgyÂ~(=Žÿ îy[—ĉ³£pã¹WÈ.]2HÚi"Áš¡ 5"=Íì5—™›þQ6DØ>,3Ðÿ‘ýÝxþ–¤¢…B]Iób5†ÐcC|’nÇ’ÈÿÙýÜG5Õ_uwãzÝRî*ó]©à7­8µ‘“Š«5$ÍUY©šÂWÎ2<�ŠQp{d4Þá$×*ß#&¦oF³sc?†‹“@Ú{y±³,àÌÙ5�åj<|2³N4�ì”.Ý#%>1›™1.–-*̨i�¨©©"ÁLJBL¨‚—SJ‘©Sãñ®#j#$?»ür#q9@34Oíh7êe=yµ‚ý0:¼üð:[®ºÊ#}=uïêû•\osúÍ�Ûj%ü�Þ�„Á¥~I"ª­ÑJŠûƒõ™�Œ-J==}¾¸~0úÿ$:©ééƒdIpü„:üË„½î :eŽªÉÌT!/ÛÈ£×¥ÊüvLD~-©›$\»ý QœMŠ–ŸÙŒÎ&?žLùLacîD#&Ìç«Ñs=5¤·U’ü.yÌo|˜@’6Ûm®#&£î;`Æ8‡YIMgn‰•ófg‰Dø+	'��YqUeYV*%ú-hd;fÜ:ÊDÌPã³eS×1·PõÓŸ;ó›1Î`;3Ž^wÏy#%áÝÒ ;Ï.¼Cœ:D‚ªÈ‚bFG�úoä×:µ4ÜÛ4l!’
3àšSœüPE‰?;w7’G�“Xrüû7Wu"z»Îò”}e�>Òµ» Þ(ž°�„ƒÈÈý¡Œ•ODAr9Ï×}‡üÛMmúP_`+�õŒ+Aø‡G·O~yÅñ�BA	lclèÕy6‡SD±»¡†¬Ìà#$Xðà¶#&âs(ú‚΀SCëê9kÖ´õCJñØhþ…p9}ÝC¯ßõë÷gcó -FIµ/jDOR?œˆf0� #&Ðè< Ú8	 ôûBñªÓ@�³¥‰»�z³ãAhÜ£¸ÿ"�Ðð .—öqÓ"<:=?~v ¸Œ#&¼CÙ´ó‚ Ü"¾Ò'´prï64yÀûoÀHòûôñ~ƒŒSë”ÀŸ…i­�~#%Ùï|
ÞºZ #&˜8{#&Ãñè,4*Ø>ßá~ã?‚ý°ãÛ?éV(0<'ÒJ,D� …ïݸx“=¤DŠÅ"°OjHºôñ|ÎgäêN/AÑDcuïá~ý¾Ò>|·b#&ñþ«,ýb{Î<|Óô#&#ØžhÇÅÀ‚4™G�£Ðˆ“3U£€þpôÙŠ#${:;;«§Òó2rZærc4˜ÞUfCÖ0P›#$3Þ·^;A'_´ê|	·pœ-ü³á=£!AêPPXH(±c	$ |Ï7j[ܧõ«�y¨�ÄÐ¥S‡ªÎÄ<Ó­ôþmŽOGP…ÑÕŸX÷GIMõ�“ù>ÞŸ¬ï Yuû@¤Ç—¡ùýÆ›mæX”ßÚ˜1‰Æ¿­~tšîù^š)Ž°Þü"Û�~„#%æâsxF„øƒRPkKìÄÜ¥j&°=êq@2Ä$1ìa	'Ä\(§°M�p'Oò^äÁA¢¦Í€P¢9ÿÌ#%ï^�ãq&°!QVöÐw	�æSê}Í‘E}6ÛtÔåÙo‹g‰£ó¡õZ5gv*bzéB¢‡—î{ù#¸É‘#%k÷*ZÈd<?#$ÔÏ�ž´0"3yv}…Wó1öèÇt?m’P“€áàù�ÁåªÕ5`Žò²
 ƒ�Nc[¼1÷eDßHq€Ð®åä¹òâ0ýzƒ ¡8Ê6ÏÅÜŠ}IoÇa¥$ÏÔ”­“X!‚÷ð¡ÂÊ%F¯bÃóU–Φµ#&E!Š§¿ßÖC1
3ÏZˆÆA$U1:¦2\y^.#Ç6½Š4ra<ãnÔâû“wW30„ëƒ?Ñ×5Èeˆ‡×Ö$ˆHW¿¡ë;ØPÅÑD?“¨Ã{	Uµ7rI#VQu·‡J§²'±ž®»î=ª>€:ß3`<´6àé#$‘²ü‚±0#%À`6–…¹Çf7\ÃÑú±âÀ7��
ÔFŠ©E›Ï�ÚðŒ�|íЯã¯Õã)Ü/Û�LB¨
—JüÖþ�ØÅþ&„ؤߥv&š«)YÿaÌhl#%£8ËJLÕ##&‡[Ø%ðj3kZXRlÞæC‡·OÃÇËÔüORù¾ûÉúUêáN?qIºüßhBÕKUóñª«Õc˜¬(Çýá8|Hs/¿\êz#Çã(ø
C¼cñ‚=$7p7ý>ÓˆpTìHÂH2B!@JˆE¯ œÏÀŸŽ‚º1S†¼ï¥;¼&¾¨àé6!¢�ÆâË2I¼"j‰�¿¡þØ·®Îª}¥ÌØ€€Âg8Ö^d?OX�U£ö÷èT·XËí0ÀÁít#ù•c98Ñ‰1#$.%$-Ë­øÆ!6>?©ªÍ‹Ð|Ïw•™3P¥ø"1¢ˆ'½¢Âªf›KlÖ±Œ`�PБE€Å�#œšg#&kóU³†MAóq¸õGö«"Gë!õPŒÄÿC¨æ
?l>Vb r"ÎGÕg&
yZJL¬(k‰"¾Ø yiL„Qˆ¤P‰¹:QcÚ‡ëÐ
àBÉÀnj^<OVC€SÒ|5úÐö›lÔéöæ�ê÷cCTÔ:,±ª"Õ4¤‡5ZRˆ/§n9!ƒzy‡é‰Oƒrš�û¶ÜkTa((;HB3ÁZƒ!ßý£üGŒ<~ËÚ’}ˆé ~¨U,!â—bŠ²ÏÁú.¹¯»µ^ín×T£$‘Y2™ ËãÞm¾»lsW-yÛ‹m\È Fˆ˜Y%¨©T]ʖʤ‘‘-ÁüåœÃ¨Ò›£§—®­òFο(<@È,iôT­Ô_ÚÈÐ=Ï
©…È'âH¿° ú#%@;}¯@�Þœ:Àxg¼üòš<°‡ð)†X@àr’ÙUE‚„X„(€Ù‚dÛ:4�ç¨)vQ¼Ü…¨ÏJ˜öSÒâ!ꪾ¼úÃ�G‰ì¤Þ!={sïÚ¼uî©¡ö#&Ò`óÒ±©hµSmÌ|ËØ〳z“#$¯Þ1«=p‚Ó q´
#&ì°Þ˜Ð£&k¦³ÃÞO+ìg�¥„OËԣІˆ#p`i+X;=|où|ôDî!<!$Iê<©¢^[Ë~;Yú;׋‡zyåÀîÜ1$‰8ì�X¢/Ä¿yÔ†\’Ò…ævÎF¶ß‹uD(Aöƒ¾A¦µÅÙÏ«sKËÓî�A6gÜ-Š´´ð’�ÂŽZ6ÙEñÏ‘šªöü#& š»·PÆ §}½¹Â†Bé(*‘÷PX x*ɤ$‡0Ì3ü¦G†;7�"bmNi›	Á;*'0˜Ò£S~ïb‚'`�HÒŠ!¾HˆÇ”‰Öºz»þßF¢)HBX1ÆàÀô=¤¸LùøsÝ�Ž�m^ú?K(Ü	!½¾yA2zË#$:óýhX;Dg8K
+Âj�ZýxÔbD"€±:·Þ…A-‘j`©ß饊e’´,.a›Äœ—¨öÀ÷ì<lö„_ÒTÍ?��½½T{Ó14Ì$äm¤Oôîò­ˆv?Ïù~†=Ý5`ϵ¸¤3-Þ‚ƒ(Ä|�ŒcÆA²Š|ŽtœR;Xº¡É£üû>1	í9Ù‹i>ß—f*b°¬ŠÀÉ 4�ˆbhL‡ÜÊCRƒRVnV!ZUc#% ~èä+2�Dú‡ÜëÛÞiô#&<�ó;Í‹4ú#
ÔêU¡R–"§X¶™G4 g0ËéÉØ{Ê!Å“dSaý?ˆx`7Ͼzùxœ9‰Ì ¯‰ÍOüŽL‚�Ä<=¿…¦Š‰”D�¯!}]ÇI¢½�íá°ö€vhq| tHðïQ�d#$Ä?�É�ÀóàèÇÊÊ^ܬ8á:2Ñ#&èáÀ‰IÔôptµ¤Eaƒ1ƒ.Xpù‡OgÝ+×ñ(z}_§Ã<1^b#&c
/�˜Ë I�3»36“«¯-çßÆ$˺âXDù/¿Xhá68¬ÿ§'L�õ@ß•ëªQ#&#%¶+Íñùõ´#€ßë�YîdÒ\q‹ ¡ß‡ðÝTˆ¸¯ÞA’M ²v¼M	#%¼Cæc*õ"“†¨›	1§þÑËH¢ÉôûjŒ96ï؇:jæxK™ŠZ{Ô 3ŠräÝ­ðÝY4Üž¯Ìép¿9ĵ=
ärî³´àv=ÇÁ$EâtWRýr(8JÄîZÀíÄB›PéQ€�4�û‡#%g#$׋ÁDõÄ$W€Ì;!"ûc~xèTžêÅ®”ªç·	r#%p Œ æNaÜs“oáÃÖæ¨îÞPõ#J„°ˆ»ÀÔñ^£›�­fKàdÛV}S½6­â×’]m9‘tGóçBäÄb`>&AÝ “IɪÉu¬Èq|y÷ôÑÔøo;�ÈÈ=å#$P)ÐÅdë�;pfÈ|SŒãü³‰ƵƒS=éêÛ>}h›C¨òOÓ)RXõûF¬Ð¢OŒIáö,=Q4$k)#&)rîÐI=xpìsÔ$åõ'çüIéð£ÇûzŤÙú�>;çø‹Z�žþ*^ß	îØþìp�“õëȲªý–?ωÓäcŸO‰-[“qI7:H;y��ŽnÊ Ñ'9r$"K¯ÆÍ4£�Ç'Ý‘ïÖQòÐÊÙ|o{Æ+ÒÞýïÝÙÖ6?;95ŒØÐ#’Ûr¦˜˜#$\LÁ5ã0Ý}zñåõg¹ÝÒïqKø‚3›60B�ŒÉ…w-#&ú†¦Å­¾1~°ã §WÇϳäÈS÷š–u£AÒÍÈD>Ì¥ÎA±ÈïX6#%á⢔Ÿtyú•Œ#Åî&C¡#&!"iÎ#$"~ÞÐGÐÀ`
à=+Öõ�^)¯‘HlŽDÑn(…ïPh,3¢làè³Ëï²àVµL#%Óó@b,ÝZdÔGŸ@ê‹éìwLÂc¯BÌ%ÕcýûŒ“ó‰Òñ/÷¨­Ï‚g¼0
Å‹ÐA4	M™Cƈ9i”#$~mݬ#$±¨@�¡€ #W3÷¿“ûwòïÍÞº¶Ï<bŒ‘"$H}À‚¢°T•r}¦&ƒ,ÍÆYŒdN@>ך¬R8}äç|ì9ã#&’X**U?ë3“}µÔŵU­±}óÜÍû}œÍUÜÀjšHÑ	¹=q¯~»ï�E![6Ù°é$À’V#&ƒ(¡Ö[ÚŠe$P£,n努Â}èCÿ7NÀ§ÕÙà5&èG!< A›¦.ÌtÓÝõA<E,üA`jûÒÂ"où¡áCà~IÒŒÞ#$p>’3zý^_<+ÐŽ‡DxýœÃ�έö¦µ�;	£¢8#%[ldÁYCö‚4´�½ÿò>Ï÷ŽÜNÂõ(°K(cò¡ÙL�	š16/¥ÕÑÌ›ö‘8
ýçÆ¢ôº3l‘ÁhÂ4²7?f)^˜¦¦øýå¦ôD·¿îë?qÄÉ[j¶ÒxʤŒrF-HcQ444`±_²H¥š‡AŽ¿ë'öigµ^Ÿ!{;=5UU^ $>_Íš~b}¦„úÿutmúÍèZ@QƒZ¶T(ýo#$(cXÃT79iÚQα/óc¾·@?¡&¿„¼?[9>^¦ö&HW=ÛP.¤ç±ªìŠ‚hwz”;8:¿:$hП®(õ6ñ™ q'†Ý—}y¨¬Þ?e†}`é@0	jT5¡¬?OªSûnûÙÃþ>>ã” ŒÜ¨ÄxŒÓ¿ì±:û.\F8BŠaIM1�Ð>¨á¥ý–œ¦‰–š‰KâY@rôlA�%�x‡‰E®3@¯©Awù�퉎è‡p³ˆDK"óúvøu“;:ƒR|Mçø¼Ñø©ß"Š�É$<ÆB¡xC}p¢,-lI®óÄÄdq
€GŒbh|Nð;²}Bt·$`.¼Œs¶‘æ—«ƒƒú3’Yü]ü#iÌõúÂ,9ëŠÒÓ÷7Ä�ðò÷%/Ìa䜩õMÿbÓÉf¿ÓþbçõÀólÔ¦1E«V^ó¼›-ÝuxÔÍåÎ:f['”—WUra#&-jàÉ”Xà13#$�fÂ¥0‘KªÌBâ­s(ñXŠÕPIm"5#$#&Ši´x° "±Œ¡EjTdh &ŠU#$êÀ.0ˆ2
ˆƒ ©ˆ`—™þ!‘¯èyQ°CJ¢ÿ˜uÿŠ�·›àOVPY"4‘†bABëü¡˜M1ŒÅ‹0E$þë-V`¿Ø„žú
��^zÏ&-Tsƺ´#%Á½.�aÊ€Ì(‘³‚ÔqäŠ
a—‰¹•é8Eb98ÐPÂêPPeÅÈ·¯lhR\¨þ’™ü[=_Àiüï3Õ›±ïùd#%1yÐ\®~‹þ¦ü¦-Z7~è~żPèµ{¥e§®ëó:Ü­ð2cYšû¿ëñÝôÓæOËjZý¿¢`W|Ïo>·#&É]„Ê/ŽtŽ	�½ß
Ša²)B[
dÓ˜Ôìwøwà†]ÄÉYŠô·áûz¦R„™�÷q+Õ9šˆß0tûÈ
™¶/D‚cTa½òÁÞWbõå‘Ö¨¥Ú¦Å¢bŠ†ˆN{tšß^y°¦³—¬®
Vã§5â›@‰Bb�ÜcYDf@výÞlHcɘžâ#%/gtÞXDç>£ãOßAì×#&.‘Ö(n‹pTéŠ ¥3¿Ö?¹F0HÃ-2S*©‚&þx‘J#2øwI›Óä¢2<b9Hü¸F¢o3Ð;@BOÈ*nŒÙ¨Ï^Ú¿´ç#$q¢#&¸W+	AbÓ¤ÎZ‘@*:]Ô	£<¥!Pd2¼o¿ÔìÁ-ãÊ“�#$v5CÙ›µX�»�Ĭ„‘ÖHI±N�.Tj¾$¥8w(,‘#$«ONä[e¹A©ÅÄg#pöË¢‚—¼]I©œ¡@n@ˆ7�tI§Ë•%­'LÚˆ°GACƒ¡\Ä‚)@ó§F'‚ò5U1qožSÃ><á›C>nÏ´Ù½Fel ‚†-/-[�ØÔ†©À™©P´ ÀLÔ�¹|e짧ø([?à¬a—ÓÁü×UáW?Ã-úráù­?(ùiÚ”tÉSµÍ{f`¿O?3'æÌvÏaÇžéY2Ò<!‚#&c\+ú¶®îÙ²*¶™I†+™"z™³…‘÷ù+ñœ³�¥l�L±SOß:£þ¿í‚SÙè<¿Õç#%|?UÙ‚û³KùÈ'Wðþ7ãøù6¦ßæõõÐ乤mF´�Í"ª$JçáN•k%¨N]«Ð•çŒ ’DÍ$¦DSañf1­‹‘Κ»}Eð§w7XC@µÖCd]Çx?i3 ™ù/6ÀuÒÿ—ý)1©Gc!h?¦¥ˆÕ0¯&¢qŸF—±G’Ÿ¹ï…×78�\¼[Z"ë¿b0½’çßfì~k.'*=Þ½KüÒvÿ£YÈç�Ê¿ÉBUÚQÊow]±¥©êÎSÍû€EÇI©W^#$Û![_Í’ô¨7ê�E"ïò<ô'«œƒnIN+æȲ
™*¾¹kß*QÛ_Õî…‘žG,ˆW‘Uòû“DýV&W¼_9`Y‰*3¸hÀqªÁL¢+𺛲¥’4#&$pîë§RËÍYæxaGú¡ý9ÞúiùíþY�v#F#&ö–ô$¯	cªÏw2¢ÜÜæ9ðÑÿPàxøyngN}Új€lAJ6ªÐg^˜6‚‚èarª)�œ+·<2…UEö[ŒîŒ\d&#%¢8Òúé¾»7å¼Çó²ÖÎÔa™r)W $˜©0RŒÐôm€ù¾FŠ¡©MWt¯­æª¡Õã´…pž&P­³ªCÔä“A6JVÊ߆xB(�4„#%î3Úg#%1jjŸÜ¢z(­1¯M1Û*K Êè[t[f‡%‚­>/ªº,”+N-Îìøáq·ë×zwÜõpH9#%Uݪüä;»­,CaÑO¯syãA­`Ôõ�Xaí¹2w"åï½Gª©Î‚ˆÁ€ŒŒX¢©š4”•š’¢¯½ðï/yèœ5ãÓ]W¾¸!r,6*uíÔ°˜ˆç�ÃÙúUÒ(€õÓ‡éqž¬ˆGVÁÃ%VŦºVzÕçT?ÎcZ5Œ˜¯˜ý;ÿ�›æ>Õý=~¿—·#%#%:`ÐFêòïx@—<zùºá¥ù£O æ„ÊÊyÜ�±…:n�KóYÑmvèÏ9CwÔýú…´~Ë:Ѿ\HÓ"+»e¼ú´Ótâ«Fã|µôïö™K„cNêxåFUý�{À÷“YûÅӭ毌å²ñ�b¤GtV>±-þË¿%üz|ôc
ÚA°<äÝžø—­w.ô‘pˆïÄéñ€�4ô¾õ¢×9ëçä§jUê�#$-Là™z\ºåÐ:®x`ˆ½¸ñÍñ¢Âjƒd‡fweað{àúØ(4ÞajE>?Œ.‘F_³pÿ]îc~/Æ]ó¿ÆÖ� 9m™+Š9¶]·ósdsJÞëI‹Œfx¢K{¯
çVátÄäýPfb�ŽÌÌ“{ÏÆ ÁøÓËɳ#$ç�o©�Ï’ö˶q¸Ìg3ø;ñCŒßž‡!ƒi™„ƒ!ûpþõ¿Ï!¤êŸXðƒœ:L:êî8ì÷1ÞB*Õ2L:SLëxµJóÉvQ2Zˆ7B÷\åÒÙ˹;´Ó»7¹Û¶œ±n*mµÙ<h[»vM"½}‡ÊѸ¯DD¢Q #$hŒF0kÊì/¹0ͳ!�¢È¿�ÉãüQAnâƒÎ!Ñлt†ÉèëÓû*A˜@á6í"ö°¬@Ƈƒ¼IÑ�˧°©Å™o¡X¦û9âæGßÙó¼æ�O¾¶é#&	—FJº€<J&S(.Ñ30[B¨Oš¥à~ŠgVë`ù™Á^É�Ñá²FÎG›ôÌ®ÔtRZ³N#4Û¸�Åe\ZœeÌw½ŸˆV!¸îy…Ñ{¶'\t›³�Vu¿ÄS‰vMö jŠ]Sâÿ�ûs¡,r�å”\OgÈdgâÅèðë8ó#¯‰Ci‰Ò¾ÿR¼F¥	�™&LeÏþß©4ÄþúÖÿxþ“ù:µÑá#$ز#%Ø°c #&Ú¾y|UÉ&“&((vf×#õûÿU=Ÿq¦$µíþN3ÆIrC§>_484êÈ@Ô2pAÒ@>»d}ü(?‡&êoî?íüÍÐ4˜oÁ�s1O[™#%�̯uUUî°)“!óþÑ�gå@tïx§(™�vÒL)4Ÿ˜	YhÙ5EBWƒ–rkìo¸£3L�z#¹EÀZ 1Â"2�ÿdÈýv€¶µ�{X#S8í	Ú$”"j@ž¢³¶˜H08
p40o·V¬×‚¯0ìGÆz¤5ÒA‚�Ûµ
YMq€œlS>DkŸ‹¸B`#&LŒ`ã¸ï´:¿#&!b1ÐÆÄBÙÏêhj˜70ÜaA´…¬6Í1˸>‡#%A!G²"¬H £`—! lY�às¾Ëåû·Æ¯{Ô
)÷»Žî»Æƒ³¥†]¼Œå²‚p
ï�—›#UG“B“¤þw³åOò~cühYƒ
mÊP0E¨K©‡€w�Ó’qóŠ#øž³2²tز›O	Pˆ¡´L´� Â6¤+MOs»Ô;øÐÜ’¸k5W¾:=ûý„<©®MÆÙVC7SÞøöø{?ªÈHÒ`ŒF"ê#%ea†…RÞÈla¦#%@ ]á€Êt{Άy¤Çe×^, â*dQ8ÙƒBŒ™Íã˜ôv/¨ÁÀ^®—‘{¹#%¡}߇9šÓx8@§®Ó‹(ðáÖ8Ó@sß×Öe¿;[�½#&ÇuíûÞ»ährö{ý=<ûmHuÛÉÙj­õíù»ð�<›øN‰ü[wPm:>Ú8GÉí°Ñ¦ÎíâÖ@5;A	”üŽr z`¯UPÉ8²ª¦ÕM˜V`£ÿ]’ðd,e»-È”,¡”ˆ!Ò7eUÖ>`»Ì´ªö
BµPjB#&Ù	Õý¿ú?ÇíoišÊX6�ë#&c`È’5R4P~ñTKR'Óüîôù4¯µN€õIBIWw.Ì�è½GXhCw¦~ð£âCNýÛy3EpT4rœ‹ ÒçïØsøôé«DW—XÿLé;»ŒÐî˜T’ÉÝ%I±fðœÿ%£”Òjp7#%ì„«°BØt²9¢�×»JÛWÒ=mÛÃÐűöî…ƒÕ @âw›!½`i­,¯xPàæ(øI#&; &‚Ø~Õûq�&*³	<°›dèð&B¢³”qܵ (¬¹(‘@bŠ!ü:š“&CÚ1ˆ1îóóð¶ï`øý�$s×»ÅvøÌÖd¦`[Œr`��37mºÏÈái°Q¾	íFm°÷ct=Ìæå‚$Gt\‡í0ݶðz#$î3âÛ{s_ÕŠXU^1ÛÆB&š8™˜}¥¡‡Oæ(í 8:�çCÖ˜ê'oJéjóõz¤µâM}[FfÏfU^M*©¡WÊMg3Õ(ò=;`ؼ’\ýU¿®ÚO²Ï!ìfí³~– Ý>Rq‘9™°¦œ²a•ÀàïÞ	»U†ïŽ#ÖJµ¹¢Ç8aèXøzáõu­ÀqYlÕ·e59—…®�wÀ_ã<@ÐÇìh”Ù\:ôØ»0ÒuÎZÕ£âÍvÑôl—.Ê‹ÝÂC‰�»¨‡¾î(g5kþáâ{Öµ+«�fÂm’³ÍÐàÂÐôHÁí0ÒxL0\&BÒ¢9nîÎÛ#&6^ÎÕ8·3ɱ€å�…vBͯVÑ¿u.®ñÝ™ÉÙh¡”bmFX�ÌŒ1bÓÇ_.Nµ•ë–{˜ŽÍ^6éŒEÃN›³EÇx˜a´žŠvdv1·@�ÑMá!«^»j¤7=¶BñUnØÃçÀá&@†H„¶¯@ 8pbÒׇLw„l™!×èø/'¸@ˆt<#%Ü#>
šwrº¹¨Q‹BT™cëØÛŠ�B»�És}”r"lŽ¡`û:Ÿ	áî/ãs²õˆH_QØ~Ä––üÝw.fE–¶V#& �íÛY˜yš“(z*ro6ó}yRþ‘;AÑÊÆÎ
úîäòm„1~Ǧ¢èÀ™|Ù¡ÜœÒć*Ø2Fö=I¡„àÀê¾$Q�c‚ûaDL¼J#&®Çzd9ô!ÐÍoˆ£Âk½\
I¼2�q•0N&ÛyGJø½pyJoPÖ‚AÖÍæ;§)�t”=¬áÈ¡;C%YµCYË€³•@ô÷Ÿ?zêkÔƸã[m’uøñ)ã=A&ëÔм˜ƒMáy÷›—/Ý<ÁÍ¢Š#&’Ð#%1¥S°4–íεªi:mÚe¥ÖéÈÌ`Q�.ܾ¿¦Í'žªùXÕtúê5F¤Ð%›´U#&¡êGXy’¥2(ÍÆ¥ƒ,L“‘b³´­‰ßB,ˆ©q Ø8Ö7ؾ‹ÍßJùj7-Í×"ebL ©‰'/¡âÞqEws¹}U×Þ½Ës¿ÁŽ0–�PGfÿœ…ùûæ¦`”DL,s2ãÌÌ™s33,m™r¬Ys1ºó2úÉÓ/׎*¹ñÓH)�…QÕšNQ1‹#$ÐS<ª”1¼*èfE¤—±é�¨xS<äLr9–#'Ÿ½mç†]9ðœï;õÆh�~\*1¡¦†Ý„ÈK��µ·HaÁsíª©g–±™ºfëx¦uÉ×%Ö^‹+T6DgZ™eˆ#&í‹jJ
 ¦rI]�ŠÄ0ÍÜ >} êtJb�XVšäêè$ñ*‰Ó¬•Qˆ1DF–ª ¢”5MA.ás–fEMû´ddYLŠ>[£H‘®Þ!¡#P1‹ˆ#%J[œ Ê7­¶Öu‡$ZËžHí#%IUS,Ãe™L54Û‹¹ˆå{ÃXM)h¯÷H𹳇z**ñ,gR»ÈpÔ#$8R$ôÙP÷òýJy
°¡©RuNñʘ:Ëç$qDÚ"L¹ŒBß^i…2„Oo?|Ài¾N©*r}¸ñO6Ù#¯Ù8‚>#$›ÜêLM›ÀµìL@¹‡Ž_J<ŽP$$Ó�“D›P›¦¯)S˜áóFlÜæ±¹Ët.a&yJ¦ú@Õm˜9ÈójAâïƒ#$"`‘ucŠÉe„jô?—GCö®Zyê8>Ã�hMN*5á#&¡åE[MK$9àGÜ‹™Â@9Ã�"hk<>HB×#&2”P›ÿ£õ˜�B¥ÀÕ¥©Üó‡	 xÖ%4±ÒD;¢ý4ÀÛ„47OŸà•�G�à®M	Zˆ`�ñÙÁ‘Ï¡,»!™fBAG 7pA¡ªÇ€™Ùi;àÚq/ÈÅ”Qp9+0n�ê$ÈÌlX̳�ˆSÄUý½#&‹ ƒ2Å”ˆ‘$&ÀÃs¨i뀃UAøF›uá5OHR)#&šv#%ìnÞgÝöð3ÐCôÚbŽýÎÇPg`Ùøáä0Û
ã#؆Ź””ðÛ¹Ç]´c
@ˆ„5ÆÚâÆ�Æ2dLQ+"÷¥²I«´u¸Ùp-‚å…5X9ËÅ™qyš��ÝP×zº]Œ¦%6QL¡L Ìéïl�ãqu½‹¶Ô¢cscnÖ9‹ìºÓ±Ù„;wÙ9,¡ÌXY&¤zCØuu Îm+9 Ç&4è,;�1Û¨]1e‘Y•#$ÅãkØÒsK”#%JK6^²	BâOø�áÀ,àñ  `²¢õ§a¶ò»#&ª¶Âa2|7/»ÝIÏ(muíd²Ïf1®ºÕ.ÕWUm#&Ùå.ÕUUV¿’ü‘u‚AqfØã>e¦2E‚B!Abg”¡%×ÏîøépÕÝÄÖ5ß¹Þ÷ì=ÕÃf¦<žxø1·M¹Ô«°pÃ�ˆ"iæAèÜÍèT.	GWK¡½õb4ƒ•Ò3dr(È�°`cšÒF…lÄ„ŠÚÈqÞClå¬xu¦‘�#gÕþHwõÛ]3»¶¯Ìc2™’c¢9*|¨<¯·OµY×nÝ»T•ò®1·¾¨LXu�?”QÔ¢.Í4×";&Å5WªÝ±þˆþä5Uˆ¼ˆeaªÊwÊùgèÜÍÍlî'úbB¦,Š±YÌgãí¦Å‘ym#$dÓ�ü©¹˜8°{Å°¢È#%¥�£ÙÀ2î:½ø~}?Q#%sœdz>Œ>ó0‰‰ˆ�Sv€`ÓJćʈcÇ‘>€	#&£Ÿ>Üö=íQCD§¼p*BÁ%@0=Ýg§$é°…ÑaÑçådâ�yþl¿Ö¾úÿóØeS®G·ïÆ #ܯŸ­Ug©˜"Æ"BR”Ë
e½ýþ¿!ñORBÏ��œ7œã´DY #$v§Cr@ B
&Í´Å©A‰·�Ø’ÙI‘AN€£–ÙeÅ·MÍà"˜ U{yåå“'âüÝåjŠ¢ÑHƒÙ)UEPæ´+Õƒn¼N@I: <á$%$öòÓlÕv©ü OóÉM	"Zt#$6>'DîÜvû»@òì;mC¸#%Ÿ;+Õu#¼èºwJˆ!—Ô�ϧóõ”T"4@ÁN®"ÒÝ\IµMTú÷²
Dþ„‚Sµ!¤,ûZCÓ#$Œ,Q7#$!Чˆv™ôª'¾P'
€„H@>ê¨þ‚’`©%ŒÑΕžZ¦»ÛVÛ¯“.Ô3Ìb‚’ñvQ*KB(¢$/¶.I¥|ÍQÒƒ)C
þöÕGoðõõJÐ4£Ó§„`L­ÖYzBZ¬É’!ÜkD) Èƒ÷µDi•;ýe-Ä DzÁ"�ï6;BX¿žŸ†­5>Óº‹†‚
~�ð³x;Çif»o°Mädô%[Øw_`	}¹ð{Ïb#ê‘Š«»Œr(žQU‚GÑ»¦�4ÚSmX¬U-%•-*ßž½ƒ‰h
Ý#$þxªŒ"&`‰D„QcFÈh`JE$‚½=~°Ê'«	'¶ùYÊÂYN™‰Ed¯†!q4�J…>ð´µfAĪ¶'Z€Á¬5ŠšFˆ4#%Á�ð]JM°èB¤?ØÝÆÛ#L*7#$Ä$=7¢æêI4k×]¼zkr½K»«Ô¹rfºk¤—œëáü7�¯;®•Î…–JÍÝbå>i×”ºN‡^öÒZ3á¹	<û-­Ô—½–ÔµóvþþùäÌ‘° €B,´O¬{E[W#$§¸ƒ”0C_îjBÀ+�|�úDU�ôxÎA><"——“|s»Þå �Šg`ã6¤Î'Ló#&<½ÓÒÃÀx˜ïý´ˆƒBÇT…ý_Q盄,]CQ9%`»¿RŽštjÒum²Ã&Ô\|‹Ç¢ªQƒ&Îs¿èn¼Ó”Û‡ú©æÜQÐ"&©¯‹:«¶/«UÞzÜ̦a!š8;¾ÊxÇS¨ß@uü¸h%÷'¸#&¨/ó—DИäå™=Dö™5϶èØÐêÑ©¥ãf…Ã)#&Pàe#ÎTæM˜S“BßL.ƒ$fa)aCKpÛ•ópÙHX¶–†@×ô15t(Ñí‡#$´¿ˆ4C	haÖ‡>â$‚IŸJ 7ý…¸]'‘'¸p‚i«JSVðÞW#%,u¾dÇX@hj€Ç¨P÷Ð]U†fqˆ„˜
Ä1ÞNþtõKô]îÂýpüž>Iæ�\ÿßvuʵ*#´LŸù'i8ì¢��?ËÐæbÙeg*dåpk1:Ö©=Áùb!ôû=ñ…ÂT(©E'w‡_$ê<–QÔ oOe.Ô¾‡Ò×ÆU&ªé²Z¹6j±Ji#$"¿@`[5F@CÒìQèéʉÓ.ªA‘æC¿×—RÕ¡¡‡4ÿ+KªÅ ü/韫K%ÚeÜ6ëE�sN^ŽZr®!å·×Ýòcþ›l	T¹“¹¤»µ¹¶×Ò§Þ¯É?›\ÖýkÕzÕ~äeµbÛAKTdT¢M±ª6ÃMVÌ…-’¥¶5’¶‘©Q¤Í˜ˆ¡Aõ�	'DúN›ûaRuCŸ_C·Ò«Zį¹µ[›Xµ\«]—ðPµˆ:²’aâ§æßfs:œpÑÂ�XÃ�¢´ïî¸ðÊT`Ì4Ë#&í…†2Båš`'€ªËT1ƆPƒ¡$YNímyíŒ�N�~�m·Ûe0Š8†ª\ÊÂdÅe6Hlˆ–šÙ‚ÉN#%+&i[…¶$L¶´‚
êFªædó­@Ñ4#$=ÿ‡&п U‘8q¤V⧧;Øq#Ž‰ºÈ#%nVÁ¤Ýd#·%l€ÌC„Ê�‡B›?E5êÁ~_b>ƒ4. D D�"‡A€C­üÝ#$Té"žþ)Ò0ÛEŒVi¨³6ß~»µE¤¦Z·*ånmv”ÍŠ“EP%~U®hµ¯Ómò÷ßØoÚw¯pºöaÔÐÙC˜LbÉ$M•CÐ#&ô{pí}œ†ï�¸óøç¥Ä£imœ¥È)£œN_R«ÛÛ¸±=çl„C¨¯g¦E>ïFÁJqǵ5 ÜÇŠ„;#%‘Ö‘Ûþ®ýÞ�ÅêãýÿÚªà#$Ç2èYMÄ€`é„3Ïi¬8“(ShÅIl&P7hBCÙŽªÒÍúµój•#&éšén]SQòªdz�Õò<ÞÞ»5wÀMÎÍ•7@U$G÷IÀ#&8zwLˆß÷µýÈ(~˜çUË›@Í]‰˜'(øÐ�ú¿¦Ó·½ïùŸòƒ™~ºDy@„TåN��§Ä”Ž\4UõiØß‘#&{C@߈Iˆ9Í
åêj‘?mC Á-ê¶#&S”Ì€þ%íq@ |2w„H8w:·“ü|»¤ðúûŽÏ¾�#$ˆñÓœºªŒN‘M#$'a:Çùl6ì>®Î<(Äü5§0Ùf+pI!ø5-®]mÝ€v ÈâÚÍùÚšZ&MÔãj„œð‹@mRl#%#Äq:Ö¢µ*ëz�þ2€q�:Gd,_Å`!!F1åft¶Ó>ñÔ4´‡�ÊLІۤ•×qs*Š6 š*fë·‘%<ÿDK†Dº˜þI†bÍf¡#$“#%Dò-åu.°§lD(àÊúuºHÀ³©³,)!FY@#0RŠ”-O‘ÅECnbÞÉþ–Í-lÝ�Ÿ]Kœ¢9 —áã!©
È„ØŒi“8zǧ4P¥êy¾8ÌÙÂäb¬X#&äM•ä•º…Ê`ZÔ£:bá(Ã6šX«}ª˜¤€ $(Ĥ¨¨{ŸHzhòNG³Åù<=!Ç€:Râ®::ºëUCíøÿ‡ýxD}L`ð˜�ì?Åú5¸+8,]Æ£’V,¸ŒFÒU¿·§SÔ�X #"žÈW]¥»,š£–ºX±«ö??ðÛÛPª‘b‚oÕyoïQᎾž¹’ƒMi°Ž=jc¥c¾ˆ{¥b«ªË¶�ª$…—ö<³(àªè:…MÞ&O�öƒ72ôƒíG²Ë¦’ÖM jDŠA#&³“Þ‚–­­ÕÌïÚÿ&?4¢‚íÒQ»DfHÙL;ôájí¦î¦pƒÁ~ýï4² Òˆçkh{ J¢â—bÑ�í¢†…Ï€™Iðy·¢zy65&Û+£J…ŒpiŸ0¾…uñ¼oÎ	Ò-õ½ü®8÷Ö¶9®¹Œóäþ¥¡Žµþ’'µ'É0¹ê†9ƒÆµ�Ñ¡íºMn1Á[v‹!)°*©Èá<$^WAC½í¬òB(‘L%,ŽücŽœr¸æuËÑÓ|�öt]cûWftÏ&Ù»wéǽuZšl�:TR †¢‚ðõ=mºâg“»ß~£ïU
£V‡Ólþèu¦àŽ·LgV÷Ÿ~&áë@´Oyå–ÿvÌãËà›ÏÝW»¯q>Ï„�Vdpw#%÷�#ÖüqŠÃkn´ó¿/•ˆ�-f×ëË»¿¤7#Ùˆ#%ƒh˜Õ‚Vl¦ÓŸf—£]#$T‚ú,òDpYa\˜}ƒj;B£¬ìâ‡o‘K°Cr¬­¡]iªUY­œo'®íú´¶·wJž{$O%>ÛbmÉ›â3åVŠñ#$JQƒˆÖyc†ôµ$Á挄܌d€ò‘à¼dlÛŒô\XŸ¹‡-ï²â9,}â,0#$*-ÍEÓR
S7£ñê÷rîò¤Üf€êËsöô†Aâx0WSÝt4ùÖxt½»
e#%QsX6×ÚÚ�×E
Ó”¤v´ÂâÖ‹/¥`ˆ°ZXnj2ËlÁñÁ†kòAU®*ê¨DÕKR�S5¤“Ü™‰Qj/ º&ÌÀ#hâH;œŽžIR¥U4ÙF2]WxÝT�rrgì|˜@™!Ý!Áâ—.~néî=ˆ°g·mò2"0ÃǬì�X¾YÒ»W#$ÁŠ‚ŽûŸ`I!##%iŽ$ʆï›á§[7×XæGÑͳ›óµú4‚!ä{î/#%Z¡Ün¦¤\S(Ëž¸ÆŠ&Õ”­©© âªjY¼¿S#ÌÇRœPŽ›5ÓŒ	%ÏR#Õ:YýŒïÝšûï,�ðS5Z#$àt²ü^ÿ¿’„RD/áݼá�_Q©Z{u¾»FΑVÆA¹-Î3:`Ðfå0úÞR¯#%ß/6®Í²µ^UÌRÈÊRljén î®§Mvˆ9‚#$Á}LN5	"ƒ>÷Z£$RJ‚b],ˆCCŸW#EÊSI èˇq+ Ú¼Ì‰Ï6–"a’2\#%¦NIÔÑ`"ˆ£
Œ$	_#%8ô§‚½
ü8qÔšb³ovêÇ×Èâ?.>ÕãOϦýMÃÛD%Òì²d€²}ªì²™YUö×]�ÅÝFª¾7V%,R”¥Œ”<CÔvBõß”Y�Ý5/Ê϶Ãëpš¼8‹Á‡H?t�#$&Ó*òZ3ʇTAaL&nxV¡¥ðš5ù e ûZ[x%‡5¢‘Ž#&†ÀŠ†ˆa,CÅ’��Z³dÑ߇>‹_!š^|W×6ˆð7#$Ê?†µÒd#%ta­¨IÄ1CmxVtQ…8Úr°cxÈc&æ‘à‡oŸ*5)XŠÈÊ”Ad‘Š(Å
D)I ¡+°µ¸¨T#$#%ÚR
X–$Ql¹ó84•Ò…#&0›#&cë <f"^õRœQÖ@ˆH’#%@@¢*Hfå1	#$#%³ÉÀÞ�¬ÉIpúdÇÈzÖåÝÇ•-ù{­âDFð|š?_Èà»Ë—³‘ÕA\âñÛˆ,àBC¯¤àÀKÃÕƒY¦ü%Å3K¨(S;¹
3%ͽ¥³Ôó�`Â@ô×°V‡ œòv/ÇÈ¢ékª‡xŠ1NìÎÝÎ	1#Áû±'Ü%ÎÔ³È¤�Ó#³pphÐW�:
1üÕù7$ßXÑžPÁø}^¿3¿ÁóO¤)í!¢µc¿Aäݱ´O@ïÈ#&­4¥‡¢!$tÕIÔá)+TX‚‰´P¬=|Øè”ÕrFÌ÷‹$Œ~!ÍRkŽàw+òƺä>ÌÀîÂ&—Èo…ÿ"‹L}Ý#%„“¤â)£HWØt›—yÕ9zVýÇ\I"ÍØS ÕB§ÉjSž#%ã;Nô’ÀìáôËåDÄáŒ#&&ËŸ~˜½£©Lì!€×:†	l8øé!(]ûÿ©úm•“c¡G/e5䪨|ãÂñà„Ã6lˆ[†‚iv#%ž¼hR(3ICau#&"˜p®S#&}ÚÒºR0š;ƒÔX+˃�}÷BP5C; 3è„„¹�Š‰PÙB<d	d‰Íþ—=.Ê÷}i­wufq­•ëM,¼d@†þâµz�âRW"šºŒTTAˆ È•h%¸0ÆA†#&,¾Ò,„ô�᫵2JØz–¢¦‘ÉB£Œr‚	©O•¢ÕjŒ&Ék8¥±ÆÆÅ�q”1âHÕFµ¼Ò4›D36VÍÄUÚ6Í5 ò‚Bqý�¼q}_ƒp¸�×YgÏ0–žl1£A6ëJ�ÖÔF–kÍtµÈí¯#=�t%�xo)(‘áÂÐJ‚^µ—ÞkÖÌ'2`õüƒ&J”MÑ{!ËYŸ3ÕF?Sæ\#$ê‹©M]´Å¹¼Ô›¨†²°î"g¸�#&*4†¨´oŽ–bjAqym!À>é r
g’¬Q(gPö‡�÷g2Xd³†—÷ GfC®vl@„‡Ïן�š?r¾®·ÄØâõ�§,˜=EÅ÷|ú’6*™‰¬² rûúô'mƒz:ÉТ�TBŠ„�›þgùÒ	$"„Žáì"CµP‹aáѶÆëÂPº	¨/¨ó�0Sx(¶MÜÓñ¡â„£ô{Mø“Ê�LÜ©O®àÎmT¥ˆª(°µÈØÄÚo‰‚‹Ë#&jht�2º�¯�Æç‡�8üÄE¨N©cŒ`#&Að ¡6*™–„'ãt\™ªE`âÆfA²~#º•l(‚¦Á¶&$3AHƒß
›#$®
íùáðlÄ ƒL*ôïÈ&°rÅMéŽ}S]‡Rº$Ÿ¹~œæ¶F @!+Ý·ìÙ9>‚ìŠ�gDíÎ`Ú0øop‰Ò uÊܤù:qHÁu0Q”ÒÛ-ÜLaÞ˜¸yå7*tRtÂOA€FEŠv�\MÄD$ç67`²°i¤)TYÈf¹³	¾÷”[ ëJ{¶Sv�#&úÇ?’o�¸ÁgON{˜†ºÄŽÙ2]“"W:…+#$Jd4ª°•Œm²”¡'`<ñ#%=¿ß#$òÊ ¦‰Z2Q†ë	ý	²z0íwG}¥§PîÁ¤Øñ„[‘Ë.nâŸÈ#&)«Iij‰W€È‹#&Þ?-f&"Xȵ$5Vè~<á³¾¸Å®/½Ðé™ìklòy¬)Y׳±jY¨Fz¥#�a:Ì�Q‰V«èÈÉ –kÔ³QcQÙQ²”ÖSb3SIÙ›My¯ÇU	ð@×y°+iêÄ«“E]ØØÓÁy4@Ôƒk°îêIÙ…œ4Î-#&#&Õs¼ÿ74Ò‡¹Aœâsp¯ë#$öõâÝ`”Ä©‰PëFô=&é˜ð)9Çò:~-Îó‚WëO*TJübžÚ‡åÞ¸ís³î{deèloÄ”q›’¥Ç÷Í��¸šsSCŽÃ2Þ˜#%Üé‚ìƒF颈œ©«.Ë©¯²më£\1bºÑ�§�âJ(+"ºŽ¬0W§œ &ƒC¡IS~N€�§#&#%tÍð
 ¤2†t’jÀ,bKC�l IT‘#%#leäšÓDLUd©”@uAÄ(M(¨40ÂZ,Àɰ˳#$À¬ŠLn:пWNfŸ×i×Øv}ó!ò/'Ž¢¼HŒF`ÜæÍS:”Zˆ•Üܘ¸T›äŒï©Ì}y`Âk¼6I?ž1¡ XSCÐÔæàè?EO!_“.>’XÖÛ1ù}Å îv(á³#%
¤ÎÍÕØ2Șž:tôД»™aÔÒ»M(7iJ’ÄT¸$X,çJú ‰ˆŽóŽãÒ`Mä]ñ7E¸7×¾(q:)1ÈàØ&àˆwuẓ”ÀsæZþ(ù;ôuÍ�îcÌŠg¶ïQØ­AÅ䩦‰·.­&qŠ¦ºÂÙ#&ƒ¹®FœÛŒó%3­†ØÁð4[‡ýRÜ2ò¶ÙáîæžX«½K°žk'6í€öoÔóšVí„jƒh “†IH1Ré¨>`ô“N°íÌæØCàÜ	°
8œ¿#$Mpo,wµÍP'X†7NFØ�„4ÖŠêlʸŠx>¯g`úá>�í‡á8•b,0bX�âNN@0ÃÛÙEÖVǽÃA³ƒq‚Ü4´@Ä´š€%ɉ¦Î²IÄ…ªeHˆ–(E,èÝi™©@|o[2Bm$
FH#%cžÖdßH!¨8(€ÆC
„�ö7…ÈŠåÒ˯„2:?€F‡4Þ¶¦Gí#%ÂÚýÿ¶Ò¨:ïthÆjg¯;´É�hÜò‰ ¡¤ˆ¨fBÎŒ�ÝÆ`ËMŸ;öGÓT|2MäÒóÃÖãLYÈÇæz*#›ô\#%Œ´S3/Nã<óF`¿A�Äг6­`ÎkLú;ãïˆ'‚@„T„ESŒï,YpžÊº–FÍ[òwg�·)$Ë´UQµxØÖåV¨¶­E·óéV¯UâÖ5V5NºÒ ixŸ~¦öüCÕ�"{+Aï#"@ù×âwbã	´=âK+ИŒàž±³Ã¦¤�¾U»(#$ì~iÞ›Èh{�¡:‰" yIL)0Ä™((š¤3$Úe,Å%Q´¨ü=])#%¶�Ém4¨BK4FH2X’³$kèíÓ%i4hšR–²Í12Œ‘™h©‰²hWÍÝ@*XPHÒJKAµ“F ŒJ“%ƒ¦(ÌPb¬Ñ5²–Rh,ÒYÔf,†PhHÑ‹
#f†�3Á]ûŠ�Çx¯�»TÇÔ%��4;·›È>oÓqجîC�§ç¶†Â|¡�FnJÎ+±„h”ÝÓ¯¨ä‚°,ŒÆû=³g í`•·èà0ˆ&‚ØÞ’ÃüÆxÃ#$9†ú�¼N
çÐNùE0÷­#%Í%‘}â¾Q/†âö�A&e�C8SK߇Žû„•a›4#%],´­`œº²ãD̟Ę÷} ¼ëô,”⮪âÈ*†Ë“
E„#,«ˆ&eÐéÞ¿$F×߶ûY#&¥š)Y­&ØMe5™iŒ’À`Ó¯¶juÖüµ¿ÑU®Xf#%@Ze3äƼú5žBgÄEV‚„£‚k„Pð¾b:#%¢Ë0Âá´§¿_ÝãÇSO¾´äâ¥ÙÞ*½ogÐH�{L ®¯”<ibdO&¾Owz}=�5ŸrQîïøq(D±¸5¢ÈÊñ{3#®�ï}xl1äš÷àöΪDK2{ t>Ž7¡á±½¢ÆÒàVûµ)¤"Ñ"Š]Q"D3ä‡w4íü($|àÜñýU÷Wã|8z3‰yMÛÕìí—j973±="#pxF�,7Ùs‰…¥¼Ãôw‡âá<êcºO6‡f~>ƒ5 ;´Ù³i¥Œø³á5 Õ¬£—-{O#·ðV"ˆá4§~.ÌérÿmÌÏغyÕ'ÍQ³ƒIˆj“ʘ_;º.z1«^¢Jûbä* .,Ü´áÕÃ�\p˜q÷¸ b餅£³4P¹=·=7÷|útÁ·¡rb ”C�&P(ú-À§—~úñî¾o«]ŸäñÄŽëkŒÈzaŒ¦v<´äaº3½ížÕ­œ|W´³ÍYÈg³àqìc;3Ž­J#%*Ÿ>4é½ÁÞgZ!#t}8µH«@3Ë~­†	t
Cô×Ä&“׬¶tÒrAR±ÚWQ\«/4ÆLl�XÉ.£[7ìBI€Ã|µ1�LÑòãIŠ>G‘Ü�ã×9›j(~¿|ŪŸÁÛÃ|öréóÀO>Ñ{‘@†wy°xz*j†:߆âðÕ®³ h#%¼G¤£ÀGtñ8žA»{ïÔÝÕ‘é	p>»�ó³ž/ck.»ÑIåĀĨ¼£ÔçªÇÈ=ÀÁ}íL[ S:P"	ËR‘´YUùx»X+•4?;´käÅ#$3ÛÈt¶lá”Κ¡Þ‘èÊŸKH7+
ˆnsåÐ�3»‡�–|gMm�!Bm÷szplÂô£"îyeì4„·mã±9+„Ö�yrÚu(/¾QÁ	+˜bI…äq¸)Zƒï¯ò'\=œw˜�ãÛ!$_�UݧÖí�H¡ô�4ȇ“ë#£0fœ,ÌË,lm<¥Ž´GÅXAãàfµ'Û‘Þ,ãSl|H·£M™&]8Ï}…9›lË“æ2.]Ì{ÃdaË*Óýl*Í*]Jd¼K—CɨAŽ”·#&®Yuüš•éJ<†´ôö9±ÌÓ˜±9×9š&¸°j�QKøQ&eé8‰œo‡¼Êâ†ÜZÀÀÙËL#/‚&w¥#&Ÿõ9—¼™‹B…ÍaÄmÛ7³l¬F8ʼn­×„÷owCäñG>ìÅ—»k—~&dĺ˱1ÌT¾TˆÔ©Œ,¼c6NwQ Ɉ#%0Àa­é0Í·˜Í:ÍOðp®Ø8é1‰Ì·X©9ýâäèù�¹P„RnyÌ1ÖŠü_KÎô#üESu–:Kmt‡³-YЄXºŽÑ]tFÑ9#H·†„N&߃°�ek†MP«Øé™I|<#&vwÂdÏ56ªNðün0FfN×Û—Ù¡ð]^o›´Ð‘ý=\;-í’sƒÔqÀeécº%[ôÌï-Ö„
±#&.80ì…®ÎUœƒŸ¦ßnë�o,ýp<\ rÒÎñ¼ÔQDVª%³àÀšÑ¦8R�g%\Ñ£x#%$Å“ŸÏÁ^jÎÞë�Ž˜qkž7–êNºÖ$<…å­Ôî$â•öã�ï8�KÞK»×|GLéºlÉ$Ö˜u‡#[BEW.sÂVg¡7YÆbE¾ ®ú`ĸ»õN—<V*mmæäÔÁÚø1ºÃ‚w}?2rwl6]˜ˆ…¸$GdÆïw•ç£v^¼Ì;¾AÛ;'oÀï¶à·o»Ê{(™qFÙàÒPX®%©D44™BŠ¸]Ö±2éø.i,a±4QŒfÍδûÕ»Qu6­T1`‡ä�i	W�”‰˜M3‘‘´-j›rd€{˜.˜ºÃbã#&#&Øý£HƒT4‡5ô”2"¡¢¼+$”ZbM¢ÜC¼³‚m'&â¡DrªÜ¨ŠÉ.bΓ:L^�ŒCe2@„ÈW¬:$ÑmbçŽrLµ‹+]â˨ùNæ4)xÔ¨k‚VüsмÌGc
Ž	2d­æ]ú!Ýj“q:©¾¸©#¢éÌÀï�Øa©Ä[%Ê+‹+fÞpeJåÝ2AÓ‡átD®‚'.`àÝ<±ÌÃ9ž§0tÁ§á�дڎµ¡%ÔLOPÈ·Q�½•Æ�ËT•¢'&ó½o6kPm¸lL®©ÆldꘋÏEEç—:CÓ.�²H˜Ú&l	µ§žŠÉˆÝ;bC-9¢…†‡a[^])z壧/YÊ6ª-ªÙq9RÆÉ7;¿1ÓuÐW˜:i¨ðÔÔ[« ç†|Z(­(Ö›‡œ&c µläïc·UÈÛiÊ÷¬4’�¥Ý”ue"Àñ·:†¸³¶ígå¼—9?AµÊßNÙKje!çÌÐõl8”v(ÓÞ£ý<qvi9Åtâi·‘ÿ(8f£òfÍñ™¨É	Ž5œ®}šÊÁ«&ž›:a‹qM'˜S‰9ÜÑç;æ�|2žadhÄ›p¸æ79�£Æ¦‚´TÃQ]e4H&3]Liæ¶ac”ÌY6=i™ƒt˜‡Ä›ÉCUÚäŒqÝ·¢·«c2cžd1ŽÄäîÎ/û¢§¶y÷åGU(œ²:¾ñ8‰¹(‚"0¦œçK$^\¤O"@ú¤gæ†1ÉÓƒo×%âï8¼+·/>Ó9bÅ¥ªˆÝP·WtÉ�9ØeM Þà5;…/.±É�˃%¾ÒF7h³R&rÅÆ`î¦é‹"�¶øpðÃo0…"ÎrVfõ0Í_ôôd’7uW31ܶiÁê=6Wa¬-h˜BW’Q6bÞ®¦–µã{hÖTV65©Ã´¥	LÈñ•”8¼R)°º”C_2êðÅgˆˆ¼aNwÎ�Åç¦poòaŸà¶-�ÞÉe´¨”(åÊ)K¦ "ÐΉ=Áš{ÃÔåì¬aFç|…bŒ–œCUPøg1˜l©l8Q¸#Ôw›(ÐÎV	ÌU£]uCÚÑÊb Í¦MÞQqÄŒV5ŒÖÎ,†`QQ¨ó:äÕŠä@�IRO#&ɸ‰¨%1„Zb2a¾qáX‚¡‘k¡#ÕNI§x—u{(”3ˆ‚5Žgñbõ\C¦Ûœ¯¦cmó¯t•„£S6I7Ѳ�LN ´nNBå#&À¤#&ë;ùqMxÍ BîHENÖ7–˜%†=Ëé;õîØ�m†J#%5*Tîx	Ka‚4»ÀØqˆ¸ˆAåçÅôb6Î�á6_,�N	±Œ�„—#%ÃŒߊ#%ˆôµöÐcKè/³
H¹:DÔ£ÿ[}f²r�=HxàªI20TBœi[~–%Ù¬XFø †þÕn#&2JÅM†¢J7­Ó#%#&¶%Ä0dº2o¤¸&bqßIz´’5�Š3©èÍnm­4JÁ›‘£¦(ù¥2#³U�@½èÙ!h+=oD…0PÚ¨Ùs¥™lÑ›%¤0™f3E°Ù“D#%Ð×sx³VE0`åG	òÔVe™u7
&c’7ÃÒêÏÚ©áÙÄ=´©zRr<£ƒ#$å 6„„&h6·Îê‘1#’ÐzØùzƒ#…öm,N$%e2L ^œ<âø¦Ÿ0Š%Ì!(uÊ+p>µœ^‰K‡TÙ1\¾€ÖTu¾±ÑmlwðyÁµd,àŒâ‡!œÀÎP@7H€ÐdI¦Ðî±¢a•P�àäÝÇ6m4êÌôz騹8"#$€LLÁ,$q4¤�`˜áÍU¼¦&M<aÑÐCñž�5î7�ã“\©$ÚnjiÑ#$é5Už…Ž¶)gbY¥V(ß(L ¼  h8#7<y¾åûŸ]Ñ9ÒJ�,u‚ÊI6d0…"�02XˆàõVd”ͺä/¡ÃrDç`áS¿B[n)��#¿¥¾op§»„k%¤DçýECn÷�tÈÚM=Œ§­]$xâr42&Œ^bÃg�˜p8¢0P‡aCÙCcÁ´ŠWyœŠ†Ú4vß)6ƒAnj1Fb:KÔGc´j�·ô±u„¥QD;9E�¤HÇĹ&áÂNn¡š^%§ Ø×r×DâT¢„…¶›÷%ÉÖlRÑB¸`�!•�ÅÜìs£9×fä&C8ÊšSÊ‚.:`l,UÕ±¡áÀx£¼Œ
o1´æ˜(†ä£q#%Æ—	xAÀkLÔrB#%óA²¥Ñ€¶/y¯bU ¶l´t±8Ùc‚΀Icp6ƒšfjkŒ7¦ä¡ØÛI¯')Ë–²mŽ’«UW™àGz(¼#&™æÉhA‡l)XÁ`uNb	¡¹<*Ì!¬(#�ˆ0ª#&„`´—ú!"¦ø"l/A.#&qDÞR&`©(Ab 5ý¦ïæz•ýÏ@}]Ú Lx'�H§™HÓ$a#	$	ŠŒª¨èÁýº£�â#&ÍÄTt€‰#%‹H¥•Â‹i¦
³²ár1F ,Òæ€EÀâÕ8(¶Q/Bì¾4÷zÃyŒF£	²Ù]ûz5uYhœ);H?#µ¼�ú]ŸÌæÚ�²íö‹Ź/¶O¡ÙȈÅN‹*‰i)àœ16¬�>øZÖs²În’¬V•eœÐàîpîr´ d}fÂÜda©˜dQ#%1Êu…úŽ¡Ð:ë*¶K«´æ‰lnø»õò#¯L#$ûsÁJ
~ðP‹¦q“Ql¢8À˜I†¼O핾jÕUínÝ:ÇQË2¶üED#$FÆ"Q,Ù@)°^Ÿ\C}Ž^°Šh±x	Štîèx¦‚k w=ÝDuŠT[Tc“4<×°HѦhÛ„¸|þ~`hŽ‚y*R‡KlUûÂ#&+·êÙ=�i ¯è‰ql¹T"F2i+®ìÎn‰Q­ÒþÕy©#%=0‘Sh•ó›Îè‡Pó'×r*…§òO#%ê‰ÉPâ¡ÉyŸÃ•EzPˆæ1ÐÓ¤è¯(Ÿ/Lé€s�E{(à‹ð"?±·6kéBQgêÌ›Œ?¯úMA"ÿ£÷¶/·ìÐøuž¾¦­œ—%ÿÊ«;tÒµß2Â	ù¨k,«‚Æ$IbS#$¶…N©1�¶!FñpÊcß AîEzþ­£»Ølmê.؈�,z#!Uë 53’Gg	£uº“jAÔÂç;A(Dëî!ü:´#%bÃÞÐ"T7�‰ùØ:¨î�~¯ÖUðDKSÍ7³áGÒi
Rm)­�²Q´¦´m£jŒEE-35¨1Z75T*
@ W˜ü×—¸óÛ]…¿¼" )Žå>\±Ýæ´š‹Òa"áÌáë�<àŸ3Z‡ßxpàQâ T…ˆCuA´t¤¤,#&KŠ—8ˆñ—�Ô¦96ÎÇvãã½Èè°,0�	ÔomnZü¤þ›³ÐÀƒ<Ý¥"uLU”…Pý!0 Zƒó CÃRN»B()ž<ö°n°0�–"-ÅQ2�ƒ®À^=vÙ%¥°‹(Æâ�Ý…¡JÄ‚#%+!¶—4Acb"I>&8Rõš‹Ph=Á`d�½ˆF,"ÈF(l–©£$ø?Ðágk³–(íË]aú\‚o|Õ¼ù&±©�›=÷Å[Ý�8©:;¬²r3­Çƒ�w¤IQp¡t9|<ñÉp˜T#&Å(lɈ‘b�„0!Kcb8q0­�
°è�Þ‹¶,¼R4–Òˆ¦6)]bßÆHtJ`B—E#&«IEOàê	²cJ	ÄGZ†*¦º†5yÄq#$$TÄCH�q-2Çl}ÓÕó|ÃÌOPúcDcçê)ÁF#$‘1•¥)TÈ b0!ù.„1‹ÐÂ�‹v•1
_ªÐã
]D`Åc¤eÇOÏ=[‚|v9bëjfæQ÷ö³CëÁT–+°U}÷‹(‘†PŸº
ÊÓ‚3}>°èa¼âÞnäEdaÒm}ÎV–ãñG�ªPx6¸œíaŠR:×(ŒÜÓÆå	X»ˆ²Ú#&)‚‰£©Á†‡´×,ã…�,š"Õk(°/#3û},<Žzb™ÃÒ†NSaa5„�wy/9˜Ý×3!CyCCÇ�<¦�Í:©BŒæHó‰<Ÿ#$÷ò3HÓ#%kúÕ Qú{dÎѱÎù!ÝÜsmÃØ‚ÈkfŠNUÀ¹&K9Ä`5†#%#;aœpÆŽƒPÎ\ÕèBí\—ožšÈ’Æ.BPsONš�IDn.�Ÿ¶Ê•Ö$pÙéM!”Ú÷YG4„(Ëc1#&h²äÊ»0ÔØHd#%…K%#$uÆ °­ M¤Ø š
¬ÀwæÀ´I$#&Y
»âÎè³AÈÕrm0ß«re€°ÿm6 ÿ@@#$è"=Ga`nöøûnAÿºêþmæ°p�H±]”£üÏæÌßçT¿K²…Áí6£]¨pWÛÚÐË��#$¯Æ÷^y]ïß2^p#$Áí�dçó©cX÷ßtÆ!¨{QìöF©ôØP0²*ª£U*1éFÿ®•dmck%¶Ñ­©›koÚÖRÔ9î!¬ÆÔÍüMîªÕÓ…,Ò°^ÞêÙÂUGç"Ü©²oñ?¿£œcrQÝÒcŒCñeç+û™Ž*Zì�àì´$ÕÇA±Ul‘r É××Nâ#JÊ®…š\V3UÝ:JIajå:Õι›ÝMXVÍÆ÷Î,¢ÄFuUš�C“„®,¡ÀÒ4�e\¼æmÃD ÊR‰1ð1IK¬v—Œ4ži¼À†–u‹MÅE©)è{Ç<Þ'¡m%ŠiÖ.óÅ3T‡S¾à²Ã‡±‚Æl2"±ƒ6xáØ#%° LÔŽ" Lî…žšA!†.ñDðå¬N\çì78ˆ3ù¹[ƒ¢9¬Âè(ЙÝ›x°è›K•áJj“#&*(¤à�MμâßsR±œvË3:�í/zŠ&›ßÒÆ=MŒ/	Ds9£æmöÊSˆü33É„±N¶Gp’X†ÒH¼wד ]i¢J<*d)7ÓçSº8\—–pƒ^ã�ص©§ØäS@5 «€oS‘‹‰O�ËÃË®´FÛvYTÛ–»3#%#FSGä“ä[wqcTTjqR/‡w¢JîÖõ<zõæÆÛ]#%òŠF#$ÁD(CÁs@À)@�Œq£¢F‚íì�N+'å!õ»ÆÂûó…�Š&1‚ÛkL�‘!3»‹·\e³�¯S�s¦w;'&:îçZó<ëµrðT”B®HÚc²’bCÅ//-¼ZPµÊÝçžVeE²i!S(þÍ´R$rä#&)¸ÛRF¾è\ªÞ¦ÆSlÓ)DÙXÛš””¦º–ºkF–Í F’'ÃßÐ9wtF�Œ`Œ�I	µm%ET1#$‘Bë1óøûJàè�èïò&7æVø¸�|˜"zhhÍÓIctu��…F(ÂT8*qª,:$'‚$ŸAî>»OG/ÄD�ŽÇñ‰A}];„-MC>'ÇD:w#&÷ @Üwñ*‰_H¯ÐÈa�…LÌàeá8!ŽÝÚXÚZÒÛÄ!4¶þ”ôbй! 0}3¦6IÓ$‘�Ô夢#%tLõ¥a!Æá½g»ôáP;â	œR™`!q#&�…"[®Ån Q†JQ¢ˆÔT…!))ÎŽWÈ\¸žxáТ"k%Ù¹·]ì¿ÏY°…ÿ“¥Ÿ±�LJJ€Qše´·Tñå‹Â(q©QäÎR\(ƒšÔµ©”ȾhvÂZä¨Í«{øt{Ïæg½‡{ùz*QØ8�:ö6à*ˇm&ßåœ;ƒð_½¹{ÜÔQá˜{†`TЂP‚MN<Caùòâã$… z¶Í�„2ÂR#$`a92�!¡Ýÿ{,±ÂKµ`Ïp}”.Õ˜ç‰�ƒbŒj�«¡…GbÆI'ì…”)@TiÒ#&³y"²ÏmƒE+"é;]ç!(Fc�H¸I“—W˜Ÿ•âQ€¡H¡*>�‡ÞB»Ï¨ü½›ä19Àûô¯f2£˜ˆ%D6Xîri½>_Ðj~™–!¡eAV#$á�-x±/N¤e±­cZH¥(–“×Zê ’Q¼W+i#%¡XbÔó5[¬¶bim%†±¤^9)”Rhi“Mc0b¬1$§Ú®°›VTÅ•‘‘SMEÛ-jX¼î(©­Js¥F©èÛ.-5{uv(©ˆLe%­LKe•c[T²bÍWï-nÕòvHªf’T‚¶5%³*­²Fš¥jÞív¥FÃjI¨jÇžuᦓ,´²ŒÍ›Xk-–ÞέlµDZ<n‹Jšó«§�tjmSßè<mæ³T›Ð®³ZjJ%­	Vâ[��f«L-å{}¼vûÞÖµ¬ôçZJÐL±çË¢Z¿Çüaž#$ïŠ=}ÏÃø>®¾'n}¢�ä‡i#%Ãoå—sJK$ÑíëÒÇJLèB�·ÃwÏáN!q#&‚J¥}0[EÊt	š0̤QD@—š4BHMÖÐkÓ¦Vm*%†im3
EŠH ˆ#$Î#%‰ýË!ìI%6¤"+fke-oemºm¬–úWf¦—›¶ëso—v¼e-]-%­ÊÜ×(ØÔ›�«"%é²D"#$îM©àaã9ÔH#&oR	P	E@ƘÙ&Ijõi¸ÈQ©­”µ­6Ê™£m&ªiM©-�™PbUM¬M¡¦ŠJR™ÒFS2Ä)“lÊd””[“fl‰²Y–eE©6Ê$¢Í*¤¦l³QF‰LSM¦2ÆÍI­*ILcI�4‘T¦•6£U(6R¤JI2ÉI”™ˆÉ3&ŠYµ–Æ*‰• È”j’jSVm•«K2bÆ”ÉR•Rʶ*µ{íZîªÆР@a*q‚…ÄFÈ„�E‚#&,"*#&ˆbX€Uy–¬V´[)¶7ÉUr¬#&EQ¨!«(ÔÜ{CFÃû±·¬„�Ù¹ÜÝ=SK†ô÷váŽRêÜ/|‡Ãžoí°
ý�‡¼“§ÏŠÊ4š�ZœÊ±7‘Q-�„�:]AÅ©9og#$tjÁ<a!I·.1òY§@>¨ž¯Ñœ‡®áÂ=°�Í�ÐKAŠý~#%®Í�vá‹6ÖPLÇœº;¶ˆMùƒr�´tå‘âeòK>áß §øj0øæû`ígXs)ý†£$%˜R*Ub„Ì!Ô#&:Ó‹ª¡&¡b¢1UA40Së#$î#Ü
ó#_Ô]ƒñ€^n1#$næ:#&Ú»‘¢Ø¦	zèžLù¦€ðQDþAù4PK’z·q^¸aøhS’AkMnÃóúâ›,)t›bPTìúaìíûJLÐG@‹—åI)ÜESÖ#К&õ<Owu»‰ÒÕG8œÐ®J3k­x‰„$,KN²<0uG×»buqfs&ŽpÒè˜$$ò¤ùÉ"Œ¢�ÖŸ¶ÒéÔ1†}ûcS†ÅŽ„‘�0‡Ábµ–Á¡aÓéÒHgVB‚©â³2JüÎcõGƒà3»¢ÑNíÞYËåxë,tgc£,Gàz@À9‘(
@º†é¦Í(¸±©#$B—p#$ÔUF­F#$ªùÚºŠ�¥ÀÒ¹h“œut—>H‰*Š‚B(
^T‡±ØK‡n}«G™Øm¶1׺¬¢Æ>ÇOQëBÔXH²lp”ˆ�¸ÂÆ+eT<Ӕ㜵€âUÛ()15XZt8Æã[Óè5úÌ�Úsý�>sòQ$Sá°t™yú_Cæ›ÎŽß`˜ª}m]&èÇPpBdÁ#XNŽÁ¢Z‘«’µ¹•üÜ®ÞÉð�$ÝBûOõ'™E`.wªú|Ý$Q®šänœOì^¯]�½,E”Šòoò^#+x‡]ìåûíË—´Wêõ]^ír®!ú#&¨˜#%5§Ž2–CI¶Ò²lÉà•U–7€‰µqR€Ú‰�QJU£g÷!£Per°�#%n¨ä#O­T´5Ž$‡–B3›;2âA¤ÀŒ#&ÅY£	Û!¨âlTf]´ZeH²-šìÒC(-¡�«+x ª«x4­úPD`×PS�öw8£cÒ ëU#%ÁEäÜ,à{µ?O�&¯úPçΨ7h†eo&”ÕD͵e`,óÁã9Db�~q]¼ öÀ÷ü¸/%.¿‚ìÄ‚d5’»•¤8šÐï®-v1[ÉŠ<¡‰Q0BJB@X˜V#&аkÒQÆ°ýv³4;	¢Æ\bñI<
ä}®>Qie�¨ƒ‚̇2sî�Ýn:Ú³ÝöýÁÞýû«ZÑ.IÝîÎe¥N>5;ùØšë‹è–aB·hC³Ü¦©høãsÞ!Š®-å,»ðh;8J¢9à‘q)4oqxÄ-Vú4ÂJH‹ B3ä�¦ùç«ëo~Ìx o B>?—䪜w=œí©àL-`16ëV�—*M¯ì±jb,ª ƒ¦ïËjé?,„‹{s‘¿~˜õ¬É•!«3U½Q'f,$2“Ò·üʥݟ³?Å‹;Bd|—“r(Ô”vÈ Ö°ªˆ²R?ÇS,jÞ¥­íc´öòª4Íá"#äj £&†Þª*‘*0f/bdÀ[š}˜=ó¯ƒí†Ò2ÂÈíràhƇ¢¡T5#%X(<ŽEs¾Qæ#&.ì�1•zÅëœXÎ]fÌ5{q8ÚÍГ«Œ"ª)	ˆFøêôbR.´<TÜ®çÞF* ‹Øõñ–§MKÜ©„IÆ¡ãPÀÔ︱ù¶:÷ŽØ{¬ûÅ(9¤X,X+ݱ±e5#&�ˆ[BIª‰ªZ™
,âj˜¢h%þ>%žÞþ>(9�>ÊHä”™[â&»{›"CÀ‹¶„¤Ã´bK+1|‘"�,Œ#&iräh®H½Üa[cÄÄhŸóžüFÝj�:ñÕkQhÒp°œh«:š(Ž¨#$ÁЂÏy�TC7#;tüê:Ž	ÝDtqîÞ1q-c9Ñ\÷a�d•Àk�Òæi‚’�ð(àƒ¡tMävMÁ/Ñí<|ê�Ub¾Ê)W”äÉíë4K’Í7
è{<NYÝÖq•³8*{Iדˆoƒ±Ôè*Mg×F®“Uò›GmkÎÖ» V¸>n$µ=':(`õâV3’•D{YiÊ–#&:úÙ¾;˜Õ	ÔÙ~Ù®‘îzN‚A�@Ü:…8!Òq(l’,‡S#&DN ŠÐDçÀ² È£ Hc7¾§>É_Îø¸ÙË�…§#AÔ*‘XeËWYŒÂÁÎ#&A¼ÑíÎï†÷®D@+ÝŽËñü¯<T°TÚ©É82Ò ¬@¨å™¸VI»­Å~ïnÞv�p“n=tyÛ·\-t™MÒé±Þ<󳟃Q1¶3&*›„hi'툔nT£‰ƒm¦™ÞC7«Žè·¡TÔV÷²
ã"P;¹6ƒ!Ž†#%lÕ)ª(Í(9#ÚúÇtE*B#&CÎÐwáμWÅÊøÖžow—o/UoÊNcó˜(q)œ™¯<R…^[…âñj˜¦«XYL&ðTFJôšÖ¦JyFDwríððLÁï_Hz˜IÕE6#ySRÆœ±é£p; I¢Faã«”Íl.-°f,ÛO#%$!Õà–Q9µ3“H­°VÍ·ÞõuùQ{fÞÖ¢-ë¹ Œ9œŽ�YÞÜR	#&J‚RX�.Ý_5éë·Am„¶Ñx¶‹ºŠY:Ô¤ˆÂÚQQ»°³@…MÕZ=—-·¬ŠØ¶Û®õ2à‘MB®@�ŒcJ1Ó,a¡Qª•¢º Àbi°n½'c�Ð÷#&Àµ9öëÁq¿¡é–>_�N�U"#$†~ ’¶6À¾¯Ë£;•.4Ýí»ŸJ"�Zº‚k‹-auH“äf­R`û´UŒ~mÕ	µ“X®ZÕM#&ãõ¤:²DY”årh0Ö&/›”%Fµãf˜Õ·ÜªÕâ�FͲ–Óyt\¯‹nS<íÒ–�¶5_‘Ëb(¨“V74�¨ °“9 È Â…
þ¯÷*Ø@F"#$À�ˆx~zX‰�ë±CŒD /{™ûòJ#%¬gðYºO]¬ÎÉàŠFˆŒ7:gMµÒ,'Þ…è…Db]·	’pg«9Ø@Ò¡I’7)Õ:]ä<ÍCé°œ!ù��ƒpá$F'“Á	aî9›�'`>©(¨l(Ú9ïCù –¥†ÝôWe4qBíñ»?*¥#2¬c	;J5¹*p›Ý=f#%ú¹Þ¯u!ü|jšV&šîí�L‹F“h­N…N_"{G@�  ´K1u}33ÒivIЃí£+×:;+µc˜y0"€ ‚ű	°mB…ûþ¼tòqàNT
Q
ëܪH?xÒREÒË.ž°Ñ>:è…6Ôõcòÿ¿*¦P^Ðã
‘Éá‘D'_Ëì8ç #%(­lq-Lä‰V¦tVÎ}Öù_Œ°ÓnÒc±½òB9;aÁë‘„ˆëM H’ ?XÃ
Dõ¥~5oÝÃ$V@†ðä§P&>y5œæ¿Ý±ñbóÓ
×·ÓVŽä	8š¿3y!z.Ü“62²–ÐQôÕYª_Øýr³�#%³Oyà`Ã�ädA�Æ‚{ìèl¢ˆC‘Š‰;~þoZ;‡gbÐÀ#&#%�#&{‘‰‚+±å×Î+FO–Cô3?ÁþÁ“ÃLÅšqbgÕ(þn
ý°Ò²Y†Àb”É7 ¬@uŽó’škÕjŠpAíöÑï,ô¨}óàþ“+…OŠ—#$ó" 0ŠÈ¨yRËsk¬ÛVÝ5ª�¤®°¢(’Õ`ÙlU1#$Äj#$’# E¡dQ#$%ÒwàÂîËÑý ‚‹Ü‚`«l`\¥*e„À" ê%#&Q“SâgÄ5ÍF†4086¶cáî-ÊÀd`€½	ÛÒfÈL\Ç3v3•i›±²ƒLy1ûF0ÐoÅ Ñ’#$P…HÀb;èïè�àa�½T‹-…"¢¬!_·Ö�ãT–#òyÀdAdöZÆ›->¾zi"›™!d0ö¶9�Ãô47î“øVMÃ/	´ŽúW™CÁÏ#»la6Úu`u1ï
2Ü“€Á²j$ , })³~¶…én­––ÀlCm¢5?Ð�gÊOé‰üø¥fRrÅEPª!�áw²dIl•’©¦RÀ]Vµ20È„Â}i4AH±5­Ý þ¤2ì"2L�%ˆJIL€n’›!ÑɈ;ê6„ÞÚSýR$G\±°KV(d­nS#$)Ã!i²B“m«.ˆ¡–’B·¢Z,"nQ09` QÊÍ&:‘J£2bÌ®nלÝËÙêGŒEguµr±mñ
«&0Â�2€hÛq­ÄI›/&gz`L R²)‘e
d±‘ÍŒ�”*(d§þ–êÉ n;2X†€‹�Ôjî©-ˆ%�Y#$'$;3M½MFôó#%²*ÅZƹb%Mê€Þ²'rŽE¦«M�ŒË{w"#y9È×#%\¹µI·-Š×)›×®ôôdõ.­ðlkp#7 Þs ´Î´í+Kn3,@î È»ÿÓÖa¦XHÁ®$�††Šk*;B#%­>âj±VwklãP1Û·Lm˜�ºDâ 8PÅŠ½´‰¯#Ó+EMª$‹)beÚëžjÞz�ˆ¬;’ƒ²2*ŽŸºp¤õuYÂOU6^þiÒÁû€÷ä>¦Ú¢�ü˜U±ªD¹­ÕÝ]–æ*ÄpÔLš†ÈÈÖ8$¢¸ÈŠ“ÂЈ€QVØ"ÒRcé?¯zRîˆj²Ÿ²=¹®gÕÙõ½põêê¯@ª�)ìu&&ðª	ðg'ùGퟖ#%äa�w€¤`ȃ0€$R##$aýü_¡#$RQR#�2–•0͢ͷ–ÔW�\“&Ñ-Œ#%£6ªêT[b5W-ÚÙ56•5ï]6Í-#$\TMä@µTb’
Äè GðXŠ	N!"ÜbŸæäs?¯¨±ÞŠ*Àƒû:k	#%ÿ||“¿ãç¥î)£'OÃÞnO~¢nVñPÒ!ŠÑTˆWóÐR$-RTZ�­¸	g	×b„ÍA5e·xøÙL¨¦•ÚÝ'‡ËÁ¹ŽqT3 ó+™3z�ÊâŠb‚ÂkNJ…A@§\¾+ËÎêV+FÜæfË,Ë�j[ a	ÕX&Z ¤F�«-3[JÅFÝWuF¡¶¦™01LÑ* (Cq!%ÆÑ`�1)$²–ÔZ´K>+:mN$"²D#%¡.�`ÝË×eú·JdœXñƒC©¨Ò"Ö͵ [hš‡KfÊ (F RHÕÂèˆÒ&T‚>èê�
3�2°\‘¤±&XI–B,±'Il€¤ßX¨P•%W“ÅU#$¬XMOÒÔà4•"&" (p2õLï�<`ç%y£geФ�”>Kó’#$œCxŽ×ÝÄõî=\¹æ§m5ôšY1¡È»¢´(F((6[³#%PÞϺþxcaùŠc ¼‹N�ù$cZ-;µ×-…”ššN�z×zÒ„ ‚ú÷mÎ#$á÷Ÿ�s9£7èËê¡ä@†²VüF@ÑÛ·š<AR�4°ï+ÐK^9ÕÛ9	©1JfÕfkÞëu�5´ÓYOR»&²P%‹aˆšÝ›ÏÛÁ@qèòçÉ#$Îøñ¹«òxÒ�E#&°hcCtñKEmÓŒa[T!EÎó9’dy#%P'BSq1“”ùþºt3íHK¢üúǦŒÕ" »f†¨¥8¸ÞðÝ`ÎqDUäg$ÐÆcÕ&zsvgBLÐÊH’HG{£1m•"—•_aˆ¥QªÓ�N ÉPlb9%çòO?KãâˆÀïê�UØ$�þvXbf}?.4÷/ß>ИßwqÐà%ç.ìú QÊbÐH–l@Ò)pj¤¦P­ 
ºC2wÙÈ’N&úîtúYÜkÀ]º.ùé‡3{f᯿R”Àá8EdJ› ý�¥$Dê9¬OF©£"IáqÔ·�kÃE™TýLÄ�°T2Íl"ÌÄ™PÓ&îEJeBOÇ~Ó§gõ*¿w�¾{w.FÜè&™#$=½hu[ѿþ°˜ùñâró†v_Ýåz-%–Ï0àt4&=“IìÓpØêß®ÇÈ£[5©?odïîðOz |šnÙzë£y 'Ó°ûwÑÒ ‘¨Wß[ ¤’$6Æ�HÈ”-LŒa›#IZ–Û-I´kFQA3_È›¨�¡5–NÚ¹­LͲ*d«S4¶C-³Ì„Õ›m5HÚÊšjÉ­ÄTj6¡¬Õ†›m"™¬¶l­µb%A•>kúíûkåÙ5ýÃ÷´�9yQ£d�#&½6HDÈŽD=A^�çWF¶å¶-[vr«h«´VìÕµÍn–Ý…F#%_ÁR€€òpö]¼õ@æŠ1#%ñA$YF_4,§l!ó’0]ð_Ý0S9uZ¾î4œÂ1¦¢ìPJB¡{`yÑO£é‚h®I'Ï¡(Mð\qàa°Šà§_b#$YPõyÿ©ØébDFAj#PßïCmÜ�÷'J–ÿ!u÷¯îiµÝÎuWÜÕÍj×+²#&¿Zp@Šã¶�¡ÓJûBzëˆÍcÖôìë?Ó±+‰Èã¿BœX‚J:&€�Œ_HwÝÂH%GY�ÊÒ&ò#%MtÉs&OAûüµÂ#¯î­
Ò�¯L~Ÿr©ì"x½G§Ù¯²1-ãÁ(�uÎÙUM¦±7§Ìä`:UW¿­ž#$u=b#$L��²ÃrBËA€*íÉóô’س‘PPËiµ¡	PŠ�ßõ“€“dþf4üò…*´l!¨ŠÄ!´Ó‘ÈØñ%ÿ ]:ŠjrjŠ(¼2Ç,¯lîþ?>úâÑòCô~³	ù¢È$Ž›kÛ»GLʉ꺿gtSï“îèÐyèû̶£bš{�p‰;š�ïâKõmdIÁ×Æ1ûù:¦I0$&�RA}˜ßú¶áÇ<nÿ-9S�ꜟ0éÍSUxóüΛ	Ù�ö!Å»­S.Ü6‹i@ ÅDqD¢Ò“ᚌBd³åâi}ûm«´úh/ÕŠH—A’()Ü”°EÄ`,Pž"bÝϧ{ÙÝ›5£Ú49ÍÞøÿ®ìƒz™ƒ6�P¦J(´VƒchÛ¦TÛ=$c�Yl)k"f¼ËÎ×]3>îÞ¿uƉôuïh©‰#%¦õ–�•ÔÑð“ €Š†’±¦C°Ðb
#%#˜F�f÷p•±ØPi¹»é:„°p¨»û[K!R4¨.È^¶O#&wí)
á�S1æCq�b]:kHH‚m¼ynBÉæðòÑû5ãK7ÄB(ƒIŸc¦íœâ=ÝlTkQ�!.�µƒtܼ`�!LaÚv:´ …ë‡fY{õ*ÇŸx}:c®¦� ‡À@Ùäzv„¡"Hö˜Y B+L!AŽ¢Â„�ŠÄ!,0#$)íl-ÉB/¤÷}6x*y§Œ#%R·>ŠKÏQäCóó5�#%|ˆ|§CÚÏmR±@_h5"“%¨ôu�b~¤òPÓ·’…\‡4È_kÜ'X}À�ŠŒº8îÕEëÔØÖ€Ý�žpy4&ša&X¡#&c#$D˜JD`e56Ä}#<Ï,Wçµ}­o¥TPnn••õnÖØ–E�ñ¸^t¦€e6#,¥JnèðhDRÌ]	†#$G%¹u.ƒá’€º”y3F LÂáE±n2àÚl#zZÒÓm5Ε7†ƒP“¢íkcci8œEÜÅ Žá$…v½]á£ïÒÖ!D+€ÓŒQa©®2N`ž‹›?í>`䕇8?QÃ�xÊ0wðÐJ‹3#$ú†z㪠ÈvgfÆJÔRdンÙSLÜÍêÙ‚O¢A �™¦-OêÚö²w ðãüjx%?-¦ÿkŽ‘¼´¥ö¬îº$—†‰~|hI"´	œHHXpëÃMd¶ŒaT:	˜æò<$�’{*êÄÇ©<ùÑŒQßž‹K�×�7áR¼åH»JìË¿[è„zgg�áð2�ÕƇxh‹£5“Íò�æˆÅ3
ÐGÓ×äF 8Ø/€TBLÚRħïÏJ1 ÃKË‚æešÎmÊJïb»Ê»’ÊDyè–#&DÐ&ú[<ŽØxÌÆ	•…L7Ì!Ç—/�*ÞùVÊ¥�f:>´%�ßÑø³&.þ½w©Š†ò;Ïq#&"6ÙÌÀ`Rª��$ÃŒ(‰#&[‹ki‚ÆÕ C¼Î@´
êô”©�SâEoKAÜz<§â‚Àg
fÌ`[€ãrÍ�_訠µæÁŠ±‰¦D!¼í5ækŸŽØäÖç¨ëií`)ƒ=Þç#&©Õ
A„ND;Pîâ¨CR)ù<8›'!
¹e-Ú
/0F¨‘ØýÍ‚ŽŠ‰W®K;Zš³3öm@-ÓÉ­lB²Ò#%¶OP�¶H�òê«"x-¡¤¢jðÌ#%"j̽:mºî›·–ÈÜ.¥)K$Ré
!‘ #k@‰l’P— YrË‚€Qa@”6•ôûw›Î©#&×ûp	Ç•o`ó‚èªØ�åMÑU*¨¨’«ñ!é˜þJò`Y#$ÒÁt«,H÷p3ÄJZ¨ȳ5(`›¸ñ0X¾\*Ѭå¼í+î°—3"Ë‘$¦6ëO¢#&:Jõ—™o%�kË�ÊK|QF1=1ÍÕZÉ#%³–+bO2 Œ#&ÈêA¤Z#&ˆ™@Þ‰½’dbGtÇ[…Þé˜*Öàx Z¸g9M6±‘ÝÒ�=!¼˜Õ�Ý�µbDF›lÉÀ`E�ÃBþþÕ F†Ã#%
½2l#�,¦ÜÚ9!
—rRéèb¶‰�F&ÜTöDòtH!àt§ Ã‚B�	ªLé†hä#&�}issz^S©�è؉>ß]da�_çþseû¤ZýÓ—­Bô#%À›'öjmÃ[*Œûe„¶S¸a×Ú€>ê„{"bBU%Wæ[WV”›fkJZ4•3VÅR–¯Ê¯ÌñQøÛb%~êò¬ó­sc\Æ®š6åt#$��ö~K£Š~Žc¸‡llõ`µ£Gku2z¾Àëä(*,=žWmZå7U3ë+ËŒ‡:tÑ:#$�ìrL<Ñߨ>ð@šštý !�ƒ×`Øh‘Œ�sv5žï¼÷óÏ/eçoü´íx©¤_Þ~ŠÀÚ,ðŸsGŒÏXΔ¢D@`ƒUV‰bht�…≂`dÂ>ÞoBºëö(é¼7ÀpÑè#$£&°xH P8¥F4ˆ;ž–Çjp¦S4ðšzέ¯NCúÂÍsAÛ£“�.ãnÀïQ�j2B�÷ë³Ð:9à±v‰ƒNë=ùÛ—V_ƱҀhÞYÀÂÒ™¨<ãÔ•õ—qc]pÐù|OAWñ^zò9â›]ÈÙÞŽ<ió»�£yŒ4�32;ýždƒ¿ÒOÜBP8ÇŠ‘š>J>ÜØõ$#&÷	<}¼{#%ã=ÌÇ#$Õ r™U”MFοåÕ€øÁì‰I H�èc4„¬5dQ¹ZPVo¿Ó¯´šž¸ŒLžR{R!ÀÇ›ÑÀÜŒn4XÇL¹œþ¶'ÑJÉÁ…ž2¾Ñú= a¥.ŸÆ7›ø©á”9Ç‚­‹‰÷�è2Aî#&+=Ò?#%#%D/Í #‡“£kþn}¸gÁPÝ72ìß7Q!ö]bc!HÓVžæì¨w$‡#$RsªY‘He’©Í„¼Ð\Q%Aa1zŠZHm9üuÇg-€ä¤ó;¥Ø5;~‘QþF¸Ÿ„úR´YF1S•¬.¡rD‰›º¹(@hVÇ
;ä
@i¤’Æ€ƒ#$>ØÂ@È€% ò3P!Ž†çê‹æDàj11—¥ŒF™Æf#%K]¥™™ÃÏú"Ñ[�ÙñÓ1}#&ÖÓ+ñ?Â#&üóîSo³¯�Ww·^ÃtÜãqç]>LÒlyÊ%i*î‡mZ¥²%I#9þHRe©œõ®­‘:d™Ã¡FPê6	)�J/QGrî¡àõaáÂ|`@o×N½DWP^äsõ�‰÷õÐg´ÇËìâ’"„ÇÂÒ"GPäüNŠe#$DBŠjÆìLÝ¥Å(ƒT¡EA˜·k¬ÖšU–mS6¦M¦Õ³6Öê¶4n™KÅÉ4®Q5 ‘‰ ªÅ
d@G§åƒ¸êdgWÍ!ãÓî~-#%?u²¤ÂpÊf#b,¦GUE’Ù5÷Q`‘@Úð}•H�®FH»~›LÔ‡Àü%Üú3LÂBkõèt�&øÄ#“�͹ÊIWKQWEi…þ�Ðm4°d�µºIŠ°å¨Ã,Ð{ÙÙjÎŒH¥�²”ÆŸ!«Eƒ„âkù®n‘�èa†Š#$(¡°ÆŠ»G&[Jé� Þ;9þ‡Ð�Õ•¢µòš`=¾t|ë¼ã¼BªÅ?�ô—ít(|{¾+fŽtá§ì¹³ õI]þ¾þü}¸2dæ õ¿A¶²šŸcÁî„;ÄC¿|>’Šf�&L$‚.Ïk>ûT²Ùûï]#$×&
ºÆÿ�™‹6…¬PLI<ŠÄWE›”B—i�¥’ÙDçôþÏßý¿ëþPþ6§øG|à{i¾¼_|1}]Fµ,sEÉÂ)öxÒÝHP<Dv×qXW ‘¤€]IÂñ�)#?a«X–vk¶�Ú²éî�ÖR•äË{#$Ü‚ƒ8Êš› n<qNØL_)]HæKk¢Ø\‹Z[“ ñ0{ß–ÛžQB)!OÜø&ûôŒ¾-,΂²Ð¤IÚÄÄƶ ¨

ÙÉ?€OCܤ˜'¨·øC¥ûNÑ»�òfœ‚fYá,dZsÇxáÔä?i‘í7,¥P‹ˆaÚƒ¸9Òc#$í±#%"®ðTaî6æ0ñÒLè½nýlFw‡|Þ½zÛm÷wc.*†=»Eé1˜JL(Ÿ ÅŸ•Þ]$�—ÃÀböeHc×,ÖÄäþAdI0|L£â&d0öÑ¡#%¤3ÀÍ�Q>ì�úf#²™>âoµ"STƒöÇ£3#%Œ
Àìu´	1i„…ú?ÁÓL1“:G(ˆÂÝ>’7ºÀü~çØLØ–²M0Îk<œGJãä#%ƒž]��€RChp%¹—Av0ýôoú1J&ù(öÓëäõñ8±�öÂënÓC)HÕÙï0Sà ÈN¾†û½\ß_½ fÜ@�#$wEV¤„!—{Ôò#$ ^{7`r§D
‘RIç[›XµÓêj*Õâ6Å­´[F­F¶£ki›k%¶¥´À€¤…0$7N”
Ä×�åû^ä왎ÖðL‰”ÁUv.ôp@�§«zríîfœÐàDɇ¼¿pYc€;Šø›ÕpÉhÏfåât™âd†ýMß¹“Žš![¯òϭª€m4õ>¡€á¼¸Áh[ÀåH2„«*b¤MÐ#Þô|„�d|¶xw¢m8Q§þ‡ðÏâ`‚HÔ©ˆÓ: 4c‘îSýÜøÀT:âÀ[W (7£gËåÎ0i|B…Sæ@!°0ƒ>"ê(F“¿€†2ƒ?ÔãP†ÙƒŽ.3ƒ€£¹ýã¢1�†ØsÐF3,¨®%ƒ¿Ý3¼ÌUf�#$ºrì#&æÂy@“2T©0ß±µ´ðî�ÅõÄg7#8�~òÛ'NXüß©˜#&rœ)£ûš@FÚ&#&Ocp‘¸}¡ç'Ÿ•ÝCÐ×F)”‚CjJ€ÜZ‰×ûåÄn’
º(iGÀîÁ¤#$�7iý†¥Y)(Ñ]ÉÜí8Ö?c§·xT†È‚cn*÷YhH²vRIJ–R¼!ôôöË÷3éœüG'Õì&!¯ëM%	À’%Ù"_{6 ÊLš·Åmr®Zü¿�÷UI©#–V«ÂÐhÅèñ6Ûz‘™÷hôÆ㯳Z¨Ý;K%¼à‡åþ{·‡*¨õaÎ!�§¬3É+Ùqî÷39ñå©e°=ÿ+ø„Ý IÙ�܆QŒZlË�Š(×k…_×—¯´×àcaÝUÛ@rh9b¸ß‘.³¸®ì°®@Úºµ5T7]3W¢tJ|Ò˜h�Nu)`#&Ke#„cL@�Ù¬¼ ±UŸQZ#%-<4=(ßLd‰°h�ËJ¸ã8îMЙE¡�¢€È#$ÄÆ0�b+fLÖ)2¢íÝEWo¿©ñ[ˆ\L.bÜMj‹00ŒE#hÄÈÔ³,¦Y°jRAŽ0i6Èä¶�Èec£Z”D 
Z–(†ˆ@š‚RÈ|訤DÄh�ûª‡¿ªâºÙŸÜ¼L@)s_Ù�W%PH$ˆ£7•K^$«ç•älµfms¤^uÔíݳS)dÒÝÝ—G“oƒzô¡ 1H,m¹e&j XQŒà/Ò”s–¬zñyÞmÚm6S3e¤´ÖÍ-’Q£Iª2Yš�,†VŒL6ÙMMë¸õ:Ù^yâóºës*M7]¹.W·vwWî­Å%D’)’0/49™Í1$AHÆA[Õêê2)+CÈc0‚mmíc8uPÒ+©a VÁ«pÒI‚ŠÂƒLCq”…ÂêæÞI+ 4‡Mˆ&Ü¢fÂ*‹h˜úeÉ(L`A€û¢Ž°‘sWy£l!´á^K‰&pæ Úú¨¸Ú#A¢Hqâ|¸hÃ#�ÞS„ß}#l¦6Æ8㸑§·¦›Íµ&Ô†#%R^Û\Ø¥0ÊD¢‰CCT-ÂÌ8͘ñ΂‹M€ÛÔ»Ç]J8Úd2iJŒhcnkü8(3H%;â8`¨	+%àÀ¶]JˆZ" ¬4Ø»e (^ê¡hX¤`1p+M"Ú]X14­-t­ m!WSš4ÐÓÚL¬‰1¡–µŒ3}òæÄpÃÁb\dm2�Êllá„ÐÔš–±µ•BJ´næ;OÊMÈiž{{³öµ±–qZj0§½ÄG€Ód˜<S!éÍ“5ºÓ­ƒÃ&A^)~:ZKŒ==&0ÏH«m épª,2á¨zl^›†iè{ïª.ZJ<M"á–±s3Altå•Ä†K³Î#%£jT,Ô‚nOÌnµ44’¡[½¶8¸­äõ@DÐð?Ÿ¸t0Díܼ$ÌÃ<Ki–üߢ’e3g5Xý¯FÙ¬#%ÞâKm(Ò­¼bƒ�(Í�ÃI…+ÄIêQ6“HÄ–«£efúÐSy¬„ÄML¿´!‡YÈ«„[Ò¦*³1Åue2Åy#%Qk])hi èjšG¯Ã¶¶†7xn[ˆæ‡riûr	ˆá¦všM�& œ¡ƒÌ��”+t¥°oÐMÃp|ã[bL¢Ùe‰k„²Æ‚ŠˆŒÕëÄÕÍ¢®›Y·—W)ãVÆÃ#&>e"^ËL„,‹e#i‚Q �‚6l˜L’Z9þ†„ê|z:{½ïw€ƒ/Qì,*[ÇÎñ1öÙf?UÖ<}¬½MC±ù~$1âÆZ3÷AwMˆàøýLhÌš×kÛìïZî*î•R'ò°é“m%Š¿jü·<]Rçy6óÎÍ ÿOBçu3ß4<ZzY�rkÝ[i·fÝÌpSËÁ‹‹%>R%߬´bV…ƒÝfòú§ºÂS+„ÎÃÃÃJZššŒ;«º4-K7žv=´N}×üGýòcmt8ëÕ¯øÄö[-uu#&)Ó’@‡uqr{™~#–õªð×3êqÆ4tbZø£ E’k%É�ÌfGîïÃÞö‘M! $q*c#$-p ã#&ÒTáZN.Èo«)‰YË^{÷ð>o�3–þíÎÛy8ž>D$㧀º¨4P¢�íK3	Üòú¾Ã,#&?‘šGñ’ã?aÌ5¼<Ï2³ÈñK5vÏìÁ~¤0ù³§>eÂÎ\08|qš”,Lrç,y²g÷õA#%@õ0LU,(m �Á•iN†v¬{pNXb‰·éÕêzè_Õô:îi8±¾`·}¨Ú°Û�ja¸áÊ54Ÿp/¸=¡}¿ŽúÓØÌ�€N¤ø�|(’™A`€'}h"ZŒaDlZL#ch„#$GpX$¥­ s‰¢»LpÝq,9Ýí]œˆN-2óÍãËWŽšMâ·emÃVå�¬šÝã¤ØÖŠ¼»IµÕ·J»·9ÌÊí׊Ñ]\ÒË4cR53*kœ6wm¨­&©lÚ®Zç´Û¦¶“x«vÝ/<«•
Z„BÀ¬>C#†DV;áÄF°��àëTŒƒìª”×3í°‡>»ãµ^´Ú¾-T¶²ê¬¸%PT¢(A¦"Ë'­„ŠBG
HAè�¬7”%hH°Ôó¤¸EÊÍ{my3D¶jA, !F, |{ä2šÅaHÑ5-ÚÞÍj-£kÆÝHm‰ünµ¢¶*S,¦Ñ¶-¢1YE±cTkTÍ¢#%FŠŠf�²j)šDŒ¶ThÖ™¬3mf#$Šw°)V
AÈû:Y }úCðþ˜Ú>V¶×«Ô4š¬%ˆ6¿3³†>3óyãÇÒö7ê¨{ËlÿW‡`;cä›oᦺO~Ç3­D #è€DŠ$ FZ�Ùso6hÕ_’k~ËV®%[%úyÛ²D­¯Yt›œ¤ÚíÚ+»m¦TVÚC%e¸Ý¥$¨‘@ b…)@ŒE­Û]Û7nßÆ_~¾]~¬ö÷ úmæT“Ò” �Ðu`éDŒ’B#$³‘P6dÞN<4€B*¬R#& Ôƒ˜Ý
øC‘ß×°^ô÷.–ÊóÒ�è�81CS|;ãG[FCzÁ	¹ÚÐ_,ºÖuÞ5mÍ“óÚÍÍÏŠ¹�³IИË!êX~£P�<½´5*¡éUƒ0¸èÛ3*̹„dn�–21±�W€`Æ=0„¨#%™€Õ«1Rl®„‰&š0c'ðÅ{q\Œ�[wO²V2Í»ÎG‘Û‚Ã2[ü§r{ýqr1Š›l7X%݈ˆ÷o�ÑÌÍù¹Œ'¡#&Õ„9³ò®¤¸MŒìèúœ—™�GlºˆmÇMϵíÆlæQ廒S­Ñ®æu¼æh›wX/ƒ –ªN9¨ZÁû¸;ÝÙ¡•*ãméø}÷ÐØ?éG}ÅAGí'_:´2w÷ãÃ�XÌR¿#&Ü`õ(
Š%S¶§r×`°^â5ÀØâùã¸r�61Œ®èi0S°Í/réº#&×Ðô´{kÒûQûÕïNC©ò#%åõÄ#$û,"¨È�"„ »Â=±T÷,EïþMRÑ#%XBX›2@µ²o‡uŠµ�kçUrÚñTÜ0c�có(5ëüãÔðÍ>ø¢†HÞ9[€û㌯²ƒ.úb¦��AH”}#&š@Ö(5 !d\@ÄÁ#$àyum€ÈB¶*È…ÂÍ“2mH+#& bÿ;²¬aÕÈïjÍ^Ûkw¶åµ_:¢¬­SJLb�m·m�½ýcjó» å*Ø¢"Â%!vQLž.1–¥A `À]õ.í¬{ÑUi«‘•$ 4ÌiG–3V©FÈ"²#V†°ˆf#%1È’€ 0¢©#&"ÓE£AW

üýE&Ä‘�È…ÓaùÊ’ë"@¤ÖD#%ÆP/lÃ?ýø¼#$:Q�X1AŒ=c¹¤@Ï)úøM|ÚKÎo#$LHNý:…×Ô|°cÍ)ѳY©œÑò=áÂîLé¬Û¸bð�°xÛYjç%p!¦™2e*Å-¶Ÿ躖3Y˜I¸H@иŠ"¢Œ	ˆ“„
Ì W÷»ÏFº~çÛ'`U{�üõLrzü|ö<4ÿyl›Ùù]¦‡ãöFe�÷�!õˆÎ<ÜŸ¢	±#%jTƒåTÙEÓÕÕ©¯IòÍmšu1ùHÒ‰ŸGÏ“x§KVVry¾+›½~Æ4ë}5.(‡üŽ<®Ke�gI#$b*œ8ñ8.o UQË�n<Û&™1Ï­eø¦‘Õ”®É*Q Ayšd!àkf÷X �áæPî.^×Æ$s�ÆŸX;X•-ÕµŠèLlP”:§�¸:!'IDÒ#�ˆÆ#&­§�Úˆ;6lz>±PÒ ÔΠémدWg/åáðð$Ä!1µò{CŠžÚ~é&fÑfÛݪ˜©ÙêáŠßa/OYú€<¶ÔA:ÂÐëc B¨ˆ”
 ´)€u#&â%¸úpyPP…D¨
äx¦£s§ü[§QÍvùÚî%J‡kX3iÙVéîmG™úý¼‰$dXâ5®®í#)já¥×yæó*´¼æ™©%%c—RÕãUÛ-¢“b�M‚ƒ`ÛÅé­%c¹Õæòu.Øw\—6îíÒ+¥âÞ+^(楼¼º×9lË%ÑåmÚ¶(Ú·—v«©¥®ÓRd­6¼nã2ëºÝÙ]vݪw]®UÚ;»ME±G5Qªí-\ÒÃû)cj)�ö§²
»!ÀÑ8#G¿>Îjz¬M#ððdBÍhý¾ªT<”ÿG�—#$V0ì‹ç@#$�,O"X"½_Š�¤@^¤îÐ#$ôþ˜üESÄpEÀ=´ƒ�SÑD`±Péïì÷VÇv~)¢ý……ž™”¤¦ÍᥜLÝWpa…êqƒõüù§ëò{“ÙÃØáyÈ*HŒfÚ¢ff›èÕíʶ·³Z¹¬%
J]†ö”?è‚)(m;¾]6šµìB¤­“V*Õ%¡4pfƒ ö¦<Èa5¤¡@U4®uxÛwœ]9eJ��ºˆU•#$±ËÕ 1ò*Œ¼êšºM`†"ò…Shk¢
WK¬t%ŠÙ]5µ|þª¢ˆ!pˆ®–†\R#Èc*5ãzòëZˆÚÕ×UvÓgÉ^Tö—N­–Û±ÙR÷èÜd!Û><ù¦Æ¡B}b)[Q'öô¾�yB±€ˆH#$ç%*7#&"„lÎó?—öMǺ²T7ö#$y"¨8 *Û5±¥‘¦¶š[SUM A'0/�°Ø\�¤P
Þ&ä…eR[*ŠQMI™Tk[ñªyîˆBq C¡÷ç„T00å)’“TÁ…)“m_ã�„�$ˆ�#$†\†šsWûàîÛ~)Ÿeup õÇ’è	)6•
,€ÈÐ
û¼‰„qè ¼�Y2Îüc[1cj5upúùqå�Þ‚?´ÌF1T�¨@¢´º13Oøßpýºi :T䢂°å¬ð
ƒB!#%mà#&ØGçÅfi­äBC¢Èq8u½â¶Öy3 ÿµ°‘ü�•½|}Ò)žþøÓÓà­ÀZú ý…UCº%˦#þ:‘¡,8…ˆQI##&ÈÉ5˜+F#㤑"‚l.Õ•A¤!½ÉTd&0x «B¬0Q�§Z
´Sfè–Ì�•ƒj#$®1âÀ»´`6<ÇPå…XÖŠÑâ«š/rÉ·/k-X¬´Ñ2!ª$ïÞqJÆÚ™ÔÉÃÑŠ>JÒz�UØ;³•X9è#&kfI¥€eÃBM£m.ÜŒx]à2É!­(ªÑ§,™2åY¾÷	œ@PG()L*È™Í0Áœ•¢±E‘"µ(…@‘‰ƒ!)¤AÜm¼É¦€�B†â“�)À0cFɱ-Ô¼zZ€F“«ŠWœÐéÜýE}B�ö”,ªV¢æ!1JPPj#$†°LAPc`jg
]þSÑgê˜r÷쪟˜‘Œ$�À u'\»”HÔ "1*úÿmZ­úi«à¶×ëm«•F•ñ´—^­<m\µ]´ñ­×Ë4´„Ü¢‡söÏl$a¨{ŽÇˆ‡™Oø#&"mxó$ú˜Ÿ�o�†v,Q´ª¢î’Dò¡ÊÚ$cf¸	çVú¡—iüGíÊÜéŸÚÜÓ;ŽÉ¡†#$¢$QŒj4
!ÄšŽ°Ó ÛjId™(B‰¡Á�-<mãTeÊÝ’R»07K\L£0Ä VŸ_èø’>ÅR‘>m¾yN$«VòfÞÜäuºi?-ã…v/ñ9ƒØôÓÃMÙS¼6Ô@&8œõ‘E¥&ã��¢•(tÍHÇ�5Œ8WÕ#&ˆðã_¦¨Ý
'^€¢rE‘WôE3
F¡a
#$Ÿ#&b‚°Ã#&J P¬Š²u„òvÖ zBºL›ÆÜ{ùbŽ—û‡lM‚è1^ìÜ㇑;‡)ùÇSÎx‡á,AHŒYHJ/j7é›m“ïo/­«¨¡¹>ŠîýàžÞ˜OGÝÚüIïÄ�ŸÎWAF668—íàæ~šj@†ž,$È	oÑ÷�ˆÓ~} 6œh•
C÷ZÃR�Ðýûþe˜ÜäÍ]:#$R¥[Ǩá#&éAh"ƒ# ?J:ˆ:?ÝS¾EBç*çQfËb3/|Žë!°{aÊÄÐx`(C£#%ÏC2ØB,LÀìÉÀ>BØÖš6"\úQ�Düþ(@
Ì¥=PgO�òõ;<ý=þé)oòl—œ»uEù„4 b8+˜|ƒ…*ÿLZžŸAº¾¨BuNVýXÎC¿J=HÂŒw›Ç¥ü±Æ°ðaÃ*ª©`ü.РæÙF"¨5’Ÿ¼ê+K¤ÇôÝ&ø»±,ß F¤ï[(udôaL8¿.ðƒU#$˜R0�jbè.*]Ø[k	—¡E£#D&5£’ÃF5¦tLm-0f�¨™Ha÷³±$‘ˆc¾Ü†Kï9y1¯ëpƒYƒ2f©¼#XÁ(z¸õèÎjzÜûþêDîÁbâ¥uéê9|Øð‚½JíÝÈ\3}îÌas𸟻2ã7Ï;è–øà)Êjždj®¨¿]ôŽþ„§~ë…I™ü¯°ÿÏœéÜ
´‹‹´€»^xY‘à,ÖÐzRݲå`rÚcÉ�Ã!ÊÃã^~¾û‘èóþš Ô»Æ÷0Þ½C£¶7ÒéB„šS"‹H)˜’€Õ&FÌ'ŶȄʑÉÌL�{#%=Ù¬6³ Ü'0D—;Áó”(ë®>Õ(S
á:žüØkm”Œ†ß¯N›çxuâA¬Bfk"A¤ ôœ¦<‹†és€ôÂ;M%Ztœ‹˜�6è&wRPNq9�*#Ž Ñ¡å“:V×Ø×Sq$À!âD)# Ô ßø÷l`\‹	¤,bÌÁȳû2O–À'¶¿Ñßva›�	;a¥¦2°Bn�	$Àm›©â9ïØ<›´ØƒFLW“Û¹¢!BcþF�–3§Ú‡¨CUŽúКzëHʪ(ª£úýùÐ4© !ú’ÁVch.Û\‹ÛɤÚûW+½_‚ó�´œi�‹njì{P&š…÷ö!=\§À›f`äžl3Ö�Zãá“�oL¹ ä•‘?ë‡OÚöÄ×Ç­zç�&©3É‹Â9FßsÉ;ÕB´×À�¯o9ã\•}Á�fl^óœÚÝŠ#%o>Ù`Da#$Ñ$!)
dñ,¢J)1ˆTCv=ÚÞù"º©iž´ß�àÆ!OÊmñ¦iHðZÅ•ãÖiàÑ#îR>ÇáåyÜá½›¢ �F…><úŽ–ÒIP'Qx„9DËXþø³­¦&Ó4cƒeÌ<BgÕ°¢ªï枯o[Üý÷D™�·bµ‘ƒ¦q+¢Ð›f"Š(Fbœrê``ü�Xamú¹~O’�y-.½iÀE¡wµš,†I@Bà�z”þD‡ØZfvvµ¬·¶üsjÛA¬Z,ZÁ!¡åȺÀ‰Å}~¬3‰úiõ¾´ÈÈqSšŽþÞdŒbuãñú?�óNù¡•í̹‘Ã|É—#$#$Ô†ŒF	Ûãi¥V³ØTItâê=a)w+(«s5ƒRÞ4rP‚6|HoÙV­™¾Q«¶ª·Ðt]#Õ2¬W�EwHq„žÈÈO"#Š�?ƒ÷Þ‡Ã,‹Ì¨×‰Ö™˜ÒŒ­2fàç\#&›§7l‘Œ ÎX@ò0P2ÍÚ	)i[¾å<;ähV@Úõ‰<ô(ˆ·õÍz·šÕ£V²û÷]5ù²ÔÕÚˈ™$A¯>n{¤ØìcŒþèr
çD”´+O�ÈAôƒ‹w+&æµs¯·øç¯ÅŸŸÐV™„ÉOu:6b%©¦{ap.nº�#%ÑùòáÅ#%iDª�C`€�b›‡­œ0XÈ|èž~lž¡‡wôœÌð8Þl,m÷Õ]#&µåKîÇÆ#&#&™Ÿ½A3#%‡høåýÒ¹„îP©:õ¨10‹üêlàdýÂ1ƒküK­¾ÌS8&b#A²Ì¡ê
J‘ë@/‚ÎéƒÀý‚?)µ±GþmëÛ8¤×u%öuéå­!}ôBÄ#$ñMÆT„Ø¡d™@”$P„	„'ù?#%kŠGD;v§ú²îùDñ÷×éëç³[fBBDÜ_Ïi·Š>R̈új*YžTKý��!}\²Û�8˜(ïß”
2T�Š6t#i(°Õ×ß“ƒD�dj“£h{“–ULºÞD»íµù›ãR,ö›èn1'�"LË$ „•µˆwiòÀáQA´!0Ô'VQ64!°àe>9@I´¿Ë¢sfúZÅH�":âöýuð¯‹ÚØîÛmʈVJÙ~¹µHV-¶m¦¬Ô¬jje´�dD#;yp°9= c’&€gÏM~}Ÿd¼vJ)öªUÜQ¨Ú"Õù±síý\åè¿o´»Š«##ňŒB2Aa	¦�Â)`˜š”¬2hÌ,Ù’H¢S3RššPÁR®N¼‘Ôç CŸÝPàÀì�“aLÇâŒy9÷þ\"”’m¸lÏÆ#%NŒÃk”ÆEÓ™Á˜A®o*E¨& ¹�Ó×7aÄ.¿r­ßÇä}¦7ÍÅDe].;½þ‚»ÌOT9Ê“Á¢y`‚Ò’Ñ>Ç	 à€�Ÿ‹ä?‰äLS$wF,oAˆÞP�sp¼�ÞF‘ÆP�s¼6@ãŽQFG(¨8súŒ1€,k,mGFL˜Ñ�ðÞs>"XvaMu‰½š¶�¸>>ñ“0k®-»6åÓ´¼O
ûÉfáÐûO³ÛÒfÜ%àT¡ÿÜÃ?&�S™¥­C‚ÍáÎ(Æ?í2vCž?×Îú&IÙ¡ˆ°µ E¿Ê¢#!…ªÛQY[Åi—5ÒêæÅâÞªW¢Þˆi#%‰"I�¹ÚH34PW
°DZnº©-»977IvÝ’w½á(ÛÒH‰À°8�™­0­»ÒP×¥ÛÕ^-¶ñQQ­Îk6Æ †@‡Ê¢	(ÐÝu¯„¯_«½š¨-¬jfÔʼZ1�(È8Àr#&@
9úf�raÓ”(ÆÂe<+%G$.ÐJWº¸kM´ý¥	[ŽÅç˜Ê5ÃŒ-p‡ü¶ðÿào$#ð÷‘W_}Àºk´³%Ò2™94yÔ—ò/Rá½³4dËVX↊F(&ÇJÄ)ãFͦÐõªŒhBöµÁÁ¢¢ÒmA!w¯<¯]v¢ÛÇ(µ»³åÔ†E.ºwËnåHŽäÕã!ÔLJ’Ve¹)v]ˆÅÍ4Û!B”yˆj�Y¤Ô�Pp€È‘Œ²5‘Cˆ¢xÇ�fixI5ê:ö¼w&—iÛzêêJ„kYB&ªӥ�2&L¬Á¹	#$›7	…HŒ£Ov‚X²7XL&,q�,�‰�ÈÞ²Ò�j8cƒqD Å)1H:«àzyÍU6”KÙbz©¹�”Ô]ÕÃ�uJJL#$òÉÂL»ÁK™¥«‘š>c ôòœ¾�Ë@Ú�ùs‡’BZZÆÊ•dqƒÌ•¼#&Õq̉`Lcw2È:ÔmÀzÄo Úš0Æb­‹�Vÿ".8äh1� ŽFn‚‰¦5ÛÈ&VuT$hwT7a­cuºâÈÁÆ$órŒ24;Zdd`vº¤ÄÜQÖkmÍcÁ­È`Ü9¸GF‹œº`¤yª—XÀAp›
‘˜1òœÊŒ¨Òqª4#$bt[�G†•lÊ2$œL6CM&Ö†¼&G¬Ä#%‚�`Ú†¹®ÿ¸|0:ä½C+AÊq0|ÊÀM¤:@#Ô†°•ƒ*’È\LÍ`7�.ec¦hscoMW+›3lS»wu»¯Ww“+,³º®›¥]=ÛƳ}|2~z`ƒot7ÈÆñèÖ¢¯”„g/lĦÐÑV”@)b–P”Â,#&Wª©Àñí¥¨}�ÃHm‡—±¶ºj'·Ö`UdGêhÍ‘c5í¦5�.­0TwÁØ1âeŒ�™£#&“LFXÜkt‡F`ÆmžË˜ÙN-0¹´eØkM}ð€ö1aBº7ÄDH²³îÍŽa©F€6MˆÜET„ô”CN“ÏG.¸ÜW؃àƒ¶á¾‰µ¬²Ý*€qí’
¶“’0=Žš7ƒÁbµK4(©,‰HÃyC¡„¤L®L1¾H
¤¸€Æ
2†ÐQ[#$PU“LÈ`J–V„4lLPa•ºŒTF	°62J&Ðüˆ$èu'{M!ü˜X¿¤Œ#Ìl•A¤›La2ÁÒDÔð[(¡ª˜e¥Œ­Îñ ¢‚ŠHÛcBÔØ–™±2[_+˜#& Mê�ù“áâ�j§û5^�U££½	=3õs®åd@y4 §«žÄÒOçãüæºc(j#&üŒÐcºÙFÖo>â¢�ƒ ¼€õAXE@�Y1£rŠr"Æ,ø�!âP”JÁí+âjRtµû,äC#%"Å	‚+JOÑOw×ËN}£eýÆ#%oɬŒQ¸PÌv 	S´Ð»©CE?Á%½8æ»�lFÛ««›k{n:”*¨, ‰樸ù±¤ÃD�›r²ÕHÞ—žJM’Øßó4n\ês~Š¶s$þú#$½ÍMÙn Œ6nCL8éØfÜ�YîŸêÖÞæ"‰¼ŠL[ë~xß^õŸÜY;€‹:ŽH8cãºËØ| Í–ˆ56dh?Zå$H¿{[ààÌQv‘å¶1´¦I>Öùõ8Ü“ƒõuêß‚ˆÿ$Wnò!³«Ò^S©‡ࡆŒXCÅ0i5µýG 
ЛÂIœöž÷ÕZƒr9º
Ê,ˆˆA@®#&Õ{³õ™:Õ§í³[Ýçf“
Mšþ7.ѵÏ{1–>#%ÐÕ²a†‰º„¦±9ëÞ¥°õÑ̬&Z2!ÒwÁˆYbN”UUü]×λˆlv2ÌÇ�fšB?Iõ Æ0ˆðÁ§°r©ÜA
‘`Œ‰]ßzx) jl=-ª½˜ ñ)éÓ¢[0•°/ð€90
ïž}îù€“†({ !PDäÁ¸r»B¾ÊòŽ3ãšó„
¶ÈNãYCŒC‚Æ@aÖa‘îgy´LB„@ÙIFJh6¤‚üM_™mê½ï_ƒ7僌õŸ—‡	¿Z«"40ßM°‰"¶…0Ù#$R#J¨lß{7ç‰Ò‰�ÿ}Ò¤”’NbɨªÿEJªgJ²X)uH—VÅ¢ Pª¡Ã)‚É–˜K`sC(
ˆ¢m#%sk^9W5EÅr׊¬QtÕ!ÊÝ-¯¼[ƶ(À£m»¨�Oî•%˜×ë¶Æ#%Ò ̦Œ©†B™#&0…Ps�p-�wAÍ@ÜÎ…­kØ›{ƒÒj8vó2ï ™1@	Šâ".H¡qR„#$¬P¯¹þl¥ÄЄ 5)–˜„ðåǾ«çÑýÝSлè:^‚R¡÷Á;OŒR€ Ž¿¥ûˆ e7/Î~Ø…%Yõ©Ü)”å@ì�B¢·tÒ}“Ï/£šäµ»4µÜ[uÝÃvh%
åæ`+ì æ ©èT°47Q½¦ªÑ­I­M6µhÖZU�€%ƒ$ˆ@N܉m«#&\ƒ†Ñê3#$å"‰Ö@X@d„PFNÏæèô‡Ú‚
�ê©À ¿ô'´A8/oemõ”~›rda.! §´¢†ZüK¡>€(#% ƒ²Hã«5Ö¢‡‘âqJË܆Wð:Íß´¢A;){‡#$Õ€{}(�í}B#&Ê’šÌ¦¤FÒQT›)Fˆ£M&14*e¤Ñ2“$Í�¡•Z-¨¶Øµ±[SiT[-E©j‹²`,Åz®€\Z�T‰AˆrcÊäI°sŒ0¸&cPyVXFE±¡Ü*#¹
¡RX�R;ˆH	X 4AGŒXꌈ˜Ô°ÄÐÊØÈŠåh¬l²›�ª¦2Ñ€æ
ÈÐD ÓncVæ«*®•µS5µ›Y®ü¡Œh(#%@¡"ïþ#%o#$#Ÿ*ħŠ—Vå—rˆ»Sð«µë‚ D#&ˆ¥#$Ãh[¸x
Ñ„¹Æ¤‰åªÏ«G^ù"wÔõv7øøñ­-îÒ*¥4«Ô¦B€ ö†ÇnÆÈ�-ø3Ú£Aˆ7gLPï¡¿:›'4ùœuMí2T+9HLZ 0‚	œ�Hëuð˜�sš!1ÃÊ“!ñ5Sa­,\ÆÁ')sbqNÄ=Ýê=Eëºb‰v”Îîqw§ž]t×WŠB cÂÓ5pùUÀ#%AdAdV@$URE¢
Qª°R„‹”-ÁíórYÖ’:Å?l�MÄl�¥~ü౧Á4¼ZÅ�fÕH¡ðü5ÇClq¢BLšÄ6P+�Íx—íÐîe�´F]´¸F/ÀùWL¥sÙ{ÁäÔádþì\T8‘’•pŸö9ðöÅaÒ9˧žQÓƒ¨<û,úè7ÌêM®Óé²Iáð»'8é׊:%Ê'ËÛƒºuj!"Ú"!®°¦êéø«�×�°ç�YåðÔÊÉÚ—D:$òƒ"?OW胞tÑÍ»p§’Q®µ1Φ„Iô³W“:§Pè$¡DÏLC ÅžI�H‡íÄF/ÙÊS—~úóAÙmaw]Ó>^‘(.+¤ô‹ÔŒ³#%ƒ§–{£‹Ã\Óh7𓵃$rYtͲòÝ`~ï­× Ì܃§#&”èðÕ2÷¸^‰]!>#&ïg¹Ï3`§¶g´‡ƒÄß]4*R/(¹�4å²γÑt÷ö8+ÈÅ¢<j›�Õîñ¡ÆðwnÒÍ‘qZó|5ÚÆ0Í¥¢ÞEÁß„ªñåîKèË– BmyyâŠOΗ~`³½›§=PÁ¬ž5ÞÃÝ"ùÀû¬¡·ðø§‡p=¯ÊŠ^í÷cP¦§ª©ª¥9|P#%ñdÁÑ@=0Fñ6é¢Ë;ü?Ã>§GJ*ÞW‘ìíq%[5W^"é0 Z­WG.eóþŸ`ï�q°ÿbÂ=vgŒü&|¸¦Øê¤tjÁË7çŠÓo…º¨+2½íQS›å8«›®{‹åxDlu*�‰ïaSº;	ž2â#¹‰~Ò']D;øÀëµûÙºÇ#&:Õ÷DTVJÅ튅ä9ÛåÛ¶æºeüŸ”Šs”N ÏJbzD±ÔíZ³€´Ç]hø.9ÂØÊl7ñ~æ5œÆ	vzåî\#:ºfpL$˜å#$ѱ#%õ�R–ìæPrVN~^=ØÆÜq]™uŽ‹—˜qœyˆÝ%` ëS³šªÂ�‚?»]<ºaE‡`t±¡Êr!+Ê;¦b›4˜Àxuã‰,È‹P¤J	?„Ä ºˆê¡¤Í_»fu„ë�"œ`o¨G*ƒn»žh‘‚ÉÁ:Ñ›´b:hóšcVï…àð#žG/®~z øÞ ß^ì<’ó$«…Ž ÚÎk¶+ËX¹C�Ö‡NÞ™¤C’æ2ÏZ|	½�CS¸Ð5êj>•n;ŸªgY&äžò„GtuåI °s86pW`JZç•O:âí�Ž�y‚{9ïѺoÏó\š/+Æc¬ÄAÇ¿z"½U¬’B]Pþ2<W«÷^!Â2˜:ÛŠÇ—ðÖHáRiä~èè7]…NsqèÏÄÛ>-É¿L´©®Q帡:´xÉ¡ü8®Ö¯d[ñÑ”™ã u;Cjùñ3Är‡èvÄö—…Z˜Ž~ Ý£Å1¤ÄÃÁÙ¥­å~…)oƒ±A[¦} ©ó{ë]}{zyÖÂtW´;úé4ÒMi‡œÃy%I’·IÈ£%–1¹dsiÆØÁºÒ‰¤ìþ¦¦žH�̇¤Ô#$ýŠ€^«DqØ毈úóˆÍš	�ä_‚Ö…ÛE ªô—Y<¨²„œq	‡F"TÈ’¹Þ9Î
�G‡=G_YÝ%»à‡ÁÙ®ê�u¡"Áè#$–IL
J�»±!˜œ#%UÛmÁ¯0dST®¯pÁ…Â�#%;œV$Í㧆f¦$;ß,1<4½ŒIJˆ¤â3{#&àpµ¨DG4¢¦Œ#+‡�bIšOœ}½‡Ô{°ÖÐÂq¾I¬‘¹’Öë¾ó!W†#$�›�ãcL)C4RçáðÜ‚ç…õl=!·$JVß"'ªß*èâ�ó]Û‡[�«ì˜7- `Gt9	oU{·ßEê�ÝÏ–8Í÷ߥáÅq<tT9ÙëZ�ÞÍÌ5Þèàê(({¨)ÔQ(ŽÐQHÀE#%Ô¡ÛÈè�{<w9ëå^ç»MÛeié€óí †ò[Õ Ò½xD+š;ú�6è’N³·fûÝà(tAÀÈ]#&
ƒÕf»ï§–­i
ek¶uÀƒã†ƒŽ¦ŽÇƒðTåãGS傳¯¤=bCgjÅÃÓj€AP!V¦k‚ú¬K#&þô®°7]fC›ê�;�ææ´ôA[è0ÌNÊ|Ù>dm•’âGÃGÂeœž[Žº\¶[‡ç/�9Ž�ç”úÄ®³ÛOÜ®±Ý—8ŽÈʃÜŽ±å	ü-�D¼C gç6ºLöÃV[Ú͋˧–bžŒ2!†Ÿ¤ùG_'m§[ñâN)ˆ-´F‹óSÌp(0Ę=8µÜãéé¶ïÕúå(3É]“ö�§rð™ú«ð�¥Î©†‘	x–8뎇1Òc»5sÏŸ›\vrÇmÂÕTªß1E>ÝÞÎúvEóŒ$–û-©c6ð!F#$¡I¢:wæR�ø÷W¹Ž{üW9šZSÄPEïâ¢ú@šïÜ0�½ißð("ÅÇù·0‡:f‚—5¢­H¯4}Ð:Z·¶ÀùŒöSá×m{FeW†;ó¹¾MvØ’#%˜kºœèÁ#%HO<oªçZL"T1CU(ººäÏVƒ'‚5–ðùf–\˜0plˆ]"¥°qçÚ¾§M]~ÝYÉç=4Ôyéû£Î5S¯„S¹¤°úçÎ%Ä’‰—þ‰%zø,å¼7Öóhë:xt÷ì,Îm]OJÞ̇‹vŒÚMÃ#%‰¤ùåu&Lƒ»#&V¡í-#&Ï–bøCÞ$ä7—LZ°b�?á+4Ôéš^16š¨†’N²ËʺIÈWL%‰ERXç5cÖU#&©ÇpË°òhH}F¢¶¥TJ‚‡¨F¹Í”ÝhÖ–w•š¯<¨#$K§‘—郞•$•á
lß‘i“ _ž‡¿ŽêupR�=¹(xôê£#$KLvæ`´HSE–ä[Ôâ¦bÆw¹|ö§^ÆÛ@Ø£©â×
ï4#&0°Œyod=ªäQ:Ê®W†¦ÜTrºâc0瘡ð¥ZLÙº‰K)¥#%í#&M…¡ƒ€ C¡'SÊd9£^�†'€vó©8C¸8a„q½¡¼�6ë(MÇï'µøf3<w†V‚pPÎò}A¿ï~üû#õ}d/èÕÝŸÇmLG÷«š'9AÜ1SkMD4yãsÅÆ�OÁÂS²á2t¨HÒ¬!@ ÆP0ë„¡l«ðLlc_Ý*³“{˜‡bø¯�y:�Ôù¥Ç�Môwä²¾ 4�f¦.Žd5a¬¸m;TK{Çr”$ɉ€6#%•¥Šÿ¢¿*hÌ3VÆ¡þ#%CX-j©´DF¶8Ò•7R›d‰Œ#M „q0&@«±oMT”Ź®K»[¥&Ó5�K·iãym½5lQ¶¾æ·5³"Ö«Ò®m¢ÔZÚõyTm�S¬�˜#$äEb(}¢*£¦JlKK!E­ �Ü´Û®}'ä9óì»K#$öœ{C¼^+V�ÒÖGxg�H*É•ø~4X‹Óbô׋]-Í*­HHB‚{ ¤€©"Š±0I`ŠH9£ïÕdÊFr­ÙùC5öÝcÇ-’.R‹ùÍ!„úpî™ÛŽÜ¨Åƒæi¹;ùäçýßß0lál‘YÒe?9¡UÉ"oQñ½¸Ã+%-©±�XôµÓ�¨¥ãÎדA)BEIj¸&U..4õ#¸eáXÍ´FL‚yPž®Ý©#&ëÔÙ®Tb·Šé§^¯/X*r¥™îªÌ´ÜÈÐ-¬¢Ñ…KwL¦fZId�>­¨~�œ;-C%½æ-Ê{\IE	À1rÓ#$Í®&1W-FK[@Ʊ˜ô;ÃÕⓉ“Šc˘G!\¬#p·^#%âß:ÜÌÌ¢64	¸,v�›�(4h6Í™:Æ×ÃZœ™›Ä›‘776é’8È6¢m¥jZÛT‰¶«Ã²LܵùïwZäËØ‘ŒB§Š�§
cæQö|14&4E&·=þl÷[É×n•Õ#%Ýs,q ÙCR0ÔÒïD, ˆj»aƪU	+2ð2âYÇD7’ŽÇ™Á®ò™u*M˜ÛKD #%œmZæ…"NÚ•¶»¶®Ûo#%3}å@iN	²�Œà~MF˜Ò{Û;Гu#àZ5³�d¬÷#$ƒE&bZº¥QQP«F¼A¡¦›V1·š‹.„�Ë×KG.äF20xÃ�’…g3#&Òj`êÚn’
„[æÁÝ·tVÌ%¨à°iƒ3/#%€<K´y>gp|.ùÈüuXTE´Â:0ßõemrFÇ1Qº�³Ë—3²i{ocíÓ:kN¢Çcoy`Õ`É$P&‡âÌ$n8¦Ù¡Y¡°�̵�F’ÇZ1èZº7šcmœO-elÕº¤W–dtnT¤ŠçaÌá“#jP˲ÆÔ£€åUTÚ PäfA?ª¨±Äem-ÅãJ”C£á5#&ÄHÌb¯r+âÕ\cz�§[J¯"à`dà€ûÜrÓ‘ã~Ç5¶Ø:³G3ÝbË0¦[Š_8®Kˆ~V¬È‘¦ww	:ð”ÚÍ2:�#%KL²hÉ�DY,Îè«7N2ì…zxÖ‘’|Š†#&�vÕ«}@Ó¬Úƒlìø£w30}IÐfÆ^Ô¦¸6#&5,éª11-œ;EPðqó>Pò¾I ª‚ÁdF){.èØĘ6¿@ÛØ{Ã-zè¢2D’AÆÚl‡­p0F'HT¨R¢C_Ãwµ‡^à“Åõ´{jP¸ç¡ªÜ”Îøê§#&ž@áˆ×<y±°F¾õê·åûn×ܵ{�5¦Žzc�i¾HÖ,º™ÆSã‡)ò<B¾J�ê’
#%ßËÚÑ}¨$N-¤4``B¦éY|üàÞz™1Ì|ør›4[1a³�ú–Þ,ÂdèÅì3il—öh~ïa„zæŠj	Š¸ËhpÚàªEƒ*„jª‘ˆª+U0Þ=šãW]¢àJZ©Q‚+Ï Ìõ±ÏSгµ±Å¦ƒ˜èBK[
+Ê­vq3XÈbˆ² ƒ„Ù¼´SUGÒ~X’~'‡°ô×;RúË¢žâ«ëKTCØï$$À
‹t«Æém³TÊ›mÊÑ­$®š®j®Z£QxÛZñ�	@#%‹Z>¥&90Í™C³v[“•¯oÔC(ØYQ²’­¢´£h¢M…&ÉJL*Ó¶Y­%©¦�VÆÍ)-‰-$Y“&,³TiJFf¡³KS"™*1›*&ɱ¦¤2¥’š–R´‘dËöWc#4Ð’6¶»¹‘@�ÏqæW®ePzò|^ îä:ñƒ}4>¹àξG朕øïCŽMÂ|¹ª?sÔ;ΓŸˆ‹¯ tšûe‘‡×9‹q=)3Ahyb�$�j'È‚^´Sé¬ÒÐ26�ŸA§Å#16܇(Õj›HkLÒ̉ÆvGÜóL6#Èò� ‚’VÄ°äq+¬ìÝܧN‘1	l¢û$z̶ÂK‡B;k=WÝöý|�	óãâN�änžchS‘…Bï’ÙÛ#%²ÏÆàJS¢“&oW¢,˜Â—DæA�;GôüÃk}’µ‹R[I­}öµ®[7îwk•qI„b5F£-õ¤„�dE `¥J`©)jYq`©2ä2‡‰ˆæ	DaH>‚þ~�£rÀjÅ5J\ßиj@[©•ýR¥¸máƇ?º4Vš‰�2³˜¨Ê:2ÑtÈZí&"FÍ·ƒŽ1¶1¶êÁiòÛ(5‰¡F–šc#$6<HméUâ·½ŒX oËÛÙ¼{®–õT#&ƒβÃQ0Vš¨È˜¤Ü\²	¾7öÕ¡£L[�Dµc©ª*Ëž4šÎ%(–šŒD(âH‚ddV¤Y'yÇñ?a­?'(NL?FC‹ñP/j¥HŒ $ç‚„ÂÆ©@JŒXˆÅ¦B”°gªÈk11oö´•”Þ
|™2FˆÛƒŽ+֒œÃ!G�éL!¨ˆBQšª‘ó‰$,t%¬G­eÐTÆ¡dš“ž>‚ª°Ò@}óæ½ä;&ÛB4¥‰"«=½Íƒê�ë?Ñ;<ÄMóßbÖ±9÷iÌ¥2ú˜tÇBpƒrŒÐ`ŠãôÎ/„ïï(,º0χ¾@bêlžåûÌ$`øí†	âç–†#섈ԒŠ,ÀÄÏ#&î M½A¯°=*?FI¯¾±àÅ%¢`EÌn\ ÑÑÝUlâeìq'$$%ìñ¹¢^¾ÿ?EéŒY�ÝÇIgÝÓq¨s}å¡¿N@P¥™bà©bq­tnïÊD  Ù…IJƒ�×è£Åí Òg��ÍÜ®’¸òVÌŒcÔÊ¢Ù®xÃΆÁbÀ‚ì�F"¤€Wné7¯l“ºÞÁ¦ÐBféè: &%n…ľÇoµF’}H#&
‹Üô1ö&·‚;ìÛÚ})BDeL{u5$æù²‚FDHÅõ;óËq=û<¤Øõ}ÿÉkŠZz0kúYˆ—äÉ„$‹À‚8—âî%
#Ûæc”4,T´ŒBeçWE0 „Õ•èøvªK“SOuY7á”ÄÃÔB‰_£äÚn›:¨jC&_¯�î#„ùDTÒ'—Yg7O¦ÜzžWÍã¡"ó–ÂAòœ|{Íi˜0’aadE	}~èñ/}R‹F§?·î½ÆÆÐÓ2#$yžT‡0°Ïåº×ÙùÐ[Î#$‡Øÿ~j~æ¦9:€¬4®š,1C0ZÕaâô„�O$ókçß 8h^ûýÇØ!îªO—°¿X@‡ÇàÌÐ5MO­§ÝmýÈ/žlÖi5â’ãß‹´×ëx¬$þt•¤uņŠ¹P–Ì�®`BÁµÛ!ÚL2¿‚öF”„ªú꺨Fú<­¢EÈqBR%Š¬«‰àiN?šÇ:ÕW)ÙNËRÈÓÃXÔ�3�PD(Ò‘d'.1L)#&QA#%×ZF¾Òì¸.H?ØP­�¦b#%nȸd\ttœO}®oa¤¼™˜ŒLCC9aÍš‰‚@dœ$ŽXÃt¥ùP�Ú(į0âã44#$¸âhb Ê9¯¨w₸íñàîS.ДhCâ!”±.V��ôßBÊnÒ,AÕNÇ)ZiU.€ÞºrÅœ�7CÖØ<0Ô!j‹5Jƒ$Ü£cÚ~fC#$Å�‰¡‘‰š¡“xZr*í#ÓÅ£š6„ˆ�«#%ä:�b™�€¶@S€¤·•]E`ßÚi¤Û
‰ºœç·Ffò#YÉES41!Œ™6Ô
³�¬¦jDV#%€{XwÉ001ÝÌäÒ"ãùzp÷žd3Ï[n–Üc£ô(�‚ÌÌ:Žn´q;U'‰©+awh2&®aÉü³þÿW= 5Ó“§«Õð½T�ØÓ:0Ý2ãhxgy1Ò±Ǧù½#&–t%6àŽó¤¨9n`¨g|Ó0Î]†ÚJ0FÃzèÑ´a(#&	&…Z±I’D¤‰&‘hqKYJÐ"H¤#%0ã¨
¦Û§•ã=ãÔyÛ¾ìÃ77–�%zº#%j7½ÍîÌ£$–DƘäêòÅË(ÐŽïV#ŽÍ"ð±ŠF`tp«‹cŒ0†4Ô!£+’‚`sÙÏ0ØÖù{b&¥„2ž‡¨�aÚÚéš4Зxo9Ôex3�õ˜Q.W
Ò(§$Ù¯¸ÜG[å*v§)SºíU9¤3¡ÝHGL¾ÇÙSÊmêš>ƒ$,ùîÎ#%iŽrûCNn/4Qp4«š‘&l^	Òm× ûÆu‡ɳU-‘im¡–$·‹e({¡SêŸxÂgs%+<$¿=h†íO}ÇxmŽY-(ƒÜ“ÁwÛQk&߇šæì‘7š;BƒÅ#%‡»!£ìæFÇŽ[nW©4åÃ3Ÿ"c<š¡¶ŸÄ}Îksº´´î$® áøaSKx(Æa¹IqNm8qÛ÷#0}0>˜LÕÙÃ×g1UÄ—V|¸sM…‘\•Â
Õ3¶«œBæ¯�úbÈZ”³8ôuTÚ˜Œö“4ë´öMª£�Lèr6:Í!%4ø2�Çć	Œšv¾œãæ•Hah8ºÎ#%£¢ BÆ#%[ª1Û¢Nœö鱌3mr!“ÑäO²'è±^âß•#&nÕѦÈ3ÒͲöR)ÉœˆMuÆŠ�´i¦ ¦v$Õb)(B£#$Xjº³M¿+°3¦¶	q7c4ƒ‘².ÀëH$$:û2#m¯`…ót3µ‹G,™ LnÈ‹œL»•µÐÅ#…O`ÄAY|­¾Læ#�A"Yšʨ&;[+$šç#%²KÐÅí¹æ@Æy�mÔû?/½½´vÚ.ĺ2ökF¸Ëõû�‰Ë³mÞã»@¢F+
‹€åª:¯‘ßÌÅ¢ÃÅ'#Of¥»çÈÚ†Ö¬ÂS-Úñ6¶8êåóm¢l©RY‚-¡°K­=	páE	“1u$º	8w Šj>|7I6´¹·ßIÖ¸n�'›	¡ùfçÎèÒl9a#&D‚ ÛK˜”¤8Š”};[5Q›v¦A¿‚ÆÐèf¢-ºyEK&<{>• Æ‘¡eŒ»ã ö†œó™jkÎkF^Õ$Ð`ÄÚ5#&0cŒCh­F=û›àÜåÎ0¼!‹2)ûÐPÙ¸niûf�šÊc^®³\¢rÛx�êvÉ°´ïK/˜jªDðón˜W}ÈL.ÜÇYÚ(ñ”ÂdÓÈøó7%˜™Q¨Žlîɬ�Ç{C4.ì$Ý< ½¸¼<æâ§åjãŒG‚¢Añ¤Ð6°;Âd�KÁ	S&¸
¢ù2XØVŽ¤Ài~דÈÅnœ`ÆÛ馊5i#&D1uM¼è4,ËiW5J¹�‚|Ù³ô’øY‡a×¢R»ƒïÒM
–Ú8f—·
{ƒ®Á40iÁ .ÁH#%Û·evÒ	`Ä Ž#¨\ÍÍ#$ÓtbÄTcC ÕL’ðÚ]@é‹lÛn#$Ì5•)Iz®²¯+Lô�º‹^mn¸»Lã`cµ™a“x/"Ž�4qC'N$Ô†ƒ€R…(aŒËÉpCËؤPc$# EÁÒ08tD4P±Þ147-TJˆê’‡a˜“X4F‘
¥ÈdB `CÅQAgÄ*Î84m¡´†#%Ë‘NÌr9$*.É’¡abÁw#%‰8¢ Õ@úÉêõñ§ë)rŒ�ÙqŒ}š¿»†¨»×–Þß	>a«ŸŸQ
7*-!"¦ôPj#&/a#$8óÿO·…äA'o"WÖ*^O¬>t	ê±€ö¹c÷Àñ–l‡á©I´(ˆ„#mû	Ó“ É†£‰£U'{Þý%ž
°?HƒMÉH“ñKcsªlhLäï±ÝI±M:zÛÍÝÉŠn=bŠQCYo†ÝLÊ8ws1*©÷—DÔ@:£!®CâD]ã©ð«²Šd}P¢rºx@æm¡i÷zh¹6GÆ¥(gÒI3³‚7ÉHŒ àM‘UÞî}ø,’ý£5˜®>Tv*¢#˞ܚQháôSi¡›¶Åž´:{~ãiå2àwyRÑåÔ%•µ?"³Lwä¹bT•é²Nå.˜}ÃÖ‰Ú“½ÞfÈŠ›ºÃ41ˆ¹Fž#$ƒÿÀø)ðô€¢Z¨v9âxVω\�ÓÄxdBÚ˜Ø1܆a-Iù"œl^FŽ‘:ϯm° �èPƒ¾4¾iË®âÑö–ñ;JMÖp„Žd ÈÚHv÷#$¡ž/ÇmÞc1£Ì"²,`,2Äブ¼ŠH¤–¸ÕçxKÍÝFZW*-s¢y×]w§wy%Îz¨AiB ØF[Ap[X[#$Ç-+(Ø?=&¨°})âë­ä—uP—[rª(¾/ÅP°[5‚‹2#%LÉ/Q*B)#‡8ú»ƒ¿Á>>>€Ÿ9§™å»i¹Qî‚JA·»Tò€Bkß­Ò4ñ“¡¿žw2Äbƒˆ­X*R)nf1–¢ŠÈ‘tBC˜eyÀv›ÑÀ›b¦Í}±6,k»¨J‚€öv„à'a×Ó"ƒ tŒ'NÀÛß=Læw•hôûÞí:ÎÂ,:CO¯i™÷¶b?l‡ó‘æTƇ¡œ<
À6šÖB)¹Q;Ù‘t©�4g'ÚüõªcUÙ�¸À¤Ë–r™¾äÔûD©‰6ç7rÃsÈžˆ›ÎQup#$!3u‚‰¯f¸<ÀÌ8’D©H®Èì;Κ	Œ}R“ëúfô3gJpí‹SÎ|ᔡe"ªFOa´×Û!®æ”dÎ…•<y×`}’‰ßÌTøÅ\#&FÀUJ¶Ò˜ÒÊÙ6ÓJüô¶MjM´Ÿܬk[á5¤Â\
ÎF…A.+’8”@ Dsz– T	m"B#£‘R#$âùÅG�‚OlÓ0áB`ÔŸÙ¢ŠüÐDã¼óÖùz�Ìz¡ÛSlÎ�`Œ#$PQ‡n™öøw“å!²·
Jù�3¨'ïˆAŠ#$H‚È,0�ÕËÆÊ;û¤¥†ùe#$ª›Û!�P¬›	=þP®¾^SêQZ¥Âc'�n”!’ºA
£#%N8 T)*r¨„V\™b%¶ÞM^O<Ó8º,î•]o×4Uç—KŶ+¯5´ºmf^h…0YaR*€HŒèó³�G#%¢3n5°HJ�ðtU˜!hм°hZ�©yÁýC#$Ú:–ãÅŒšnâd#&kË!iôö¸¯#$°8䱶jpÂNøOnQ{Ël·VÆìï@³—xu½ñ´ð9€à„-H0|™	X›tç¨rôÖIvŠ>ö‹>*‹7ÐƯ•‘njÙ'¿m¦”ÏKk¥í·!#%Dn_¶xæ#�g»�Ï)¶Ä
d#$8©ÁH,ÉœGÂÚåRJŒ¸ß¯�ÚsuäÒON7‰H¼\¤ge«T,‰V^9­«kmp¼{yô©|%KßÓ^²S™Jz›÷r­u^Çòô5b½ö8˜ôXÕ²fÞŠ„òÜð*6~ <É»*'AÑäAd€Œ#m%	�ª#%9ðDzrYÑS㜳ðšùÃê=žÕ󫘂&
QÐ=81‘…™¬³SJTÍ£L%d¡šÖÙŒÔ2¡٬ƿRÅkt·JJÚã:W@¨�!¯dB
Âzçäu�¿Ñ½^j��çЗ"òÓ˜r¶±†Å¬``i%ªf¦`{�‚ÑèãÙ2÷Ö‚¼ ’	 	£Xlí#”Øì€Z÷íà§OV"€š>àú¾¬‚ v£5éggIÃÑË£J}¼ß¡õi}?àaÆŠ2ê…ÉDºðSñ†|páFòÿ3—bŒ!Hé—‘OÍ4ä´: Š	¤Å¬,ÕŽœê#&ƒEx²†-,KŽ®ŸMTÀ×2óºŽÏ†i,G%l&˜‘ŠÂŠØ}C¹Ï;PÚL-¶a«éŠ5‹¼ß:9ÀîZÖòÝK¥Óðdi§d�„ægiÄël¨ë{ëq	±$†ÀpIdÜX§!Ün-hýî/lTè<¼ÇØDúêŸTRB¤H!	ãêƒDÛŠ]ˆ4[K†nª`u©†"Þ'‘˜SY¶Â›4Žz2ƒXú“úvz# ´Ã†*Ö´¥¦$5»°5#©ÛßÔ%% ½ç{~++¿°#&m@ò¼}ª)�TßYé§=^U�ä»rÓ³&ôˆ©¬J³bœ�`‚‘¦lc=D	B#$ª#$1T.ljÊLx\æ*càq�‡Øda¥†‚	ÄRÀî	T'Œ‘HU¸¢™D¯§· /†	nŠjcO/–ÃãQ¼P³…b”@uç{EHŽd=¯Œ\pb²8Íš8NÚ{G¹‹»»Í¶î»àåT©YÏ32˜Š¥Ûñù�ý‚�üoÿ]éKG7«{C\@Õm·2gâïXH	)"G#&ã0?nët‰�¨ÿM-sw/Ÿ¬³oÌH]Ã#$ä#&
û`p" ýþcÆ"‰Ô/öD<-ÃaÇŸU‡àC2A‘„�BF$4k(J(*â©‚õºe‘T…ÝIlýc.‹ó^zóÄÕ.F´ÑÈÒØAZõ®ÝQ°yA%ašÑ‘Q\·f¦Úim®É[ø aP}ð¤Sˆ�A2D#&‡#üÄo·Óä.G?�È7qxyœ$ÞR.Ðä%[’¤ßöãdÔó!<½ÏÑ‹ÅPX‰	(DC>ÃÙäŠxe’T™$´T›Y*i’Ù¤šý•êÕS_AH£cB¨ÕJ£YQ"@CÈõ??>ÌèBCpk÷"¨TDáñ„¥¯/˜“aÄ�íbاLé¬ßdýÆ#%ð—«MÝsf&ÆMD+fØÆÚ6šÌ�¤zó¼­IµH©²š¶üW–«‹Ð�ùbÍŽõâ»ù;·‡ð÷þçò˜wð\ÌÍκÛùÎ!Ùì°öÒR%
Œ#%ñY‹í`�¦A‰Ý�èG¾µ¾°Sm¦{öR¢z�ˆ£öå¢W£ønñdQ¨É©;4ý¢qa^ú0gÕ™€q¼#&P£l±€Ær~ýè9“Ûàq;}Fe‰Õ ÑèéɶÚkAÐø"t#\ š|L#&j"w'Ì#&`€Âó#$#&PF�Ãd8ö»Mµ%\7ªVѲ›)#.0R@´P ‰0q˜ß¨åP
Ïùˆ«¸"	B°vâŒÉ*àŠ
<*ÙÙÀÓ×ÄðûhŠ5@™…åè½¢ýˆ*šx=°ì„P¥Ãù@D>á­]–Tƒ+åa\¾¸¸Aã€1�Ë"Œ#${i‰Ø˜�%7ß.\x#%#%0ú µ¹a…u_ÀØ0–u€�Öû>Ñì%¨ÝC—*dM•$XV)¢ÅPj*ÆM¶Ú>åo¹«Æjm¢Ø¨Šj~Ì®Bh×~*뻵ä¤kù-Gèòn€±„#&©”&ŒhôÑMnŸNû!b	A¼ãÀØùÏÂ9^<%Ç–a¢XIP´I#$“ZPÖ(KiFPVÁ#$ŒH�OkåÛ™·¹�ÛÛJ¬²R@Ó�³šT>Q\Æâ#ÀÜÑüÕúõ×ØB03 ¸Š	Rô5…�o²¹ÒTv�]"|¤œO+JÄV�´2Ó#$²¦ÀiBÈÐøxzdd#&0™Oóbå›hbA•@@Зp¦D‚Žë à*E ÄF1	 Â>³z4+•õv"´-#à`.îQ°!=F‰~2Mé'5FËèÏ/ë4¤Ûm´Í‰ŒÃ AZøèX|¨ÏI�SQû¢ŒE
B¹1¯à‡Ôè%Ù|†¿ÝSb²ŠUåuë»Mx¥£w.¯My¼­Ö™bÝ–ìÝ™•]ζšhÊ¥#o]Úç5F²¦ÓRQ±­çvךùWzò¼£Ö«Æô·§ž]‹v\´¤¬¢Õ2´Öi–̵ÓnÝÕ©¤)AœËB€'hgZ¶O$<tÜh¸|€#%ÿã8ëûr«”¶uz6Kž�hÕ¸à¶Ál+byd"!¸U;wîO#%äœ0œ*žÿ?¬ôýeÙŠ‚Âf©‰,±©¹‡kàœjk�MŒ•-Ÿg¡¬Ãß�·Vpû7=QŠ(æ¡‚­yšëØLÕ¥lEf0cηQEUD¦Ì!IÇ‘Hà“5¹ó,/i%ýÄPÈy?îxñêuúÉZxõÓŸ[B}ŒÒbq9B•Â˜Ëe›; ìãPiøáÝÉ—ƒÇ:GÖДq¤FŒKÔÒ„——À2‡Ì~Ƚ¬-�¨¹=ˆbèê3
ÄI[d“åŽø®ÄSªôÝ­�ìÃÛ/2JÕ›"ä¡XÝ0íf\MÑÄÌ@‰Œ¬§Xr#&�±ov0Üžôîr€jìÁ‘#%÷ŽxºwBÍ;žY(½ô7/-"¤Ûxõ/µx¯DÛµ5Ò�2$1ņU>'Ý“wpVó±E3ýìS‚Î4Xƒpx•þbR §sÑúI@ÿÇí0aŒ«÷Û–@…"®¡¤nNƼÍ&ðø…SÉe¤L|©Z’Yê¨ùÿ.ºž¢ÖÝ·Ùg#&áË4?¾•ZCø±Wxj´Û±oÝ/_VßÎV×£�¬�.ðƒC=2†~3¶hÍK‘™;X…‹‰5A¿š67ÚåÈÒŒ�=‹hœös±sòböëmr�u�ó«~®�¦d"{o{÷#Þ}¨¦?I]&§nM€6.ƒÚn±Ùv2‡NÚœ÷£Úg>I9XHÈù.:‘8•É.
ˆ¥ȃDØrîÖLAsP*ÎäXSü{¿_t™TÁP>PDŸ·„„€�¤Ñ_´ð>­ETß“×@(ëv ÃPîûË„ ^ö’QpaŠT"žD5šÑ-ê<;§=ÖW>Í#% 
�a!Ïç¶f÷cŸè@i#$Ù
ÿåÇý¿³ÿwþøÛýýÝ?ßÿ/÷e‡—ðÿwý¿÷þ>¿ø¿ýü?×ÿÛúÿ¿áÿÃûÿã¿þq³Gò¯ÿ‡ùÝÙ«ßÿ/Ñÿ/“û»½_÷ÿýÿýÿ?ÿ�_»þ?çÿ?ü?îÿÇþßü¿ñÿGüþ3ïÿ�]_ù/Éø~�Èî#%ù:ûÿæ?ò¿ç6=áþ]è—ÞH@ãÞœ#&ÀpêMá(-ˆYÉþwùQjRG@^RHB@N%œ«üCÿZ~ņÓþR«©“$	2™õk~KÚÕÚ¯­Q�stÏ	{Zò„†›D5Ç¡ÉcMjf	zm§úpÿÅÓCSÄÛÏn)»‰°`áö	}
ƺí|âÿÁJ¢a¥gMÑ×7ðÏvW CLûp<Á»žV˜ÌòÌ£=€y�ä«€”^ÃÛÿr…3ØÖÿÊ|NùØ�ÿÖ?Ï—ü^ùeüÊXš´åÙ0L“–ƉOýÐ’™“(™Š ÙÐÛÙƒÿF3l¢P‹¿^çÿË]0ç†GÆUZc„PÁ¨×b¬Ïóñv–
½Ö˜U!ø24þZcc[É pmB¦�4®/t hàÿ‹·oW,æ]‹¦®q,cÜ Š‚¯á�Û-2¬Zª90Àf§ÐÓ„Ë4M8Õ&Fºh››’×*e!º¢ñ¸fÌÆšÜC(,…£¾áÿk±�&—vj4"±˜í‰nvÍŒûÄVDŽNž%<¸—®Š†—L&2°(éòš#&cQØÌáýtå?Ìõ}йcÙow—e1+r,:Eã8Ûñ3¹Œ¶XaŒÓ2</‚�½»„_Ú‹¯#³x®Dd¶½º^PoL±‹E1È;–Ì4ù‚¢»_þebž?*œÃÙ‘µïáÓÃÆ7ƒk—8cÂÉX@쨈k’8’ví²i„¡Öš%šG%¡<)Ìo×Ú‹÷|·!˜Üz6‹*ì…6»ù߯~|!¡ÊD”ù*ýp.S"œdV–úª¤)1·¼°Hz¹p.
t7ÂFA7ñyLˆÄx,AóVA"zᣖØ�™"¨H2b¡$&ž)—�9êµ-#$5$†¸}Ä_¾bX™šG÷à~ØX 'Îñ¶×@Ç„·',#D:¸Rƒ©¶¦òü{+rv„£ÍZÍ‘±fñq* ª5©I•i5IT‘™f6+ç»UÛ[këmo ‰Ÿ®þ¬>d#&è)ã¶!üW=•RÊ*ÓÀ9Ê&°:² hàd…+CÖ(vñ´A>ÔñõWt?º2H'ÞVj­O½Ö»Òzó#%?ïãSÖ{¦aä†æ2w�xŸ¯GGOõN$²‘PG3S(ý’éBŒ }ͦÍ~54E÷cÅ„¥gÕ¹O¡f¶‘úÊ%¾à¯P—0{r§A³|ž<ø¼)ñ°Ñíúw4ÿI'§V°˜]c�#%4TÃH~“O—•4×þÙÍ�Ñ>Ú,7
>n½Ê:b�Rí4Ø4#%·áêMëEÝ—´á"6&YvTCV‚I”D%2î�anjô¶ñm,¨Å¥5µã{5WÓë­IQlk`YXŒhm‰FÎÀZN5¦ÙV¦C‘9}6ÕÄ&"R#©¯ýªCþ“	Ò@’D(z<^AdE›š¼ãoq�îH†c
U!±^ï!qÇ>¡G^ªåUÉbÇçRTê‚'¿ýDzübŽÈtùØï’,‰!9'Húš‰¼ˆ˜ÿ{æúxlö+Í_‡Pž˜aúA€QÐ!Ò?CpÿÑHD$8<ÐN'„܉	(B•R@„‰REâ@µ["˜‰#bfÔ×	@dPƒAÕO/‡‡Ýõ›ŸU¡ÿïÄ�Œ	¸e¯™2áÅ9ÝÔ§<É4.„½6-`4Q1êÜî`žø”AŸYIêü3ú?¤§ìáù¡nÕ+“¹fš#&þo””µÿ€Û‡›Ÿáý…:?å�÷Ð$'oX €•<?ûð{Ïã¶þen’ß0ÛŸÿaaYÿEõ~Èjö?Ñêú¡–®Zš®¼¸£¡k¯š</ë¥�LO”>d�çP-õû}Mé|Ô·œœÿºÓÛçæ6¼¡7Íö»zÐEš Œþ_ü4V€h™lÿ!Å‘gÛç¬×ÿÕl.¶v�e5¶ýñ÷núH;„¥ç„ÿ‹ˆW'P’ô„iG÷ªQÿ®‹^ø+·ŒL•Làƒíªçœ´50ï�pCàû¶N�´@Î&2²S˜?›¤„¢ðŽ÷(ËãM‘(ç£Â6N*%¬â1@MfhËžë™�¥’„ÊÊàð¥Ì¢ùÈ›F43B.ÕÝÊ\¢H‡Ö…>C#&Êñ4#%Í3ìŸwûžB°u{&±'‰#%’L�	fë«óW*Ûâ>sC?§ù>äDÿ‹¹"œ(HiK…æ€
- #<==
diff --git a/libraries/lilv/lilv-0.24.8-fix_translations.patch b/libraries/lilv/lilv-0.24.8-fix_translations.patch
new file mode 100644
index 0000000000..1f7593dd6a
--- /dev/null
+++ b/libraries/lilv/lilv-0.24.8-fix_translations.patch
@@ -0,0 +1,56 @@
+From b3438131f4bff67d56243bac85371c03a86bf53b Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Sun, 17 May 2020 20:49:46 +0200
+Subject: [PATCH] Make lilv_world_get() use translations
+
+---
+ NEWS        |  6 ++++++
+ src/world.c | 20 ++++++++++++++++++++
+ wscript     |  2 +-
+ 3 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/NEWS b/NEWS
+index b2f881c..c1c06f7 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,9 @@
++lilv (0.24.9) unstable;
++
++  * Make lilv_world_get() use translations
++
++ -- David Robillard <d@drobilla.net>  Sun, 17 May 2020 18:44:04 +0000
++
+ lilv (0.24.8) stable;
+ 
+   * Allow passing strings for URIs in Python API when unambiguous
+diff --git a/src/world.c b/src/world.c
+index 22d165a..65cffd4 100644
+--- a/src/world.c
++++ b/src/world.c
+@@ -240,6 +240,26 @@ lilv_world_get(LilvWorld*      world,
+                const LilvNode* predicate,
+                const LilvNode* object)
+ {
++	if (!object) {
++		// TODO: Improve performance (see lilv_plugin_get_one)
++		SordIter* stream = sord_search(world->model,
++		                               subject   ? subject->node : NULL,
++		                               predicate ? predicate->node : NULL,
++		                               NULL,
++		                               NULL);
++
++		LilvNodes* nodes =
++		    lilv_nodes_from_stream_objects(world, stream, SORD_OBJECT);
++
++		if (nodes) {
++			LilvNode* value = lilv_node_duplicate(lilv_nodes_get_first(nodes));
++			lilv_nodes_free(nodes);
++			return value;
++		}
++
++		return NULL;
++	}
++
+ 	SordNode* snode = sord_get(world->model,
+ 	                           subject   ? subject->node   : NULL,
+ 	                           predicate ? predicate->node : NULL,
diff --git a/libraries/lilv/lilv.SlackBuild b/libraries/lilv/lilv.SlackBuild
index 2e1bb84911..7ac20f5b57 100644
--- a/libraries/lilv/lilv.SlackBuild
+++ b/libraries/lilv/lilv.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for lilv
 
 # Copyright 2012-2016 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2020 Matteo Bernardini, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lilv
-VERSION=${VERSION:-0.22.0}
+VERSION=${VERSION:-0.24.8}
 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 +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"
@@ -54,13 +55,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ "${BINDINGS:-no}" = "no" ]; then
-  bindings=""
-else
-  bindings="--bindings"
-  SLKCFLAGS="$SLKCFLAGS -I/usr/lib$LIBDIRSUFFIX/python2.7/site-packages/numpy/core/include/"
-fi
-
 set -e
 
 rm -rf $PKG
@@ -74,11 +68,11 @@ 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix python bindings
-patch -p1 -i $CWD/fix-python-bindings.patch
+patch -p1 < $CWD/lilv-0.24.8-fix_translations.patch
 
+export PYTHON=python3
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./waf configure \
@@ -87,8 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --configdir=/etc \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --dyn-manifest \
-  $bindings
+  --dyn-manifest
 
 ./waf
 
@@ -101,7 +94,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README \
+cp -a AUTHORS COPYING INSTALL NEWS README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/lilv/lilv.info b/libraries/lilv/lilv.info
index 8c89f38119..001ae88370 100644
--- a/libraries/lilv/lilv.info
+++ b/libraries/lilv/lilv.info
@@ -1,10 +1,10 @@
 PRGNAM="lilv"
-VERSION="0.22.0"
+VERSION="0.24.8"
 HOMEPAGE="http://drobilla.net/software/lilv/"
-DOWNLOAD="http://download.drobilla.net/lilv-0.22.0.tar.bz2"
-MD5SUM="fd3a14fdaeaba4716b4fef526548a747"
+DOWNLOAD="http://download.drobilla.net/lilv-0.24.8.tar.bz2"
+MD5SUM="a2eb196d97c3c3b21de77cfbe4489e51"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="sratom"
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+REQUIRES="numpy3 sratom"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
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 59132b8128..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
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=live555
-VERSION=${VERSION:-2020.03.06}
+VERSION=${VERSION:-2020.08.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,8 +66,9 @@ for f in $(find . -type f |xargs grep -l "PREFIX =") ; do echo $f; sed -i -e "/P
 for f in $(find . -type f |xargs grep -l "LIBDIR =") ; do echo $f; sed -i -e "/LIBDIR =/c\LIBDIR = \$(PREFIX)\/lib$LIBDIRSUFFIX" $f ; done
 
 ./genMakefiles linux-with-shared-libraries
-# -j1 to avoid make race
-make -j1 install DESTDIR=$PKG
+# Deal with intermittent parallel make failures
+make || make -j1
+make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
 sed -e "s/%VERSION%/$VERSION/" -e "s/%LIBDIRSUFFIX%/$LIBDIRSUFFIX/" -e "s/%PREFIX%/\/usr/" $CWD/live555.pc.in >$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/live555.pc
diff --git a/libraries/live555/live555.info b/libraries/live555/live555.info
index 6b0c3e8270..75a0ba1211 100644
--- a/libraries/live555/live555.info
+++ b/libraries/live555/live555.info
@@ -1,8 +1,8 @@
 PRGNAM="live555"
-VERSION="2020.03.06"
+VERSION="2020.08.19"
 HOMEPAGE="http://www.live555.com/"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/live555/live.2020.03.06.tar.gz"
-MD5SUM="cfca528bda964d2167260b3ab6ee294e"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/live555/live.2020.08.19.tar.gz"
+MD5SUM="4645d2a0c865505c85b48af5317bcb4a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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-posix/README b/libraries/lua-posix/README
index 51e11febe1..36ac878478 100644
--- a/libraries/lua-posix/README
+++ b/libraries/lua-posix/README
@@ -1,5 +1,8 @@
 A library binding various POSIX APIs. POSIX is the IEEE Portable
 Operating System Interface standard. luaposix is based on lposix.
 
-Optional Dependency: lua52, lua53.
+This require one version of Lua installed (lua, lua52, lua53, luajit):
 Default support for all versions of Lua installed before build.
+To specify which Lua versions:
+  LUAVER="vers"
+"vers" must be one or more of "5.1 5.2 5.3 jit" in the right order separated with space
diff --git a/libraries/lua-posix/lua-posix.SlackBuild b/libraries/lua-posix/lua-posix.SlackBuild
index dd351655c2..e7bf79dccb 100644
--- a/libraries/lua-posix/lua-posix.SlackBuild
+++ b/libraries/lua-posix/lua-posix.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for lua-posix
-# Copyright 2019 abooksigun <abooksigun09@gmail.com>
+# Copyright 2020 abooksigun <abooksigun09@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 PRGNAM=lua-posix
 SRCNAM=luaposix
-VERSION=${VERSION:-34.1.1}
+VERSION=${VERSION:-35.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,22 +69,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-build-aux/luke all
-build-aux/luke PREFIX=$PKG/usr install
+LUAVER=${LUAVER:-"5.1 5.2 5.3 5.4 jit"}
 
-# lua 5.2 support.
-if $(lua5.2 -v &> /dev/null); then
-  sed -i '1s|lua.*|lua5.2|' build-aux/luke
-  build-aux/luke all
-  build-aux/luke PREFIX=$PKG/usr install
-fi
-
-# lua 5.3 support
-if $(lua5.3 -v &> /dev/null); then
-  sed -i '1s|lua.*|lua5.3|' build-aux/luke
-  build-aux/luke all
-  build-aux/luke PREFIX=$PKG/usr install
-fi
+for i in $LUAVER
+do
+  if [ $i != 5.1 ]; then ver=$i; fi
+  if $(lua$ver -v &> /dev/null)
+  then
+    sed -i "1s|lua.*|lua$ver|" build-aux/luke
+    build-aux/luke all
+    build-aux/luke PREFIX=$PKG/usr install
+  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-posix/lua-posix.info b/libraries/lua-posix/lua-posix.info
index d2afb78d23..009df7ef72 100644
--- a/libraries/lua-posix/lua-posix.info
+++ b/libraries/lua-posix/lua-posix.info
@@ -1,8 +1,8 @@
 PRGNAM="lua-posix"
-VERSION="34.1.1"
+VERSION="35.0"
 HOMEPAGE="https://github.com/luaposix/luaposix/"
-DOWNLOAD="https://github.com/luaposix/luaposix/archive/v34.1.1/luaposix-34.1.1.tar.gz"
-MD5SUM="83130630b4c87c9764d307d8653301a0"
+DOWNLOAD="https://github.com/luaposix/luaposix/archive/v35.0/luaposix-35.0.tar.gz"
+MD5SUM="b76815223b3cb2670f97cdbd14cca496"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua-std.normalize"
diff --git a/libraries/lua-readline/lua-readline.SlackBuild b/libraries/lua-readline/lua-readline.SlackBuild
index 460d3f2b90..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 2019 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.5}
+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 7c0d9b4576..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.5"
+VERSION="2.9"
 HOMEPAGE="http://www.pjb.com.au/comp/lua/readline.html"
-DOWNLOAD="http://www.pjb.com.au/comp/lua/readline-2.5.tar.gz"
-MD5SUM="fe1156b5b30cfc42999099e7061df6bb"
+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/lua-readline/slack-desc b/libraries/lua-readline/slack-desc
index cf5b62695e..566ea2ce2a 100644
--- a/libraries/lua-readline/slack-desc
+++ b/libraries/lua-readline/slack-desc
@@ -11,7 +11,7 @@ lua-readline:
 lua-readline: This Lua module offers a simple calling interface
 lua-readline: to the GNU Readline/History Library.
 lua-readline:
-lua-readline: Homepage: http://www.pjb.com.au/comp/lua/readline-2.5.tar.gz
+lua-readline: Homepage: http://www.pjb.com.au/comp/lua/readline.html
 lua-readline:
 lua-readline:
 lua-readline:
diff --git a/libraries/lua-std.normalize/lua-std.normalize.SlackBuild b/libraries/lua-std.normalize/lua-std.normalize.SlackBuild
index 515a20af9f..f771b8e569 100644
--- a/libraries/lua-std.normalize/lua-std.normalize.SlackBuild
+++ b/libraries/lua-std.normalize/lua-std.normalize.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for lua-std.normalize
-# Copyright 2019 abooksigun <abooksigun09@gmail.com>
+# Copyright 2020 abooksigun <abooksigun09@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 
 PRGNAM=lua-std.normalize
 SRCNAM=normalize
-VERSION=${VERSION:-2.0.2}
+VERSION=${VERSION:-2.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/lua-std.normalize/lua-std.normalize.info b/libraries/lua-std.normalize/lua-std.normalize.info
index 95fe135f41..3ebd4af1fe 100644
--- a/libraries/lua-std.normalize/lua-std.normalize.info
+++ b/libraries/lua-std.normalize/lua-std.normalize.info
@@ -1,8 +1,8 @@
 PRGNAM="lua-std.normalize"
-VERSION="2.0.2"
+VERSION="2.0.3"
 HOMEPAGE="https://lua-stdlib.github.io/normalize/"
-DOWNLOAD="https://github.com/lua-stdlib/normalize/archive/v2.0.2/normalize-2.0.2.tar.gz"
-MD5SUM="ef79927f6d272182bf5d4fdc5e89dd8f"
+DOWNLOAD="https://github.com/lua-stdlib/normalize/archive/v2.0.3/normalize-2.0.3.tar.gz"
+MD5SUM="a13b97767f4006ec190fdf20fd50fada"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua-std._debug"
diff --git a/libraries/luasec/luasec.SlackBuild b/libraries/luasec/luasec.SlackBuild
index 4744c092e1..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.8.2}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,9 +61,9 @@ 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
+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/luasec/luasec.info b/libraries/luasec/luasec.info
index e38025def6..bee916ba24 100644
--- a/libraries/luasec/luasec.info
+++ b/libraries/luasec/luasec.info
@@ -1,8 +1,8 @@
 PRGNAM="luasec"
-VERSION="0.8.2"
+VERSION="1.0"
 HOMEPAGE="https://github.com/brunoos/luasec"
-DOWNLOAD="https://github.com/brunoos/luasec/archive/luasec-0.8.2/luasec-luasec-0.8.2.tar.gz"
-MD5SUM="2898af6a094f63c9e582f907f09758e4"
+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 8a5249f1f6..7807226fce 100644
--- a/libraries/mbedtls/mbedtls.SlackBuild
+++ b/libraries/mbedtls/mbedtls.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for mbedtls
 
 # Copyright 2015 Euan Thoms (euan at potensol dot com)
-# Copyright 2019 Hunter Sezen California, USA
+# Copyright 2019-2020 Hunter Sezen California, 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=mbedtls
-VERSION=${VERSION:-2.16.2}
+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 d1241d5f41..986067a587 100644
--- a/libraries/mbedtls/mbedtls.info
+++ b/libraries/mbedtls/mbedtls.info
@@ -1,8 +1,8 @@
 PRGNAM="mbedtls"
-VERSION="2.16.2"
+VERSION="2.16.8"
 HOMEPAGE="https://tls.mbed.org"
-DOWNLOAD="https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.2/mbedtls-mbedtls-2.16.2.tar.gz"
-MD5SUM="e099b6f9fffde49565133770f3f5f387"
+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/med/med.SlackBuild b/libraries/med/med.SlackBuild
index 9256b4e3b0..2620575135 100644
--- a/libraries/med/med.SlackBuild
+++ b/libraries/med/med.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=med
-VERSION=${VERSION:-3.2.1}
+VERSION=${VERSION:-4.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,16 +54,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-SRCVERSION=$(echo $VERSION'_SRC')
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,6 +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_VERSION=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/med/med.info b/libraries/med/med.info
index b35c93daa5..f9551cd268 100644
--- a/libraries/med/med.info
+++ b/libraries/med/med.info
@@ -1,10 +1,10 @@
 PRGNAM="med"
-VERSION="3.2.1"
+VERSION="4.0.0"
 HOMEPAGE="https://www.code-aster.org"
-DOWNLOAD="http://files.salome-platform.org/Salome/other/med-3.2.1.tar.gz"
-MD5SUM="4965899bb578229ba27c9bc5293c651e"
+DOWNLOAD="http://files.salome-platform.org/Salome/other/med-4.0.0.tar.gz"
+MD5SUM="ef903d0dc165fc72818ab264ebb6e8ba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="hdf5"
+REQUIRES="hdf5 python3"
 MAINTAINER="blizzack"
-EMAIL="slackbuilds@blizzack.com"
\ No newline at end of file
+EMAIL="slackbuilds@blizzack.com"
diff --git a/libraries/msgpack-c/msgpack-c.SlackBuild b/libraries/msgpack-c/msgpack-c.SlackBuild
index c2cf26e5c6..7685b356ba 100644
--- a/libraries/msgpack-c/msgpack-c.SlackBuild
+++ b/libraries/msgpack-c/msgpack-c.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for msgpack-c
 
-# Copyright 2014-2019 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=msgpack-c
-VERSION=${VERSION:-3.2.1}
+VERSION=${VERSION:-3.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/msgpack-c/msgpack-c.info b/libraries/msgpack-c/msgpack-c.info
index ae629b2a4f..ecfbe14ac1 100644
--- a/libraries/msgpack-c/msgpack-c.info
+++ b/libraries/msgpack-c/msgpack-c.info
@@ -1,8 +1,8 @@
 PRGNAM="msgpack-c"
-VERSION="3.2.1"
+VERSION="3.3.0"
 HOMEPAGE="https://github.com/msgpack/msgpack-c"
-DOWNLOAD="https://github.com/msgpack/msgpack-c/releases/download/cpp-3.2.1/msgpack-3.2.1.tar.gz"
-MD5SUM="ef10c80885c4f5e4baf8d37113629eae"
+DOWNLOAD="https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz"
+MD5SUM="e676575d52caae974e579c3d5f0ba6a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/mujs/mujs.SlackBuild b/libraries/mujs/mujs.SlackBuild
index 61a22527d4..4ad0e1966b 100644
--- a/libraries/mujs/mujs.SlackBuild
+++ b/libraries/mujs/mujs.SlackBuild
@@ -3,6 +3,9 @@
 # Slackware build script for mujs
 
 # Written by Valerio Talora <navigare@gmx.com>
+# Copyright (c) 2018 (versions 1.0.3-1.0.5) Andreas Guldstrand
+# Copyright (c) 2020-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:
@@ -22,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mujs
-VERSION=${VERSION:-1.0.5}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,6 +65,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
+sed -i -e '/LIBREADLINE +=/ s/$/ -ltermcap/' Makefile
 
 chown -R root:root .
 find -L . \
@@ -70,8 +74,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 {} \;
 
-make LDFLAGS=-ltermcap
-make prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} install DESTDIR=$PKG
+make shared && make install-shared \
+  prefix=/usr \
+  libdir=/usr/lib${LIBDIRSUFFIX} \
+  DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README docs $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/mujs/mujs.info b/libraries/mujs/mujs.info
index c214533a45..ceb4d4982d 100644
--- a/libraries/mujs/mujs.info
+++ b/libraries/mujs/mujs.info
@@ -1,10 +1,10 @@
 PRGNAM="mujs"
-VERSION="1.0.5"
+VERSION="1.1.0"
 HOMEPAGE="https://mujs.com/"
-DOWNLOAD="https://mujs.com/downloads/mujs-1.0.5.tar.xz"
-MD5SUM="578f8be24a46449c6bcd36ad968d805d"
+DOWNLOAD="https://mujs.com/downloads/mujs-1.1.0.tar.xz"
+MD5SUM="f68f04aa9223934295afb88e87442ecc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andreas Guldstrand"
-EMAIL="andreas.guldstrand@gmail.com"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
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/mxml/link_with_pthread.diff b/libraries/mxml/link_with_pthread.diff
deleted file mode 100644
index e012a81cb8..0000000000
--- a/libraries/mxml/link_with_pthread.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- mxml-2.7.orig/Makefile.in	2012-06-14 20:05:40.319997357 -0700
-+++ mxml-2.7/Makefile.in	2012-06-14 20:23:52.961000179 -0700
-@@ -297,7 +297,7 @@
- 
- libmxml.so.1.5:	$(LIBOBJS)
- 	echo Creating $@...
--	$(DSO) $(DSOFLAGS) -o libmxml.so.1.5 $(LIBOBJS)
-+	$(DSO) $(DSOFLAGS) -o libmxml.so.1.5 $(LIBOBJS) $(LIBS)
- 	$(RM) libmxml.so libmxml.so.1
- 	$(LN) libmxml.so.1.5 libmxml.so
- 	$(LN) libmxml.so.1.5 libmxml.so.1
diff --git a/libraries/mxml/mxml.SlackBuild b/libraries/mxml/mxml.SlackBuild
index e9b64a516f..816208bec3 100644
--- a/libraries/mxml/mxml.SlackBuild
+++ b/libraries/mxml/mxml.SlackBuild
@@ -6,8 +6,8 @@
 # Updated by Kent Fritz <fritz.kent@gmail.com>
 
 PRGNAM=mxml
-VERSION=${VERSION:-2.12}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,7 +65,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DSTROOT=$PKG
+make install uninstall-libmxml.a DSTROOT=$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/mxml/mxml.info b/libraries/mxml/mxml.info
index 17b08931e7..6be369ac05 100644
--- a/libraries/mxml/mxml.info
+++ b/libraries/mxml/mxml.info
@@ -1,8 +1,8 @@
 PRGNAM="mxml"
-VERSION="2.12"
-HOMEPAGE="http://www.minixml.org/"
-DOWNLOAD="https://github.com/michaelrsweet/mxml/archive/v2.12/mxml-2.12.tar.gz"
-MD5SUM="bb927d3b94299862583b50df9a71e06a"
+VERSION="3.1"
+HOMEPAGE="https://www.msweet.org/mxml/"
+DOWNLOAD="https://github.com/michaelrsweet/mxml/releases/download/v3.1/mxml-3.1.tar.gz"
+MD5SUM="fd10c1aa96fee95947d64febc56d8a5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/mxml/remove_rpath.diff b/libraries/mxml/remove_rpath.diff
deleted file mode 100644
index be19c042a5..0000000000
--- a/libraries/mxml/remove_rpath.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- mxml-2.7.orig/configure	2012-06-14 20:05:40.322997627 -0700
-+++ mxml-2.7/configure	2012-06-14 20:28:11.276000237 -0700
-@@ -4715,8 +4715,8 @@
- echo "${ECHO_T}yes" >&6; }
- 			LIBMXML="libmxml.so.1.5"
- 			DSO="\$(CC)"
--			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)"
--                        LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-+			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1 -shared \$(OPTIM)"
-+                        LDFLAGS="$LDFLAGS"
- 			;;
- 
- 		*BSD*)
diff --git a/libraries/netcdf/README b/libraries/netcdf/README
index 61374e1929..dae0880c19 100644
--- a/libraries/netcdf/README
+++ b/libraries/netcdf/README
@@ -14,15 +14,3 @@ the 'hdf' package from SlackBuilds.org, and then pass the option
 
   HDF4=yes ./netcdf.SlackBuild
 
-Optional CDF5 support
----------------------
-
-CDF5 support is not yet enabled by default. According to the release
-notes [1], reading and writing CDF5 files on 32-bit platforms may
-result in unexpected behavior when using extremely large variables. If
-you need CDF5 support, please pass the option 'CDF5=yes' to the netcdf
-SlackBuild, for example
-
-  CDF5=yes ./netcdf.SlackBuild
-
-[1] https://www.unidata.ucar.edu/software/netcdf/docs/RELEASE_NOTES.html
diff --git a/libraries/netcdf/netcdf.SlackBuild b/libraries/netcdf/netcdf.SlackBuild
index 3c1449d46d..d5ab90e6f2 100644
--- a/libraries/netcdf/netcdf.SlackBuild
+++ b/libraries/netcdf/netcdf.SlackBuild
@@ -23,11 +23,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Maintained by David Spencer <baildon.research@googlemail.com>
+# Maintained by Gregory J. L. Tourte <artourter@gmail.com>
 
 PRGNAM=netcdf
 SRCNAM=netcdf-c
-VERSION=${VERSION:-4.6.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.7.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -79,12 +80,6 @@ else
   hdf4opt=""
 fi
 
-if [ "${CDF5:-no}" = 'yes' ]; then
-  cdf5opt="--enable-cdf5"
-else
-  cdf5opt=""
-fi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -96,10 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \
    --datarootdir=/usr \
    --docdir=/usr/doc/$PRGNAM-$VERSION \
    --enable-static=no \
-   --enable-netcdf-4 \
-   --enable-dap-netcdf \
    ${hdf4opt} \
-   ${cdf5opt} \
    --build=$ARCH-slackware-linux
 
 make
diff --git a/libraries/netcdf/netcdf.info b/libraries/netcdf/netcdf.info
index edcedb5fae..00bfd35100 100644
--- a/libraries/netcdf/netcdf.info
+++ b/libraries/netcdf/netcdf.info
@@ -1,8 +1,8 @@
 PRGNAM="netcdf"
-VERSION="4.6.2"
+VERSION="4.7.4"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-DOWNLOAD="https://github.com/Unidata/netcdf-c/archive/v4.6.2/netcdf-c-4.6.2.tar.gz"
-MD5SUM="7d3a25ec23e1fd7c1c7cdca7aa4a498c"
+DOWNLOAD="https://github.com/Unidata/netcdf-c/archive/v4.7.4/netcdf-c-4.7.4.tar.gz"
+MD5SUM="33979e8f0cf4ee31323fc0934282111b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="hdf5"
diff --git a/libraries/nltk/README b/libraries/nltk/README
index e47befeee7..868d987c3c 100644
--- a/libraries/nltk/README
+++ b/libraries/nltk/README
@@ -2,11 +2,12 @@ Open source Python modules, linguistic data and documentation for research and
 development in natural language processing, supporting dozens of NLP tasks,
 with distributions for Windows, Mac OSX and Linux.
 
-This SlackBuild will create a package with the python2 version and the python3
-version if python3 is installed on the machine.
+As of version 3.5, python 2.7 is no longer supported and python3 is now
+required.
 
 NLTK comes with many corpora, toy grammars, trained models, etc. A complete
 list is posted at: http://nltk.org/nltk_data/.  To retrieve all the data, use
-"python -m nltk.downloader all". To ensure system wideinstallation, you can
-run the command "python -m nltk.downloader -d /usr/share/nltk_data all" as
-root.
+"python3 -m nltk.downloader all". To ensure system wideinstallation, you can
+run the command "python3 -m nltk.downloader -d /usr/share/nltk_data all" as
+root. Note that the 'regex' package, also available on SBo, is required to run
+this command.
diff --git a/libraries/nltk/nltk.SlackBuild b/libraries/nltk/nltk.SlackBuild
index 33f1da43e9..9c30d81549 100644
--- a/libraries/nltk/nltk.SlackBuild
+++ b/libraries/nltk/nltk.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nltk
-VERSION=${VERSION:-3.4.5}
+VERSION=${VERSION:-3.5}
 SRCVER=$VERSION
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -59,11 +59,7 @@ find -L . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-python2 setup.py install --root=$PKG
-
-if $(command -v python3 &>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
+python3 setup.py install --root=$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
diff --git a/libraries/nltk/nltk.info b/libraries/nltk/nltk.info
index 7803ae1e10..7503fa33d9 100644
--- a/libraries/nltk/nltk.info
+++ b/libraries/nltk/nltk.info
@@ -1,10 +1,10 @@
 PRGNAM="nltk"
-VERSION="3.4.5"
+VERSION="3.5"
 HOMEPAGE="http://www.nltk.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/f6/1d/d925cfb4f324ede997f6d47bea4d9babba51b49e87a767c170b77005889d/nltk-3.4.5.zip"
-MD5SUM="26bbf73e822136df16d7e9ce38120bd0"
+DOWNLOAD="https://files.pythonhosted.org/packages/92/75/ce35194d8e3022203cca0d2f896dbb88689f9b3fce8e9f9cff942913519d/nltk-3.5.zip"
+MD5SUM="2a827c8c8a50b98241c07f2758eb6961"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3 regex"
 MAINTAINER="ArTourter"
 EMAIL="artourter@gmail.com"
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/ode/README b/libraries/ode/README
index 5ba8aa34da..901fa2bc5a 100644
--- a/libraries/ode/README
+++ b/libraries/ode/README
@@ -1,5 +1,5 @@
-The Open Dynamics Engine (ODE) is a free, industrial quality library for 
-simulating articulated rigid body dynamics. Proven applications include 
-simulating ground vehicles, legged creatures, and moving objects in VR 
-environments. It is fast, flexible and robust, and has built-in collision 
-detection.
+The Open Dynamics Engine (ODE) is a free, industrial quality library for
+simulating articulated rigid body dynamics. Proven applications include
+simulating ground vehicles, legged creatures, and moving objects in VR
+environments. It is fast, flexible and robust, and has built-in
+collision detection.
diff --git a/libraries/ode/ode.SlackBuild b/libraries/ode/ode.SlackBuild
index 5b3f7a102b..9a65a657e5 100644
--- a/libraries/ode/ode.SlackBuild
+++ b/libraries/ode/ode.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ode
-VERSION=${VERSION:-0.16.1}
+VERSION=${VERSION:-0.16.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/ode/ode.info b/libraries/ode/ode.info
index 327f01faff..7542fbaaf5 100644
--- a/libraries/ode/ode.info
+++ b/libraries/ode/ode.info
@@ -1,8 +1,8 @@
 PRGNAM="ode"
-VERSION="0.16.1"
+VERSION="0.16.2"
 HOMEPAGE="https://ode.org/"
-DOWNLOAD="https://bitbucket.org/odedevs/ode/downloads/ode-0.16.1.tar.gz"
-MD5SUM="0af3efe98f19163c04083c554afff629"
+DOWNLOAD="https://bitbucket.org/odedevs/ode/downloads/ode-0.16.2.tar.gz"
+MD5SUM="13426ae292f4dd007a1b8483b08ecc8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/ogre/README b/libraries/ogre/README
index 96cb08cd72..651c87caf3 100644
--- a/libraries/ogre/README
+++ b/libraries/ogre/README
@@ -31,7 +31,7 @@ For example, in order to build samples too, launch from super user:
 OGRE_BUILD_SAMPLES=ON ./ogre.SlackBuild
 
 Optional dependencies available at SlackBuilds.org:
-zziplib, FreeImage, tbb, cppunit, ois
+zziplib, FreeImage, tbb, cppunit, ois, nvidia-cg-toolkit
 
 Optional dependencies NOT (yet) available at SlackBuilds.org:
-cg, opengles, POCO
+opengles, POCO
diff --git a/libraries/ogre/ogre.SlackBuild b/libraries/ogre/ogre.SlackBuild
index 958cc17e2b..294590f265 100644
--- a/libraries/ogre/ogre.SlackBuild
+++ b/libraries/ogre/ogre.SlackBuild
@@ -24,14 +24,17 @@
 # (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.9}
-BUILD=${BUILD:-6}
+VERSION=${VERSION:-1.12.9}
+IMGUIVER=${IMGUIVER:-1.77}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM="${PRGNAM}_src_v${VERSION//./-}"
-SRCNAM="sinbad-ogre-6e05fa641af2" # This is just temporary
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -63,16 +66,15 @@ fi
 # cmake options
 OGRE_BUILD_SAMPLES=${OGRE_BUILD_SAMPLES:-ON}
 OGRE_INSTALL_DOCS=${OGRE_INSTALL_DOCS:-ON}
-OGRE_INSTALL_DOCS=${OGRE_INSTALL_DOCS:-ON}
 OGRE_INSTALL_SAMPLES_SOURCE=${OGRE_INSTALL_SAMPLES_SOURCE:-ON}
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM.tar.bz2 || tar xvf $CWD/v$(echo $VERSION | tr . -).tar.bz2
-cd $SRCNAM
+rm -rf $PRGNAM-$VERSION
+unzip $CWD/$PRGNAM-$VERSION.zip
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -82,6 +84,8 @@ find -L . \
 
 mkdir build
 cd build
+tar xvf $CWD/imgui-$IMGUIVER.tar.gz
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   CXXFLAGS+=' -Wno-deprecated-declarations' \
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
@@ -89,7 +93,10 @@ cd build
         -DOGRE_BUILD_SAMPLES=$OGRE_BUILD_SAMPLES \
         -DOGRE_INSTALL_SAMPLES=$OGRE_BUILD_SAMPLES \
         -DOGRE_INSTALL_DOCS=$OGRE_INSTALL_DOCS \
+        -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
@@ -99,7 +106,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 BUGS BuildingOgre.txt COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS 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/libraries/ogre/ogre.info b/libraries/ogre/ogre.info
index 354dc24f47..848a248656 100644
--- a/libraries/ogre/ogre.info
+++ b/libraries/ogre/ogre.info
@@ -1,10 +1,12 @@
 PRGNAM="ogre"
-VERSION="1.9"
+VERSION="1.12.9"
 HOMEPAGE="https://www.ogre3d.org/"
-DOWNLOAD="https://bitbucket.org/sinbad/ogre/get/v1-9.tar.bz2"
-MD5SUM="445ed1d75f24fd351e6f87304d95098b"
+DOWNLOAD="https://github.com/OGRECave/ogre/archive/v1.12.9/ogre-1.12.9.zip \
+https://github.com/ocornut/imgui/archive/v1.77/imgui-1.77.tar.gz"
+MD5SUM="af72419a3ad1f84213de29db4d52f261 \
+d42af3bff3a6489fd8eb5ceb49e12a63"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="cmake-202x pugixml"
 MAINTAINER="Roberto Metere"
 EMAIL="roberto@metere.it"
diff --git a/libraries/olm/README b/libraries/olm/README
index fcdee97450..7f9b4947e0 100644
--- a/libraries/olm/README
+++ b/libraries/olm/README
@@ -1,18 +1,18 @@
 olm (olm and megolm cryptographic ratchets)
 
-An implementation of the Double Ratchet cryptographic ratchet described by
-https://whispersystems.org/docs/specifications/doubleratchet/, written in 
-C and C++11 and exposed as a C API.
+An implementation of the Double Ratchet cryptographic ratchet described
+by https://whispersystems.org/docs/specifications/doubleratchet/,
+written in C and C++11 and exposed as a C API.
 
 The specification of the Olm ratchet can be found in olm.md.
 
-This library also includes an implementation of the Megolm cryptographic 
+This library also includes an implementation of the Megolm cryptographic
 ratchet, as specified in megolm.md.
 
-Olm is designed to be easy port to different platforms and to be easy to 
+Olm is designed to be easy port to different platforms and to be easy to
 write bindings for.
 
-It was originally implemented in C++, with a plain-C layer providing the 
-public API. As development has progressed, it has become clear that C++ 
-gives little advantage, and new functionality is being added in C, with 
+It was originally implemented in C++, with a plain-C layer providing the
+public API. As development has progressed, it has become clear that C++
+gives little advantage, and new functionality is being added in C, with
 C++ parts being rewritten as the need arises.
diff --git a/libraries/olm/olm.SlackBuild b/libraries/olm/olm.SlackBuild
index 89ed8ad2fc..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.1.4}
+VERSION=${VERSION:-3.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/olm/olm.info b/libraries/olm/olm.info
index 8faa32cb87..03494cb7c7 100644
--- a/libraries/olm/olm.info
+++ b/libraries/olm/olm.info
@@ -1,8 +1,8 @@
 PRGNAM="olm"
-VERSION="3.1.4"
+VERSION="3.2.2"
 HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm"
-DOWNLOAD="https://gitlab.matrix.org/matrix-org/olm/-/archive/3.1.4/olm-3.1.4.tar.bz2"
-MD5SUM="c45da62ae90274157576ff405c8057c9"
+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/opencl-amd/README b/libraries/opencl-amd/README
new file mode 100644
index 0000000000..a46fcc5478
--- /dev/null
+++ b/libraries/opencl-amd/README
@@ -0,0 +1,7 @@
+OpenCL userspace driver as provided in the amdgpu-pro driver stack and
+intended to work along with the free amdgpu stack.  It's a repackage
+of AUR opencl-amd and don't provide the full amdgpu-pro stack.
+
+The Ubuntu 18.04 drivers can be downloaded using:
+
+/usr/bin/wget --referer https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx -N https://drivers.amd.com/drivers/linux/19.50/amdgpu-pro-19.50-967956-ubuntu-18.04.tar.xz
diff --git a/libraries/opencl-amd/opencl-amd.SlackBuild b/libraries/opencl-amd/opencl-amd.SlackBuild
new file mode 100644
index 0000000000..f0e076e986
--- /dev/null
+++ b/libraries/opencl-amd/opencl-amd.SlackBuild
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+# Copyright 2020  Ciprian Stingu <ciprian dot stingu at gmail dot com>
+# Repackage of AUR : opencl-amd.git for Slackware
+#
+# Original credits of AUR : opencl-amd.git
+# Maintainer: Christopher Snowhill <kode54 at gmail dot com>
+# Contributor: ipha <ipha00 at gmail dot com>
+# Contributor: johnnybash <georgpfahler at wachenzell dot org>
+# Contributor: grmat <grmat at sub dot red>
+#
+# 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="opencl-amd"
+VERSION=${VERSION:-19.50}
+MINVER="967956"
+AMDVER="2.4.99"
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="amdgpu-pro-${VERSION}-${MINVER}-ubuntu-18.04"
+CLINFO_SHARED="opt/amdgpu-pro/bin"
+OPENCL_SHARED="opt/amdgpu-pro/lib/x86_64-linux-gnu"
+LIBDRM_SHARED="opt/amdgpu/lib/x86_64-linux-gnu"
+
+# Allow $ARCH to be preset before running the script.  This is useful in the
+# case where someone is running a 32-bit chroot environment under an x86_64
+# kernel:
+ARCH=${ARCH:-$(uname -m)}
+
+case "$ARCH" in
+  x86_64) DEBARCH="amd64" ; LIBDIRSUFFIX="64" ; ARCH=x86_64 ;;
+  *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
+esac
+
+if [ ! $UID = 0 ]; then
+  cat << EOF
+
+This script must be run as root.
+
+EOF
+  exit 1
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG="${TMP}/package-${PRGNAM}"
+SRCDIR="${TMP}/${SRCNAM}"
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf "${PKG}"
+mkdir -p "${TMP}" "${PKG}" "${OUTPUT}"
+cd "${TMP}"
+
+rm -rf ${SRCDIR}
+tar -xf "${CWD}/${SRCNAM}.tar.xz"
+
+rm -rf "${TMP}/opencl"
+rm -rf "${TMP}/libdrm"
+
+#start AUR : opencl-amd.git
+mkdir -p "${TMP}/opencl"
+cd "${TMP}/opencl"
+# clinfo
+ar x "${SRCDIR}/clinfo-amdgpu-pro_${VERSION}-${MINVER}_${DEBARCH}.deb"
+tar xJf "data.tar.xz"
+# pal
+ar x "${SRCDIR}/opencl-amdgpu-pro-icd_${VERSION}-${MINVER}_${DEBARCH}.deb"
+tar xJf "data.tar.xz"
+ar x "${SRCDIR}/opencl-amdgpu-pro-comgr_${VERSION}-${MINVER}_${DEBARCH}.deb"
+tar xJf "data.tar.xz"
+# orca
+ar x "${SRCDIR}/opencl-orca-amdgpu-pro-icd_${VERSION}-${MINVER}_${DEBARCH}.deb"
+tar xJf "data.tar.xz"
+cd "${OPENCL_SHARED}"
+sed -i "s|libdrm_amdgpu|libdrm_amdgpo|g" libamdocl-orca64.so
+# libdrm
+mkdir -p "${TMP}/libdrm"
+cd "${TMP}/libdrm"
+ar x "${SRCDIR}/libdrm-amdgpu-amdgpu1_${AMDVER}-${MINVER}_${DEBARCH}.deb"
+tar xJf "data.tar.xz"
+cd "${LIBDRM_SHARED}"
+rm "libdrm_amdgpu.so.1"
+mv "libdrm_amdgpu.so.1.0.0" "libdrm_amdgpo.so.1.0.0"
+ln -s "libdrm_amdgpo.so.1.0.0" "libdrm_amdgpo.so.1"
+
+mv "${TMP}/opencl/etc" "${PKG}/"
+mkdir -p "${PKG}/usr/lib${LIBDIRSUFFIX}"
+mkdir -p "${PKG}/usr/bin"
+# clinfo
+mv "${TMP}/opencl/${CLINFO_SHARED}/clinfo" "${PKG}/usr/bin/"
+# pal
+mv "${TMP}/opencl/${OPENCL_SHARED}/libamdocl64.so" "${PKG}/usr/lib${LIBDIRSUFFIX}/"
+mv "${TMP}/opencl/${OPENCL_SHARED}/libamd_comgr.so" "${PKG}/usr/lib${LIBDIRSUFFIX}/"
+# orca
+mv "${TMP}/opencl/${OPENCL_SHARED}/libamdocl-orca64.so" "${PKG}/usr/lib${LIBDIRSUFFIX}/"
+mv "${TMP}/opencl/${OPENCL_SHARED}/libamdocl12cl64.so" "${PKG}/usr/lib${LIBDIRSUFFIX}/"
+# libdrm
+mv "${TMP}/libdrm/${LIBDRM_SHARED}/libdrm_amdgpo.so.1.0.0" "${PKG}/usr/lib${LIBDIRSUFFIX}/"
+mv "${TMP}/libdrm/${LIBDRM_SHARED}/libdrm_amdgpo.so.1" "${PKG}/usr/lib${LIBDIRSUFFIX}/"
+
+mkdir -p "${PKG}/opt/amdgpu/share/libdrm"
+cd "${PKG}/opt/amdgpu/share/libdrm"
+ln -s "/usr/share/libdrm/amdgpu.ids" "amdgpu.ids"
+
+rm -rf "${TMP}/opencl"
+rm -rf "${TMP}/libdrm"
+#end AUR : opencl-amd.git
+
+mkdir -p "${PKG}/install"
+cat "${CWD}/slack-desc" > "${PKG}/install/slack-desc"
+
+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 {} \;
+
+/sbin/makepkg -l y -c n "${OUTPUT}/${PRGNAM}-${VERSION}-${MINVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}"
diff --git a/libraries/opencl-amd/opencl-amd.info b/libraries/opencl-amd/opencl-amd.info
new file mode 100644
index 0000000000..0f7d1890e3
--- /dev/null
+++ b/libraries/opencl-amd/opencl-amd.info
@@ -0,0 +1,10 @@
+PRGNAM="opencl-amd"
+VERSION="19.50"
+HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://drivers.amd.com/drivers/linux/19.50/amdgpu-pro-19.50-967956-ubuntu-18.04.tar.xz"
+MD5SUM_x86_64="aa0df956b488789896b82359ddb856c8"
+REQUIRES=""
+MAINTAINER="Ciprian Stingu"
+EMAIL="ciprian dot stingu at gmail dot com"
diff --git a/libraries/opencl-amd/slack-desc b/libraries/opencl-amd/slack-desc
new file mode 100644
index 0000000000..ee2d33b540
--- /dev/null
+++ b/libraries/opencl-amd/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------------------------------------------------------|
+opencl-amd: opencl-amd (OpenCL Userspace Driver)
+opencl-amd:
+opencl-amd: OpenCL userspace driver as provided in the amdgpu-pro driver stack
+opencl-amd: This package is intended to work along with the free amdgpu stack
+opencl-amd:
+opencl-amd:
+opencl-amd:
+opencl-amd: Homepage:  https://support.amd.com/en-us/kb-articles/Pages/
+opencl-amd: AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx
+opencl-amd:
+opencl-amd:
diff --git a/libraries/opencv/README b/libraries/opencv/README
index d2e02e42d9..38ce4bcba5 100644
--- a/libraries/opencv/README
+++ b/libraries/opencv/README
@@ -53,13 +53,14 @@ This package is configured to generate python bindings for Python 3 (via
 dependency on the numpy3 package). If bindings for Python 2 are required,
 the numpy package is required when building opencv.
 
-The Deep Neural Network module and Extra 2D Features Framework from
-OpenCV's "extra modules" section are disabled by default. They may be
-enabled by setting the DNN and/or XF2D environment variables as required
-e.g.
-    DNN=yes sh ./opencv.SlackBuild
-Enabling either of these modules results in additional downloading during
-the configure stage of building.
+The Extra 2D Features Framework from OpenCV's "extra modules" section
+is disabled by default as it entails additional downloading during
+the configure stage of building. It may be enabled by setting the XF2D
+environment variable when building e.g.
+    XF2D=yes sh ./opencv.SlackBuild
+Usually, this also applies to the Deep Neural Network (DNN) module
+however it is no longer possible to complete a build without without
+it and therefore remains enabled by default.
 
 The face recognition module is enabled by default. This incurs an additional
 download of the face_landmark_model.dat file (~70M) from OpenCV's github
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index f6f32bf9e7..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.2.0}
+VERSION=${VERSION:-4.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,13 +58,13 @@ else
 fi
 
 qt5="-DWITH_QT=ON" ; [ "${CVQT5:-yes}" = "no" ] &&   qt5="-DWITH_QT=OFF"
-cvnonfree="" ;  [ "${CVNONFREE:-no}" = "yes" ]  &&   cvnonfree="-DOPENCV_ENABLE_NONFREE=ON"
-cv1394="" ;     [ "${CV1394:-yes}" = "no" ]     &&   cv1394="-DWITH_1394=OFF"
-cvffmpeg="" ;   [ "${CVFFMPEG:-yes}" = "no" ]   &&   cvffmpeg="-DWITH_FFMPEG=OFF"
-cvvtk="" ;      [ "${CVVTK:-yes}" = "no" ]      &&   cvvtk="-DWITH_VTK=OFF"
-cvgdal="" ;     [ "${CVGDAL:-no}" = "yes" ]     &&   cvgdal="-DWITH_GDAL=ON"
-dnn="-DBUILD_opencv_dnn=OFF" ; [ "${DNN:-no}" = "yes" ] && dnn=""
-face="" ;       [ "${OCV_FACE:-yes}" = "no" ]   &&   face="-DBUILD_opencv_face=OFF"
+cvnonfree="" ; [ "${CVNONFREE:-no}" = "yes" ]  &&   cvnonfree="-DOPENCV_ENABLE_NONFREE=ON"
+cv1394="" ;    [ "${CV1394:-yes}" = "no" ]     &&   cv1394="-DWITH_1394=OFF"
+cvffmpeg="" ;  [ "${CVFFMPEG:-yes}" = "no" ]   &&   cvffmpeg="-DWITH_FFMPEG=OFF"
+cvvtk="" ;     [ "${CVVTK:-yes}" = "no" ]      &&   cvvtk="-DWITH_VTK=OFF"
+cvgdal="" ;    [ "${CVGDAL:-no}" = "yes" ]     &&   cvgdal="-DWITH_GDAL=ON"
+dnn=""; #dnn="-DBUILD_opencv_dnn=OFF" ; [ "${DNN:-no}" = "yes" ] && dnn=""
+face="" ;      [ "${OCV_FACE:-yes}" = "no" ]   &&   face="-DBUILD_opencv_face=OFF"
 xf2d="-DBUILD_opencv_xfeatures2d=OFF" ; [ "${XF2D:-no}" = "yes" ] && xf2d=""
 cvdocs="-DBUILD_DOCS=ON -DBUILD_EXAMPLES=ON -DINSTALL_C_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON " ; [ "${CVDOCS:-yes}" = "no" ] && cvdocs=""
 
@@ -116,6 +116,7 @@ cd build
     $xf2d \
     $cvdocs \
     $cvnonfree \
+    -DBUILD_opencv_intensity_transform=OFF \
     -DOPENCV_EXTRA_MODULES_PATH=../$PRGNAM2-$VERSION/modules ..
 
   make VERBOSE=1
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index 5822a26dbf..cbf4a26a23 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -1,10 +1,10 @@
 PRGNAM="opencv"
-VERSION="4.2.0"
+VERSION="4.5.2"
 HOMEPAGE="https://opencv.org/"
-DOWNLOAD="https://github.com/opencv/opencv/archive/4.2.0/opencv-4.2.0.tar.gz \
-        https://github.com/opencv/opencv_contrib/archive/4.2.0/opencv_contrib-4.2.0.tar.gz"
-MD5SUM="e8cb208ce2723481408b604b480183b6 \
-        7f8111deb2ce3ed6c87ede8b3bf82031"
+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 363ee93c1b..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.0}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/orcania/orcania.info b/libraries/orcania/orcania.info
index 0b8d0fc7f7..23f438ec16 100644
--- a/libraries/orcania/orcania.info
+++ b/libraries/orcania/orcania.info
@@ -1,8 +1,8 @@
 PRGNAM="orcania"
-VERSION="2.1.0"
+VERSION="2.2.0"
 HOMEPAGE="https://github.com/babelouest/orcania"
-DOWNLOAD="https://github.com/babelouest/orcania/archive/v2.1.0/orcania-2.1.0.tar.gz"
-MD5SUM="9eba5d4f1a553e95f62da2ea35500dde"
+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/pcre2/pcre2.SlackBuild b/libraries/pcre2/pcre2.SlackBuild
index 650a83f9b3..f34a4068f4 100644
--- a/libraries/pcre2/pcre2.SlackBuild
+++ b/libraries/pcre2/pcre2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pcre2
 
-# Copyright 2016-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2016-2020 Larry Hajali <larryhaja[at]gmail[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=pcre2
-VERSION=${VERSION:-10.33}
+VERSION=${VERSION:-10.35}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/pcre2/pcre2.info b/libraries/pcre2/pcre2.info
index 648ddb8cb8..620196ad18 100644
--- a/libraries/pcre2/pcre2.info
+++ b/libraries/pcre2/pcre2.info
@@ -1,8 +1,8 @@
 PRGNAM="pcre2"
-VERSION="10.33"
+VERSION="10.35"
 HOMEPAGE="http://www.pcre.org/"
-DOWNLOAD="https://downloads.sourceforge.net/pcre/pcre2-10.33.tar.bz2"
-MD5SUM="80b355f2dce909a2e2424f5c79eddb44"
+DOWNLOAD="https://downloads.sourceforge.net/pcre/pcre2-10.35.tar.bz2"
+MD5SUM="a0674e2cc5941d738c1afddf43fb8745"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/pexpect/pexpect.SlackBuild b/libraries/pexpect/pexpect.SlackBuild
index e60bff3237..7eccf94dab 100644
--- a/libraries/pexpect/pexpect.SlackBuild
+++ b/libraries/pexpect/pexpect.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pexpect
-VERSION=${VERSION:-4.6.0}
+VERSION=${VERSION:-4.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,6 +71,10 @@ find -L . \
   -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 -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/pexpect/pexpect.info b/libraries/pexpect/pexpect.info
index d5c3e3374a..8bcb54c20b 100644
--- a/libraries/pexpect/pexpect.info
+++ b/libraries/pexpect/pexpect.info
@@ -1,8 +1,8 @@
 PRGNAM="pexpect"
-VERSION="4.6.0"
+VERSION="4.8.0"
 HOMEPAGE="https://github.com/pexpect/pexpect"
-DOWNLOAD="https://files.pythonhosted.org/packages/89/43/07d07654ee3e25235d8cea4164cdee0ec39d1fda8e9203156ebe403ffda4/pexpect-4.6.0.tar.gz"
-MD5SUM="d4f3372965a996238d57d19b95d2e03a"
+DOWNLOAD="https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10/pexpect-4.8.0.tar.gz"
+MD5SUM="153eb25184249d6a85fde9acf4804085"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ptyprocess"
diff --git a/libraries/pigpio/README b/libraries/pigpio/README
new file mode 100644
index 0000000000..e50a716dff
--- /dev/null
+++ b/libraries/pigpio/README
@@ -0,0 +1,2 @@
+pigpio is a C library for the Raspberry which allows control of the
+General Purpose Input Outputs (GPIO).
diff --git a/libraries/pigpio/pigpio.SlackBuild b/libraries/pigpio/pigpio.SlackBuild
new file mode 100644
index 0000000000..6d5d9ea78c
--- /dev/null
+++ b/libraries/pigpio/pigpio.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for pigpio
+
+# Copyright 2020 Fauzi Gomez Miami FL 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=pigpio
+VERSION=${VERSION:-74}
+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|local/||g" CMakeLists.txt
+sed -i "s|/lib|/lib${LIBDIRSUFFIX}|g" CMakeLists.txt
+
+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
+  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 EXAMPLES README UNLICENCE *.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/pigpio/pigpio.info b/libraries/pigpio/pigpio.info
new file mode 100644
index 0000000000..bccd5f6e84
--- /dev/null
+++ b/libraries/pigpio/pigpio.info
@@ -0,0 +1,10 @@
+PRGNAM="pigpio"
+VERSION="74"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
+DOWNLOAD="https://github.com/joan2937/pigpio/archive/v74/pigpio-74.tar.gz"
+MD5SUM="976e83991b47ac239200d99d06247e2b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fauzi Gomez"
+EMAIL="me@fauzigomez.com"
diff --git a/libraries/pigpio/slack-desc b/libraries/pigpio/slack-desc
new file mode 100644
index 0000000000..b07f8b08ea
--- /dev/null
+++ b/libraries/pigpio/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------------------------------------------------------|
+pigpio: pigpio (GPIO for Raspberry)
+pigpio:
+pigpio: pigpio is a library for the Raspberry which allows control of the
+pigpio: General Purpose Input Outputs (GPIO).  pigpio works on all versions
+pigpio: of the Pi.
+pigpio:
+pigpio:
+pigpio:
+pigpio: Homepage: http://abyz.me.uk/rpi/pigpio/index.html
+pigpio:
+pigpio:
diff --git a/libraries/podofo/XRefStrParObj-deprecated.patch b/libraries/podofo/XRefStrParObj-deprecated.patch
new file mode 100644
index 0000000000..d2a74b68b5
--- /dev/null
+++ b/libraries/podofo/XRefStrParObj-deprecated.patch
@@ -0,0 +1,61 @@
+diff -Naur podofo-0.9.6.orig/src/base/PdfXRefStreamParserObject.h podofo-0.9.6/src/base/PdfXRefStreamParserObject.h
+--- podofo-0.9.6.orig/src/base/PdfXRefStreamParserObject.h	2014-06-06 22:13:22.000000000 +0000
++++ podofo-0.9.6/src/base/PdfXRefStreamParserObject.h	2020-05-03 02:26:01.119538387 +0000
+@@ -47,8 +47,11 @@
+  * an XRef stream object.
+  *
+  * It is mainly here to make PdfParser more modular.
++ * This is only marked PODOFO_API for the benefit of the tests,
++ * the class is for internal use only. It is deprecated, so
++ * don't ever rely on it (i.e. externally or in PoDoFo tools).
+  */
+-class PdfXRefStreamParserObject : public PdfParserObject {
++class PODOFO_DEPRECATED PODOFO_API PdfXRefStreamParserObject : public PdfParserObject {
+ public:
+ 
+     /** Parse the object data from the given file handle starting at
+diff -Naur podofo-0.9.6.orig/src/base/podofoapi.h podofo-0.9.6/src/base/podofoapi.h
+--- podofo-0.9.6.orig/src/base/podofoapi.h	2017-10-27 06:38:19.000000000 +0000
++++ podofo-0.9.6/src/base/podofoapi.h	2020-05-03 02:27:03.874537513 +0000
+@@ -173,9 +173,22 @@
+ 
+ /* Set up some other compiler-specific but not platform-specific macros */
+ 
+-#if defined(__GNUC__)
+-    /* gcc will issue a warning if a function or variable so annotated is used */
+-    #define PODOFO_DEPRECATED       __attribute__((deprecated))
++#ifdef __GNU__
++  #define PODOFO_HAS_GCC_ATTRIBUTE_DEPRECATED 1
++#elif defined(__has_attribute)
++  #if __has_attribute(__deprecated__)
++    #define PODOFO_HAS_GCC_ATTRIBUTE_DEPRECATED 1
++  #endif
++#endif
++
++#ifdef PODOFO_HAS_GCC_ATTRIBUTE_DEPRECATED
++    /* gcc (or compat. clang) will issue a warning if a function or variable so annotated is used */
++    #define PODOFO_DEPRECATED       __attribute__((__deprecated__))
++#else
++    #define PODOFO_DEPRECATED
++#endif
++
++#ifdef __GNU__
+     /* gcc can do some additional optimisations on functions annotated as pure.
+      * See the documentation on __attribute__((pure)) in the gcc docs. */
+     #define PODOFO_PURE_FUNCTION    __attribute__((pure))
+@@ -185,9 +198,12 @@
+      * (see CODINGSTYLE.txt) .*/
+     #define PODOFO_NOTHROW          __attribute__((nothrow))
+ #else
+-    #define PODOFO_DEPRECATED
+-    #define PODOFO_PURE_FUNCTION
+-    #define PODOFO_NOTHROW          __declspec(nothrow)
++  #define PODOFO_PURE_FUNCTION
++    #ifdef _MSC_VER
++      #define PODOFO_NOTHROW        __declspec(nothrow)
++    #else
++      #define PODOFO_NOTHROW
++    #endif
+ #endif
+ 
+ // Peter Petrov 27 April 2008
diff --git a/libraries/podofo/podofo-0.9.4_build.patch b/libraries/podofo/podofo-0.9.4_build.patch
deleted file mode 100644
index 3c4b72a751..0000000000
--- a/libraries/podofo/podofo-0.9.4_build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN podofo-0.9.4/test/unit/EncryptTest.h podofo-0.9.4-new/test/unit/EncryptTest.h
---- podofo-0.9.4/test/unit/EncryptTest.h	2012-12-12 23:55:46.000000000 +0100
-+++ podofo-0.9.4-new/test/unit/EncryptTest.h	2016-09-18 10:41:30.476635230 +0200
-@@ -83,7 +83,7 @@ class EncryptTest : public CppUnit::Test
- 
-  private:
-   char* m_pEncBuffer;
--  long  m_lLen;
-+  PoDoFo::pdf_long  m_lLen;
-   int   m_protection;
-   
- };
diff --git a/libraries/podofo/podofo.SlackBuild b/libraries/podofo/podofo.SlackBuild
index 926b5372d3..2a4d4b5002 100644
--- a/libraries/podofo/podofo.SlackBuild
+++ b/libraries/podofo/podofo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for podofo
 
-# Copyright 2009-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2009-2020 Larry Hajali <larryhaja[at]gmail[dot]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=podofo
-VERSION=${VERSION:-0.9.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -71,8 +71,8 @@ find -L . \
 
 # Fix mandir directory.
 sed -i 's|share/man|man|' CMakeLists.txt
-# Fix building podofo on x86 with cppunit.
-patch -p1 < $CWD/podofo-0.9.4_build.patch
+# Ref: https://sourceforge.net/p/podofo/tickets/28/
+patch -p1 < $CWD/XRefStrParObj-deprecated.patch
 
 mkdir build
 cd build
@@ -92,7 +92,7 @@ cd build
   make install DESTDIR=$PKG
 cd -
 
-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 {} \;
diff --git a/libraries/podofo/podofo.info b/libraries/podofo/podofo.info
index 411003ffcd..5a97ef24ef 100644
--- a/libraries/podofo/podofo.info
+++ b/libraries/podofo/podofo.info
@@ -1,8 +1,8 @@
 PRGNAM="podofo"
-VERSION="0.9.5"
+VERSION="0.9.6"
 HOMEPAGE="http://podofo.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/podofo/podofo-0.9.5.tar.gz"
-MD5SUM="4751a6cf41250bea550a73ff960b7228"
+DOWNLOAD="http://downloads.sourceforge.net/podofo/podofo-0.9.6.tar.gz"
+MD5SUM="46336fc4c4ce4be814bb5fbb4d918334"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/protobuf-c/protobuf-c.SlackBuild b/libraries/protobuf-c/protobuf-c.SlackBuild
index 4e64f58a3c..c2beb70f84 100644
--- a/libraries/protobuf-c/protobuf-c.SlackBuild
+++ b/libraries/protobuf-c/protobuf-c.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=protobuf-c
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/protobuf-c/protobuf-c.info b/libraries/protobuf-c/protobuf-c.info
index 91d9a95445..34871d1ddb 100644
--- a/libraries/protobuf-c/protobuf-c.info
+++ b/libraries/protobuf-c/protobuf-c.info
@@ -1,8 +1,8 @@
 PRGNAM="protobuf-c"
-VERSION="1.3.2"
+VERSION="1.3.3"
 HOMEPAGE="https://github.com/protobuf-c/protobuf-c"
-DOWNLOAD="https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.2/protobuf-c-1.3.2.tar.gz"
-MD5SUM="b4395fd8cb5cba21afa12410741b2a92"
+DOWNLOAD="https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.3/protobuf-c-1.3.3.tar.gz"
+MD5SUM="dabc05a5f11c21b96d8d6db4153f5343"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf3"
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-efl/python-efl.SlackBuild b/libraries/python-efl/python-efl.SlackBuild
index 985f0bb3fa..63330c2c88 100644
--- a/libraries/python-efl/python-efl.SlackBuild
+++ b/libraries/python-efl/python-efl.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for python-efl
-# Erik Falor | Logan, UT | ewfalor@gmail.com
+# Erik Falor | Logan, UT, USA | ewfalor@gmail.com | July 2020
 
 # 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
@@ -22,7 +22,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=python-efl
-VERSION=${VERSION:-1.21.0}
+VERSION=${VERSION:-1.24.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/python-efl/python-efl.info b/libraries/python-efl/python-efl.info
index f7a20de435..dd6d7b2508 100644
--- a/libraries/python-efl/python-efl.info
+++ b/libraries/python-efl/python-efl.info
@@ -1,8 +1,8 @@
 PRGNAM="python-efl"
-VERSION="1.21.0"
+VERSION="1.24.0"
 HOMEPAGE="https://www.enlightenment.org/"
-DOWNLOAD="https://download.enlightenment.org/rel/bindings/python/python-efl-1.21.0.tar.xz"
-MD5SUM="e798838b7e16902ec840a7bee692e276"
+DOWNLOAD="https://download.enlightenment.org/rel/bindings/python/python-efl-1.24.0.tar.xz"
+MD5SUM="56cbd28d7c659a4d42193bc82df9d105"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="efl"
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/python3-PyQt5/python3-PyQt5.SlackBuild b/libraries/python3-PyQt5/python3-PyQt5.SlackBuild
index 759fbffc7b..9c4399e1b5 100644
--- a/libraries/python3-PyQt5/python3-PyQt5.SlackBuild
+++ b/libraries/python3-PyQt5/python3-PyQt5.SlackBuild
@@ -32,8 +32,8 @@
 
 PRGNAM=python3-PyQt5
 SRCNAM=PyQt5
-VERSION=${VERSION:-5.9.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-5.13.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -63,16 +63,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-PYTHONVER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${SRCNAM}_gpl-$VERSION
-tar xvf $CWD/${SRCNAM}_gpl-$VERSION.tar.gz
-cd ${SRCNAM}_gpl-$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 \
@@ -80,8 +78,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 {} \;
 
-# This is needed or an include from dbus is missed (thanks, Archlinux)
-sed -i '/target_config.dbus_inc_dirs = \[\]/d' configure.py
 
 export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5
 export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5
@@ -92,12 +88,13 @@ export CXXFLAGS="$SLKCFLAGS"
 python3 configure.py \
   --confirm-license \
   --verbose \
+  --qsci-api \
   -q /usr/bin/qmake-qt5 \
   --sip=/usr/bin/python3-sip \
-  --sip-incdir=/usr/include/python$PYTHONVER
+  --sip-incdir=$(pkg-config --cflags-only-I python3 | sed -e 's/^-I//')
 
 make
-make install DESTDIR=$PKG INSTALL_ROOT=$PKG
+make -j1 install DESTDIR=$PKG 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/python3-PyQt5/python3-PyQt5.info b/libraries/python3-PyQt5/python3-PyQt5.info
index 78476ae3ba..58a36728d9 100644
--- a/libraries/python3-PyQt5/python3-PyQt5.info
+++ b/libraries/python3-PyQt5/python3-PyQt5.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-PyQt5"
-VERSION="5.9.2"
+VERSION="5.13.2"
 HOMEPAGE="https://riverbankcomputing.com/software/pyqt/intro/"
-DOWNLOAD="https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9.2/PyQt5_gpl-5.9.2.tar.gz"
-MD5SUM="33d6d2ab8183da17ac18b8132a4b278e"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/PyQt5-5.13.2.tar.gz"
+MD5SUM="c1023cb9c3d29a89fc109b163a0175c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-sip qt5-webkit"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
+REQUIRES="qt5 python3-sip"
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild
index aba9d8897f..4184457861 100644
--- a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild
+++ b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=python3-PyQtWebEngine
 SRCNAM=${PRGNAM#*-}
 VERSION=${VERSION:-5.13.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,11 +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 {} \;
 
-PYTHONVER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
-
 export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5
 export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5
-
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 
@@ -82,7 +79,7 @@ python3 configure.py \
   --verbose \
   -q /usr/bin/qmake-qt5 \
   --sip=/usr/bin/python3-sip \
-  --sip-incdir=/usr/include/python$PYTHONVER
+  --sip-incdir=$(pkg-config --cflags-only-I python3 | sed -e 's/^-I//')
 
 make
 make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG
diff --git a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info
index d2c2eb3694..2a8e0f58ec 100644
--- a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info
+++ b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info
@@ -1,7 +1,7 @@
 PRGNAM="python3-PyQtWebEngine"
 VERSION="5.13.2"
 HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-DOWNLOAD="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/5.13.2/PyQtWebEngine-5.13.2.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/PyQtWebEngine-5.13.2.tar.gz"
 MD5SUM="0a5f156959066cf86de31ddfe973f134"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/qml-material/README b/libraries/qml-material/README
index 337db12c4d..92b0b2e98f 100644
--- a/libraries/qml-material/README
+++ b/libraries/qml-material/README
@@ -2,4 +2,4 @@ This is a library of QML widgets implementing Google's Material
 Design. It is completely cross platform, and runs on Linux, OS X,
 and Windows. It may also run on iOS and Android, though those
 platforms have not been tested and are not currently officially
-supported.
\ No newline at end of file
+supported.
diff --git a/libraries/qt5-legacy/README b/libraries/qt5-legacy/README
index eefa1df469..7cb3c58c21 100644
--- a/libraries/qt5-legacy/README
+++ b/libraries/qt5-legacy/README
@@ -1,24 +1,72 @@
-Qt is a cross-platform C++ application framework. Qt's primary feature
-is its rich set of widgets that provide standard GUI functionality.
+Qt is a cross-platform C++ application framework.  Qt's
+primary feature is its rich set of widgets that provide
+standard GUI functionality.
 
-This builds the legacy 5.7.1 version.
+This is a legacy build of the old 5.9.x LTS version.
 
-Optional dependencies: unixodbc, freetds, OpenAL, libwebp, opus, snappy,
-wayland, and postgresql
+The following are optional dependencies that Qt will link
+against if they are detected at build time:
 
-Optional dependencies: openvg and firebird (not available
-at slackbuilds.org)
+libwebp opus pcre2 snappy libinput
 
-Note1: To build documentation pass DOCS=yes to the slackbuild
+============================================================
+
+OPTIONS
+
+To use Qt's built-in ccache option:
+
+  CCACHE=yes ./qt5-legacy.SlackBuild
+
+To build the documentation:
 
   DOCS=yes ./qt5-legacy.SlackBuild
 
-Note2: To build examples pass EXAMPLES=yes to the slackbuild
+To build the examples:
 
   EXAMPLES=yes ./qt5-legacy.SlackBuild
 
-Note3: To build support for proprietary media codecs (note that this
-will produce a non-redistributable package in some countries) pass
-PROPRIETARY_CODECS=yes to the slackbuild
+To build support for proprietary media codecs:
 
   PROPRIETARY_CODECS=yes ./qt5-legacy.SlackBuild
+
+(this will produce a non-redistributable package in some
+countries)
+
+To disable support for pulseaudio:
+
+  PULSEAUDIO=no ./qt5-legacy.SlackBuild
+
+(Qt will automatically detect if pulseaudio is not installed
+at build time and disable it if it is missing.)
+
+To NOT build qtwebengine (EXPERIMENTAL):
+
+  WEBENGINE=no ./qt5-legacy.SlackBuild
+
+
+Combine any or all of the above.
+
+============================================================
+
+GENERAL NOTES
+
+After upgrading qt5-legacy it is important to rebuild qt5ct
+too, if it is installed, or some applications may not
+display or function correctly.
+
+Please report any problems about applications that don't
+work correctly to the qt5-legacy maintainer or to the
+mailing list.
+
+============================================================
+
+BUILDING WITHOUT WEBENGINE
+
+YMMV whether it works with an application or not, but if you
+have no intention of using the browser code, which includes
+a chunk of 3rd party Google Chromium source, then it may
+make sense to skip it and save yourself about 2/3 of the
+build time.
+
+The package version has _nowebengine appended to it for
+clarity.
diff --git a/libraries/qt5-legacy/README.ccache b/libraries/qt5-legacy/README.ccache
new file mode 100644
index 0000000000..1053bcc5c9
--- /dev/null
+++ b/libraries/qt5-legacy/README.ccache
@@ -0,0 +1,46 @@
+NOTES ON SETTING UP CCACHE
+
+Using ccache can save a lot of time when building packages,
+and this is not limited to Qt5.  Ccache is installed by
+default on stock Slackware.
+
+ccache(1) has a lot of useful info on using ccache, however
+I don't recommend using its method of symlinking.  Instead I
+recommend the following way:
+
+mkdir -p /usr/local/bin
+ln -s /usr/bin/ccache /usr/local/bin/cc
+ln -s /usr/bin/ccache /usr/local/bin/c++
+ln -s /usr/bin/ccache /usr/local/bin/gcc
+ln -s /usr/bin/ccache /usr/local/bin/g++
+
+Doing it this way rather than copying the ccache binary as
+the man page suggests will ensure that the ccache used is
+updated whenever the ccache package is.
+
+The cache is created in the home directory of the user using
+it, and since slackbuilds are run by root that will be in
+/root/.ccache, therefore ensure that you have enough free
+space on the root file system for it.  It is possible to put
+the cache directory elsewhere though.  See the man page for
+info.  But it would probably be fastest when on the same
+file system as the build directory.
+
+It's also possible to host the cache on a shared NFS
+directory, but be sure to test the speed before committing
+to that.  The man page has some notes on this.
+
+Since Qt5 can take a lot of build space I recommend a max
+cache size of AT LEAST 6 GB.  If you intend to use it all
+the time then use as much as you can.  The default size is
+5 GB.  I use 20 GB on my main build box, but use 7 GB on
+workstations and servers.
+
+Handy commands:
+
+ccache -s:     To show some statistics.
+ccache -M <N>: To set the max cache size to N.
+
+(use G for GB with -M.)
+
+Last updated Mon 10 Dec 03:46:41 UTC 2018
diff --git a/libraries/qt5/patches/explicitly-initialize-sqlite.patch b/libraries/qt5-legacy/patches/explicitly-initialize-sqlite.patch
index 2773658adc..2773658adc 100644
--- a/libraries/qt5/patches/explicitly-initialize-sqlite.patch
+++ b/libraries/qt5-legacy/patches/explicitly-initialize-sqlite.patch
diff --git a/libraries/qt5-legacy/patches/nss-update-sslv3-nonce.patch b/libraries/qt5-legacy/patches/nss-update-sslv3-nonce.patch
deleted file mode 100644
index 1700c226a6..0000000000
--- a/libraries/qt5-legacy/patches/nss-update-sslv3-nonce.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc
---- qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc	2015-10-13 04:36:54.000000000 +0000
-+++ qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc	2016-03-15 11:57:53.898988200 +0000
-@@ -66,9 +66,9 @@
-                                                AeadParams* aead_params) const {
-   aead_params->len = sizeof(aead_params->data.nss_aead_params);
-   CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
--  nss_aead_params->pIv =
-+  nss_aead_params->pNonce =
-       reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
--  nss_aead_params->ulIvLen = nonce.size();
-+  nss_aead_params->ulNonceLen = nonce.size();
-   nss_aead_params->pAAD =
-       reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
-   nss_aead_params->ulAADLen = associated_data.size();
-diff -Naur qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc
---- qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc	2015-10-13 04:36:54.000000000 +0000
-+++ qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc	2016-03-15 11:57:53.902988200 +0000
-@@ -66,9 +66,9 @@
-                                                AeadParams* aead_params) const {
-   aead_params->len = sizeof(aead_params->data.nss_aead_params);
-   CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
--  nss_aead_params->pIv =
-+  nss_aead_params->pNonce =
-       reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
--  nss_aead_params->ulIvLen = nonce.size();
-+  nss_aead_params->ulNonceLen = nonce.size();
-   nss_aead_params->pAAD =
-       reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
-   nss_aead_params->ulAADLen = associated_data.size();
-diff -Naur qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c
---- qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c	2015-10-13 04:36:52.000000000 +0000
-+++ qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c	2016-03-15 12:00:01.376986796 +0000
-@@ -2088,8 +2088,8 @@
-     param.len = sizeof(aeadParams);
-     param.data = (unsigned char *) &aeadParams;
-     memset(&aeadParams, 0, sizeof(aeadParams));
--    aeadParams.pIv = (unsigned char *) additionalData;
--    aeadParams.ulIvLen = 8;
-+    aeadParams.pNonce = (unsigned char *) additionalData;
-+    aeadParams.ulNonceLen = 8;
-     aeadParams.pAAD = (unsigned char *) additionalData;
-     aeadParams.ulAADLen = additionalDataLen;
-     aeadParams.ulTagLen = tagSize;
diff --git a/libraries/qt5-legacy/patches/qt5.mysql.h.diff b/libraries/qt5-legacy/patches/qt5.mysql.h.diff
index 41dc9d34d5..1ac6faacfd 100644
--- a/libraries/qt5-legacy/patches/qt5.mysql.h.diff
+++ b/libraries/qt5-legacy/patches/qt5.mysql.h.diff
@@ -1,6 +1,6 @@
-diff -Naur qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h
---- qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h	2013-07-02 07:09:52.000000000 +0000
-+++ qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h	2013-07-21 21:21:01.190172379 +0000
+diff -Naur qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h qt-everywhere-opensource-src-5.1.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h
+--- qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h	2013-07-02 07:09:52.000000000 +0000
++++ qt-everywhere-opensource-src-5.1.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h	2013-07-21 21:21:01.190172379 +0000
 @@ -60,7 +60,7 @@
  #include <QtCore/qt_windows.h>
  #endif
diff --git a/libraries/qt5-legacy/qt5-legacy.SlackBuild b/libraries/qt5-legacy/qt5-legacy.SlackBuild
index 88e35e600c..b2f9354521 100644
--- a/libraries/qt5-legacy/qt5-legacy.SlackBuild
+++ b/libraries/qt5-legacy/qt5-legacy.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for qt5-legacy
 
-# Maintained 2018- by Dave Woodfall <dave@slackbuilds.org>
+# Update for 5.9.6-5.9.9 by David Woodfall <dave@slackbuilds.org>
+#
 # Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
 # Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
@@ -46,11 +47,13 @@
 # This is the highly modified version qt.SlackBuild found in Slackware
 # tailored to Qt 5. Modified by Larry Hajali.
 
+# Adapted for Qt 5.9.6 by David Woodfall
+
 PRGNAM=qt5-legacy
-LIBNAM=qt5
-SRCNAM=qt-everywhere-opensource-src
-VERSION=${VERSION:-5.7.1}
-BUILD=${BUILD:-1}
+LIBNAM=${PRGNAM%%-*}
+SRCNAM=${PRGNAM%%5*}
+VERSION=${VERSION:-5.9.9}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -66,6 +69,52 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+EXAMPLES=${EXAMPLES:-no}
+DOCS=${DOCS:-no}
+PROPRIETARY_CODECS=${PROPRIETARY_CODECS:-no}
+PULSEAUDIO=${PULSEAUDIO:-yes}
+CCACHE=${CCACHE:-no}
+WEBENGINE=${WEBENGINE:-yes}
+
+printf "\n%s\n\n" "SlackBuild Options:"
+printf "%s\n" "CCACHE:             $CCACHE"
+printf "%s\n" "DOCS:               $DOCS"
+printf "%s\n" "EXAMPLES:           $EXAMPLES"
+printf "%s\n" "PROPRIETARY_CODECS: $PROPRIETARY_CODECS"
+printf "%s\n" "PULSEAUDIO:         $PULSEAUDIO"
+printf "%s\n" "WEBENGINE:          $WEBENGINE"
+printf "\n"
+
+# Default is no.
+if [ "$EXAMPLES" == "yes" ]; then
+  BUILD_EXAMPLES=""
+else
+  BUILD_EXAMPLES="-nomake examples"
+fi
+
+# Default is yes.
+if [ "$PULSEAUDIO" = "no" ]; then
+  PULSE="-no-pulseaudio"
+fi
+
+# Default is no.
+if [ "$CCACHE" = "yes" ]; then
+  CCACHE="-ccache"
+else
+  unset CCACHE
+fi
+
+if [ "$WEBENGINE" = "no" ]; then
+  EXCLUDE="--exclude=qtweb*"
+  PKGVERSION="${VERSION}_nowebengine"
+else
+  PKGVERSION="${VERSION}"
+  # Note that this changes to -webengine-proprietary-codecs in later versions
+  if [ "$PROPRIETARY_CODECS" = "yes" ]; then
+    CODECS="-proprietary-codecs"
+  fi
+fi
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -75,6 +124,7 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  SLKLDFLAGS="-L/usr/lib64"
 elif [ "$ARCH" = "armv7hl" ]; then
   # To prevent "qatomic_armv6.h error: output number 2 not directly addressable"
   # More permanent solution is to patch gcc:
@@ -86,30 +136,21 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# http://doc.qt.io/qt-5/qtwebengine-platform-notes.html#audio-and-video-codec-support
-PRCOD=""
-[ "$PROPRIETARY_CODECS" = "yes" ] && PRCOD="WEBENGINE_CONFIG += use_proprietary_codecs"
-
 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
+echo "Removing any existing source directory. Please wait..."
+rm -rf ${SRCNAM}-everywhere-opensource-src-$VERSION
+tar xvf $CWD/${SRCNAM}-everywhere-opensource-src-$VERSION.tar.xz $EXCLUDE
+cd ${SRCNAM}-everywhere-opensource-src-$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 {} \;
-
-# Slackware patch to build against MySQL/MariaDB.
-patch -p1 < $CWD/patches/qt5.mysql.h.diff
-
-# Patch for the newer mozilla-nss
-patch -p1 < $CWD/patches/nss-update-sslv3-nonce.patch
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Limit -reduce-relocations to ix86 and x86_64.
 # https://bugreports.qt-project.org/browse/QTBUG-36129
@@ -119,19 +160,25 @@ else
   RELOCATIONS=""
 fi
 
-sed -i "s|-O2|$SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf
+# Borrowed a few things from alienBOB:
+# Fix path to mysql header:
+cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose
 
-# Build examples. Default is no.
-if [ "${EXAMPLES:-no}" == "yes" ]; then
-  BUILD_EXAMPLES=""
-else
-  BUILD_EXAMPLES="-nomake examples"
-fi
+# Fix missing private includes: QTBUG-37417
+sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \
+  -i qtbase/mkspecs/features/create_cmake.prf
+
+# Use our custom compiler and linker flags:
+sed -i -re "s,-O(2|3),$SLKCFLAGS," qtbase/mkspecs/common/gcc-base.conf
 
-echo "$PRCOD" >> qtwebengine/.qmake.conf
+if [ "$ARCH" = "x86_64" ]; then
+  sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" \
+    qtbase/mkspecs/common/gcc-base.conf
+  export LDFLAGS="$SLKLDFLAGS"
+fi
 
 export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS -std=c++11"
 ./configure -v \
   -confirm-license \
   -opensource \
@@ -144,12 +191,10 @@ export CXXFLAGS="$SLKCFLAGS"
   -system-libjpeg \
   -system-zlib \
   -system-sqlite \
-  -system-pcre \
   -plugin-sql-sqlite \
   -icu \
-  -openssl \
+  -openssl-linked \
   -verbose \
-  -optimized-qmake \
   -dbus-linked \
   -qpa xcb \
   -xcb \
@@ -161,7 +206,10 @@ export CXXFLAGS="$SLKCFLAGS"
   -no-strip \
   -release \
   -no-use-gold-linker \
-  -pulseaudio \
+  -c++std c++11 \
+  $CCACHE \
+  $CODECS \
+  $PULSE \
   $RELOCATIONS \
   $BUILD_EXAMPLES
 
@@ -169,7 +217,7 @@ make
 make install INSTALL_ROOT=$PKG
 
 # Install documentation. Default is not to install documentation.
-if [ "${DOCS:-no}" == "yes" ]; then
+if [ "$DOCS" == "yes" ]; then
   # Recreate Makefiles in order to use the just compiled qdoc.
   for doc in $(find . -name "Makefile*" | xargs egrep "^\s/usr/lib${LIBDIRSUFFIX}/qt5/bin/" \
     | cut -d':' -f1 | uniq)
@@ -183,17 +231,15 @@ 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
 
-ln -s $LIBNAM $PKG/usr/lib${LIBDIRSUFFIX}/qt-$VERSION
-
 mkdir -p $PKG/usr/bin
 for BIN in $PKG/usr/lib${LIBDIRSUFFIX}/$LIBNAM/bin/*; do
   TMP_FILE=$(echo $BIN | sed -e "s|$PKG||")
   case $(basename $BIN) in
     syncqt.pl|fixqt4headers.pl)
-      ln -s $TMP_FILE $PKG/usr/bin/$(basename $BIN)
+      ln -vs $TMP_FILE $PKG/usr/bin/$(basename $BIN)
       ;;
     *)
-      ln -s $TMP_FILE $PKG/usr/bin/$(basename $BIN)-$LIBNAM
+      ln -vs $TMP_FILE $PKG/usr/bin/$(basename $BIN)-$LIBNAM
       ;;
   esac
 done
@@ -229,11 +275,13 @@ Description: Qt5 Configuration
 Version: $VERSION
 EOF
 
-# Fix internal linking for Qt5WebEngineCore.pc.
-sed -i \
-  -e 's|-Wl,--start-group.* -Wl,--end-group||' \
-  -e "s|-L${PWD}/qtwebengine/src/core/api/Release||" \
-  $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc
+if [ "$WEBENGINE" = "yes" ]; then
+  # Fix internal linking for Qt5WebEngineCore.pc.
+  sed -i \
+    -e 's|-Wl,--start-group.* -Wl,--end-group||' \
+    -e "s|-L${PWD}/qtwebengine/src/core/api/Release||" \
+    $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc
+fi
 
 # While we are at it, there isn't any reason to keep references to $PKG in the *.prl files.
 for PRL in $(find $PKG -name "*\.prl"); do
@@ -269,6 +317,7 @@ find $PKG \( -name "*.qml" -o -name "*.app" \) -perm 755 -exec chmod 644 '{}' \;
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   README qtbase/{header*,LGPL_EXCEPTION.txt,LICENSE.*L} \
+  $CWD/README.ccache \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -277,4 +326,6 @@ 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-$PKGVERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
+# vim: expandtab
diff --git a/libraries/qt5-legacy/qt5-legacy.info b/libraries/qt5-legacy/qt5-legacy.info
index b2eac2c0f0..fc02ef7b03 100644
--- a/libraries/qt5-legacy/qt5-legacy.info
+++ b/libraries/qt5-legacy/qt5-legacy.info
@@ -1,10 +1,10 @@
 PRGNAM="qt5-legacy"
-VERSION="5.7.1"
+VERSION="5.9.9"
 HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/qt-everywhere-opensource-src-5.7.1.tar.xz"
-MD5SUM="7524ffba8411119d867f673155ec91bc"
+DOWNLOAD="https://download.qt.io/official_releases/qt/5.9/5.9.9/single/qt-everywhere-opensource-src-5.9.9.tar.xz"
+MD5SUM="97e81709b57e82ab2b279408eaa9270e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libxkbcommon libinput"
-MAINTAINER="David Woodfall"
+REQUIRES="libxkbcommon"
+MAINTAINER="Dave Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/libraries/qt5-legacy/slack-desc b/libraries/qt5-legacy/slack-desc
index d5abcfd6c0..e2e4fa607a 100644
--- a/libraries/qt5-legacy/slack-desc
+++ b/libraries/qt5-legacy/slack-desc
@@ -11,9 +11,9 @@ qt5-legacy:
 qt5-legacy: Qt is a cross-platform C++ application framework. Qt's primary feature
 qt5-legacy: is its rich set of widgets that provide standard GUI functionality.
 qt5-legacy:
-qt5-legacy: This is the legacy 5.7.1 version of qt5
-qt5-legacy:
 qt5-legacy: Homepage: http://qt-project.org
 qt5-legacy:
 qt5-legacy:
 qt5-legacy:
+qt5-legacy:
+qt5-legacy:
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/qt5-styleplugins/qt5-styleplugins.SlackBuild b/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild
index 7132a0064b..cd15a4d5a3 100644
--- a/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild
+++ b/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=qt5-styleplugins
 VERSION=${VERSION:-5.0.0.20170112}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM=qtstyleplugins
@@ -72,6 +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 {} \;
 
+# Force linking against Qt5DBus or build will fail
+sed -i "s|2.0$|2.0 Qt5DBus|" src/plugins/platformthemes/gtk2/gtk2.pro
+
 QMAKE_CFLAGS_RELEASE="$SLKCFLAGS" \
 QMAKE_CXXFLAGS_RELEASE="$SLKCFLAGS" \
 PREFIX=/usr \
diff --git a/libraries/qt5-webkit-annulen/README b/libraries/qt5-webkit-annulen/README
deleted file mode 100644
index 8824621244..0000000000
--- a/libraries/qt5-webkit-annulen/README
+++ /dev/null
@@ -1,11 +0,0 @@
-qt5-webkit-annulen (annulen's fork of the Qt based web browser engine)
-
-Qtwebkit is a Qt based web browser engine.
-
-This package contains a fork of the Qt5 based version, with many bug
-and security fixes. This is an optional backend for the Qutebrowser web
-browser.
-
-Please note, this clashes with qt5-webkit.
-
-Optional dependency: libwebp
diff --git a/libraries/qt5-webkit-annulen/qt5-webkit-annulen.SlackBuild b/libraries/qt5-webkit-annulen/qt5-webkit-annulen.SlackBuild
deleted file mode 100644
index 0f296ba7de..0000000000
--- a/libraries/qt5-webkit-annulen/qt5-webkit-annulen.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016  Patrick J. Volkerding, Sebeka, MN, 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.
-
-# Derived from the qt5.SlackBuild
-
-# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0, 5.9.1 2016,2017 by Eric  Hameleers, Eindhoven, NL
-# Modified for the fork of qt5-webkit by annulen by David Woodfall.
-
-PRGNAM=qt5-webkit-annulen
-VERSION=${VERSION:-5.212.0_alpha2}
-SRCVERSION=${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 qtwebkit-$SRCVERSION
-tar xfv $CWD/qtwebkit-$SRCVERSION.tar.xz
-cd qtwebkit-$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 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5"
-export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
-
-mkdir -p build
-cd build
-  cmake \
-    -DPORT=Qt \
-    -DQt5_DIR=$QTDIR \
-    -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 \
-  LICENSE.LGPLv21 \
-  $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/qt5-webkit-annulen/qt5-webkit-annulen.info b/libraries/qt5-webkit-annulen/qt5-webkit-annulen.info
deleted file mode 100644
index 74c8c32bb2..0000000000
--- a/libraries/qt5-webkit-annulen/qt5-webkit-annulen.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qt5-webkit-annulen"
-VERSION="5.212.0_alpha2"
-HOMEPAGE="https://github.com/annulen/webkit"
-DOWNLOAD="https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha2/qtwebkit-5.212.0-alpha2.tar.xz"
-MD5SUM="301dd0192b1d7ce0edd75c214706e257"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5 hyphen"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/libraries/qt5-webkit-annulen/slack-desc b/libraries/qt5-webkit-annulen/slack-desc
deleted file mode 100644
index 2c2fe150d2..0000000000
--- a/libraries/qt5-webkit-annulen/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------------------------------------------------------|
-qt5-webkit-annulen: qt5-webkit-annulen (annulen's fork of the Qt based web browser engine)
-qt5-webkit-annulen:
-qt5-webkit-annulen: Qtwebkit is a Qt based web browser engine.
-qt5-webkit-annulen:
-qt5-webkit-annulen: This package contains a fork of the Qt5 based version, with many bug
-qt5-webkit-annulen: and security fixes.
-qt5-webkit-annulen:
-qt5-webkit-annulen: This is an optional backend for the Qutebrowser web browser.
-qt5-webkit-annulen:
-qt5-webkit-annulen: https://github.com/annulen/webkit
-qt5-webkit-annulen:
diff --git a/libraries/qt5-webkit/README b/libraries/qt5-webkit/README
index 98bca031ab..7783fb6e68 100644
--- a/libraries/qt5-webkit/README
+++ b/libraries/qt5-webkit/README
@@ -1,5 +1,3 @@
 QtWebkit is a Qt based web browser engine.
 
-This package contains the Qt5 based version.
-
 Optional dependencies: libwebp
diff --git a/libraries/qt5-webkit/platformplugin-install-path-fix.patch b/libraries/qt5-webkit/platformplugin-install-path-fix.patch
deleted file mode 100644
index 022166de66..0000000000
--- a/libraries/qt5-webkit/platformplugin-install-path-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro
---- qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro	2013-04-09 00:11:38.000000000 +0000
-+++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro	2013-05-31 01:18:29.157175082 +0000
-@@ -20,7 +20,8 @@
-     }
- }
- 
--DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit
-+target.path = $$[QT_INSTALL_PLUGINS]/webkit
-+INSTALLS += target
- 
- SOURCES += \
-     WebPlugin.cpp \
diff --git a/libraries/qt5-webkit/qt5-webkit.SlackBuild b/libraries/qt5-webkit/qt5-webkit.SlackBuild
index a13f448a54..71efbc8fac 100644
--- a/libraries/qt5-webkit/qt5-webkit.SlackBuild
+++ b/libraries/qt5-webkit/qt5-webkit.SlackBuild
@@ -25,17 +25,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Adapted for 5.9.0 by David Woodfall <dave@slackbuilds.org>
+# Added some parts from -current build.
 
 PRGNAM=qt5-webkit
-SRCNAM=qtwebkit-opensource-src
-VERSION=${VERSION:-5.9.0}
-BUILD=${BUILD:-1}
+SRCNAM=qtwebkit
+VERSION=${VERSION:-5.212.0_alpha4}
+SRCVERSION=$(echo $VERSION | tr -s '_' '-')
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -64,9 +66,9 @@ 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
+rm -rf $SRCNAM-$SRCVERSION
+tar xvf $CWD/$SRCNAM-$SRCVERSION.tar.gz
+cd $SRCNAM-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -80,40 +82,21 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
 export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5"
 export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
 
-# Install path fix for libplatformplugin.so.
-# https://bugs.webkit.org/show_bug.cgi?id=117077
-patch -p2 < $CWD/platformplugin-install-path-fix.patch
-
-if [ -d include ]; then
-  syncqt.pl -version $VERSION Source/sync.profile
-fi
-
-qmake-qt5 PREFIX="/usr" QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-  -o Makefile WebKit.pro
-
-make
-make install INSTALL_ROOT=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DPORT=Qt \
+    -DQt5_DIR=$QTDIR \
+    -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
 
-# Fix internal linking for Qt5WebKit.pc
-sed -i \
-  -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/Source/WebKit[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/Source/WebKit2[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L${PWD}/Source/WebCore[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/Source/ThirdParty/ANGLE[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/Source/ThirdParty/leveldb[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/Source/JavaScriptCore[^ ]* ||" \
-  -e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/Source/WTF[^ ]* ||" \
-  $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
-
-# Fix the path in prl files:
-find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \
-  -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog* LICENSE* VERSION $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
diff --git a/libraries/qt5-webkit/qt5-webkit.info b/libraries/qt5-webkit/qt5-webkit.info
index b53918b710..744f377419 100644
--- a/libraries/qt5-webkit/qt5-webkit.info
+++ b/libraries/qt5-webkit/qt5-webkit.info
@@ -1,10 +1,10 @@
 PRGNAM="qt5-webkit"
-VERSION="5.9.0"
+VERSION="5.212.0_alpha4"
 HOMEPAGE="https://www.qt.io"
-DOWNLOAD="https://download.qt.io/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz"
-MD5SUM="1fc0ed873cc9326b823a8a83126714f5"
+DOWNLOAD="https://github.com/qt/qtwebkit/archive/v5.212.0-alpha4/qtwebkit-5.212.0-alpha4.tar.gz"
+MD5SUM="22e442063e7d0362439934442e269ed2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES="qt5 hyphen"
 MAINTAINER="Dave Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/libraries/qt5/README b/libraries/qt5/README
index c0fc3bbad5..553ecb1637 100644
--- a/libraries/qt5/README
+++ b/libraries/qt5/README
@@ -5,7 +5,9 @@ standard GUI functionality.
 The following are optional dependencies that Qt will link
 against if they are detected at build time:
 
-libwebp opus pcre2 snappy
+libwebp, opus, ffmpeg, re2, snappy, libminizip, jsoncpp,
+libinput, unixODBC, postgresql, SDL2, assimp, wayland,
+OpenAL, protobuf(3?), argon2, and perhaps more.
 
 ============================================================
 
@@ -15,12 +17,13 @@ To use Qt's built-in ccache option:
 
   CCACHE=yes ./qt5.SlackBuild
 
-See README.benchmarks for the benefits of using ccache.
-
 To build the documentation:
 
   DOCS=yes ./qt5.SlackBuild
 
+(you will need the llvm package from extra/ to build
+documentation)
+
 To build the examples:
 
   EXAMPLES=yes ./qt5.SlackBuild
@@ -43,6 +46,11 @@ To NOT build qtwebengine (EXPERIMENTAL):
 
   WEBENGINE=no ./qt5.SlackBuild
 
+To use the gold linker:
+
+  LDGOLD=yes ./qt5.SlackBuild
+
+This may speed up the build, but can take more RAM.
 
 Combine any or all of the above.
 
@@ -54,7 +62,7 @@ After upgrading Qt5 it is important to rebuild qt5ct too, if
 it is installed, or some applications may not display or
 function correctly.
 
-There is a qt5-legacy (5.7.1) SlackBuild that is available
+There is a qt5-legacy (5.9.9) SlackBuild that is available
 for older applications that do not run correctly with this
 version.  However it will not coexist with this version.
 
@@ -63,24 +71,6 @@ work correctly to the Qt5 maintainer or to the mailing list.
 
 ============================================================
 
-ROUGH SPEED & SIZE GUIDE
-
-  OPTION                                 PKG  SPACE TIME
-  Normal:                                102M 5018M 9:55
-  No Webengine:                          50M  1895M 3:18
-  With Documentation:                    339M 6197M -
-  With Examples:                         391M 6388M -
-  With Documentation and Examples:       628M 7604M -
-
-  PKG:   Package size.
-  SPACE: Package directory + source space needed.
-  TIME:  Rough build time (- = unknown.)
-
-See README.benchmarks for more detailed information.
-See README.ccache for information on setting up ccache.
-
-============================================================
-
 NOTES ON OPTIONS
 
 * Using ccache should speed up subsequent rebuilds, but may
@@ -89,6 +79,20 @@ NOTES ON OPTIONS
 * Building the documentation and/or examples creates a
   significantly larger package.
 
+============================================================
+
+BUILDING WITHOUT WEBENGINE
+
+Building without webengine can speed up compilation.
+
+If you have no intention of using the browser code, which
+includes a chunk of 3rd party Google Chromium source, then
+it may make sense to skip it and save yourself about 2/3 of
+the build time, and knocks about 3G off the needed space.
+
+The package version has _nowebengine appended to it for
+clarity.
+
 * Successfully tested so far without webengine (VERY quick
   tests):
 
@@ -102,16 +106,29 @@ NOTES ON OPTIONS
 
 ============================================================
 
-BUILDING WITHOUT WEBENGINE
+TROUBLESHOOTING
 
-See README.benchmarks for the benefits of not building
-webengine.
+If Qt5 fails to build, it may be worth using the following
+steps.
 
-YMMV whether it works with an application or not, but if you
-have no intention of using the browser code, which includes
-a chunk of 3rd party Google Chromium source, then it may
-make sense to skip it and save yourself about 2/3 of the
-build time.
+1 Uninstall the old Qt5 package
+2 Log out of root
+3 Log back in as root
+4 Build and install the new package
+5 Log out of root
+6 Log back in as root
+7 Upgrade all other packages that depend on Qt5
+
+The reasoning behind all the log outs/ins, is because Qt5
+installs /etc/profile.d/qt5.sh that sets QT5DIR and adds
+QT5DIR/bin to your $PATH when you log in (there's a similar
+file for csh.) Even though the old Qt5 is removepkg'd, those
+settings are *still there* until you log out.
+
+You can see with a test (assuming bash or a zsh type shell):
+
+env | grep -i qt5
+
+If that command is used before step 4, you shouldn't see
+anything qt5 related in PATH and QT5DIR shouldn't exist.
 
-The package version has _nowebengine appended to it for
-clarity.
diff --git a/libraries/qt5/README.benchmarks b/libraries/qt5/README.benchmarks
deleted file mode 100644
index 466d6b924d..0000000000
--- a/libraries/qt5/README.benchmarks
+++ /dev/null
@@ -1,114 +0,0 @@
-ENVIRONMENT
-
-	Linux 4.4.157 SMP x86_64 (stock 14.2 	-huge.)
-	Using /usr/bin/time rather than shell built-in.
-	Jobs: 2.
-	Qt version: 5.9.7
-
-DMI Info:
-
-	Board: Lenovo Mahobay motherboard.
-	CPU: Version: Intel(R) Pentium(R) CPU G640 @ 2.80GHz
-	Family: Core i7 Core Count: 2
-	Core Enabled: 2
-	Thread Count: 2
-	Max Speed: 2800 MHz
-	Current Speed: 2800 MHz
-	External Clock: 100 MHz
-
-	CPUFREQ: Performance mode.
-
-	RAM: 12G (1333 MHz) DDR3.
-
-	An 8 GB tmpfs in /mnt/memory is used as a ramdisk for /tmp
-	while the package was output on the real HDD. i.e.
-	$TMP=/mnt/memory/SBo
-	$OUTPUT=/tmp
-
-System ccache setup:
-
-	cache size: 18.3 GB
-	max_cache:  20.0 GB
-	cache_dir:  /root/.ccache
-	CCACHE_TEMPDIR=/mnt/memory/ccache
-
-No special settings were used for Qt's -ccache.
-All builds with either ccache option were performed a few
-times to build up enough cache.
-
-BENCHMARKS
-
-BUILDS WITH WEBENGINE
-
-Normal build:
-
-45970.94 user
-2408.58 system
-9:55:02 elapsed
-135% CPU (0 avgtext + 0 avgdata 7378176 maxresident) k
-80232 inputs + 522800 outputs (263 major + 950621123 minor) pagefaults
-0 swaps
-
-Using Qt's -ccache option:
-
-36223.82 user
-1872.14 system
-6:58:03 elapsed
-151% CPU (0 avgtext + 0 avgdata 7375136 maxresident) k
-274848 inputs + 578712 outputs (730 major + 724828690 minor) pagefaults
-0 swaps
-
-Using system ccache:
-
-4008.03 user
-289.34 system
-1:17:11 elapsed
-92% CPU (0 avgtext + 0 avgdata 7377248 maxresident) k
-4396232 inputs + 391856 outputs (97 major + 59094442 minor) pagefaults
-0 swaps
-
-
-BUILDS WITHOUT WEBENGINE
-
-Normal build:
-
-10408.66 user
-687.60 system
-3:18:22 elapsed
-93% CPU (0 avgtext + 0 avgdata 3850048 maxresident) k
-48176 inputs + 414056 outputs (26 major + 265106108 minor) pagefaults
-0 swaps
-
-Using Qt's -ccache option:
-
-1055.75 user
-167.14 system
-22:17.13 elapsed
-91% CPU (0 avgtext + 0 avgdata 1188432 maxresident) k
-936 inputs + 468464 outputs (8 major + 42575851 minor) pagefaults
-0 swaps
-
-Using system ccache:
-
-922.05 user
-159.25 system
-19:42.82 elapsed
-91% CPU (0 avgtext + 0 avgdata 504048 maxresident) k
-5672 inputs + 158016 outputs (5 major + 38449127 minor) pagefaults
-0 swaps
-
-
-Average Packages Sizes:
-
-Normal:            102 MB
-Without webengine: 50  MB
-
-
-As is seen by the elapsed time in the results, using ccache
-system-wide has a huge benefit.  Qt's -ccache option showed
-little gain when building the full package, but was good
-when building without webengine.
-
-See README.ccache for information on setting up ccache.
-
-Last updated Mon 10 Dec 03:46:29 UTC 2018
diff --git a/libraries/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch b/libraries/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch
new file mode 100644
index 0000000000..ff00e63bed
--- /dev/null
+++ b/libraries/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch
@@ -0,0 +1,14 @@
+diff -up qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo	2019-04-30 15:18:24.886346423 -0500
++++ qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in	2019-04-30 15:19:48.303873296 -0500
+@@ -66,8 +66,10 @@ unset(_GL_INCDIRS)
+ # Don\'t check for existence of the "_qt5gui_OPENGL_INCLUDE_DIR" because it is
+ # optional.
+ 
++if (NOT ${_qt5gui_OPENGL_INCLUDE_DIR} STREQUAL "/usr/include")
+ list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR})
+ set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5gui_OPENGL_INCLUDE_DIR})
++endif()
+ 
+ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
+ 
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index ef7507d8de..67d6e19149 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -2,8 +2,6 @@
 
 # Slackware build script for qt5
 
-# Update for 5.9.6 by David Woodfall <dave@slackbuilds.org>
-#
 # Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
 # Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
@@ -47,10 +45,12 @@
 # This is the highly modified version qt.SlackBuild found in Slackware
 # tailored to Qt 5. Modified by Larry Hajali.
 
-# Adapted for Qt 5.9.6 by David Woodfall
+# Adapted for Qt >= 5.9.6 by Dave Woodfall <dave@slackbuilds.org>
+# Some parts thanks to alienBOB's qt5 SlackBuild.
 
 PRGNAM=qt5
-VERSION=${VERSION:-5.9.9}
+SRCNAM=${PRGNAM%%[[:digit:]]*}
+VERSION=${VERSION:-5.12.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,46 +73,33 @@ PROPRIETARY_CODECS=${PROPRIETARY_CODECS:-no}
 PULSEAUDIO=${PULSEAUDIO:-yes}
 CCACHE=${CCACHE:-no}
 WEBENGINE=${WEBENGINE:-yes}
+LDGOLD=${LDGOLD:-no}
 
-printf "\n%s\n\n" "SlackBuild Options:"
-printf "%s\n" "CCACHE:             $CCACHE"
-printf "%s\n" "DOCS:               $DOCS"
-printf "%s\n" "EXAMPLES:           $EXAMPLES"
-printf "%s\n" "PROPRIETARY_CODECS: $PROPRIETARY_CODECS"
-printf "%s\n" "PULSEAUDIO:         $PULSEAUDIO"
-printf "%s\n" "WEBENGINE:          $WEBENGINE"
-printf "\n"
-
-# Default is no.
-if [ "$EXAMPLES" == "yes" ]; then
-  BUILD_EXAMPLES=""
-else
-  BUILD_EXAMPLES="-nomake examples"
-fi
-
-# Default is yes.
-if [ "$PULSEAUDIO" = "no" ]; then
-  PULSE="-no-pulseaudio"
-fi
-
-# Default is no.
-if [ "$CCACHE" = "yes" ]; then
-  CCACHE="-ccache"
-else
-  unset CCACHE
-fi
+[ "$EXAMPLES"    =  "no" ] && BUILD_EXAMPLES="-nomake examples"
+[ "$PULSEAUDIO"  =  "no" ] && PULSE="-no-pulseaudio"
+[ "$CCACHE"      = "yes" ] && USE_CCACHE="-ccache"
+[ "$LDGOLD"      =  "no" ] && USE_LDGOLD="-no-use-gold-linker"
 
 if [ "$WEBENGINE" = "no" ]; then
-  EXCLUDE="--exclude=qtweb*"
+  EXCLUDE="--exclude=qtwebengine"
   PKGVERSION="${VERSION}_nowebengine"
 else
   PKGVERSION="${VERSION}"
-  # Note that this changes to -webengine-proprietary-codecs in later versions
   if [ "$PROPRIETARY_CODECS" = "yes" ]; then
-    CODECS="-proprietary-codecs"
+    CODECS="-webengine-proprietary-codecs"
   fi
 fi
 
+printf "\n%s\n\n" "SlackBuild Options:"
+printf "%s\n" "CCACHE:             $CCACHE"
+printf "%s\n" "DOCS:               $DOCS"
+printf "%s\n" "EXAMPLES:           $EXAMPLES"
+printf "%s\n" "PROPRIETARY_CODECS: $PROPRIETARY_CODECS"
+printf "%s\n" "PULSEAUDIO:         $PULSEAUDIO"
+printf "%s\n" "WEBENGINE:          $WEBENGINE"
+printf "%s\n" "LDGOLD:             $LDGOLD"
+printf "\n"
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -147,9 +134,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 echo "Removing any existing source directory. Please wait..."
-rm -rf ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
-tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION.tar.xz $EXCLUDE
-cd ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
+rm -rf $SRCNAM-everywhere-src-$VERSION
+tar xvf $CWD/$SRCNAM-everywhere-src-$VERSION.tar.xz $EXCLUDE
+cd $SRCNAM-everywhere-src-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -165,21 +152,31 @@ else
   RELOCATIONS=""
 fi
 
-# Borrowed a few things from alienBOB:
 # Fix path to mysql header:
 cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose
 
-# Fix missing private includes: QTBUG-37417
-sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \
-  -i qtbase/mkspecs/features/create_cmake.prf
+# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
+# and for it breaks KWin compilation with:
+# /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory
+# See also https://bugzilla.redhat.com/1704474
+cd qtbase
+  cat $CWD/patches/qt5.qtbase_cmake_isystem_includes.patch \
+    | patch -p1 --verbose || exit 1
+cd - 1>/dev/null
 
 # Use our custom compiler and linker flags:
-sed -i -re "s,-O(2|3),$SLKCFLAGS," qtbase/mkspecs/common/gcc-base.conf
-sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" \
-  qtbase/mkspecs/common/gcc-base.conf
+sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \
+  -i qtbase/mkspecs/common/gcc-base.conf || exit 1
+sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \
+  -i qtbase/mkspecs/common/g++-unix.conf || exit 1
 
 export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS -std=c++11"
+export CXXFLAGS="$SLKCFLAGS"
+export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
+export QTDIR="${TMP}/qt-everywhere-src-$VERSION"
+export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
+export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
+
 ./configure -v \
   -confirm-license \
   -opensource \
@@ -188,6 +185,7 @@ export CXXFLAGS="$SLKCFLAGS -std=c++11"
   -headerdir "/usr/include/$PRGNAM" \
   -libdir "/usr/lib${LIBDIRSUFFIX}" \
   -docdir "/usr/doc/$PRGNAM-$VERSION" \
+  -examplesdir "/usr/doc/$PRGNAM-$VERSION/examples" \
   -system-libpng \
   -system-libjpeg \
   -system-zlib \
@@ -206,23 +204,22 @@ export CXXFLAGS="$SLKCFLAGS -std=c++11"
   -no-rpath \
   -no-strip \
   -release \
-  -no-use-gold-linker \
-  -c++std c++11 \
-  $CCACHE \
+  $USE_CCACHE \
   $CODECS \
   $PULSE \
   $RELOCATIONS \
-  $BUILD_EXAMPLES
+  $BUILD_EXAMPLES \
+  $USE_LDGOLD
 
-make
+make || make -j1
 make install INSTALL_ROOT=$PKG
 
 # Install documentation. Default is not to install documentation.
-if [ "$DOCS" == "yes" ]; then
+if [ "$DOCS" = "yes" ]; then
   # Recreate Makefiles in order to use the just compiled qdoc.
-  for doc in $(find . -name "Makefile*" | xargs egrep "^\s/usr/lib${LIBDIRSUFFIX}/qt5/bin/" \
-    | cut -d':' -f1 | uniq)
-  do
+  for doc in $(find . -name "Makefile*" \
+    | xargs egrep "^\s/usr/lib${LIBDIRSUFFIX}/qt5/bin/" | cut -d':' -f1 \
+    | uniq); do
     rm -fv $doc
   done
   make docs
@@ -232,8 +229,6 @@ 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
 
-ln -s $PRGNAM $PKG/usr/lib${LIBDIRSUFFIX}/qt-$VERSION
-
 mkdir -p $PKG/usr/bin
 for BIN in $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin/*; do
   TMP_FILE=$(echo $BIN | sed -e "s|$PKG||")
@@ -278,46 +273,19 @@ Description: Qt5 Configuration
 Version: $VERSION
 EOF
 
-if [ "$WEBENGINE" = "yes" ]; then
-  # Fix internal linking for Qt5WebEngineCore.pc.
-  sed -i \
-    -e 's|-Wl,--start-group.* -Wl,--end-group||' \
-    -e "s|-L${PWD}/qtwebengine/src/core/api/Release||" \
-    $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc
-fi
-
-# While we are at it, there isn't any reason to keep references to $PKG in the *.prl files.
-for PRL in $(find $PKG -name "*\.prl"); do
-  sed -i '/^QMAKE_PRL_BUILD_DIR/d' $PRL
-done
+# Fix the path in prl files:
+find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \
+  -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 
 # One more for the road.
 sed -i "s|$PWD/qtbase|/usr/lib${LIBDIRSUFFIX}/$PRGNAM|" \
   $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/mkspecs/modules/qt_lib_bootstrap_private.pri
 
-sed -i "s|-L${PWD}/\w*/lib ||g" \
-  $PKG/usr/lib${LIBDIRSUFFIX}/libqgsttools_p.prl
-
 for i in $CWD/desktop/*.desktop; do
   install -D -m 0644 $i $PKG/usr/share/applications/$(basename $i)
 done
 sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/*
 
-# Currently not working for qt version 5.4.0.  Extra layer added to *.ico file
-# freaks out ImageMagick and fails image conversion.
-# Eg.
-#   $ convert assistant.ico -resize 96x96! assistant.png
-#     convert: file format version mismatch `assistant.ico' @ error/xwd.c/ReadXWDImage/241.
-#     convert: no images defined `assistant.png' @ error/convert.c/ConvertImageCommand/3127.
-#for i in $(find . -name "assistant.ico" -o -name "designer.ico" \
-#  -o -name "linguist.ico" -o -name "qdbusviewer.ico"); do
-#  for j in 16 24 32 48 64 96 128; do
-#    convert $i -resize ${j}x${j}! $(basename $i)-$j.png
-#    install -D -m 0644 $(basename $i)-$j-0.png \
-#      $PKG/usr/share/icons/hicolor/${j}x${j}/apps/$(basename $i | sed 's|.ico||')-$PRGNAM.png
-#  done
-#done
-
 install -D -m 0644 qttools/src/assistant/assistant/images/assistant-128.png \
   $PKG/usr/share/icons/hicolor/128x128/apps/assistant-qt5.png
 install -D -m 0644 qttools/src/designer/src/designer/images/designer.png \
@@ -332,10 +300,14 @@ done
 # Remove executable bits from files.
 find $PKG \( -name "*.qml" -o -name "*.app" \) -perm 755 -exec chmod 644 '{}' \;
 
+# Add missing version info
+sed -i "s,set(PACKAGE_VERSION ),set(PACKAGE_VERSION $VERSION)," \
+   $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt5/Qt5ConfigVersion.cmake
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  README qtbase/{header*,LGPL_EXCEPTION.txt,LICENSE.*L} \
-  $CWD/README.benchmarks $CWD/README.ccache \
+  README qtbase/{header*,LICENSE*} \
+  $CWD/README.ccache \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -345,5 +317,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
-# vim: expandtab
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index 18ec3e1a45..280af26135 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,10 +1,10 @@
 PRGNAM="qt5"
-VERSION="5.9.9"
+VERSION="5.12.8"
 HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="https://download.qt.io/official_releases/qt/5.9/5.9.9/single/qt-everywhere-opensource-src-5.9.9.tar.xz"
-MD5SUM="97e81709b57e82ab2b279408eaa9270e"
+DOWNLOAD="https://download.qt.io/official_releases/qt/5.12/5.12.8/single/qt-everywhere-src-5.12.8.tar.xz"
+MD5SUM="8ec2a0458f3b8e9c995b03df05e006e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libxkbcommon libinput"
+REQUIRES="libxkbcommon"
 MAINTAINER="Dave Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/libraries/quazip-qt4/README b/libraries/quazip-qt4/README
new file mode 100644
index 0000000000..aff044eeb5
--- /dev/null
+++ b/libraries/quazip-qt4/README
@@ -0,0 +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 provides complete abstraction of the ZIP/UNZIP API, for both
+reading from and writing to ZIP archives.
diff --git a/libraries/quazip-qt4/quazip-qt4.SlackBuild b/libraries/quazip-qt4/quazip-qt4.SlackBuild
new file mode 100644
index 0000000000..2f801f15df
--- /dev/null
+++ b/libraries/quazip-qt4/quazip-qt4.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for quazip-qt4
+
+# Copyright 2013  Isaque Galdino <igaldino@gmail.com>
+# Copyright 2019-2020  Matteo Bernardini <ponce@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=quazip-qt4
+SRCNAM=quazip
+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"
+  SLKCFLAGS="-O2"
+  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 {} \;
+
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \
+    -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_WITH_QT4=1 \
+    ..
+  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 NEWS.txt COPYING *.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/quazip-qt4/quazip-qt4.info b/libraries/quazip-qt4/quazip-qt4.info
new file mode 100644
index 0000000000..d88b35094d
--- /dev/null
+++ b/libraries/quazip-qt4/quazip-qt4.info
@@ -0,0 +1,10 @@
+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"
+MD5SUM="46a7c344355bd53af8da2bfcd5126c3c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
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-qt5/quazip-qt5.SlackBuild b/libraries/quazip-qt5/quazip-qt5.SlackBuild
index d1acfdcf2d..bbfa3bb078 100644
--- a/libraries/quazip-qt5/quazip-qt5.SlackBuild
+++ b/libraries/quazip-qt5/quazip-qt5.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for quazip-qt5
 
-# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2019-2020  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=quazip-qt5
 SRCNAM=quazip
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/quazip-qt5/quazip-qt5.info b/libraries/quazip-qt5/quazip-qt5.info
index 3e51230aec..7f3f2550fa 100644
--- a/libraries/quazip-qt5/quazip-qt5.info
+++ b/libraries/quazip-qt5/quazip-qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="quazip-qt5"
-VERSION="0.8.1"
+VERSION="0.9.1"
 HOMEPAGE="https://github.com/stachenov/quazip/"
-DOWNLOAD="https://github.com/stachenov/quazip/archive/v0.8.1/quazip-0.8.1.tar.gz"
-MD5SUM="0161c679b1d32c289dab2f96c81354aa"
+DOWNLOAD="https://github.com/stachenov/quazip/archive/v0.9.1/quazip-0.9.1.tar.gz"
+MD5SUM="46a7c344355bd53af8da2bfcd5126c3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/libraries/quazip/README b/libraries/quazip/README
deleted file mode 100644
index 026ee2c7d4..0000000000
--- a/libraries/quazip/README
+++ /dev/null
@@ -1,10 +0,0 @@
-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 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/quazip.SlackBuild
deleted file mode 100644
index 55ed195667..0000000000
--- a/libraries/quazip/quazip.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for quazip
-
-# Copyright 2013  Isaque Galdino <igaldino@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=quazip
-VERSION=${VERSION:-0.8.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"
-  SLKCFLAGS="-O2"
-  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
-  cmake \
-    -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DBUILD_WITH_QT4=1 \
-    ..
-  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 NEWS.txt COPYING *.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/quazip/quazip.info b/libraries/quazip/quazip.info
deleted file mode 100644
index 8545d85d7d..0000000000
--- a/libraries/quazip/quazip.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="quazip"
-VERSION="0.8.1"
-HOMEPAGE="https://github.com/stachenov/quazip"
-DOWNLOAD="https://github.com/stachenov/quazip/archive/v0.8.1/quazip-0.8.1.tar.gz"
-MD5SUM="0161c679b1d32c289dab2f96c81354aa"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
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.4-pkgconfig.diff b/libraries/qwt-qt5/patch-6.1.6-pkgconfig.diff
index 91c5ed4c78..91c5ed4c78 100644
--- a/libraries/qwt-qt5/patch-6.1.4-pkgconfig.diff
+++ b/libraries/qwt-qt5/patch-6.1.6-pkgconfig.diff
diff --git a/libraries/qwt-qt5/patch-6.1.4-qwtconfig.diff b/libraries/qwt-qt5/patch-6.1.6-qwtconfig.diff
index 815013bd06..815013bd06 100644
--- a/libraries/qwt-qt5/patch-6.1.4-qwtconfig.diff
+++ b/libraries/qwt-qt5/patch-6.1.6-qwtconfig.diff
diff --git a/libraries/qwt-qt5/patch-6.1.4-qwtfunctions.diff b/libraries/qwt-qt5/patch-6.1.6-qwtfunctions.diff
index b31dc22de6..b31dc22de6 100644
--- a/libraries/qwt-qt5/patch-6.1.4-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 b3c360556e..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 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.4}
+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.4-qwtconfig.diff
-patch -p0 < $CWD/patch-6.1.4-pkgconfig.diff
-patch -p1 < $CWD/patch-6.1.4-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 c6d067114d..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.4"
+VERSION="6.1.6"
 HOMEPAGE="http://qwt.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.1.4.tar.bz2"
-MD5SUM="4fb1852f694420e3ab9c583526edecc5"
+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 46a4e9b453..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-2019 by Christoph Willing <chris.willing@linux.com>
+# Maintained 2015-2021 by Christoph Willing <chris.willing@linux.com>
 
 PRGNAM=qwt
-VERSION=${VERSION:-6.1.4}
+VERSION=${VERSION:-6.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/qwt/qwt.info b/libraries/qwt/qwt.info
index 1b81a031d9..36c5bc0943 100644
--- a/libraries/qwt/qwt.info
+++ b/libraries/qwt/qwt.info
@@ -1,8 +1,8 @@
 PRGNAM="qwt"
-VERSION="6.1.4"
+VERSION="6.1.6"
 HOMEPAGE="https://qwt.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/qwt/qwt-6.1.4.tar.bz2"
-MD5SUM="4fb1852f694420e3ab9c583526edecc5"
+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/qwtplot3d/README b/libraries/qwtplot3d/README
index cfec1a9015..f8274f0d79 100644
--- a/libraries/qwtplot3d/README
+++ b/libraries/qwtplot3d/README
@@ -1,5 +1,5 @@
 QwtPlot3D (A Qt/OpenGL-based C++ programming library)
 
-QwtPlot3D is not a  program, but a feature-rich Qt/OpenGL-based C++
-programming  library,  providing essentially a  bunch of 3D-widgets
-for programmers. The library is zlib licensed.
\ No newline at end of file
+QwtPlot3D is not a program, but a feature-rich Qt/OpenGL-based C++
+programming library, providing essentially a bunch of 3D-widgets
+for programmers. The library is zlib licensed.
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/re2/re2.SlackBuild b/libraries/re2/re2.SlackBuild
index 1fd6dfb038..54e31b88ea 100644
--- a/libraries/re2/re2.SlackBuild
+++ b/libraries/re2/re2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for re2
 
-# Copyright 2018-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2018-2020 Larry Hajali <larryhaja[at]gmail[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=re2
-VERSION=${VERSION:-2019_09_01}
+VERSION=${VERSION:-2020_05_01}
 PKGVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/libraries/re2/re2.info b/libraries/re2/re2.info
index 9d42e175d1..f6dcc349cd 100644
--- a/libraries/re2/re2.info
+++ b/libraries/re2/re2.info
@@ -1,8 +1,8 @@
 PRGNAM="re2"
-VERSION="2019_09_01"
+VERSION="2020_05_01"
 HOMEPAGE="https://github.com/google/re2"
-DOWNLOAD="https://github.com/google/re2/archive/2019-09-01/re2-2019-09-01.tar.gz"
-MD5SUM="7f866527b1def4b0287d9eb3e871b1dc"
+DOWNLOAD="https://github.com/google/re2/archive/2020-05-01/re2-2020-05-01.tar.gz"
+MD5SUM="b4fe3a6ddedb805a5ad4f3b301e12ba9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/rhonabwy/README b/libraries/rhonabwy/README
new file mode 100644
index 0000000000..72ee9dccc7
--- /dev/null
+++ b/libraries/rhonabwy/README
@@ -0,0 +1,11 @@
+Rhonabwy - JWK, JWKS, JWS, JWE and JWT library
+
+Create, modify, parse, import or export JSON Web Keys (JWK) and JSON
+Web Keys Set (JWKS).
+
+Create, modify, parse, validate or serialize JSON Web Signatures (JWS).
+
+Create, modify, parse, validate or serialize JSON Web Encryption (JWE)
+limited!
+
+Create, modify, parse, validate or serialize JSON Web Token (JWT).
diff --git a/libraries/rhonabwy/rhonabwy.SlackBuild b/libraries/rhonabwy/rhonabwy.SlackBuild
new file mode 100644
index 0000000000..0dcb0f0911
--- /dev/null
+++ b/libraries/rhonabwy/rhonabwy.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+# Slackware build script for rhonabwy
+#
+# Yth | Pont-en-Royans, France | yth@ythogtha.org
+#
+# 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=rhonabwy
+VERSION=${VERSION:-0.9.999}
+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 -Wno-error=maybe-uninitialized"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=maybe-uninitialized"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC -Wno-error=maybe-uninitialized"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2 -Wno-error=maybe-uninitialized"
+  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_INSTALL_PREFIX=/usr \
+    -DWITH_JOURNALD=off \
+    -DCMAKE_INSTALL_DOCDIR=doc/$PRGNAM-$VERSION \
+    -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
+
+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
+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/rhonabwy/rhonabwy.info b/libraries/rhonabwy/rhonabwy.info
new file mode 100644
index 0000000000..8d9b0fbe19
--- /dev/null
+++ b/libraries/rhonabwy/rhonabwy.info
@@ -0,0 +1,10 @@
+PRGNAM="rhonabwy"
+VERSION="0.9.999"
+HOMEPAGE="https://github.com/babelouest/rhonabwy"
+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"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/libraries/rhonabwy/slack-desc b/libraries/rhonabwy/slack-desc
new file mode 100644
index 0000000000..13880570b6
--- /dev/null
+++ b/libraries/rhonabwy/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------------------------------------------------------|
+rhonabwy: rhonabwy (Manage JW* libraries)
+rhonabwy:
+rhonabwy: Rhonabwy - JWK, JWKS, JWS, JWE and JWT library
+rhonabwy:
+rhonabwy:
+rhonabwy:
+rhonabwy:
+rhonabwy: Project URL: https://github.com/babelouest/rhonabwy
+rhonabwy:
+rhonabwy:
+rhonabwy:
diff --git a/libraries/robin-map/robin-map.SlackBuild b/libraries/robin-map/robin-map.SlackBuild
index 19c977c17a..81514ed4c2 100644
--- a/libraries/robin-map/robin-map.SlackBuild
+++ b/libraries/robin-map/robin-map.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for robin-map
 
-# Copyright 2019 Christoph Willing   Brisbane, Australia
+# Copyright 2019-2020 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=robin-map
-VERSION=${VERSION:-0.6.2}
+VERSION=${VERSION:-0.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/robin-map/robin-map.info b/libraries/robin-map/robin-map.info
index 348c759405..208ba6f027 100644
--- a/libraries/robin-map/robin-map.info
+++ b/libraries/robin-map/robin-map.info
@@ -1,8 +1,8 @@
 PRGNAM="robin-map"
-VERSION="0.6.2"
+VERSION="0.6.3"
 HOMEPAGE="https://github.com/Tessil/robin-map"
-DOWNLOAD="https://github.com/Tessil/robin-map/archive/v0.6.2/robin-map-0.6.2.tar.gz"
-MD5SUM="2142db273d9bd0a274d076ad5411855d"
+DOWNLOAD="https://github.com/Tessil/robin-map/archive/v0.6.3/robin-map-0.6.3.tar.gz"
+MD5SUM="e6a362bff8372bbb4d901d2e28993a8a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/serd/serd.SlackBuild b/libraries/serd/serd.SlackBuild
index 217fef0cf3..86642bdc18 100644
--- a/libraries/serd/serd.SlackBuild
+++ b/libraries/serd/serd.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for serd
 
 # Copyright 2012-2016 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=serd
-VERSION=${VERSION:-0.22.0}
+VERSION=${VERSION:-0.30.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 +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"
@@ -67,7 +68,7 @@ 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -90,7 +91,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README \
+cp -a AUTHORS COPYING INSTALL NEWS README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/serd/serd.info b/libraries/serd/serd.info
index 978a5b2323..54db918c02 100644
--- a/libraries/serd/serd.info
+++ b/libraries/serd/serd.info
@@ -1,10 +1,10 @@
 PRGNAM="serd"
-VERSION="0.22.0"
+VERSION="0.30.4"
 HOMEPAGE="http://drobilla.net/software/serd/"
-DOWNLOAD="http://download.drobilla.net/serd-0.22.0.tar.bz2"
-MD5SUM="541bceb9f7cec50f4bf618060332b87c"
+DOWNLOAD="http://download.drobilla.net/serd-0.30.4.tar.bz2"
+MD5SUM="d91349ad8ca81072d95c65b3346108cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/skalibs/README b/libraries/skalibs/README
index c601481353..2bb7aa0577 100644
--- a/libraries/skalibs/README
+++ b/libraries/skalibs/README
@@ -30,3 +30,8 @@ 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, 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 125d6212fc..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.2.0}
+VERSION=${VERSION:-2.10.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,14 +60,14 @@ fi
 # If you need to build the shared libraries, just pass BUILD_SHARED=yes to this script
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
+[ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
+[ "$BUILD_SHARED" = "no" ] && LIBS_CONF="--disable-shared $LIBS_CONF"
 
-if [ "$BUILD_STATIC" = "no" ]; then
-	LIBS_CONF="--disable-static"
-fi
-
-if [ "$BUILD_SHARED" = "no" ]; then
-	LIBS_CONF="--disable-shared $LIBS_CONF"
-fi
+# 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
 
@@ -92,6 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --includedir=/usr/include \
   --sysdepdir=/usr/lib${LIBDIRSUFFIX}/skalibs/sysdeps \
   --datadir=/etc \
+  --with-default-path=${DEF_PATH} \
   $LIBS_CONF
 
 make
diff --git a/libraries/skalibs/skalibs.info b/libraries/skalibs/skalibs.info
index bae29cfa67..2dd406572f 100644
--- a/libraries/skalibs/skalibs.info
+++ b/libraries/skalibs/skalibs.info
@@ -1,8 +1,8 @@
 PRGNAM="skalibs"
-VERSION="2.9.2.0"
+VERSION="2.10.0.3"
 HOMEPAGE="https://skarnet.org/software/skalibs/"
-DOWNLOAD="https://skarnet.org/software/skalibs/skalibs-2.9.2.0.tar.gz"
-MD5SUM="1c2aabd584412ce17e43860a7776053a"
+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/skalibs/slack-desc b/libraries/skalibs/slack-desc
index 12cb6a8087..4bca6413d9 100644
--- a/libraries/skalibs/slack-desc
+++ b/libraries/skalibs/slack-desc
@@ -16,3 +16,4 @@ skalibs: also be used as a general-purpose library. It is very suitable for
 skalibs: creating small and secure system programs.
 skalibs:
 skalibs: Homepage: https://skarnet.org/software/skalibs/
+skalibs:
diff --git a/libraries/skalibs/sysdeps.cfg/sysdeps b/libraries/skalibs/sysdeps.cfg/sysdeps
deleted file mode 100644
index 8829fd46ab..0000000000
--- a/libraries/skalibs/sysdeps.cfg/sysdeps
+++ /dev/null
@@ -1 +0,0 @@
-target: x86_64-slackware-linux
diff --git a/libraries/skalibs/sysdeps.cfg/sysdeps.h b/libraries/skalibs/sysdeps.cfg/sysdeps.h
deleted file mode 100644
index 09dd53d4b8..0000000000
--- a/libraries/skalibs/sysdeps.cfg/sysdeps.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* ISC license. */
-
-#ifndef SYSDEPS_H
-#define SYSDEPS_H
-
-#define SKALIBS_TARGET "x86_64-slackware-linux"
diff --git a/libraries/skalibs/sysdeps.cfg/target b/libraries/skalibs/sysdeps.cfg/target
deleted file mode 100644
index 210a166722..0000000000
--- a/libraries/skalibs/sysdeps.cfg/target
+++ /dev/null
@@ -1 +0,0 @@
-x86_64-slackware-linux
diff --git a/libraries/skalibs/sysdeps.cfg/util.lib b/libraries/skalibs/sysdeps.cfg/util.lib
deleted file mode 100644
index 8b13789179..0000000000
--- a/libraries/skalibs/sysdeps.cfg/util.lib
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/libraries/slv2/slv2.SlackBuild b/libraries/slv2/slv2.SlackBuild
index 6807ffb551..41ca8f070a 100644
--- a/libraries/slv2/slv2.SlackBuild
+++ b/libraries/slv2/slv2.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# In the newer lv2 the pkgconfig file is named differently...
+sed -i "s|lv2core|lv2|" wscript
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./waf configure \
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/sord/sord.SlackBuild b/libraries/sord/sord.SlackBuild
index 1a8a102ed1..25ae3cb787 100644
--- a/libraries/sord/sord.SlackBuild
+++ b/libraries/sord/sord.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for sord
 
 # Copyright 2012-2016 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2020 Matteo Bernardini, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sord
-VERSION=${VERSION:-0.14.0}
+VERSION=${VERSION:-0.16.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 +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"
@@ -67,7 +68,7 @@ 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -89,7 +90,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README \
+cp -a AUTHORS COPYING INSTALL NEWS README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/sord/sord.info b/libraries/sord/sord.info
index 82211c257c..9c0c0a4852 100644
--- a/libraries/sord/sord.info
+++ b/libraries/sord/sord.info
@@ -1,10 +1,10 @@
 PRGNAM="sord"
-VERSION="0.14.0"
+VERSION="0.16.4"
 HOMEPAGE="http://drobilla.net/software/sord/"
-DOWNLOAD="http://download.drobilla.net/sord-0.14.0.tar.bz2"
-MD5SUM="7ffda283ad0a5716f196f650edd25713"
+DOWNLOAD="http://download.drobilla.net/sord-0.16.4.tar.bz2"
+MD5SUM="c80bcaf8e411ceeff5ac7fd14da27ace"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="serd"
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/sparsehash/sparsehash.SlackBuild b/libraries/sparsehash/sparsehash.SlackBuild
index ffe9703129..1d5acb2193 100644
--- a/libraries/sparsehash/sparsehash.SlackBuild
+++ b/libraries/sparsehash/sparsehash.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sparsehash
 
-# Copyright 2013-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2020 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=sparsehash
-VERSION=${VERSION:-2.0.3}
+VERSION=${VERSION:-2.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -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 {} \;
 
+# the version number is incorrect
+sed -i "s|sparsehash,\ 2\.0\.2|sparsehash, 2.0.4|" configure.ac
+autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -86,8 +90,10 @@ 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 doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc/$PRGNAM-* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -fR $PKG/usr/share
+cp -a doc $PKG/usr/doc/$PRGNAM-$VERSION/html
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/sparsehash/sparsehash.info b/libraries/sparsehash/sparsehash.info
index 62f5d59320..8e58865768 100644
--- a/libraries/sparsehash/sparsehash.info
+++ b/libraries/sparsehash/sparsehash.info
@@ -1,8 +1,8 @@
 PRGNAM="sparsehash"
-VERSION="2.0.3"
+VERSION="2.0.4"
 HOMEPAGE="https://github.com/sparsehash/sparsehash"
-DOWNLOAD="https://github.com/sparsehash/sparsehash/archive/sparsehash-2.0.3/sparsehash-sparsehash-2.0.3.tar.gz"
-MD5SUM="d8d5e2538c1c25577b3f066d7a55e99e"
+DOWNLOAD="https://github.com/sparsehash/sparsehash/archive/sparsehash-2.0.4/sparsehash-sparsehash-2.0.4.tar.gz"
+MD5SUM="cb565465643c3588abfac569b31e7433"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/sqliteodbc/sqliteodbc.SlackBuild b/libraries/sqliteodbc/sqliteodbc.SlackBuild
index c0162bfaed..57b8f32ce0 100644
--- a/libraries/sqliteodbc/sqliteodbc.SlackBuild
+++ b/libraries/sqliteodbc/sqliteodbc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sqliteodbc
 
-# Copyright 2018 Jason Graham <jgraham@compukix.net>, USA
+# Copyright 2018,2020 Jason Graham <jgraham@compukix.net>, 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=sqliteodbc
-VERSION=${VERSION:-0.9996}
+VERSION=${VERSION:-0.9998}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/sqliteodbc/sqliteodbc.info b/libraries/sqliteodbc/sqliteodbc.info
index 555fefaa05..847bb96076 100644
--- a/libraries/sqliteodbc/sqliteodbc.info
+++ b/libraries/sqliteodbc/sqliteodbc.info
@@ -1,10 +1,10 @@
 PRGNAM="sqliteodbc"
-VERSION="0.9996"
+VERSION="0.9998"
 HOMEPAGE="http://www.ch-werner.de/sqliteodbc/"
-DOWNLOAD="http://www.ch-werner.de/sqliteodbc/sqliteodbc-0.9996.tar.gz"
-MD5SUM="703e298a7232e49be1ddf26769c71211"
+DOWNLOAD="http://www.ch-werner.de/sqliteodbc/sqliteodbc-0.9998.tar.gz"
+MD5SUM="42262e341806a92d56c7ca769dff105c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/libraries/sratom/sratom.SlackBuild b/libraries/sratom/sratom.SlackBuild
index 5129da7c4e..8610e45df6 100644
--- a/libraries/sratom/sratom.SlackBuild
+++ b/libraries/sratom/sratom.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for sratom
 
 # Copyright 2012-2016 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2020 Matteo Bernardini, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sratom
-VERSION=${VERSION:-0.4.6}
+VERSION=${VERSION:-0.6.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 +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"
@@ -67,7 +68,7 @@ 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -87,7 +88,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 COPYING NEWS README \
+cp -a COPYING NEWS README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/sratom/sratom.info b/libraries/sratom/sratom.info
index c534449740..5f1a1d3782 100644
--- a/libraries/sratom/sratom.info
+++ b/libraries/sratom/sratom.info
@@ -1,10 +1,10 @@
 PRGNAM="sratom"
-VERSION="0.4.6"
+VERSION="0.6.4"
 HOMEPAGE="http://drobilla.net/software/sratom/"
-DOWNLOAD="http://download.drobilla.net/sratom-0.4.6.tar.bz2"
-MD5SUM="5cf28520418779bf41fb14a40fbb20ad"
+DOWNLOAD="http://download.drobilla.net/sratom-0.6.4.tar.bz2"
+MD5SUM="0d087aa05c7b22d569aacc2fd14f0274"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lv2 sord"
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+REQUIRES="lv2"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
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/suil/README b/libraries/suil/README
index b31b84b9b0..3985e1d932 100644
--- a/libraries/suil/README
+++ b/libraries/suil/README
@@ -1 +1,3 @@
 Suil is a lightweight C library for loading and wrapping LV2 plugin UIs.
+
+qt5 is an optional dependency.
diff --git a/libraries/suil/suil.SlackBuild b/libraries/suil/suil.SlackBuild
index 95aa37a684..8057a72981 100644
--- a/libraries/suil/suil.SlackBuild
+++ b/libraries/suil/suil.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for suil
 
 # Copyright 2012-2015 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2020 Matteo Bernardini, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=suil
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-0.10.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 +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"
@@ -70,7 +71,7 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./waf configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -87,7 +88,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 COPYING INSTALL NEWS PACKAGING README \
+cp -a AUTHORS COPYING INSTALL NEWS PACKAGING README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/suil/suil.info b/libraries/suil/suil.info
index e8d45badc4..eb6cac3233 100644
--- a/libraries/suil/suil.info
+++ b/libraries/suil/suil.info
@@ -1,10 +1,10 @@
 PRGNAM="suil"
-VERSION="0.8.2"
+VERSION="0.10.6"
 HOMEPAGE="http://drobilla.net/software/suil/"
-DOWNLOAD="http://download.drobilla.net/suil-0.8.2.tar.bz2"
-MD5SUM="1b06947b1fc028f9ffcbc16d30065aa5"
+DOWNLOAD="http://download.drobilla.net/suil-0.10.6.tar.bz2"
+MD5SUM="12c87f830c06d280e2826fae7bc6dd86"
 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/tbb/tbb.SlackBuild b/libraries/tbb/tbb.SlackBuild
index 3be13554af..26680e445a 100644
--- a/libraries/tbb/tbb.SlackBuild
+++ b/libraries/tbb/tbb.SlackBuild
@@ -4,10 +4,11 @@
 # Written by powtrix (@gmail.com)
 
 PRGNAM=tbb
-VERSION=${VERSION:-2020u1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2020u2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=oneTBB
 SRCVERSION=$( echo ${VERSION} | sed 's,u,_U,' )
 
 if [ -z "$ARCH" ]; then
@@ -42,8 +43,8 @@ set -e
 rm -rf $PKG $TMP/oneTBB-${SRCVERSION}
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/${PRGNAM}-${SRCVERSION}.tar.gz
-cd oneTBB-${SRCVERSION}
+tar xvf $CWD/${SRCNAM}-${SRCVERSION}.tar.gz
+cd $SRCNAM-${SRCVERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/tbb/tbb.info b/libraries/tbb/tbb.info
index bed499b385..d00913329f 100644
--- a/libraries/tbb/tbb.info
+++ b/libraries/tbb/tbb.info
@@ -1,8 +1,8 @@
 PRGNAM="tbb"
-VERSION="2020u1"
+VERSION="2020u2"
 HOMEPAGE="https://software.intel.com/en-us/tbb"
-DOWNLOAD="https://github.com/oneapi-src/oneTBB/archive/2020_U1/tbb-2020_U1.tar.gz"
-MD5SUM="1e9c8914683d31d1721ee68d9f1aab5d"
+DOWNLOAD="https://github.com/oneapi-src/oneTBB/archive/2020_U2/oneTBB-2020_U2.tar.gz"
+MD5SUM="1b711ae956524855088df3bbf5ec65dc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/tcl-inotify/README b/libraries/tcl-inotify/README
index 77cb5c5b04..56f2807cd3 100644
--- a/libraries/tcl-inotify/README
+++ b/libraries/tcl-inotify/README
@@ -1,2 +1,2 @@
 This is a Tcl extension that provides an interface to the inotify file
-system notification service of the Linux kernel.
\ No newline at end of file
+system notification service of the Linux kernel.
diff --git a/libraries/tcl-promise/README b/libraries/tcl-promise/README
new file mode 100644
index 0000000000..9f2d5439be
--- /dev/null
+++ b/libraries/tcl-promise/README
@@ -0,0 +1,2 @@
+tcl-promise implements the 'promise' abstraction for asynchronous
+programming.
diff --git a/libraries/tcl-promise/dst-installer.patch b/libraries/tcl-promise/dst-installer.patch
new file mode 100644
index 0000000000..293f59d268
--- /dev/null
+++ b/libraries/tcl-promise/dst-installer.patch
@@ -0,0 +1,12 @@
+--- promise-1.1.0.tm.orig	2020-07-27 12:00:27.771781329 -0500
++++ promise-1.1.0.tm	2020-07-27 12:03:12.543787263 -0500
+@@ -1281,7 +1281,8 @@
+             }

+         }

+         install {

+-            set dir [file join [tcl::pkgconfig get libdir,runtime] tcl8 8.6]

++            set dir [string cat [lindex $::argv 1] [file join [tcl::pkgconfig get libdir,runtime] tcl8 8.6]]

++            file mkdir $dir

+             if {[file extension $filename] eq ".tm"} {

+                 # We already are a .tm with version number

+                 set target $filename

diff --git a/libraries/tcl-promise/slack-desc b/libraries/tcl-promise/slack-desc
new file mode 100644
index 0000000000..b9ce42cbc3
--- /dev/null
+++ b/libraries/tcl-promise/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------------------------------------------------------|
+tcl-promise: tcl-promise (A promise/future lib for tcl)
+tcl-promise:
+tcl-promise: This package implements the 'promise' abstraction for asynchronous
+tcl-promise: programming.
+tcl-promise:
+tcl-promise: https://tcl-promise.magicsplat.com/
+tcl-promise:
+tcl-promise:
+tcl-promise:
+tcl-promise:
+tcl-promise:
diff --git a/libraries/tcl-promise/tcl-promise.SlackBuild b/libraries/tcl-promise/tcl-promise.SlackBuild
new file mode 100644
index 0000000000..5b43693fe6
--- /dev/null
+++ b/libraries/tcl-promise/tcl-promise.SlackBuild
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Slackware build script for promise
+
+# 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=tcl-promise
+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}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+cp $CWD/promise-${VERSION}.tm .
+patch < $CWD/dst-installer.patch
+
+tclsh ./promise-${VERSION}.tm install "${PKG}"
+
+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/tcl-promise/tcl-promise.info b/libraries/tcl-promise/tcl-promise.info
new file mode 100644
index 0000000000..afa3b5be6e
--- /dev/null
+++ b/libraries/tcl-promise/tcl-promise.info
@@ -0,0 +1,10 @@
+PRGNAM="tcl-promise"
+VERSION="1.1.0"
+HOMEPAGE="http://www.magicsplat.com/blog/tags/promises/"
+DOWNLOAD="https://master.dl.sourceforge.net/project/tcl-promise/promise-1.1.0.tm"
+MD5SUM="c8c10f855bdc8a935246f29ab238cd9f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jeff Parent"
+EMAIL="jeff+SBo@sh0.xyz"
diff --git a/libraries/tinyxml2/tinyxml2.SlackBuild b/libraries/tinyxml2/tinyxml2.SlackBuild
index 21377dcded..65687b396c 100644
--- a/libraries/tinyxml2/tinyxml2.SlackBuild
+++ b/libraries/tinyxml2/tinyxml2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tinyxml2
 
-# Copyright 2014-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2020 Larry Hajali <larryhaja[at]gmail[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=tinyxml2
-VERSION=${VERSION:-7.1.0}
+VERSION=${VERSION:-8.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/tinyxml2/tinyxml2.info b/libraries/tinyxml2/tinyxml2.info
index c8fd536315..529d10048b 100644
--- a/libraries/tinyxml2/tinyxml2.info
+++ b/libraries/tinyxml2/tinyxml2.info
@@ -1,8 +1,8 @@
 PRGNAM="tinyxml2"
-VERSION="7.1.0"
+VERSION="8.0.0"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml2/index.html"
-DOWNLOAD="https://github.com/leethomason/tinyxml2/archive/7.1.0/tinyxml2-7.1.0.tar.gz"
-MD5SUM="8a02c592702dcc7a061932425d8f3087"
+DOWNLOAD="https://github.com/leethomason/tinyxml2/archive/8.0.0/tinyxml2-8.0.0.tar.gz"
+MD5SUM="5dc535c8b34ee621fe2128f072d275b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/tolua++/tolua++.SlackBuild b/libraries/tolua++/tolua++.SlackBuild
index 7db0ed754a..9bb08e34d1 100644
--- a/libraries/tolua++/tolua++.SlackBuild
+++ b/libraries/tolua++/tolua++.SlackBuild
@@ -62,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/libraries/tolua++/tolua++.info b/libraries/tolua++/tolua++.info
index ebf8d5f6cc..256e37b9c7 100644
--- a/libraries/tolua++/tolua++.info
+++ b/libraries/tolua++/tolua++.info
@@ -1,7 +1,7 @@
 PRGNAM="tolua++"
 VERSION="1.0.93"
 HOMEPAGE="https://github.com/LuaDist/toluapp"
-DOWNLOAD="https://github.com/LuaDist/toluapp/archive/1.0.93/tolua++-1.0.93.tar.gz"
+DOWNLOAD="https://github.com/LuaDist/toluapp/archive/1.0.93/toluapp-1.0.93.tar.gz"
 MD5SUM="689d952034e55d4333fa240f7516e68a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/libraries/tox-extension-messages/tox-extension-messages.SlackBuild b/libraries/tox-extension-messages/tox-extension-messages.SlackBuild
new file mode 100644
index 0000000000..0f438f303a
--- /dev/null
+++ b/libraries/tox-extension-messages/tox-extension-messages.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# 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
+# 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=tox-extension-messages
+VERSION=${VERSION:-0.0.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/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -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
+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 \
+  -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 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/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/libraries/toxext/slack-desc b/libraries/toxext/slack-desc
new file mode 100644
index 0000000000..432ac899a2
--- /dev/null
+++ b/libraries/toxext/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------------------------------------------------------|
+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 0f3d9756ae..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.5}
+VERSION=${VERSION:-2.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/ulfius/ulfius.info b/libraries/ulfius/ulfius.info
index 9f27937910..d9c85c3d40 100644
--- a/libraries/ulfius/ulfius.info
+++ b/libraries/ulfius/ulfius.info
@@ -1,8 +1,8 @@
 PRGNAM="ulfius"
-VERSION="2.6.5"
+VERSION="2.7.2"
 HOMEPAGE="https://github.com/babelouest/ulfius"
-DOWNLOAD="https://github.com/babelouest/ulfius/archive/v2.6.5/ulfius-2.6.5.tar.gz"
-MD5SUM="88a2f725a3d8af830063f40c1b8fa723"
+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 32944960ac..a21dc230b9 100644
--- a/libraries/uriparser/uriparser.SlackBuild
+++ b/libraries/uriparser/uriparser.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for uriparser
 
-# Copyright 2015-2019 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.3}
+VERSION=${VERSION:-0.9.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/uriparser/uriparser.info b/libraries/uriparser/uriparser.info
index 683158a09e..ee40e432c1 100644
--- a/libraries/uriparser/uriparser.info
+++ b/libraries/uriparser/uriparser.info
@@ -1,8 +1,8 @@
 PRGNAM="uriparser"
-VERSION="0.9.3"
+VERSION="0.9.5"
 HOMEPAGE="https://uriparser.github.io"
-DOWNLOAD="https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.3/uriparser-0.9.3.tar.xz"
-MD5SUM="e857bf458b3aca5ea338d1e4b1f74c1a"
+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 f6190360a2..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 2.38.0 (ATTENTION!! 2.40.1 is not working!)
-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 2fce345824..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.12.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 doc/Contributing $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 78b6ba2600..0b2b19c8eb 100644
--- a/libraries/wayland/wayland.info
+++ b/libraries/wayland/wayland.info
@@ -1,8 +1,8 @@
 PRGNAM="wayland"
-VERSION="1.12.0"
+VERSION="1.19.0"
 HOMEPAGE="https://wayland.freedesktop.org/"
-DOWNLOAD="https://wayland.freedesktop.org/releases/wayland-1.12.0.tar.xz"
-MD5SUM="ee615e2d1e205eec48b02f069327eb96"
+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 4ab8d64d97..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.1}
+VERSION=${VERSION:-1.13.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/wimlib/wimlib.info b/libraries/wimlib/wimlib.info
index f8c9148128..7e919675ca 100644
--- a/libraries/wimlib/wimlib.info
+++ b/libraries/wimlib/wimlib.info
@@ -1,8 +1,8 @@
 PRGNAM="wimlib"
-VERSION="1.13.1"
+VERSION="1.13.3"
 HOMEPAGE="https://www.wimlib.net"
-DOWNLOAD="https://wimlib.net/downloads/wimlib-1.13.1.tar.gz"
-MD5SUM="8f148a0348689329d32f60a8b9509e2f"
+DOWNLOAD="https://wimlib.net/downloads/wimlib-1.13.3.tar.gz"
+MD5SUM="cc5657d6bd5baf45662eac7c78becbbf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/wxGTK3/wxGTK3.SlackBuild b/libraries/wxGTK3/wxGTK3.SlackBuild
index 43a7241a66..e89eb53447 100644
--- a/libraries/wxGTK3/wxGTK3.SlackBuild
+++ b/libraries/wxGTK3/wxGTK3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wxGTK3
 
-# Copyright 2013-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-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=wxGTK3
-VERSION=${VERSION:-3.0.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.0.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=wxWidgets
diff --git a/libraries/wxGTK3/wxGTK3.info b/libraries/wxGTK3/wxGTK3.info
index 7edde8a4a5..f1a3b86ea1 100644
--- a/libraries/wxGTK3/wxGTK3.info
+++ b/libraries/wxGTK3/wxGTK3.info
@@ -1,8 +1,8 @@
 PRGNAM="wxGTK3"
-VERSION="3.0.4"
+VERSION="3.0.5"
 HOMEPAGE="http://www.wxwidgets.org"
-DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/v3.0.4/wxWidgets-3.0.4.tar.gz"
-MD5SUM="148a57dc7e1a025b28d5dbffc99e38eb"
+DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/v3.0.5/wxWidgets-3.0.5.tar.gz"
+MD5SUM="0acae8c9d8df226ed2523d745200bdc4"
 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 7ae4d6dcb2..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.29}
+VERSION=${VERSION:-1.2.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/xmlsec/xmlsec.info b/libraries/xmlsec/xmlsec.info
index deea60f4fb..79fa175e41 100644
--- a/libraries/xmlsec/xmlsec.info
+++ b/libraries/xmlsec/xmlsec.info
@@ -1,8 +1,8 @@
 PRGNAM="xmlsec"
-VERSION="1.2.29"
+VERSION="1.2.31"
 HOMEPAGE="https://www.aleksey.com/xmlsec/"
-DOWNLOAD="https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.29.tar.gz"
-MD5SUM="4755621ff2a7150e208de6bd7decca10"
+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/xview/README b/libraries/xview/README
index c89d9bf1a8..3defd3d840 100644
--- a/libraries/xview/README
+++ b/libraries/xview/README
@@ -1,4 +1,4 @@
-XView (X11 toolkit for OPEN LOOK applications)
+xview (X11 toolkit for OPEN LOOK applications)
 
 XView is a cross-platform X11 toolkit which implements OPEN LOOK
 specification. It was originally created by Sun Microsystems (now
@@ -7,11 +7,8 @@ several OPEN LOOK applications, including window managers (olwm,
 olvwm), text editors (oledit, textedit), clock (olclock) and a
 simple calculator (olcalc).
 
-!!! IMPORTANT !!!
 Due to conflict with /sbin/clock, XView's clock was renamed to olclock.
 
-If you are using one of certain, older Slackware versions, XView
-applications may hang after first mouse button click. To prevent this
-behaviour, build this SlackBuild in the following way:
-
-XVIEW_BROKEN_X11_WORKAROUND=1 ./xview.SlackBuild
+Note to 64-bit users: xview isn't "64-bit clean". The window managers
+(olwm, olvwm) work, but the applications crash with a segfault on
+startup.
diff --git a/libraries/xview/xview.SlackBuild b/libraries/xview/xview.SlackBuild
index e3a5c4ab5c..d5e643a36c 100644
--- a/libraries/xview/xview.SlackBuild
+++ b/libraries/xview/xview.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for XView
 
-# Copyright 2014 Tomasz Konojacki <me@xenu.tk>
+# Copyright 2014 Tomasz Konojacki <email removed>
+# Copyright 2020 B. Watson <yalhcru@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +23,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200524 bkw:
+# - take over maintenance, BUILD=2
+# - add partial 64-bit support (olwm and olvwm work, apps don't)
+# - add xinitrc.ol[v]wm
+# - add MAKEFLAGS=-j1
+# - remove XVIEW_BROKEN_X11_WORKAROUND from README, not needed on 14.2
+
 PRGNAM=xview
 VERSION=${VERSION:-3.2p4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -35,47 +43,84 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-if [ "$ARCH" != "i586" ] && [ "$ARCH" != "i686" ]; then
-    echo "$ARCH is not supported."
-    exit 1
-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
+  if [ "${WARN64:-yes}" = "yes" ]; then
+      cat <<"EOF"
+************************************************************************
+Warning: xview doesn't fully support 64-bit systems. The window managers
+(olwm and olvwm) work, but the applications (olclock, oledit, etc) crash
+on startup. Please don't report this as a bug, we already know.
+Press Enter or wait 5 seconds to continue, or press ^C to abort.
+************************************************************************
+EOF
+    read -t 5 || true
+  fi
+  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 Zxvf $CWD/$PRGNAM-$VERSION.tar.Z
+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 {} \;
-
-DESTDIR=$PKG \
-XVIEW_USE_GCC=1 \
-bash Build-XView.bash libs clients contrib olvwm
-
-DESTDIR=$PKG \
-bash Build-XView.bash instlibs instclients instcontrib instolvwm instfinish
-
-# it conflicts with /sbin/clock from Slackware
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Apply our CFLAGS. There might be a simpler way to do it, but this works:
+sed -i "s,-O2,$SLKCFLAGS,g" \
+  clients/olvwm-4.1/compiler.tmpl \
+  clients/olwm/Makefile.simple \
+  config/XView.tmpl
+
+script=Build-XView.bash
+
+# lib64 support, and stop creating /usr/config outside of $TMP.
+sed -i \
+    -e "s|/lib/X11/config|/lib$LIBDIRSUFFIX/X11/config|g" \
+    -e '/instlibs)/,+1s|install-sh|#&|' \
+  $script
+
+# 20200524 bkw: Yes, we do need -j1 here.
+X11DIR=/usr
+OPENWINHOME=/usr
+DESTDIR=$PKG
+XVIEW_USE_GCC=1
+MAKEFLAGS=-j1
+export X11DIR OPENWINHOME DESTDIR XVIEW_USE_GCC MAKEFLAGS
+
+# "all" builds/installs everything according to the env vars set above.
+sh $script all
+
+# This conflicts with /sbin/clock from Slackware:
 mv $PKG/usr/bin/clock $PKG/usr/bin/olclock
 mv $PKG/usr/man/man1/clock.1x $PKG/usr/man/man1/olclock.1x
 
 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 -9 $PKG/usr/man/man?/*
+
+mkdir -p $PKG/etc/X11/xinit
+install -m0755 -oroot -groot $CWD/xinitrc.* $PKG/etc/X11/xinit
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README CHANGELOG LEGAL_NOTICE $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/xview/xview.info b/libraries/xview/xview.info
index 19e1836265..07e6fbb3a6 100644
--- a/libraries/xview/xview.info
+++ b/libraries/xview/xview.info
@@ -1,10 +1,10 @@
 PRGNAM="xview"
 VERSION="3.2p4"
-HOMEPAGE="https://physionet.org/physiotools/xview/"
+HOMEPAGE="https://archive.physionet.org/physiotools/xview/"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/xview-3.2p4.tar.Z"
 MD5SUM="27b10252d53d2ccee12650221d873e2b"
-DOWNLOAD_x86_64="UNSUPPORTED"
+DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Tomasz Konojacki"
-EMAIL="me@xenu.tk"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/xylib/xylib.SlackBuild b/libraries/xylib/xylib.SlackBuild
index 82714ce15a..ca3d209064 100644
--- a/libraries/xylib/xylib.SlackBuild
+++ b/libraries/xylib/xylib.SlackBuild
@@ -2,7 +2,7 @@
 # Slackware build script for xylib
 # Based on Slackware 14.2 SlackBuild
 #
-# Copyright 2017, Fellype do Nascimento, Campinas - Brazil
+# Copyright 2017-2020, Fellype do Nascimento, Campinas - Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=xylib
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/xylib/xylib.info b/libraries/xylib/xylib.info
index 96cdc589f9..a38dfeafd2 100644
--- a/libraries/xylib/xylib.info
+++ b/libraries/xylib/xylib.info
@@ -1,10 +1,10 @@
 PRGNAM="xylib"
-VERSION="1.5"
+VERSION="1.6"
 HOMEPAGE="http://xylib.sourceforge.net/"
-DOWNLOAD="https://github.com/wojdyr/xylib/releases/download/v1.5/xylib-1.5.tar.bz2"
-MD5SUM="398d0e04fc50b231b5214a5196765d70"
+DOWNLOAD="https://github.com/wojdyr/xylib/releases/download/v1.6/xylib-1.6.tar.bz2"
+MD5SUM="028aa46b01180b0f9de363c691c5def4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxGTK3"
 MAINTAINER="Fellype do Nascimento"
-EMAIL="fellype(at)gmail.com"
+EMAIL="fellype (at) gmail (dot) com"
diff --git a/libraries/yder/yder.SlackBuild b/libraries/yder/yder.SlackBuild
index 55fc637cda..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.9}
+VERSION=${VERSION:-1.4.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/yder/yder.info b/libraries/yder/yder.info
index 1e1ac0079c..1e4b3e94a2 100644
--- a/libraries/yder/yder.info
+++ b/libraries/yder/yder.info
@@ -1,8 +1,8 @@
 PRGNAM="yder"
-VERSION="1.4.9"
+VERSION="1.4.13"
 HOMEPAGE="https://github.com/babelouest/yder"
-DOWNLOAD="https://github.com/babelouest/yder/archive/v1.4.9/yder-1.4.9.tar.gz"
-MD5SUM="6a07f690e1a3da88aad9bcd27736baa2"
+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 25c0798109..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-2019 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.2}
+VERSION=${VERSION:-4.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/zeromq/zeromq.info b/libraries/zeromq/zeromq.info
index 538ed317ff..02481233b5 100644
--- a/libraries/zeromq/zeromq.info
+++ b/libraries/zeromq/zeromq.info
@@ -1,8 +1,8 @@
 PRGNAM="zeromq"
-VERSION="4.3.2"
+VERSION="4.3.4"
 HOMEPAGE="http://www.zeromq.org/"
-DOWNLOAD="https://github.com/zeromq/libzmq/releases/download/v4.3.2/zeromq-4.3.2.tar.gz"
-MD5SUM="2047e917c2cc93505e2579bcba67a573"
+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/zita-alsa-pcmi/zita-alsa-pcmi.SlackBuild b/libraries/zita-alsa-pcmi/zita-alsa-pcmi.SlackBuild
index 4762c53fcc..63d21f7e45 100644
--- a/libraries/zita-alsa-pcmi/zita-alsa-pcmi.SlackBuild
+++ b/libraries/zita-alsa-pcmi/zita-alsa-pcmi.SlackBuild
@@ -2,9 +2,8 @@
 # Slackware build script for <zita-alsa-pcmi>
 # Written by Michales Michaloudes korgie@gmail.com <2014>
 
-
 PRGNAM=zita-alsa-pcmi
-VERSION=${VERSION:-0.2.0}
+VERSION=${VERSION:-0.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,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 . \
@@ -50,33 +49,26 @@ 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 {} \;
 
-# compile libraries (mandatory).
-# fix prefix, delete ldconfig
-sed -i -e 's+/usr/local+/usr+' -e '/ldconfig/d' $TMP/$PRGNAM-$VERSION/libs/Makefile
-cd $TMP/$PRGNAM-$VERSION/libs
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make
-make install DESTDIR=$PKG
-
-# compile optional demo programs (you have to compile...
-# .. twice for the library to recognized :/ )
-### sed -i -e 's+/usr/local+/usr+' $TMP/$PRGNAM-$VERSION/apps/Makefile
-### cd $TMP/$PRGNAM-$VERSION/apps
+# Thanks to ARCH Linux
+sed -e '/native/d' \
+      -e 's/ldconfig/& -N $(DESTDIR)\/$(LIBDIR)/' \
+      -i source/Makefile
+sed -e 's|\ $(BINDIR)|\ $(DESTDIR)$(BINDIR)|' apps/Makefile
 
-### CFLAGS="$SLKCFLAGS" \
-### CXXFLAGS="$SLKCFLAGS" \
-### make
-### make install DESTDIR=$PKG
+make -C source
+ln -sv lib$PRGNAM.so.$VERSION source/lib$PRGNAM.so
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -I../source" \
+LDFLAGS+=" -L../source" \
+make -C apps
+make -C source install DESTDIR=$PKG PREFIX=/usr SUFFIX="$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
 
 cd $TMP/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING INSTALL \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS 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/zita-alsa-pcmi/zita-alsa-pcmi.info b/libraries/zita-alsa-pcmi/zita-alsa-pcmi.info
index 991c7ac326..b8e98fb4a5 100644
--- a/libraries/zita-alsa-pcmi/zita-alsa-pcmi.info
+++ b/libraries/zita-alsa-pcmi/zita-alsa-pcmi.info
@@ -1,8 +1,8 @@
 PRGNAM="zita-alsa-pcmi"
-VERSION="0.2.0"
+VERSION="0.3.2"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-alsa-pcmi-0.2.0.tar.bz2"
-MD5SUM="0ba4d59abce231056e2628d081124114"
+DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-alsa-pcmi-0.3.2.tar.bz2"
+MD5SUM="1596e6b11af312e2d28ae92b10f73971"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/zita-resampler/zita-resampler.SlackBuild b/libraries/zita-resampler/zita-resampler.SlackBuild
index 4e62ce8487..77d8754859 100644
--- a/libraries/zita-resampler/zita-resampler.SlackBuild
+++ b/libraries/zita-resampler/zita-resampler.SlackBuild
@@ -3,13 +3,13 @@
 # Written by Michales Michaloudes korgie@gmail.com
 
 PRGNAM=zita-resampler
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.6.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
@@ -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"
@@ -49,36 +49,26 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# no configure file
-cd $TMP/$PRGNAM-$VERSION/libs
-sed -i -e 's+/usr/local+/usr/bin+' -e 's+^CXXFLAGS.*++' Makefile
+# Thanks to ARCH Linux
+sed -e '/native/d' \
+      -e 's/ldconfig/& -N $(DESTDIR)\/$(LIBDIR)/' \
+      -i source/Makefile
+sed -e 's|\ $(BINDIR)|\ $(DESTDIR)$(BINDIR)|' apps/Makefile
 
-SUFFIX="$LIBDIRSUFFIX" \
+make -C source
+ln -sv lib$PRGNAM.so.$VERSION source/lib$PRGNAM.so
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -Wall -ffast-math" \
-  make
+CXXFLAGS="$SLKCFLAGS -I../source" \
+LDFLAGS+=" -L../source" \
+make -C apps
+make -C source install DESTDIR=$PKG PREFIX=/usr SUFFIX="$LIBDIRSUFFIX"
 
-# copy library and header file
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-install -m 755 lib${PRGNAM}.so.${VERSION} $PKG/usr/lib${LIBDIRSUFFIX}
-cd $PKG/usr/lib${LIBDIRSUFFIX}/
-ln -s ./lib${PRGNAM}.so.${VERSION} ./lib${PRGNAM}.so
-
-cd $TMP/$PRGNAM-$VERSION/libs
-mkdir -p $PKG/usr/include/$PRGNAM
-install -m 644 $PRGNAM/*.h $PKG/usr/include/$PRGNAM/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION/
-cp -a AUTHORS COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $TMP/$PRGNAM-$VERSION/
-cp -a AUTHORS COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS 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/zita-resampler/zita-resampler.info b/libraries/zita-resampler/zita-resampler.info
index 3ec8351b63..b465132cfb 100644
--- a/libraries/zita-resampler/zita-resampler.info
+++ b/libraries/zita-resampler/zita-resampler.info
@@ -1,8 +1,8 @@
 PRGNAM="zita-resampler"
-VERSION="1.3.0"
+VERSION="1.6.2"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/zita-resampler-1.3.0.tar.bz2"
-MD5SUM="74c12e2280008f63ac9f2670fe4cf79b"
+DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-resampler-1.6.2.tar.bz2"
+MD5SUM="9b2cff7fa419febbca3a13435b2a24b3"
 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/zmusic/slack-desc b/libraries/zmusic/slack-desc
new file mode 100644
index 0000000000..73661cb029
--- /dev/null
+++ b/libraries/zmusic/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------------------------------------------------------|
+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/libraries/zziplib/zziplib.SlackBuild b/libraries/zziplib/zziplib.SlackBuild
index 44761f2555..1065cd9143 100644
--- a/libraries/zziplib/zziplib.SlackBuild
+++ b/libraries/zziplib/zziplib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for zziplib
 
-# Copyright 2012-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2012-2020 Larry Hajali <larryhaja[at]gmail[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=zziplib
-VERSION=${VERSION:-0.13.69}
+VERSION=${VERSION:-0.13.71}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/zziplib/zziplib.info b/libraries/zziplib/zziplib.info
index 5e68f8ee35..323a7ed6ad 100644
--- a/libraries/zziplib/zziplib.info
+++ b/libraries/zziplib/zziplib.info
@@ -1,10 +1,10 @@
 PRGNAM="zziplib"
-VERSION="0.13.69"
+VERSION="0.13.71"
 HOMEPAGE="http://zziplib.sourceforge.net/zzip-index.html"
-DOWNLOAD="https://github.com/gdraheim/zziplib/archive/v0.13.69/zziplib-0.13.69.tar.gz"
-MD5SUM="df52161252aa17031bca82e2fd381a14"
+DOWNLOAD="https://github.com/gdraheim/zziplib/archive/v0.13.71/zziplib-0.13.71.tar.gz"
+MD5SUM="1aa094186cf2222e4cda1b91b8fb8f60"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/misc/BISP/BISP.SlackBuild b/misc/BISP/BISP.SlackBuild
index ebe7620708..4cd53b0b66 100644
--- a/misc/BISP/BISP.SlackBuild
+++ b/misc/BISP/BISP.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Nexus Personal (BISP)
 #
-# Copyright 2009  Niklas "Nille" Åkerström
+# Copyright 2009  Niklas "Nille" Åkerström
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -32,10 +32,10 @@
 #             This was not a script to start with.
 #             Just made a guide on wiki.slackware.se that "Damaged"
 #             the Slackware install.
-# 4.10.0.x  28/Mar/2009 by Niklas "Nille" Åkerström.
+# 4.10.0.x  28/Mar/2009 by Niklas "Nille" Åkerström.
 #           * First full working Slackware buildscript.
 #             Buildscript needed "Compatlibs" from Ubuntu.
-# 4.10.0.x   11/May/2009 by Niklas "Nille" Åkerström.
+# 4.10.0.x   11/May/2009 by Niklas "Nille" Åkerström.
 #           * Corrected some rights settings in the buildscript.
 # 4.10.2.16 01/Jan/2010
 #           * Removed the "Compatlibs" and made some minor changes to the
diff --git a/misc/KeePass/KeePass.SlackBuild b/misc/KeePass/KeePass.SlackBuild
index da94a8a6ce..f47c940d85 100644
--- a/misc/KeePass/KeePass.SlackBuild
+++ b/misc/KeePass/KeePass.SlackBuild
@@ -4,7 +4,7 @@
 # Based on http://slackbuilds.org/templates/autotools-template.SlackBuild
 
 # Copyright (c) 2011, Eric B. Pratt <eric.b.pratt@gmail.com>
-#               2015-18, Shrivatsan Sampathkumar <nastavs@gmail.com>
+#               2015-20, Shrivatsan Sampathkumar <nastavs@gmail.com>
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -19,7 +19,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=KeePass
-VERSION=${VERSION:-2.44}
+VERSION=${VERSION:-2.47}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/KeePass/KeePass.info b/misc/KeePass/KeePass.info
index 6b4f983b9c..0ece240393 100644
--- a/misc/KeePass/KeePass.info
+++ b/misc/KeePass/KeePass.info
@@ -1,8 +1,8 @@
 PRGNAM="KeePass"
-VERSION="2.44"
+VERSION="2.47"
 HOMEPAGE="https://keepass.info/"
-DOWNLOAD="http://downloads.sourceforge.net/keepass/KeePass-2.44-Source.zip"
-MD5SUM="0ce384cece6c3e85e1c1e4600bb6c61a"
+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/OSCAR/OSCAR.SlackBuild b/misc/OSCAR/OSCAR.SlackBuild
index abd11023e8..eb58726ca5 100644
--- a/misc/OSCAR/OSCAR.SlackBuild
+++ b/misc/OSCAR/OSCAR.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OSCAR
 
-# Copyright 2019 Zhu, Qun-Ying
+# Copyright 2019-2020 Zhu, Qun-Ying
 # 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=OSCAR
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,7 +56,7 @@ fi
 
 set -e
 
-PRGSRC_NAME=$PRGNAM-code-v$VERSION-Release-1
+PRGSRC_NAME=$PRGNAM-code-v$VERSION
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -66,20 +66,24 @@ cd $PRGSRC_NAME
 chown -R root:root .
 mkdir build
 (cd build; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
- qmake-qt5 ../OSCAR_QT.pro; make)
+    qmake-qt5 ../OSCAR_QT.pro; make $JOBS)
 
 mkdir -p $PKG/usr/bin
 strip --strip-unneeded build/oscar/OSCAR
 cp build/oscar/OSCAR $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Htmldocs CONTRIBUTING.md README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp CONTRIBUTING.md README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/icons
+mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
 mkdir -p $PKG/usr/share/applications
-cp Installers/Linux/OSCAR.png $PKG/usr/share/icons
-cp Installers/Linux/OSCAR.desktop $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/$PRGNAM
+
+cp Building/Linux/OSCAR.png $PKG/usr/share/icons/hicolor/48x48/apps
+cp Building/Linux/OSCAR.desktop $PKG/usr/share/applications
+cp -a build/oscar/Translations $PKG/usr/share/$PRGNAM
+cp -a build/oscar/Html $PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/OSCAR/OSCAR.info b/misc/OSCAR/OSCAR.info
index 9e81784d17..756a9871bc 100644
--- a/misc/OSCAR/OSCAR.info
+++ b/misc/OSCAR/OSCAR.info
@@ -1,8 +1,8 @@
 PRGNAM="OSCAR"
-VERSION="1.0.1"
+VERSION="1.1.1"
 HOMEPAGE="https://www.sleepfiles.com/OSCAR/"
-DOWNLOAD="https://gitlab.com/pholy/OSCAR-code/-/archive/v1.0.1-Release-1/OSCAR-code-v1.0.1-Release-1.tar.bz2"
-MD5SUM="8dc05d38325e6583b30203d753168ae4"
+DOWNLOAD="https://gitlab.com/pholy/OSCAR-code/-/archive/v1.1.1/OSCAR-code-v1.1.1.tar.bz2"
+MD5SUM="8d5d315f01fdf29cf0b2fc7fb24d0f13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
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/bchunk/bchunk.SlackBuild b/misc/bchunk/bchunk.SlackBuild
index 4c0d92e133..d11133160e 100644
--- a/misc/bchunk/bchunk.SlackBuild
+++ b/misc/bchunk/bchunk.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bchunk
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/bchunk/bchunk.info b/misc/bchunk/bchunk.info
index 88bd123740..ab23e86df5 100644
--- a/misc/bchunk/bchunk.info
+++ b/misc/bchunk/bchunk.info
@@ -1,8 +1,8 @@
 PRGNAM="bchunk"
-VERSION="1.2.0"
+VERSION="1.2.2"
 HOMEPAGE="http://he.fi/bchunk/"
-DOWNLOAD="http://he.fi/bchunk/bchunk-1.2.0.tar.gz"
-MD5SUM="6a613da3f34f9a303f202d2e9731d231"
+DOWNLOAD="http://he.fi/bchunk/bchunk-1.2.2.tar.gz"
+MD5SUM="0eeb764647824062085872ddb0b28c5a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/bdfresize/bdfresize.info b/misc/bdfresize/bdfresize.info
index 629634772b..725f577dc1 100644
--- a/misc/bdfresize/bdfresize.info
+++ b/misc/bdfresize/bdfresize.info
@@ -1,7 +1,7 @@
 PRGNAM="bdfresize"
 VERSION="1.5"
 HOMEPAGE="https://directory.fsf.org/wiki/Bdfresize"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/bdfresize-1.5.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/bdfresize-1.5.tar.gz"
 MD5SUM="8169ac564fe676d53a9b4d7aad163005"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/misc/conkyforecast/README b/misc/conkyforecast/README
deleted file mode 100644
index 67c906bfe1..0000000000
--- a/misc/conkyforecast/README
+++ /dev/null
@@ -1,3 +0,0 @@
-conkyForecast is a python script created to provide weather forecast
-information to be displayed in Conky. It uses the Weather.com XOAP
-service to retrieve data for all over the world.
diff --git a/misc/conkyforecast/conkyforecast.SlackBuild b/misc/conkyforecast/conkyforecast.SlackBuild
deleted file mode 100644
index 2345848919..0000000000
--- a/misc/conkyforecast/conkyforecast.SlackBuild
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for conkyforecast
-
-# Written by M.Dinslage (daedra1980@gmail.com)
-
-PRGNAM=conkyforecast
-VERSION=${VERSION:-2.24}
-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
-mkdir -p $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz -C $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION/src
-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 {} \;
-
-# Fix font path for slackware
-sed -i 's,/usr/share/fonts/truetype/conkyforecast,/usr/share/fonts/TTF,g' setup.py
-
-python setup.py install --root=$PKG
-
-# remove font .sfd files, they shouldn't be needed
-rm -r $PKG/usr/share/fonts/TTF/*.tar.gz
-
-# Put the .otf fonts in the right place
-mkdir -p $PKG/usr/share/fonts/OTF
-mv $PKG/usr/share/fonts/TTF/*.otf $PKG/usr/share/fonts/OTF
-
-# No need to put an arch-specific dir in here; the egg info file is useless
-rm -rf $PKG/usr/lib{,64}
-
-mkdir -p $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
-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/misc/conkyforecast/conkyforecast.info b/misc/conkyforecast/conkyforecast.info
deleted file mode 100644
index f5fa39c8be..0000000000
--- a/misc/conkyforecast/conkyforecast.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="conkyforecast"
-VERSION="2.24"
-HOMEPAGE="https://launchpad.net/~conky-companions"
-DOWNLOAD="https://launchpad.net/~conky-companions/+archive/ppa/+files/conkyforecast_2.24.tar.gz"
-MD5SUM="7661233474cd6b27ea3a921a16a88a55"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="conky"
-MAINTAINER="M.Dinslage"
-EMAIL="daedra1980@gmail.com"
diff --git a/misc/conkyforecast/doinst.sh b/misc/conkyforecast/doinst.sh
deleted file mode 100644
index 8b79d8c94e..0000000000
--- a/misc/conkyforecast/doinst.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Update the X font indexes:
-if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
-    cd /usr/share/fonts/OTF
-    mkfontscale .
-    mkfontdir .
-  )
-fi
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
-fi
-
diff --git a/misc/conkyforecast/slack-desc b/misc/conkyforecast/slack-desc
deleted file mode 100644
index dd57dced9f..0000000000
--- a/misc/conkyforecast/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------------------------------------------------------|
-conkyforecast: conkyforecast (weather information display for conky)
-conkyforecast:
-conkyforecast: conkyForecast is a python script created to provide weather forecast
-conkyforecast: information to be displayed in Conky.  It uses the Weather.com XOAP
-conkyforecast: service to retrieve data for all over the world.
-conkyforecast:
-conkyforecast:
-conkyforecast:
-conkyforecast:
-conkyforecast:
-conkyforecast:
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/discount/discount.SlackBuild b/misc/discount/discount.SlackBuild
index 862e816568..ccc7aa80b3 100644
--- a/misc/discount/discount.SlackBuild
+++ b/misc/discount/discount.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for discount
 
-# Copyright 2018 Donald Cooley, South Haven, Indiana USA
+# Copyright 2018-2020 Donald Cooley, South Haven, Indiana USA
 # Copyright (c) 2011-2015, Antonio Hernández Blas <hba.nihilismus@gmail.com>
 # All rights reserved.
 #
@@ -23,7 +23,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=discount
-VERSION=${VERSION:-2.2.6}
+VERSION=${VERSION:-2.2.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -91,7 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-all-features \
   --shared
 
-make
+make -j1
 
 mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},include}
 make install.everything DESTDIR=$PKG
diff --git a/misc/discount/discount.info b/misc/discount/discount.info
index f3f8fa2fb2..f0cf9121cc 100644
--- a/misc/discount/discount.info
+++ b/misc/discount/discount.info
@@ -1,8 +1,8 @@
 PRGNAM="discount"
-VERSION="2.2.6"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-DOWNLOAD="https://github.com/Orc/discount/archive/v2.2.6/discount-2.2.6.tar.gz"
-MD5SUM="65606357127d8081a39d641fd4e87a3a"
+VERSION="2.2.7"
+HOMEPAGE="https://www.pell.portland.or.us/~orc/Code/discount/"
+DOWNLOAD="https://github.com/Orc/discount/archive/v2.2.7/discount-2.2.7.tar.gz"
+MD5SUM="c02c81bea757667fbaf0fefdf9b3749c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/discount/slack-desc b/misc/discount/slack-desc
index e2ce055ce4..6a9151d848 100644
--- a/misc/discount/slack-desc
+++ b/misc/discount/slack-desc
@@ -14,6 +14,6 @@ discount: differentiates it from any of the existing Markdown implementations
 discount: except that it's written in C instead of one of the vast flock of
 discount: scripting languages that are fighting it out for the Perl crown.
 discount:
-discount: Homepage: http://www.pell.portland.or.us/~orc/Code/discount/
+discount: Homepage: https://www.pell.portland.or.us/~orc/Code/discount/
 discount:
 discount:
diff --git a/misc/dmg2img/dmg2img.1 b/misc/dmg2img/dmg2img.1
new file mode 100644
index 0000000000..5f3ac1b777
--- /dev/null
+++ b/misc/dmg2img/dmg2img.1
@@ -0,0 +1,42 @@
+.TH "dmg2img" 1
+.SH NAME
+dmg2img \- convert compressed dmg to standard (hfsplus) image disk files
+.SH SYNOPSIS
+.B dmg2img
+[-s] [-v] [-V] [-d] <input.dmg> [<output.img>]
+.PP
+.B dmg2img
+[-s] [-v] [-V] [-d] -i <input.dmg> -o <output.img>
+.SH DESCRIPTION
+.B dmg2img
+is an Apple's compressed dmg to standard (hfsplus) image disk file conversion tool.
+.SH OPTIONS
+.TP
+.B \-i
+Path to the input .dmg file.
+.TP
+.B \-s
+Silent operation
+.TP
+.B \-v
+Verbose operation
+Try to extract key from input file.
+.TP
+.B \-V
+Extremely verbose operation
+.TP
+.B \-d
+Enable debugging.
+.TP
+.B \-o
+The output file (if left out it will be named <input_file>.img).
+.SH "SEE ALSO"
+vfdecrypt(1)
+.SH AUTHORS
+.TP
+vu1tur <to@vu1tur.eu.org>
+.TP
+Jean-Pierre Demailly <demailly@fourier.ujf-grenoble.fr>.
+.PP
+This manual page was written by Soeren Sonnenburg <sonne@debian.org>,
+for the Debian project (but may be used by others).
diff --git a/misc/dvtm/doinst.sh b/misc/dvtm/doinst.sh
new file mode 100644
index 0000000000..870a890ca1
--- /dev/null
+++ b/misc/dvtm/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/tic ]; then
+  /usr/bin/tic -s usr/share/dvtm/dvtm.info >/dev/null 2>&1
+fi
diff --git a/misc/dvtm/dvtm.SlackBuild b/misc/dvtm/dvtm.SlackBuild
index 5a37858326..2d9f870684 100644
--- a/misc/dvtm/dvtm.SlackBuild
+++ b/misc/dvtm/dvtm.SlackBuild
@@ -24,9 +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.
 
+# Modified by slackbuilds.org
+
 PRGNAM=dvtm
 VERSION=${VERSION:-0.15}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,11 +73,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 {} \;
 
+# Strip the slackware way
+sed "/@${STRIP} dvtm/d" Makefile
+
+# Fix terminfo
+sed -i "s|f22.*$|&,|" dvtm.info
+
 CFLAGS="$SLKCFLAGS" \
 LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
 make
-make install DESTDIR=$PKG PREFIX=/usr MANPREFIX=/usr/man
-# binaries are already stripped
+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
+
+# install terminfo
+install -D -m 0644 dvtm.info $PKG/usr/share/dvtm/dvtm.info
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -88,6 +104,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir $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/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/g810-led/README b/misc/g810-led/README
new file mode 100644
index 0000000000..451a0859e6
--- /dev/null
+++ b/misc/g810-led/README
@@ -0,0 +1,7 @@
+g810-led (LED controller for Logitech Gx10 keyboards)
+
+This is a configuration tool for the LEDs on Logitech Gx10 gaming
+keyboards. The LEDs can be configured in a variety of ways depending
+on the capabilities of the keyboard, including effects such as
+breathing, color-cycling, waves, individual key colors and
+intensities, and key group colors and intensities.
diff --git a/misc/g810-led/doinst.sh b/misc/g810-led/doinst.sh
new file mode 100644
index 0000000000..46961bfb1d
--- /dev/null
+++ b/misc/g810-led/doinst.sh
@@ -0,0 +1,15 @@
+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/g810-led/profile.new
+config etc/g810-led/reboot.new
diff --git a/misc/g810-led/g810-led.SlackBuild b/misc/g810-led/g810-led.SlackBuild
new file mode 100644
index 0000000000..621fbaaf3c
--- /dev/null
+++ b/misc/g810-led/g810-led.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Copyright 2020  Patrick Volkerding, Sebeka, Minnesota, 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=g810-led
+VERSION=${VERSION:-0.4.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+# Set this to anything other than "NO" to install the shared library and
+# development files. I'm not aware of anything that can make use of these
+# at this time. Also, the library will not compile on Slackware 14.2, though
+# it does compile on -current.
+DEVEL=${DEVEL:-NO}
+
+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 {} \+
+
+# Patch the following issues with the makefile:
+# - errors when systemd is not present
+# - $(DESTDIR) missing in a few places
+# - create relative, not absolute symlinks
+# - create and install the shared library with a proper soname
+# - don't install the udev rules
+patch -p1 < $CWD/g810-led.makefile.patch
+
+# Fix libdir:
+sed -i "s|libdir?=\$(PREFIX)/lib|libdir?=\$(PREFIX)/lib${LIBDIRSUFFIX}|g" makefile
+
+make bin LIB=libusb
+make install DESTDIR=$PKG
+if [ ! "$DEVEL" = "NO" ]; then
+  make lib LIB=libusb
+  make install-lib DESTDIR=$PKG
+  make install-dev DESTDIR=$PKG
+  # Fix permissions on shared library:
+  chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/libg810-led.so.*
+fi
+
+# Strip binaries:
+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
+
+# Don't clobber an existing configuration:
+mv $PKG/etc/g810-led/profile $PKG/etc/g810-led/profile.new
+mv $PKG/etc/g810-led/reboot $PKG/etc/g810-led/reboot.new
+
+# Install the udev rules manually, filtering out the part that seems broken:
+mkdir -p $PKG/lib/udev/rules.d
+cat udev/g810-led.rules | grep -v SUBSYSTEMS > $PKG/lib/udev/rules.d/g810-led.rules
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CONTRIBUTING* CONTRIBUTORS* INSTALL* LICENSE* PROFILES* README* \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/g810-led.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/g810-led.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/misc/g810-led/g810-led.info b/misc/g810-led/g810-led.info
new file mode 100644
index 0000000000..ede2cb45db
--- /dev/null
+++ b/misc/g810-led/g810-led.info
@@ -0,0 +1,10 @@
+PRGNAM="g810-led"
+VERSION="0.4.2"
+HOMEPAGE="https://github.com/MatMoul/g810-led/"
+DOWNLOAD="https://github.com/MatMoul/g810-led/archive/v0.4.2/g810-led-0.4.2.tar.gz"
+MD5SUM="6f4180a75469cd763b65fec7f1325c5f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Patrick Volkerding"
+EMAIL="volkerdi@slackware.com"
diff --git a/misc/g810-led/g810-led.makefile.patch b/misc/g810-led/g810-led.makefile.patch
new file mode 100644
index 0000000000..e973edb080
--- /dev/null
+++ b/misc/g810-led/g810-led.makefile.patch
@@ -0,0 +1,82 @@
+--- ./makefile.orig	2020-05-19 16:44:50.000000000 -0500
++++ ./makefile	2020-10-23 15:49:08.155992793 -0500
+@@ -39,8 +39,9 @@
+ 
+ lib/lib$(PROGN).so: $(LIBSRCS)
+ 	@mkdir -p lib
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LIBS)
+-	@ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so
++	@$(CXX) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so.$(MAJOR) -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LIBS)
++	@ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so.$(MAJOR)
++	@ln -sf lib$(PROGN).so.$(MAJOR) lib/lib$(PROGN).so
+ 
+ bin-linked: lib/lib$(PROGN).so
+ 	@mkdir -p bin
+@@ -56,42 +57,43 @@
+ 	@install -m 755 -d \
+ 		$(DESTDIR)/usr/bin \
+ 		$(DESTDIR)/etc/$(PROGN)/samples \
+-		$(DESTDIR)/etc/udev/rules.d
++#		$(DESTDIR)/etc/udev/rules.d
+ 	@cp bin/$(PROGN) $(DESTDIR)/usr/bin
+-	@test -s $(DESTDIR)/usr/bin/g213-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g213-led
+-	@test -s $(DESTDIR)/usr/bin/g410-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g410-led
+-	@test -s $(DESTDIR)/usr/bin/g413-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g413-led
+-	@test -s $(DESTDIR)/usr/bin/g512-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g512-led
+-	@test -s $(DESTDIR)/usr/bin/g513-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g513-led
+-	@test -s $(DESTDIR)/usr/bin/g610-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g610-led
+-	@test -s $(DESTDIR)/usr/bin/g815-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g815-led
+-	@test -s $(DESTDIR)/usr/bin/g910-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/g910-led
+-	@test -s $(DESTDIR)/usr/bin/gpro-led || ln -s /usr/bin/$(PROGN) $(DESTDIR)/usr/bin/gpro-led
++	@test -s $(DESTDIR)/usr/bin/g213-led || ln -s $(PROGN) $(DESTDIR)/usr/bin/g213-led
++	@test -s $(DESTDIR)/usr/bin/g410-led || ln -s $(PROGN) $(DESTDIR)/usr/bin/g410-led
++	@test -s $(DESTDIR)/usr/bin/g413-led || ln -s $(PROGN) $(DESTDIR)/usr/bin/g413-led
++	@test -s $(DESTDIR)/usr/bin/g512-led || ln -s $(PROGN) $(DESTDIR)/usr/bin/g512-led
++	@test -s $(DESTDIR)/usr/bin/g513-led || ln -s $(PROGN) $(DESTDIR)/usr/bin/g513-led
++	@test -s $(DESTDIR)/usr/bin/g610-led || ln -s $(PROGN) $(DESTDIR)/usr/bin/g610-led
++	@test -s $(DESTDIR)/usr/bin/g815-led || ln -s $(PROGN) $(DESTDIR)/usr/bin/g815-led
++	@test -s $(DESTDIR)/usr/bin/g910-led || ln -s $(PROGN) $(DESTDIR)/usr/bin/g910-led
++	@test -s $(DESTDIR)/usr/bin/gpro-led || ln -s $(PROGN) $(DESTDIR)/usr/bin/gpro-led
+ 	@cp sample_profiles/* $(DESTDIR)/etc/$(PROGN)/samples
+-	@cp udev/$(PROGN).rules $(DESTDIR)/etc/udev/rules.d
+-	@test -s /usr/bin/systemd-run && \
+-		install -m 755 -d $(DESTDIR)$(SYSTEMDDIR)/system && \
+-		cp systemd/$(PROGN)-reboot.service $(DESTDIR)$(SYSTEMDDIR)/system
++#	@cp udev/$(PROGN).rules $(DESTDIR)/etc/udev/rules.d
++#	@test -s /usr/bin/systemd-run && \
++#		install -m 755 -d $(DESTDIR)$(SYSTEMDDIR)/system && \
++#		cp systemd/$(PROGN)-reboot.service $(DESTDIR)$(SYSTEMDDIR)/system
+ 
+ install-lib: lib
+ 	@install -m 755 -d $(libdir)
+ 	@install -m 644 lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $(libdir)/
+-	@ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $(libdir)/lib$(PROGN).so
++	@ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $(libdir)/lib$(PROGN).so.$(MAJOR)
++	@ln -sf lib$(PROGN).so.$(MAJOR) $(libdir)/lib$(PROGN).so
+ 
+ install-dev: install-lib
+ 	@mkdir -p $(includedir)/$(PROGN)/
+ 	@install -m 644 src/classes/*.h $(includedir)/$(PROGN)
+ 
+ install: setup
+-	@test -s /etc/$(PROGN)/profile || \
+-		cp /etc/$(PROGN)/samples/group_keys /etc/$(PROGN)/profile
+-	@test -s /etc/$(PROGN)/reboot || \
+-		cp /etc/$(PROGN)/samples/all_off /etc/$(PROGN)/reboot
+-	@udevadm control --reload-rules
+-	@$(PROGN) -p /etc/$(PROGN)/profile
+-	@test -s /usr/bin/systemd-run && \
+-		systemctl daemon-reload && \
+-		systemctl enable $(PROGN)-reboot
++	@test -s $(DESTDIR)/etc/$(PROGN)/profile || \
++		cp $(DESTDIR)/etc/$(PROGN)/samples/group_keys $(DESTDIR)/etc/$(PROGN)/profile
++	@test -s $(DESTDIR)/etc/$(PROGN)/reboot || \
++		cp $(DESTDIR)/etc/$(PROGN)/samples/all_off $(DESTDIR)/etc/$(PROGN)/reboot
++#	@udevadm control --reload-rules
++#	@$(PROGN) -p /etc/$(PROGN)/profile
++#	@test -s /usr/bin/systemd-run && \
++#		systemctl daemon-reload && \
++#		systemctl enable $(PROGN)-reboot
+ 
+ uninstall-lib:
+ 	@rm -f $(libdir)/lib$(PROGN).so*
diff --git a/misc/g810-led/slack-desc b/misc/g810-led/slack-desc
new file mode 100644
index 0000000000..7616e91553
--- /dev/null
+++ b/misc/g810-led/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------------------------------------------------------|
+g810-led: g810-led (LED controller for Logitech Gx10 keyboards)
+g810-led:
+g810-led: This is a configuration tool for the LEDs on Logitech Gx10 gaming
+g810-led: keyboards. The LEDs can be configured in a variety of ways depending
+g810-led: on the capabilities of the keyboard, including effects such as
+g810-led: breathing, color-cycling, waves, individual key colors and
+g810-led: intensities, and key group colors and intensities.
+g810-led:
+g810-led: Homepage: https://github.com/MatMoul/g810-led/
+g810-led:
+g810-led:
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 023129d51a..26cf227cd7 100644
--- a/misc/ghostpcl/ghostpcl.SlackBuild
+++ b/misc/ghostpcl/ghostpcl.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=ghostpcl
 SRCNAM=ghostpdl
-VERSION=${VERSION:-9.52}
+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 0238cef99b..d4d566c5b8 100644
--- a/misc/ghostpcl/ghostpcl.info
+++ b/misc/ghostpcl/ghostpcl.info
@@ -1,8 +1,8 @@
 PRGNAM="ghostpcl"
-VERSION="9.52"
+VERSION="9.54.0"
 HOMEPAGE="https://www.ghostscript.com"
-DOWNLOAD="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/ghostpdl-9.52.tar.gz"
-MD5SUM="f45c5896d22285f8a00ce506998b43d9"
+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/goldencheetah/GoldenCheetah.desktop b/misc/goldencheetah/GoldenCheetah.desktop
new file mode 100644
index 0000000000..7217806afe
--- /dev/null
+++ b/misc/goldencheetah/GoldenCheetah.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=GoldenCheetah
+Icon=GoldenCheetah
+Exec=GoldenCheetah
+Terminal=false
+Comment=Cycling power analysis software
+Keywords=Cycling;Training;Bike;Ride;Power;
+Categories=Qt;Education;Sports;DataVisualization;Maps;
diff --git a/misc/goldencheetah/doinst.sh b/misc/goldencheetah/doinst.sh
new file mode 100644
index 0000000000..4a25de5e6f
--- /dev/null
+++ b/misc/goldencheetah/doinst.sh
@@ -0,0 +1,10 @@
+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/misc/goldencheetah/goldencheetah.SlackBuild b/misc/goldencheetah/goldencheetah.SlackBuild
index 28ad3ec29f..a3dec7778e 100644
--- a/misc/goldencheetah/goldencheetah.SlackBuild
+++ b/misc/goldencheetah/goldencheetah.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=goldencheetah
 SRCNAM=GoldenCheetah
 VERSION=${VERSION:-3.5}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -108,12 +108,24 @@ make
 install -D -m0755 -s src/GoldenCheetah $PKG/usr/bin/GoldenCheetah
 install -D -m0644 src/Resources/linux/51-garmin-usb.rules $PKG/lib/udev/rules.d/51-garmin-usb.rules
 
+# Generate desktop icon set
+convert -size 512x512 xc:none -fill white -draw "roundrectangle 15,16 487,486 52,52" \
+  src/Resources/images/gc.png -compose Over -composite -crop 475x473+14+15\! logo.png
+for RES in 16 22 24 32 48 64 128 256 512; do
+  mkdir -p $PKG/usr/share/icons/hicolor/${RES}x${RES}/apps
+  convert logo.png -resize ${RES}x${RES}\! $PKG/usr/share/icons/hicolor/${RES}x${RES}/apps/GoldenCheetah.png
+done
+
+mkdir -p $PKG/usr/share/applications
+cp $CWD/GoldenCheetah.desktop $PKG/usr/share/applications/
+
 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
 
 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/misc/grc/grc.SlackBuild b/misc/grc/grc.SlackBuild
index 7fba5531c2..13ba2526d8 100644
--- a/misc/grc/grc.SlackBuild
+++ b/misc/grc/grc.SlackBuild
@@ -2,7 +2,8 @@
 #
 # Slackware build script for grc.
 #
-# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2020 Ricardo J. Barberis <ricardo.barberis@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/misc/grc/grc.info b/misc/grc/grc.info
index 979aa67782..9c3b9c962f 100644
--- a/misc/grc/grc.info
+++ b/misc/grc/grc.info
@@ -6,5 +6,5 @@ MD5SUM="17f9a0b014c771b9e4cd060113309073"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
+MAINTAINER="Ricardo J. Barberis"
+EMAIL="ricardo.barberis@gmail.com"
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/html-xml-utils/README b/misc/html-xml-utils/README
index e5d8b61b92..65a1ea27cd 100644
--- a/misc/html-xml-utils/README
+++ b/misc/html-xml-utils/README
@@ -1,3 +1,3 @@
 html-xml-utils provides command-line tools for manipulating, examining,
 and parsing HTML and XML documents.  It is produced by the World Wide
-Web COnsortium (W3C).
\ No newline at end of file
+Web Consortium (W3C).
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 a9d22610d7..ec0b29cd92 100644
--- a/misc/jmri/jmri.SlackBuild
+++ b/misc/jmri/jmri.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for JMRI
 
 # Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
-# Copyright 2016-2018 Heiko Rosemann, Germany
+# Copyright 2016-2020 Heiko Rosemann, Germany
 
 # All rights reserved.
 #
@@ -25,8 +25,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jmri
-VERSION=${VERSION:-4.18}
-REVISION=${REVISION:-R37ad3d0}
+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 314a14f3b4..e2fb872b9b 100644
--- a/misc/jmri/jmri.info
+++ b/misc/jmri/jmri.info
@@ -1,8 +1,8 @@
 PRGNAM="jmri"
-VERSION="4.18"
+VERSION="4.22"
 HOMEPAGE="http://jmri.org/"
-DOWNLOAD="https://github.com/JMRI/JMRI/releases/download/v4.18/JMRI.4.18+R37ad3d0.tgz"
-MD5SUM="f14a2affe383eb0d2ff0ac0099c2d054"
+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/keychain/keychain.SlackBuild b/misc/keychain/keychain.SlackBuild
index b5152a3319..e0bcf158c0 100644
--- a/misc/keychain/keychain.SlackBuild
+++ b/misc/keychain/keychain.SlackBuild
@@ -2,7 +2,7 @@
 # Slackware build script for keychain
 
 # Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
-# Copyright 2014-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2020 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -21,13 +21,13 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=keychain
-VERSION=${VERSION:-2.8.3}
+VERSION=${VERSION:-2.8.5}
 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,7 +44,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.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -58,7 +58,7 @@ sed -i 's|:/usr/ucb||' $PRGNAM
 
 mkdir -p $PKG/usr/bin $PKG/usr/man/man1
 install -m 755 $PRGNAM $PKG/usr/bin
-cat keychain.1 > $PKG/usr/man/man1/keychain.1
+install -m 644 keychain.1 $PKG/usr/man/man1/keychain.1
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
diff --git a/misc/keychain/keychain.info b/misc/keychain/keychain.info
index 5713764d6d..2cf6186e11 100644
--- a/misc/keychain/keychain.info
+++ b/misc/keychain/keychain.info
@@ -1,8 +1,8 @@
 PRGNAM="keychain"
-VERSION="2.8.3"
-HOMEPAGE="https://www.funtoo.org/index.php?title=Keychain"
-DOWNLOAD="https://www.funtoo.org/archive/keychain/keychain-2.8.3.tar.bz2"
-MD5SUM="bdf70a69b8b2208664cfcd4a8e42523b"
+VERSION="2.8.5"
+HOMEPAGE="https://www.funtoo.org/Keychain"
+DOWNLOAD="https://github.com/funtoo/keychain/archive/2.8.5/keychain-2.8.5.tar.gz"
+MD5SUM="b08ead19dc71c91e0ded2976e707b340"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/linux_logo/linux_logo.SlackBuild b/misc/linux_logo/linux_logo.SlackBuild
index bbcc37aa6b..48e6e9434b 100644
--- a/misc/linux_logo/linux_logo.SlackBuild
+++ b/misc/linux_logo/linux_logo.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for linux_logo
 
 # Copyright 2007, 2008  Steve Kennedy <steve@gnomeslackbuild.org>
+# Copyright 2019-2020  Gregory J. L. Tourte <artourter@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=linux_logo
-VERSION=${VERSION:-5.11}
+VERSION=${VERSION:-6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,10 +65,10 @@ 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
 
 #force to accept our CFLAGS
 sed -i "s|CFLAGS=\"|CFLAGS+=\" |" configure
@@ -77,7 +78,7 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr
 
-make
+make logos-all
 make install PREFIX=$PKG/usr
 
 ( cd $PKG/usr ; mv share/man . )
@@ -86,9 +87,9 @@ 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 ANNOUNCE.logo README.CUSTOM_LOGOS BUGS README.SECURITY \
-  CHANGES README.history CHANGES_IN_5.0 TODO COPYING USAGE \
-  LINUX_LOGO.FAQ README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUGS CHANGES CHANGES_IN_6.0 COPYING LINUX_LOGO.FAQ README \
+  README.CUSTOM_LOGOS  README.SECURITY  README.history  RELEASE_PROCEDURE \
+  TODO USAGE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/linux_logo/linux_logo.info b/misc/linux_logo/linux_logo.info
index be8badbfb7..4bc174c8e8 100644
--- a/misc/linux_logo/linux_logo.info
+++ b/misc/linux_logo/linux_logo.info
@@ -1,8 +1,8 @@
 PRGNAM="linux_logo"
-VERSION="5.11"
+VERSION="6.0"
 HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-DOWNLOAD="http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-5.11.tar.gz"
-MD5SUM="8e52af520368980ceba978330881e36e"
+DOWNLOAD="http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-6.0.tar.gz"
+MD5SUM="9992285b9b8483c65350f338340ea3d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/moreutils/README b/misc/moreutils/README
index 793048affb..3a234765a3 100644
--- a/misc/moreutils/README
+++ b/misc/moreutils/README
@@ -1,4 +1,10 @@
 moreutils is a growing collection of the unix tools that nobody
 thought to write long ago when unix was young.
 
-This package conflicts with system/parallel.
+perl-IPC-Run is an optional dependency, if it's missing chronic will
+not be installed.
+
+This package conflicts with system/parallel so moreutils version of
+parallel is not installed by default. To install it:
+
+  PARALLEL=yes ./moreutils.SlackBuild
diff --git a/misc/moreutils/moreutils.SlackBuild b/misc/moreutils/moreutils.SlackBuild
index 077644d309..6fd209996c 100644
--- a/misc/moreutils/moreutils.SlackBuild
+++ b/misc/moreutils/moreutils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for moreutils
 
-# Copyright 2015-2016 Arkadiusz Drabczyk <arkadiusz@drabczyk.org>
+# Copyright 2015-2020 Arkadiusz Drabczyk <arkadiusz@drabczyk.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=moreutils
-VERSION=${VERSION:-0.63}
+VERSION=${VERSION:-0.64}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,6 +77,14 @@ mkdir $PKG/usr/man
 mv $PKG/usr/share/man/* $PKG/usr/man
 rm -rf $PKG/usr/share/ $PKG/usr/man/man1/ts.1
 
+if [ "${PARALLEL:-yes}" = "no" ]; then
+  rm -f $PKG/usr/bin/parallel $PKG/usr/man/man1/parallel.1
+fi
+
+if ! perl -MIPC::Run -e 1 2>/dev/null; then
+  rm -f $PKG/usr/bin/chronic $PKG/usr/man/man1/chronic.1
+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/misc/moreutils/moreutils.info b/misc/moreutils/moreutils.info
index aee85fab27..8d31108f60 100644
--- a/misc/moreutils/moreutils.info
+++ b/misc/moreutils/moreutils.info
@@ -1,10 +1,10 @@
 PRGNAM="moreutils"
-VERSION="0.63"
+VERSION="0.64"
 HOMEPAGE="https://joeyh.name/code/moreutils"
-DOWNLOAD="http://drabczyk.org/moreutils-0.63.tar.gz"
-MD5SUM="0af12becbed31dc5d57c4a880ef398fc"
+DOWNLOAD="http://distfiles.gentoo.org/distfiles/moreutils-0.64.tar.gz"
+MD5SUM="a02be0dd938c3fefbb2aa2761e59e7d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-IPC-Run"
+REQUIRES=""
 MAINTAINER="Arkadiusz Drabczyk"
 EMAIL="arkadiusz@drabczyk.org"
diff --git a/misc/mosquitto/mosquitto.SlackBuild b/misc/mosquitto/mosquitto.SlackBuild
index ffab10959f..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.9}
+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 6e12fe8cff..b4ea0ace2a 100644
--- a/misc/mosquitto/mosquitto.info
+++ b/misc/mosquitto/mosquitto.info
@@ -1,8 +1,8 @@
 PRGNAM="mosquitto"
-VERSION="1.6.9"
+VERSION="2.0.10"
 HOMEPAGE="https://mosquitto.org/"
-DOWNLOAD="https://mosquitto.org/files/source/mosquitto-1.6.9.tar.gz"
-MD5SUM="52f5078ec18aaf623b14dfb121fd534b"
+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/par/default_env.diff b/misc/par/default_env.diff
new file mode 100644
index 0000000000..c34ab4d95c
--- /dev/null
+++ b/misc/par/default_env.diff
@@ -0,0 +1,11 @@
+diff -Naur Par-1.53.0/par.c Par-1.53.0.patched/par.c
+--- Par-1.53.0/par.c	2020-03-14 21:01:03.000000000 -0400
++++ Par-1.53.0.patched/par.c	2020-06-22 19:46:25.353559989 -0400
+@@ -762,6 +762,7 @@
+   if (*errmsg) goto parcleanup;
+ 
+   env = getenv("PARINIT");
++  if (!env) env = "rTbgqR B=.,?'_A_a_@ Q=_s>|";
+   if (env) {
+     parinit = malloc((strlen(env) + 1) * sizeof (char));
+     if (!parinit) {
diff --git a/misc/par/par.SlackBuild b/misc/par/par.SlackBuild
index 334254bb06..f7b1c7f736 100644
--- a/misc/par/par.SlackBuild
+++ b/misc/par/par.SlackBuild
@@ -3,16 +3,25 @@
 # Slackware build script for par
 # Written by slakmagik <slakmagik@gmail.com>
 # Released under the WTFPL
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# 20200622 bkw:
+# - Update for v1.53 (after *19 years*)
+# - Correctly rm the source dir from previous runs
+# - Fix mode 0700 top-level source dir (it's annoying)
+# - i486 => i586
+# - various tweaks
+# - add default_env patch (see below)
 
 PRGNAM=par
-VERSION=${VERSION:-1.52}
-SRCNAM=Par152
+SRCNAM=Par
+VERSION=${VERSION:-1.53.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
@@ -23,8 +32,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"
@@ -42,33 +51,36 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM.tar.gz
-cd $SRCNAM
+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 600 -o -perm 444 -o -perm 440 \
-  -o -perm 400 \) -exec chmod 644 {} \;
+# please don't revert this to template:
+chmod 755 .
+chmod 644 *
+
+# 20200622 bkw: the man page says to:
+# $ export PARINIT="rTbgqR B=.,?'_A_a_@ Q=_s>|"
+# before running. This one-line patch just makes that the default, if
+# the PARINIT variable isn't set. This sets a reasonable default so
+# users don't have to diddle their startup files.
+[ "${PRISTINE:-no}" = "no" ] && patch -p1 < $CWD/default_env.diff
 
-make -f protoMakefile CC="cc -c" LINK1="cc" LINK2="-o" RM="rm" JUNK=""
+make -f protoMakefile CFLAGS="$SLKCFLAGS"
 mkdir -p $PKG/usr/bin
-install par $PKG/usr/bin
+install -m0755 -s $PRGNAM $PKG/usr/bin
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF |
-  cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# rename ".doc" so nothing thinks it's a word document.
+mv $PRGNAM.doc $PRGNAM.txt
+sed -i "s/$PRGNAM\.doc/$PRGNAM.txt/g" $PRGNAM.txt $PRGNAM.1
 
 mkdir -p $PKG/usr/man/man1
-# make the manual reflect a filename change which will be made below
-sed 's/par\.doc/par.txt/g' par.1 | gzip -c > $PKG/usr/man/man1/par.1.gz
+gzip -9c $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-# change the filename (and its references to itself) to avoid tripping up
-# extension sniffers
-sed 's/par\.doc/par.txt/g' par.doc > $PKG/usr/doc/$PRGNAM-$VERSION/par.txt
-cat releasenotes > $PKG/usr/doc/$PRGNAM-$VERSION/releasenotes
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a $PRGNAM.txt releasenotes $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/par/par.info b/misc/par/par.info
index 254334f841..575b3ed9bb 100644
--- a/misc/par/par.info
+++ b/misc/par/par.info
@@ -1,10 +1,10 @@
 PRGNAM="par"
-VERSION="1.52"
+VERSION="1.53.0"
 HOMEPAGE="http://www.nicemice.net/par/"
-DOWNLOAD="http://ftp.netbsd.org/pub/pkgsrc/distfiles/Par152.tar.gz"
-MD5SUM="4ccacd824171ba2c2f14fb8aba78b9bf"
+DOWNLOAD="http://www.nicemice.net/par/Par-1.53.0.tar.gz"
+MD5SUM="5e0f8beb45fbd967df538125fb760ad0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="slakmagik"
-EMAIL="slakmagik@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
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/pinfo/pinfo.SlackBuild b/misc/pinfo/pinfo.SlackBuild
index 868bf1c597..5b318d1b5a 100644
--- a/misc/pinfo/pinfo.SlackBuild
+++ b/misc/pinfo/pinfo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pinfo
 
-# Copyright 2009 Arun Prasannan - http://arunprasannan.com
+# Copyright 2009 Arun Prasannan - <URL removed>
 # All rights reserved.
 #
 # Now maintained by B. Watson <yalhcru@gmail.com>.
@@ -24,6 +24,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200708 bkw: BUILD=2
+# - restore old 'pman' link (nothing conflicts)
+# - fix homepage in slack-desc
+
 # 20191221 bkw:
 # - take over maintenance.
 # - upgrade for v0.6.13... though if you really need to, you can still
@@ -33,7 +37,7 @@
 
 PRGNAM=pinfo
 VERSION=${VERSION:-0.6.13}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -97,6 +101,11 @@ rm -f $PKG/usr/info/dir
 # Let's not clobber the config file
 mv $PKG/etc/pinforc $PKG/etc/pinforc.new
 
+# Upstream removed this as it conflicted with something on his system.
+# It doesn't conflict with ours.
+ln -s $PRGNAM $PKG/usr/bin/pman
+ln -s $PRGNAM.1.gz $PKG/usr/man/man1/pman.1.gz
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS Change[lL]og* COPYING NEWS README* TECHSTUFF \
     $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/misc/pinfo/slack-desc b/misc/pinfo/slack-desc
index 989606848e..be3e7b2498 100644
--- a/misc/pinfo/slack-desc
+++ b/misc/pinfo/slack-desc
@@ -15,5 +15,5 @@ pinfo:
 pinfo: Pinfo is similar in use to lynx. It has similar key movements, and
 pinfo: gives similar intuition.
 pinfo:
-pinfo: Homepage: https://alioth-archive.debian.org/releases/pinfo/pinfo/
+pinfo: Homepage: https://github.com/baszoetekouw/pinfo
 pinfo:
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 2ba307a511..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.11.4}
+VERSION=${VERSION:-3.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/protobuf3/protobuf3.info b/misc/protobuf3/protobuf3.info
index 8e1aa1d1a0..f6b32b675c 100644
--- a/misc/protobuf3/protobuf3.info
+++ b/misc/protobuf3/protobuf3.info
@@ -1,8 +1,8 @@
 PRGNAM="protobuf3"
-VERSION="3.11.4"
+VERSION="3.14.0"
 HOMEPAGE="https://github.com/google/protobuf"
-DOWNLOAD="https://github.com/google/protobuf/archive/v3.11.4/protobuf-3.11.4.tar.gz"
-MD5SUM="9b649590a4b74e93024ea3a28c0d3a22"
+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/qtkeychain/qtkeychain.SlackBuild b/misc/qtkeychain/qtkeychain.SlackBuild
index f44a2d9be0..a56078d4bc 100644
--- a/misc/qtkeychain/qtkeychain.SlackBuild
+++ b/misc/qtkeychain/qtkeychain.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for qtkeychain
 
 # Copyright 2014 Donald Cooley La Porte, IN USA
-# Copyright 2016-2018 Donald Cooley South Haven, IN USA
+# Copyright 2016-2020 Donald Cooley South Haven, IN 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=qtkeychain
-VERSION=${VERSION:-0.9.1}
+VERSION=${VERSION:-0.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/qtkeychain/qtkeychain.info b/misc/qtkeychain/qtkeychain.info
index dce0b15151..122ee046de 100644
--- a/misc/qtkeychain/qtkeychain.info
+++ b/misc/qtkeychain/qtkeychain.info
@@ -1,8 +1,8 @@
 PRGNAM="qtkeychain"
-VERSION="0.9.1"
+VERSION="0.10.0"
 HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-DOWNLOAD="https://github.com/frankosterfeld/qtkeychain/archive/v0.9.1/qtkeychain-0.9.1.tar.gz"
-MD5SUM="e6921de6f256259784f2a9edd1eeb8f5"
+DOWNLOAD="https://github.com/frankosterfeld/qtkeychain/archive/v0.10.0/qtkeychain-0.10.0.tar.gz"
+MD5SUM="00856441d995146b11fb8cfab87b8bc6"
 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/slop/slack-desc b/misc/slop/slack-desc
index fa52a345e4..1daa3f13f9 100644
--- a/misc/slop/slack-desc
+++ b/misc/slop/slack-desc
@@ -8,12 +8,12 @@
     |-----handy-ruler------------------------------------------------------|
 slop: slop (selection query)
 slop:
-slop:
 slop: slop (Select Operation) is an application that
 slop: queries for a selection from the user
 slop: and prints the region to stdout.
 slop:
-slop:
 slop: https://github.com/naelstrof/slop
 slop:
 slop:
+slop:
+slop:
diff --git a/misc/slop/slop.SlackBuild b/misc/slop/slop.SlackBuild
index 43bbfdfff2..693962d3c0 100644
--- a/misc/slop/slop.SlackBuild
+++ b/misc/slop/slop.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slop
-VERSION=${VERSION:-7.4}
+VERSION=${VERSION:-7.5}
 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.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,16 +71,15 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cmake ./
-  make
-  make install DESTDIR=$PKG
+make
+make install DESTDIR=$PKG
+
+mv $PKG/usr/share/man $PKG/usr
+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
 
-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
 cp -a COPYING README.md license.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/misc/slop/slop.info b/misc/slop/slop.info
index 570065b473..ea090f1564 100644
--- a/misc/slop/slop.info
+++ b/misc/slop/slop.info
@@ -1,8 +1,8 @@
 PRGNAM="slop"
-VERSION="7.4"
+VERSION="7.5"
 HOMEPAGE="https://github.com/naelstrof/slop"
-DOWNLOAD="https://github.com/naelstrof/slop/archive/v7.4/slop-7.4.tar.gz"
-MD5SUM="cdf2369c033778a90c7518e357b5a92a"
+DOWNLOAD="https://github.com/naelstrof/slop/archive/v7.5/slop-7.5.tar.gz"
+MD5SUM="d8ba3c332f801f19c2bd66014d79e988"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="glm"
diff --git a/misc/subsurface/libgit2-version.patch b/misc/subsurface/libgit2-version.patch
new file mode 100644
index 0000000000..76878e4a86
--- /dev/null
+++ b/misc/subsurface/libgit2-version.patch
@@ -0,0 +1,54 @@
+commit 67a717dc057a5936ae1f5820fc6c470524213b97
+Author: Dirk Hohndel <dirk@hohndel.org>
+Date:   Thu Apr 9 16:59:12 2020 -0700
+
+    cleanup: remove support for ancient versions of libgit2
+    
+    We require a minimum of libgit2 0.26.
+    
+    Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
+
+diff --git a/INSTALL b/INSTALL
+index 52b05cf2b..321c6cef0 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -97,7 +97,7 @@ Other third party library dependencies
+ --------------------------------------
+ 
+ In order for our cloud storage to be fully functional you need
+-libgit2 0.23 or newer.
++libgit2 0.26 or newer.
+ 
+ 
+ cmake build system
+diff --git a/core/git-access.c b/core/git-access.c
+index 3688cb90c..982a51cfd 100644
+--- a/core/git-access.c
++++ b/core/git-access.c
+@@ -359,11 +359,7 @@ static int try_to_git_merge(git_repository *repo, git_reference **local_p, git_r
+ 	}
+ 
+ 	git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION);
+-#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR > 23
+ 	merge_options.flags = GIT_MERGE_FIND_RENAMES;
+-#else
+-	merge_options.tree_flags = GIT_MERGE_TREE_FIND_RENAMES;
+-#endif
+ 	merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION;
+ 	merge_options.rename_threshold = 100;
+ 	if (git_commit_lookup(&local_commit, repo, local_id)) {
+diff --git a/core/save-git.c b/core/save-git.c
+index a304e0d94..7bf7b2e1d 100644
+--- a/core/save-git.c
++++ b/core/save-git.c
+@@ -1022,10 +1022,8 @@ int update_git_checkout(git_repository *repo, git_object *parent, git_tree *tree
+ 
+ static int get_authorship(git_repository *repo, git_signature **authorp)
+ {
+-#if LIBGIT2_VER_MAJOR || LIBGIT2_VER_MINOR >= 20
+ 	if (git_signature_default(authorp, repo) == 0)
+ 		return 0;
+-#endif
+ 	/* try to fetch the user info from the OS, otherwise use default values. */
+ 	struct user_info user = { .name = NULL, .email = NULL };
+ 	subsurface_user_info(&user);
diff --git a/misc/subsurface/subsurface.SlackBuild b/misc/subsurface/subsurface.SlackBuild
index c0d02297a3..8242455158 100644
--- a/misc/subsurface/subsurface.SlackBuild
+++ b/misc/subsurface/subsurface.SlackBuild
@@ -73,6 +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 {} \;
 
+# Fix building against newer versions of libgit2
+patch -p1 < $CWD/libgit2-version.patch
+
 # Ugly hack to avoid header collision between grantlee and grantlee-qt5.
 # https://mail.kde.org/pipermail/release-team/2015-August/008911.html
 sed -i 's|#include <grantlee_templates.h>|#include "grantlee_templates_local.h"|' \
diff --git a/misc/tidyp/README b/misc/tidyp/README
index 47a2f01b4a..c68cb19527 100644
--- a/misc/tidyp/README
+++ b/misc/tidyp/README
@@ -1,3 +1,4 @@
-This module provides HTML and XHTML validations a fork of tidy on SourceForge
-at http://tidy.sf.net. The library name is "tidyp", and the command-line tool
-is also "tidyp" but all internal API stays the same..
+This module provides HTML and XHTML validations a fork of tidy on
+SourceForge at http://tidy.sf.net. The library name is "tidyp", and
+the command-line tool is also "tidyp", but all internal APIs stay the
+same.
diff --git a/misc/tidyp/slack-desc b/misc/tidyp/slack-desc
index b6144485eb..29599cd912 100644
--- a/misc/tidyp/slack-desc
+++ b/misc/tidyp/slack-desc
@@ -11,7 +11,7 @@ tidyp:
 tidyp: tidyp is a fork of tidy on SourceForge at http://tidy.sf.net.
 tidyp: The library name is "tidyp", and the command-line tool is also
 tidyp: "tidyp" but all internal API stays the same.
-tidyp: 
+tidyp:
 tidyp: Homepage: https://metacpan.org/pod/HTML-Tidy
 tidyp:
 tidyp:
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/misc/xbanish/xbanish.SlackBuild b/misc/xbanish/xbanish.SlackBuild
index bcefc8e187..d0a11d5ca4 100644
--- a/misc/xbanish/xbanish.SlackBuild
+++ b/misc/xbanish/xbanish.SlackBuild
@@ -28,6 +28,7 @@
 
 # Build script for xbanish
 
+# 20200720 bkw: update for v1.7
 # 20200129 bkw:
 # - take over maintenance
 # - update for v1.6
@@ -35,7 +36,7 @@
 # - use proper github download URL
 
 PRGNAM=xbanish
-VERSION=${VERSION:-1.6}
+VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/xbanish/xbanish.info b/misc/xbanish/xbanish.info
index c66d7e7a15..2a4b8bdfdd 100644
--- a/misc/xbanish/xbanish.info
+++ b/misc/xbanish/xbanish.info
@@ -1,8 +1,8 @@
 PRGNAM="xbanish"
-VERSION="1.6"
+VERSION="1.7"
 HOMEPAGE="https://github.com/jcs/xbanish"
-DOWNLOAD="https://github.com/jcs/xbanish/archive/v1.6/xbanish-1.6.tar.gz"
-MD5SUM="dc1320b6eee1e3e5eb008554bbeb060f"
+DOWNLOAD="https://github.com/jcs/xbanish/archive/v1.7/xbanish-1.7.tar.gz"
+MD5SUM="08c0702576d6b2434f62ba06e1a3a32d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/xca/doinst.sh b/misc/xca/doinst.sh
new file mode 100644
index 0000000000..39ec34e32e
--- /dev/null
+++ b/misc/xca/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 [ -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/misc/xca/xca.SlackBuild b/misc/xca/xca.SlackBuild
index 15387ae802..88e104b191 100644
--- a/misc/xca/xca.SlackBuild
+++ b/misc/xca/xca.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xca
 
-# Copyright 2014-2019 Kent Fritz, Mountain View, CA
+# Copyright 2014-2020 Kent Fritz, Mountain View, CA
 # 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=xca
-VERSION=${VERSION:-2.1.2}
+VERSION=${VERSION:-2.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,26 +69,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 {} \;
 
-sed -i \
-  -e 's/LIBS="\${LIBS} \${OPENSSL_LIBS}\${QT_LIBS}"/LIBS="\${LIBS} \${OPENSSL_LIBS} \${QT_LIBS}"/' \
-  configure
-
 CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr
+./configure --prefix=/usr --mandir=/usr/man --docdir=/usr/doc/$PRGNAM-$VERSION
 make
-make install destdir=$PKG
-
-mv $PKG/usr/share/man $PKG/usr
+make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/xca/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
 cp -a AUTHORS COPYRIGHT INSTALL README.md VERSION 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
+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/misc/xca/xca.info b/misc/xca/xca.info
index e80565c323..f72a4d1e53 100644
--- a/misc/xca/xca.info
+++ b/misc/xca/xca.info
@@ -1,8 +1,8 @@
 PRGNAM="xca"
-VERSION="2.1.2"
+VERSION="2.3.0"
 HOMEPAGE="https://hohnstaedt.de/xca"
-DOWNLOAD="https://github.com/chris2511/xca/releases/download/RELEASE.2.1.2/xca-2.1.2.tar.gz"
-MD5SUM="1d48bd19b0bc6caf1b4431cb2c73cc67"
+DOWNLOAD="https://github.com/chris2511/xca/releases/download/RELEASE.2.3.0/xca-2.3.0.tar.gz"
+MD5SUM="9c57ca1f231c0623e81e20c6f7b5f348"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/ykpers/ykpers.info b/misc/ykpers/ykpers.info
index 6667c26b02..077916cd82 100644
--- a/misc/ykpers/ykpers.info
+++ b/misc/ykpers/ykpers.info
@@ -1,7 +1,7 @@
 PRGNAM="ykpers"
 VERSION="1.20.0"
 HOMEPAGE="https://developers.yubico.com/yubikey-personalization/"
-DOWNLOAD="https://developers.yubico.com/yubikey-personalization/releases/ykpers-1.20.0.tar.gz"
+DOWNLOAD="https://developers.yubico.com/yubikey-personalization/Releases/ykpers-1.20.0.tar.gz"
 MD5SUM="8749113ce5a0164fe2b429b61242ba0f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/misc/yubikey-personalization-gui/yubikey-personalization-gui.info b/misc/yubikey-personalization-gui/yubikey-personalization-gui.info
index d945792105..99a3473b27 100644
--- a/misc/yubikey-personalization-gui/yubikey-personalization-gui.info
+++ b/misc/yubikey-personalization-gui/yubikey-personalization-gui.info
@@ -1,7 +1,7 @@
 PRGNAM="yubikey-personalization-gui"
 VERSION="3.1.25"
 HOMEPAGE="https://developers.yubico.com/yubikey-personalization-gui/"
-DOWNLOAD="https://developers.yubico.com/yubikey-personalization-gui/releases/yubikey-personalization-gui-3.1.25.tar.gz"
+DOWNLOAD="https://developers.yubico.com/yubikey-personalization-gui/Releases/yubikey-personalization-gui-3.1.25.tar.gz"
 MD5SUM="33f4312281ada355c62f7232b57ad0b3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/misc/yubioath-desktop/README b/misc/yubioath-desktop/README
new file mode 100644
index 0000000000..015a3db1eb
--- /dev/null
+++ b/misc/yubioath-desktop/README
@@ -0,0 +1,4 @@
+Yubico Authenticator adds a layer of security for online accounts
+
+It allows you to generate rfc6238 compatible 2-factor one-time
+passwords for which the secrets can be stored on a yubikey.
diff --git a/misc/yubioath-desktop/slack-desc b/misc/yubioath-desktop/slack-desc
new file mode 100644
index 0000000000..97e8f821cd
--- /dev/null
+++ b/misc/yubioath-desktop/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------------------------------------------------------|
+yubioath-desktop: yubioath-desktop (Yubico Authenticator)
+yubioath-desktop:
+yubioath-desktop: Yubico Authenticator adds a layer of security for online accounts.
+yubioath-desktop:
+yubioath-desktop: It allows you to generate rfc6238 compatible 2-factor one-time
+yubioath-desktop: passwords for which the secrets can be stored on a yubikey.
+yubioath-desktop:
+yubioath-desktop:
+yubioath-desktop:
+yubioath-desktop:
+yubioath-desktop:
diff --git a/misc/yubioath-desktop/yubioath-desktop.SlackBuild b/misc/yubioath-desktop/yubioath-desktop.SlackBuild
new file mode 100644
index 0000000000..5357a8a87a
--- /dev/null
+++ b/misc/yubioath-desktop/yubioath-desktop.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for yubioath-desktop
+
+# Copyright 2020 Spycrowsoft The Netherlands
+# 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=yubioath-desktop
+VERSION=${VERSION:-5.0.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
+
+# Make the Appimage executable
+chmod 755 $CWD/$PRGNAM-$VERSION-linux.AppImage
+
+# Get appimage mount offset
+MOUNT_OFFSET=`$CWD/$PRGNAM-$VERSION-linux.AppImage --appimage-offset`
+
+# Mount the appimage so we can extract the .desktop and icon files.
+mkdir $PRGNAM-$VERSION
+mount -o loop -o offset=$MOUNT_OFFSET $CWD/$PRGNAM-$VERSION-linux.AppImage $TMP/$PRGNAM-$VERSION
+
+# Add .desktop and icon to KDE/XFCE-menus
+mkdir -p $PKG/usr/share/applications/ $PKG/usr/share/pixmaps/
+cp $PRGNAM-$VERSION/com.yubico.yubioath.desktop ${PKG}/usr/share/applications/${PRGNAM}.desktop
+cp $PRGNAM-$VERSION/com.yubico.yubioath.svg ${PKG}/usr/share/pixmaps/com.yubico.yubioath.svg
+
+# Unmount appimage
+umount $TMP/$PRGNAM-$VERSION
+rmdir $TMP/$PRGNAM-$VERSION
+
+# Copy appimage to package-location
+mkdir -p $PKG/usr/bin/
+cp $CWD/$PRGNAM-$VERSION-linux.AppImage $PKG/usr/bin/$PRGNAM
+
+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/yubioath-desktop/yubioath-desktop.info b/misc/yubioath-desktop/yubioath-desktop.info
new file mode 100644
index 0000000000..6426460d0d
--- /dev/null
+++ b/misc/yubioath-desktop/yubioath-desktop.info
@@ -0,0 +1,10 @@
+PRGNAM="yubioath-desktop"
+VERSION="5.0.4"
+HOMEPAGE="https://www.yubico.com/products/services-software/download/yubico-authenticator/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-5.0.4-linux.AppImage"
+MD5SUM_x86_64="4490045c8910b8f34678a1a3b4541eaa"
+REQUIRES=""
+MAINTAINER="Spycrowsoft"
+EMAIL="spycrowsoft [ at ] gmail [ dot ] com"
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
new file mode 100644
index 0000000000..c635edc48d
--- /dev/null
+++ b/multimedia/LBRY/LBRY.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# Slackware build script for LBRY
+
+# 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
+# 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=LBRY
+VERSION=${VERSION:-0.50.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" != "x86_64" ]; then
+  echo "Package for $(uname -m) architecture is not available."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}_$VERSION.deb data.tar.xz | tar xJv
+mkdir usr/{bin,doc}
+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
+
+ln -s /opt/LBRY/lbry usr/bin/lbry
+mv usr/share/doc/lbry usr/doc/$PRGNAM-$VERSION
+rm -rf 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/multimedia/LBRY/LBRY.info b/multimedia/LBRY/LBRY.info
new file mode 100644
index 0000000000..151960e6ed
--- /dev/null
+++ b/multimedia/LBRY/LBRY.info
@@ -0,0 +1,10 @@
+PRGNAM="LBRY"
+VERSION="0.50.2"
+HOMEPAGE="https://lbry.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+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/LBRY/README b/multimedia/LBRY/README
new file mode 100644
index 0000000000..a5f56b63c9
--- /dev/null
+++ b/multimedia/LBRY/README
@@ -0,0 +1,7 @@
+LBRY (A browser for the LBRY network)
+
+LBRY is a browser for the LBRY network; a digital marketplace
+controlled by its users.
+
+This is a re-packinging of the upstream Debian x86_64 binary
+package.
diff --git a/multimedia/LBRY/doinst.sh b/multimedia/LBRY/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/multimedia/LBRY/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/multimedia/LBRY/slack-desc b/multimedia/LBRY/slack-desc
new file mode 100644
index 0000000000..5f90f22476
--- /dev/null
+++ b/multimedia/LBRY/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------------------------------------------------------|
+LBRY: LBRY (A browser for the LBRY network)
+LBRY:
+LBRY: LBRY is a browser for the LBRY network; a digital marketplace
+LBRY: controlled by its users.
+LBRY:
+LBRY: This is a repackaging of the upstream Debian binary package.
+LBRY:
+LBRY:
+LBRY:
+LBRY:
+LBRY:
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 051026c944..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.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 85224ce691..aa3acac807 100644
--- a/multimedia/MuseScore/MuseScore.info
+++ b/multimedia/MuseScore/MuseScore.info
@@ -1,12 +1,12 @@
 PRGNAM="MuseScore"
-VERSION="3.2"
+VERSION="3.6"
 HOMEPAGE="http://www.musescore.org/"
-DOWNLOAD="https://github.com/musescore/MuseScore/archive/v3.2/MuseScore-3.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="f7b6a53fea406c0a0e90c12ee347c056 \
-        3e02cc70ae6df3077d0003bbcb95456c \
-        6ab9352030223f909bb36b8f067c7d26"
+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
new file mode 100644
index 0000000000..40b686daea
--- /dev/null
+++ b/multimedia/aom/README
@@ -0,0 +1,10 @@
+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 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
new file mode 100644
index 0000000000..6d6940a1e7
--- /dev/null
+++ b/multimedia/aom/aom.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+# ----------------------------------------------------------------------
+# Slackware build script for aom
+#
+# 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
+#   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.
+# ----------------------------------------------------------------------
+
+
+PRGNAM=aom
+# 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.1}
+GITCOMMIT=${GITCOMMIT:-b52ee6d44adaef8a08f6984390de050d64df9faa}
+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
+tar xvf $CWD/$PRGNAM-$GITCOMMIT.tar.gz -C $TMP/$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 {} \;
+
+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=0' below to '1' to build
+  # the docs 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=1 \
+    -DENABLE_DOCS=0 \
+    -DBUILD_SHARED_LIBS=1 \
+    -DENABLE_TESTS=0 \
+    ../
+  make -j1
+  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/multimedia/aom/aom.info b/multimedia/aom/aom.info
new file mode 100644
index 0000000000..3537579242
--- /dev/null
+++ b/multimedia/aom/aom.info
@@ -0,0 +1,10 @@
+PRGNAM="aom"
+VERSION="2.0.1"
+HOMEPAGE="https://aomedia.googlesource.com/aom"
+DOWNLOAD="http://www.andrews-corner.org/downloads/aom-b52ee6d44adaef8a08f6984390de050d64df9faa.tar.gz"
+MD5SUM="d37bf9cfe3353e661637c2b106ee1787"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrew Strong"
+EMAIL="andrew.david.strong@gmail.com"
diff --git a/multimedia/aom/slack-desc b/multimedia/aom/slack-desc
new file mode 100644
index 0000000000..981c25fff9
--- /dev/null
+++ b/multimedia/aom/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------------------------------------------------------|
+aom: aom (Open Source Video Codec)
+aom:
+aom: AOMedia Video 1 (AV1) is designed to be the successor to VP9 and
+aom: also to eventually be a direct competitor for HEVC/H.265.
+aom: This Slackbuild builds the 'reference' encoder aomenc as well as
+aom: the 'reference' decoder aomdec.
+aom:
+aom: Homepage: https://aomedia.googlesource.com/aom
+aom:
+aom:
+aom:
diff --git a/multimedia/audio-recorder/README b/multimedia/audio-recorder/README
index 1e6343d584..f49af0dcf5 100644
--- a/multimedia/audio-recorder/README
+++ b/multimedia/audio-recorder/README
@@ -1,22 +1,22 @@
-  Audio-recorder (Audio recorder for GNOME and Unity Desktops)
+Audio-recorder (Audio recorder for GNOME and Unity Desktops)
 
-  This amazing program allows you to record your favourite music and 
-  audio to a file. It can record audio from your system's sound card, 
-  microphones, browsers, webcams & more. Put simply; if it plays out 
-  of your loudspeakers you can record it.
+This amazing program allows you to record your favourite music and 
+audio to a file. It can record audio from your system's sound card, 
+microphones, browsers, webcams & more. Put simply; if it plays out 
+of your loudspeakers you can record it.
 
-  It has an advanced timer that can:
+It has an advanced timer that can:
   * Start, stop or pause recording at a given clock time.
   * Start, stop or pause after a time period.
   * Stop when the recorded file size exceeds a limit.
   * Start recording on voice or sound (user can set the audio 
-  threshold).
+    threshold).
   * Stop or pause recording on "silence" (user can set the audio 
-  threshold and delay).
-  
-  After you first run the application it will autostart at every login, 
-  you can disable this in the "Additional settings". It also offers a 
-  convenient appindicator.
+    threshold and delay).
 
-  Optional dependencies to record MP3 and M4A formats: 
-  gst-plugins-ugly gst-plugins-bad
\ No newline at end of file
+After you first run the application it will autostart at every login, 
+you can disable this in the "Additional settings". It also offers a 
+convenient appindicator.
+
+Optional dependencies to record MP3 and M4A formats: 
+gst-plugins-ugly gst-plugins-bad
diff --git a/multimedia/audio-recorder/audio-recorder.info b/multimedia/audio-recorder/audio-recorder.info
index 52de5352b5..23eeb8275e 100644
--- a/multimedia/audio-recorder/audio-recorder.info
+++ b/multimedia/audio-recorder/audio-recorder.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libappindicator3"
 MAINTAINER="Alexander Schultz"
-EMAIL="alexander_schultz@posteo.se"
\ No newline at end of file
+EMAIL="alexander_schultz@posteo.se"
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index e1ae707bad..2856a1de47 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -5,7 +5,7 @@
 # Derived from a SlackBuild by Eric Hameleers.
 # Copyright 2009, 2010, 2011, 2013  Eric Hameleers, Eindhoven, NL
 # Copyright 2015 John Vogel Corning, NY USA
-# Copyright 2017-2019 Matteo Bernardini, Pisa, IT
+# Copyright 2017-2020 Matteo Bernardini, Pisa, IT
 # 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=avidemux
-VERSION=${VERSION:-2.7.4}
+VERSION=${VERSION:-2.7.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index bafc51fb4f..e75a7a4000 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -1,8 +1,8 @@
 PRGNAM="avidemux"
-VERSION="2.7.4"
+VERSION="2.7.6"
 HOMEPAGE="http://avidemux.org"
-DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.7.4.tar.gz"
-MD5SUM="87b4dd1ef3a1f695b3d0f9971da8abde"
+DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.7.6.tar.gz"
+MD5SUM="c2470d31ee8ed6203c9d3ba6957c5ea1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac faad2 lame libdca qt5 x264 xvidcore"
diff --git a/multimedia/castget/README b/multimedia/castget/README
new file mode 100644
index 0000000000..e17bb1c8d4
--- /dev/null
+++ b/multimedia/castget/README
@@ -0,0 +1,9 @@
+castget is a simple, command-line based RSS enclosure downloader. It is
+primarily intended for automatic, unattended downloading of podcasts.
+
+It features
+  - simple configuration,
+  - automatic tagging of downloaded MP3 files using ID3v2,
+  - automatic M3U playlists, and
+  - support for all RSS versions (to the extent this is possible) and
+    Media RSS.
diff --git a/multimedia/castget/castget.SlackBuild b/multimedia/castget/castget.SlackBuild
new file mode 100644
index 0000000000..184429e98f
--- /dev/null
+++ b/multimedia/castget/castget.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for castget
+
+# 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=castget
+VERSION=${VERSION:-2.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.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 {} \;
+
+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  CHANGES.md castgetrc.example COPYING COPYING.LIB 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/multimedia/castget/castget.info b/multimedia/castget/castget.info
new file mode 100644
index 0000000000..0e0e699294
--- /dev/null
+++ b/multimedia/castget/castget.info
@@ -0,0 +1,10 @@
+PRGNAM="castget"
+VERSION="2.0.1"
+HOMEPAGE="https://castget.johndal.com/"
+DOWNLOAD="http://savannah.nongnu.org/download/castget/castget-2.0.1.tar.bz2"
+MD5SUM="c8007f3db3df07e3e9f999868ea741d0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="id3lib"
+MAINTAINER="Jeff Parent"
+EMAIL="jeff+SBo@sh0.xyz"
diff --git a/multimedia/castget/slack-desc b/multimedia/castget/slack-desc
new file mode 100644
index 0000000000..68c67701bf
--- /dev/null
+++ b/multimedia/castget/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------------------------------------------------------|
+castget: castget (A command line tool to download podcasts)
+castget:
+castget: castget is a simple, command-line based RSS enclosure downloader. It
+castget: is primarily intended for automatic, unattended downloading of
+castget: podcasts.
+castget:
+castget: It features
+castget: - simple configuration
+castget: - automatic tagging of downloaded MP3 files using ID3v2
+castget: - automatic M3U playlists
+castget: - and support for all RSS versions and Media RSS
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/dvdbackup/README b/multimedia/dvdbackup/README
index 48ef05de8d..a512714f7a 100644
--- a/multimedia/dvdbackup/README
+++ b/multimedia/dvdbackup/README
@@ -1,4 +1,15 @@
 dvdbackup is a tool to backup video DVDs from the command line.
 It has the advantages of being small, fast, and easy to use.
 
-libdvdcss is optional but most likely desired.
+By default, dvdbackup reformats the DVD title by replacing the
+underscores with spaces and converting to "Proper Case".
+To turn this "feature" off and retain the original VOLUME_ID
+formatting, pass CLOBBER="no" to the script.
+
+To build on current (15.0 EXPERIMENTAL), pass CURRENT=yes to 
+the script.
+
+NOTE: Copyright laws vary from nation to nation, so bear in mind
+that this program is only intended for personal backups.
+
+libdvdcss is is an optional runtime dependency.
diff --git a/multimedia/dvdbackup/dvdbackup.SlackBuild b/multimedia/dvdbackup/dvdbackup.SlackBuild
index ab324bce25..4b29260735 100644
--- a/multimedia/dvdbackup/dvdbackup.SlackBuild
+++ b/multimedia/dvdbackup/dvdbackup.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for dvdbackup
 
 # Copyright 2013 John Vogel Corning, New York US
+# Copyright 2020 Lenard Spencer, Orlando, Florida USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +25,12 @@
 
 PRGNAM=dvdbackup
 VERSION=${VERSION:-0.4.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -69,16 +70,24 @@ 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 {} \;
 
-# Patches from lauchpad bazaar repo.
+# Patch to not treat automake warnings as errors
 patch -p0 < $CWD/patches/do_not_treat_automake_warnings_as_errors.patch
-patch -p0 < $CWD/patches/remove_PATH_MAX_limitation.patch
+
+# Patch to not change VOLUME_ID to Volume Id
+if [ ${CLOBBER:-"yes"} == "no" ]; then
+  patch -p1 < $CWD/patches/dvdbackup_no-convert-title.patch
+fi
+
+if [ "${CURRENT:-no}" = "yes" ]; then
+  patch -p0 < $CWD/patches/dvdbackup-dvdread-6.1.patch
+fi
+
+autoreconf -fiv
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -87,8 +96,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
 
 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/multimedia/dvdbackup/dvdbackup.info b/multimedia/dvdbackup/dvdbackup.info
index 90f9497b10..1964b50274 100644
--- a/multimedia/dvdbackup/dvdbackup.info
+++ b/multimedia/dvdbackup/dvdbackup.info
@@ -6,5 +6,5 @@ MD5SUM="fd9189149ec88520e0ceba8d17520fbb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="John Vogel"
-EMAIL="jvogel4@stny.rr.com"
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
diff --git a/multimedia/dvdbackup/patches/dvdbackup-dvdread-6.1.patch b/multimedia/dvdbackup/patches/dvdbackup-dvdread-6.1.patch
new file mode 100644
index 0000000000..88f88cbecd
--- /dev/null
+++ b/multimedia/dvdbackup/patches/dvdbackup-dvdread-6.1.patch
@@ -0,0 +1,86 @@
+--- src/dvdbackup.c.orig 2012-06-24 01:10:29 UTC
++++ src/dvdbackup.c
+@@ -1132,7 +1132,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 	int size;
+ 
+ 	/* DVD handler */
+-	ifo_handle_t* ifo_file = NULL;
++	dvd_file_t* ifo_file = NULL;
+ 
+ 	if (title_set_info->number_of_title_sets + 1 < title_set) {
+ 		return(1);
+@@ -1181,7 +1181,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 	if ((streamout_ifo = open(targetname_ifo, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
+ 		fprintf(stderr, _("Error creating %s\n"), targetname_ifo);
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1191,7 +1191,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 	if ((streamout_bup = open(targetname_bup, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
+ 		fprintf(stderr, _("Error creating %s\n"), targetname_bup);
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1200,31 +1200,31 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+ 	/* Copy VIDEO_TS.IFO, since it's a small file try to copy it in one shot */
+ 
+-	if ((ifo_file = ifoOpen(dvd, title_set))== 0) {
++	if ((ifo_file = DVDOpenFile(dvd, title_set, DVD_READ_INFO_FILE))== 0) {
+ 		fprintf(stderr, _("Failed opening IFO for title set %d\n"), title_set);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+ 		return 1;
+ 	}
+ 
+-	size = DVDFileSize(ifo_file->file) * DVD_VIDEO_LB_LEN;
++	size = DVDFileSize(ifo_file) * DVD_VIDEO_LB_LEN;
+ 
+ 	if ((buffer = (unsigned char *)malloc(size * sizeof(unsigned char))) == NULL) {
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+ 		return 1;
+ 	}
+ 
+-	DVDFileSeek(ifo_file->file, 0);
++	DVDFileSeek(ifo_file, 0);
+ 
+-	if (DVDReadBytes(ifo_file->file,buffer,size) != size) {
++	if (DVDReadBytes(ifo_file,buffer,size) != size) {
+ 		fprintf(stderr, _("Error reading IFO for title set %d\n"), title_set);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1234,7 +1234,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+ 	if (write(streamout_ifo,buffer,size) != size) {
+ 		fprintf(stderr, _("Error writing %s\n"),targetname_ifo);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1243,7 +1243,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+ 	if (write(streamout_bup,buffer,size) != size) {
+ 		fprintf(stderr, _("Error writing %s\n"),targetname_bup);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
diff --git a/multimedia/dvdbackup/patches/dvdbackup_no-convert-title.patch b/multimedia/dvdbackup/patches/dvdbackup_no-convert-title.patch
new file mode 100644
index 0000000000..aa515aad31
--- /dev/null
+++ b/multimedia/dvdbackup/patches/dvdbackup_no-convert-title.patch
@@ -0,0 +1,26 @@
+diff -Naur dvdbackup-0.4.2/src/dvdbackup.c dvdbackup-0.4.2.new/src/dvdbackup.c
+--- dvdbackup-0.4.2/src/dvdbackup.c	2012-06-23 21:10:29.000000000 -0400
++++ dvdbackup-0.4.2.new/src/dvdbackup.c	2020-01-19 10:13:23.689417434 -0500
+@@ -1326,22 +1326,6 @@
+ 		length--;
+ 	}
+ 
+-	/* convert title to lower case and replace underscores with spaces */
+-	for(i = 0; i < length; i++) {
+-		word_length++;
+-		if(word_length == 1) {
+-			title[i] = toupper(title[i]);
+-		} else {
+-			title[i] = tolower(title[i]);
+-		}
+-		if(title[i] == '_') {
+-			title[i] = ' ';
+-		}
+-		if(title[i] == ' ') {
+-			word_length = 0;
+-		}
+-	}
+-
+ 	return(0);
+ }
+ 
diff --git a/multimedia/dvdbackup/patches/remove_PATH_MAX_limitation.patch b/multimedia/dvdbackup/patches/remove_PATH_MAX_limitation.patch
deleted file mode 100644
index 75a1295566..0000000000
--- a/multimedia/dvdbackup/patches/remove_PATH_MAX_limitation.patch
+++ /dev/null
@@ -1,463 +0,0 @@
-=== modified file 'src/dvdbackup.c'
---- src/dvdbackup.c	2012-06-24 01:13:07 +0000
-+++ src/dvdbackup.c	2013-07-04 12:06:44 +0000
-@@ -2,7 +2,7 @@
-  * dvdbackup - tool to rip DVDs from the command line
-  *
-  * Copyright (C) 2002  Olaf Beck <olaf_sc@yahoo.com>
-- * Copyright (C) 2008-2012  Benjamin Drung <benjamin.drung@gmail.com>
-+ * Copyright (C) 2008-2013  Benjamin Drung <benjamin.drung@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
-@@ -179,7 +179,8 @@
- 	int vob = 1;
- 
- 	/* Temp filename,dirname */
--	char targetname[PATH_MAX];
-+	char *targetname;
-+	size_t targetname_length;
- 
- 	/* Write buffer */
- 
-@@ -217,10 +218,18 @@
- 	fprintf(stderr,"DVDWriteCells: vob files are %d\n", number_of_vob_files);
- #endif
- 
-+	// Reserve space for "<targetdir>/<title_name>/VIDEO_TS/VTS_XX_X.VOB" and terminating "\0"
-+	targetname_length = strlen(targetdir) + strlen(title_name) + 24;
-+	targetname = malloc(targetname_length);
-+	if (targetname == NULL) {
-+		fprintf(stderr, _("Failed to allocate %zu bytes for a filename.\n"), targetname_length);
-+		return 1;
-+	}
-+
- 	/* Remove all old files silently if they exists */
- 
- 	for ( i = 0 ; i < 10 ; i++ ) {
--		sprintf(targetname,"%s/%s/VIDEO_TS/VTS_%02i_%i.VOB",targetdir, title_name, title_set, i + 1);
-+		snprintf(targetname, targetname_length, "%s/%s/VIDEO_TS/VTS_%02i_%i.VOB", targetdir, title_name, title_set, i + 1);
- #ifdef DEBUG
- 		fprintf(stderr,"DVDWriteCells: file is %s\n", targetname);
- #endif
-@@ -237,9 +246,10 @@
- 	/* Create VTS_XX_X.VOB */
- 	if (title_set == 0) {
- 		fprintf(stderr,_("Do not try to copy chapters from the VMG domain; there are none.\n"));
-+		free(targetname);
- 		return(1);
- 	} else {
--		sprintf(targetname,"%s/%s/VIDEO_TS/VTS_%02i_%i.VOB",targetdir, title_name, title_set, vob);
-+		snprintf(targetname, targetname_length, "%s/%s/VIDEO_TS/VTS_%02i_%i.VOB", targetdir, title_name, title_set, vob);
- 	}
- 
- #ifdef DEBUG
-@@ -248,6 +258,7 @@
- 
- 	if ((buffer = (unsigned char *)malloc(BUFFER_SIZE * DVD_VIDEO_LB_LEN * sizeof(unsigned char))) == NULL) {
- 		fprintf(stderr, _("Out of memory copying %s\n"), targetname);
-+		free(targetname);
- 		return(1);
- 	}
- 
-@@ -259,6 +270,7 @@
- 	if ((streamout = open(targetname, O_WRONLY | O_CREAT | O_APPEND, 0666)) == -1) {
- 		fprintf(stderr, _("Error creating %s\n"), targetname);
- 		perror(PACKAGE);
-+		free(targetname);
- 		return(1);
- 	}
- 
-@@ -271,6 +283,7 @@
- 		fprintf(stderr, _("Failed opening TITLE VOB\n"));
- 		free(buffer);
- 		close(streamout);
-+		free(targetname);
- 		return(1);
- 	}
- 
-@@ -294,6 +307,7 @@
- 				free(buffer);
- 				DVDCloseFile(dvd_file);
- 				close(streamout);
-+				free(targetname);
- 				return(1);
- 			}
- 			if (have_read < to_read) {
-@@ -303,6 +317,7 @@
- 				fprintf(stderr, _("Error writing TITLE VOB\n"));
- 				free(buffer);
- 				close(streamout);
-+				free(targetname);
- 				return(1);
- 			}
- #ifdef DEBUG
-@@ -321,10 +336,11 @@
- 				close(streamout);
- 				vob = vob + 1;
- 				size = 0;
--				sprintf(targetname,"%s/%s/VIDEO_TS/VTS_%02i_%i.VOB",targetdir, title_name, title_set, vob);
-+				snprintf(targetname, targetname_length, "%s/%s/VIDEO_TS/VTS_%02i_%i.VOB", targetdir, title_name, title_set, vob);
- 				if ((streamout = open(targetname, O_WRONLY | O_CREAT | O_APPEND, 0666)) == -1) {
- 					fprintf(stderr, _("Error creating %s\n"), targetname);
- 					perror(PACKAGE);
-+					free(targetname);
- 					return(1);
- 				}
- 			}
-@@ -334,6 +350,7 @@
- 	DVDCloseFile(dvd_file);
- 	free(buffer);
- 	close(streamout);
-+	free(targetname);
- 
- 	return(0);
- }
-@@ -925,8 +942,10 @@
- 	int i;
- 
- 	/* Temp filename,dirname */
--	char filename[PATH_MAX] = "VIDEO_TS.VOB";
--	char targetname[PATH_MAX];
-+	// filename is either "VIDEO_TS.VOB" or "VTS_XX_X.VOB" and terminating "\0"
-+	char filename[13] = "VIDEO_TS.VOB";
-+	char *targetname;
-+	size_t targetname_length;
- 	struct stat fileinfo;
- 
- 	/* File Handler */
-@@ -943,9 +962,10 @@
- 	/* Return value */
- 	int result;
- 
-+
- 	/* create filename VIDEO_TS.VOB or VTS_XX_X.VOB */
- 	if(title_set > 0) {
--		sprintf(filename, "VTS_%02i_%i.VOB", title_set, vob);
-+		sprintf(filename, "VTS_%02i_%1i.VOB", title_set, vob);
- 	}
- 
- 	if (title_set_info->number_of_title_sets + 1 < title_set) {
-@@ -980,7 +1000,14 @@
- 		fprintf(stderr,_("Do not try to copy a Title VOB from the VMG domain; there are none.\n"));
- 		return(1);
- 	} else {
--		sprintf(targetname,"%s/%s/VIDEO_TS/VTS_%02i_%i.VOB",targetdir, title_name, title_set, vob);
-+		// Reserve space for "<targetdir>/<title_name>/VIDEO_TS/<filename>" and terminating "\0"
-+		targetname_length = strlen(targetdir) + strlen(title_name) + strlen(filename) + 12;
-+		targetname = malloc(targetname_length);
-+		if (targetname == NULL) {
-+			fprintf(stderr, _("Failed to allocate %zu bytes for a filename.\n"), targetname_length);
-+			return 1;
-+		}
-+		snprintf(targetname, targetname_length, "%s/%s/VIDEO_TS/%s", targetdir, title_name, filename);
- 	}
- 
- 
-@@ -990,6 +1017,7 @@
- 		tsize = title_set_info->title_set[title_set].size_vob[i];
- 		if (tsize%DVD_VIDEO_LB_LEN != 0) {
- 			fprintf(stderr, _("The Title VOB number %d of title set %d does not have a valid DVD size\n"), i + 1, title_set);
-+			free(targetname);
- 			return(1);
- 		} else {
- 			offset = offset + tsize/DVD_VIDEO_LB_LEN;
-@@ -1006,11 +1034,13 @@
- 		if (! S_ISREG(fileinfo.st_mode)) {
- 			/* TRANSLATORS: The sentence starts with "The title file %s is not valid[...]" */
- 			fprintf(stderr,_("The %s %s is not valid, it may be a directory.\n"), _("title file"), targetname);
-+			free(targetname);
- 			return(1);
- 		} else {
- 			if ((streamout = open(targetname, O_WRONLY | O_TRUNC, 0666)) == -1) {
- 				fprintf(stderr, _("Error opening %s\n"), targetname);
- 				perror(PACKAGE);
-+				free(targetname);
- 				return(1);
- 			}
- 		}
-@@ -1018,6 +1048,7 @@
- 		if ((streamout = open(targetname, O_WRONLY | O_CREAT, 0666)) == -1) {
- 			fprintf(stderr, _("Error creating %s\n"), targetname);
- 			perror(PACKAGE);
-+			free(targetname);
- 			return(1);
- 		}
- 	}
-@@ -1025,6 +1056,7 @@
- 	if ((dvd_file = DVDOpenFile(dvd, title_set, DVD_READ_TITLE_VOBS))== 0) {
- 		fprintf(stderr, _("Failed opening TITLE VOB\n"));
- 		close(streamout);
-+		free(targetname);
- 		return(1);
- 	}
- 
-@@ -1032,6 +1064,7 @@
- 
- 	DVDCloseFile(dvd_file);
- 	close(streamout);
-+	free(targetname);
- 	return result;
- }
- 
-@@ -1039,8 +1072,10 @@
- static int DVDCopyMenu(dvd_reader_t * dvd, title_set_info_t * title_set_info, int title_set, char * targetdir,char * title_name, read_error_strategy_t errorstrat) {
- 
- 	/* Temp filename,dirname */
--	char filename[PATH_MAX] = "VIDEO_TS.VOB";
--	char targetname[PATH_MAX];
-+	// filename is either "VIDEO_TS.VOB" or "VTS_XX_0.VOB" and terminating "\0"
-+	char filename[13] = "VIDEO_TS.VOB";
-+	char *targetname;
-+	size_t targetname_length;
- 	struct stat fileinfo;
- 
- 	/* File Handler */
-@@ -1077,8 +1112,15 @@
- 		return(1);
- 	}
- 
-+	// Reserve space for "<targetdir>/<title_name>/VIDEO_TS/<filename>" and terminating "\0"
-+	targetname_length = strlen(targetdir) + strlen(title_name) + strlen(filename) + 12;
-+	targetname = malloc(targetname_length);
-+	if (targetname == NULL) {
-+		fprintf(stderr, _("Failed to allocate %zu bytes for a filename.\n"), targetname_length);
-+		return 1;
-+	}
- 	/* Create VIDEO_TS.VOB or VTS_XX_0.VOB */
--	sprintf(targetname,"%s/%s/VIDEO_TS/%s",targetdir, title_name, filename);
-+	snprintf(targetname, targetname_length, "%s/%s/VIDEO_TS/%s", targetdir, title_name, filename);
- 
- 	if (stat(targetname, &fileinfo) == 0) {
- 		/* TRANSLATORS: The sentence starts with "The menu file %s exists[...]" */
-@@ -1087,12 +1129,14 @@
- 			/* TRANSLATORS: The sentence starts with "The menu file %s is not valid[...]" */
- 			fprintf(stderr,_("The %s %s is not valid, it may be a directory.\n"), _("menu file"), targetname);
- 			DVDCloseFile(dvd_file);
-+			free(targetname);
- 			return(1);
- 		} else {
- 			if ((streamout = open(targetname, O_WRONLY | O_TRUNC, 0666)) == -1) {
- 				fprintf(stderr, _("Error opening %s\n"), targetname);
- 				perror(PACKAGE);
- 				DVDCloseFile(dvd_file);
-+				free(targetname);
- 				return(1);
- 			}
- 		}
-@@ -1101,6 +1145,7 @@
- 			fprintf(stderr, _("Error creating %s\n"), targetname);
- 			perror(PACKAGE);
- 			DVDCloseFile(dvd_file);
-+			free(targetname);
- 			return(1);
- 		}
- 	}
-@@ -1113,6 +1158,7 @@
- 
- 	DVDCloseFile(dvd_file);
- 	close(streamout);
-+	free(targetname);
- 	return result;
- 
- }
-@@ -1120,7 +1166,9 @@
- 
- static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_info_t* title_set_info, int title_set, char* targetdir, char* title_name) {
- 	/* Temp filename, dirname */
--	char targetname_ifo[PATH_MAX], targetname_bup[PATH_MAX];
-+	char *targetname_ifo;
-+	char *targetname_bup;
-+	size_t string_length;
- 	struct stat fileinfo;
- 
- 	/* Write buffer */
-@@ -1148,14 +1196,26 @@
- 		}
- 	}
- 
-+	// Reserve space for "<targetdir>/<title_name>/VIDEO_TS/VIDEO_TS.IFO" or
-+	// "<targetdir>/<title_name>/VIDEO_TS/VTS_XX_0.IFO" and terminating "\0"
-+	string_length = strlen(targetdir) + strlen(title_name) + 24;
-+	targetname_ifo = malloc(string_length);
-+	targetname_bup = malloc(string_length);
-+	if (targetname_ifo == NULL || targetname_bup == NULL) {
-+		fprintf(stderr, _("Failed to allocate %zu bytes for a filename.\n"), string_length);
-+		free(targetname_ifo);
-+		free(targetname_bup);
-+		return 1;
-+	}
-+
- 	/* Create VIDEO_TS.IFO or VTS_XX_0.IFO */
- 
- 	if (title_set == 0) {
--		sprintf(targetname_ifo,"%s/%s/VIDEO_TS/VIDEO_TS.IFO",targetdir, title_name);
--		sprintf(targetname_bup,"%s/%s/VIDEO_TS/VIDEO_TS.BUP",targetdir, title_name);
-+		snprintf(targetname_ifo, string_length, "%s/%s/VIDEO_TS/VIDEO_TS.IFO", targetdir, title_name);
-+		snprintf(targetname_bup, string_length, "%s/%s/VIDEO_TS/VIDEO_TS.BUP", targetdir, title_name);
- 	} else {
--		sprintf(targetname_ifo,"%s/%s/VIDEO_TS/VTS_%02i_0.IFO",targetdir, title_name, title_set);
--		sprintf(targetname_bup,"%s/%s/VIDEO_TS/VTS_%02i_0.BUP",targetdir, title_name, title_set);
-+		snprintf(targetname_ifo, string_length, "%s/%s/VIDEO_TS/VTS_%02i_0.IFO", targetdir, title_name, title_set);
-+		snprintf(targetname_bup, string_length, "%s/%s/VIDEO_TS/VTS_%02i_0.BUP", targetdir, title_name, title_set);
- 	}
- 
- 	if (stat(targetname_ifo, &fileinfo) == 0) {
-@@ -1164,6 +1224,8 @@
- 		if (! S_ISREG(fileinfo.st_mode)) {
- 			/* TRANSLATORS: The sentence starts with "The IFO file %s is not valid[...]" */
- 			fprintf(stderr,_("The %s %s is not valid, it may be a directory.\n"), _("IFO file"), targetname_ifo);
-+			free(targetname_ifo);
-+			free(targetname_bup);
- 			return(1);
- 		}
- 	}
-@@ -1174,6 +1236,8 @@
- 		if (! S_ISREG(fileinfo.st_mode)) {
- 			/* TRANSLATORS: The sentence starts with "The BUP file %s is not valid[...]" */
- 			fprintf(stderr,_("The %s %s is not valid, it may be a directory.\n"), _("BUP file"), targetname_bup);
-+			free(targetname_ifo);
-+			free(targetname_bup);
- 			return(1);
- 		}
- 	}
-@@ -1183,6 +1247,8 @@
- 		perror(PACKAGE);
- 		ifoClose(ifo_file);
- 		free(buffer);
-+		free(targetname_ifo);
-+		free(targetname_bup);
- 		close(streamout_ifo);
- 		close(streamout_bup);
- 		return 1;
-@@ -1193,6 +1259,8 @@
- 		perror(PACKAGE);
- 		ifoClose(ifo_file);
- 		free(buffer);
-+		free(targetname_ifo);
-+		free(targetname_bup);
- 		close(streamout_ifo);
- 		close(streamout_bup);
- 		return 1;
-@@ -1204,6 +1272,8 @@
- 		fprintf(stderr, _("Failed opening IFO for title set %d\n"), title_set);
- 		ifoClose(ifo_file);
- 		free(buffer);
-+		free(targetname_ifo);
-+		free(targetname_bup);
- 		close(streamout_ifo);
- 		close(streamout_bup);
- 		return 1;
-@@ -1215,6 +1285,8 @@
- 		perror(PACKAGE);
- 		ifoClose(ifo_file);
- 		free(buffer);
-+		free(targetname_ifo);
-+		free(targetname_bup);
- 		close(streamout_ifo);
- 		close(streamout_bup);
- 		return 1;
-@@ -1226,6 +1298,8 @@
- 		fprintf(stderr, _("Error reading IFO for title set %d\n"), title_set);
- 		ifoClose(ifo_file);
- 		free(buffer);
-+		free(targetname_ifo);
-+		free(targetname_bup);
- 		close(streamout_ifo);
- 		close(streamout_bup);
- 		return 1;
-@@ -1236,6 +1310,8 @@
- 		fprintf(stderr, _("Error writing %s\n"),targetname_ifo);
- 		ifoClose(ifo_file);
- 		free(buffer);
-+		free(targetname_ifo);
-+		free(targetname_bup);
- 		close(streamout_ifo);
- 		close(streamout_bup);
- 		return 1;
-@@ -1245,11 +1321,15 @@
- 		fprintf(stderr, _("Error writing %s\n"),targetname_bup);
- 		ifoClose(ifo_file);
- 		free(buffer);
-+		free(targetname_ifo);
-+		free(targetname_bup);
- 		close(streamout_ifo);
- 		close(streamout_bup);
- 		return 1;
- 	}
- 
-+	free(targetname_ifo);
-+	free(targetname_bup);
- 	return 0;
- }
- 
-
-=== modified file 'src/main.c'
---- src/main.c	2012-06-24 01:13:07 +0000
-+++ src/main.c	2013-07-04 12:06:44 +0000
-@@ -2,7 +2,7 @@
-  * dvdbackup - tool to rip DVDs from the command line
-  *
-  * Copyright (C) 2002  Olaf Beck <olaf_sc@yahoo.com>
-- * Copyright (C) 2008-2012  Benjamin Drung <benjamin.drung@gmail.com>
-+ * Copyright (C) 2008-2013  Benjamin Drung <benjamin.drung@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
-@@ -172,7 +172,8 @@
- 	char* targetdir = ".";
- 
- 	/* Temp filename,dirname */
--	char targetname[PATH_MAX];
-+	char *targetname;
-+	size_t targetname_length;
- 	struct stat fileinfo;
- 
- 	/* The DVD main structure */
-@@ -403,9 +404,15 @@
- 		}
- 	}
- 
--
--
--	sprintf(targetname,"%s",targetdir);
-+	// Reserve space for "<targetdir>/<title_name>/VIDEO_TS" and terminating "\0"
-+	targetname_length = strlen(targetdir) + strlen(title_name) + 11;
-+	targetname = malloc(targetname_length);
-+	if (targetname == NULL) {
-+		fprintf(stderr, _("Failed to allocate %zu bytes for a filename.\n"), targetname_length);
-+		DVDClose(_dvd);
-+		return 1;
-+	}
-+	snprintf(targetname, targetname_length, "%s", targetdir);
- 
- 	if (stat(targetname, &fileinfo) == 0) {
- 		if (! S_ISDIR(fileinfo.st_mode)) {
-@@ -421,7 +428,7 @@
- 	}
- 
- 
--	sprintf(targetname,"%s/%s",targetdir, title_name);
-+	snprintf(targetname, targetname_length, "%s/%s", targetdir, title_name);
- 
- 	if (stat(targetname, &fileinfo) == 0) {
- 		if (! S_ISDIR(fileinfo.st_mode)) {
-@@ -436,7 +443,7 @@
- 		}
- 	}
- 
--	sprintf(targetname,"%s/%s/VIDEO_TS",targetdir, title_name);
-+	snprintf(targetname, targetname_length, "%s/%s/VIDEO_TS", targetdir, title_name);
- 
- 	if (stat(targetname, &fileinfo) == 0) {
- 		if (! S_ISDIR(fileinfo.st_mode)) {
-@@ -513,7 +520,7 @@
- 		}
- 	}
- 
--
-+	free(targetname);
- 	DVDClose(_dvd);
- 	exit(return_code);
- }
-
diff --git a/multimedia/fdkaac/fdkaac.SlackBuild b/multimedia/fdkaac/fdkaac.SlackBuild
index f08ed2f906..efd573a39b 100644
--- a/multimedia/fdkaac/fdkaac.SlackBuild
+++ b/multimedia/fdkaac/fdkaac.SlackBuild
@@ -24,13 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fdkaac
-VERSION=${VERSION:-0.6.3}
+VERSION=${VERSION:-1.0.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 +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"
@@ -61,12 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-if [ -e $CWD/v$VERSION.tar.gz ]; then
-  tar xvf $CWD/v$VERSION.tar.gz
-else
-  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-fi
-
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/multimedia/fdkaac/fdkaac.info b/multimedia/fdkaac/fdkaac.info
index c2cacdf740..d5805dc951 100644
--- a/multimedia/fdkaac/fdkaac.info
+++ b/multimedia/fdkaac/fdkaac.info
@@ -1,8 +1,8 @@
 PRGNAM="fdkaac"
-VERSION="0.6.3"
+VERSION="1.0.0"
 HOMEPAGE="https://github.com/nu774/fdkaac"
-DOWNLOAD="https://github.com/nu774/fdkaac/archive/v0.6.3/fdkaac-0.6.3.tar.gz"
-MD5SUM="20cdcfcf1e3ea4060f021b6eefa9b75b"
+DOWNLOAD="https://github.com/nu774/fdkaac/archive/1.0.0/fdkaac-1.0.0.tar.gz"
+MD5SUM="f9eabdada9f1469721ef508360d7c3a3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libfdk-aac"
diff --git a/multimedia/ffmpeg4/README b/multimedia/ffmpeg4/README
index 9d9c5e4ed1..76b26f3a96 100644
--- a/multimedia/ffmpeg4/README
+++ b/multimedia/ffmpeg4/README
@@ -16,10 +16,10 @@ It can optionally link to a number of extra libraries that are available
 on SBo by setting the relevant env vars, which all default to "no":
 
   CHROMAPRINT=yes    # requires chromaprint
+  CUDA=yes           # requires cudatoolkit & nv-codec-headers
   DECKLINK=yes       # requires decklink-sdk
   FREI0R=yes         # requires frei0r
   LADSPA=yes         # requires ladspa_sdk
-  LIBAOM=yes         # requires libaom
   LIBBLURAY=yes      # requires libbluray
   LIBBS2B=yes        # requires libbs2b
   LIBCELT=yes        # requires celt
@@ -42,9 +42,6 @@ on SBo by setting the relevant env vars, which all default to "no":
   LIBTESSERACT=yes   # requires tesseract
   LIBTWOLAME=yes     # requires twolame
   LIBVIDSTAB=yes     # requires vid.stab
-  LIBWEBP=yes        # requires libwebp
-  LIBX264=yes        # requires x264
-  LIBX265=yes        # requires x265
   LIBXVID=yes        # requires xvidcore
   LIBZMQ=yes         # requires zeromq
   LIBZVBI=yes        # requires zvbi
@@ -63,6 +60,7 @@ There are a few other libraries available in Slackware that are also
 linked to by default, and you can disable them by changing the default
 of "yes" to "no" with the following settings:
 
+  LIBAOM=no
   LIBCACA=no
   LIBCDIO=no
   LIBFONTCONFIG=no
@@ -77,6 +75,9 @@ of "yes" to "no" with the following settings:
   LIBVORBIS=no
   LIBVPX=no
   LIBWAVPACK=no
+  LIBWEBP=no
+  LIBX264=no
+  LIBX265=no
   OPENGL=no
 
 To link to this version of the ffmpeg libraries, you'll need to set
diff --git a/multimedia/ffmpeg4/ffmpeg4.SlackBuild b/multimedia/ffmpeg4/ffmpeg4.SlackBuild
index 565dc68ae9..30f00771d1 100644
--- a/multimedia/ffmpeg4/ffmpeg4.SlackBuild
+++ b/multimedia/ffmpeg4/ffmpeg4.SlackBuild
@@ -4,6 +4,8 @@
 
 # Copyright 2018 Andreas Guldstrand
 # All rights reserved.
+# Copyright (c) 2020-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:
@@ -24,7 +26,7 @@
 
 PRGNAM=ffmpeg4
 SRCNAM=ffmpeg
-VERSION=${VERSION:-4.1}
+VERSION=${VERSION:-4.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,11 +71,12 @@ enable() {
        # ENV VAR      DEFAULT    IF YES                  IF NO
 enable "BINS"          "no"  ""                       "--disable-programs --disable-manpages"
 enable "CHROMAPRINT"   "no"  "--enable-chromaprint"   ""
+enable "CUDA"          "no"  "--enable-nonfree --enable-cuda-sdk --enable-libnpp" ""
 enable "DECKLINK"      "no"  "--enable-decklink"      ""
 enable "FREI0R"        "no"  "--enable-frei0r"        ""
 enable "GNUTLS"        "no"  "--enable-gnutls"        ""
 enable "LADSPA"        "no"  "--enable-ladspa"        ""
-enable "LIBAOM"        "no"  "--enable-libaom"        ""
+enable "LIBAOM"        "yes"  "--enable-libaom"        ""
 enable "LIBBLURAY"     "no"  "--enable-libbluray"     ""
 enable "LIBBS2B"       "no"  "--enable-libbs2b"       ""
 enable "LIBCACA"       "yes" "--enable-libcaca"       ""
@@ -110,9 +113,9 @@ enable "LIBVIDSTAB"    "no"  "--enable-libvidstab"    ""
 enable "LIBVORBIS"     "yes" "--enable-libvorbis"     ""
 enable "LIBVPX"        "yes" "--enable-libvpx"        ""
 enable "LIBWAVPACK"    "yes" "--enable-libwavpack"    ""
-enable "LIBWEBP"       "no"  "--enable-libwebp"       ""
-enable "LIBX264"       "no"  "--enable-libx264"       ""
-enable "LIBX265"       "no"  "--enable-libx265"       ""
+enable "LIBWEBP"       "yes"  "--enable-libwebp"       ""
+enable "LIBX264"       "yes"  "--enable-libx264"       ""
+enable "LIBX265"       "yes"  "--enable-libx265"       ""
 enable "LIBXVID"       "no"  "--enable-libxvid"       ""
 enable "LIBZMQ"        "no"  "--enable-libzmq"        ""
 enable "LIBZVBI"       "no"  "--enable-libzvbi"       ""
@@ -158,6 +161,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-libass \
   $enable_BINS \
   $enable_CHROMAPRINT \
+  $enable_CUDA \
   $enable_DECKLINK \
   $enable_FREI0R \
   $enable_GNUTLS \
diff --git a/multimedia/ffmpeg4/ffmpeg4.info b/multimedia/ffmpeg4/ffmpeg4.info
index 50c38934da..dad8d9f9a9 100644
--- a/multimedia/ffmpeg4/ffmpeg4.info
+++ b/multimedia/ffmpeg4/ffmpeg4.info
@@ -1,10 +1,10 @@
 PRGNAM="ffmpeg4"
-VERSION="4.1"
+VERSION="4.3.2"
 HOMEPAGE="https://ffmpeg.org/"
-DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.1.tar.bz2"
-MD5SUM="8107e8f22a33b27a5e34b38e628eecc6"
+DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2"
+MD5SUM="d84e0f81740adefa76d94ed8c3aa9006"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libass"
-MAINTAINER="Andreas Guldstrand"
-EMAIL="andreas.guldstrand@gmail.com"
+REQUIRES="aom libass libwebp x264 x265"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
diff --git a/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild b/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
index 3095a132b4..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.344}
+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 56d1b442ff..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.344"
+VERSION="32.0.0.465"
 HOMEPAGE="https://get.adobe.com/flashplayer/"
-DOWNLOAD="https://fpdownload.adobe.com/get/flashplayer/pdc/32.0.0.344/flash_player_npapi_linux.i386.tar.gz"
-MD5SUM="774f9dc345164a4f7ef52096aa376c69"
-DOWNLOAD_x86_64="https://fpdownload.adobe.com/get/flashplayer/pdc/32.0.0.344/flash_player_npapi_linux.x86_64.tar.gz"
-MD5SUM_x86_64="4f552ec7a81f8710e24fc1bbec09683b"
+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/get_iplayer/get_iplayer.SlackBuild b/multimedia/get_iplayer/get_iplayer.SlackBuild
index 508e68a30d..86f4424fa5 100644
--- a/multimedia/get_iplayer/get_iplayer.SlackBuild
+++ b/multimedia/get_iplayer/get_iplayer.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=get_iplayer
-VERSION=${VERSION:-3.25}
+VERSION=${VERSION:-3.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/get_iplayer/get_iplayer.info b/multimedia/get_iplayer/get_iplayer.info
index 6c5b02e54c..39afd094fa 100644
--- a/multimedia/get_iplayer/get_iplayer.info
+++ b/multimedia/get_iplayer/get_iplayer.info
@@ -1,8 +1,8 @@
 PRGNAM="get_iplayer"
-VERSION="3.25"
+VERSION="3.26"
 HOMEPAGE="http://www.infradead.org/get_iplayer/html/get_iplayer.html"
-DOWNLOAD="https://github.com/get-iplayer/get_iplayer/archive/v3.25/get_iplayer-3.25.tar.gz"
-MD5SUM="6c9a2b1b138ffc5b69ee4ecaa76d62d1"
+DOWNLOAD="https://github.com/get-iplayer/get_iplayer/archive/v3.26/get_iplayer-3.26.tar.gz"
+MD5SUM="425901e2ff6742386eeb9f8aa3661b30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg perl-LWP-Protocol-https perl-JSON perl-xml-libxml perl-Mojolicious AtomicParsley"
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 94f94a9262..3f2efa3d1e 100644
--- a/multimedia/k9copy-reloaded/README
+++ b/multimedia/k9copy-reloaded/README
@@ -2,16 +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: 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 1: This script now uses the system ffmpeg, so be sure it is
+installed before trying to run this script.
 
 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 3: This program is only intended for personal backups, and is NOT
-intended for copying of copyrighted commercial DVDs.  Therefore, there
+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 a6c97ac873..4f1e30b823 100644
--- a/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
+++ b/multimedia/k9copy-reloaded/k9copy-reloaded.SlackBuild
@@ -2,12 +2,9 @@
 
 # Slackware build script for k9copy-reloaded
 
-# Copyright 2016 by Lenard Spencer (lspencer31-at-cfl-rr-com)
+# 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:-2}
-FFMPEG_VERSION=${FFMPEG_VERSION:-2.8.15}
+BUILD=${BUILD:-6}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -49,21 +45,15 @@ OUTPUT=${OUTPUT:-/tmp}
 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
 
 set -e
@@ -71,78 +61,63 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ffmpeg*
-tar xvf $CWD/ffmpeg-$FFMPEG_VERSION.tar.?z*
-cd ffmpeg*
-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 {} \;
-echo "Building static ffmpeg libs ..."
-
-FFMPEGDIR=/$TMP/ff-$(mcookie)
-
-CFLAGS="$SLKCFLAGS -fvisibility=hidden -I/usr/include/openmj2-2.1" \
-CXXFLAGS="$SLKCFLAGS -fvisibility=hidden -I/usr/include/openmj2-2.1" \
-./configure \
-    --prefix=$FFMPEGDIR/usr \
-    --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
 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 {} \;
-
-# patches from upstream and community:
-patch -p1 < $CWD/patches/k9copy-mimetype.patch
-patch -p0 < $CWD/patches/k9copy-tempdir.patch
-
-# Needed to link with the ffmpeg static libs we just built:
-export PKG_CONFIG_PATH="${FFMPEGDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig"
+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 {} \;
+
+# 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
+
+# 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 install DESTDIR=$PKG
@@ -152,7 +127,9 @@ 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 COPYING README $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
diff --git a/multimedia/k9copy-reloaded/k9copy-reloaded.info b/multimedia/k9copy-reloaded/k9copy-reloaded.info
index 1f850abaa6..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.15.tar.bz2"
-MD5SUM="53158282e23a4aa4fb8f4336f1424521 \
-        87b4e1680fdbf08f6504c33c1e278cc7"
+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-dvdnav.patch b/multimedia/k9copy-reloaded/patches/k9copy-dvdnav.patch
new file mode 100644
index 0000000000..bf456a3252
--- /dev/null
+++ b/multimedia/k9copy-reloaded/patches/k9copy-dvdnav.patch
@@ -0,0 +1,207 @@
+diff -Naur k9copy/src/libdvdnav-NOW/dvdnav/dvdnav.h k9copy.new/src/libdvdnav-NOW/dvdnav/dvdnav.h
+--- k9copy/src/libdvdnav-NOW/dvdnav/dvdnav.h	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/dvdnav/dvdnav.h	2020-04-17 15:06:57.239790857 -0400
+@@ -32,11 +32,11 @@
+ extern "C" {
+ #endif
+ 
+-#include <dvdnav/dvd_types.h>
+-#include <dvdread/dvd_reader.h>
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h> /* For vm_cmd_t */
+-#include <dvdnav/dvdnav_events.h>
++#include "dvdnav/dvd_types.h"
++#include "dvdread/dvd_reader.h"
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h" /* For vm_cmd_t */
++#include "dvdnav_events.h"
+ 
+ 
+ 
+diff -Naur k9copy/src/libdvdnav-NOW/dvdnav.c k9copy.new/src/libdvdnav-NOW/dvdnav.c
+--- k9copy/src/libdvdnav-NOW/dvdnav.c	2014-09-29 12:02:49.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/dvdnav.c	2020-04-17 14:58:35.428540596 -0400
+@@ -34,14 +34,14 @@
+ #include <string.h>
+ #include <sys/time.h>
+ #include "dvdnav/dvdnav.h"
+-#include <dvdread/dvd_reader.h>
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h> /* For vm_cmd_t */
++#include "dvdread/dvd_reader.h"
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h" /* For vm_cmd_t */
+ #include "vm/decoder.h"
+ #include "vm/vm.h"
+ #include "dvdnav_internal.h"
+ #include "read_cache.h"
+-#include <dvdread/nav_read.h>
++#include "dvdread/nav_read.h"
+ 
+ static dvdnav_status_t dvdnav_clear(dvdnav_t * this) {
+   /* clear everything except file, vm, mutex, readahead */
+diff -Naur k9copy/src/libdvdnav-NOW/highlight.c k9copy.new/src/libdvdnav-NOW/highlight.c
+--- k9copy/src/libdvdnav-NOW/highlight.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/highlight.c	2020-04-17 14:59:35.543043065 -0400
+@@ -29,7 +29,7 @@
+ #include <limits.h>
+ #include <string.h>
+ #include <sys/time.h>
+-#include <dvdread/nav_types.h>
++#include "dvdread/nav_types.h"
+ #include "dvdnav/dvdnav.h"
+ #include "vm/decoder.h"
+ #include "vm/vm.h"
+diff -Naur k9copy/src/libdvdnav-NOW/navigation.c k9copy.new/src/libdvdnav-NOW/navigation.c
+--- k9copy/src/libdvdnav-NOW/navigation.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/navigation.c	2020-04-17 15:00:18.333402659 -0400
+@@ -27,8 +27,8 @@
+ #include <string.h>
+ #include <sys/time.h>
+ #include "dvdnav/dvdnav.h"
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h>
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h"
+ #include "vm/decoder.h"
+ #include "vm/vm.h"
+ #include "dvdnav_internal.h"
+diff -Naur k9copy/src/libdvdnav-NOW/read_cache.c k9copy.new/src/libdvdnav-NOW/read_cache.c
+--- k9copy/src/libdvdnav-NOW/read_cache.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/read_cache.c	2020-04-17 15:01:33.012033279 -0400
+@@ -34,8 +34,8 @@
+ #include <sys/time.h>
+ #include <time.h>
+ #include "dvdnav/dvdnav.h"
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h>
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h"
+ #include "vm/decoder.h"
+ #include "vm/vm.h"
+ #include "dvdnav_internal.h"
+diff -Naur k9copy/src/libdvdnav-NOW/searching.c k9copy.new/src/libdvdnav-NOW/searching.c
+--- k9copy/src/libdvdnav-NOW/searching.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/searching.c	2020-04-17 15:02:25.819481072 -0400
+@@ -30,12 +30,12 @@
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include "dvdnav/dvdnav.h"
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h>
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h"
+ #include "vm/decoder.h"
+ #include "vm/vm.h"
+ #include "dvdnav_internal.h"
+-#include <dvdread/ifo_read.h>
++#include "dvdread/ifo_read.h"
+ 
+ /*
+ #define LOG_DEBUG
+diff -Naur k9copy/src/libdvdnav-NOW/settings.c k9copy.new/src/libdvdnav-NOW/settings.c
+--- k9copy/src/libdvdnav-NOW/settings.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/settings.c	2020-04-17 15:03:13.324884966 -0400
+@@ -27,8 +27,8 @@
+ #include <string.h>
+ #include <sys/time.h>
+ #include "dvdnav/dvdnav.h"
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h>
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h"
+ #include "vm/decoder.h"
+ #include "vm/vm.h"
+ #include "dvdnav_internal.h"
+diff -Naur k9copy/src/libdvdnav-NOW/vm/decoder.c k9copy.new/src/libdvdnav-NOW/vm/decoder.c
+--- k9copy/src/libdvdnav-NOW/vm/decoder.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/vm/decoder.c	2020-04-17 15:04:17.177429113 -0400
+@@ -32,8 +32,8 @@
+ #include <sys/time.h>
+ #include <assert.h>
+ 
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h> /* vm_cmd_t */
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h" /* vm_cmd_t */
+ 
+ #include "dvdnav/dvdnav.h"
+ #include "decoder.h"
+diff -Naur k9copy/src/libdvdnav-NOW/vm/getset.c k9copy.new/src/libdvdnav-NOW/vm/getset.c
+--- k9copy/src/libdvdnav-NOW/vm/getset.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/vm/getset.c	2020-04-17 15:09:14.945967023 -0400
+@@ -30,9 +30,9 @@
+ #include <stdio.h>
+ #include <inttypes.h>
+ 
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h>
+-#include <dvdread/ifo_read.h>
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h"
++#include "dvdread/ifo_read.h"
+ #include "dvdnav/dvdnav.h"
+ 
+ #include "decoder.h"
+diff -Naur k9copy/src/libdvdnav-NOW/vm/play.c k9copy.new/src/libdvdnav-NOW/vm/play.c
+--- k9copy/src/libdvdnav-NOW/vm/play.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/vm/play.c	2020-04-17 15:10:18.384509885 -0400
+@@ -29,9 +29,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h>
+-#include <dvdread/ifo_read.h>
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h"
++#include "dvdread/ifo_read.h"
+ #include "dvdnav/dvdnav.h"
+ 
+ #include "decoder.h"
+diff -Naur k9copy/src/libdvdnav-NOW/vm/vm.c k9copy.new/src/libdvdnav-NOW/vm/vm.c
+--- k9copy/src/libdvdnav-NOW/vm/vm.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/vm/vm.c	2020-04-17 15:11:23.105064197 -0400
+@@ -37,9 +37,9 @@
+ #include <sys/time.h>
+ #include <fcntl.h>
+ 
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h>
+-#include <dvdread/ifo_read.h>
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h"
++#include "dvdread/ifo_read.h"
+ #include "dvdnav/dvdnav.h"
+ 
+ #include "decoder.h"
+diff -Naur k9copy/src/libdvdnav-NOW/vm/vmcmd.c k9copy.new/src/libdvdnav-NOW/vm/vmcmd.c
+--- k9copy/src/libdvdnav-NOW/vm/vmcmd.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/vm/vmcmd.c	2020-04-17 15:12:20.354554837 -0400
+@@ -30,8 +30,8 @@
+ #include <sys/time.h>
+ 
+ #include "dvdnav/dvdnav.h"
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h>
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h"
+ #include "decoder.h"
+ #include "vm.h"
+ #include "vmcmd.h"
+diff -Naur k9copy/src/libdvdnav-NOW/vm/vmget.c k9copy.new/src/libdvdnav-NOW/vm/vmget.c
+--- k9copy/src/libdvdnav-NOW/vm/vmget.c	2014-09-29 11:50:54.000000000 -0400
++++ k9copy.new/src/libdvdnav-NOW/vm/vmget.c	2020-04-17 15:14:34.696659304 -0400
+@@ -31,9 +31,9 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include <dvdread/nav_types.h>
+-#include <dvdread/ifo_types.h>
+-#include <dvdread/ifo_read.h>
++#include "dvdread/nav_types.h"
++#include "dvdread/ifo_types.h"
++#include "dvdread/ifo_read.h"
+ #include "dvdnav/dvdnav.h"
+ 
+ #include "decoder.h"
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 862aa7da36..c224ef53ef 100644
--- a/multimedia/lives/lives.SlackBuild
+++ b/multimedia/lives/lives.SlackBuild
@@ -4,6 +4,7 @@
 
 # Copyright 2014-2015 Yanes Checcacci Balod <yanes@pobox.com>, Brazil
 # Copyright 2015-2016 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2020 Lenard Spencer, Orlando,Florida, USA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,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
@@ -58,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
@@ -74,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} \
@@ -91,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/lwks/lwks.SlackBuild b/multimedia/lwks/lwks.SlackBuild
index ced82cca3c..bd412df8c9 100644
--- a/multimedia/lwks/lwks.SlackBuild
+++ b/multimedia/lwks/lwks.SlackBuild
@@ -23,11 +23,9 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf data.tar.xz
-ar -p $CWD/$PRGNAM-$VERSION-$ARCH.deb data.tar.xz > lwks.tar.xz
-tar xvf $PRGNAM.tar.xz -C $TMP
-cd usr/
+cd $PKG
+ar p $CWD/$PRGNAM-$VERSION-$ARCH.deb data.tar.xz | tar xJv
+cd $PKG
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/multimedia/makemkv/makemkv.info b/multimedia/makemkv/makemkv.info
index 0cfdf756d4..9efdd707fc 100644
--- a/multimedia/makemkv/makemkv.info
+++ b/multimedia/makemkv/makemkv.info
@@ -1,8 +1,8 @@
 PRGNAM="makemkv"
 VERSION="1.14.4"
 HOMEPAGE="http://www.makemkv.com/"
-DOWNLOAD="http://www.makemkv.com/download/makemkv-oss-1.14.4.tar.gz \
-          http://www.makemkv.com/download/makemkv-bin-1.14.4.tar.gz"
+DOWNLOAD="http://www.makemkv.com/download/old/makemkv-oss-1.14.4.tar.gz \
+          http://www.makemkv.com/download/old/makemkv-bin-1.14.4.tar.gz"
 MD5SUM="e738e5e2e0ff2d556f00002699253271 \
         b7ec3c40359a9b5b5adb1a48dba36f30"
 DOWNLOAD_x86_64=""
diff --git a/multimedia/mediainfo/mediainfo.SlackBuild b/multimedia/mediainfo/mediainfo.SlackBuild
index f196f7aa7d..410d331fa0 100644
--- a/multimedia/mediainfo/mediainfo.SlackBuild
+++ b/multimedia/mediainfo/mediainfo.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
 # Copyright 2012-2017 Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-# Copyright 2017-2019  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2017-2020  Jeremy Hansen <jebrhansen+SBo -at- gmail.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=mediainfo
-VERSION=${VERSION:-19.09}
+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 c0b4bb3ad7..a7713afba0 100644
--- a/multimedia/mediainfo/mediainfo.info
+++ b/multimedia/mediainfo/mediainfo.info
@@ -1,8 +1,8 @@
 PRGNAM="mediainfo"
-VERSION="19.09"
+VERSION="20.09"
 HOMEPAGE="https://mediaarea.net/MediaInfo/"
-DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v19.09/MediaInfo-19.09.tar.gz"
-MD5SUM="b15f687a32f40bf383b8a8466ac2205c"
+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/README b/multimedia/mpv/README
index 3ae161a662..3dbd6498f5 100644
--- a/multimedia/mpv/README
+++ b/multimedia/mpv/README
@@ -1,40 +1,30 @@
-mpv
-===
-
 mpv is a movie player based on MPlayer and mplayer2. It shares some
 features with the former projects while introducing many more. It
 supports a wide variety of video file formats, audio and video codecs,
 and subtitle types.
 
-optional: docutils, jack, libbluray, libdvdnav,
-          libfdk-aac, libuchardet, OpenAL, lua, mujs, oss, rubberband,
-          SDL2, wayland, youtube-dl
-
-If docutils is not installed, the man pages will not be built/installed.
-This is the reason I have included docutils in both the `required` and
-`optional` lists. If you don't consider the man pages required, then the
-docutils package is optional, too. Building the man pages is
-recommended.
-
-If lua is not installed, much functionality will be lost. This is the
-reason I have included lua in both the `required` and `optional` lists.
-If you don't consider the functionality lua gives required, then the
-lua package is optional, too. Building with lua support is recommended.
+This SlackBuild provides support for most useful optional features.
+Some other optional features may be enabled by having the relevant
+packages installed; they will be autodetected at build time.
+These include:
+  jack, libuchardet, OpenAL, oss, rubberband, SDL2, wayland,
+  cudatoolkit & nv-codec-headers
 
-Dependencies are autodetected. Some optional dependencies are disabled
-by default and may be enabled (see BUILD_OPTS). Optional dependencies
-that are enabled by default may be disabled (see BUILD_OPTS).
+Please note that CUDA based hardware acceleration requires mpv to be
+built with both the cudatoolkit and nv-codec-headers packages installed.
 
-BUILD_OPTS:
-To override the default for build options, set the shell variable
-BUILD_OPTS prior to or at build time. For example, to enable cdda and
-openal, which are disabled by default, and to build with four jobs in
-parallel, you could use the following:
+Most dependencies are autodetected. Some optional dependencies are
+disabled by default and may be enabled via the BUILD_OPTS environment
+variable. Optional dependencies that are enabled by default may be
+disabled in the same way.
 
-~# BUILD_OPTS="--enable-cdda --enable-openal --jobs 4" sh mpv.SlackBuild
+For example, to enable support for Samba and SDL2 (both disabled
+by default) as well as to disable javascript support (normally
+autodetected), you could run:
 
-The following list is meant as a note to myself of build options or
-optional dependencies currently unavailable via full Slackware
-installation and from SBo:
+BUILD_OPTS="--enable-libsmbclient --enable-sdl2 --disable-javascript" \
+  sh mpv.SlackBuild
 
-vapoursynth, rsound
+Runtime support for youtube videos requires installation of youtube-dl
+(available from SBo) to be installed. Watch with something like:
+  mpv https://www.youtube.com/watch?v=mAFMJ1LnQu8
diff --git a/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild
index f4957c9a36..d4e5ce2a0b 100644
--- a/multimedia/mpv/mpv.SlackBuild
+++ b/multimedia/mpv/mpv.SlackBuild
@@ -3,6 +3,8 @@
 # Slackware build script for mpv
 
 # Copyright 2015 John Vogel Corning, NY USA
+# Copyright 2017,2018 (versions 0.25.0-0.29.1) Andreas Guldstrand
+# Copyright 2020 Christoph Willing  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +25,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpv
-VERSION=${VERSION:-0.29.1}
+VERSION=${VERSION:-0.33.0}
+WAF_VERSION=${WAF_VERSION:-2.0.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,9 +66,10 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cp $CWD/waf-2.0.9 $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 \
@@ -76,7 +80,7 @@ find -L . \
 DOCS="Copyright LICENSE.GPL LICENSE.LGPL README.md RELEASE_NOTES VERSION"
 MANUAL="DOCS/*.md DOCS/*.rst DOCS/*.txt"
 
-# This leaves an opening for build options.
+# This leaves an opening for additional build options.
 BUILD_OPTS=${BUILD_OPTS:-""}
 
 PKG_CONFIG_PATH="/usr/lib${LIBDIRSUFFIX}/ffmpeg4/pkgconfig"
@@ -89,6 +93,11 @@ export PKG_CONFIG_PATH
   --confdir=/etc/$PRGNAM \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-libmpv-shared \
+  --enable-html-build \
+  --enable-dvdnav \
+  --enable-cdda \
+  --enable-dvbin \
   $BUILD_OPTS
 
 ./waf build
diff --git a/multimedia/mpv/mpv.info b/multimedia/mpv/mpv.info
index d811d661fc..8dd18520f5 100644
--- a/multimedia/mpv/mpv.info
+++ b/multimedia/mpv/mpv.info
@@ -1,12 +1,12 @@
 PRGNAM="mpv"
-VERSION="0.29.1"
+VERSION="0.33.0"
 HOMEPAGE="https://mpv.io/"
-DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.29.1/mpv-0.29.1.tar.gz \
-          https://waf.io/waf-2.0.9"
-MD5SUM="2cd070c6aed980786177b7cb5b73664b \
-        3bc28bcd4868999798a6d2675211e23f"
+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="b08d25d3a44c3362984636e5dfa78ecc \
+        eb0cd320fc8838971cfa735ad78f6de8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="docutils ffmpeg4 lua"
-MAINTAINER="Andreas Guldstrand"
-EMAIL="andreas.guldstrand@gmail.com"
+REQUIRES="docutils ffmpeg4 libbluray libplacebo lua mujs"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
diff --git a/multimedia/musixmatch/README b/multimedia/musixmatch/README
index f8c3ceab24..1277f0005d 100644
--- a/multimedia/musixmatch/README
+++ b/multimedia/musixmatch/README
@@ -1,6 +1,6 @@
 musixmatch (The world's largest collection of song lyrics)
 
-Musixmatch is the world's largest collection of song lyrics used by 
+Musixmatch is the world's largest collection of song lyrics used by
 millions of people to get instant synchronised lyrics for Spotify,
-YouTube, Pandora and more. You can also now use it to get 
+YouTube, Pandora and more. You can also now use it to get
 song translations on the go.
diff --git a/multimedia/musixmatch/musixmatch.info b/multimedia/musixmatch/musixmatch.info
index 276ff6fc97..5e1156ca78 100644
--- a/multimedia/musixmatch/musixmatch.info
+++ b/multimedia/musixmatch/musixmatch.info
@@ -4,7 +4,7 @@ HOMEPAGE="https://www.musixmatch.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
 DOWNLOAD_x86_64="https://download-app.musixmatch.com/download/musixmatch_3.10.4043-master.20200211001_amd64.deb"
-MD5SUM_x86_64="2fab80385df3cc6d1a579b07322b05cf"
+MD5SUM_x86_64="a35c8872d5c61289f8507ca0d7c8b5b4"
 REQUIRES="spotify"
 MAINTAINER="Reza Talebi"
 EMAIL="reza.talebi.73@outlook.com"
diff --git a/multimedia/obs-studio/README b/multimedia/obs-studio/README
index 590efc0be7..22446edbfb 100644
--- a/multimedia/obs-studio/README
+++ b/multimedia/obs-studio/README
@@ -9,3 +9,6 @@ build time.
 Another optional build requirement is the mbedtls package which is used
 to provide RTMPS support. However it will be disabled unless at least
 version 2.7.0 of the mbedtls package is detected at build time.
+
+Due to the cmake version in Slackware-14.2,
+the latest buildable version of obs-studio is restricted to version 24.0.6.
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 cd3ccaa0df..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.344}
+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 208567cee6..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.344"
+VERSION="32.0.0.465"
 HOMEPAGE="https://get.adobe.com/flashplayer/otherversions/"
-DOWNLOAD="https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.344/flash_player_ppapi_linux.i386.tar.gz"
-MD5SUM="5f669fb6842b7290cf9f3a7f698a5d32"
-DOWNLOAD_x86_64="https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.344/flash_player_ppapi_linux.x86_64.tar.gz"
-MD5SUM_x86_64="5eefa51557b18a96a8b7e4a97c2d906e"
+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/doinst.sh b/multimedia/plexmediaserver/doinst.sh
index 0908c4e6c4..b295ab1144 100644
--- a/multimedia/plexmediaserver/doinst.sh
+++ b/multimedia/plexmediaserver/doinst.sh
@@ -11,15 +11,19 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# Keep same perms on rc.plexmediaserver.new:
-if [ -e etc/rc.d/rc.plexmediaserver ]; then
-  cp -a etc/rc.d/rc.plexmediaserver etc/rc.d/rc.plexmediaserver.new.incoming
-  cat etc/rc.d/rc.plexmediaserver.new > etc/rc.d/rc.plexmediaserver.new.incoming
-  mv etc/rc.d/rc.plexmediaserver.new.incoming etc/rc.d/rc.plexmediaserver.new
-fi
+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/rc.d/rc.plexmediaserver.new
-config etc/default/plexmediaserver
+preserve_perms etc/rc.d/rc.plexmediaserver.new
+config etc/default/plexmediaserver.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/multimedia/plexmediaserver/plexmediaserver.SlackBuild b/multimedia/plexmediaserver/plexmediaserver.SlackBuild
index ff60da3225..462c61ed14 100644
--- a/multimedia/plexmediaserver/plexmediaserver.SlackBuild
+++ b/multimedia/plexmediaserver/plexmediaserver.SlackBuild
@@ -5,6 +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-2021 Stu Miller <slackbuilds@go4it2day.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=plexmediaserver
-VERSION=${VERSION:-1.18.9.2571_e106a8a91}
+VERSION=${VERSION:-1.22.2.4282_a97b03fad}
 PKG_VERSION=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -91,12 +92,13 @@ fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $PKG
-rm -rf $PRGNAM-$PKG_VERSION
-ar xv $CWD/${PRGNAM}_${PKG_VERSION}_${DEBARCH}.deb
-tar xvf data.tar.?z
-rm -f debian-binary control.tar.?z data.tar.?z
-rm -rf $PKG/etc/apt/ $PKG/etc/init $PKG/etc/init.d
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+ar xv $CWD/${PRGNAM}_${PKG_VERSION}_${DEBARCH}.deb data.tar.xz
+tar xvf data.tar.xz -C $PRGNAM-$VERSION
+rm -f data.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 \
@@ -104,24 +106,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 {} \;
 
-mkdir -p $PKG/opt/$PRGNAM/bin/
-mv $PKG/usr/lib/plexmediaserver $PKG/opt/$PRGNAM/lib
+mkdir -p $PKG/usr/lib/
+mv usr/lib/plexmediaserver $PKG/usr/lib
 
-mv usr/sbin/start_pms $PKG/opt/$PRGNAM/bin/
-sed -i -e "s#/usr/lib/plexmediaserver#/opt/$PRGNAM/lib#" \
-	$PKG/opt/$PRGNAM/bin/start_pms
-mkdir -p $PKG/usr/bin/
-ln -s /opt/$PRGNAM/bin/start_pms \
-	$PKG/usr/bin/start_pms
+mkdir -p $PKG/usr/share/applications/
+mv usr/share/applications/plexmediaserver.desktop $PKG/usr/share/applications
+sed -i -e "s/x-www-browser/xdg-open/" $PKG/usr/share/applications/plexmediaserver.desktop
 
-mv usr/share/applications/plexmediaserver.desktop $PKG/opt/$PRGNAM/
-sed -i -e "s/x-www-browser/xdg-open/" \
-	$PKG/opt/$PRGNAM/plexmediaserver.desktop
-mkdir -p $PKG/usr/share/applications
-ln -s /opt/$PRGNAM/plexmediaserver.desktop \
-	$PKG/usr/share/applications/plexmediaserver.desktop
+mkdir -p $PKG/etc/rc.d
+cat $PKG/usr/lib/$PRGNAM/lib/$PRGNAM.init > $PKG/etc/rc.d/rc.$PRGNAM.new
+chmod 0644 $PKG/etc/rc.d/rc.$PRGNAM.new
 
-rm -rf $PKG/etc/systemd $PKG/usr/share/doc $PKG/usr/sbin $PKG/usr/lib
+mkdir -p $PKG/etc/default
+cat $PKG/usr/lib/plexmediaserver/lib/plexmediaserver.default > $PKG/etc/default/$PRGNAM.new
+chmod 0644 $PKG/etc/default/$PRGNAM.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -129,16 +127,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/var/lib/$PRGNAM
 chown -R $PLEX_USER:$PLEX_GROUP $PKG/var/lib/$PRGNAM
 
-mkdir -p $PKG/etc/rc.d/
-cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
-chmod 0644 $PKG/etc/rc.d/rc.$PRGNAM.new
-
-# cleanup
-(
-  cd $PKG
-  rm -rf _gpgplex lib
-)
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/multimedia/plexmediaserver/plexmediaserver.info b/multimedia/plexmediaserver/plexmediaserver.info
index 6dda8cd9dd..2ac5b50f07 100644
--- a/multimedia/plexmediaserver/plexmediaserver.info
+++ b/multimedia/plexmediaserver/plexmediaserver.info
@@ -1,10 +1,10 @@
 PRGNAM="plexmediaserver"
-VERSION="1.18.9.2571_e106a8a91"
+VERSION="1.22.2.4282_a97b03fad"
 HOMEPAGE="https://plex.tv/"
-DOWNLOAD="https://downloads.plex.tv/plex-media-server-new/1.18.9.2571-e106a8a91/debian/plexmediaserver_1.18.9.2571-e106a8a91_i386.deb"
-MD5SUM="542c088975ef1b4d824f22b18de4dc2f"
-DOWNLOAD_x86_64="https://downloads.plex.tv/plex-media-server-new/1.18.9.2571-e106a8a91/debian/plexmediaserver_1.18.9.2571-e106a8a91_amd64.deb"
-MD5SUM_x86_64="607e4710fafd587aa95779047186ad11"
+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="Kevin Matthew"
-EMAIL="kevin@kevinmatthew.com"
+MAINTAINER="Stu Miller"
+EMAIL="slackbuilds@go4it2day.com"
diff --git a/multimedia/plexmediaserver/rc.plexmediaserver b/multimedia/plexmediaserver/rc.plexmediaserver
deleted file mode 100644
index 0ca0d327e4..0000000000
--- a/multimedia/plexmediaserver/rc.plexmediaserver
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-# Copyright 2016 Marcel Saegebarth <marc@mos6581.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.
- 
-RUN_USER=plex
- 
-plexmediaserver_start() {
-  PIDOF=$(pidof "Plex Media Server")
-
-  if [ -z "$PIDOF" ]; then
-  echo "Starting plexmediaserver..."
-  /bin/su -s /bin/sh -l $RUN_USER -c '/usr/bin/start_pms &> /dev/null &'
-  else
-    echo "plexmediaserver is already active (PID: $PIDOF)."
-    exit 1
-  fi
-}
- 
-plexmediaserver_stop() {
-  PIDOF=$(pidof "Plex Media Server")
-  # plugins may still running when stopping plexmediaserver on its startup
-  # process
-  PGREP_PLUGINS=$(pgrep -f "Plex Plug-in")
-  PGREP_DLNA=$(pgrep -f "Plex DLNA Server")
-  PGREP_TUNER=$(pgrep -f "Plex Tuner Service")
-  PGREP_EGP=$(pgrep -f "Plex EAE Service")
-  PGREP_TRANSCODER=$(pgrep -f "Plex Transcoder")
-  PGREP_PLEXRELAY=$(pgrep -f "Plex Relay")
-
-
-  if [ -z "$PIDOF" ] && [ -z "$PGREP_PLUGINS" ]; then
-    echo "plexmediaserver is not running..."
-    exit 1
-  else
-    echo -n "Stopping plexmediaserver..."
-
-    if [ -n "$PIDOF" ]; then
-      kill -9 $PIDOF
-    fi
-
-    if [ -n "$PGREP_PLUGINS" ]; then
-      for i in "$PGREP_PLUGINS"; do
-        kill -9 $i
-      done
-    fi
-
-    if [ -n "$PGREP_DLNA" ]; then
-      for i in "$PGREP_DLNA"; do
-        kill -9 $i
-      done
-    fi
-
-    if [ -n "$PGREP_TUNER" ]; then
-      for i in "$PGREP_TUNER"; do
-        kill -9 $i
-      done
-    fi
-
-    if [ -n "$PGREP_EGP" ]; then
-      for i in "$PGREP_EGP"; do
-        kill -9 $i
-      done
-    fi
-
-    if [ -n "$PGREP_TRANSCODER" ]; then
-      for i in "$PGREP_TRANSCODER"; do
-        kill -9 $i
-      done
-    fi
-
-    if [ -n "$PGREP_PLEXRELAY" ]; then
-      for i in "$PGREP_PLEXRELAY"; do
-        kill -9 $i
-      done
-    fi
-
-
-
-    echo "done"
-  fi
-}
-
-plexmediaserver_restart() {
-  plexmediaserver_stop
-  sleep 3
-  plexmediaserver_start
-}
- 
-case "$1" in
-    start) plexmediaserver_start   ;;
-     stop) plexmediaserver_stop    ;;
-  restart) plexmediaserver_restart ;;
-        *) echo "USAGE: $0 start|stop|restart"
-           exit 1 ;;
-esac
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/smplayer/smplayer.SlackBuild b/multimedia/smplayer/smplayer.SlackBuild
index 101e0f1f6d..4f35b384cb 100644
--- a/multimedia/smplayer/smplayer.SlackBuild
+++ b/multimedia/smplayer/smplayer.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for SMPlayer
 
 # Copyright 2011-2015  Fridrich von Stauffenberg <cancellor2@gmail.com>
-# Copyright 2019 Andrzej Telszewski, Szczecin
+# Copyright 2020 Andrzej Telszewski, Szczecin
 # 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=smplayer
-VERSION=${VERSION:-19.10.2}
+VERSION=${VERSION:-20.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/smplayer/smplayer.info b/multimedia/smplayer/smplayer.info
index 5392930d88..68bf664793 100644
--- a/multimedia/smplayer/smplayer.info
+++ b/multimedia/smplayer/smplayer.info
@@ -1,10 +1,10 @@
 PRGNAM="smplayer"
-VERSION="19.10.2"
+VERSION="20.6.0"
 HOMEPAGE="https://www.smplayer.info/"
-DOWNLOAD="https://downloads.sourceforge.net/smplayer/smplayer-19.10.2.tar.bz2 \
+DOWNLOAD="https://downloads.sourceforge.net/smplayer/smplayer-20.6.0.tar.bz2 \
           https://downloads.sourceforge.net/smplayer/smplayer-themes-18.6.0.tar.bz2 \
           https://downloads.sourceforge.net/smplayer/smplayer-skins-15.2.0.tar.bz2"
-MD5SUM="9440bce02118e4599302a050e6eea41a \
+MD5SUM="90f1b3cf797580d61517369bda1befcc \
         8fe83cd59189291ca0d3beea1991e50b \
         57e165cf9a95808fafd179e5322b7f15"
 DOWNLOAD_x86_64=""
diff --git a/multimedia/smtube/README b/multimedia/smtube/README
index 5b45f3a55f..e4e60dc5ba 100644
--- a/multimedia/smtube/README
+++ b/multimedia/smtube/README
@@ -3,7 +3,8 @@ videos. Videos are played back with a media player (by default SMPlayer)
 instead of a flash player, this allows better performance, particularly
 with HD content.
 
-If you prefer to build SMTube against Qt5 rather than Qt4, install qt5 and
-qt5-webkit (both available from SlackBuilds.org) and run the script like that:
+If you prefer to build SMTube against Qt5 rather than Qt4, install qt5
+and qt5-webkit (both available from SlackBuilds.org) and run the script
+like that:
 
   USE_QT5=yes ./smplayer.SlackBuild
diff --git a/multimedia/smtube/smtube.SlackBuild b/multimedia/smtube/smtube.SlackBuild
index 456e59ecd4..d690e2dc2e 100644
--- a/multimedia/smtube/smtube.SlackBuild
+++ b/multimedia/smtube/smtube.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for SMTube
 
 # Copyright 2012-2015  Fridrich von Stauffenberg <cancellor2@gmail.com>
-# Copyright 2019 Andrzej Telszewski, Szczecin
+# Copyright 2020 Andrzej Telszewski, Szczecin
 # 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=smtube
-VERSION=${VERSION:-19.6.0}
+VERSION=${VERSION:-20.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/smtube/smtube.info b/multimedia/smtube/smtube.info
index de3a89c1ac..e64ef9e8cf 100644
--- a/multimedia/smtube/smtube.info
+++ b/multimedia/smtube/smtube.info
@@ -1,8 +1,8 @@
 PRGNAM="smtube"
-VERSION="19.6.0"
+VERSION="20.6.0"
 HOMEPAGE="https://www.smtube.org/"
-DOWNLOAD="https://download.sourceforge.net/project/smtube/SMTube/19.6.0/smtube-19.6.0.tar.bz2"
-MD5SUM="355dec97781b6973af3e244099b7e541"
+DOWNLOAD="https://download.sourceforge.net/project/smtube/SMTube/20.6.0/smtube-20.6.0.tar.bz2"
+MD5SUM="78e91392cf6faf6a94b566a3c33806c1"
 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/README b/multimedia/straw-viewer/README
index b25df5614e..aff15dfd6e 100644
--- a/multimedia/straw-viewer/README
+++ b/multimedia/straw-viewer/README
@@ -1,16 +1,18 @@
 straw-viewer (search and stream videos from youtube)
 
 straw-viewer is a lightweight application for searching and streaming
-videos from YouTube, using the API of invidio.us. The project is in its
-early development stages and some features are not implemented yet.
+videos from YouTube, using the API of invidio.us[2]. The project is
+in its early development stages and some features are not implemented
+yet.
 
 straw-viewer is a fork of youtube-viewer that does not require a Google
 API key. Usage and user interface are identical to youtube-viewer.
 
 For playing videos, this uses mplayer, vlc, or mpv. However, the mplayer
 that ships with Slackware 14.2 has some issues with straw-viewer (or
-actually with youtube: the audio stream cuts out randomly). Using vlc
-or mpv is highly recommended.
+actually with youtube: the audio stream cuts out randomly, and can be
+fixed by pressing the left arrow usually). Using vlc or mpv is highly
+recommended.
 
 Optional dependencies:
 
@@ -27,17 +29,27 @@ Counting optional ones, straw-viewer has over 40 dependencies. To make
 life easier, there's a "straw-viewer.sqf" queue file included with this
 build, which includes everything listed above.
 
+This build always includes the command-line client (straw-viewer). For
+the GTK client (gtk-straw-viewer[3]), install perl-Gtk3 and
+perl-File-ShareDir before running this script. If you have them
+installed but don't want gtk-straw-viewer, you can set GTK=no in the
+script's environment.
+
+Notes:
+
 [1] A small caveat about youtube-dl: straw-viewer works without it,
-though occasionally it'll choose a lower quality than is available
-for some videos. However, if youtube-dl is present but outdated,
-straw-viewer will fail to play videos at all! If you suspect this,
-remove youtube-dl and try without it.
-
-This build always includes the command-line client (straw-viewer). For the
-GTK client (gtk-straw-viewer), install perl-Gtk3 and perl-File-ShareDir
-before running this script. If you have them installed but don't want
-gtk-straw-viewer, you can set GTK=no in the script's environment.
-
-To force gtk-straw-viewer to use your preferred terminal for downloading
-with wget and watching in a terminal, set TERMINAL in the script's
-environment (e.g. TERMINAL="xterm" or TERMINAL="urxvt").
+    though occasionally it'll choose a lower quality than is available
+    for some videos. However, if youtube-dl is present but outdated,
+    straw-viewer will fail to play videos at all! If you suspect this,
+    remove youtube-dl and try without it.
+
+[2] The default API host is http://invidious.snopyta.org. If you get
+    "Bad gateway" or "Too many requests" errors, try changing the
+    api_host in ~/.config/straw-viewer/straw-viewer.conf or via
+    the --api-host option. A list of API hosts can be found at:
+    https://instances.invidio.us/
+
+[3] To force gtk-straw-viewer to use your preferred terminal for
+    downloading with wget and watching in a terminal, set
+    TERMINAL in the script's environment (e.g. TERMINAL="xterm" or
+    TERMINAL="urxvt").
diff --git a/multimedia/straw-viewer/restore_mplayer.diff b/multimedia/straw-viewer/restore_mplayer.diff
new file mode 100644
index 0000000000..1c3f5f8285
--- /dev/null
+++ b/multimedia/straw-viewer/restore_mplayer.diff
@@ -0,0 +1,41 @@
+diff -Naur straw-viewer-0.1.0/bin/gtk-straw-viewer straw-viewer-0.1.0.patched/bin/gtk-straw-viewer
+--- straw-viewer-0.1.0/bin/gtk-straw-viewer	2020-10-06 15:16:34.000000000 -0400
++++ straw-viewer-0.1.0.patched/bin/gtk-straw-viewer	2020-10-12 01:17:39.658582800 -0400
+@@ -160,6 +160,13 @@
+                               fs    => q{--fullscreen},
+                               arg   => q{--really-quiet --title=*TITLE* --no-ytdl},
+                              },
++                      mplayer => {
++                                  cmd   => q{mplayer},
++                                  srt   => q{-sub *SUB*},
++                                  audio => q{-audiofile *AUDIO*},
++                                  fs    => q{-fs},
++                                  arg   => q{-prefer-ipv4 -really-quiet -title *TITLE*},
++                                 },
+                       smplayer => {
+                                    cmd => q{smplayer},
+                                    srt => q{-sub *SUB*},
+diff -Naur straw-viewer-0.1.0/bin/straw-viewer straw-viewer-0.1.0.patched/bin/straw-viewer
+--- straw-viewer-0.1.0/bin/straw-viewer	2020-10-06 15:16:34.000000000 -0400
++++ straw-viewer-0.1.0.patched/bin/straw-viewer	2020-10-12 01:18:57.794575697 -0400
+@@ -153,11 +153,19 @@
+                               arg     => q{--really-quiet --title=*TITLE* --no-ytdl},
+                               novideo => q{--no-video},
+                              },
++                      mplayer => {
++                                  cmd     => q{mplayer},
++                                  srt     => q{-sub *SUB*},
++                                  audio   => q{-audiofile *AUDIO*},
++                                  fs      => q{-fs},
++                                  arg     => q{-prefer-ipv4 -really-quiet -title *TITLE*},
++                                  novideo => q{-novideo},
++                                 },
+                      },
+ 
+     video_player_selected => (
+         $constant{win32}
+-        ? 'vlc'
++        ? 'mplayer'
+         : undef    # auto-defined
+     ),
+ 
diff --git a/multimedia/straw-viewer/straw-viewer.SlackBuild b/multimedia/straw-viewer/straw-viewer.SlackBuild
index 7ac1fee7a9..763f6bfa41 100644
--- a/multimedia/straw-viewer/straw-viewer.SlackBuild
+++ b/multimedia/straw-viewer/straw-viewer.SlackBuild
@@ -6,6 +6,16 @@
 
 # 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.
+# 20200525 bkw:
+# - update to latest git.
+# - add patch to re-enable mplayer.
+# - add note in README about new --api-host option.
+
 # 20200310 bkw: update to not-quite-latest git. Next commit after 9089523
 # removes mplayer support, which kinda sucks for Slackware users since
 # mplayer ships with the OS (but mpv and vlc don't). My next update will
@@ -17,7 +27,7 @@
 # issues that have been fixed.
 
 PRGNAM=straw-viewer
-VERSION=${VERSION:-0.0.2+20200307_9089523}
+VERSION=${VERSION:-0.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,6 +86,12 @@ esac
 
 echo "=== GTK=$GTK  BUILD_GTK=$BUILD_GTK  GTKOPT=$GTKOPT"
 
+# 20200525 bkw: Upstream removed mplayer support because it's flaky.
+# That's as may be, but mplayer is included in core Slackware and the
+# other players aren't. So we'll give the user the option to at least
+# try it. Patch made with: git diff 9c9bbdf4..9089523
+patch -p1 < $CWD/restore_mplayer.diff
+
 # 20200228 bkw: upstream claims gtk+3-3.20 is required, but everything
 # actually works fine with 14.2's 3.18. So:
 sed -i 's,"3.20","3.18",' share/gtk-$PRGNAM.glade
diff --git a/multimedia/straw-viewer/straw-viewer.info b/multimedia/straw-viewer/straw-viewer.info
index 5144df6a25..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.0.2+20200307_9089523"
+VERSION="0.1.2"
 HOMEPAGE="https://github.com/trizen/straw-viewer/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/straw-viewer-0.0.2+20200307_9089523.tar.xz"
-MD5SUM="60675a74c96dd9d7fa0f1096f32977c5"
+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/strawberry/slack-desc b/multimedia/strawberry/slack-desc
index a61d8a3cac..53873dfbfb 100644
--- a/multimedia/strawberry/slack-desc
+++ b/multimedia/strawberry/slack-desc
@@ -8,10 +8,10 @@
           |-----handy-ruler------------------------------------------------------|
 strawberry: strawberry (fork of Clementine)
 strawberry:
-strawberry: Strawberry is a audio player and music collection organizer. It is a 
-strawberry: fork of Clementine released in 2018 aimed at music collectors, audio 
-strawberry: enthusiasts and audiophiles. The name is inspired by the band 
-strawberry: Strawbs. It's based on a heavily modified version of Clementine 
+strawberry: Strawberry is a audio player and music collection organizer. It is a
+strawberry: fork of Clementine released in 2018 aimed at music collectors, audio
+strawberry: enthusiasts and audiophiles. The name is inspired by the band
+strawberry: Strawbs. It's based on a heavily modified version of Clementine
 strawberry: created in 2012-2013. It's written in C++ and Qt 5.
 strawberry:
 strawberry:
diff --git a/multimedia/strawberry/strawberry.SlackBuild b/multimedia/strawberry/strawberry.SlackBuild
index 809fc4497c..8ff3ecf4f7 100644
--- a/multimedia/strawberry/strawberry.SlackBuild
+++ b/multimedia/strawberry/strawberry.SlackBuild
@@ -27,7 +27,7 @@
 # Modified by SlackBuilds.org
 
 PRGNAM=strawberry
-VERSION=${VERSION:-0.6.8}
+VERSION=${VERSION:-0.6.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/strawberry/strawberry.info b/multimedia/strawberry/strawberry.info
index ecf9170e1e..f3674cb114 100644
--- a/multimedia/strawberry/strawberry.info
+++ b/multimedia/strawberry/strawberry.info
@@ -1,8 +1,8 @@
 PRGNAM="strawberry"
-VERSION="0.6.8"
+VERSION="0.6.12"
 HOMEPAGE="https://www.strawberrymusicplayer.org/"
-DOWNLOAD="https://files.jkvinge.net/packages/strawberry/strawberry-0.6.8.tar.xz"
-MD5SUM="3e4aa26e5d5239626e9a4c62dc15f648"
+DOWNLOAD="https://files.jkvinge.net/packages/strawberry/strawberry-0.6.12.tar.xz"
+MD5SUM="947cae0b362e09964791acd4ac59492f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="chromaprint protobuf cryptopp qt5"
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/README b/multimedia/vlc/README
index 0ac727b531..48a30411a4 100644
--- a/multimedia/vlc/README
+++ b/multimedia/vlc/README
@@ -34,12 +34,9 @@ security feature may be side stepped by building vlc with the RUNASROOT
 environment variable set e.g.
   RUNASROOT=yes sh vlc.SlackBuild
 
-Some versions of the automatically deteced optional libaom package are
-incompatible with this version of vlc (the build will fail with an
-incompatible libaom). Such an incompatible libaom may be ignored
-during building by setting the LIBAOM environmant variable to "no"
-e.g.
-  LIBAOM=no sh vlc.SlackBuild
+Playing of AV1 encoded video is supported when either of SBo's
+multimedia/aom or libraries/dav1d packages is detected when vlc is built.
+One of these is expected to become required in a future release.
 
 Please advise the maintainer to suggest support for any further options.
 
diff --git a/multimedia/vlc/patch-dvdnav-503.diff b/multimedia/vlc/patch-dvdnav-503.diff
new file mode 100644
index 0000000000..422fc53d03
--- /dev/null
+++ b/multimedia/vlc/patch-dvdnav-503.diff
@@ -0,0 +1,13 @@
+--- modules/access/dvdnav.c.orig	2020-04-07 23:35:05.000000000 +1000
++++ modules/access/dvdnav.c	2020-04-16 22:32:34.175000000 +1000
+@@ -59,6 +59,10 @@
+ 
+ 
+ #include <dvdnav/dvdnav.h>
++/* libdvdnav-5.0.3 doesn't define DVDNAV_VERSION */
++#ifndef DVDNAV_VERSION
++#define DVDNAV_VERSION (50003)
++#endif
+ /* Expose without patching headers */
+ dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *, uint64_t, int32_t);
+ 
diff --git a/multimedia/vlc/patch-dvdread-503.diff b/multimedia/vlc/patch-dvdread-503.diff
new file mode 100644
index 0000000000..81523e6829
--- /dev/null
+++ b/multimedia/vlc/patch-dvdread-503.diff
@@ -0,0 +1,15 @@
+--- modules/access/dvdread.c.orig	2020-03-28 23:39:33.000000000 +1000
++++ modules/access/dvdread.c	2020-04-16 22:10:43.065000000 +1000
+@@ -55,6 +55,12 @@
+ #include <unistd.h>
+ 
+ #include <dvdread/dvd_reader.h>
++#ifndef DVDREAD_VERSION_CODE
++#define DVDREAD_VERSION_CODE(major, minor, micro) \
++    (((major) * 10000) +                          \
++     ((minor) *   100) +                          \
++     ((micro) *     1))
++#endif
+ #include <dvdread/ifo_types.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/nav_read.h>
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 4f21102ecd..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.8}
+VERSION=${VERSION:-3.0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,6 +81,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 
+patch -p0 < $CWD/patch-dvdread-503.diff
+patch -p0 < $CWD/patch-dvdnav-503.diff
 patch -p0 < $CWD/patch-projectM-fontpath.diff
 patch -p0 < $CWD/patch_vlc_cache_gen.diff
 
@@ -103,9 +105,6 @@ fi
 # Enable vlc to be run as root
 runasroot=""; [ "${RUNASROOT:-no}" != "no" ] && runasroot="--enable-run-as-root"
 
-# Disable use of libaom
-libaom=""; [ "${LIBAOM:-yes}" = "no" ] && libaom="--disable-aom"
-
 autoreconf -fiv
 
 chown -R root:root .
@@ -130,7 +129,6 @@ LDFLAGS="$SLKLDFLAGS" \
   $wayland \
   $opencv \
   $runasroot \
-  $libaom \
   --enable-merge-ffmpeg \
   --enable-libva=no \
   --with-kde-solid=no \
diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info
index 96f288ffb5..08febffa16 100644
--- a/multimedia/vlc/vlc.info
+++ b/multimedia/vlc/vlc.info
@@ -1,8 +1,8 @@
 PRGNAM="vlc"
-VERSION="3.0.8"
+VERSION="3.0.12"
 HOMEPAGE="https://www.videolan.org/vlc/"
-DOWNLOAD="https://get.videolan.org/vlc/3.0.8/vlc-3.0.8.tar.xz"
-MD5SUM="744442ec0c145453ea1d257914c8072e"
+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/slack-desc b/multimedia/vokoscreen/slack-desc
deleted file mode 100644
index fb49a51f85..0000000000
--- a/multimedia/vokoscreen/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------------------------------------------------------|
-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:
diff --git a/multimedia/vokoscreen/vokoscreen.SlackBuild b/multimedia/vokoscreen/vokoscreen.SlackBuild
deleted file mode 100644
index 66a31fd981..0000000000
--- a/multimedia/vokoscreen/vokoscreen.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for <appname>
-
-# Harald Achitz | Stockholm/Sweden | harald.achitz@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=vokoscreen
-VERSION=${VERSION:-2.5.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 {} \;
-
-qmake-qt5 VOKOSCREEN_INSTALL_PREFIX=/usr QMAKE_CXXFLAGS="$SLKCFLAGS"
-make
-make install INSTALL_ROOT=$PKG
-
-mv $PKG/usr/share/man $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
-
-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 CREDITS \
-  $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/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/webvfx/README b/multimedia/webvfx/README
new file mode 100644
index 0000000000..6f6e2b1232
--- /dev/null
+++ b/multimedia/webvfx/README
@@ -0,0 +1 @@
+webvfx is a video effects engine based on the mlt framework.
diff --git a/multimedia/webvfx/slack-desc b/multimedia/webvfx/slack-desc
new file mode 100644
index 0000000000..f5472d857c
--- /dev/null
+++ b/multimedia/webvfx/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------------------------------------------------------|
+webvfx: webvfx (video effects engine)
+webvfx:
+webvfx:
+webvfx: webvfx is a video effects engine based on the mlt framework.
+webvfx:
+webvfx:
+webvfx:
+webvfx:
+webvfx: Website: https://github.com/mltframework/webvfx
+webvfx:
+webvfx:
diff --git a/multimedia/webvfx/webvfx.SlackBuild b/multimedia/webvfx/webvfx.SlackBuild
new file mode 100644
index 0000000000..1d3c5df5a1
--- /dev/null
+++ b/multimedia/webvfx/webvfx.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh -e
+
+# Slackware build script for webvfx
+
+# Copyright 2020 Christopher L Duston <christopher.duston@protonmail.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=webvfx
+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
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.txz
+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 {} \;
+
+qmake-qt5 -r PREFIX=/usr
+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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  $TMP/$PRGNAM-$VERSION/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/multimedia/webvfx/webvfx.info b/multimedia/webvfx/webvfx.info
new file mode 100644
index 0000000000..f2f26cb81f
--- /dev/null
+++ b/multimedia/webvfx/webvfx.info
@@ -0,0 +1,10 @@
+PRGNAM="webvfx"
+VERSION="1.1.0"
+HOMEPAGE="https://github.com/mltframework/webvfx"
+DOWNLOAD="https://github.com/mltframework/webvfx/releases/download/1.1.0/webvfx-1.1.0.txz"
+MD5SUM="23380751bc2aa7ccdd429e911dbfb5f7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5-webkit"
+MAINTAINER="Christopher L Duston"
+EMAIL="christopher.duston@protonmail.com"
diff --git a/multimedia/x265/x265.SlackBuild b/multimedia/x265/x265.SlackBuild
index 6f395a0eee..e891d63354 100644
--- a/multimedia/x265/x265.SlackBuild
+++ b/multimedia/x265/x265.SlackBuild
@@ -23,8 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=x265
-VERSION=${VERSION:-3.3}
-SRCNAM=057215961bc4
+VERSION=${VERSION:-3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf multicoreware-$PRGNAM-$SRCNAM
-tar xvf $CWD/$VERSION.tar.bz2 || tar xvf $CWD/multicoreware-$PRGNAM-$SRCNAM.tar.bz2
-cd multicoreware-$PRGNAM-$SRCNAM
+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/multimedia/x265/x265.info b/multimedia/x265/x265.info
index a4aacad246..852cae9117 100644
--- a/multimedia/x265/x265.info
+++ b/multimedia/x265/x265.info
@@ -1,8 +1,8 @@
 PRGNAM="x265"
-VERSION="3.3"
+VERSION="3.4"
 HOMEPAGE="https://www.videolan.org/developers/x265.html"
-DOWNLOAD="https://bitbucket.org/multicoreware/x265/get/3.3.tar.bz2"
-MD5SUM="e1b74d727e6aee171440df3b612c31cd"
+DOWNLOAD="https://github.com/videolan/x265/archive/3.4/x265-3.4.tar.gz"
+MD5SUM="d867c3a7e19852974cf402c6f6aeaaf3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/xawtv/xawtv.SlackBuild b/multimedia/xawtv/xawtv.SlackBuild
index 36485bc3ec..4157d83657 100644
--- a/multimedia/xawtv/xawtv.SlackBuild
+++ b/multimedia/xawtv/xawtv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xawtv
 
-# 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=xawtv
-VERSION=${VERSION:-3.106}
+VERSION=${VERSION:-3.107}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,6 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-gl \
   --build=$ARCH-slackware-linux
 
+make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/multimedia/xawtv/xawtv.info b/multimedia/xawtv/xawtv.info
index c2f8f49a71..2ffdd97f69 100644
--- a/multimedia/xawtv/xawtv.info
+++ b/multimedia/xawtv/xawtv.info
@@ -1,8 +1,8 @@
 PRGNAM="xawtv"
-VERSION="3.106"
+VERSION="3.107"
 HOMEPAGE="https://www.kraxel.org/blog/linux/xawtv/"
-DOWNLOAD="https://linuxtv.org/downloads/xawtv/xawtv-3.106.tar.bz2"
-MD5SUM="1fd7c98fa8973f501d52449202c71ca7"
+DOWNLOAD="https://linuxtv.org/downloads/xawtv/xawtv-3.107.tar.bz2"
+MD5SUM="3c9171aeeda7ca3eb2287f45ca7e86a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/xmms-cue/README b/multimedia/xmms-cue/README
new file mode 100644
index 0000000000..2108a0a27a
--- /dev/null
+++ b/multimedia/xmms-cue/README
@@ -0,0 +1,2 @@
+VirtualCueXmms is an input plugin for XMMS 1.x
+for the parsing/playing of CUE sheet files.
diff --git a/multimedia/xmms-cue/slack-desc b/multimedia/xmms-cue/slack-desc
new file mode 100644
index 0000000000..ef1e69017c
--- /dev/null
+++ b/multimedia/xmms-cue/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------------------------------------------------------|
+xmms-cue: xmms-cue (XMMS Cuesheet reader plugin)
+xmms-cue:
+xmms-cue: VirtualCueXmms is an XMMS input plugin for playing CUE files.
+xmms-cue:
+xmms-cue: http://virtualcuexmms.sourceforge.net/
+xmms-cue:
+xmms-cue:
+xmms-cue:
+xmms-cue:
+xmms-cue:
+xmms-cue:
diff --git a/multimedia/xmms-cue/xmms-cue.SlackBuild b/multimedia/xmms-cue/xmms-cue.SlackBuild
new file mode 100644
index 0000000000..feaf6ff531
--- /dev/null
+++ b/multimedia/xmms-cue/xmms-cue.SlackBuild
@@ -0,0 +1,134 @@
+#!/bin/sh
+#
+# Slackware build script for VirtualCue plugin for XMMS 1.x.
+#
+# 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=xmms-cue
+SRCNAM=VirtualCueXmms
+VERSION=${VERSION:-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
+
+# 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"
+  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-$VERSION.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 {} \;
+
+# The object file CueParser.o is 32-bit.
+# Thus, it must be recompiled for
+# 64-bit build to work.
+case "$ARCH" in
+  i?86) ;;
+     *) cd Cueparser
+        gcc -v -g $SLKCFLAGS -c CueParser.c
+        cd .. ;;
+esac
+
+# Compile general plugin
+cd GeneralPlayer
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
+
+sed -i "6s/-O/$SLKCFLAGS/" Makefile
+sed -i "10i\
+INSTALLPATH = $PKG\/usr\/lib${LIBDIRSUFFIX}\/xmms\/General" Makefile
+make
+make install
+
+# Compile input plugin
+cd ../InPlayer
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
+
+sed -i "6s/-O/$SLKCFLAGS/" Makefile
+sed -i "10i\
+INSTALLPATH = $PKG\/usr\/lib${LIBDIRSUFFIX}\/xmms\/Input" Makefile
+make
+make install
+
+find $PKG -print0 | xargs -0 file | grep -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
+cat $TMP/$SRCNAM/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $TMP/$SRCNAM/TODO > $PKG/usr/doc/$PRGNAM-$VERSION/TODO
+
+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/xmms-cue/xmms-cue.info b/multimedia/xmms-cue/xmms-cue.info
new file mode 100644
index 0000000000..01b4c3a272
--- /dev/null
+++ b/multimedia/xmms-cue/xmms-cue.info
@@ -0,0 +1,10 @@
+PRGNAM="xmms-cue"
+VERSION="0.2"
+HOMEPAGE="http://virtualcuexmms.sourceforge.net/"
+DOWNLOAD="https://sourceforge.net/projects/virtualcuexmms/files/virtualcuexmms/VirtualCueXmms%200.2/VirtualCueXmms-0.2.tar.gz/download"
+MD5SUM="c9ebf2a7f07a430b05fa105a0483c000"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jay"
+EMAIL="ld.jay@protonmail.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/2ping/2ping.SlackBuild b/network/2ping/2ping.SlackBuild
index d81a2c738c..1e52bff087 100644
--- a/network/2ping/2ping.SlackBuild
+++ b/network/2ping/2ping.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200805 bkw: update for v4.5.
 # 20191130 bkw: update for v4.3.
 
 # 20180821 bkw:
@@ -14,7 +15,7 @@
 # - include wireshark stuff in package.
 
 PRGNAM=2ping
-VERSION=${VERSION:-4.3}
+VERSION=${VERSION:-4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/2ping/2ping.info b/network/2ping/2ping.info
index e1197b74ab..dd25f12962 100644
--- a/network/2ping/2ping.info
+++ b/network/2ping/2ping.info
@@ -1,8 +1,8 @@
 PRGNAM="2ping"
-VERSION="4.3"
+VERSION="4.5"
 HOMEPAGE="https://www.finnie.org/software/2ping/"
-DOWNLOAD="https://github.com/rfinnie/2ping/archive/v4.3/2ping-4.3.tar.gz"
-MD5SUM="50c476b63cd3aa13a2ed2c5def018e8b"
+DOWNLOAD="https://github.com/rfinnie/2ping/archive/v4.5/2ping-4.5.tar.gz"
+MD5SUM="acfb9d8e40cfae72bf1767347528ae4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/network/AdGuardHome/AdGuardHome.SlackBuild b/network/AdGuardHome/AdGuardHome.SlackBuild
index 377d99df4e..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.101.0}
+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 1c143f2edd..b254d22293 100644
--- a/network/AdGuardHome/AdGuardHome.info
+++ b/network/AdGuardHome/AdGuardHome.info
@@ -1,10 +1,10 @@
 PRGNAM="AdGuardHome"
-VERSION="0.101.0"
+VERSION="0.105.2"
 HOMEPAGE="https://adguard.com/adguard-home.html"
-DOWNLOAD="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.101.0/AdGuardHome_linux_386.tar.gz"
-MD5SUM="7323bf988724522f34fac11b642463e7"
-DOWNLOAD_x86_64="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.101.0/AdGuardHome_linux_amd64.tar.gz"
-MD5SUM_x86_64="0f1cb08a299953d40d971368f005599b"
+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 d5895bfdab..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:-3.3.8}
+VERSION=${VERSION:-4.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/Electrum/Electrum.info b/network/Electrum/Electrum.info
index 08ac9c3e5e..c11549a938 100644
--- a/network/Electrum/Electrum.info
+++ b/network/Electrum/Electrum.info
@@ -1,10 +1,10 @@
 PRGNAM="Electrum"
-VERSION="3.3.8"
+VERSION="4.1.1"
 HOMEPAGE="https://electrum.org/"
-DOWNLOAD="https://download.electrum.org/3.3.8/Electrum-3.3.8.tar.gz"
-MD5SUM="66a1d04927f7cf7bb44a254d8791de96"
+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 ecdsa python-qrcode protobuf3 python-jsonrpclib dnspython pyaes secp256k1 python3-certifi python3-six python3-aiohttp python3-aiohttp-socks python3-aiorpcX python-chardet 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/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.SlackBuild b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.SlackBuild
new file mode 100644
index 0000000000..faf559b5e1
--- /dev/null
+++ b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for NetworkManager-fortisslvpn
+
+# Copyright 2020 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
+# 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=NetworkManager-fortisslvpn
+VERSION=${VERSION:-1.2.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 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 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --without-gnome \
+  --without-libnm-glib \
+  --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 \
+  AUTHORS COPYING ChangeLog 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/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.info b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.info
new file mode 100644
index 0000000000..d7472771fe
--- /dev/null
+++ b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.info
@@ -0,0 +1,10 @@
+PRGNAM="NetworkManager-fortisslvpn"
+VERSION="1.2.10"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn"
+DOWNLOAD="https://github.com/GNOME/NetworkManager-fortisslvpn/archive/1.2.10/NetworkManager-fortisslvpn-1.2.10.tar.gz"
+MD5SUM="5a484064654e2428067674e4d9382ec0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="openfortivpn"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerado.zamudio@linux.com"
diff --git a/network/NetworkManager-fortisslvpn/README b/network/NetworkManager-fortisslvpn/README
new file mode 100644
index 0000000000..7740068ef6
--- /dev/null
+++ b/network/NetworkManager-fortisslvpn/README
@@ -0,0 +1 @@
+Fortinet SSLVPN support for NetworkManager
diff --git a/network/NetworkManager-fortisslvpn/slack-desc b/network/NetworkManager-fortisslvpn/slack-desc
new file mode 100644
index 0000000000..9b57abc7e3
--- /dev/null
+++ b/network/NetworkManager-fortisslvpn/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------------------------------------------------------|
+NetworkManager-fortisslvpn: NetworkManager-fortisslvpn (NetworkManager SSLVPN)
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn: Fortinet SSLVPN support for NetworkManager
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn: This requires the openfortivpn client installed, version 1.10 or newer
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
+NetworkManager-fortisslvpn:
diff --git a/network/Quaternion/Quaternion.SlackBuild b/network/Quaternion/Quaternion.SlackBuild
index dc72254b20..a43bdc3ebc 100644
--- a/network/Quaternion/Quaternion.SlackBuild
+++ b/network/Quaternion/Quaternion.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Quaternion
-VERSION=${VERSION:-0.0.9.4c}
+VERSION=${VERSION:-0.0.9.4e}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/Quaternion/Quaternion.info b/network/Quaternion/Quaternion.info
index 292f287e2f..69eb62ee78 100644
--- a/network/Quaternion/Quaternion.info
+++ b/network/Quaternion/Quaternion.info
@@ -1,10 +1,10 @@
 PRGNAM="Quaternion"
-VERSION="0.0.9.4c"
+VERSION="0.0.9.4e"
 HOMEPAGE="https://github.com/quotient-im/Quaternion"
-DOWNLOAD="https://github.com/quotient-im/Quaternion/archive/0.0.9.4c/Quaternion-0.0.9.4c.tar.gz"
-MD5SUM="6786fbdeec6edc5432694216aebe2ebf"
+DOWNLOAD="https://github.com/quotient-im/Quaternion/archive/0.0.9.4e/Quaternion-0.0.9.4e.tar.gz"
+MD5SUM="e489f331b49f18e0554b60070e61b7c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libQuotient"
+REQUIRES="qt5 libQuotient"
 MAINTAINER="Charles Daniels"
 EMAIL="charles@cdaniels.net"
diff --git a/network/Quaternion/slack-desc b/network/Quaternion/slack-desc
index 62a58bcee7..b8c7bdb2bd 100644
--- a/network/Quaternion/slack-desc
+++ b/network/Quaternion/slack-desc
@@ -1,3 +1,10 @@
+# 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------------------------------------------------------|
 Quaternion: Quaternion (A Qt5-based IM client for Matrix)
 Quaternion:
diff --git a/network/QuiteRSS/QuiteRSS.SlackBuild b/network/QuiteRSS/QuiteRSS.SlackBuild
index 25db6d35bc..5c5b72efbe 100644
--- a/network/QuiteRSS/QuiteRSS.SlackBuild
+++ b/network/QuiteRSS/QuiteRSS.SlackBuild
@@ -3,9 +3,10 @@
 # Slackware build script for QuiteRSS
 
 # Written by  Andrey Maraev <andrew.maraev60@yandex.ru>
+# Maintained by Spycrowsoft as of 2020-10-18
 
 PRGNAM=QuiteRSS
-VERSION=${VERSION:-0.18.9}
+VERSION=${VERSION:-0.19.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/QuiteRSS/QuiteRSS.info b/network/QuiteRSS/QuiteRSS.info
index da08dbe69c..f37df41ce7 100644
--- a/network/QuiteRSS/QuiteRSS.info
+++ b/network/QuiteRSS/QuiteRSS.info
@@ -1,10 +1,10 @@
 PRGNAM="QuiteRSS"
-VERSION="0.18.9"
+VERSION="0.19.4"
 HOMEPAGE="http://quiterss.org/en/node"
-DOWNLOAD="https://quiterss.org/files/0.18.9/QuiteRSS-0.18.9-src.tar.gz"
-MD5SUM="6a1d7b3ad8842d8c9cd745a8076726c2"
+DOWNLOAD="https://quiterss.org/files/0.19.4_/QuiteRSS-0.19.4-src.tar.gz"
+MD5SUM="96a25a33904dadba2daa3ea5c92d4388"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Reedych"
-EMAIL="reedych@ya.ru"
+MAINTAINER="Spycrowsoft"
+EMAIL="spycrowsoft [ at ] gmail [ dot ] com"
diff --git a/network/RTL8192/README b/network/RTL8192/README
new file mode 100644
index 0000000000..57af2d7643
--- /dev/null
+++ b/network/RTL8192/README
@@ -0,0 +1,26 @@
+The RTL8192 package includes the kernel module '8192eu',
+which contains a TP-Link-provided kernel driver known to
+support the Realtek 8192 chipset, and possibly others.
+
+Slackware kernel-source package needs to be installed for build to work,
+and module will need to be re-built after a kernel upgrade.
+
+To build for a kernel other than the one currently running,
+pass KVER variable when invoking SlackBuild script.  E.g.,
+
+   KVER=4.4.14 ./RTL8192.SlackBuild
+
+This driver is advertised to work with the following TP-Link USB wifi
+adapters: TL-WN821N V6/TL-WN822N V5/TL-WN823N V3.  The driver has
+also been tested (both i386 & x86_64) to work for the TL-WN823N V2.
+Other brands of USB devices utilizing the Realtek 8192 chip may work,
+as well.
+
+From the website:
+
+   Published Date: 2018-05-08
+   Operating System: Linux (kernel 2.6.24 ~ 4.9.60)
+
+   For TL-WN821N V6/TL-WN822N V5/TL-WN823N V3.
+   This is a beta version; unknown bugs may still exist.
+   The formal version is coming soon.
diff --git a/network/RTL8192/RTL8192.SlackBuild b/network/RTL8192/RTL8192.SlackBuild
new file mode 100644
index 0000000000..f54f57b1c8
--- /dev/null
+++ b/network/RTL8192/RTL8192.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+#
+# Slackware build script for RTL8192 wifi USB driver.
+#
+# 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=RTL8192
+VERSION=${VERSION:-5.2.19.1}
+BUILD=${BUILD:-25633}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i386 ;;
+  arm64*) ARCH=arm64 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+else
+  # 32-bit PC build fails if ARCH != i386
+  case "$ARCH" in
+    i?86) export ARCH=i386 ;;
+  esac
+fi
+
+# Caveat emptor
+case "$ARCH" in
+    i386) ;;
+  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}
+KVER=${KVER:-$( uname -r )}
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$PRGNAM
+mkdir -p $PKG $OUTPUT $TMP/$PRGNAM
+# Nested zip files
+unzip $CWD/TP-Link_Driver_Linux_series8_beta.zip -d $TMP/$PRGNAM
+cd $TMP/$PRGNAM
+unzip rtl8192EU_WiFi_linux_v5.2.19.1_25633.20171222_COEX20171113-0047.zip
+cd rtl8192EU_WiFi_linux_v5.2.19.1_25633.20171222_COEX20171113-0047
+
+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/lib/modules/$KVER/kernel/drivers/net/wireless/
+sed -i 's/install -p -m 644 $(MODULE_NAME).ko  $(MODDESTDIR)/install -p -m 644 $(MODULE_NAME).ko  $(DESTDIR)$(MODDESTDIR)/' Makefile
+sed -i "s/\/sbin\/depmod -a \${KVER}//" Makefile
+sed -i "s/KVER.*:=/KVER ?=/" Makefile
+
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $TMP/$PRGNAM/readme_beta.txt > $PKG/usr/doc/$PRGNAM-$VERSION/readme_beta.txt
+cp $TMP/$PRGNAM/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION/
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat << EOF > $PKG/install/doinst.sh
+# A good idea whenever kernel modules are added or changed:
+if [ -x sbin/depmod ]; then
+  chroot . /sbin/depmod -a 1> /dev/null 2> /dev/null
+fi
+EOF
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$KVER-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/RTL8192/RTL8192.info b/network/RTL8192/RTL8192.info
new file mode 100644
index 0000000000..ee8ff7cfe1
--- /dev/null
+++ b/network/RTL8192/RTL8192.info
@@ -0,0 +1,10 @@
+PRGNAM="RTL8192"
+VERSION="5.2.19.1"
+HOMEPAGE="https://www.tp-link.com/ca/support/download/tl-wn823n/"
+DOWNLOAD="https://static.tp-link.com/2018/201805/20180514/TP-Link_Driver_Linux_series8_beta.zip"
+MD5SUM="e2c4dbb26f2a4d3eaa6f52328b6e6010"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jay"
+EMAIL="ld.jay@protonmail.com"
diff --git a/network/RTL8192/slack-desc b/network/RTL8192/slack-desc
new file mode 100644
index 0000000000..62257426a3
--- /dev/null
+++ b/network/RTL8192/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------------------------------------------------------|
+RTL8192: RTL8192 (Realtek RTL8192 chip Driver)
+RTL8192:
+RTL8192: Specifically for TP-Link adapters:
+RTL8192: TL-WN821N V6/TL-WN822N V5/TL-WN823N V3.
+RTL8192: Also verified working on TL-WN823N V2.
+RTL8192:
+RTL8192: May also work on other brands using the RTL8192.
+RTL8192:
+RTL8192: For more information, see:
+RTL8192: https://www.tp-link.com/ca/support/download/tl-wn823n/
+RTL8192:
diff --git a/network/Signal-Desktop/README b/network/Signal-Desktop/README
deleted file mode 100644
index 738d21f711..0000000000
--- a/network/Signal-Desktop/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Signal Desktop is a chrome packaged app that links with your
-Signal Android or Signal iOS app.
-
-Signal is an encrypted instant messaging and voice calling
-application for Android and iOS. It uses the Internet to
-send one-to-one and group messages, which can include images
-and video messages, and make one-to-one voice calls.
-
-Please be sure to run the SlackBuild with a real root shell
-using 'su -l'.  If the build fails with an access error, remove
-the npm cache:
-
-  rm -rf ~/.npm/
diff --git a/network/Signal-Desktop/Signal-Desktop.SlackBuild b/network/Signal-Desktop/Signal-Desktop.SlackBuild
deleted file mode 100644
index 5682b12be7..0000000000
--- a/network/Signal-Desktop/Signal-Desktop.SlackBuild
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Signal-Desktop
-
-# Copyright 2017 Rodrigo Gimenez <estrod[at]zoho[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=Signal-Desktop
-VERSION=${VERSION:-0.42.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 $TMP/$PRGNAM-$VERSION
-chown -R root:root .
-
-patch -Np1 < $CWD/expirejs.patch
-npm install
-node_modules/grunt-cli/bin/grunt
-
-cd dist
-
-install -Ddm755 "$PKG/opt/$PRGNAM"
-cp -r * "$PKG/opt/$PRGNAM"
-
-install -Ddm755 "$PKG/usr/bin"
-echo -e "#!/bin/bash\n/usr/bin/nw /opt/$PRGNAM" > "$PKG/usr/bin/signal"
-chmod +x "$PKG/usr/bin/signal"
-
-install -Ddm755 "$PKG/usr/share/applications"
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-
-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
-
-for icon_size in 16 32 48 128 250 256; do
-	icon_dir="$PKG/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
-	install -d "$icon_dir"
-	install -m644 "../images/icon_${icon_size}.png" "$icon_dir/$PRGNAM.png"
-done
-
-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/Signal-Desktop/Signal-Desktop.desktop b/network/Signal-Desktop/Signal-Desktop.desktop
deleted file mode 100644
index 5274855218..0000000000
--- a/network/Signal-Desktop/Signal-Desktop.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Signal Desktop
-Comment=Signal Private Messenger for the Desktop
-Exec=/usr/bin/signal
-StartupWMClass=Signal-Desktop
-Icon=Signal-Desktop
-Terminal=false
-Type=Application
-Categories=Network;
diff --git a/network/Signal-Desktop/Signal-Desktop.info b/network/Signal-Desktop/Signal-Desktop.info
deleted file mode 100644
index d0366d1b40..0000000000
--- a/network/Signal-Desktop/Signal-Desktop.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="Signal-Desktop"
-VERSION="0.42.2"
-HOMEPAGE="https://github.com/WhisperSystems/Signal-Desktop"
-DOWNLOAD="https://github.com/WhisperSystems/Signal-Desktop/archive/v0.42.2/Signal-Desktop-0.42.2.tar.gz"
-MD5SUM="97a093a38f7b8d837e40fbc0e84e3585"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="nodejs nwjs rubygem-sass"
-MAINTAINER="Rodrigo Gimenez"
-EMAIL="estrod[at]zoho[dot]com"
diff --git a/network/Signal-Desktop/expirejs.patch b/network/Signal-Desktop/expirejs.patch
deleted file mode 100644
index 02f2ffc2dc..0000000000
--- a/network/Signal-Desktop/expirejs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -bur Signal-Desktop-0.42.2/Gruntfile.js Signal-Desktop-0.42.2-fix/Gruntfile.js
---- Signal-Desktop-0.42.2/Gruntfile.js	2017-03-30 19:12:25.000000000 -0300
-+++ Signal-Desktop-0.42.2-fix/Gruntfile.js	2017-04-01 08:58:49.662938344 -0300
-@@ -127,9 +127,10 @@
-                 /textsecure-service-staging.whispersystems.org/g,
-                 'textsecure-service-ca.whispersystems.org');
-             } else if (srcpath.match('expire.js')) {
--              var gitinfo = grunt.config.get('gitinfo');
--              var commited = gitinfo.local.branch.current.lastCommitTime;
--              var time = Date.parse(commited) + 1000 * 60 * 60 * 24 * 90;
-+              //var gitinfo = grunt.config.get('gitinfo');
-+              //var commited = gitinfo.local.branch.current.lastCommitTime;
-+              //var time = Date.parse(commited) + 1000 * 60 * 60 * 24 * 90;
-+              var time = NaN;
-               return content.replace(
-                 /var BUILD_EXPIRATION = 0/,
-                 "var BUILD_EXPIRATION = " + time
diff --git a/network/Signal-Desktop/slack-desc b/network/Signal-Desktop/slack-desc
deleted file mode 100644
index ee7eca4ab6..0000000000
--- a/network/Signal-Desktop/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------------------------------------------------------|
-Signal-Desktop: Signal-Desktop (Signal Private Messenger for the Desktop)
-Signal-Desktop:
-Signal-Desktop: Signal is an encrypted instant messaging and voice calling
-Signal-Desktop: application for Android and iOS. It uses the Internet to send
-Signal-Desktop: one-to-one and group messages, which can include images and
-Signal-Desktop: video messages, and make one-to-one voice calls.
-Signal-Desktop:
-Signal-Desktop:
-Signal-Desktop:
-Signal-Desktop:
-Signal-Desktop:
diff --git a/network/TeamSpeak3/TeamSpeak3.SlackBuild b/network/TeamSpeak3/TeamSpeak3.SlackBuild
index 041342a7fe..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.3.2}
+VERSION=${VERSION:-3.5.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/TeamSpeak3/TeamSpeak3.info b/network/TeamSpeak3/TeamSpeak3.info
index 3d9721f2d5..f6d5be52f0 100644
--- a/network/TeamSpeak3/TeamSpeak3.info
+++ b/network/TeamSpeak3/TeamSpeak3.info
@@ -1,10 +1,10 @@
 PRGNAM="TeamSpeak3"
-VERSION="3.3.2"
+VERSION="3.5.6"
 HOMEPAGE="https://www.teamspeak.com/en/"
-DOWNLOAD="https://files.teamspeak-services.com/releases/client/3.3.2/TeamSpeak3-Client-linux_x86-3.3.2.run"
-MD5SUM="0ef269a11d72edeef110b5196c8e0d01"
-DOWNLOAD_x86_64="https://files.teamspeak-services.com/releases/client/3.3.2/TeamSpeak3-Client-linux_amd64-3.3.2.run"
-MD5SUM_x86_64="b26c2c9db335c7c15e45a162766312c2"
+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/UDR/README b/network/UDR/README
index 653b521e76..044eca08fa 100644
--- a/network/UDR/README
+++ b/network/UDR/README
@@ -11,7 +11,7 @@ then places the connection between the rsync client and server.
 To use UDR, prefix the current rsync command used to transfer data with
 'udr', for example:
 
-udr rsync -avz /home/user/dir/ user@example.com:/home/user/dir
+udr rsync -av /home/user/dir/ user@example.com:/home/user/dir
 
 Any rsync options can be used.
 
diff --git a/network/UDR/UDR.SlackBuild b/network/UDR/UDR.SlackBuild
index ecaecb07e6..064ca4b6ea 100644
--- a/network/UDR/UDR.SlackBuild
+++ b/network/UDR/UDR.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for UDR
 
-# Copyright 2017, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia
 # 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=UDR
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.9.4_774f2e7}
+GITVERSION=${GITVERSION:-774f2e76c58feeb09dc5401fdff4207602b6f088}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr/bin $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$GITVERSION
+tar xvf $CWD/$GITVERSION.tar.gz
+cd $PRGNAM-$GITVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/network/UDR/UDR.info b/network/UDR/UDR.info
index 61c04c6341..772b79909a 100644
--- a/network/UDR/UDR.info
+++ b/network/UDR/UDR.info
@@ -1,8 +1,8 @@
 PRGNAM="UDR"
-VERSION="0.9.4"
-HOMEPAGE="https://github.com/LabAdvComp/UDR"
-DOWNLOAD="https://github.com/LabAdvComp/UDR/archive/v0.9.4/UDR-0.9.4.tar.gz"
-MD5SUM="74a7ebd384156be0fc3d9a08890e098b"
+VERSION="0.9.4_774f2e7"
+HOMEPAGE="https://github.com/martinetd/UDR"
+DOWNLOAD="https://github.com/martinetd/UDR/archive/774f2e7/774f2e76c58feeb09dc5401fdff4207602b6f088.tar.gz"
+MD5SUM="a046d266b95d113d3cecc8ff505c562f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/UDR/slack-desc b/network/UDR/slack-desc
index d665c18bf2..98a3ccf65a 100644
--- a/network/UDR/slack-desc
+++ b/network/UDR/slack-desc
@@ -12,7 +12,7 @@ UDR: UDR is a wrapper around rsync that enables rsync to use UDT protocol
 UDR: and thus improves throughput of large data transfers over long
 UDR: distances.
 UDR:
-UDR: HOMEPAGE: https://github.com/LabAdvComp/UDR
+UDR: HOMEPAGE: https://github.com/martinetd/UDR
 UDR:
 UDR:
 UDR:
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 2becfe5aca..44518a476a 100644
--- a/network/acme.sh/README
+++ b/network/acme.sh/README
@@ -1,14 +1,18 @@
 An ACME Shell script
 
- - An ACME protocol client written purely in Shell (Unix shell) language.
+ - 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.
+ - 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.
+ - 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
@@ -17,3 +21,4 @@ An ACME Shell script
  Optional dependencies:
 
 * socat - to standalone mode
+
diff --git a/network/acme.sh/acme.sh.SlackBuild b/network/acme.sh/acme.sh.SlackBuild
index f1741842e7..554aa6df98 100644
--- a/network/acme.sh/acme.sh.SlackBuild
+++ b/network/acme.sh/acme.sh.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 #
 # 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 dcf8ff0d56..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:-5.5.4}
+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 4bd5968ddd..15a9deed47 100644
--- a/network/anydesk/anydesk.info
+++ b/network/anydesk/anydesk.info
@@ -1,10 +1,10 @@
 PRGNAM="anydesk"
-VERSION="5.5.4"
+VERSION="6.1.0"
 HOMEPAGE="https://anydesk.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.anydesk.com/linux/anydesk_5.5.4-1_x86_64.rpm"
-MD5SUM_x86_64="4abd972632848fb8bb2d15faed84f3e8"
+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 3e35584dd6..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.8.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.8.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 7e9c513e0f..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.9.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 680b82438a..00aca78b29 100644
--- a/network/asterisk/asterisk.info
+++ b/network/asterisk/asterisk.info
@@ -1,7 +1,7 @@
 PRGNAM="asterisk"
-VERSION="16.9.0"
+VERSION="16.15.0"
 HOMEPAGE="https://www.asterisk.org"
-DOWNLOAD="https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-16.9.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 \
@@ -35,9 +35,9 @@ DOWNLOAD="https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-16.9.0.
           https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz \
           https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz.sha1 \
           https://raw.githubusercontent.com/asterisk/third-party/master/jansson/2.12/jansson-2.12.tar.bz2 \
-          https://www.pjsip.org/release/2.9/pjproject-2.9.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="f50a3073061c5b72cd06cc0059e15804 \
+MD5SUM="2f03204a38e8ed49e58474961d43f363 \
         d90e24e30d707e2932cf419cfccff25a \
         3c071029c1ab648367666d1e384394bb \
         e4a9ee348028fc0e47148f783e7f945b \
@@ -71,7 +71,7 @@ MD5SUM="f50a3073061c5b72cd06cc0059e15804 \
         8277e2c693fd056773b1c15e4d52077d \
         011fa4dc9fe35dc3d34ed557bb04263f \
         317dbaf90a9f85ea0ec7b12d080d173d \
-        66757078e7bd7cf316acb0425c2fdd6f \
+        4fffc49b461133f0a4143b05a22fb30e \
         d9f7fd4e1d93ad9fca1df8717a79d1c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/awscli/awscli.SlackBuild b/network/awscli/awscli.SlackBuild
index aa5392d994..a9a7cd2b1e 100644
--- a/network/awscli/awscli.SlackBuild
+++ b/network/awscli/awscli.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=awscli
-VERSION=${VERSION:-1.17.15}
+VERSION=${VERSION:-1.18.141}
 BUILD=${BUILD:-1}
 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
 
 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 PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt PKG-INFO 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/network/awscli/awscli.info b/network/awscli/awscli.info
index 94faf14c36..c6d98c2b64 100644
--- a/network/awscli/awscli.info
+++ b/network/awscli/awscli.info
@@ -1,10 +1,10 @@
 PRGNAM="awscli"
-VERSION="1.17.15"
+VERSION="1.18.141"
 HOMEPAGE="https://aws.amazon.com/cli/"
-DOWNLOAD="https://files.pythonhosted.org/packages/2e/e5/b80329cb29004fd073a61fead50755898d25e2127d12c27ad9ef70c55741/awscli-1.17.15.tar.gz"
-MD5SUM="350b7270208a2119890e5c36e1f7ddef"
+DOWNLOAD="https://files.pythonhosted.org/packages/f0/4b/24e8a4568dcc12c27391cfa48dd73afd159886e0ca3a4ec47e56d95678bf/awscli-1.18.141.tar.gz"
+MD5SUM="eff481eb3ae06d5c22a7ad1729b3922e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="s3transfer colorama rsa PyYAML"
+REQUIRES="s3transfer colorama python3-rsa python3-PyYAML"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
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 0a02564bd5..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.7}
+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 ABOUT-NLS 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 31158b1fd4..994749100c 100644
--- a/network/axel/axel.info
+++ b/network/axel/axel.info
@@ -1,10 +1,10 @@
 PRGNAM="axel"
-VERSION="2.17.7"
+VERSION="2.17.10"
 HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.7/axel-2.17.7.tar.gz"
-MD5SUM="7ae8b2cee4dd75caf4c6a810470940ba"
+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 bf26b9db6c..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.19.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 37ddf51ef1..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.19.1}
+VERSION=${VERSION:-0.21.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/bitcoin/bitcoin.info b/network/bitcoin/bitcoin.info
index e05fbb739c..c9df6a1ae7 100644
--- a/network/bitcoin/bitcoin.info
+++ b/network/bitcoin/bitcoin.info
@@ -1,8 +1,8 @@
 PRGNAM="bitcoin"
-VERSION="0.19.1"
+VERSION="0.21.0"
 HOMEPAGE="https://bitcoincore.org"
-DOWNLOAD="https://bitcoincore.org/bin/bitcoin-core-0.19.1/bitcoin-0.19.1.tar.gz"
-MD5SUM="6066d7247a5a8c61392fb79ae882bd30"
+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 4627a26c0a..d322989b32 100644
--- a/network/bluejeans/bluejeans.SlackBuild
+++ b/network/bluejeans/bluejeans.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bluejeans
 
-# Copyright 2019 Igor Alexandrov <igora.vault@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=bluejeans
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.21.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,6 +35,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+set -e
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -48,12 +50,10 @@ if [ "$ARCH" != "x86_64" ]; then
   exit 1
 fi
 
-set -e
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-rpm2cpio $CWD/$SRCNAM.rpm | cpio -idmv
+rpm2cpio $CWD/${SRCNAM}_${VERSION}.rpm | cpio -idmv
 
 chown -R root:root .
 find -L . \
@@ -65,6 +65,11 @@ find -L . \
 find . -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+sed -i \
+  '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}
 ln -s ../../opt/$SRCNAM/$EXECNAM usr/bin/$PRGNAM
 ln -s ../../../opt/$SRCNAM/LICENSE.electron.txt usr/doc/$PRGNAM-$VERSION
diff --git a/network/bluejeans/bluejeans.info b/network/bluejeans/bluejeans.info
index a13d97eaf7..a348be5d79 100644
--- a/network/bluejeans/bluejeans.info
+++ b/network/bluejeans/bluejeans.info
@@ -1,10 +1,10 @@
 PRGNAM="bluejeans"
-VERSION="2.1.0"
+VERSION="2.21.3.2"
 HOMEPAGE="https://www.bluejeans.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://swdl.bluejeans.com/desktop-app/linux/2.1.0/BlueJeans.rpm"
-MD5SUM_x86_64="05a514e65d7d14e3d51c43363000eee0"
+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="igora.vault@gmail.com"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/network/bollux/README b/network/bollux/README
new file mode 100644
index 0000000000..da116fcd80
--- /dev/null
+++ b/network/bollux/README
@@ -0,0 +1,14 @@
+bollux (bash Gemini client)
+
+bollux is a cli client for the new Gemini protocol implemented in
+bash.
+
+CAPABILITIES
+
+- make requests
+- receive files
+- use dd to show a nice little download status
+- use less to display text/* files
+- link navigation
+- man page
+- configuration
diff --git a/network/bollux/bollux.SlackBuild b/network/bollux/bollux.SlackBuild
new file mode 100644
index 0000000000..62c42b3027
--- /dev/null
+++ b/network/bollux/bollux.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# Slackware build script for bollux.
+#
+# Copyright 2020 Matthew Graybosch
+# 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=bollux
+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 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
+
+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/man
+
+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="LICENSE README.md test.gmi"
+
+rm -rf $PKG/usr/share/doc
+
+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
+
+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/bollux/bollux.info b/network/bollux/bollux.info
new file mode 100644
index 0000000000..e65279d0ea
--- /dev/null
+++ b/network/bollux/bollux.info
@@ -0,0 +1,10 @@
+PRGNAM="bollux"
+VERSION="0.2.2"
+HOMEPAGE="https://git.sr.ht/~acdw/bollux"
+DOWNLOAD="https://git.sr.ht/~acdw/bollux/archive/0.2.2.tar.gz"
+MD5SUM="4ba00dc4f85b9766cfbab5969c7bc561"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matthew Graybosch"
+EMAIL="contact@matthewgraybosch.com"
diff --git a/network/bollux/slack-desc b/network/bollux/slack-desc
new file mode 100644
index 0000000000..00731e0164
--- /dev/null
+++ b/network/bollux/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------------------------------------------------------|
+bollux: bollux (bash Gemini client)
+bollux:
+bollux: bollux is a cli client for the new Gemini protocol
+bollux: implemented in bash using basic shell tools.
+bollux:
+bollux: Home Page: https://git.sr.ht/~acdw/bollux
+bollux:
+bollux:
+bollux:
+bollux:
+bollux:
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 2d1c14ce91..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, Boston MA <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.4.95}
+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 e975e91873..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.4.95"
+VERSION="1.23.71"
 HOMEPAGE="https://brave.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.4.95/brave-browser-1.4.95-1.x86_64.rpm"
-MD5SUM_x86_64="0c8b0d62e2ccc90f5c81a761f9e2483d"
-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/brave-browser/slack-desc b/network/brave-browser/slack-desc
index b95e1599f6..99dfa4edda 100644
--- a/network/brave-browser/slack-desc
+++ b/network/brave-browser/slack-desc
@@ -11,9 +11,9 @@ brave-browser:
 brave-browser: Brave is a free and open-source web browser developed by Brave
 brave-browser: Software, Inc. based on the Chromium web browser.
 brave-browser:
+brave-browser: https://brave-browser.com
 brave-browser:
 brave-browser:
 brave-browser:
 brave-browser:
 brave-browser:
-brave-browser: https://brave-browser.com
diff --git a/network/broadcom-sta/broadcom-sta.SlackBuild b/network/broadcom-sta/broadcom-sta.SlackBuild
index e533023942..e1258bdbad 100644
--- a/network/broadcom-sta/broadcom-sta.SlackBuild
+++ b/network/broadcom-sta/broadcom-sta.SlackBuild
@@ -85,7 +85,9 @@ patch -p2 < $CWD/patches/18-linux411.patch
 patch -p2 < $CWD/patches/19-linux412.patch
 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/22-linux56.patch b/network/broadcom-sta/patches/22-linux56.patch
new file mode 100644
index 0000000000..2a2bcad837
--- /dev/null
+++ b/network/broadcom-sta/patches/22-linux56.patch
@@ -0,0 +1,90 @@
+From dd057e40a167f4febb1a7c77dd32b7d36056952c Mon Sep 17 00:00:00 2001
+From: Herman van Hazendonk <github.com@herrie.org>
+Date: Tue, 31 Mar 2020 17:09:55 +0200
+Subject: [PATCH] Add fixes for 5.6 kernel
+
+Use ioremap instead of ioremap_nocache and proc_ops instead of file_operations on Linux kernel 5.6 and above.
+
+Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
+---
+ amd64/src/shared/linux_osl.c |  6 +++++-
+ amd64/src/wl/sys/wl_linux.c  | 21 ++++++++++++++++++++-
+ 2 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/amd64/src/shared/linux_osl.c b/amd64/src/shared/linux_osl.c
+index 6157d18..dcfc075 100644
+--- a/amd64/src/shared/linux_osl.c
++++ b/amd64/src/shared/linux_osl.c
+@@ -942,7 +942,11 @@ osl_getcycles(void)
+ void *
+ osl_reg_map(uint32 pa, uint size)
+ {
+-	return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++		return (ioremap((unsigned long)pa, (unsigned long)size));
++	#else
++		return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
++	#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+ }
+ 
+ void
+diff --git a/amd64/src/wl/sys/wl_linux.c b/amd64/src/wl/sys/wl_linux.c
+index 0d05100..6d9dd0d 100644
+--- a/amd64/src/wl/sys/wl_linux.c
++++ b/amd64/src/wl/sys/wl_linux.c
+@@ -582,10 +582,17 @@ wl_attach(uint16 vendor, uint16 device, ulong regs,
+ 	}
+ 	wl->bcm_bustype = bustype;
+ 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++	if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
++		WL_ERROR(("wl%d: ioremap() failed\n", unit));
++		goto fail;
++	}
++	#else 
+ 	if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) {
+ 		WL_ERROR(("wl%d: ioremap() failed\n", unit));
+ 		goto fail;
+ 	}
++	#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+ 
+ 	wl->bar1_addr = bar1_addr;
+ 	wl->bar1_size = bar1_size;
+@@ -772,8 +779,13 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ 	if ((val & 0x0000ff00) != 0)
+ 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+ 		bar1_size = pci_resource_len(pdev, 2);
++		#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++		bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
++			bar1_size);
++		#else
+ 		bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
+ 			bar1_size);
++		#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
+ 	wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
+ 		pdev->irq, bar1_addr, bar1_size);
+ 
+@@ -3335,12 +3347,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t
+ }
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++static const struct proc_ops wl_fops = {
++	.proc_read	= wl_proc_read,
++	.proc_write	= wl_proc_write,
++};
++#else
+ static const struct file_operations wl_fops = {
+ 	.owner	= THIS_MODULE,
+ 	.read	= wl_proc_read,
+ 	.write	= wl_proc_write,
+ };
+-#endif
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) */
+ 
+ static int
+ wl_reg_proc_entry(wl_info_t *wl)
+-- 
+2.17.1.windows.1
+
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/cicb/cicb.info b/network/cicb/cicb.info
index cfcb0af283..53edd89248 100644
--- a/network/cicb/cicb.info
+++ b/network/cicb/cicb.info
@@ -1,7 +1,7 @@
 PRGNAM="cicb"
 VERSION="5.2.0b1+git20170501"
 HOMEPAGE="https://github.com/hoche/cicb/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/cicb-5.2.0b1+git20170501.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/cicb-5.2.0b1+git20170501.tar.xz"
 MD5SUM="ff3afbdad3f6744a154965b26c75db2e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/cicb/git2targz.sh b/network/cicb/git2targz.sh
index c8cd99f76b..de4eaab723 100644
--- a/network/cicb/git2targz.sh
+++ b/network/cicb/git2targz.sh
@@ -46,7 +46,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz
 Update $PRGNAM.info with:
 
 VERSION="$VERSION"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
 MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
 
 Don't forget to upload the new source!
diff --git a/network/ckermit/README b/network/ckermit/README
index 67eadee43e..ceca6cc69a 100644
--- a/network/ckermit/README
+++ b/network/ckermit/README
@@ -19,9 +19,10 @@ C-Kermit includes:
   * Built-in scriptable FTP and HTTP clients plus an SSH interface
   * Configurability as an SSH Subsystem
   * Character-set translation in both file transfer and online sessions,
-    for Western- and Eastern-European languages, Cyrillic, Greek, Hebrew,
-    and Japanese, now including Unicode.
+    for Western- and Eastern-European languages, Cyrillic, Greek,
+    Hebrew, and Japanese, now including Unicode.
   * Ability to send numeric and alphanumeric pages.
 
-This SlackBuild installs a default initialization file in the documentation
-directory.  However, an initialization file is rarely required with ckermit.
+This SlackBuild installs a default initialization file in the
+documentation directory.  However, an initialization file is rarely
+required with ckermit.
diff --git a/network/ckermit/ckermit.SlackBuild b/network/ckermit/ckermit.SlackBuild
index 8916e7d3fc..d62609d874 100644
--- a/network/ckermit/ckermit.SlackBuild
+++ b/network/ckermit/ckermit.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Andrew Rowland (darowland@ieee.org)
 
 PRGNAM=ckermit
-VERSION=${VERSION:-9.0.302}
+VERSION=${VERSION:-9.0.304.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,7 +43,14 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
-tar xvf $CWD/cku302.tar.gz -C $PRGNAM-$VERSION
+FILE=$(sed -En '/^9\.0\.([0-9]+)\.([0-9]+)$/s//cku\1-dev\2.tar.gz/p'<<<$VERSION)
+if [ -z "$FILE" ]; then
+  FILE=$(sed -En '/^9\.0\.([0-9]+)$/s//cku\1.tar.gz/p'<<<$VERSION)
+  if [ -z "$FILE" ]; then
+    FILE=x.tar.gz
+  fi
+fi
+tar xvf $CWD/$FILE -C $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -55,7 +62,7 @@ find -L . \
 # Force the makefile to accept our custom cflags
 patch -p1 < $CWD/makefile-use-custom-cflags.diff
 
-make linux OPT="$SLKCFLAGS"
+make linux OPT="$SLKCFLAGS -D_IO_file_flags"
 
 mkdir -p $PKG/usr/bin
 cp -a wermit $PKG/usr/bin/kermit
@@ -67,7 +74,8 @@ cp ckuker.nr $PKG/usr/man/man1/kermit.1
 gzip -9 $PKG/usr/man/man1/kermit.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING.TXT ockermit.ini *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+shopt -s nullglob
+cp -a COPYING.TXT *.ini *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/ckermit.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/ckermit.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/ckermit/ckermit.info b/network/ckermit/ckermit.info
index b4d7fe1de2..da4529215d 100644
--- a/network/ckermit/ckermit.info
+++ b/network/ckermit/ckermit.info
@@ -1,8 +1,8 @@
 PRGNAM="ckermit"
-VERSION="9.0.302"
+VERSION="9.0.304.23"
 HOMEPAGE="http://www.kermitproject.org/ck90.html"
-DOWNLOAD="ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz"
-MD5SUM="eac4dbf18b45775e4cdee5a7c74762b0"
+DOWNLOAD="ftp://ftp.kermitproject.org/kermit/test/tar/cku304-dev23.tar.gz"
+MD5SUM="fd42607a8875409141bce3318f16ca4e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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
new file mode 100644
index 0000000000..b9e0253193
--- /dev/null
+++ b/network/coturn/README
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000..5998ee5fc2
--- /dev/null
+++ b/network/coturn/coturn.SlackBuild
@@ -0,0 +1,142 @@
+#!/bin/sh
+
+# Slackware build script for coturn
+
+# Copyright 2020 Thomas Bourdon <thomas dot bourdon at halpanet dot 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.
+
+# Special thanks to Thomas Morper for some configuration adjustments tips
+# Modified by slackbuilds.org 2020-04-17 16:08:20 +0100
+
+PRGNAM=coturn
+VERSION=${VERSION:-4.5.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+TURN_USER=${TURN_USER:-turnserver}
+TURN_GROUP=${TURN_GROUP:-turnserver}
+
+if ! grep -q ^$TURN_GROUP: /etc/group 2>/dev/null ; then
+        echo "    Error: TURN group ($TURN_GROUP) doesn't exist."
+        echo "    Try creating one with: groupadd -g 366 $TURN_GROUP"
+        exit 1
+fi
+
+if ! grep -q ^$TURN_USER: /etc/passwd 2>/dev/null ; then
+        echo "    Error: TURN user ($TURN_USER) doesn't exist."
+        echo "    Try creating one with: useradd -u 366 -g $TURN_GROUP -d /var/lib/turn -s /bin/bash $TURN_USER"
+        exit 1
+fi
+
+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=""
+   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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --examplesdir=/usr/share/turnserver/examples \
+  --disable-rpath \
+  --build=$ARCH-slackware-linux || exit 1
+
+make
+make install DESTDIR=$PKG
+
+sed 's%/usr/local%/usr/share/turnserver/examples%' $PKG/etc/turnserver.conf.default > $PKG/etc/turnserver.conf.new
+rm -f $PKG/etc/turnserver.conf.default
+
+mkdir -p $PKG/etc/{rc.d,logrotate.d}
+cat $CWD/rc.turnserver > $PKG/etc/rc.d/rc.turnserver.new
+cat $CWD/logrotate.turnserver > $PKG/etc/logrotate.d/turnserver.new
+
+mkdir -p $PKG/var/log/turnserver
+chown $TURN_USER:$TURN_GROUP $PKG/var/log/turnserver
+
+# Populating /etc/default/turnserver.new
+mkdir -p $PKG/etc/default
+cat << EOF > $PKG/etc/default/turnserver.new
+TURN_USER=$TURN_USER
+TURN_GROUP=$TURN_GROUP
+TURN_PID_PATH=/var/run/turnserver
+EOF
+
+rm -rf $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
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog LICENSE* README* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+find $PKG/{usr/doc,usr/share,usr/include,etc,var} -type f -exec chmod -x {} +
+
+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/coturn/coturn.info b/network/coturn/coturn.info
new file mode 100644
index 0000000000..28ecb38663
--- /dev/null
+++ b/network/coturn/coturn.info
@@ -0,0 +1,10 @@
+PRGNAM="coturn"
+VERSION="4.5.2"
+HOMEPAGE="https://github.com/coturn/coturn"
+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=""
+MAINTAINER="Thomas Bourdon"
+EMAIL="thomas dot bourdon at halpanet dot org"
diff --git a/network/coturn/doinst.sh b/network/coturn/doinst.sh
new file mode 100644
index 0000000000..e6ac736181
--- /dev/null
+++ b/network/coturn/doinst.sh
@@ -0,0 +1,28 @@
+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.turnserver.new
+config etc/turnserver.conf.new
+config etc/logrotate.d/turnserver.new
+config etc/default/turnserver.new
diff --git a/network/coturn/logrotate.turnserver b/network/coturn/logrotate.turnserver
new file mode 100644
index 0000000000..063f3c86e1
--- /dev/null
+++ b/network/coturn/logrotate.turnserver
@@ -0,0 +1,11 @@
+/var/log/turn/turn*.log {
+    su turnserver turnserver
+    daily
+    rotate 7
+    create 0644 turnserver turnserver
+    copytruncate
+    delaycompress
+    compress
+    notifempty
+    missingok
+}
diff --git a/network/coturn/rc.turnserver b/network/coturn/rc.turnserver
new file mode 100644
index 0000000000..8e34917c60
--- /dev/null
+++ b/network/coturn/rc.turnserver
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+CONFIG="/etc/turnserver.conf"
+. /etc/default/turnserver
+
+coturn_start() {
+    if [ ! -d $TURN_PID_PATH ]; then
+      mkdir -p $TURN_PID_PATH
+      chown $TURN_USER:$TURN_GROUP $TURN_PID_PATH
+    fi
+    if [ -x /usr/bin/turnserver ]; then
+      echo "Starting turnserver daemon:  /usr/bin/turnserver"
+      su -l -c "/usr/bin/turnserver -o -c $CONFIG --pidfile $TURN_PID_PATH/turnserver.pid" $TURN_USER
+    fi
+}
+
+coturn_stop() {
+    echo "Stopping turnserver daemon:  /usr/bin/turnserver"
+    kill $(cat $TURN_PID_PATH/turnserver.pid)
+    rm -f $TURN_PID_PATH/turnserver.pid
+}
+
+coturn_restart() {
+    coturn_stop
+    sleep 1
+    coturn_start
+}
+
+case "$1" in
+'start')
+    coturn_start
+    ;;
+'stop')
+    coturn_stop
+    ;;
+'restart')
+    coturn_restart
+    ;;
+*)
+    echo "usage $0 start|stop|restart"
+esac
+
+exit 0
diff --git a/network/coturn/slack-desc b/network/coturn/slack-desc
new file mode 100644
index 0000000000..6e4fe0b298
--- /dev/null
+++ b/network/coturn/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------------------------------------------------------|
+coturn: coturn (Free open source implementation of TURN and STUN Server)
+coturn:
+coturn: The TURN Server is a VoIP media traffic NAT traversal server and
+coturn: gateway. It can be used as a general-purpose network traffic TURN
+coturn: server and gateway, too.
+coturn:
+coturn: Homepage: https://github.com/coturn/coturn
+coturn:
+coturn:
+coturn:
+coturn:
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/README b/network/ddclient/README
index d99ecf45b5..192fbed378 100644
--- a/network/ddclient/README
+++ b/network/ddclient/README
@@ -1,9 +1,15 @@
 DDclient is a small but full featured Perl client used to update dynamic
-DNS entries for accounts on Dynamic DNS Network Services free DNS service.
-It has the capability to update more than only dyndns and it can fetch your
-WAN-ipaddress in a few different ways.
+DNS entries for accounts on Dynamic DNS Network Services free DNS
+service.  It has the capability to update more than only dyndns and it
+can fetch your WAN-ipaddress in a few different ways.
 
 Supported features include: operating as a daemon, manual and automatic
 updates, static and dynamic updates, optimized updates for multiple
 addresses, MX, wildcards, abuse avoidance, retrying failed updates, and
 sending update status to syslog and through e-mail.
+
+Optional dependencies:
+  perl-IO-Socket-SSL    perl library for ssl-support (recommended)
+  perl-JSON-PP          perl library for JSON support
+  perl-IO-Socket-INET6  perl library for ipv6-support
+
diff --git a/network/ddclient/ddclient.SlackBuild b/network/ddclient/ddclient.SlackBuild
index 101e66205d..ac6d3a1692 100644
--- a/network/ddclient/ddclient.SlackBuild
+++ b/network/ddclient/ddclient.SlackBuild
@@ -26,8 +26,8 @@
 # Revision date 2011/08/14
 
 PRGNAM=ddclient
-VERSION=${VERSION:-3.8.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.9.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch	# it's only a perl script
@@ -43,7 +43,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.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/ddclient/ddclient.info b/network/ddclient/ddclient.info
index 765f8a7588..81bf76dec3 100644
--- a/network/ddclient/ddclient.info
+++ b/network/ddclient/ddclient.info
@@ -1,10 +1,10 @@
 PRGNAM="ddclient"
-VERSION="3.8.3"
-HOMEPAGE="http://ddclient.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/ddclient/ddclient-3.8.3.tar.bz2"
-MD5SUM="3b426ae52d509e463b42eeb08fb89e0b"
+VERSION="3.9.1"
+HOMEPAGE="https://github.com/ddclient/ddclient/"
+DOWNLOAD="https://github.com/ddclient/ddclient/archive/v3.9.1/ddclient-3.9.1.tar.gz"
+MD5SUM="8497033052649ebe6f714338c7be4cda"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-IO-Socket-SSL"
+REQUIRES="perl-IO-Socket-SSL perl-Data-Validate-IP"
 MAINTAINER="Richard Narron"
 EMAIL="richard@aaazen.com"
diff --git a/network/ddclient/rc.ddclient b/network/ddclient/rc.ddclient
index cb88a8dd26..daac891d53 100644
--- a/network/ddclient/rc.ddclient
+++ b/network/ddclient/rc.ddclient
@@ -10,26 +10,28 @@
 case "$1" in
   start)
 	echo -n "Starting ddclient: "
+#	ddclient -verbose
 	ddclient
 	echo    
 	;;
   stop)
 	echo -n "Shutting down ddclient: "
 	#kill $( ps -aef | grep ddclient | grep sleeping | awk '{print$2}' )
-	kill -9 $( cat /var/run/ddclient.pid )
+	pkill ddclient
 	echo
 	;;
   restart)
-	$0 stop
-	$0 start
+	sh $0 stop
+	sh $0 start
 	;;
   status)
-	pids=$( ps -aef | grep ddclient | grep sleeping | awk '{print$2}' )
+	pids=$(pgrep ddclient)
 	if test "$pids"
 	then
 		for p in $pids
 		do
 			echo "ddclient (pid $p) is running."
+			ps up $p
 		done
 	else
 		echo "ddclient is stopped."
diff --git a/network/deluge/deluge.SlackBuild b/network/deluge/deluge.SlackBuild
index fbac53a519..23b2f1a6a3 100644
--- a/network/deluge/deluge.SlackBuild
+++ b/network/deluge/deluge.SlackBuild
@@ -24,17 +24,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# CHANGELOG
-#
-# 20191118 Logan Rathbone <poprocks@gmail.com> 2.0.3-1
-# - Update for 2.0.3
-# - Additional dependencies: MarkupSafe, setproctitle, rencode,
-#   service_identity
-#
 
 PRGNAM=deluge
 VERSION=${VERSION:-2.0.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/network/deluge/deluge.info b/network/deluge/deluge.info
index eaa430858e..0263717aa8 100644
--- a/network/deluge/deluge.info
+++ b/network/deluge/deluge.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-2.0.3.tar.xz"
 MD5SUM="fbe784ebed006cd93c9a50f7c0530051"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Mako MarkupSafe libtorrent-rasterbar pyOpenSSL python-chardet python-twisted pyxdg rencode service_identity setproctitle"
+REQUIRES="Mako MarkupSafe libtorrent-rasterbar pyOpenSSL python-chardet python-twisted pyxdg rencode service_identity setproctitle wheel"
 MAINTAINER="Logan Rathbone"
 EMAIL="poprocks@gmail.com"
diff --git a/network/discord/discord.SlackBuild b/network/discord/discord.SlackBuild
index 66e5c0f750..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.10}
+VERSION=${VERSION:-0.0.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/discord/discord.info b/network/discord/discord.info
index 5caa0c836c..1dbd59a296 100644
--- a/network/discord/discord.info
+++ b/network/discord/discord.info
@@ -1,10 +1,10 @@
 PRGNAM="discord"
-VERSION="0.0.10"
+VERSION="0.0.14"
 HOMEPAGE="https://discordapp.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.10/discord-0.0.10.deb"
-MD5SUM_x86_64="0a8568752ce607187c86b640c23ae27b"
+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.SlackBuild b/network/dissenter-browser/dissenter-browser.SlackBuild
deleted file mode 100644
index f5ada8fd3d..0000000000
--- a/network/dissenter-browser/dissenter-browser.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dissenter-browser
-
-# Copyright 2019 Donald Cooley South Haven, Indiana 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=dissenter-browser
-VERSION=${VERSION:-0.70.122}
-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}
-
-# 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
-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 {} \;
-
-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
-
-# Move icon into place
-mkdir -p $PKG/usr/share/pixmaps
-cp opt/dissenter.com/dissenter/*.xpm $PKG/usr/share/pixmaps/dissenter-browser.xpm
-
-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
-
-# Place man page(s) where The Man likes 'em
-mv $PKG/usr/share/man $PKG/usr/man
-
-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/dissenter-browser/dissenter-browser.info b/network/dissenter-browser/dissenter-browser.info
deleted file mode 100644
index 1eeae47708..0000000000
--- a/network/dissenter-browser/dissenter-browser.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dissenter-browser"
-VERSION="0.70.122"
-HOMEPAGE="https://dissenter.com"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://apps.gab.com/application/5d3f93a29dd49a5b1d9fc27f/resource/5dbdab0f53c1056bd98c33d2/content"
-MD5SUM_x86_64="9ba6bfd7c33c838a43d0846f7d3b104d"
-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/dissenter-browser/slack-desc b/network/dissenter-browser/slack-desc
deleted file mode 100644
index e2446ed6b2..0000000000
--- a/network/dissenter-browser/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------------------------------------------------------|
-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:
diff --git a/network/dma/README b/network/dma/README
new file mode 100644
index 0000000000..66108f5935
--- /dev/null
+++ b/network/dma/README
@@ -0,0 +1,4 @@
+dma is a small Mail Transport Agent (MTA), designed for home and office use.
+It accepts mails from locally installed Mail User Agents (MUA) and delivers
+the mails either locally or to a remote destination.
+Remote delivery includes several features like TLS/SSL support and SMTP authentication.
diff --git a/network/dma/dma.SlackBuild b/network/dma/dma.SlackBuild
new file mode 100644
index 0000000000..e6766f6b8d
--- /dev/null
+++ b/network/dma/dma.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for dma
+# 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=dma
+VERSION=${VERSION:-0.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
+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|share/man|/man|g" Makefile
+sed -i "s|/lib|/lib${LIBDIRSUFFIX}|g" Makefile
+
+make
+make install sendmail-link mailq-link install-spool-dirs install-etc PREFIX=/usr 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 INSTALL LICENSE README.markdown 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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/dma/dma.info b/network/dma/dma.info
new file mode 100644
index 0000000000..e5e9785815
--- /dev/null
+++ b/network/dma/dma.info
@@ -0,0 +1,10 @@
+PRGNAM="dma"
+VERSION="0.13"
+HOMEPAGE="https://github.com/corecode/dma/"
+DOWNLOAD="https://github.com/corecode/dma/archive/v0.13/dma-0.13.tar.gz"
+MD5SUM="8bf824b065295a594f399c8b96663673"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
diff --git a/network/dma/slack-desc b/network/dma/slack-desc
new file mode 100644
index 0000000000..9df4761ac6
--- /dev/null
+++ b/network/dma/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------------------------------------------------------|
+dma: dma (DragonFlyBSD Mail Agent)
+dma:
+dma: dma is a small Mail Transport Agent (MTA), designed for home and
+dma: office use. It accepts mails from locally installed Mail User Agents
+dma: (MUA) and delivers the mails either locally or to a remote
+dma: destination. Remote delivery includes several features like TLS/SSL
+dma: support and SMTP authentication.
+dma:
+dma:
+dma:
+dma:
diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
index 52f8059230..01a89c316e 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
@@ -27,7 +27,7 @@
 # significantly improved the value of this script!
 
 PRGNAM=dnscrypt-proxy
-VERSION=${VERSION:-2.0.25}
+VERSION=${VERSION:-2.0.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +67,7 @@ mkdir -p $PRGNAM-$VERSION/src/$DOMAIN/$ORG
 cd $PRGNAM-$VERSION/src/$DOMAIN/$ORG
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 mv $PRGNAM-$VERSION $PRGNAM
-cd $PRGNAM
+cd $TMP/$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,6 +79,8 @@ export GOPATH="$TMP/$PRGNAM-$VERSION"
 
 go install -a -x ./...
 
+cd $TMP/$PRGNAM-$VERSION/src/$DOMAIN/$ORG/$PRGNAM
+
 mkdir -p $PKG/usr/sbin
 
 install -m 755 "$TMP/$PRGNAM-$VERSION/bin/${PRGNAM}" $PKG/usr/sbin/${PRGNAM}
diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.info b/network/dnscrypt-proxy/dnscrypt-proxy.info
index add495f8cd..99c27a29ac 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.info
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.info
@@ -1,8 +1,8 @@
 PRGNAM="dnscrypt-proxy"
-VERSION="2.0.25"
+VERSION="2.0.42"
 HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-DOWNLOAD="https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.25/dnscrypt-proxy-2.0.25.tar.gz"
-MD5SUM="1c92cedfc8d4ea7dc21b1abd5e93478c"
+DOWNLOAD="https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.42/dnscrypt-proxy-2.0.42.tar.gz"
+MD5SUM="9892c5d281b57c5f315d2f95cd6c33d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.toml b/network/dnscrypt-proxy/dnscrypt-proxy.toml
index 5b4e99a89d..0da38f8272 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.toml
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.toml
@@ -21,19 +21,22 @@
 ## Servers from the "public-resolvers" source (see down below) can
 ## be viewed here: https://dnscrypt.info/public-servers
 ##
-## If this line is commented, all registered servers matching the require_* filters
-## will be used.
+## The proxy will automatically pick working servers from this list.
+## Note that the require_* filters do NOT apply when using this setting.
+##
+## By default, this list is empty and all registered servers matching the
+## require_* filters will be used instead.
 ##
-## The proxy will automatically pick the fastest, working servers from the list.
 ## Remove the leading # first to enable this; lines starting with # are ignored.
 
 # server_names = ['scaleway-fr', 'google', 'yandex', 'cloudflare']
 
 
 ## List of local addresses and ports to listen to. Can be IPv4 and/or IPv6.
-## Note: When using systemd socket activation, choose an empty set (i.e. [] ).
+## Example with both IPv4 and IPv6:
+## listen_addresses = ['127.0.0.1:53', '[::1]:53']
 
-listen_addresses = ['127.0.0.1:53', '[::1]:53']
+listen_addresses = ['127.0.0.1:53']
 
 
 ## Maximum number of simultaneous client connections to accept
@@ -93,18 +96,21 @@ force_tcp = false
 ## Uncomment the following line to route all TCP connections to a local Tor node
 ## Tor doesn't support UDP, so set `force_tcp` to `true` as well.
 
-# proxy = "socks5://127.0.0.1:9050"
+# proxy = 'socks5://127.0.0.1:9050'
 
 
 ## HTTP/HTTPS proxy
 ## Only for DoH servers
 
-# http_proxy = "http://127.0.0.1:8888"
+# http_proxy = 'http://127.0.0.1:8888'
 
 
-## How long a DNS query will wait for a response, in milliseconds
+## How long a DNS query will wait for a response, in milliseconds.
+## If you have a network with *a lot* of latency, you may need to
+## increase this. Startup may be slower if you do so.
+## Don't increase it too much. 10000 is the highest reasonable value.
 
-timeout = 2500
+timeout = 5000
 
 
 ## Keepalive for HTTP (HTTPS, HTTP/2) queries, in seconds
@@ -112,11 +118,12 @@ timeout = 2500
 keepalive = 30
 
 
-## Use the REFUSED return code for blocked responses
-## Setting this to `false` means that some responses will be lies.
-## Unfortunately, `false` appears to be required for Android 8+
+## Response for blocked queries.  Options are `refused`, `hinfo` (default) or
+## an IP response.  To give an IP response, use the format `a:<IPv4>,aaaa:<IPv6>`.
+## Using the `hinfo` option means that some responses will be lies.
+## Unfortunately, the `hinfo` option appears to be required for Android 8+
 
-refused_code_in_responses = false
+# blocked_query_response = 'refused'
 
 
 ## Load-balancing strategy: 'p2' (default), 'ph', 'first' or 'random'
@@ -167,6 +174,8 @@ cert_refresh_delay = 240
 ## 49195 = TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
 ## 52392 = TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
 ## 52393 = TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+##  4865 = TLS_AES_128_GCM_SHA256
+##  4867 = TLS_CHACHA20_POLY1305_SHA256
 ##
 ## On non-Intel CPUs such as MIPS routers and ARM systems (Android, Raspberry Pi...),
 ## the following suite improves performance.
@@ -178,34 +187,35 @@ cert_refresh_delay = 240
 # tls_cipher_suite = [52392, 49199]
 
 
-## Fallback resolver
-## This is a normal, non-encrypted DNS resolver, that will be only used
+## Fallback resolvers
+## These are normal, non-encrypted DNS resolvers, that will be only used
 ## for one-shot queries when retrieving the initial resolvers list, and
 ## only if the system DNS configuration doesn't work.
-## No user application queries will ever be leaked through this resolver,
-## and it will not be used after IP addresses of resolvers URLs have been found.
-## It will never be used if lists have already been cached, and if stamps
+## No user application queries will ever be leaked through these resolvers,
+## and they will not be used after IP addresses of resolvers URLs have been found.
+## They will never be used if lists have already been cached, and if stamps
 ## don't include host names without IP addresses.
-## It will not be used if the configured system DNS works.
-## A resolver supporting DNSSEC is recommended. This may become mandatory.
+## They will not be used if the configured system DNS works.
+## Resolvers supporting DNSSEC are recommended.
 ##
 ## People in China may need to use 114.114.114.114:53 here.
 ## Other popular options include 8.8.8.8 and 1.1.1.1.
+##
+## If more than one resolver is specified, they will be tried in sequence.
 
-fallback_resolver = '9.9.9.9:53'
+fallback_resolvers = ['9.9.9.9:53', '8.8.8.8:53']
 
 
-## Never let dnscrypt-proxy try to use the system DNS settings;
-## unconditionally use the fallback resolver.
+## Always use the fallback resolver before the system DNS settings.
 
-ignore_system_dns = false
+ignore_system_dns = true
 
 
 ## Maximum time (in seconds) to wait for network connectivity before
 ## initializing the proxy.
 ## Useful if the proxy is automatically started at boot, and network
 ## connectivity is not guaranteed to be immediately available.
-## Use 0 to not test for connectivity at all,
+## Use 0 to not test for connectivity at all (not recommended),
 ## and -1 to wait as much as possible.
 
 netprobe_timeout = 60
@@ -219,7 +229,7 @@ netprobe_timeout = 60
 ## On other operating systems, the connection will be initialized
 ## but nothing will be sent at all.
 
-netprobe_address = "9.9.9.9:53"
+netprobe_address = '9.9.9.9:53'
 
 
 ## Offline mode - Do not use any remote encrypted servers.
@@ -229,9 +239,19 @@ netprobe_address = "9.9.9.9:53"
 # offline_mode = false
 
 
+## Additional data to attach to outgoing queries.
+## These strings will be added as TXT records to queries.
+## Do not use, except on servers explicitly asking for extra data
+## to be present.
+## encrypted-dns-server can be configured to use this for access control
+## in the [access_control] section
+
+# query_meta = ["key1:value1", "key2:value2", "token:MySecretToken"]
+
+
 ## Automatic log files rotation
 
-# Maximum log files size in MB
+# Maximum log files size in MB - Set to 0 for unlimited.
 log_files_max_size = 10
 
 # How long to keep backup files, in days
@@ -246,23 +266,42 @@ log_files_max_backups = 1
 #        Filters        #
 #########################
 
+## Note: if you are using dnsmasq, disable the `dnssec` option in dnsmasq if you
+## configure dnscrypt-proxy to do any kind of filtering (including the filters
+## below and blacklists).
+## You can still choose resolvers that do DNSSEC validation.
+
+
 ## Immediately respond to IPv6-related queries with an empty response
 ## This makes things faster when there is no IPv6 connectivity, but can
 ## also cause reliability issues with some stub resolvers.
-## Do not enable if you added a validating resolver such as dnsmasq in front
-## of the proxy.
 
 block_ipv6 = false
 
 
+## Immediately respond to A and AAAA queries for host names without a domain name
+
+block_unqualified = true
+
+
+## Immediately respond to queries for local zones instead of leaking them to
+## upstream resolvers (always causing errors or timeouts).
+
+block_undelegated = true
+
+
+## TTL for synthetic responses sent when a request has been blocked (due to
+## IPv6 or blacklists).
+
+reject_ttl = 600
+
+
 
 ##################################################################################
 #        Route queries for specific domains to a dedicated set of servers        #
 ##################################################################################
 
-## Example map entries (one entry per line):
-## example.com 9.9.9.9
-## example.net 9.9.9.9,8.8.8.8,1.1.1.1
+## See the `example-forwarding-rules.txt` file for an example
 
 # forwarding_rules = 'forwarding-rules.txt'
 
@@ -276,12 +315,13 @@ block_ipv6 = false
 ## In addition to acting as a HOSTS file, it can also return the IP address
 ## of a different name. It will also do CNAME flattening.
 ##
-## Example map entries (one entry per line)
-## example.com     10.1.1.1
-## www.google.com  forcesafesearch.google.com
+## See the `example-cloaking-rules.txt` file for an example
 
 # cloaking_rules = 'cloaking-rules.txt'
 
+## TTL used when serving entries in cloaking-rules.txt
+
+# cloak_ttl = 600
 
 
 ###########################
@@ -295,12 +335,12 @@ cache = true
 
 ## Cache size
 
-cache_size = 512
+cache_size = 4096
 
 
 ## Minimum TTL for cached entries
 
-cache_min_ttl = 600
+cache_min_ttl = 2400
 
 
 ## Maximum TTL for cached entries
@@ -319,6 +359,37 @@ cache_neg_max_ttl = 600
 
 
 
+##################################
+#        Local DoH server        #
+##################################
+
+[local_doh]
+
+## dnscrypt-proxy can act as a local DoH server. By doing so, web browsers
+## requiring a direct connection to a DoH server in order to enable some
+## features will enable these, without bypassing your DNS proxy.
+
+## Addresses that the local DoH server should listen to
+
+# listen_addresses = ['127.0.0.1:3000']
+
+
+## Path of the DoH URL. This is not a file, but the part after the hostname
+## in the URL. By convention, `/dns-query` is frequently chosen.
+## For each `listen_address` the complete URL to access the server will be:
+## `https://<listen_address><path>` (ex: `https://127.0.0.1/dns-query`)
+
+# path = "/dns-query"
+
+
+## Certificate file and key - Note that the certificate has to be trusted.
+## See the documentation (wiki) for more information.
+
+# cert_file = "localhost.pem"
+# cert_key_file = "localhost.pem"
+
+
+
 ###############################
 #        Query logging        #
 ###############################
@@ -327,7 +398,8 @@ cache_neg_max_ttl = 600
 
 [query_log]
 
-  ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+  ## Path to the query log file (absolute, or relative to the same directory as the config file)
+  ## On non-Windows systems, can be /dev/stdout to log to the standard output (also set log_files_max_size to 0)
 
   # file = 'query.log'
 
@@ -353,7 +425,7 @@ cache_neg_max_ttl = 600
 
 [nx_log]
 
-  ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+  ## Path to the query log file (absolute, or relative to the same directory as the config file)
 
   # file = 'nx.log'
 
@@ -383,7 +455,7 @@ cache_neg_max_ttl = 600
 
 [blacklist]
 
-  ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+  ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
 
   # blacklist_file = 'blacklist.txt'
 
@@ -411,7 +483,7 @@ cache_neg_max_ttl = 600
 
 [ip_blacklist]
 
-  ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+  ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
 
   # blacklist_file = 'ip-blacklist.txt'
 
@@ -439,7 +511,7 @@ cache_neg_max_ttl = 600
 
 [whitelist]
 
-  ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the executable file)
+  ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the config file)
 
   # whitelist_file = 'whitelist.txt'
 
@@ -465,8 +537,7 @@ cache_neg_max_ttl = 600
 ##
 ## For example, the following rule in a blacklist file:
 ## *.youtube.* @time-to-sleep
-## would block access to YouTube only during the days, and period of the days
-## define by the 'time-to-sleep' schedule.
+## would block access to YouTube during the times defined by the 'time-to-sleep' schedule.
 ##
 ## {after='21:00', before= '7:00'} matches 0:00-7:00 and 21:00-0:00
 ## {after= '9:00', before='18:00'} matches 9:00-18:00
@@ -507,7 +578,7 @@ cache_neg_max_ttl = 600
 ## must include the prefixes.
 ##
 ## If the `urls` property is missing, cache files and valid signatures
-## must be already present; This doesn't prevent these cache files from
+## must already be present. This doesn't prevent these cache files from
 ## expiring after `refresh_delay` hours.
 
 [sources]
@@ -518,17 +589,24 @@ cache_neg_max_ttl = 600
   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
   cache_file = 'public-resolvers.md'
   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+  prefix = ''
+
+  ## Anonymized DNS relays
+
+  [sources.'relays']
+  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/relays.md', 'https://download.dnscrypt.info/resolvers-list/v2/relays.md']
+  cache_file = 'relays.md'
+  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
   refresh_delay = 72
   prefix = ''
 
   ## Quad9 over DNSCrypt - https://quad9.net/
 
   # [sources.quad9-resolvers]
-  # urls = ["https://www.quad9.net/quad9-resolvers.md"]
-  # minisign_key = "RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN"
-  # cache_file = "quad9-resolvers.md"
-  # refresh_delay = 72
-  # prefix = "quad9-"
+  # urls = ['https://www.quad9.net/quad9-resolvers.md']
+  # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
+  # cache_file = 'quad9-resolvers.md'
+  # prefix = 'quad9-'
 
   ## Another example source, with resolvers censoring some websites not appropriate for children
   ## This is a subset of the `public-resolvers` list, so enabling both is useless
@@ -540,10 +618,87 @@ cache_neg_max_ttl = 600
 
 
 
+#########################################
+#        Servers with known bugs        #
+#########################################
+
+[broken_implementations]
+
+# Cisco servers currently cannot handle queries larger than 1472 bytes, and don't
+# truncate reponses larger than questions as expected by the DNSCrypt protocol.
+# This prevents large responses from being received over UDP and over relays.
+#
+# The `dnsdist` server software drops client queries larger than 1500 bytes.
+# They are aware of it and are working on a fix.
+#
+# The list below enables workarounds to make non-relayed usage more reliable
+# until the servers are fixed.
+
+fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familyshield-ipv6', 'quad9-dnscrypt-ip4-filter-alt', 'quad9-dnscrypt-ip4-filter-pri', 'quad9-dnscrypt-ip4-nofilter-alt', 'quad9-dnscrypt-ip4-nofilter-pri', 'quad9-dnscrypt-ip6-filter-alt', 'quad9-dnscrypt-ip6-filter-pri', 'quad9-dnscrypt-ip6-nofilter-alt', 'quad9-dnscrypt-ip6-nofilter-pri', 'cleanbrowsing-adult', 'cleanbrowsing-family-ipv6', 'cleanbrowsing-family', 'cleanbrowsing-security']
+
+
+
+
+################################
+#   TLS Client Authentication  #
+################################
+
+# This is only useful if you are operating your own, private DoH server(s).
+# (for DNSCrypt, see the `query_meta` feature instead)
+
+[tls_client_auth]
+
+# creds = [
+#    { server_name='myserver', client_cert='client.crt', client_key='client.key' }
+# ]
+
+
+
+################################
+#        Anonymized DNS        #
+################################
+
+[anonymized_dns]
+
+## Routes are indirect ways to reach DNSCrypt servers.
+##
+## A route maps a server name ("server_name") to one or more relays that will be
+## used to connect to that server.
+##
+## A relay can be specified as a DNS Stamp (either a relay stamp, or a
+## DNSCrypt stamp), an IP:port, a hostname:port, or a server name.
+##
+## The following example routes "example-server-1" via `anon-example-1` or `anon-example-2`,
+## and "example-server-2" via the relay whose relay DNS stamp
+## is "sdns://gRIxMzcuNzQuMjIzLjIzNDo0NDM".
+##
+## !!! THESE ARE JUST EXAMPLES !!!
+##
+## Review the list of available relays from the "relays.md" file, and, for each
+## server you want to use, define the relays you want connections to go through.
+##
+## Carefully choose relays and servers so that they are run by different entities.
+##
+## "server_name" can also be set to "*" to define a default route, but this is not
+## recommended. If you do so, keep "server_names" short and distinct from relays.
+
+# routes = [
+#    { server_name='example-server-1', via=['anon-example-1', 'anon-example-2'] },
+#    { server_name='example-server-2', via=['sdns://gRIxMzcuNzQuMjIzLjIzNDo0NDM'] }
+# ]
+
+
+# skip resolvers incompatible with anonymization instead of using them directly
+
+skip_incompatible = false
+
+
+
+
 ## Optional, local, static list of additional servers
 ## Mostly useful for testing your own servers.
 
 [static]
 
-  # [static.'google']
-  # stamp = 'sdns://AgUAAAAAAAAAAAAOZG5zLmdvb2dsZS5jb20NL2V4cGVyaW1lbnRhbA'
+  # [static.'myserver']
+  # stamp = 'sdns:AQcAAAAAAAAAAAAQMi5kbnNjcnlwdC1jZXJ0Lg'
diff --git a/network/dokuwiki/README b/network/dokuwiki/README
index afddebc299..08789293b8 100644
--- a/network/dokuwiki/README
+++ b/network/dokuwiki/README
@@ -7,9 +7,8 @@ useful in the enterprise context and the large number of plugins
 contributed by its vibrant community allow for a broad range of use
 cases beyond a traditional wiki.
 
-Note:
-You must add this line in your httpd.conf to enable dokuwiki:
-Include /etc/httpd/extra/httpd-dokuwiki.conf
-
 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 2e10b130e4..9f7823b228 100644
--- a/network/dokuwiki/dokuwiki.SlackBuild
+++ b/network/dokuwiki/dokuwiki.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
-# Slackware build script for dokuwiki
 
-# Copyright 2016 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
-# All rights reserved.
+# Slackware build script for dokuwiki
+#
+# Copyright 2016-2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# 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:
@@ -22,9 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dokuwiki
-VERSION=${VERSION:-20180422b}
+VERSION=${VERSION:-20200729}
 UNPACK=${UNPACK:-stable}
-SRCVERSION=${SRCVERSION:-2018-04-22b}
+SRCVERSION=${SRCVERSION:-2020-07-29}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,11 +45,12 @@ cd $TMP
 rm -rf $PRGNAM-$SRCVERSION
 tar xvzf $CWD/$PRGNAM-$SRCVERSION.tgz
 
-mkdir -p $PKG/var/www/$PRGNAM
-mv $TMP/$PRGNAM-$SRCVERSION/* $PKG/var/www/$PRGNAM/
-chown -R apache:apache $PKG/var/www/$PRGNAM/
+mkdir -p $PKG/var/www/htdocs/$PRGNAM
+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/>
@@ -66,6 +68,8 @@ Alias /dokuwiki /var/www/htdocs/dokuwiki
 EOF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# Move all docs
+mv $PKG/var/www/htdocs/${PRGNAM}/{COPYING,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/network/dokuwiki/dokuwiki.info b/network/dokuwiki/dokuwiki.info
index 399ca8b8e2..ff5714ca14 100644
--- a/network/dokuwiki/dokuwiki.info
+++ b/network/dokuwiki/dokuwiki.info
@@ -1,8 +1,8 @@
 PRGNAM="dokuwiki"
-VERSION="20180422b"
+VERSION="20200729"
 HOMEPAGE="https://www.dokuwiki.org/dokuwiki"
 DOWNLOAD="https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz"
-MD5SUM="605944ec47cd5f822456c54c124df255"
+MD5SUM="8867b6a5d71ecb5203402fe5e8fa18c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/driftnet/README b/network/driftnet/README
index 03ebbda903..3774915a48 100644
--- a/network/driftnet/README
+++ b/network/driftnet/README
@@ -7,3 +7,11 @@ Original project:  http://www.ex-parrot.com/~chris/driftnet/
 
 This is an updated version available from GitHub, which includes several
 patches for use on newer systems.
+
+HTTP websockets display
+-----------------------
+
+Disabled by default.
+
+This feature requires libwebsockets as a dependency and remove this
+build flag: --disable-http-display
diff --git a/network/driftnet/driftnet.SlackBuild b/network/driftnet/driftnet.SlackBuild
index d9999b0e3b..7b75ac248f 100644
--- a/network/driftnet/driftnet.SlackBuild
+++ b/network/driftnet/driftnet.SlackBuild
@@ -2,7 +2,7 @@
 # Slackbuild build script for driftnet
 
 # Copyright 2010, JK Wood <joshuakwood@gmail.com>
-# Copyright 2017-2018 Brenton Earl <brent@exitstatuosne.com>
+# Copyright 2017-2018, 2020 Brenton Earl <brent@exitstatuosne.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=driftnet
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -87,6 +87,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
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING INSTALL CREDITS README.md Changelog TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/driftnet/driftnet.info b/network/driftnet/driftnet.info
index 0a4f69fa15..a7d40d2e0e 100644
--- a/network/driftnet/driftnet.info
+++ b/network/driftnet/driftnet.info
@@ -1,8 +1,8 @@
 PRGNAM="driftnet"
-VERSION="1.2.0"
+VERSION="1.3.0"
 HOMEPAGE="https://github.com/deiv/driftnet"
-DOWNLOAD="https://github.com/deiv/driftnet/archive/v1.2.0/driftnet-1.2.0.tar.gz"
-MD5SUM="86fda7573a2c17ba02059e63e0f097b8"
+DOWNLOAD="https://github.com/deiv/driftnet/archive/v1.3.0/driftnet-1.3.0.tar.gz"
+MD5SUM="60e8955771e028cab44ecd6b2800f326"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/dropbear/README b/network/dropbear/README
index bae1c188d1..5da4e54160 100644
--- a/network/dropbear/README
+++ b/network/dropbear/README
@@ -6,13 +6,13 @@ distributed under a MIT-style license. Dropbear is particularly
 useful for "embedded"-type Linux (or other Unix) systems, such as
 wireless routers.
 
-Please note the Dropbear distribution includes a standalone version of
-OpenSSH's scp program. This slackbuild will build this by default, thus
-creating a package which conflicts with OpenSSH's scp binary. Installing this
-package will overwrite this file with a symbolic link to the dropbearmulti
-binary, so a backup of /usr/bin/scp will be made if it exists. After
-uninstalling dropbear, you can restore the backup with 'mv
-/usr/bin/scp.openssh /usr/bin/scp'.
+Please note the Dropbear distribution includes a standalone
+version of OpenSSH's scp program. This slackbuild will build this
+by default, thus creating a package which conflicts with OpenSSH's
+scp binary. Installing this package will overwrite this file with a
+symbolic link to the dropbearmulti binary, so a backup of /usr/bin/scp
+will be made if it exists. After uninstalling dropbear, you can
+restore the backup with 'mv /usr/bin/scp.openssh /usr/bin/scp'.
 
 If you do not want to build the scp binary, use:
 
diff --git a/network/dropbear/dropbear.SlackBuild b/network/dropbear/dropbear.SlackBuild
index e9bd3d6105..309fcbb935 100644
--- a/network/dropbear/dropbear.SlackBuild
+++ b/network/dropbear/dropbear.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2007-2008, Piter Punk, São Paulo, Brazil
-# Copyright 2017-2019, Andrew Clemons, Wellington New Zealand
+# Copyright 2007-2008, Piter Punk, São Paulo, Brazil
+# Copyright 2017-2020, Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dropbear
-VERSION=${VERSION:-2019.78}
+VERSION=${VERSION:-2020.81}
+SRCVERSION="DROPBEAR_$VERSION"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,9 +59,9 @@ 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-$SRCVERSION
+tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
+cd $PRGNAM-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,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 -if
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/network/dropbear/dropbear.info b/network/dropbear/dropbear.info
index 0ad1eaba52..95c96f952b 100644
--- a/network/dropbear/dropbear.info
+++ b/network/dropbear/dropbear.info
@@ -1,8 +1,8 @@
 PRGNAM="dropbear"
-VERSION="2019.78"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-DOWNLOAD="https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2"
-MD5SUM="a972c85ed678ad0fdcb7844e1294fb54"
+VERSION="2020.81"
+HOMEPAGE="https://github.com/mkj/dropbear"
+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/dropbear/slack-desc b/network/dropbear/slack-desc
index 837032b6bc..f2e888a128 100644
--- a/network/dropbear/slack-desc
+++ b/network/dropbear/slack-desc
@@ -14,6 +14,6 @@ dropbear: distributed under a MIT-style license. Dropbear is particularly
 dropbear: useful for "embedded"-type Linux (or other Unix) systems, such as
 dropbear: wireless routers.
 dropbear:
-dropbear:
+dropbear: https://github.com/mkj/dropbear
 dropbear:
 dropbear:
diff --git a/network/dropbox/dropbox.SlackBuild b/network/dropbox/dropbox.SlackBuild
index 9c9106a25f..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:-92.4.382}
+VERSION=${VERSION:-118.4.460}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/dropbox/dropbox.info b/network/dropbox/dropbox.info
index 5bd86e8b8d..84974b4983 100644
--- a/network/dropbox/dropbox.info
+++ b/network/dropbox/dropbox.info
@@ -1,10 +1,10 @@
 PRGNAM="dropbox"
-VERSION="92.4.382"
+VERSION="118.4.460"
 HOMEPAGE="https://www.dropbox.com"
-DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-92.4.382.tar.gz"
-MD5SUM="5b1f1b6eb4736a1b1dd8896e51cddd62"
-DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-92.4.382.tar.gz"
-MD5SUM_x86_64="67d51c688b81f94d28a381878e73350f"
+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/easyrsa/easyrsa.SlackBuild b/network/easyrsa/easyrsa.SlackBuild
index ffb18d7c19..88449facc1 100644
--- a/network/easyrsa/easyrsa.SlackBuild
+++ b/network/easyrsa/easyrsa.SlackBuild
@@ -22,7 +22,7 @@
 
 PRGNAM=easyrsa
 SRCNAM=EasyRSA
-VERSION=${VERSION:-3.0.4}
+VERSION=${VERSION:-3.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/easyrsa/easyrsa.info b/network/easyrsa/easyrsa.info
index fafb548f82..ca4545365a 100644
--- a/network/easyrsa/easyrsa.info
+++ b/network/easyrsa/easyrsa.info
@@ -1,8 +1,8 @@
 PRGNAM="easyrsa"
-VERSION="3.0.4"
+VERSION="3.0.7"
 HOMEPAGE="https://github.com/OpenVPN/easy-rsa"
-DOWNLOAD="https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.4/EasyRSA-3.0.4.tgz"
-MD5SUM="d163f0681b4b2067f107badeb9151629"
+DOWNLOAD="https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.7/EasyRSA-3.0.7.tgz"
+MD5SUM="e9ae0a705831354193ed23b2c6da9944"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/etherape/etherape.SlackBuild b/network/etherape/etherape.SlackBuild
index 4a121bcf59..8e6f7312f2 100644
--- a/network/etherape/etherape.SlackBuild
+++ b/network/etherape/etherape.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2011-2013  Chris Abela, Malta
 # Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# Copyright 2017-2018 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
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=etherape
-VERSION=${VERSION:-0.9.18}
+VERSION=${VERSION:-0.9.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -93,7 +93,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 ABOUT-NLS AUTHORS COPYING ChangeLog FAQ INSTALL NEWS OVERVIEW README* TODO \
+cp -a ABOUT-NLS AUTHORS COPYING ChangeLog FAQ NEWS OVERVIEW README* TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/etherape/etherape.info b/network/etherape/etherape.info
index 97fba9b12c..9ae95c8d03 100644
--- a/network/etherape/etherape.info
+++ b/network/etherape/etherape.info
@@ -1,8 +1,8 @@
 PRGNAM="etherape"
-VERSION="0.9.18"
+VERSION="0.9.19"
 HOMEPAGE="http://etherape.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/etherape/etherape-0.9.18.tar.gz"
-MD5SUM="6d6a6c03e03e2d6aae3a59cd42752ac1"
+DOWNLOAD="http://downloads.sourceforge.net/etherape/etherape-0.9.19.tar.gz"
+MD5SUM="eaf0326ddef2a50fdaae369aee53be2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="goocanvas2 c-ares"
diff --git a/network/ettercap/ettercap.SlackBuild b/network/ettercap/ettercap.SlackBuild
index 6b4d4de738..d331932033 100644
--- a/network/ettercap/ettercap.SlackBuild
+++ b/network/ettercap/ettercap.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ettercap
-VERSION=${VERSION:-0.8.3}
+VERSION=${VERSION:-0.8.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/ettercap/ettercap.info b/network/ettercap/ettercap.info
index dae0424458..5fdfb8eaef 100644
--- a/network/ettercap/ettercap.info
+++ b/network/ettercap/ettercap.info
@@ -1,8 +1,8 @@
 PRGNAM="ettercap"
-VERSION="0.8.3"
+VERSION="0.8.3.1"
 HOMEPAGE="https://ettercap.github.io/ettercap/"
-DOWNLOAD="https://github.com/Ettercap/ettercap/releases/download/v0.8.3/ettercap-0.8.3.tar.gz"
-MD5SUM="6b27d329a509e65fef9044c95a2dde35"
+DOWNLOAD="https://github.com/Ettercap/ettercap/releases/download/v0.8.3.1/ettercap-0.8.3.1.tar.gz"
+MD5SUM="aec144118be53679f906843ff3054ee0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libnet"
diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile
index 3479dc2b45..5691e422f5 100644
--- a/network/exim/exim.Makefile
+++ b/network/exim/exim.Makefile
@@ -13,12 +13,11 @@
 
 # Things that depend on the operating system have default settings in
 # OS/Makefile-Default, but these are overridden for some OS by files
-# called called OS/Makefile-<osname>. You can further override these by
-# creating files called Local/Makefile-<osname>, and
-# Local/Makefile-<buildname> (where "<osname>" stands for the name of
-# your operating system - look at the names in the OS directory to see
-# which names are recognized, and "<buildname>" is derived from the
-# environment variable "build")
+# called OS/Makefile-<osname>. You can further override these settings by
+# creating files Local/Makefile-<osname>, and Local/Makefile-<build>.
+# The suffix "<osname>" stands for the name of your operating system - look
+# at the names in the OS directory to see which names are recognized,
+# and "<build>" is the content of the environment variable "build".
 
 # However, if you are building Exim for a single OS only, you don't need to
 # worry about setting up Local/Makefile-<osname>. Any build-time configuration
@@ -604,6 +603,10 @@ DISABLE_MAL_MKS=yes
 # CFLAGS  += -I/usr/local/include
 # LDFLAGS += -lsrs_alt
 
+# Uncomment the following lines to add SRS (Sender rewriting scheme) support
+# using only native facilities.
+# EXPERIMENTAL_SRS_NATIVE=yes
+
 # Uncomment the following line to add DMARC checking capability, implemented
 # using libopendmarc libraries. You must have SPF and DKIM support enabled also.
 # SUPPORT_DMARC=yes
@@ -642,6 +645,9 @@ DISABLE_MAL_MKS=yes
 # Uncomment the following line to include support for TLS Resumption
 # EXPERIMENTAL_TLS_RESUME=yes
 
+# Uncomment the following to include the fast-ramp two-phase-queue-run support
+# EXPERIMENTAL_QUEUE_RAMP=yes
+
 ###############################################################################
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
 ###############################################################################
@@ -794,6 +800,9 @@ AUTH_LIBS=-lsasl2
 # AUTH_LIBS=-lgsasl
 # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt
 
+# If using AUTH_GSASL with SCRAM methods, you should also be defining
+# SUPPORT_I18N to get standards-conformant support of utf8 normalization.
+
 
 #------------------------------------------------------------------------------
 # When Exim is decoding MIME "words" in header lines, most commonly for use
diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild
index 889c6d34e0..a9c26a8899 100644
--- a/network/exim/exim.SlackBuild
+++ b/network/exim/exim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Exim
 
-# Copyright 2012-2019 Thomas Morper, Augsburg, Germany
+# Copyright 2012-2020 Thomas Morper, Augsburg, 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=exim
-VERSION=${VERSION:-4.93}
+VERSION=${VERSION:-4.94}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/exim/exim.info b/network/exim/exim.info
index a20827bb05..0aaea452ce 100644
--- a/network/exim/exim.info
+++ b/network/exim/exim.info
@@ -1,8 +1,8 @@
 PRGNAM="exim"
-VERSION="4.93"
+VERSION="4.94"
 HOMEPAGE="https://www.exim.org/"
-DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.93.tar.xz"
-MD5SUM="60aa3b38844a8ccece06670e8ff7d657"
+DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.94.tar.xz"
+MD5SUM="4d4bfd56e2e9f25ceab23f623ed2f84a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
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/network/fdns/fdns.SlackBuild b/network/fdns/fdns.SlackBuild
new file mode 100644
index 0000000000..e15d2deab2
--- /dev/null
+++ b/network/fdns/fdns.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for fdns
+
+#
+# Copyright 2020 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=fdns
+VERSION=${VERSION:-0.9.62}
+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 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 \
+  --build=$ARCH-slackware-linux
+
+sed -i "s|lib/fdns|lib${LIBDIRSUFFIX}/fdns|" Makefile
+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
+
+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
+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/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/README b/network/felinks/README
new file mode 100644
index 0000000000..5a878fde58
--- /dev/null
+++ b/network/felinks/README
@@ -0,0 +1,72 @@
+Felinks is a maintained and up-to-date fork of ELinks, an advanced web
+browser.
+
+ELinks is an advanced and well-established feature-rich text mode web
+(HTTP/FTP/..) browser. ELinks can render both frames and tables, is
+highly customizable and can be extended via scripts. It is very portable
+and runs on a variety of platforms.  The ELinks official website is
+available at http://elinks.cz
+
+NOTE: Felinks will conflict with Elinks, so currently only one can be
+installed at a time.
+
+There are a number of options that can be used to add support for
+other protocols etc.  To enable or disable an option use the following
+method:
+
+  MOUSE=no ./elinks.SlackBuild
+or
+  MOUSE=no sh elinks.SlackBuild
+
+Multiple options can be combined.
+
+Category       Description                         Default Value
+
+System:
+
+FASTMEM        Direct use of system alloc          no
+CGI            Local CGI support                   no
+COMBINING      Unicode combining characters        no (experimental)
+UTF8           UTF-8 support                       yes
+IPV6           IPv6 support                        yes
+HTMLHL         HTML highlighting using DOM engine  no
+LZMA           LZMA encoding support               no
+TRE            REGEX SEARCH SUPPORT                yes
+BROTLI         BROTLI COMPRESSION                  yes
+DEBUG          Debug support (disables fastmem)    no
+XTERM          Xterm support (Enables X11)         no
+X11            X11 support                         no
+
+UI:
+
+MOUSE          Mouse support                       yes
+GPM            GPM (mouse) support                 yes
+EXMODE         Exmode (ex/vi CLI)                  no
+
+Colours:
+
+COLS88         88 Colours                          no
+COLS256        256 Colours                         no
+COLSTRUE       True Colours                        no
+
+Scripting:
+
+GUILE                                              no
+PERL                                               no
+PYTHON        (python3 required)                   no
+LUA                                                yes
+
+Protocols:
+
+BITTORRENT                                         no
+DATA                                               yes
+FSP                                                no
+FTP                                                yes
+FINGER                                             no
+GOPHER                                             no
+NNTP                                               no
+SMB                                                no
+
+OPTIONAL:
+
+python3 for python support (still experimental).
diff --git a/network/felinks/felinks.SlackBuild b/network/felinks/felinks.SlackBuild
new file mode 100644
index 0000000000..b03f8422b8
--- /dev/null
+++ b/network/felinks/felinks.SlackBuild
@@ -0,0 +1,200 @@
+#!/bin/sh
+
+# Slackware build script for felinks
+# Copyright 2014 David Woodfall <dave@dawoodfall.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=felinks
+VERSION=${VERSION:-08da1d8}
+COMMIT=${COMMIT:-08da1d87eb74e082ca7aae8c81d2518a4415f3a7}
+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}
+
+# Added -fno-strict-aliasing -Wno-pointer-sign for a much more peaceful build
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC -fno-strict-aliasing -Wno-pointer-sign"
+  # fix for multilib
+  SLKLDFLAGS="-m64"
+  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-$VERSION.tar.?z
+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 {} \;
+
+for patch in $CWD/patches/*; do
+  printf "\n%s\n" "Applying Patch $( basename $patch )"
+  patch --verbose -p1 < $patch
+done
+
+## System
+[ "${FASTMEM:-no}"    = "yes" ] && fastmem="--enable-fastmem"
+[ "${DEBUG:-no}"      = "yes" ] && debug="--enable-debug --disable-fastmem"
+[ "$DEBUG"            = "yes" ] && SLKCFLAGS="-ggdb $SLKCFLAGS"
+[ "${CGI:-no}"        = "yes" ] && cgi="--enable-cgi"
+[ "${COMBINING:-no}"  = "yes" ] && combining="--enable-combining"
+[ "${UTF8:-yes}"      = "no"  ] && utf8="--disable-utf-8"
+[ "${IPV6:-yes}"      = "no"  ] && ipv6="--disable-ipv6"
+[ "${HTMLHL:-no}"     = "yes" ] && htmlhl="--enable-html-highlight"
+[ "${LZMA:-no}"       = "yes" ] && lzma="--with-lzma"
+[ "${TRE:-no}"        = "no"  ] && tre="--without-tre"
+[ "${BROTLI:-no}"     = "no"  ] && brotli="--without-brotli"
+[ "${LIBDOM:-no}"     = "yes" ] && libdom="--with-libdom"
+[ "${XTERM:-no}"      = "no"  ] && xterm="--without-xterm"
+[ "$XTERM"            = "yes" ] && X11="yes"
+[ "${X11:-no}"        = "no"  ] && x11="--without-x"
+
+# UI
+[ "${MOUSE:-yes}"     = "no"  ] && mouse="--disable-mouse"
+[ "${GPM:-yes}"       = "no"  ] && gpm="--without-gpm"
+[ "${EXMODE:-no}"     = "yes" ] && exmode="--enable-exmode"
+
+# Colours
+[ "${COLS88:-no}"     = "yes" ] && cols88="--enable-88-colors"
+[ "${COLS256:-no}"    = "yes" ] && cols256="--enable-256-colors"
+[ "${COLSTRUE:-no}"   = "yes" ] && colstrue="--enable-true-colors"
+
+# Scripting
+[ "${GUILE:-no}"      = "yes" ] && guile="--with-guile"
+[ "${PERL:-no}"       = "yes" ] && perl="--with-perl"
+[ "${PYTHON:-no}"     = "yes" ] && python="--with-python"
+[ "${LUA:-yes}"       = "no"  ] && lua="--without-lua"
+[ "${ECMA:-yes}"      = "no"  ] && ecma="--disable-sm-scripting"
+
+# Protocols
+[ "${BITTORRENT:-no}" = "yes" ] && bittorrent="--enable-bittorrent"
+[ "${DATA:-yes}"      = "no"  ] && data="--disable-data"
+[ "${FSP:-no}"        = "yes" ] && fsp="--enable-fsp"
+[ "${FTP:-yes}"       = "no"  ] && ftp="--disable-ftp"
+[ "${FINGER:-no}"     = "yes" ] && finger="--enable-finger"
+[ "${GOPHER:-no}"     = "yes" ] && gopher="--enable-gopher"
+[ "${NNTP:-no}"       = "yes" ] && nntp="--enable-nntp"
+[ "${SMB:-no}"        = "yes" ] && smb="--enable-smb"
+
+./autogen.sh
+CFLAGS="$SLKCFLAGS -L/usr/lib$LIBDIRSUFFIX" \
+LDFLAGS="$SLKLDFLAGS" \
+  ./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  $fastmem \
+  $debug \
+  $cgi \
+  $combining \
+  $utf8 \
+  $ipv6 \
+  $htmlhl \
+  $lzma \
+  $tre \
+  $brotli \
+  $libdom \
+  $xterm \
+  $x11 \
+  $mouse \
+  $gpm \
+  $exmode \
+  $cols88 \
+  $cols256 \
+  $colstrue \
+  $guile \
+  $perl \
+  $python \
+  $lua \
+  $ecma \
+  $bittorrent \
+  $data \
+  $fsp \
+  $ftp \
+  $finger \
+  $gopher \
+  $nntp \
+  $smb \
+  --build=$ARCH-slackware-linux
+
+  make
+  make install DESTDIR=$PKG
+
+# Don't clobber the one supplied by glibc-i18n.
+rm -f $PKG/usr/share/locale/locale.alias
+
+if [ "$DEBUG" = "no" ]; 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
+
+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 BUGS COPYING NEWS README SITES THANKS TODO \
+  ChangeLog doc/*txt contrib \
+  $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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/felinks/felinks.info b/network/felinks/felinks.info
new file mode 100644
index 0000000000..4d5bf48d14
--- /dev/null
+++ b/network/felinks/felinks.info
@@ -0,0 +1,10 @@
+PRGNAM="felinks"
+VERSION="08da1d8"
+HOMEPAGE="https://github.com/rkd77/felinks"
+DOWNLOAD="https://github.com/rkd77/felinks/archive/08da1d87eb74e082ca7aae8c81d2518a4415f3a7/felinks-08da1d8.tar.gz"
+MD5SUM="bc6b107e131dbfc0d17566b4f3d6429d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/felinks/patches/0001-gopher_html_links.patch b/network/felinks/patches/0001-gopher_html_links.patch
new file mode 100644
index 0000000000..38a2dd0b10
--- /dev/null
+++ b/network/felinks/patches/0001-gopher_html_links.patch
@@ -0,0 +1,37 @@
+################################################################
+# Fix for HTML links that contain URL:http://
+# dave@slackbuilds.org
+###############################################################
+diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
+--- a/src/protocol/gopher/gopher.c	2013-12-18 15:38:57.000000000 +0000
++++ b/src/protocol/gopher/gopher.c	2020-01-08 05:34:02.300498220 +0000
+@@ -277,6 +277,10 @@
+ 	struct string command;
+ 	enum gopher_entity entity = DEFAULT_GOPHER_ENTITY;
+ 	unsigned char *selector = conn->uri->data;
++	unsigned char const* URI  = "hURI%3";
++	unsigned char const* URL  = "hURL%3";
++	unsigned char const* CURI = "HURI%3";
++	unsigned char const* CURL = "HURL%3";
+ 	int selectorlen = conn->uri->datalen;
+ 	struct gopher_entity_info *entity_info;
+ 	size_t size;
+@@ -288,6 +292,18 @@
+ 		selectorlen--;
+ 	}
+ 
++	if(strstr(selector, URL) != NULL || strstr(selector, URI) != NULL) {
++		entity = GOPHER_HTML;
++		selector++;
++		selectorlen--;
++	}
++
++	if(strstr(selector, CURL) != NULL || strstr(selector, CURI) != NULL) {
++		entity = GOPHER_CHTML;
++		selector++;
++		selectorlen--;
++	}
++
+ 	/* This is probably a hack. It serves as a work around when no entity is
+ 	 * available in the Gopher URI. Instead of segfaulting later the content
+ 	 * will be served as application/octet-stream. However, it could
diff --git a/network/felinks/patches/0002-gopher_index_queries.patch b/network/felinks/patches/0002-gopher_index_queries.patch
new file mode 100644
index 0000000000..662fd13a7f
--- /dev/null
+++ b/network/felinks/patches/0002-gopher_index_queries.patch
@@ -0,0 +1,113 @@
+#######################################################################
+# Fix for type 7 entities.
+# dave@slackbuilds.org
+#######################################################################
+diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-13 22:35:13.663935305 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-13 23:16:00.053003768 +0000
+@@ -197,7 +197,7 @@
+ 	command->length = strlen(command->source);
+ }
+ 
+-static struct connection_state init_gopher_index_cache_entry(struct connection *conn);
++/* static struct connection_state init_gopher_index_cache_entry(struct connection *conn); */
+ 
+ static struct connection_state
+ add_gopher_command(struct connection *conn, struct string *command,
+@@ -205,7 +205,7 @@
+ 		   unsigned char *selector, int selectorlen)
+ {
+ 	unsigned char *query;
+-	int querylen;
++	int querylen = 0;
+ 
+ 	if (!init_string(command))
+ 		return connection_state(S_OUT_OF_MEM);
+@@ -218,13 +218,14 @@
+ 		/* Exclude '?' */
+ 		if (query) selectorlen -= 1;
+ 		query = NULL;
+-		querylen = 0;
+-	} else {
+-		query += 1;
++	} else if (entity == GOPHER_INDEX) {
++		/* fix query size to not include the search= part */
++		query += 8;
+ 		querylen = selector + selectorlen - query;
+ 		/* Exclude '?' */
+-		selectorlen -= querylen + 1;
+-		if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) {
++		/* fix selector length to fit with query */
++		selectorlen -= querylen + 8;
++		if (querylen >= 7 && !c_strncasecmp(query, "submit=", 7)) {
+ 			query	 += 7;
+ 			querylen -= 7;
+ 		}
+@@ -233,9 +234,11 @@
+ 	switch (entity) {
+ 	case GOPHER_INDEX:
+ 		/* No search required? */
++		/* Don't display the form page */
+ 		if (!query) {
+ 			done_string(command);
+-			return init_gopher_index_cache_entry(conn);
++			add_uri_decoded(command, selector, selectorlen, 0);
++			break;
+ 		}
+ 
+ 		add_uri_decoded(command, selector, selectorlen, 0);
+@@ -371,13 +374,14 @@
+ add_gopher_search_field(struct string *buffer, const unsigned char *text,
+ 		const unsigned char *addr)
+ {
++	/* Not *every* query is a search! */
+ 	add_format_to_string(buffer,
+ 		"<form action=\"%s\">"
+ 		"<table>"
+ 		"<td>            </td>"
+ 		"<td>%s:</td>"
+-		"<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>"
+-		"<td><input type=submit value=\"Search\"></td>"
++		"<td><input maxlength=\"256\" name=\"submit\" value=\"\"></td>"
++		"<td><input type=submit value=\"Submit\"></td>"
+ 		"</table>"
+ 		"</form>",
+ 		addr, text);
+@@ -662,6 +666,7 @@
+ }
+ 
+ /* Display a Gopher Index document. */
++/* Use the page that the gopher site sends us
+ static struct connection_state
+ init_gopher_index_cache_entry(struct connection *conn)
+ {
+@@ -674,9 +679,9 @@
+ 
+ 	where = get_uri_string(conn->uri, URI_PUBLIC);
+ 
+-	/* TODO: Use different function when using UTF-8
++	 TODO: Use different function when using UTF-8
+ 	 * in terminal (decode_uri_for_display replaces
+-	 * bytes of UTF-8 characters width '*'). */
++	 * bytes of UTF-8 characters width '*'). *
+ 	if (where) decode_uri_for_display(where);
+ 
+ 	add_format_to_string(&buffer,
+@@ -695,7 +700,7 @@
+ 
+ 	mem_free_if(where);
+ 
+-	/* FIXME: I think this needs a form or something */
++	* FIXME: I think this needs a form or something *
+ 
+ 	add_fragment(conn->cached, conn->from, buffer.source, buffer.length);
+ 	conn->from += buffer.length;
+@@ -707,7 +712,7 @@
+ 		? connection_state(S_OK)
+ 		: connection_state(S_OUT_OF_MEM);
+ }
+-
++*/
+ 
+ static void
+ read_gopher_response_data(struct socket *socket, struct read_buffer *rb)
diff --git a/network/felinks/patches/0003-gopher_directory_links.patch b/network/felinks/patches/0003-gopher_directory_links.patch
new file mode 100644
index 0000000000..15a89fac2f
--- /dev/null
+++ b/network/felinks/patches/0003-gopher_directory_links.patch
@@ -0,0 +1,26 @@
+#######################################################################
+# Fix remote directory links.
+# dave@slackbuilds.org
+#######################################################################
+diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-13 23:22:18.918292198 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-13 23:21:00.631960039 +0000
+@@ -321,6 +321,18 @@
+ 		selectorlen++;
+ 	}
+ 
++	if (entity_info->type == '1') {
++		if (strchr(selector, '1') == (char *) selector) {
++			selector++;
++			selectorlen--;
++		}
++		else {
++			if ((char *) selector  == "/1") {
++				selectorlen--;
++			}
++		}
++	}
++
+ 	state = add_gopher_command(conn, &command, entity, selector, selectorlen);
+ 	if (!is_in_state(state, S_CONN))
+ 		return state;
diff --git a/network/felinks/patches/0005-gopher_newlines_tabs_entity-2.patch b/network/felinks/patches/0005-gopher_newlines_tabs_entity-2.patch
new file mode 100644
index 0000000000..2885a67e76
--- /dev/null
+++ b/network/felinks/patches/0005-gopher_newlines_tabs_entity-2.patch
@@ -0,0 +1,50 @@
+diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
+--- a/src/protocol/gopher/gopher.c	2020-01-31 16:50:36.000000000 +0000
++++ b/src/protocol/gopher/gopher.c	2020-05-14 06:21:44.523952135 +0000
+@@ -283,7 +283,7 @@
+ 
+ 	/* Get entity type, and selector string. */
+ 	/* Pick up gopher_entity */
+-	if (selectorlen > 1 && selector[1] == '/') {
++	if (selectorlen > 1) {
+ 		entity = *selector++;
+ 		selectorlen--;
+ 	}
+@@ -308,6 +308,18 @@
+ 		selectorlen--;
+ 	}
+ 
++	if (entity_info->type == '1') {
++		if (strchr(selector, '1') == (char *) selector) {
++			selector++;
++			selectorlen--;
++		}
++		else {
++			if ((char *) selector  == "/1") {
++				selectorlen--;
++			}
++		}
++	}
++
+ 	state = add_gopher_command(conn, &command, entity, selector, selectorlen);
+ 	if (!is_in_state(state, S_CONN))
+ 		return state;
+@@ -548,7 +560,8 @@
+ 
+ 		} else if (address.length > 0
+ 			   && strlcmp(address.source, address.length - 1,
+-				      "gopher://error.host:1/", -1)) {
++				      "gopher://error.host:1/", -1)
++				 && selector) {
+ 			add_gopher_link(buffer, name, address.source);
+ 
+ 		} else {
+@@ -571,7 +584,7 @@
+ 		if (data[0] == ASCII_CR && data[1] == ASCII_LF)
+ 			return data + 2;
+ 
+-		if (data[0] == ASCII_LF)
++		if (data[0] == ASCII_CR || data[0] == ASCII_LF)
+ 			return data + 1;
+ 	}
+ 
diff --git a/network/felinks/patches/0006-gopher-indexes_nocr.patch b/network/felinks/patches/0006-gopher-indexes_nocr.patch
new file mode 100644
index 0000000000..9e4a441db6
--- /dev/null
+++ b/network/felinks/patches/0006-gopher-indexes_nocr.patch
@@ -0,0 +1,19 @@
+#######################################################################
+# Fix index listings with only LF and no CRs.
+# dave@slackbuilds.org 
+#######################################################################
+diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-14 06:42:11.030536586 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-14 06:42:26.710000886 +0000
+@@ -757,6 +757,11 @@
+ 	switch (gopher->entity->type) {
+ 	case GOPHER_DIRECTORY:
+ 	case GOPHER_INDEX:
++		/* Lines with no carriage returns */
++		if (strchr(rb->data, ASCII_CR) == NULL) {
++			strncat(rb->data, "\r\n", 2);
++			rb->length += 3;
++		}
+ 		state = read_gopher_directory_data(conn, rb);
+ 		break;
+ 
diff --git a/network/felinks/patches/0008-gopher-html-entities.patch b/network/felinks/patches/0008-gopher-html-entities.patch
new file mode 100644
index 0000000000..750d1a49de
--- /dev/null
+++ b/network/felinks/patches/0008-gopher-html-entities.patch
@@ -0,0 +1,47 @@
+###################################################################
+# Encode < > to HTML.
+###################################################################
+diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c	2020-01-14 03:26:41.791778387 +0000
++++ cc/src/protocol/gopher/gopher.c	2020-01-14 06:19:56.964025440 +0000
+@@ -620,6 +620,25 @@
+ 	return line[0] == '.' && !line[1] ? NULL : line;
+ }
+ 
++/* substring replacement */
++static void
++str_replace(char * in_string, char * s_string, char * r_string)
++{
++	/* max == replace all characters */
++	char temp[strlen(in_string) * (strlen(r_string) - strlen(s_string)) + 1];
++	char * pos;
++
++	if (!(pos = strstr(in_string, s_string)))
++			return;
++
++	strncpy(temp, in_string, pos - in_string);
++	temp[pos - in_string] = 0;
++	sprintf(temp + (pos - in_string), "%s%s", r_string, pos + 1);
++	in_string[0] = 0;
++	strcpy(in_string, temp);
++	return str_replace(in_string, s_string, r_string);
++}
++
+ /* Parse a Gopher Menu document */
+ static struct connection_state
+ read_gopher_directory_data(struct connection *conn, struct read_buffer *rb)
+@@ -639,6 +658,14 @@
+ 		return connection_state(S_OUT_OF_MEM);
+ 	}
+ 
++	/* Lines with characters that need to be converted to html */
++	if (strstr(rb->data, "<")) {
++		str_replace(rb->data, "<", "&lt;");
++	}
++	if (strstr(rb->data, ">")) {
++		str_replace(rb->data, ">", "&gt;");
++	}
++
+ 	while ((end = get_gopher_line_end(rb->data, rb->length))) {
+ 		unsigned char *line = check_gopher_last_line(rb->data, end);
+ 
diff --git a/network/felinks/slack-desc b/network/felinks/slack-desc
new file mode 100644
index 0000000000..1a0bba4cc9
--- /dev/null
+++ b/network/felinks/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------------------------------------------------------|
+felinks: felinks (A fork of Elinks, the web browser)
+felinks:
+felinks: Felinks is a maintained and up-to-date fork of ELinks, an advanced
+felinks: web browser.
+felinks:
+felinks: https://github.com/rkd77/felinks
+felinks:
+felinks:
+felinks:
+felinks:
+felinks:
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/fping/README b/network/fping/README
new file mode 100644
index 0000000000..1fa2dc57cb
--- /dev/null
+++ b/network/fping/README
@@ -0,0 +1,7 @@
+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.
+
+NOTE: Old fping and fping6 packages are no longer needed, and should probably
+be removed before installing this one.
diff --git a/network/fping/fping.SlackBuild b/network/fping/fping.SlackBuild
new file mode 100644
index 0000000000..070a4beda9
--- /dev/null
+++ b/network/fping/fping.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for fping
+
+# Copyright 2015, 2016, 2020  Mario Preksavec, Zagreb, Croatia
+# 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=fping
+VERSION=${VERSION:-5.0}
+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/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -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 \
+  --enable-ipv4 \
+  --enable-ipv6 \
+  --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 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
+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/fping/fping.info b/network/fping/fping.info
new file mode 100644
index 0000000000..883aa40729
--- /dev/null
+++ b/network/fping/fping.info
@@ -0,0 +1,10 @@
+PRGNAM="fping"
+VERSION="5.0"
+HOMEPAGE="http://fping.org/"
+DOWNLOAD="http://fping.org/dist/fping-5.0.tar.gz"
+MD5SUM="6af4c39bf012af75f93983d0efa242b0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
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/fping3/README b/network/fping3/README
deleted file mode 100644
index 8370986017..0000000000
--- a/network/fping3/README
+++ /dev/null
@@ -1,7 +0,0 @@
-fping3 (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.
-
-NOTE: Old fping and fping6 packages are no longer needed, and should probably
-be removed before installing this one.
diff --git a/network/fping3/fping3.SlackBuild b/network/fping3/fping3.SlackBuild
deleted file mode 100644
index 06fe8076bc..0000000000
--- a/network/fping3/fping3.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for fping3
-
-# Copyright 2015, 2016  Mario Preksavec, Zagreb, Croatia
-# 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=fping3
-SRCNAM=fping
-VERSION=${VERSION:-3.13}
-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/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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/$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" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-ipv4 \
-  --enable-ipv6 \
-  --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 ChangeLog INSTALL README doc/README.1992 $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/fping3/fping3.info b/network/fping3/fping3.info
deleted file mode 100644
index 6f597a3c17..0000000000
--- a/network/fping3/fping3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fping3"
-VERSION="3.13"
-HOMEPAGE="http://fping.org/"
-DOWNLOAD="http://fping.org/dist/fping-3.13.tar.gz"
-MD5SUM="a39134baca6bc6ced56191cb51fb0dc2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/fping3/slack-desc b/network/fping3/slack-desc
deleted file mode 100644
index e65a12eed9..0000000000
--- a/network/fping3/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------------------------------------------------------|
-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:
diff --git a/network/franz/README b/network/franz/README
new file mode 100644
index 0000000000..63bc085c60
--- /dev/null
+++ b/network/franz/README
@@ -0,0 +1,5 @@
+Franz is your messaging app for WhatsApp, Facebook Messenger, Slack,
+Telegram and many many more.
+
+You need to sign up for Franz account before you can use this
+application.
diff --git a/network/franz/doinst.sh b/network/franz/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/network/franz/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/franz/franz.SlackBuild b/network/franz/franz.SlackBuild
new file mode 100644
index 0000000000..87bd08bc6a
--- /dev/null
+++ b/network/franz/franz.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# Slackware build script for franz
+
+# Copyright 2020 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=franz
+VERSION=${VERSION:-5.6.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  SRCARCH="amd64"
+else
+  echo "This system is unsupported.  Aborting."
+  exit 1
+fi
+
+# No flags/configure needed as it is just a binary repackaging.
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}_${VERSION}_${SRCARCH}.deb data.tar.xz | tar xJv
+cd $PKG
+chown -R root:root .
+find . -type d -exec chmod 0755 {} \;
+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/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 > $PWD/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/franz/franz.info b/network/franz/franz.info
new file mode 100644
index 0000000000..584c56006f
--- /dev/null
+++ b/network/franz/franz.info
@@ -0,0 +1,10 @@
+PRGNAM="franz"
+VERSION="5.6.1"
+HOMEPAGE="https://meetfranz.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+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/franz/slack-desc b/network/franz/slack-desc
new file mode 100644
index 0000000000..a42a23a70a
--- /dev/null
+++ b/network/franz/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------------------------------------------------------|
+franz: franz (Messaging App Unification)
+franz:
+franz: Franz is your messaging app for WhatsApp, Facebook Messenger, Slack,
+franz: Telegram and many many more.
+franz:
+franz:
+franz:
+franz:
+franz: Project: https://meetfranz.com/
+franz:
+franz:
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/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild
index 18f1a4bc4f..3b9edaa061 100644
--- a/network/freerdp/freerdp.SlackBuild
+++ b/network/freerdp/freerdp.SlackBuild
@@ -6,7 +6,7 @@
 # Copyright 2010,2012 Niels Horn, Rio de Janeiro, RJ, Brazil
 # Copyright 2015 Mario Preksavec <mario@slackware.hr>
 # Copyright 2015-2018 Philip van der Hoeven, Almere, The Netherlands
-# Copyright 2019 Tim Danforth, USA
+# Copyright 2019-2020 Tim Danforth, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,12 +28,11 @@
 
 
 PRGNAM=freerdp
-VERSION=${VERSION:-2.0.0_rc4}
-SRCVER=$(echo $VERSION | tr _ -)
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-DIRNAME=FreeRDP-$SRCVER
+DIRNAME=FreeRDP-$VERSION
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -108,7 +107,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 ChangeLog LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/freerdp/freerdp.info b/network/freerdp/freerdp.info
index 1ce1cd6bdd..8d652ec32a 100644
--- a/network/freerdp/freerdp.info
+++ b/network/freerdp/freerdp.info
@@ -1,8 +1,8 @@
 PRGNAM="freerdp"
-VERSION="2.0.0_rc4"
-HOMEPAGE="http://www.freerdp.com"
-DOWNLOAD="https://github.com/FreeRDP/FreeRDP/archive/2.0.0-rc4/FreeRDP-2.0.0-rc4.tar.gz"
-MD5SUM="bbf6f3566037b0e3de7d8dc637066682"
+VERSION="2.0.0"
+HOMEPAGE="https://www.freerdp.com"
+DOWNLOAD="https://github.com/FreeRDP/FreeRDP/archive/2.0.0/FreeRDP-2.0.0.tar.gz"
+MD5SUM="9ac36ebc219a9877965eedc9263ee59c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
diff --git a/network/freerdp/slack-desc b/network/freerdp/slack-desc
index 5a5436edbe..7900777963 100644
--- a/network/freerdp/slack-desc
+++ b/network/freerdp/slack-desc
@@ -11,7 +11,7 @@ freerdp:
 freerdp: FreeRDP is a free implementation of the Remote Desktop Protocol (RDP),
 freerdp: released under the Apache license.
 freerdp:
-freerdp: Homepage: http://www.freerdp.com
+freerdp: Homepage: https://www.freerdp.com
 freerdp:
 freerdp:
 freerdp:
diff --git a/network/frr/frr.SlackBuild b/network/frr/frr.SlackBuild
index 701fd9696a..c25bdfa0c4 100644
--- a/network/frr/frr.SlackBuild
+++ b/network/frr/frr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for frr
 
-# Copyright 2018 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2018-2020 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=frr
-VERSION=${VERSION:-6.0}
+VERSION=${VERSION:-7.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -110,6 +110,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-fpm \
   --enable-vtysh \
   --enable-watchfrr \
+  --enable-doc \
+  --enable-doc-html \
   --disable-systemd \
   --disable-static \
   --without-libpam \
@@ -120,21 +122,13 @@ make install-strip DESTDIR=$PKG
 
 install -d -m 750 -o frr -g frr $PKG/etc/frr $PKG/var/log/frr $PKG/var/run/frr
 
-install -D -m 640 -o frr -g frr redhat/daemons $PKG/etc/frr/daemons.new
+install -D -m 640 -o frr -g frr tools/etc/frr/daemons $PKG/etc/frr/daemons.new
 install -D -m 640 -o frr -g frrvty tools/etc/frr/vtysh.conf $PKG/etc/frr/vtysh.conf.new
 
-install -D -m 644 redhat/frr.init $PKG/etc/rc.d/rc.frr.new
+install -D -m 644 $PKG/usr/sbin/frrinit.sh $PKG/etc/rc.d/rc.frr.new
 install -D -m 644 redhat/frr.logrotate $PKG/etc/logrotate.d/frr.new
 
-install -D -m 644 bgpd/BGP4-MIB.txt $PKG/usr/share/snmp/mibs/BGP4-MIB.txt
-install -D -m 644 eigrpd/EIGRP-MIB.txt $PKG/usr/share/snmp/mibs/EIGRP-MIB.txt
-install -D -m 644 ospf6d/OSPFv3-MIB.txt $PKG/usr/share/snmp/mibs/OSPFv3-MIB.txt
-install -D -m 644 ospfd/OSPF-MIB.txt $PKG/usr/share/snmp/mibs/OSPF-MIB.txt
-install -D -m 644 ospfd/OSPF-TRAP-MIB.txt $PKG/usr/share/snmp/mibs/OSPF-TRAP-MIB.txt
-install -D -m 644 ripd/RIPv2-MIB.txt $PKG/usr/share/snmp/mibs/RIPv2-MIB.txt
-
-# Fix paths
-sed -i 's|usr/lib/frr|usr/sbin|g' $PKG/etc/rc.d/rc.frr.new $PKG/etc/frr/daemons.new
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' $PKG/usr/sbin/{frr-reload.py,generate_support_bundle.py}
 
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
@@ -148,7 +142,7 @@ gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL NEWS README* \
+  COPYING* README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/frr/frr.info b/network/frr/frr.info
index d653abc141..4cd3dd396a 100644
--- a/network/frr/frr.info
+++ b/network/frr/frr.info
@@ -1,10 +1,10 @@
 PRGNAM="frr"
-VERSION="6.0"
+VERSION="7.3.1"
 HOMEPAGE="https://frrouting.org/"
-DOWNLOAD="https://github.com/FRRouting/frr/archive/frr-6.0/frr-frr-6.0.tar.gz"
-MD5SUM="f7584302a8837194021b82ae646d5e2d"
+DOWNLOAD="https://github.com/FRRouting/frr/archive/frr-7.3.1/frr-frr-7.3.1.tar.gz"
+MD5SUM="87eeee8a5ca731054e0264d6a23c9940"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-xml-libxml c-ares ipaddr-py Sphinx rtrlib"
+REQUIRES="perl-xml-libxml c-ares ipaddr-py Sphinx rtrlib libyang"
 MAINTAINER="Thibaut Notteboom"
 EMAIL="thibaut.notteboom@gmail.com"
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 92f4e2a073..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.1.1}
+VERSION=${VERSION:-2.5.2}
 SRCVER=$(tr _ - <<< ${VERSION})
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -87,7 +87,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/var/cache/glewlwyd/
 mv $PKG/etc/glewlwyd/glewlwyd.conf $PKG/etc/glewlwyd/glewlwyd.conf.sample
 if [ ! -z "$LIBDIRSUFFIX" ]; then
-	sed -i 's#/usr/lib/glewlwyd/#/usr/lib${LIBDIRSUFFIX}/glewlwyd/#g' $PKG/etc/glewlwyd/glewlwyd.conf.sample
+	sed -i 's#/usr/lib.*/glewlwyd/#/usr/lib'${LIBDIRSUFFIX}'/glewlwyd/#g' $PKG/etc/glewlwyd/glewlwyd.conf.sample
 fi
 
 mkdir -p $PKG/etc/rc.d/
diff --git a/network/glewlwyd/glewlwyd.info b/network/glewlwyd/glewlwyd.info
index d6b6a192c2..06c12b5965 100644
--- a/network/glewlwyd/glewlwyd.info
+++ b/network/glewlwyd/glewlwyd.info
@@ -1,10 +1,10 @@
 PRGNAM="glewlwyd"
-VERSION="2.1.1"
+VERSION="2.5.2"
 HOMEPAGE="https://github.com/babelouest/glewlwyd"
-DOWNLOAD="https://github.com/babelouest/glewlwyd/archive/v2.1.1/glewlwyd-2.1.1.tar.gz"
-MD5SUM="f33ec6cef5a2452b6a84e1cf8e322bfb"
+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 libjwt oath-toolkit libcbor hoel"
+REQUIRES="libconfig oath-toolkit libcbor hoel iddawc"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"
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/gophernicus/git2tarxz.sh b/network/gophernicus/git2tarxz.sh
index e4937ba1c4..2da7118d54 100644
--- a/network/gophernicus/git2tarxz.sh
+++ b/network/gophernicus/git2tarxz.sh
@@ -46,7 +46,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz
 Update $PRGNAM.info with:
 
 VERSION="$VERSION"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
 MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
 
 Don't forget to upload the new source!
diff --git a/network/gophernicus/gophernicus.info b/network/gophernicus/gophernicus.info
index 8986cecfd3..a9f15b99e8 100644
--- a/network/gophernicus/gophernicus.info
+++ b/network/gophernicus/gophernicus.info
@@ -1,7 +1,7 @@
 PRGNAM="gophernicus"
 VERSION="2.5v101"
 HOMEPAGE="https://github.com/kimholviala/gophernicus"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/gophernicus-2.5v101.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/gophernicus-2.5v101.tar.xz"
 MD5SUM="a95b9c71bf67581b66703d979e5e3789"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/grsync/grsync.SlackBuild b/network/grsync/grsync.SlackBuild
index 222cf8102e..c4d09274d1 100644
--- a/network/grsync/grsync.SlackBuild
+++ b/network/grsync/grsync.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for grsync
 
-# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2020 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=grsync
-VERSION=${VERSION:-1.2.6}
+VERSION=${VERSION:-1.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/grsync/grsync.info b/network/grsync/grsync.info
index 68d70b398f..56c19dc988 100644
--- a/network/grsync/grsync.info
+++ b/network/grsync/grsync.info
@@ -1,8 +1,8 @@
 PRGNAM="grsync"
-VERSION="1.2.6"
+VERSION="1.2.8"
 HOMEPAGE="http://www.opbyte.it/grsync/"
-DOWNLOAD="http://downloads.sf.net/grsync/grsync-1.2.6.tar.gz"
-MD5SUM="eb2b39e68a04ea5b9c92bcb7d9401e80"
+DOWNLOAD="http://downloads.sf.net/grsync/grsync-1.2.8.tar.gz"
+MD5SUM="9531279242a36169847fb81f72ceb412"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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 8dd14ed682..d9d8e6401a 100644
--- a/network/hostapd/hostapd.SlackBuild
+++ b/network/hostapd/hostapd.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2008-2013  Murat D. Kadirov <banderols@gmail.com>
 # Copyright 2014-2016  LukenShiro, Italy
-# Copyright 2018, 2019 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2018-2020 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,8 +27,8 @@
 # Fixed doinst.sh by Mario Preksavec <mario@slackware.hr>
 
 PRGNAM=hostapd
-VERSION=${VERSION:-2.7}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.9}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -80,6 +80,7 @@ for i in $CWD/patches/*.patch; do
   patch -p2 < "$i"
 done)
 
+# Edit the defconfig to enable additional features
 cat $CWD/hostapd.defconfig > .config
 
 CFLAGS+="$SLKCFLAGS" make
diff --git a/network/hostapd/hostapd.defconfig b/network/hostapd/hostapd.defconfig
index 08005f26b4..e1bfff1f83 100644
--- a/network/hostapd/hostapd.defconfig
+++ b/network/hostapd/hostapd.defconfig
@@ -19,7 +19,7 @@ CONFIG_DRIVER_WIRED=y
 CONFIG_DRIVER_NL80211=y
 
 # QCA vendor extensions to nl80211
-#CONFIG_DRIVER_NL80211_QCA=y
+CONFIG_DRIVER_NL80211_QCA=y
 
 # driver_nl80211.c requires libnl. If you are compiling it yourself
 # you may need to point hostapd to your version of libnl.
@@ -97,7 +97,7 @@ CONFIG_EAP_PAX=y
 CONFIG_EAP_PSK=y
 
 # EAP-pwd for the integrated EAP server (secure authentication with a password)
-#CONFIG_EAP_PWD=y
+CONFIG_EAP_PWD=y
 
 # EAP-SAKE for the integrated EAP server
 CONFIG_EAP_SAKE=y
@@ -142,13 +142,13 @@ CONFIG_PKCS12=y
 
 # RADIUS authentication server. This provides access to the integrated EAP
 # server from external hosts using RADIUS.
-CONFIG_RADIUS_SERVER=y
+#CONFIG_RADIUS_SERVER=y
 
 # Build IPv6 support for RADIUS operations
 CONFIG_IPV6=y
 
 # IEEE Std 802.11r-2008 (Fast BSS Transition)
-CONFIG_IEEE80211R=y
+#CONFIG_IEEE80211R=y
 
 # Use the hostapd's IEEE 802.11 authentication (ACL), but without
 # the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
@@ -162,7 +162,7 @@ CONFIG_IEEE80211N=y
 #CONFIG_WNM=y
 
 # IEEE 802.11ac (Very High Throughput) support
-CONFIG_IEEE80211AC=y
+#CONFIG_IEEE80211AC=y
 
 # IEEE 802.11ax HE support
 # Note: This is experimental and work in progress. The definitions are still
@@ -319,7 +319,7 @@ CONFIG_IEEE80211AC=y
 #CONFIG_HS20=y
 
 # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
-CONFIG_SQLITE=y
+#CONFIG_SQLITE=y
 
 # Enable Fast Session Transfer (FST)
 #CONFIG_FST=y
@@ -390,7 +390,7 @@ CONFIG_ACS=y
 # parameter. See that parameter in hostapd.conf for more details.
 #CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1
 
-# custom configuration options
+# Additional Options
 CONFIG_MESH=y
 CONFIG_SAE=y
 CONFIG_WPS2=y
diff --git a/network/hostapd/hostapd.info b/network/hostapd/hostapd.info
index c4e87e1a2d..120734259a 100644
--- a/network/hostapd/hostapd.info
+++ b/network/hostapd/hostapd.info
@@ -1,8 +1,8 @@
 PRGNAM="hostapd"
-VERSION="2.7"
+VERSION="2.9"
 HOMEPAGE="https://w1.fi/hostapd/"
-DOWNLOAD="https://w1.fi/releases/hostapd-2.7.tar.gz"
-MD5SUM="8d3799f3a3c247cff47d41503698721b"
+DOWNLOAD="https://w1.fi/releases/hostapd-2.9.tar.gz"
+MD5SUM="f188fc53a495fe7af3b6d77d3c31dee8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/hostapd/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/network/hostapd/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
new file mode 100644
index 0000000000..0aa8a5ea1d
--- /dev/null
+++ b/network/hostapd/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
@@ -0,0 +1,150 @@
+From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Wed, 3 Jun 2020 23:17:35 +0300
+Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to
+ other networks
+
+The UPnP Device Architecture 2.0 specification errata ("UDA errata
+16-04-2020.docx") addresses a problem with notifications being allowed
+to go out to other domains by disallowing such cases. Do such filtering
+for the notification callback URLs to avoid undesired connections to
+external networks based on subscriptions that any device in the local
+network could request when WPS support for external registrars is
+enabled (the upnp_iface parameter in hostapd configuration).
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_er.c     |  2 +-
+ src/wps/wps_upnp.c   | 38 ++++++++++++++++++++++++++++++++++++--
+ src/wps/wps_upnp_i.h |  3 ++-
+ 3 files changed, 39 insertions(+), 4 deletions(-)
+
+diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c
+index 6bded14327f8..31d2e50e4cff 100644
+--- a/src/wps/wps_er.c
++++ b/src/wps/wps_er.c
+@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter)
+ 			   "with %s", filter);
+ 	}
+ 	if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text,
+-			   er->mac_addr)) {
++			   NULL, er->mac_addr)) {
+ 		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
+ 			   "for %s. Does it have IP address?", er->ifname);
+ 		wps_er_deinit(er, NULL, NULL);
+diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
+index 6e10e4bc0c3f..7d4b7439940e 100644
+--- a/src/wps/wps_upnp.c
++++ b/src/wps/wps_upnp.c
+@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s)
+ }
+ 
+ 
++static int local_network_addr(struct upnp_wps_device_sm *sm,
++			      struct sockaddr_in *addr)
++{
++	return (addr->sin_addr.s_addr & sm->netmask.s_addr) ==
++		(sm->ip_addr & sm->netmask.s_addr);
++}
++
++
+ /* subscr_addr_add_url -- add address(es) for one url to subscription */
+ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 				size_t url_len)
+@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 
+ 	for (rp = result; rp; rp = rp->ai_next) {
+ 		struct subscr_addr *a;
++		struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr;
+ 
+ 		/* Limit no. of address to avoid denial of service attack */
+ 		if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) {
+@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 			break;
+ 		}
+ 
++		if (!local_network_addr(s->sm, addr)) {
++			wpa_printf(MSG_INFO,
++				   "WPS UPnP: Ignore a delivery URL that points to another network %s",
++				   inet_ntoa(addr->sin_addr));
++			continue;
++		}
++
+ 		a = os_zalloc(sizeof(*a) + alloc_len);
+ 		if (a == NULL)
+ 			break;
+@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN])
+  * @net_if: Selected network interface name
+  * @ip_addr: Buffer for returning IP address in network byte order
+  * @ip_addr_text: Buffer for returning a pointer to allocated IP address text
++ * @netmask: Buffer for returning netmask or %NULL if not needed
+  * @mac: Buffer for returning MAC address
+  * Returns: 0 on success, -1 on failure
+  */
+ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+-		   u8 mac[ETH_ALEN])
++		   struct in_addr *netmask, u8 mac[ETH_ALEN])
+ {
+ 	struct ifreq req;
+ 	int sock = -1;
+@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+ 	in_addr.s_addr = *ip_addr;
+ 	os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr));
+ 
++	if (netmask) {
++		os_memset(&req, 0, sizeof(req));
++		os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
++		if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) {
++			wpa_printf(MSG_ERROR,
++				   "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)",
++				   errno, strerror(errno));
++			goto fail;
++		}
++		addr = (struct sockaddr_in *) &req.ifr_netmask;
++		netmask->s_addr = addr->sin_addr.s_addr;
++	}
++
+ #ifdef __linux__
+ 	os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
+ 	if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) {
+@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if)
+ 
+ 	/* Determine which IP and mac address we're using */
+ 	if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text,
+-			   sm->mac_addr)) {
++			   &sm->netmask, sm->mac_addr)) {
+ 		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
+ 			   "for %s. Does it have IP address?", net_if);
+ 		goto fail;
+ 	}
++	wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr "
++		   MACSTR,
++		   sm->ip_addr_text, inet_ntoa(sm->netmask),
++		   MAC2STR(sm->mac_addr));
+ 
+ 	/* Listen for incoming TCP connections so that others
+ 	 * can fetch our "xml files" from us.
+diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h
+index e87a93232df1..6ead7b4e9a30 100644
+--- a/src/wps/wps_upnp_i.h
++++ b/src/wps/wps_upnp_i.h
+@@ -128,6 +128,7 @@ struct upnp_wps_device_sm {
+ 	u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */
+ 	char *ip_addr_text; /* IP address of network i.f. we use */
+ 	unsigned ip_addr; /* IP address of network i.f. we use (host order) */
++	struct in_addr netmask;
+ 	int multicast_sd; /* send multicast messages over this socket */
+ 	int ssdp_sd; /* receive discovery UPD packets on socket */
+ 	int ssdp_sd_registered; /* nonzero if we must unregister */
+@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm,
+ 					const u8 uuid[UUID_LEN]);
+ void subscr_addr_delete(struct subscr_addr *a);
+ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+-		   u8 mac[ETH_ALEN]);
++		   struct in_addr *netmask, u8 mac[ETH_ALEN]);
+ 
+ /* wps_upnp_ssdp.c */
+ void msearchreply_state_machine_stop(struct advertisement_state_machine *a);
+-- 
+2.20.1
+
diff --git a/network/hostapd/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/network/hostapd/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
new file mode 100644
index 0000000000..c7a449e0b5
--- /dev/null
+++ b/network/hostapd/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
@@ -0,0 +1,59 @@
+From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Wed, 3 Jun 2020 22:41:02 +0300
+Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL
+ path
+
+More than about 700 character URL ended up overflowing the wpabuf used
+for building the event notification and this resulted in the wpabuf
+buffer overflow checks terminating the hostapd process. Fix this by
+allocating the buffer to be large enough to contain the full URL path.
+However, since that around 700 character limit has been the practical
+limit for more than ten years, start explicitly enforcing that as the
+limit or the callback URLs since any longer ones had not worked before
+and there is no need to enable them now either.
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_upnp.c       | 9 +++++++--
+ src/wps/wps_upnp_event.c | 3 ++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
+index 7d4b7439940e..ab685d52ecab 100644
+--- a/src/wps/wps_upnp.c
++++ b/src/wps/wps_upnp.c
+@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 	int rerr;
+ 	size_t host_len, path_len;
+ 
+-	/* url MUST begin with http: */
+-	if (url_len < 7 || os_strncasecmp(url, "http://", 7))
++	/* URL MUST begin with HTTP scheme. In addition, limit the length of
++	 * the URL to 700 characters which is around the limit that was
++	 * implicitly enforced for more than 10 years due to a bug in
++	 * generating the event messages. */
++	if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) {
++		wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL");
+ 		goto fail;
++	}
+ 	url += 7;
+ 	url_len -= 7;
+ 
+diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
+index d7e6edcc6503..08a23612f338 100644
+--- a/src/wps/wps_upnp_event.c
++++ b/src/wps/wps_upnp_event.c
+@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e)
+ 	struct wpabuf *buf;
+ 	char *b;
+ 
+-	buf = wpabuf_alloc(1000 + wpabuf_len(e->data));
++	buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) +
++			   wpabuf_len(e->data));
+ 	if (buf == NULL)
+ 		return NULL;
+ 	wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path);
+-- 
+2.20.1
+
diff --git a/network/hostapd/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/network/hostapd/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
new file mode 100644
index 0000000000..9d0376043d
--- /dev/null
+++ b/network/hostapd/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
@@ -0,0 +1,47 @@
+From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Thu, 4 Jun 2020 21:24:04 +0300
+Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more
+ properly
+
+While it is appropriate to try to retransmit the event to another
+callback URL on a failure to initiate the HTTP client connection, there
+is no point in trying the exact same operation multiple times in a row.
+Replve the event_retry() calls with event_addr_failure() for these cases
+to avoid busy loops trying to repeat the same failing operation.
+
+These potential busy loops would go through eloop callbacks, so the
+process is not completely stuck on handling them, but unnecessary CPU
+would be used to process the continues retries that will keep failing
+for the same reason.
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_upnp_event.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
+index 08a23612f338..c0d9e41d9a38 100644
+--- a/src/wps/wps_upnp_event.c
++++ b/src/wps/wps_upnp_event.c
+@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s)
+ 
+ 	buf = event_build_message(e);
+ 	if (buf == NULL) {
+-		event_retry(e, 0);
++		event_addr_failure(e);
+ 		return -1;
+ 	}
+ 
+@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s)
+ 					 event_http_cb, e);
+ 	if (e->http_event == NULL) {
+ 		wpabuf_free(buf);
+-		event_retry(e, 0);
++		event_addr_failure(e);
+ 		return -1;
+ 	}
+ 
+-- 
+2.20.1
+
diff --git a/network/hydra/README b/network/hydra/README
index cb062e4de5..33ab88bb80 100644
--- a/network/hydra/README
+++ b/network/hydra/README
@@ -6,10 +6,11 @@ to give researchers and security consultants a way to demonstrate
 how easy it would be to gain unauthorized access to a remote system.
            THIS TOOL IS FOR LEGAL PURPOSES ONLY!
 
-postgresql is an optional dependency, as is sap, but sap is not available
-at SBo.
+postgresql is an optional dependency, as is sap, but sap is not
+available at SBo.
 
-This SlackBuild includes an option to omit the GTK-based frontend xhydra.
+This SlackBuild includes an option to omit the GTK-based frontend
+xhydra.
 To omit xhydra, just pass XHYDRA=0 to the script:
     XHYDRA=0 sh hydra.SlackBuild
 
diff --git a/network/hydra/hydra.SlackBuild b/network/hydra/hydra.SlackBuild
index c2052738a0..7ee41979d8 100644
--- a/network/hydra/hydra.SlackBuild
+++ b/network/hydra/hydra.SlackBuild
@@ -4,7 +4,7 @@
 # Updated by Kent Fritz <fritz.kent@gmail.com>
 
 PRGNAM=hydra
-VERSION=${VERSION:-8.8}
+VERSION=${VERSION:-9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,6 @@ else
     MAKE_OPTS="XHYDRA_SUPPORT="
 fi
 
-echo CONFIG_OPTS is $CONFIG_OPTS
 ./configure $CONFIG_OPTS --prefix=$PKG/usr
 make OPTS="-I. $SLKCFLAGS" $MAKE_OPTS
 mkdir -p $PKG/usr/etc
@@ -88,7 +87,7 @@ fi
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE* README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE* README.md $PKG/usr/doc/$PRGNAM-$VERSION
 if [ "$XHYDRA" = "1" ]; then
   mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/hydra-gtk
   cp -a hydra-gtk/COPYING hydra-gtk/INSTALL hydra-gtk/README \
diff --git a/network/hydra/hydra.info b/network/hydra/hydra.info
index 4f6013d571..66f8d3e731 100644
--- a/network/hydra/hydra.info
+++ b/network/hydra/hydra.info
@@ -1,8 +1,8 @@
 PRGNAM="hydra"
-VERSION="8.8"
+VERSION="9.1"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
-DOWNLOAD="https://github.com/vanhauser-thc/thc-hydra/archive/v8.8/thc-hydra-8.8.tar.gz"
-MD5SUM="56c5a4f478bc46d3e6fc54cc5caa9c4a"
+DOWNLOAD="https://github.com/vanhauser-thc/thc-hydra/archive/v9.1/thc-hydra-9.1.tar.gz"
+MD5SUM="7a2f54980ce44aff0cc047fb75751dba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/i2pd/README b/network/i2pd/README
new file mode 100644
index 0000000000..512eb79c93
--- /dev/null
+++ b/network/i2pd/README
@@ -0,0 +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 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
new file mode 100644
index 0000000000..88d3563f2e
--- /dev/null
+++ b/network/i2pd/i2pd.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackbuild for i2pd
+
+# 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=i2pd
+VERSION=${VERSION:-2.36.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 {} \;
+
+cd build
+sed -i \
+  "s,LIBRARY DESTINATION lib,LIBRARY DESTINATION lib${LIBDIRSUFFIX}," \
+   CMakeLists.txt
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_STATIC=OFF \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_BUILD_TYPE=Release .
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE README.md docs/ \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc -name "Makefile" -delete
+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/network/i2pd/i2pd.info b/network/i2pd/i2pd.info
new file mode 100644
index 0000000000..4aa9e18f1d
--- /dev/null
+++ b/network/i2pd/i2pd.info
@@ -0,0 +1,10 @@
+PRGNAM="i2pd"
+VERSION="2.36.0"
+HOMEPAGE="http://i2pd.website/"
+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=""
+MAINTAINER="shelldweller"
+EMAIL="shelldweller@beauxbead.com"
diff --git a/network/i2pd/slack-desc b/network/i2pd/slack-desc
new file mode 100644
index 0000000000..7f7d653ce4
--- /dev/null
+++ b/network/i2pd/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------------------------------------------------------|
+i2pd: i2pd (I2P Daemon)
+i2pd:
+i2pd: A full-featured C++ implementation of an I2P client.
+i2pd:
+i2pd: An I2P client is software used for building and using anonymous I2P
+i2pd: networks. Such networks are commonly used for anonymous peer-to-peer
+i2pd: applications (filesharing, cryptocurrencies) and anonymous client-
+i2pd: server applications (websites, instant messengers, chat-servers).
+i2pd:
+i2pd: I2P allows people from all around the world to communicate and share
+i2pd: information without restrictions.
diff --git a/network/icecat/icecat.SlackBuild b/network/icecat/icecat.SlackBuild
index ea94287ad8..5d53df4b7a 100644
--- a/network/icecat/icecat.SlackBuild
+++ b/network/icecat/icecat.SlackBuild
@@ -25,7 +25,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM="icecat"
-VERSION=${VERSION:-60.3.0}
+VERSION=${VERSION:-60.7.0}
 RELEASEVER="$VERSION"
 RELEASEVERMAJ=$(echo $RELEASEVER | cut -f 1 -d .)
 BUILD=${BUILD:-1}
diff --git a/network/icecat/icecat.info b/network/icecat/icecat.info
index 082c1ce3a0..023563790d 100644
--- a/network/icecat/icecat.info
+++ b/network/icecat/icecat.info
@@ -1,10 +1,10 @@
 PRGNAM="icecat"
-VERSION="60.3.0"
+VERSION="60.7.0"
 HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
-DOWNLOAD="https://ftp.gnu.org/gnu/gnuzilla/60.3.0/icecat-60.3.0.en-US.gnulinux-i686.tar.bz2"
-MD5SUM="53c5055ab130b0c2c5b8335558ae648c"
-DOWNLOAD_x86_64="https://ftp.gnu.org/gnu/gnuzilla/60.3.0/icecat-60.3.0.en-US.gnulinux-x86_64.tar.bz2"
-MD5SUM_x86_64="2f26b0c54f14fbc2437eb50c7289b4a2"
+DOWNLOAD="https://ftp.gnu.org/gnu/gnuzilla/60.7.0/icecat-60.7.0.en-US.gnulinux-i686.tar.bz2"
+MD5SUM="7d274e1d3db42886caf96b3389209230"
+DOWNLOAD_x86_64="https://ftp.gnu.org/gnu/gnuzilla/60.7.0/icecat-60.7.0.en-US.gnulinux-x86_64.tar.bz2"
+MD5SUM_x86_64="4ae5415871df868d651f12f478f479de"
 REQUIRES=""
 MAINTAINER="melikamp"
 EMAIL="melikamp@melikamp.net"
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/insync/insync.SlackBuild b/network/insync/insync.SlackBuild
index 2ea6bdc071..99cc0a7d15 100644
--- a/network/insync/insync.SlackBuild
+++ b/network/insync/insync.SlackBuild
@@ -28,7 +28,7 @@
 
 PRGNAM=insync
 DEBNAM=bionic
-VERSION=${VERSION:-3.1.0.40756}
+VERSION=${VERSION:-3.1.3.40790}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/insync/insync.info b/network/insync/insync.info
index c1b4b040f8..e3694d0b99 100644
--- a/network/insync/insync.info
+++ b/network/insync/insync.info
@@ -1,10 +1,10 @@
 PRGNAM="insync"
-VERSION="3.1.0.40756"
+VERSION="3.1.3.40790"
 HOMEPAGE="https://www.insynchq.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://s.insynchq.com/builds/insync_3.1.0.40756-bionic_amd64.deb"
-MD5SUM_x86_64="a20c078db09548c0b22b4f13f857a393"
+DOWNLOAD_x86_64="http://s.insynchq.com/builds/insync_3.1.3.40790-bionic_amd64.deb"
+MD5SUM_x86_64="132f416415b0983c4276462d29e15201"
 REQUIRES=""
 MAINTAINER="Pedro R.M. Júnior"
 EMAIL="pedrormjunior@gmail.com"
diff --git a/network/ipxnet/git2tarxz.sh b/network/ipxnet/git2tarxz.sh
index 43de757147..b727ef3c88 100644
--- a/network/ipxnet/git2tarxz.sh
+++ b/network/ipxnet/git2tarxz.sh
@@ -35,7 +35,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz
 Update $PRGNAM.info with:
 
 VERSION="$VERSION"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
 MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
 
 Don't forget to upload the new source!
diff --git a/network/ipxnet/ipxnet.info b/network/ipxnet/ipxnet.info
index c17a1eaea5..755b99c2df 100644
--- a/network/ipxnet/ipxnet.info
+++ b/network/ipxnet/ipxnet.info
@@ -1,7 +1,7 @@
 PRGNAM="ipxnet"
 VERSION="20120808.0dce97e"
 HOMEPAGE="https://github.com/intangir/ipxnet"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ipxnet-20120808.0dce97e.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ipxnet-20120808.0dce97e.tar.xz"
 MD5SUM="a6bebe9513240e145285e4526ea3114c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/doinst.sh b/network/keepalived/doinst.sh
index 7062d561a6..4c107ecd23 100644
--- a/network/keepalived/doinst.sh
+++ b/network/keepalived/doinst.sh
@@ -17,7 +17,7 @@ if [ -e etc/rc.d/rc.keepalived ]; then
   mv etc/rc.d/rc.keepalived.new.incoming etc/rc.d/rc.keepalived.new
 fi
 
-config etc/keepalived/keepalived.new
+config etc/default/keepalived.new
 config etc/keepalived/keepalived.conf.new
 config etc/rc.d/rc.keepalived.new
 
diff --git a/network/keepalived/keepalived.SlackBuild b/network/keepalived/keepalived.SlackBuild
index ba30febaa0..c23734e1aa 100644
--- a/network/keepalived/keepalived.SlackBuild
+++ b/network/keepalived/keepalived.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for keepalived
 
 # Copyright 2010,2011 Nilton Moura, Rio de Janeiro, RJ, Brasil
+# Copyright 2020 Marek Wodzinski <majek@w7i.pl>
 # 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=keepalived
-VERSION=${VERSION:-1.2.19}
+VERSION=${VERSION:-2.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,6 +78,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-kernel-dir=/usr \
+  --disable-nftables \
+  --disable-libipset \
   --build=$ARCH-slackware-linux
 
 make
@@ -90,15 +93,19 @@ 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 \
-  AUTHOR ChangeLog CONTRIBUTORS COPYING INSTALL README TODO VERSION \
+  AUTHOR ChangeLog CONTRIBUTORS COPYING INSTALL README README.md TODO doc/NOTE_vrrp_vmac.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -a $PKG/etc/rc.d/init.d/keepalived $PKG/usr/doc/$PRGNAM-$VERSION/init.keepalived
 
-mv $PKG/etc/sysconfig/keepalived $PKG/etc/keepalived/keepalived.new
+mkdir -p $PKG/usr/share/snmp/mibs
+cp -a \
+  doc/KEEPALIVED-MIB.txt doc/VRRP-MIB.txt doc/VRRPv3-MIB.txt \
+  $PKG/usr/share/snmp/mibs
+
+mkdir -p $PKG/etc/default
+mv $PKG/etc/sysconfig/keepalived $PKG/etc/default/keepalived.new
 mv $PKG/etc/keepalived/keepalived.conf $PKG/etc/keepalived/keepalived.conf.new
-install -m755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-rm $PKG/etc/rc.d/init.d/keepalived
+install -m755 -D $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 rmdir $PKG/etc/sysconfig
 
 mkdir -p $PKG/install
diff --git a/network/keepalived/keepalived.info b/network/keepalived/keepalived.info
index a52db5cee0..3677d84db9 100644
--- a/network/keepalived/keepalived.info
+++ b/network/keepalived/keepalived.info
@@ -1,8 +1,8 @@
 PRGNAM="keepalived"
-VERSION="1.2.19"
-HOMEPAGE="http://www.keepalived.org/"
-DOWNLOAD="http://www.keepalived.org/software/keepalived-1.2.19.tar.gz"
-MD5SUM="5c98b06639dd50a6bff76901b53febb6"
+VERSION="2.2.2"
+HOMEPAGE="https://www.keepalived.org/"
+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/keepalived/rc.keepalived b/network/keepalived/rc.keepalived
index 8e214e651a..fc063fa1fe 100644
--- a/network/keepalived/rc.keepalived
+++ b/network/keepalived/rc.keepalived
@@ -3,48 +3,31 @@
 # Startup script for the Keepalived daemon
 #
 # This is the modified version from the original for the
-# Slackware. The only thing that differs from the original
-# is the path of the Source configuration file. Before was
-# /etc/sysconfig and now is /etc/keepalived, and the header
-# for the update-rc.d of Debian was removed.
-# 
-# The original file was copied to
-# /usr/doc/keepalived-1.2.2/init.keepalived
+# Slackware.
 #
-# This version was modified by Nilton Moura, the author of
-# the SlackBuild Script for keepalived.
-
-# Source function library
-. /etc/rc.d/init.d/functions
+# This version was modified in 2010 by Nilton Moura,
+# the original author of the SlackBuild Script for keepalived.
+#
+# Sript simplified, removed dependency of optional sysvinit-functions
+# package and moved daemon options to /etc/default
+# in 2020 by Marek Wodzinski <majek@w7i.pl>
 
 # Source configuration file (we set KEEPALIVED_OPTIONS there)
-. /etc/keepalived/keepalived
-
-RETVAL=0
-
-prog="keepalived"
+. /etc/default/keepalived
 
 start() {
-    echo -n $"Starting $prog: "
-    daemon keepalived ${KEEPALIVED_OPTIONS}
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+    echo "Starting keepalived"
+    /usr/sbin/keepalived ${KEEPALIVED_OPTIONS}
 }
 
 stop() {
-    echo -n $"Stopping $prog: "
-    killproc keepalived
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+    echo "Stopping keepalived "
+    pkill -TERM keepalived 1>/dev/null 2>/dev/null
 }
 
 reload() {
-    echo -n $"Reloading $prog: "
-    killproc keepalived -1
-    RETVAL=$?
-    echo
+    echo "Reloading keepalived"
+    pkill -1  keepalived
 }
 
 # See how we were called.
@@ -62,18 +45,7 @@ case "$1" in
         stop
         start
         ;;
-    condrestart)
-        if [ -f /var/lock/subsys/$prog ]; then
-            stop
-            start
-        fi
-        ;;
-    status)
-        status keepalived
-        ;;
     *)
-        echo "Usage: $0 {start|stop|reload|restart|condrestart|status}"
+        echo "Usage: $0 {start|stop|reload|restart}"
         exit 1
 esac
-
-exit $RETVAL
diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild
index d17b209e9c..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,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=krb5
-VERSION=${VERSION:-1.18}
+VERSION=${VERSION:-1.19.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -98,6 +98,7 @@ cat $CWD/rc.krb5kdc > $PKG/etc/rc.d/rc.krb5kdc.new
 cat $CWD/rc.kadmind > $PKG/etc/rc.d/rc.kadmind.new
 
 rm -rf $PKG/usr/man/cat{1,5,8}
+rm -f $PKG/usr/man/man5/.*.5
 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/krb5/krb5.info b/network/krb5/krb5.info
index 61d4a0d305..ec91e88bd1 100644
--- a/network/krb5/krb5.info
+++ b/network/krb5/krb5.info
@@ -1,8 +1,8 @@
 PRGNAM="krb5"
-VERSION="1.18"
+VERSION="1.19.1"
 HOMEPAGE="http://web.mit.edu/kerberos/"
-DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.tar.gz"
-MD5SUM="69a5b165dac5754a5094627ee6df0def"
+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 2896415dfc..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-2019 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.54}
+VERSION=${VERSION:-1.4.58}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info
index b720dc87b4..49924d8729 100644
--- a/network/lighttpd/lighttpd.info
+++ b/network/lighttpd/lighttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="lighttpd"
-VERSION="1.4.54"
+VERSION="1.4.58"
 HOMEPAGE="http://www.lighttpd.net/"
-DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.54.tar.xz"
-MD5SUM="7abc776243c811e9872f73ab38b7f8b5"
+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 6d76bd5ad1..25306b6af0 100644
--- a/network/lldpd/lldpd.SlackBuild
+++ b/network/lldpd/lldpd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lldpd
 
-# Copyright 2017-2019 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.4}
+VERSION=${VERSION:-1.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/lldpd/lldpd.info b/network/lldpd/lldpd.info
index b93d5c753d..0999957e77 100644
--- a/network/lldpd/lldpd.info
+++ b/network/lldpd/lldpd.info
@@ -1,8 +1,8 @@
 PRGNAM="lldpd"
-VERSION="1.0.4"
+VERSION="1.0.7"
 HOMEPAGE="https://vincentbernat.github.io/lldpd/"
-DOWNLOAD="https://media.luffy.cx/files/lldpd/lldpd-1.0.4.tar.gz"
-MD5SUM="33e8d58623f99184e4e709cbbfe45db3"
+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/mailspring/mailspring.SlackBuild b/network/mailspring/mailspring.SlackBuild
index bbaba850dd..aec0a99204 100644
--- a/network/mailspring/mailspring.SlackBuild
+++ b/network/mailspring/mailspring.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mailspring
-VERSION=${VERSION:-1.7.4}
+VERSION=${VERSION:-1.7.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/mailspring/mailspring.info b/network/mailspring/mailspring.info
index 2577d06b4a..18c30c3d30 100644
--- a/network/mailspring/mailspring.info
+++ b/network/mailspring/mailspring.info
@@ -1,10 +1,10 @@
 PRGNAM="mailspring"
-VERSION="1.7.4"
+VERSION="1.7.8"
 HOMEPAGE="https://getmailspring.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/Foundry376/Mailspring/releases/download/1.7.4/mailspring-1.7.4-amd64.deb"
-MD5SUM_x86_64="2660668acaa673aa08713992aa62faf4"
+DOWNLOAD_x86_64="https://github.com/Foundry376/Mailspring/releases/download/1.7.8/mailspring-1.7.8-amd64.deb"
+MD5SUM_x86_64="cba72626be223808f4d1f734fc62b1a5"
 REQUIRES=""
 MAINTAINER="Muhammad Mahendra Subrata"
 EMAIL="mumahendras3@gmail.com"
diff --git a/network/mattermost-desktop/mattermost-desktop.SlackBuild b/network/mattermost-desktop/mattermost-desktop.SlackBuild
index 5e9bf99959..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.4.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 66aa87ee83..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.4.0"
+VERSION="4.6.1"
 HOMEPAGE="https://mattermost.com"
-DOWNLOAD="https://releases.mattermost.com/desktop/4.4.0/mattermost-desktop-4.4.0-linux-ia32.tar.gz"
-MD5SUM="1a02dcaf7a8d191263c442304f57ba9a"
-DOWNLOAD_x86_64="https://releases.mattermost.com/desktop/4.4.0/mattermost-desktop-4.4.0-linux-x64.tar.gz"
-MD5SUM_x86_64="c4c1f1c3a9e2b243ce51680b1f6cf47d"
+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 8f5278cc66..a2bc3001ea 100644
--- a/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild
+++ b/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mod_auth_gssapi
 
-# Copyright 2019 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2019-2020 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=mod_auth_gssapi
-VERSION=${VERSION:-1.6.1}
+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 91dbfd5c8e..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.1"
+VERSION="1.6.3"
 HOMEPAGE="https://github.com/modauthgssapi/mod_auth_gssapi"
-DOWNLOAD="https://github.com/modauthgssapi/mod_auth_gssapi/releases/download/v1.6.1/mod_auth_gssapi-1.6.1.tar.gz"
-MD5SUM="a8d03852287fac4dbef9b50dc15b71de"
+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/modemu2k/README.Slackware b/network/modemu2k/README.Slackware
index 3c2d162234..dc8babebfa 100644
--- a/network/modemu2k/README.Slackware
+++ b/network/modemu2k/README.Slackware
@@ -1,4 +1,4 @@
-modemu2k v0.0.5
+modemu2k v0.0.6
 -------------------
 
 modemu2k is a fork of modemu, originally developed by Toru Egashira
@@ -83,6 +83,7 @@ Note: while in the program if backspace doesn't work, use CTRL+H.
   You could also connect to a BBS. For some telnet addresses, see:
 
   * <<Prism BBS<http://filegate.net/>
+  * The Rusty Mailbox (telnet to trmb.ca, port 2030)
   * Synchronet BBS List<http://www.synchro.net/sbbslist.html>
 
   To quit modemu2k, just quit the comm program.
diff --git a/network/modemu2k/modemu2k.SlackBuild b/network/modemu2k/modemu2k.SlackBuild
index 162da50b3d..21cc423d93 100644
--- a/network/modemu2k/modemu2k.SlackBuild
+++ b/network/modemu2k/modemu2k.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for modemu2k
 #
-# Copyright 2019 / Andy Alt / United States
+# Copyright 2019-2020 / 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=modemu2k
-VERSION=${VERSION:-0.0.5}
+VERSION=${VERSION:-0.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/modemu2k/modemu2k.info b/network/modemu2k/modemu2k.info
index 3732d2995a..239e0e39dc 100644
--- a/network/modemu2k/modemu2k.info
+++ b/network/modemu2k/modemu2k.info
@@ -1,8 +1,8 @@
 PRGNAM="modemu2k"
-VERSION="0.0.5"
+VERSION="0.0.6"
 HOMEPAGE="https://github.com/theimpossibleastronaut/modemu2k"
-DOWNLOAD="https://github.com/theimpossibleastronaut/modemu2k/releases/download/v0.0.5/modemu2k-0.0.5.tar.gz"
-MD5SUM="14c2cf318765508e37b1fcfd173b9f83"
+DOWNLOAD="https://github.com/theimpossibleastronaut/modemu2k/releases/download/v0.0.6/modemu2k-0.0.6.tar.gz"
+MD5SUM="a6a45ab9ad9d0fa5a2af229368fd05c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/mosaic-ck/mosaic-ck.info b/network/mosaic-ck/mosaic-ck.info
index 88f42e0114..8289604f2b 100644
--- a/network/mosaic-ck/mosaic-ck.info
+++ b/network/mosaic-ck/mosaic-ck.info
@@ -1,7 +1,7 @@
 PRGNAM="mosaic-ck"
 VERSION="2.7ck9"
 HOMEPAGE="http://www.floodgap.com/retrotech/machten/mosaic/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/mosaic27ck9.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/mosaic27ck9.tar.gz"
 MD5SUM="a412ea475bb5059182ee9642c95368cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/mosh/mosh.SlackBuild b/network/mosh/mosh.SlackBuild
index 4f5fe7ce09..ac040947a9 100644
--- a/network/mosh/mosh.SlackBuild
+++ b/network/mosh/mosh.SlackBuild
@@ -2,16 +2,17 @@
 
 # Slackware build script for mosh
 
-# Written by ruario <sbo@ruari.com>
+# Written by ruario
+# Maintained by Donald Cooley, South Haven, Indiana, USA
 
 PRGNAM=mosh
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-1.3.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,8 +23,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/mosh/mosh.info b/network/mosh/mosh.info
index 694496a6c6..73be381340 100644
--- a/network/mosh/mosh.info
+++ b/network/mosh/mosh.info
@@ -1,8 +1,8 @@
 PRGNAM="mosh"
-VERSION="1.2.4"
+VERSION="1.3.2"
 HOMEPAGE="http://mosh.mit.edu/"
-DOWNLOAD="http://mosh.mit.edu/mosh-1.2.4.tar.gz"
-MD5SUM="c2d918f4d91fdc32546e2e089f9281b2"
+DOWNLOAD="http://mosh.mit.edu/mosh-1.3.2.tar.gz"
+MD5SUM="5122f4d2b973ab7c38dcdac8c35cb61e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-IO-Tty protobuf"
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/nbtscan/nbtscan.SlackBuild b/network/nbtscan/nbtscan.SlackBuild
index f16951335b..8d103e04c7 100644
--- a/network/nbtscan/nbtscan.SlackBuild
+++ b/network/nbtscan/nbtscan.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nbtscan
 
-# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
+# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
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 6da5020cbc..44dbb59cb1 100644
--- a/network/neomutt/README
+++ b/network/neomutt/README
@@ -6,13 +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 notmuch, lua and kyotocabinet.
+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 cf4400db76..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:-20200320}
+VERSION=${VERSION:-20210205}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -94,9 +94,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --gpgme \
   --locales-fix \
   --sqlite \
+  --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 c50c5700e7..a0c239cdb8 100644
--- a/network/neomutt/neomutt.info
+++ b/network/neomutt/neomutt.info
@@ -1,8 +1,8 @@
 PRGNAM="neomutt"
-VERSION="20200320"
+VERSION="20210205"
 HOMEPAGE="https://github.com/neomutt/neomutt"
-DOWNLOAD="https://github.com/neomutt/neomutt/archive/20200320/neomutt-20200320.tar.gz"
-MD5SUM="ee975317f1dfa06cd1a7e2626911697a"
+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/netcat-openbsd/README b/network/netcat-openbsd/README
index 2301321b0f..09b5adca4e 100644
--- a/network/netcat-openbsd/README
+++ b/network/netcat-openbsd/README
@@ -7,9 +7,9 @@ time, it is a feature-rich network debugging and exploration tool, since
 it can create almost any kind of connection you would need and has
 several interesting built-in capabilities.
 
-This package contains the OpenBSD rewrite of netcat, including support
-for IPv6, proxies, and Unix sockets.  The installed binary is named
-"nc.openbsd" and the manpage is as well.
+This package contains the OpenBSD rewrite of netcat, with Debian and
+other patches, including support for IPv6, proxies, and Unix sockets.
+The installed binary is named "nc.openbsd" and the manpage is as well.
 
 BTW, this package conflicts with the netcat in slackware as it creates a
 symbolic link /usr/bin/nc (to let libvirt stuff work correctly), so
diff --git a/network/netcat-openbsd/netcat-openbsd.SlackBuild b/network/netcat-openbsd/netcat-openbsd.SlackBuild
index 22fa49b298..c36b771854 100644
--- a/network/netcat-openbsd/netcat-openbsd.SlackBuild
+++ b/network/netcat-openbsd/netcat-openbsd.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for netcat-openbsd
 #
+# Copyright 2020 Duncan Roe, Melbourne, Australia
 # Copyright 2020 Donald Cooley, South Haven, Indiana USA
 # Copyright 2010, 2014 Slax-Dude <jmfl {at} sapo [dot] pt>
 # All rights reserved.
@@ -24,12 +25,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=netcat-openbsd
-VERSION=${VERSION:-1.206}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.217_1}
+SRCVER=$(echo $VERSION | tr _ -)
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-DEBVER=1
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -69,9 +69,9 @@ 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
+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 \) \
@@ -79,10 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Apply Debian patches
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-make CFLAGS="$SLKCFLAGS -DDEBIAN_VERSION=\"\\\"$DEBVER\\\"\""
+make CFLAGS="$SLKCFLAGS -DNETCAT_VERSION=\"\\\"$VERSION\\\"\""
 
 mkdir -p $PKG/usr/bin/ $PKG/usr/man/man1/
 install -s -m 0755 nc $PKG/usr/bin/nc.openbsd
@@ -91,6 +88,7 @@ gzip -9c nc.1 > $PKG/usr/man/man1/nc.openbsd.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a changelog copyright README* $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/netcat-openbsd/netcat-openbsd.info b/network/netcat-openbsd/netcat-openbsd.info
index 5a4a2accd9..9e6928ecd8 100644
--- a/network/netcat-openbsd/netcat-openbsd.info
+++ b/network/netcat-openbsd/netcat-openbsd.info
@@ -1,8 +1,8 @@
 PRGNAM="netcat-openbsd"
-VERSION="1.206"
-HOMEPAGE="https://packages.debian.org/bullseye/netcat-openbsd"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.206.orig.tar.gz"
-MD5SUM="e6639c7931e057282bd1404b6f9fa063"
+VERSION="1.217_1"
+HOMEPAGE="https://github.com/duncan-roe/netcat-openbsd"
+DOWNLOAD="https://github.com/duncan-roe/netcat-openbsd/archive/1.217-1/netcat-openbsd-1.217-1.tar.gz"
+MD5SUM="8babccac46097ae5b746ffa00c01ac0f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% libbsd"
diff --git a/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch b/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch
deleted file mode 100644
index 3b9910f182..0000000000
--- a/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch
+++ /dev/null
@@ -1,485 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:59:31 +0800
-Subject: port to linux with libsd
-
----
- Makefile |   15 ++++++-
- nc.1     |    3 -
- netcat.c |  131 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
- socks.c  |   48 +++++++++++------------
- 4 files changed, 140 insertions(+), 57 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -5,4 +5,17 @@ SRCS=	netcat.c atomicio.c socks.c
- LDADD+= -ltls -lssl -lcrypto
- DPADD+=  ${LIBTLS} ${LIBSSL} ${LIBCRYPTO}
- 
--.include <bsd.prog.mk>
-+LIBS=  `pkg-config --libs libbsd` -lresolv
-+OBJS=  $(SRCS:.c=.o)
-+CFLAGS=  -g -O2
-+LDFLAGS=  -Wl,--no-add-needed
-+
-+all: nc
-+nc: $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o nc
-+
-+$(OBJS): %.o: %.c
-+	$(CC) $(CFLAGS) -c $< -o $@
-+
-+clean:
-+	rm -f $(OBJS) nc
---- a/nc.1
-+++ b/nc.1
-@@ -213,8 +213,6 @@ Proxy authentication is only supported f
- Specify the source port
- .Nm
- should use, subject to privilege restrictions and availability.
--Cannot be used together with
--.Fl l .
- .It Fl R Ar CAfile
- Load the root CA bundle for TLS certificate verification from
- .Ar CAfile ,
-@@ -274,6 +272,7 @@ For the IPv4 TOS/IPv6 traffic class valu
- may be one of
- .Cm critical ,
- .Cm inetcontrol ,
-+.Cm lowcost ,
- .Cm lowdelay ,
- .Cm netcontrol ,
- .Cm throughput ,
---- a/netcat.c
-+++ b/netcat.c
-@@ -32,6 +32,8 @@
-  * *Hobbit* <hobbit@avian.org>.
-  */
- 
-+#define _GNU_SOURCE
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/uio.h>
-@@ -41,6 +43,49 @@
- #include <netinet/tcp.h>
- #include <netinet/ip.h>
- #include <arpa/telnet.h>
-+#ifdef __linux__
-+# include <linux/in6.h>
-+#endif
-+
-+#ifndef IPTOS_LOWDELAY
-+# define IPTOS_LOWDELAY 0x10
-+# define IPTOS_THROUGHPUT 0x08
-+# define IPTOS_RELIABILITY 0x04
-+# define IPTOS_LOWCOST 0x02
-+# define IPTOS_MINCOST IPTOS_LOWCOST
-+#endif /* IPTOS_LOWDELAY */
-+
-+# ifndef IPTOS_DSCP_AF11
-+# define	IPTOS_DSCP_AF11		0x28
-+# define	IPTOS_DSCP_AF12		0x30
-+# define	IPTOS_DSCP_AF13		0x38
-+# define	IPTOS_DSCP_AF21		0x48
-+# define	IPTOS_DSCP_AF22		0x50
-+# define	IPTOS_DSCP_AF23		0x58
-+# define	IPTOS_DSCP_AF31		0x68
-+# define	IPTOS_DSCP_AF32		0x70
-+# define	IPTOS_DSCP_AF33		0x78
-+# define	IPTOS_DSCP_AF41		0x88
-+# define	IPTOS_DSCP_AF42		0x90
-+# define	IPTOS_DSCP_AF43		0x98
-+# define	IPTOS_DSCP_EF		0xb8
-+#endif /* IPTOS_DSCP_AF11 */
-+
-+#ifndef IPTOS_DSCP_CS0
-+# define	IPTOS_DSCP_CS0		0x00
-+# define	IPTOS_DSCP_CS1		0x20
-+# define	IPTOS_DSCP_CS2		0x40
-+# define	IPTOS_DSCP_CS3		0x60
-+# define	IPTOS_DSCP_CS4		0x80
-+# define	IPTOS_DSCP_CS5		0xa0
-+# define	IPTOS_DSCP_CS6		0xc0
-+# define	IPTOS_DSCP_CS7		0xe0
-+#endif /* IPTOS_DSCP_CS0 */
-+
-+#ifndef IPTOS_DSCP_EF
-+# define	IPTOS_DSCP_EF		0xb8
-+#endif /* IPTOS_DSCP_EF */
-+
- 
- #include <ctype.h>
- #include <err.h>
-@@ -56,6 +101,8 @@
- #include <time.h>
- #include <tls.h>
- #include <unistd.h>
-+#include <bsd/stdlib.h>
-+#include <bsd/string.h>
- 
- #include "atomicio.h"
- 
-@@ -269,10 +316,14 @@ main(int argc, char *argv[])
- 			uflag = 1;
- 			break;
- 		case 'V':
-+# if defined(RT_TABLEID_MAX)
- 			rtableid = (int)strtonum(optarg, 0,
- 			    RT_TABLEID_MAX, &errstr);
- 			if (errstr)
- 				errx(1, "rtable %s: %s", errstr, optarg);
-+# else
-+			errx(1, "no alternate routing table support available");
-+# endif
- 			break;
- 		case 'v':
- 			vflag = 1;
-@@ -321,7 +372,11 @@ main(int argc, char *argv[])
- 			oflag = optarg;
- 			break;
- 		case 'S':
-+# if defined(TCP_MD5SIG)
- 			Sflag = 1;
-+# else
-+			errx(1, "no TCP MD5 signature support available");
-+# endif
- 			break;
- 		case 'T':
- 			errstr = NULL;
-@@ -346,14 +401,23 @@ main(int argc, char *argv[])
- 	argc -= optind;
- 	argv += optind;
- 
-+# if defined(RT_TABLEID_MAX)
- 	if (rtableid >= 0)
- 		if (setrtable(rtableid) == -1)
- 			err(1, "setrtable");
-+# endif
- 
- 	/* Cruft to make sure options are clean, and used properly. */
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
- 		host = argv[0];
- 		uport = NULL;
-+	} else if (!argv[0] && lflag) {
-+		if (sflag)
-+			errx(1, "cannot use -s and -l");
-+		if (pflag)
-+			errx(1, "cannot use -p and -l");
-+		if (zflag)
-+			errx(1, "cannot use -z and -l");
- 	} else if (argv[0] && !argv[1]) {
- 		if (!lflag)
- 			usage(1);
-@@ -389,33 +453,6 @@ main(int argc, char *argv[])
- 		}
- 	}
- 
--	if (family == AF_UNIX) {
--		if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
--			err(1, "pledge");
--	} else if (Fflag && Pflag) {
--		if (pledge("stdio inet dns sendfd tty", NULL) == -1)
--			err(1, "pledge");
--	} else if (Fflag) {
--		if (pledge("stdio inet dns sendfd", NULL) == -1)
--			err(1, "pledge");
--	} else if (Pflag && usetls) {
--		if (pledge("stdio rpath inet dns tty", NULL) == -1)
--			err(1, "pledge");
--	} else if (Pflag) {
--		if (pledge("stdio inet dns tty", NULL) == -1)
--			err(1, "pledge");
--	} else if (usetls) {
--		if (pledge("stdio rpath inet dns", NULL) == -1)
--			err(1, "pledge");
--	} else if (pledge("stdio inet dns", NULL) == -1)
--		err(1, "pledge");
--
--	if (lflag && sflag)
--		errx(1, "cannot use -s and -l");
--	if (lflag && pflag)
--		errx(1, "cannot use -p and -l");
--	if (lflag && zflag)
--		errx(1, "cannot use -z and -l");
- 	if (!lflag && kflag)
- 		errx(1, "must use -l with -k");
- 	if (uflag && usetls)
-@@ -450,8 +487,8 @@ main(int argc, char *argv[])
- 		} else {
- 			strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
- 			    UNIX_DG_TMP_SOCKET_SIZE);
--			if (mktemp(unix_dg_tmp_socket_buf) == NULL)
--				err(1, "mktemp");
-+			if (mkstemp(unix_dg_tmp_socket_buf) == -1)
-+				err(1, "mkstemp");
- 			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
- 		}
- 	}
-@@ -934,8 +971,10 @@ remote_connect(const char *host, const c
- 		if (sflag || pflag) {
- 			struct addrinfo ahints, *ares;
- 
-+# if defined (SO_BINDANY)
- 			/* try SO_BINDANY, but don't insist */
- 			setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
-+# endif
- 			memset(&ahints, 0, sizeof(struct addrinfo));
- 			ahints.ai_family = res->ai_family;
- 			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -1027,9 +1066,15 @@ local_listen(const char *host, const cha
- 		    res->ai_protocol)) == -1)
- 			continue;
- 
-+		ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
-+		if (ret == -1)
-+			err(1, NULL);
-+
-+# if defined(SO_REUSEPORT)
- 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
- 		if (ret == -1)
- 			err(1, NULL);
-+# endif
- 
- 		set_common_sockopts(s, res->ai_family);
- 
-@@ -1499,11 +1544,13 @@ set_common_sockopts(int s, int af)
- {
- 	int x = 1;
- 
-+# if defined(TCP_MD5SIG)
- 	if (Sflag) {
- 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
-+# endif
- 	if (Dflag) {
- 		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
- 			&x, sizeof(x)) == -1)
-@@ -1514,9 +1561,14 @@ set_common_sockopts(int s, int af)
- 		    IP_TOS, &Tflag, sizeof(Tflag)) == -1)
- 			err(1, "set IP ToS");
- 
-+#if defined(IPV6_TCLASS)
- 		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
- 		    IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1)
- 			err(1, "set IPv6 traffic class");
-+#else
-+		else if (af == AF_INET6)
-+			errx(1, "can't set IPv6 traffic class (unavailable)");
-+#endif
- 	}
- 	if (Iflag) {
- 		if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
-@@ -1534,19 +1586,34 @@ set_common_sockopts(int s, int af)
- 		    IP_TTL, &ttl, sizeof(ttl)))
- 			err(1, "set IP TTL");
- 
-+#if defined(IPV6_UNICAST_HOPS)
- 		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
- 		    IPV6_UNICAST_HOPS, &ttl, sizeof(ttl)))
- 			err(1, "set IPv6 unicast hops");
-+#else
-+		else if (af == AF_INET6)
-+			errx(1, "can't set IPv6 unicast hops (unavailable)");
-+#endif
- 	}
- 
- 	if (minttl != -1) {
-+#if defined(IP_MINTTL)
- 		if (af == AF_INET && setsockopt(s, IPPROTO_IP,
- 		    IP_MINTTL, &minttl, sizeof(minttl)))
- 			err(1, "set IP min TTL");
-+#else
-+		if (af == AF_INET)
-+			errx(1, "can't set IP min TTL (unavailable)");
-+#endif
- 
-+#if defined(IPV6_MINHOPCOUNT)
- 		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
- 		    IPV6_MINHOPCOUNT, &minttl, sizeof(minttl)))
- 			err(1, "set IPv6 min hop count");
-+#else
-+		else if (af == AF_INET6)
-+			errx(1, "can't set IPv6 min hop count (unavailable)");
-+#endif
- 	}
- }
- 
-@@ -1581,6 +1648,7 @@ process_tos_opt(char *s, int *val)
- 		{ "cs7",		IPTOS_DSCP_CS7 },
- 		{ "ef",			IPTOS_DSCP_EF },
- 		{ "inetcontrol",	IPTOS_PREC_INTERNETCONTROL },
-+		{ "lowcost",		IPTOS_LOWCOST },
- 		{ "lowdelay",		IPTOS_LOWDELAY },
- 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
- 		{ "reliability",	IPTOS_RELIABILITY },
-@@ -1742,6 +1810,9 @@ report_sock(const char *msg, const struc
- void
- help(void)
- {
-+# if defined(DEBIAN_VERSION)
-+        fprintf(stderr, "OpenBSD netcat (Debian patchlevel " DEBIAN_VERSION ")\n");
-+# endif
- 	usage(0);
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
-@@ -1784,7 +1855,7 @@ help(void)
- 	\t-Z		Peer certificate file\n\
- 	\t-z		Zero-I/O mode [used for scanning]\n\
- 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
--	exit(1);
-+	exit(0);
- }
- 
- void
---- a/socks.c
-+++ b/socks.c
-@@ -38,7 +38,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <resolv.h>
--#include <readpassphrase.h>
-+#include <bsd/readpassphrase.h>
- #include "atomicio.h"
- 
- #define SOCKS_PORT	"1080"
-@@ -217,11 +217,11 @@ socks_connect(const char *host, const ch
- 		buf[2] = SOCKS_NOAUTH;
- 		cnt = atomicio(vwrite, proxyfd, buf, 3);
- 		if (cnt != 3)
--			err(1, "write failed (%zu/3)", cnt);
-+			err(1, "write failed (%zu/3)", (size_t)cnt);
- 
- 		cnt = atomicio(read, proxyfd, buf, 2);
- 		if (cnt != 2)
--			err(1, "read failed (%zu/3)", cnt);
-+			err(1, "read failed (%zu/3)", (size_t)cnt);
- 
- 		if (buf[1] == SOCKS_NOMETHOD)
- 			errx(1, "authentication method negotiation failed");
-@@ -270,11 +270,11 @@ socks_connect(const char *host, const ch
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%zu/%zu)", cnt, wlen);
-+			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 4);
- 		if (cnt != 4)
--			err(1, "read failed (%zu/4)", cnt);
-+			err(1, "read failed (%zu/4)", (size_t)cnt);
- 		if (buf[1] != 0) {
- 			errx(1, "connection failed, SOCKSv5 error: %s",
- 			    socks5_strerror(buf[1]));
-@@ -283,12 +283,12 @@ socks_connect(const char *host, const ch
- 		case SOCKS_IPV4:
- 			cnt = atomicio(read, proxyfd, buf + 4, 6);
- 			if (cnt != 6)
--				err(1, "read failed (%zu/6)", cnt);
-+				err(1, "read failed (%zu/6)", (size_t)cnt);
- 			break;
- 		case SOCKS_IPV6:
- 			cnt = atomicio(read, proxyfd, buf + 4, 18);
- 			if (cnt != 18)
--				err(1, "read failed (%zu/18)", cnt);
-+				err(1, "read failed (%zu/18)", (size_t)cnt);
- 			break;
- 		default:
- 			errx(1, "connection failed, unsupported address type");
-@@ -308,11 +308,11 @@ socks_connect(const char *host, const ch
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%zu/%zu)", cnt, wlen);
-+			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 8);
- 		if (cnt != 8)
--			err(1, "read failed (%zu/8)", cnt);
-+			err(1, "read failed (%zu/8)", (size_t)cnt);
- 		if (buf[1] != 90) {
- 			errx(1, "connection failed, SOCKSv4 error: %s",
- 			    socks4_strerror(buf[1]));
-@@ -326,21 +326,21 @@ socks_connect(const char *host, const ch
- 
- 		/* Try to be sane about numeric IPv6 addresses */
- 		if (strchr(host, ':') != NULL) {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT [%s]:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		} else {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT %s:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		}
- 		if (r < 0 || (size_t)r >= sizeof(buf))
- 			errx(1, "hostname too long");
--		r = strlen(buf);
-+		r = strlen((char*)buf);
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, r);
- 		if (cnt != r)
--			err(1, "write failed (%zu/%d)", cnt, r);
-+			err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r);
- 
- 		if (authretry > 1) {
- 			char proxypass[256];
-@@ -348,20 +348,20 @@ socks_connect(const char *host, const ch
- 
- 			getproxypass(proxyuser, proxyhost,
- 			    proxypass, sizeof proxypass);
--			r = snprintf(buf, sizeof(buf), "%s:%s",
-+			r = snprintf((char*)buf, sizeof(buf), "%s:%s",
- 			    proxyuser, proxypass);
- 			explicit_bzero(proxypass, sizeof proxypass);
- 			if (r == -1 || (size_t)r >= sizeof(buf) ||
--			    b64_ntop(buf, strlen(buf), resp,
-+			    b64_ntop(buf, strlen((char*)buf), resp,
- 			    sizeof(resp)) == -1)
- 				errx(1, "Proxy username/password too long");
--			r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
-+			r = snprintf((char*)buf, sizeof(buf), "Proxy-Authorization: "
- 			    "Basic %s\r\n", resp);
- 			if (r < 0 || (size_t)r >= sizeof(buf))
- 				errx(1, "Proxy auth response too long");
--			r = strlen(buf);
-+			r = strlen((char*)buf);
- 			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
--				err(1, "write failed (%zu/%d)", cnt, r);
-+				err(1, "write failed (%zu/%d)", (size_t)cnt, r);
- 			explicit_bzero(proxypass, sizeof proxypass);
- 			explicit_bzero(buf, sizeof buf);
- 		}
-@@ -371,23 +371,23 @@ socks_connect(const char *host, const ch
- 			err(1, "write failed (%zu/2)", cnt);
- 
- 		/* Read status reply */
--		proxy_read_line(proxyfd, buf, sizeof(buf));
-+		proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 		if (proxyuser != NULL &&
--		    (strncmp(buf, "HTTP/1.0 407 ", 12) == 0 ||
--		    strncmp(buf, "HTTP/1.1 407 ", 12) == 0)) {
-+		    (strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0 ||
-+		    strncmp((char*)buf, "HTTP/1.1 407 ", 12) == 0)) {
- 			if (authretry > 1) {
- 				fprintf(stderr, "Proxy authentication "
- 				    "failed\n");
- 			}
- 			close(proxyfd);
- 			goto again;
--		} else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 &&
--		    strncmp(buf, "HTTP/1.1 200 ", 12) != 0)
-+		} else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 &&
-+		    strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0)
- 			errx(1, "Proxy error: \"%s\"", buf);
- 
- 		/* Headers continue until we hit an empty line */
- 		for (r = 0; r < HTTP_MAXHDRS; r++) {
--			proxy_read_line(proxyfd, buf, sizeof(buf));
-+			proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 			if (*buf == '\0')
- 				break;
- 		}
diff --git a/network/netcat-openbsd/patches/0002-build-without-TLS-support.patch b/network/netcat-openbsd/patches/0002-build-without-TLS-support.patch
deleted file mode 100644
index c4a72c65af..0000000000
--- a/network/netcat-openbsd/patches/0002-build-without-TLS-support.patch
+++ /dev/null
@@ -1,872 +0,0 @@
-From: Guilhem Moulin <guilhem@debian.org>
-Date: Fri, 09 Jun 2017 13:21:23 +0200
-Subject: build without TLS support
-
-tls.h isn't available in libsd-dev, and TLS supports adds options (-C, -Z)
-that are already used by our Debian-specific patches.
-
----
- Makefile |    2 
- nc.1     |  114 ++---------------------------------------
- netcat.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
- 3 files changed, 153 insertions(+), 135 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,6 @@
- 
- PROG=	nc
- SRCS=	netcat.c atomicio.c socks.c
--LDADD+= -ltls -lssl -lcrypto
--DPADD+=  ${LIBTLS} ${LIBSSL} ${LIBCRYPTO}
- 
- LIBS=  `pkg-config --libs libbsd` -lresolv
- OBJS=  $(SRCS:.c=.o)
---- a/nc.1
-+++ b/nc.1
-@@ -33,20 +33,14 @@
- .Nd arbitrary TCP and UDP connections and listens
- .Sh SYNOPSIS
- .Nm nc
--.Op Fl 46cDdFhklNnrStUuvz
--.Op Fl C Ar certfile
--.Op Fl e Ar name
--.Op Fl H Ar hash
-+.Op Fl 46DdFhklNnrStUuvz
- .Op Fl I Ar length
- .Op Fl i Ar interval
--.Op Fl K Ar keyfile
- .Op Fl M Ar ttl
- .Op Fl m Ar minttl
- .Op Fl O Ar length
--.Op Fl o Ar staplefile
- .Op Fl P Ar proxy_username
- .Op Fl p Ar source_port
--.Op Fl R Ar CAfile
- .Op Fl s Ar source
- .Op Fl T Ar keyword
- .Op Fl V Ar rtable
-@@ -54,7 +48,6 @@
- .Op Fl w Ar timeout
- .Op Fl X Ar proxy_protocol
- .Op Fl x Ar proxy_address Ns Op : Ns Ar port
--.Op Fl Z Ar peercertfile
- .Op Ar destination
- .Op Ar port
- .Sh DESCRIPTION
-@@ -99,28 +92,10 @@ The options are as follows:
- Use IPv4 addresses only.
- .It Fl 6
- Use IPv6 addresses only.
--.It Fl C Ar certfile
--Load the public key part of the TLS peer certificate from
--.Ar certfile ,
--in PEM format.
--Requires
--.Fl c .
--.It Fl c
--Use TLS to connect or listen.
--Cannot be used together with any of the options
--.Fl FuU .
- .It Fl D
- Enable debugging on the socket.
- .It Fl d
- Do not attempt to read from stdin.
--.It Fl e Ar name
--Only accept the TLS peer certificate if it contains the
--.Ar name .
--Requires
--.Fl c .
--If not specified,
--.Ar destination
--is used.
- .It Fl F
- Pass the first connected socket using
- .Xr sendmsg 2
-@@ -137,18 +112,7 @@ using the
- .Cm ProxyUseFdpass
- option).
- Cannot be used with
--.Fl c
--or
- .Fl U .
--.It Fl H Ar hash
--Only accept the TLS peer certificate if its hash returned from
--.Xr tls_peer_cert_hash 3
--matches
--.Ar hash .
--Requires
--.Fl c
--and cannot be used with
--.Fl T Cm noverify .
- .It Fl h
- Print out the
- .Nm
-@@ -160,12 +124,6 @@ Sleep for
- .Ar interval
- seconds between lines of text sent and received.
- Also causes a delay time between connections to multiple ports.
--.It Fl K Ar keyfile
--Load the TLS private key from
--.Ar keyfile ,
--in PEM format.
--Requires
--.Fl c .
- .It Fl k
- When a connection is completed, listen for another one.
- Requires
-@@ -196,15 +154,6 @@ Do not do any DNS or service lookups on
- hostnames or ports.
- .It Fl O Ar length
- Specify the size of the TCP send buffer.
--.It Fl o Ar staplefile
--During the TLS handshake, load data to be stapled from
--.Ar staplefile ,
--which is expected to contain an OCSP response from an OCSP server in
--DER format.
--Requires
--.Fl c
--and
--.Fl C .
- .It Fl P Ar proxy_username
- Specifies a username to present to a proxy server that requires authentication.
- If no username is specified then authentication will not be attempted.
-@@ -213,13 +162,6 @@ Proxy authentication is only supported f
- Specify the source port
- .Nm
- should use, subject to privilege restrictions and availability.
--.It Fl R Ar CAfile
--Load the root CA bundle for TLS certificate verification from
--.Ar CAfile ,
--in PEM format, instead of
--.Pa /etc/ssl/cert.pem .
--Requires
--.Fl c .
- .It Fl r
- Choose source and/or destination ports randomly
- instead of sequentially within a range or in the order that the system
-@@ -239,35 +181,7 @@ Cannot be used together with
- or
- .Fl x .
- .It Fl T Ar keyword
--Change the IPv4 TOS/IPv6 traffic class value or the TLS options.
--.Pp
--For TLS options,
--.Ar keyword
--may be one of:
--.Cm noverify ,
--which disables certificate verification;
--.Cm noname ,
--which disables certificate name checking;
--.Cm clientcert ,
--which requires a client certificate on incoming connections; or
--.Cm muststaple ,
--which requires the peer to provide a valid stapled OCSP response
--with the handshake.
--The following TLS options specify a value in the form of a
--.Ar key Ns = Ns Ar value
--pair:
--.Cm ciphers ,
--which allows the supported TLS ciphers to be specified (see
--.Xr tls_config_set_ciphers 3
--for further details);
--.Cm protocols ,
--which allows the supported TLS protocols to be specified (see
--.Xr tls_config_parse_protocols 3
--for further details).
--Specifying TLS options requires
--.Fl c .
--.Pp
--For the IPv4 TOS/IPv6 traffic class value,
-+Change the IPv4 TOS/IPv6 traffic class value.
- .Ar keyword
- may be one of
- .Cm critical ,
-@@ -291,13 +205,13 @@ to script telnet sessions.
- Use
- .Ux Ns -domain
- sockets.
--Cannot be used together with any of the options
--.Fl cFx .
-+Cannot be used together with
-+.Fl F
-+or
-+.Fl x .
- .It Fl u
- Use UDP instead of TCP.
- Cannot be used together with
--.Fl c
--or
- .Fl x .
- For
- .Ux Ns -domain
-@@ -360,12 +274,6 @@ An IPv6 address can be specified unambig
- in square brackets.
- A proxy cannot be used with any of the options
- .Fl lsuU .
--.It Fl Z Ar peercertfile
--Save the peer certificates to
--.Ar peercertfile ,
--in PEM format.
--Requires
--.Fl c .
- .It Fl z
- Only scan for listening daemons, without sending any data to them.
- Cannot be used together with
-@@ -519,16 +427,6 @@ the source port, with a timeout of 5 sec
- .Pp
- .Dl $ nc -p 31337 -w 5 host.example.com 42
- .Pp
--Open a TCP connection to port 443 of www.example.com, and negotiate TLS with
--any supported TLS protocol version and "compat" ciphers:
--.Pp
--.Dl $ nc -cv -T protocols=all -T ciphers=compat www.example.com 443
--.Pp
--Open a TCP connection to port 443 of www.google.ca, and negotiate TLS.
--Check for a different name in the certificate for validation:
--.Pp
--.Dl $ nc -cv -e adsf.au.doubleclick.net www.google.ca 443
--.Pp
- Open a UDP connection to port 53 of host.example.com:
- .Pp
- .Dl $ nc -u host.example.com 53
---- a/netcat.c
-+++ b/netcat.c
-@@ -99,7 +99,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
--#include <tls.h>
-+#ifdef TLS
-+# include <tls.h>
-+#endif
- #include <unistd.h>
- #include <bsd/stdlib.h>
- #include <bsd/string.h>
-@@ -115,10 +117,12 @@
- #define POLL_STDOUT	3
- #define BUFSIZE		16384
- 
--#define TLS_NOVERIFY	(1 << 1)
--#define TLS_NONAME	(1 << 2)
--#define TLS_CCERT	(1 << 3)
--#define TLS_MUSTSTAPLE	(1 << 4)
-+#ifdef TLS
-+# define TLS_NOVERIFY	(1 << 1)
-+# define TLS_NONAME	(1 << 2)
-+# define TLS_CCERT	(1 << 3)
-+# define TLS_MUSTSTAPLE	(1 << 4)
-+#endif
- 
- /* Command Line Options */
- int	dflag;					/* detached, no stdin */
-@@ -144,6 +148,7 @@ int	Sflag;					/* TCP MD5 signature opti
- int	Tflag = -1;				/* IP Type of Service */
- int	rtableid = -1;
- 
-+# if defined(TLS)
- int	usetls;					/* use TLS */
- const char    *Cflag;				/* Public cert file */
- const char    *Kflag;				/* Private key file */
-@@ -156,6 +161,7 @@ char	*tls_expecthash;			/* required hash
- char	*tls_ciphers;				/* TLS ciphers */
- char	*tls_protocols;				/* TLS protocols */
- FILE	*Zflag;					/* file to save peer cert */
-+# endif
- 
- int recvcount, recvlimit;
- int timeout = -1;
-@@ -170,10 +176,16 @@ int	strtoport(char *portstr, int udp);
- void	build_ports(char *);
- void	help(void) __attribute__((noreturn));
- int	local_listen(const char *, const char *, struct addrinfo);
-+# if defined(TLS)
- void	readwrite(int, struct tls *);
-+# else
-+void	readwrite(int);
-+# endif
- void	fdpass(int nfd) __attribute__((noreturn));
- int	remote_connect(const char *, const char *, struct addrinfo);
-+# if defined(TLS)
- int	timeout_tls(int, struct tls *, int (*)(struct tls *));
-+# endif
- int	timeout_connect(int, const struct sockaddr *, socklen_t);
- int	socks_connect(const char *, const char *, struct addrinfo,
- 	    const char *, const char *, struct addrinfo, int, const char *);
-@@ -183,15 +195,24 @@ int	unix_connect(char *);
- int	unix_listen(char *);
- void	set_common_sockopts(int, int);
- int	process_tos_opt(char *, int *);
-+# if defined(TLS)
- int	process_tls_opt(char *, int *);
- void	save_peer_cert(struct tls *_tls_ctx, FILE *_fp);
-+# endif
- void	report_sock(const char *, const struct sockaddr *, socklen_t, char *);
-+# if defined(TLS)
- void	report_tls(struct tls *tls_ctx, char * host);
-+# endif
- void	usage(int);
-+# if defined(TLS)
- ssize_t drainbuf(int, unsigned char *, size_t *, struct tls *);
- ssize_t fillbuf(int, unsigned char *, size_t *, struct tls *);
- void	tls_setup_client(struct tls *, int, char *);
- struct tls *tls_setup_server(struct tls *, int, char *);
-+# else
-+ssize_t drainbuf(int, unsigned char *, size_t *);
-+ssize_t fillbuf(int, unsigned char *, size_t *);
-+# endif
- 
- int
- main(int argc, char *argv[])
-@@ -206,8 +227,10 @@ main(int argc, char *argv[])
- 	const char *errstr;
- 	struct addrinfo proxyhints;
- 	char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE];
-+# if defined(TLS)
- 	struct tls_config *tls_cfg = NULL;
- 	struct tls *tls_ctx = NULL;
-+# endif
- 	uint32_t protocols;
- 
- 	ret = 1;
-@@ -215,12 +238,18 @@ main(int argc, char *argv[])
- 	host = NULL;
- 	uport = NULL;
- 	sv = NULL;
-+# if defined(TLS)
- 	Rflag = tls_default_ca_cert_file();
-+# endif
- 
- 	signal(SIGPIPE, SIG_IGN);
- 
- 	while ((ch = getopt(argc, argv,
-+# if defined(TLS)
- 	    "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
-+# else
-+	    "46DdFhI:i:klM:m:NnO:P:p:rSs:T:tUuV:vW:w:X:x:z"))
-+# endif
- 	    != -1) {
- 		switch (ch) {
- 		case '4':
-@@ -242,24 +271,30 @@ main(int argc, char *argv[])
- 			else
- 				errx(1, "unsupported proxy protocol");
- 			break;
-+# if defined(TLS)
- 		case 'C':
- 			Cflag = optarg;
- 			break;
- 		case 'c':
- 			usetls = 1;
- 			break;
-+# endif
- 		case 'd':
- 			dflag = 1;
- 			break;
-+# if defined(TLS)
- 		case 'e':
- 			tls_expectname = optarg;
- 			break;
-+# endif
- 		case 'F':
- 			Fflag = 1;
- 			break;
-+# if defined(TLS)
- 		case 'H':
- 			tls_expecthash = optarg;
- 			break;
-+# endif
- 		case 'h':
- 			help();
- 			break;
-@@ -268,9 +303,11 @@ main(int argc, char *argv[])
- 			if (errstr)
- 				errx(1, "interval %s: %s", errstr, optarg);
- 			break;
-+# if defined(TLS)
- 		case 'K':
- 			Kflag = optarg;
- 			break;
-+# endif
- 		case 'k':
- 			kflag = 1;
- 			break;
-@@ -299,10 +336,12 @@ main(int argc, char *argv[])
- 		case 'p':
- 			pflag = optarg;
- 			break;
-+# if defined(TLS)
- 		case 'R':
- 			tls_cachanged = 1;
- 			Rflag = optarg;
- 			break;
-+# endif
- 		case 'r':
- 			rflag = 1;
- 			break;
-@@ -344,12 +383,14 @@ main(int argc, char *argv[])
- 			if ((proxy = strdup(optarg)) == NULL)
- 				err(1, NULL);
- 			break;
-+# if defined(TLS)
- 		case 'Z':
- 			if (strcmp(optarg, "-") == 0)
- 				Zflag = stderr;
- 			else if ((Zflag = fopen(optarg, "w")) == NULL)
- 				err(1, "can't open %s", optarg);
- 			break;
-+# endif
- 		case 'z':
- 			zflag = 1;
- 			break;
-@@ -368,9 +409,11 @@ main(int argc, char *argv[])
- 				errx(1, "TCP send window %s: %s",
- 				    errstr, optarg);
- 			break;
-+# if defined(TLS)
- 		case 'o':
- 			oflag = optarg;
- 			break;
-+# endif
- 		case 'S':
- # if defined(TCP_MD5SIG)
- 			Sflag = 1;
-@@ -381,8 +424,10 @@ main(int argc, char *argv[])
- 		case 'T':
- 			errstr = NULL;
- 			errno = 0;
-+# if defined(TLS)
- 			if (process_tls_opt(optarg, &TLSopt))
- 				break;
-+# endif
- 			if (process_tos_opt(optarg, &Tflag))
- 				break;
- 			if (strlen(optarg) > 1 && optarg[0] == '0' &&
-@@ -392,7 +437,11 @@ main(int argc, char *argv[])
- 				Tflag = (int)strtonum(optarg, 0, 255,
- 				    &errstr);
- 			if (Tflag < 0 || Tflag > 255 || errstr || errno)
-+# if defined(TLS)
- 				errx(1, "illegal tos/tls value %s", optarg);
-+# else
-+				errx(1, "illegal tos value %s", optarg);
-+# endif
- 			break;
- 		default:
- 			usage(1);
-@@ -429,6 +478,7 @@ main(int argc, char *argv[])
- 	} else
- 		usage(1);
- 
-+# if defined(TLS)
- 	if (usetls) {
- 		if (Cflag && unveil(Cflag, "r") == -1)
- 			err(1, "unveil");
-@@ -452,15 +502,19 @@ main(int argc, char *argv[])
- 				err(1, "unveil");
- 		}
- 	}
-+# endif
- 
- 	if (!lflag && kflag)
- 		errx(1, "must use -l with -k");
-+# if defined(TLS)
- 	if (uflag && usetls)
- 		errx(1, "cannot use -c and -u");
- 	if ((family == AF_UNIX) && usetls)
- 		errx(1, "cannot use -c and -U");
-+# endif
- 	if ((family == AF_UNIX) && Fflag)
- 		errx(1, "cannot use -F and -U");
-+# if defined(TLS)
- 	if (Fflag && usetls)
- 		errx(1, "cannot use -c and -F");
- 	if (TLSopt && !usetls)
-@@ -479,6 +533,7 @@ main(int argc, char *argv[])
- 		errx(1, "you must specify -c to use -H");
- 	if (tls_expectname && !usetls)
- 		errx(1, "you must specify -c to use -e");
-+# endif
- 
- 	/* Get name of temporary socket for unix datagram client */
- 	if ((family == AF_UNIX) && uflag && !lflag) {
-@@ -545,6 +600,7 @@ main(int argc, char *argv[])
- 			proxyhints.ai_flags |= AI_NUMERICHOST;
- 	}
- 
-+# if defined(TLS)
- 	if (usetls) {
- 		if ((tls_cfg = tls_config_new()) == NULL)
- 			errx(1, "unable to allocate TLS config");
-@@ -580,7 +636,8 @@ main(int argc, char *argv[])
- 				err(1, "pledge");
- 		} else if (pledge("stdio inet dns", NULL) == -1)
- 			err(1, "pledge");
--	}
-+ 	}
-+# endif
- 	if (lflag) {
- 		ret = 0;
- 
-@@ -591,6 +648,7 @@ main(int argc, char *argv[])
- 				s = unix_listen(host);
- 		}
- 
-+# if defined(TLS)
- 		if (usetls) {
- 			tls_config_verify_client_optional(tls_cfg);
- 			if ((tls_ctx = tls_server()) == NULL)
-@@ -599,6 +657,7 @@ main(int argc, char *argv[])
- 				errx(1, "tls configuration failed (%s)",
- 				    tls_error(tls_ctx));
- 		}
-+# endif
- 		/* Allow only one connection at a time, but stay alive. */
- 		for (;;) {
- 			if (family != AF_UNIX) {
-@@ -614,7 +673,11 @@ main(int argc, char *argv[])
- 				 * let it receive datagrams from multiple
- 				 * socket pairs.
- 				 */
-+# if defined(TLS)
- 				readwrite(s, NULL);
-+# else
-+				readwrite(s);
-+# endif
- 			} else if (uflag && !kflag) {
- 				/*
- 				 * For UDP and not -k, we will use recvfrom()
-@@ -639,9 +702,14 @@ main(int argc, char *argv[])
- 					report_sock("Connection received",
- 					    (struct sockaddr *)&z, len, NULL);
- 
-+# if defined(TLS)
- 				readwrite(s, NULL);
- 			} else {
- 				struct tls *tls_cctx = NULL;
-+# else
-+				readwrite(s);
-+ 			} else {
-+# endif
- 				int connfd;
- 
- 				len = sizeof(cliaddr);
-@@ -655,6 +723,7 @@ main(int argc, char *argv[])
- 					report_sock("Connection received",
- 					    (struct sockaddr *)&cliaddr, len,
- 					    family == AF_UNIX ? host : NULL);
-+# if defined(TLS)
- 				if ((usetls) &&
- 				    (tls_cctx = tls_setup_server(tls_ctx, connfd, host)))
- 					readwrite(connfd, tls_cctx);
-@@ -664,6 +733,10 @@ main(int argc, char *argv[])
- 					timeout_tls(s, tls_cctx, tls_close);
- 				close(connfd);
- 				tls_free(tls_cctx);
-+# else
-+				readwrite(connfd);
-+ 				close(connfd);
-+# endif
- 			}
- 			if (family == AF_UNIX && uflag) {
- 				if (connect(s, NULL, 0) == -1)
-@@ -678,7 +751,11 @@ main(int argc, char *argv[])
- 
- 		if ((s = unix_connect(host)) > 0) {
- 			if (!zflag)
-+# if defined(TLS)
- 				readwrite(s, NULL);
-+# else
-+				readwrite(s);
-+# endif
- 			close(s);
- 		} else {
- 			warn("%s", host);
-@@ -699,6 +776,7 @@ main(int argc, char *argv[])
- 		for (s = -1, i = 0; portlist[i] != NULL; i++) {
- 			if (s != -1)
- 				close(s);
-+# if defined(TLS)
- 			tls_free(tls_ctx);
- 			tls_ctx = NULL;
- 
-@@ -709,6 +787,7 @@ main(int argc, char *argv[])
- 					errx(1, "tls configuration failed (%s)",
- 					    tls_error(tls_ctx));
- 			}
-+# endif
- 			if (xflag)
- 				s = socks_connect(host, portlist[i], hints,
- 				    proxy, proxyport, proxyhints, socksv,
-@@ -746,6 +825,7 @@ main(int argc, char *argv[])
- 			}
- 			if (Fflag)
- 				fdpass(s);
-+# if defined(TLS)
- 			else {
- 				if (usetls)
- 					tls_setup_client(tls_ctx, s, host);
-@@ -754,13 +834,19 @@ main(int argc, char *argv[])
- 				if (tls_ctx)
- 					timeout_tls(s, tls_ctx, tls_close);
- 			}
-+# else
-+			else if (!zflag)
-+				readwrite(s);
-+# endif
- 		}
- 	}
- 
- 	if (s != -1)
- 		close(s);
-+# if defined(TLS)
- 	tls_free(tls_ctx);
- 	tls_config_free(tls_cfg);
-+# endif
- 
- 	return ret;
- }
-@@ -802,6 +888,7 @@ unix_bind(char *path, int flags)
- 	return s;
- }
- 
-+# if defined(TLS)
- int
- timeout_tls(int s, struct tls *tls_ctx, int (*func)(struct tls *))
- {
-@@ -888,6 +975,7 @@ tls_setup_server(struct tls *tls_ctx, in
- 	}
- 	return NULL;
- }
-+# endif
- 
- /*
-  * unix_connect()
-@@ -1113,7 +1201,11 @@ local_listen(const char *host, const cha
-  * Loop that polls on the network file descriptor and stdin.
-  */
- void
-+# if defined(TLS)
- readwrite(int net_fd, struct tls *tls_ctx)
-+# else
-+readwrite(int net_fd)
-+# endif
- {
- 	struct pollfd pfd[4];
- 	int stdin_fd = STDIN_FILENO;
-@@ -1213,12 +1305,17 @@ readwrite(int net_fd, struct tls *tls_ct
- 		/* try to read from stdin */
- 		if (pfd[POLL_STDIN].revents & POLLIN && stdinbufpos < BUFSIZE) {
- 			ret = fillbuf(pfd[POLL_STDIN].fd, stdinbuf,
-+# if defined(TLS)
- 			    &stdinbufpos, NULL);
- 			if (ret == TLS_WANT_POLLIN)
- 				pfd[POLL_STDIN].events = POLLIN;
- 			else if (ret == TLS_WANT_POLLOUT)
- 				pfd[POLL_STDIN].events = POLLOUT;
--			else if (ret == 0 || ret == -1)
-+			else
-+# else
-+			    &stdinbufpos);
-+# endif
-+			if (ret == 0 || ret == -1)
- 				pfd[POLL_STDIN].fd = -1;
- 			/* read something - poll net out */
- 			if (stdinbufpos > 0)
-@@ -1230,12 +1327,17 @@ readwrite(int net_fd, struct tls *tls_ct
- 		/* try to write to network */
- 		if (pfd[POLL_NETOUT].revents & POLLOUT && stdinbufpos > 0) {
- 			ret = drainbuf(pfd[POLL_NETOUT].fd, stdinbuf,
-+# if defined(TLS)
- 			    &stdinbufpos, tls_ctx);
- 			if (ret == TLS_WANT_POLLIN)
- 				pfd[POLL_NETOUT].events = POLLIN;
- 			else if (ret == TLS_WANT_POLLOUT)
- 				pfd[POLL_NETOUT].events = POLLOUT;
--			else if (ret == -1)
-+			else
-+# else
-+			    &stdinbufpos);
-+# endif
-+			if (ret == -1)
- 				pfd[POLL_NETOUT].fd = -1;
- 			/* buffer empty - remove self from polling */
- 			if (stdinbufpos == 0)
-@@ -1247,12 +1349,17 @@ readwrite(int net_fd, struct tls *tls_ct
- 		/* try to read from network */
- 		if (pfd[POLL_NETIN].revents & POLLIN && netinbufpos < BUFSIZE) {
- 			ret = fillbuf(pfd[POLL_NETIN].fd, netinbuf,
-+# if defined(TLS)
- 			    &netinbufpos, tls_ctx);
- 			if (ret == TLS_WANT_POLLIN)
- 				pfd[POLL_NETIN].events = POLLIN;
- 			else if (ret == TLS_WANT_POLLOUT)
- 				pfd[POLL_NETIN].events = POLLOUT;
--			else if (ret == -1)
-+			else
-+# else
-+			    &netinbufpos);
-+# endif
-+			if (ret == -1)
- 				pfd[POLL_NETIN].fd = -1;
- 			/* eof on net in - remove from pfd */
- 			if (ret == 0) {
-@@ -1279,12 +1386,17 @@ readwrite(int net_fd, struct tls *tls_ct
- 		/* try to write to stdout */
- 		if (pfd[POLL_STDOUT].revents & POLLOUT && netinbufpos > 0) {
- 			ret = drainbuf(pfd[POLL_STDOUT].fd, netinbuf,
-+# if defined(TLS)
- 			    &netinbufpos, NULL);
- 			if (ret == TLS_WANT_POLLIN)
- 				pfd[POLL_STDOUT].events = POLLIN;
- 			else if (ret == TLS_WANT_POLLOUT)
- 				pfd[POLL_STDOUT].events = POLLOUT;
--			else if (ret == -1)
-+			else
-+# else
-+			    &netinbufpos);
-+# endif
-+			if (ret == -1)
- 				pfd[POLL_STDOUT].fd = -1;
- 			/* buffer empty - remove self from polling */
- 			if (netinbufpos == 0)
-@@ -1308,21 +1420,31 @@ readwrite(int net_fd, struct tls *tls_ct
- }
- 
- ssize_t
-+# if defined(TLS)
- drainbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls)
-+# else
-+drainbuf(int fd, unsigned char *buf, size_t *bufpos)
-+# endif
- {
- 	ssize_t n;
- 	ssize_t adjust;
- 
-+# if defined(TLS)
- 	if (tls) {
- 		n = tls_write(tls, buf, *bufpos);
- 		if (n == -1)
- 			errx(1, "tls write failed (%s)", tls_error(tls));
- 	} else {
-+# endif
- 		n = write(fd, buf, *bufpos);
- 		/* don't treat EAGAIN, EINTR as error */
- 		if (n == -1 && (errno == EAGAIN || errno == EINTR))
-+# if defined(TLS)
- 			n = TLS_WANT_POLLOUT;
- 	}
-+# else
-+			n = -2;
-+# endif
- 	if (n <= 0)
- 		return n;
- 	/* adjust buffer */
-@@ -1334,21 +1456,31 @@ drainbuf(int fd, unsigned char *buf, siz
- }
- 
- ssize_t
-+# if defined(TLS)
- fillbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls)
-+# else
-+fillbuf(int fd, unsigned char *buf, size_t *bufpos)
-+# endif
- {
- 	size_t num = BUFSIZE - *bufpos;
- 	ssize_t n;
- 
-+# if defined(TLS)
- 	if (tls) {
- 		n = tls_read(tls, buf + *bufpos, num);
- 		if (n == -1)
- 			errx(1, "tls read failed (%s)", tls_error(tls));
- 	} else {
-+# endif
- 		n = read(fd, buf + *bufpos, num);
- 		/* don't treat EAGAIN, EINTR as error */
- 		if (n == -1 && (errno == EAGAIN || errno == EINTR))
-+# if defined(TLS)
- 			n = TLS_WANT_POLLIN;
- 	}
-+# else
-+			n = -2;
-+# endif
- 	if (n <= 0)
- 		return n;
- 	*bufpos += n;
-@@ -1666,6 +1798,7 @@ process_tos_opt(char *s, int *val)
- 	return 0;
- }
- 
-+# if defined(TLS)
- int
- process_tls_opt(char *s, int *flags)
- {
-@@ -1779,6 +1912,7 @@ report_tls(struct tls * tls_ctx, char *
- 
- 	}
- }
-+# endif
- 
- void
- report_sock(const char *msg, const struct sockaddr *sa, socklen_t salen,
-@@ -1817,17 +1951,12 @@ help(void)
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
- 	\t-6		Use IPv6\n\
--	\t-C certfile	Public key file\n\
--	\t-c		Use TLS\n\
- 	\t-D		Enable the debug socket option\n\
- 	\t-d		Detach from stdin\n\
--	\t-e name\t	Required name in peer certificate\n\
- 	\t-F		Pass socket fd\n\
--	\t-H hash\t	Hash string of peer certificate\n\
- 	\t-h		This help text\n\
- 	\t-I length	TCP receive buffer length\n\
- 	\t-i interval	Delay interval for lines sent, ports scanned\n\
--	\t-K keyfile	Private key file\n\
- 	\t-k		Keep inbound sockets open for multiple connects\n\
- 	\t-l		Listen mode, for inbound connects\n\
- 	\t-M ttl		Outgoing TTL / Hop Limit\n\
-@@ -1835,14 +1964,12 @@ help(void)
- 	\t-N		Shutdown the network socket after EOF on stdin\n\
- 	\t-n		Suppress name/port resolutions\n\
- 	\t-O length	TCP send buffer length\n\
--	\t-o staplefile	Staple file\n\
- 	\t-P proxyuser\tUsername for proxy authentication\n\
- 	\t-p port\t	Specify local port for remote connects\n\
--	\t-R CAfile	CA bundle\n\
- 	\t-r		Randomize remote ports\n\
- 	\t-S		Enable the TCP MD5 signature option\n\
- 	\t-s source	Local source address\n\
--	\t-T keyword	TOS value or TLS options\n\
-+	\t-T keyword	TOS value\n\
- 	\t-t		Answer TELNET negotiation\n\
- 	\t-U		Use UNIX domain socket\n\
- 	\t-u		UDP mode\n\
-@@ -1852,7 +1979,6 @@ help(void)
- 	\t-w timeout	Timeout for connects and final net reads\n\
- 	\t-X proto	Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
- 	\t-x addr[:port]\tSpecify proxy address and port\n\
--	\t-Z		Peer certificate file\n\
- 	\t-z		Zero-I/O mode [used for scanning]\n\
- 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
- 	exit(0);
-@@ -1862,15 +1988,11 @@ void
- usage(int ret)
- {
- 	fprintf(stderr,
--	    "usage: nc [-46cDdFhklNnrStUuvz] [-C certfile] [-e name] "
--	    "[-H hash] [-I length]\n"
--	    "\t  [-i interval] [-K keyfile] [-M ttl] [-m minttl] [-O length]\n"
--	    "\t  [-o staplefile] [-P proxy_username] [-p source_port] "
--	    "[-R CAfile]\n"
-+	    "usage: nc [-46DdFhklNnrStUuvz] [-I length] [-i interval] [-M ttl]\n"
-+	    "\t  [-m minttl] [-O length] [-P proxy_username] [-p source_port]\n"
- 	    "\t  [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
- 	    "[-w timeout]\n"
- 	    "\t  [-X proxy_protocol] [-x proxy_address[:port]] "
--	    "[-Z peercertfile]\n"
- 	    "\t  [destination] [port]\n");
- 	if (ret)
- 		exit(1);
diff --git a/network/netcat-openbsd/patches/0003-connect-timeout.patch b/network/netcat-openbsd/patches/0003-connect-timeout.patch
deleted file mode 100644
index dd73c1d601..0000000000
--- a/network/netcat-openbsd/patches/0003-connect-timeout.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:43:56 +0800
-Subject: connect timeout
-
----
- netcat.c |   78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 76 insertions(+), 2 deletions(-)
-
---- a/netcat.c
-+++ b/netcat.c
-@@ -90,6 +90,7 @@
- #include <ctype.h>
- #include <err.h>
- #include <errno.h>
-+#include <fcntl.h>
- #include <limits.h>
- #include <netdb.h>
- #include <poll.h>
-@@ -124,6 +125,10 @@
- # define TLS_MUSTSTAPLE	(1 << 4)
- #endif
- 
-+#define CONNECTION_SUCCESS 0
-+#define CONNECTION_FAILED 1
-+#define CONNECTION_TIMEOUT 2
-+
- /* Command Line Options */
- int	dflag;					/* detached, no stdin */
- int	Fflag;					/* fdpass sock to stdout */
-@@ -214,6 +219,9 @@ ssize_t drainbuf(int, unsigned char *, s
- ssize_t fillbuf(int, unsigned char *, size_t *);
- # endif
- 
-+static int connect_with_timeout(int fd, const struct sockaddr *sa,
-+        socklen_t salen, int ctimeout);
-+
- int
- main(int argc, char *argv[])
- {
-@@ -1079,11 +1087,14 @@ remote_connect(const char *host, const c
- 
- 		set_common_sockopts(s, res->ai_family);
- 
--		if (timeout_connect(s, res->ai_addr, res->ai_addrlen) == 0)
-+		if ((error = connect_with_timeout(s, res->ai_addr, res->ai_addrlen, timeout)) == CONNECTION_SUCCESS)
- 			break;
--		if (vflag)
-+		if (vflag && error == CONNECTION_FAILED)
- 			warn("connect to %s port %s (%s) failed", host, port,
- 			    uflag ? "udp" : "tcp");
-+                else if (vflag && error == CONNECTION_TIMEOUT)
-+                    warn("connect to %s port %s (%s) timed out", host, port,
-+                            uflag ? "udp" : "tcp");
- 
- 		save_errno = errno;
- 		close(s);
-@@ -1124,6 +1135,69 @@ timeout_connect(int s, const struct sock
- 	return ret;
- }
- 
-+static int connect_with_timeout(int fd, const struct sockaddr *sa,
-+		                socklen_t salen, int ctimeout)
-+{
-+	int err;
-+	struct timeval tv, *tvp = NULL;
-+	fd_set connect_fdset;
-+	socklen_t len;
-+	int orig_flags;
-+
-+	orig_flags = fcntl(fd, F_GETFL, 0);
-+	if (fcntl(fd, F_SETFL, orig_flags | O_NONBLOCK) < 0 ) {
-+		warn("can't set O_NONBLOCK - timeout not available");
-+		if (connect(fd, sa, salen) == 0)
-+			return CONNECTION_SUCCESS;
-+		else
-+			return CONNECTION_FAILED;
-+	}
-+
-+	/* set connect timeout */
-+	if (ctimeout > 0) {
-+		tv.tv_sec = (time_t)ctimeout/1000;
-+		tv.tv_usec = 0;
-+		tvp = &tv;
-+	}
-+
-+	/* attempt the connection */
-+	err = connect(fd, sa, salen);
-+	if (err != 0 && errno == EINPROGRESS) {
-+		/* connection is proceeding
-+		 * it is complete (or failed) when select returns */
-+
-+		/* initialize connect_fdset */
-+		FD_ZERO(&connect_fdset);
-+		FD_SET(fd, &connect_fdset);
-+
-+		/* call select */
-+		do {
-+			err = select(fd + 1, NULL, &connect_fdset,
-+				     NULL, tvp);
-+		} while (err < 0 && errno == EINTR);
-+
-+		/* select error */
-+		if (err < 0)
-+			errx(1,"select error: %s", strerror(errno));
-+		/* we have reached a timeout */
-+		if (err == 0)
-+			return CONNECTION_TIMEOUT;
-+		/* select returned successfully, but we must test socket
-+		 * error for result */
-+		len = sizeof(err);
-+		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len) < 0)
-+			errx(1, "getsockopt error: %s", strerror(errno));
-+		/* setup errno according to the result returned by
-+		 * getsockopt */
-+		if (err != 0)
-+			errno = err;
-+	}
-+
-+	/* return aborted if an error occured, and valid otherwise */
-+	fcntl(fd, F_SETFL, orig_flags);
-+	return (err != 0)? CONNECTION_FAILED : CONNECTION_SUCCESS;
-+}
-+
- /*
-  * local_listen()
-  * Returns a socket listening on a local port, binds to specified source
diff --git a/network/netcat-openbsd/patches/0004-get-sev-by-name.patch b/network/netcat-openbsd/patches/0004-get-sev-by-name.patch
deleted file mode 100644
index e0734b9c03..0000000000
--- a/network/netcat-openbsd/patches/0004-get-sev-by-name.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:45:08 +0800
-Subject: get sev by name
-
----
- netcat.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/netcat.c
-+++ b/netcat.c
-@@ -1680,11 +1680,16 @@ strtoport(char *portstr, int udp)
- void
- build_ports(char *p)
- {
-+	struct servent *sv;
- 	char *n;
- 	int hi, lo, cp;
- 	int x = 0;
- 
--	if (isdigit((unsigned char)*p) && (n = strchr(p, '-')) != NULL) {
-+	sv = getservbyname(p, uflag ? "udp" : "tcp");
-+	if (sv) {
-+		if (asprintf(&portlist[0], "%d", ntohs(sv->s_port)) < 0)
-+			err(1, "asprintf");
-+	} else if (isdigit((unsigned char)*p) && (n = strchr(p, '-')) != NULL) {
- 		*n = '\0';
- 		n++;
- 
diff --git a/network/netcat-openbsd/patches/0005-send-crlf.patch b/network/netcat-openbsd/patches/0005-send-crlf.patch
deleted file mode 100644
index ecbeb3b810..0000000000
--- a/network/netcat-openbsd/patches/0005-send-crlf.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:57:45 +0800
-Subject: send crlf
-
----
- nc.1     |    9 +++++--
- netcat.c |   74 ++++++++++++++++++++++++++++++++++-----------------------------
- 2 files changed, 48 insertions(+), 35 deletions(-)
-
---- a/nc.1
-+++ b/nc.1
-@@ -33,7 +33,7 @@
- .Nd arbitrary TCP and UDP connections and listens
- .Sh SYNOPSIS
- .Nm nc
--.Op Fl 46DdFhklNnrStUuvz
-+.Op Fl 46CDdFhklNnrStUuvz
- .Op Fl I Ar length
- .Op Fl i Ar interval
- .Op Fl M Ar ttl
-@@ -92,6 +92,11 @@ The options are as follows:
- Use IPv4 addresses only.
- .It Fl 6
- Use IPv6 addresses only.
-+.It Fl C
-+Send CRLF as line-ending.  Each line feed (LF) character from the input
-+data is translated into CR+LF before being written to the socket.  Line
-+feed characters that are already preceded with a carriage return (CR)
-+are not translated.  Received data is not affected.
- .It Fl D
- Enable debugging on the socket.
- .It Fl d
-@@ -377,7 +382,7 @@ More complicated examples can be built u
- of requests required by the server.
- As another example, an email may be submitted to an SMTP server using:
- .Bd -literal -offset indent
--$ nc localhost 25 \*(Lt\*(Lt EOF
-+$ nc [\-C] localhost 25 \*(Lt\*(Lt EOF
- HELO host.example.com
- MAIL FROM:\*(Ltuser@host.example.com\*(Gt
- RCPT TO:\*(Ltuser2@host.example.com\*(Gt
---- a/netcat.c
-+++ b/netcat.c
-@@ -166,6 +166,8 @@ char	*tls_expecthash;			/* required hash
- char	*tls_ciphers;				/* TLS ciphers */
- char	*tls_protocols;				/* TLS protocols */
- FILE	*Zflag;					/* file to save peer cert */
-+# else
-+int	Cflag = 0;			/* CRLF line-ending */
- # endif
- 
- int recvcount, recvlimit;
-@@ -215,7 +217,7 @@ ssize_t fillbuf(int, unsigned char *, si
- void	tls_setup_client(struct tls *, int, char *);
- struct tls *tls_setup_server(struct tls *, int, char *);
- # else
--ssize_t drainbuf(int, unsigned char *, size_t *);
-+ssize_t drainbuf(int, unsigned char *, size_t *, int);
- ssize_t fillbuf(int, unsigned char *, size_t *);
- # endif
- 
-@@ -256,7 +258,7 @@ main(int argc, char *argv[])
- # if defined(TLS)
- 	    "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
- # else
--	    "46DdFhI:i:klM:m:NnO:P:p:rSs:T:tUuV:vW:w:X:x:z"))
-+	    "46CDdFhI:i:klM:m:NnO:P:p:rSs:T:tUuV:vW:w:X:x:z"))
- # endif
- 	    != -1) {
- 		switch (ch) {
-@@ -286,6 +288,10 @@ main(int argc, char *argv[])
- 		case 'c':
- 			usetls = 1;
- 			break;
-+# else
-+		case 'C':
-+			Cflag = 1;
-+			break;
- # endif
- 		case 'd':
- 			dflag = 1;
-@@ -1324,12 +1330,6 @@ readwrite(int net_fd)
- 		    stdinbufpos == 0 && netinbufpos == 0)
- 			return;
- 
--		/* help says -i is for "wait between lines sent". We read and
--		 * write arbitrary amounts of data, and we don't want to start
--		 * scanning for newlines, so this is as good as it gets */
--		if (iflag)
--			sleep(iflag);
--
- 		/* poll */
- 		num_fds = poll(pfd, 4, timeout);
- 
-@@ -1409,7 +1409,7 @@ readwrite(int net_fd)
- 				pfd[POLL_NETOUT].events = POLLOUT;
- 			else
- # else
--			    &stdinbufpos);
-+			    &stdinbufpos, (iflag || Cflag) ? 1 : 0);
- # endif
- 			if (ret == -1)
- 				pfd[POLL_NETOUT].fd = -1;
-@@ -1468,7 +1468,7 @@ readwrite(int net_fd)
- 				pfd[POLL_STDOUT].events = POLLOUT;
- 			else
- # else
--			    &netinbufpos);
-+			    &netinbufpos, 0);
- # endif
- 			if (ret == -1)
- 				pfd[POLL_STDOUT].fd = -1;
-@@ -1494,33 +1494,40 @@ readwrite(int net_fd)
- }
- 
- ssize_t
--# if defined(TLS)
--drainbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls)
--# else
--drainbuf(int fd, unsigned char *buf, size_t *bufpos)
--# endif
-+drainbuf(int fd, unsigned char *buf, size_t *bufpos, int oneline)
- {
--	ssize_t n;
-+	ssize_t n, r;
- 	ssize_t adjust;
-+	unsigned char *lf = NULL;
- 
--# if defined(TLS)
--	if (tls) {
--		n = tls_write(tls, buf, *bufpos);
--		if (n == -1)
--			errx(1, "tls write failed (%s)", tls_error(tls));
--	} else {
--# endif
--		n = write(fd, buf, *bufpos);
--		/* don't treat EAGAIN, EINTR as error */
--		if (n == -1 && (errno == EAGAIN || errno == EINTR))
--# if defined(TLS)
--			n = TLS_WANT_POLLOUT;
--	}
--# else
--			n = -2;
--# endif
-+	if (oneline)
-+		lf = memchr(buf, '\n', *bufpos);
-+	if (lf == NULL) {
-+		n = *bufpos;
-+		oneline = 0;
-+	}
-+	else if (Cflag && (lf == buf || buf[lf - buf - 1] != '\r')) {
-+		n = lf - buf;
-+		oneline = 2;
-+	}
-+	else
-+		n = lf - buf + 1;
-+	if (n > 0)
-+		n = write(fd, buf, n);
-+
-+	/* don't treat EAGAIN, EINTR as error */
-+	if (n == -1 && (errno == EAGAIN || errno == EINTR))
-+		n = -2;
-+	if (oneline == 2 && n >= 0)
-+		n++;
- 	if (n <= 0)
- 		return n;
-+
-+	if (oneline == 2 && (r = atomicio(vwrite, fd, "\r\n", 2)) != 2)
-+		err(1, "write failed (%zu/2)", r);
-+	if (oneline > 0 && iflag)
-+		sleep(iflag);
-+
- 	/* adjust buffer */
- 	adjust = *bufpos - n;
- 	if (adjust > 0)
-@@ -2030,6 +2037,7 @@ help(void)
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
- 	\t-6		Use IPv6\n\
-+	\t-C		Send CRLF as line-ending\n\
- 	\t-D		Enable the debug socket option\n\
- 	\t-d		Detach from stdin\n\
- 	\t-F		Pass socket fd\n\
-@@ -2067,7 +2075,7 @@ void
- usage(int ret)
- {
- 	fprintf(stderr,
--	    "usage: nc [-46DdFhklNnrStUuvz] [-I length] [-i interval] [-M ttl]\n"
-+	    "usage: nc [-46CDdFhklNnrStUuvz] [-I length] [-i interval] [-M ttl]\n"
- 	    "\t  [-m minttl] [-O length] [-P proxy_username] [-p source_port]\n"
- 	    "\t  [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
- 	    "[-w timeout]\n"
diff --git a/network/netcat-openbsd/patches/0006-quit-timer.patch b/network/netcat-openbsd/patches/0006-quit-timer.patch
deleted file mode 100644
index 4d64cc100a..0000000000
--- a/network/netcat-openbsd/patches/0006-quit-timer.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:16:04 +0800
-Subject: quit timer
-
----
- nc.1     |   10 ++++++++++
- netcat.c |   50 +++++++++++++++++++++++++++++++++++++++++---------
- 2 files changed, 51 insertions(+), 9 deletions(-)
-
---- a/nc.1
-+++ b/nc.1
-@@ -41,6 +41,7 @@
- .Op Fl O Ar length
- .Op Fl P Ar proxy_username
- .Op Fl p Ar source_port
-+.Op Fl q Ar seconds
- .Op Fl s Ar source
- .Op Fl T Ar keyword
- .Op Fl V Ar rtable
-@@ -167,6 +168,15 @@ Proxy authentication is only supported f
- Specify the source port
- .Nm
- should use, subject to privilege restrictions and availability.
-+.It Fl q Ar seconds
-+after EOF on stdin, wait the specified number of
-+.Ar seconds
-+and then quit. If
-+.Ar seconds
-+is negative, wait forever (default).  Specifying a non-negative
-+.Ar seconds
-+implies
-+.Fl N .
- .It Fl r
- Choose source and/or destination ports randomly
- instead of sequentially within a range or in the order that the system
---- a/netcat.c
-+++ b/netcat.c
-@@ -139,6 +139,7 @@ int	Nflag;					/* shutdown() network soc
- int	nflag;					/* Don't do name look up */
- char   *Pflag;					/* Proxy username */
- char   *pflag;					/* Localport flag */
-+int    qflag = -1;				/* Quit after some secs */
- int	rflag;					/* Random ports flag */
- char   *sflag;					/* Source Address */
- int	tflag;					/* Telnet Emulation */
-@@ -224,6 +225,8 @@ ssize_t fillbuf(int, unsigned char *, si
- static int connect_with_timeout(int fd, const struct sockaddr *sa,
-         socklen_t salen, int ctimeout);
- 
-+static void quit();
-+
- int
- main(int argc, char *argv[])
- {
-@@ -256,9 +259,9 @@ main(int argc, char *argv[])
- 
- 	while ((ch = getopt(argc, argv,
- # if defined(TLS)
--	    "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
-+	    "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:q:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
- # else
--	    "46CDdFhI:i:klM:m:NnO:P:p:rSs:T:tUuV:vW:w:X:x:z"))
-+	    "46CDdFhI:i:klM:m:NnO:P:p:q:rSs:T:tUuV:vW:w:X:x:z"))
- # endif
- 	    != -1) {
- 		switch (ch) {
-@@ -350,6 +353,13 @@ main(int argc, char *argv[])
- 		case 'p':
- 			pflag = optarg;
- 			break;
-+		case 'q':
-+			qflag = strtonum(optarg, INT_MIN, INT_MAX, &errstr);
-+			if (errstr)
-+				errx(1, "quit timer %s: %s", errstr, optarg);
-+			if (qflag >= 0)
-+				Nflag = 1;
-+			break;
- # if defined(TLS)
- 		case 'R':
- 			tls_cachanged = 1;
-@@ -1320,15 +1330,27 @@ readwrite(int net_fd)
- 	while (1) {
- 		/* both inputs are gone, buffers are empty, we are done */
- 		if (pfd[POLL_STDIN].fd == -1 && pfd[POLL_NETIN].fd == -1 &&
--		    stdinbufpos == 0 && netinbufpos == 0)
--			return;
-+		    stdinbufpos == 0 && netinbufpos == 0) {
-+			if (qflag <= 0)
-+				return;
-+			goto delay_exit;
-+		}
- 		/* both outputs are gone, we can't continue */
--		if (pfd[POLL_NETOUT].fd == -1 && pfd[POLL_STDOUT].fd == -1)
--			return;
-+		if (pfd[POLL_NETOUT].fd == -1 && pfd[POLL_STDOUT].fd == -1) {
-+			if (qflag <= 0)
-+				return;
-+			goto delay_exit;
-+		}
- 		/* listen and net in gone, queues empty, done */
- 		if (lflag && pfd[POLL_NETIN].fd == -1 &&
--		    stdinbufpos == 0 && netinbufpos == 0)
--			return;
-+		    stdinbufpos == 0 && netinbufpos == 0) {
-+			if (qflag <= 0)
-+				return;
-+delay_exit:
-+			close(net_fd);
-+			signal(SIGALRM, quit);
-+			alarm(qflag);
-+		}
- 
- 		/* poll */
- 		num_fds = poll(pfd, 4, timeout);
-@@ -2053,6 +2075,7 @@ help(void)
- 	\t-O length	TCP send buffer length\n\
- 	\t-P proxyuser\tUsername for proxy authentication\n\
- 	\t-p port\t	Specify local port for remote connects\n\
-+	\t-q secs\t	quit after EOF on stdin and delay of secs\n\
- 	\t-r		Randomize remote ports\n\
- 	\t-S		Enable the TCP MD5 signature option\n\
- 	\t-s source	Local source address\n\
-@@ -2077,10 +2100,19 @@ usage(int ret)
- 	fprintf(stderr,
- 	    "usage: nc [-46CDdFhklNnrStUuvz] [-I length] [-i interval] [-M ttl]\n"
- 	    "\t  [-m minttl] [-O length] [-P proxy_username] [-p source_port]\n"
--	    "\t  [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
-+	    "\t  [-q seconds] [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
- 	    "[-w timeout]\n"
- 	    "\t  [-X proxy_protocol] [-x proxy_address[:port]] "
- 	    "\t  [destination] [port]\n");
- 	if (ret)
- 		exit(1);
- }
-+
-+/*
-+ * quit()
-+ * handler for a "-q" timeout (exit 0 instead of 1)
-+ */
-+static void quit()
-+{
-+	exit(0);
-+}
diff --git a/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch b/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch
deleted file mode 100644
index 85cd186cce..0000000000
--- a/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:29:37 +0800
-Subject: udp scan timeout
-
----
- netcat.c |   23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
---- a/netcat.c
-+++ b/netcat.c
-@@ -129,6 +129,8 @@
- #define CONNECTION_FAILED 1
- #define CONNECTION_TIMEOUT 2
- 
-+#define UDP_SCAN_TIMEOUT 3			/* Seconds */
-+
- /* Command Line Options */
- int	dflag;					/* detached, no stdin */
- int	Fflag;					/* fdpass sock to stdout */
-@@ -823,7 +825,7 @@ main(int argc, char *argv[])
- 				continue;
- 
- 			ret = 0;
--			if (vflag || zflag) {
-+			if (vflag) {
- 				/* For UDP, make sure we are connected. */
- 				if (uflag) {
- 					if (udptest(s) == -1) {
-@@ -1768,15 +1770,20 @@ build_ports(char *p)
- int
- udptest(int s)
- {
--	int i, ret;
-+	int i, t;
- 
--	for (i = 0; i <= 3; i++) {
--		if (write(s, "X", 1) == 1)
--			ret = 1;
--		else
--			ret = -1;
-+	if ((write(s, "X", 1) != 1) ||
-+	    ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED)))
-+		return -1;
-+
-+	/* Give the remote host some time to reply. */
-+	for (i = 0, t = (timeout == -1) ? UDP_SCAN_TIMEOUT : (timeout / 1000);
-+	     i < t; i++) {
-+		sleep(1);
-+		if ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED))
-+			return -1;
- 	}
--	return ret;
-+	return 1;
- }
- 
- void
diff --git a/network/netcat-openbsd/patches/0008-dccp-support.patch b/network/netcat-openbsd/patches/0008-dccp-support.patch
deleted file mode 100644
index bd37690811..0000000000
--- a/network/netcat-openbsd/patches/0008-dccp-support.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:56:51 +0800
-Subject: dccp support
-
----
- nc.1     |    4 ++
- netcat.c |   89 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
- 2 files changed, 79 insertions(+), 14 deletions(-)
-
---- a/nc.1
-+++ b/nc.1
-@@ -33,7 +33,7 @@
- .Nd arbitrary TCP and UDP connections and listens
- .Sh SYNOPSIS
- .Nm nc
--.Op Fl 46CDdFhklNnrStUuvz
-+.Op Fl 46CDdFhklNnrStUuvZz
- .Op Fl I Ar length
- .Op Fl i Ar interval
- .Op Fl M Ar ttl
-@@ -289,6 +289,8 @@ An IPv6 address can be specified unambig
- in square brackets.
- A proxy cannot be used with any of the options
- .Fl lsuU .
-+.It Fl Z
-+DCCP mode.
- .It Fl z
- Only scan for listening daemons, without sending any data to them.
- Cannot be used together with
---- a/netcat.c
-+++ b/netcat.c
-@@ -146,6 +146,7 @@ int	rflag;					/* Random ports flag */
- char   *sflag;					/* Source Address */
- int	tflag;					/* Telnet Emulation */
- int	uflag;					/* UDP - Default to TCP */
-+int	dccpflag;				/* DCCP - Default to TCP */
- int	vflag;					/* Verbosity */
- int	xflag;					/* Socks proxy */
- int	zflag;					/* Port Scan Flag */
-@@ -224,6 +225,7 @@ ssize_t drainbuf(int, unsigned char *, s
- ssize_t fillbuf(int, unsigned char *, size_t *);
- # endif
- 
-+char *proto_name(int uflag, int dccpflag);
- static int connect_with_timeout(int fd, const struct sockaddr *sa,
-         socklen_t salen, int ctimeout);
- 
-@@ -263,7 +265,7 @@ main(int argc, char *argv[])
- # if defined(TLS)
- 	    "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:q:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
- # else
--	    "46CDdFhI:i:klM:m:NnO:P:p:q:rSs:T:tUuV:vW:w:X:x:z"))
-+	    "46CDdFhI:i:klM:m:NnO:P:p:q:rSs:T:tUuV:vW:w:X:x:Zz"))
- # endif
- 	    != -1) {
- 		switch (ch) {
-@@ -380,6 +382,13 @@ main(int argc, char *argv[])
- 		case 'u':
- 			uflag = 1;
- 			break;
-+		case 'Z':
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+			dccpflag = 1;
-+# else
-+			errx(1, "no DCCP support available");
-+# endif
-+			break;
- 		case 'V':
- # if defined(RT_TABLEID_MAX)
- 			rtableid = (int)strtonum(optarg, 0,
-@@ -484,6 +493,10 @@ main(int argc, char *argv[])
- 
- 	/* Cruft to make sure options are clean, and used properly. */
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		if (dccpflag)
-+			errx(1, "cannot use -Z and -U");
-+# endif
- 		host = argv[0];
- 		uport = NULL;
- 	} else if (!argv[0] && lflag) {
-@@ -578,8 +591,20 @@ main(int argc, char *argv[])
- 	if (family != AF_UNIX) {
- 		memset(&hints, 0, sizeof(struct addrinfo));
- 		hints.ai_family = family;
--		hints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
--		hints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
-+		if (uflag) {
-+		    hints.ai_socktype = SOCK_DGRAM;
-+		    hints.ai_protocol = IPPROTO_UDP;
-+		}
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		else if (dccpflag) {
-+		    hints.ai_socktype = SOCK_DCCP;
-+		    hints.ai_protocol = IPPROTO_DCCP;
-+		}
-+# endif
-+		else {
-+		    hints.ai_socktype = SOCK_STREAM;
-+		    hints.ai_protocol = IPPROTO_TCP;
-+		}
- 		if (nflag)
- 			hints.ai_flags |= AI_NUMERICHOST;
- 	}
-@@ -587,7 +612,10 @@ main(int argc, char *argv[])
- 	if (xflag) {
- 		if (uflag)
- 			errx(1, "no proxy support for UDP mode");
--
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		if (dccpflag)
-+			errx(1, "no proxy support for DCCP mode");
-+# endif
- 		if (lflag)
- 			errx(1, "no proxy support for listen");
- 
-@@ -834,19 +862,20 @@ main(int argc, char *argv[])
- 					}
- 				}
- 
-+				char *proto = proto_name(uflag, dccpflag);
- 				/* Don't look up port if -n. */
- 				if (nflag)
- 					sv = NULL;
- 				else {
- 					sv = getservbyport(
- 					    ntohs(atoi(portlist[i])),
--					    uflag ? "udp" : "tcp");
-+					    proto);
- 				}
- 
- 				fprintf(stderr,
- 				    "Connection to %s %s port [%s/%s] "
- 				    "succeeded!\n", host, portlist[i],
--				    uflag ? "udp" : "tcp",
-+				    proto,
- 				    sv ? sv->s_name : "*");
- 			}
- 			if (Fflag)
-@@ -1061,6 +1090,24 @@ unix_listen(char *path)
- 	return s;
- }
- 
-+char *proto_name(int uflag, int dccpflag) {
-+
-+    char *proto = NULL;
-+    if (uflag) {
-+	proto = "udp";
-+    }
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+    else if (dccpflag) {
-+	proto = "dccp";
-+    }
-+# endif
-+    else {
-+	proto = "tcp";
-+    }
-+
-+    return proto;
-+}
-+
- /*
-  * remote_connect()
-  * Returns a socket connected to a remote host. Properly binds to a local
-@@ -1091,8 +1138,21 @@ remote_connect(const char *host, const c
- # endif
- 			memset(&ahints, 0, sizeof(struct addrinfo));
- 			ahints.ai_family = res->ai_family;
--			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
--			ahints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
-+			if (uflag) {
-+			    ahints.ai_socktype = SOCK_DGRAM;
-+			    ahints.ai_protocol = IPPROTO_UDP;
-+
-+			}
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+			else if (dccpflag) {
-+			    hints.ai_socktype = SOCK_DCCP;
-+			    hints.ai_protocol = IPPROTO_DCCP;
-+			}
-+# endif
-+			else {
-+		    	    ahints.ai_socktype = SOCK_STREAM;
-+			    ahints.ai_protocol = IPPROTO_TCP;
-+			}
- 			ahints.ai_flags = AI_PASSIVE;
- 			if ((error = getaddrinfo(sflag, pflag, &ahints, &ares)))
- 				errx(1, "getaddrinfo: %s", gai_strerror(error));
-@@ -1104,15 +1164,16 @@ remote_connect(const char *host, const c
- 		}
- 
- 		set_common_sockopts(s, res->ai_family);
-+		char *proto = proto_name(uflag, dccpflag);
- 
- 		if ((error = connect_with_timeout(s, res->ai_addr, res->ai_addrlen, timeout)) == CONNECTION_SUCCESS)
- 			break;
- 		if (vflag && error == CONNECTION_FAILED)
- 			warn("connect to %s port %s (%s) failed", host, port,
--			    uflag ? "udp" : "tcp");
--                else if (vflag && error == CONNECTION_TIMEOUT)
-+			     proto);
-+		else if (vflag && error == CONNECTION_TIMEOUT)
-                     warn("connect to %s port %s (%s) timed out", host, port,
--                            uflag ? "udp" : "tcp");
-+                            proto);
- 
- 		save_errno = errno;
- 		close(s);
-@@ -1716,7 +1777,8 @@ build_ports(char *p)
- 	int hi, lo, cp;
- 	int x = 0;
- 
--	sv = getservbyname(p, uflag ? "udp" : "tcp");
-+	char *proto = proto_name(uflag, dccpflag);
-+	sv = getservbyname(p, proto);
- 	if (sv) {
- 		if (asprintf(&portlist[0], "%d", ntohs(sv->s_port)) < 0)
- 			err(1, "asprintf");
-@@ -2096,6 +2158,7 @@ help(void)
- 	\t-w timeout	Timeout for connects and final net reads\n\
- 	\t-X proto	Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
- 	\t-x addr[:port]\tSpecify proxy address and port\n\
-+	\t-Z		DCCP mode\n\
- 	\t-z		Zero-I/O mode [used for scanning]\n\
- 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
- 	exit(0);
-@@ -2105,7 +2168,7 @@ void
- usage(int ret)
- {
- 	fprintf(stderr,
--	    "usage: nc [-46CDdFhklNnrStUuvz] [-I length] [-i interval] [-M ttl]\n"
-+	    "usage: nc [-46CDdFhklNnrStUuvZz] [-I length] [-i interval] [-M ttl]\n"
- 	    "\t  [-m minttl] [-O length] [-P proxy_username] [-p source_port]\n"
- 	    "\t  [-q seconds] [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
- 	    "[-w timeout]\n"
diff --git a/network/netcat-openbsd/patches/0009-broadcast-support.patch b/network/netcat-openbsd/patches/0009-broadcast-support.patch
deleted file mode 100644
index 6b2c5f1251..0000000000
--- a/network/netcat-openbsd/patches/0009-broadcast-support.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 19:06:52 +0800
-Subject: broadcast support
-
----
- nc.1     |    4 +++-
- netcat.c |   22 ++++++++++++++++++++--
- 2 files changed, 23 insertions(+), 3 deletions(-)
-
---- a/nc.1
-+++ b/nc.1
-@@ -33,7 +33,7 @@
- .Nd arbitrary TCP and UDP connections and listens
- .Sh SYNOPSIS
- .Nm nc
--.Op Fl 46CDdFhklNnrStUuvZz
-+.Op Fl 46bCDdFhklNnrStUuvZz
- .Op Fl I Ar length
- .Op Fl i Ar interval
- .Op Fl M Ar ttl
-@@ -93,6 +93,8 @@ The options are as follows:
- Use IPv4 addresses only.
- .It Fl 6
- Use IPv6 addresses only.
-+.It Fl b
-+Allow broadcast.
- .It Fl C
- Send CRLF as line-ending.  Each line feed (LF) character from the input
- data is translated into CR+LF before being written to the socket.  Line
---- a/netcat.c
-+++ b/netcat.c
-@@ -132,6 +132,7 @@
- #define UDP_SCAN_TIMEOUT 3			/* Seconds */
- 
- /* Command Line Options */
-+int	bflag;					/* Allow Broadcast */
- int	dflag;					/* detached, no stdin */
- int	Fflag;					/* fdpass sock to stdout */
- unsigned int iflag;				/* Interval Flag */
-@@ -263,9 +264,9 @@ main(int argc, char *argv[])
- 
- 	while ((ch = getopt(argc, argv,
- # if defined(TLS)
--	    "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:q:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
-+	    "46bC:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:q:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
- # else
--	    "46CDdFhI:i:klM:m:NnO:P:p:q:rSs:T:tUuV:vW:w:X:x:Zz"))
-+	    "46bCDdFhI:i:klM:m:NnO:P:p:q:rSs:T:tUuV:vW:w:X:x:Zz"))
- # endif
- 	    != -1) {
- 		switch (ch) {
-@@ -275,6 +276,13 @@ main(int argc, char *argv[])
- 		case '6':
- 			family = AF_INET6;
- 			break;
-+		case 'b':
-+# if defined(SO_BROADCAST)
-+			bflag = 1;
-+# else
-+			errx(1, "no broadcast frame support available");
-+# endif
-+			break;
- 		case 'U':
- 			family = AF_UNIX;
- 			break;
-@@ -1853,6 +1861,15 @@ set_common_sockopts(int s, int af)
- {
- 	int x = 1;
- 
-+# if defined(SO_BROADCAST)
-+	if (bflag) {
-+		/* allow datagram sockets to send packets to a broadcast address
-+		 * (this option has no effect on stream-oriented sockets) */
-+		if (setsockopt(s, SOL_SOCKET, SO_BROADCAST,
-+			&x, sizeof(x)) == -1)
-+			err(1, NULL);
-+	}
-+# endif
- # if defined(TCP_MD5SIG)
- 	if (Sflag) {
- 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
-@@ -2128,6 +2145,7 @@ help(void)
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
- 	\t-6		Use IPv6\n\
-+	\t-b		Allow broadcast\n\
- 	\t-C		Send CRLF as line-ending\n\
- 	\t-D		Enable the debug socket option\n\
- 	\t-d		Detach from stdin\n\
diff --git a/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch b/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch
deleted file mode 100644
index 3d6c4ad9a6..0000000000
--- a/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Tue, 14 Feb 2012 23:02:00 +0800
-Subject: serialized handling multiple clients
-
----
- netcat.c |   17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
---- a/netcat.c
-+++ b/netcat.c
-@@ -708,7 +708,10 @@ main(int argc, char *argv[])
- 				s = unix_bind(host, 0);
- 			else
- 				s = unix_listen(host);
--		}
-+		} else
-+			s = local_listen(host, uport, hints);
-+		if (s < 0)
-+			err(1, NULL);
- 
- # if defined(TLS)
- 		if (usetls) {
-@@ -722,13 +725,6 @@ main(int argc, char *argv[])
- # endif
- 		/* Allow only one connection at a time, but stay alive. */
- 		for (;;) {
--			if (family != AF_UNIX) {
--				if (s != -1)
--					close(s);
--				s = local_listen(host, uport, hints);
--			}
--			if (s == -1)
--				err(1, NULL);
- 			if (uflag && kflag) {
- 				/*
- 				 * For UDP and -k, don't connect the socket,
-@@ -805,8 +801,11 @@ main(int argc, char *argv[])
- 					err(1, "connect");
- 			}
- 
--			if (!kflag)
-+			if (!kflag) {
-+				if (s != -1)
-+					close(s);
- 				break;
-+			}
- 		}
- 	} else if (family == AF_UNIX) {
- 		ret = 0;
diff --git a/network/netcat-openbsd/patches/0011-set-TCP-MD5SIG-correctly-for-client-connections.patch b/network/netcat-openbsd/patches/0011-set-TCP-MD5SIG-correctly-for-client-connections.patch
deleted file mode 100644
index c274549672..0000000000
--- a/network/netcat-openbsd/patches/0011-set-TCP-MD5SIG-correctly-for-client-connections.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From: Thomas Habets <habets@google.com>
-Date: Sat, 18 Feb 2017 21:07:22 +0000
-Subject: Set TCP MD5SIG correctly for client connections
-
----
- netcat.c |   31 ++++++++++++++++++++++++-------
- 1 file changed, 24 insertions(+), 7 deletions(-)
-
---- a/netcat.c
-+++ b/netcat.c
-@@ -46,6 +46,9 @@
- #ifdef __linux__
- # include <linux/in6.h>
- #endif
-+#if defined(TCP_MD5SIG) && defined(TCP_MD5SIG_MAXKEYLEN)
-+# include <bsd/readpassphrase.h>
-+#endif
- 
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
-@@ -175,6 +178,9 @@ FILE	*Zflag;					/* file to save peer ce
- int	Cflag = 0;			/* CRLF line-ending */
- # endif
- 
-+# if defined(TCP_MD5SIG) && defined(TCP_MD5SIG_MAXKEYLEN)
-+char Sflag_password[TCP_MD5SIG_MAXKEYLEN];
-+# endif
- int recvcount, recvlimit;
- int timeout = -1;
- int family = AF_UNSPEC;
-@@ -205,7 +211,7 @@ int	udptest(int);
- int	unix_bind(char *, int);
- int	unix_connect(char *);
- int	unix_listen(char *);
--void	set_common_sockopts(int, int);
-+void	set_common_sockopts(int, const struct sockaddr *);
- int	process_tos_opt(char *, int *);
- # if defined(TLS)
- int	process_tls_opt(char *, int *);
-@@ -458,7 +464,10 @@ main(int argc, char *argv[])
- 			break;
- # endif
- 		case 'S':
--# if defined(TCP_MD5SIG)
-+# if defined(TCP_MD5SIG) && defined(TCP_MD5SIG_MAXKEYLEN)
-+			if (readpassphrase("TCP MD5SIG password: ",
-+			                   Sflag_password, TCP_MD5SIG_MAXKEYLEN, RPP_REQUIRE_TTY) == NULL)
-+				errx(1, "Unable to read TCP MD5SIG password");
- 			Sflag = 1;
- # else
- 			errx(1, "no TCP MD5 signature support available");
-@@ -1170,7 +1179,7 @@ remote_connect(const char *host, const c
- 			freeaddrinfo(ares);
- 		}
- 
--		set_common_sockopts(s, res->ai_family);
-+		set_common_sockopts(s, res->ai_addr);
- 		char *proto = proto_name(uflag, dccpflag);
- 
- 		if ((error = connect_with_timeout(s, res->ai_addr, res->ai_addrlen, timeout)) == CONNECTION_SUCCESS)
-@@ -1324,7 +1333,7 @@ local_listen(const char *host, const cha
- 			err(1, NULL);
- # endif
- 
--		set_common_sockopts(s, res->ai_family);
-+		set_common_sockopts(s, res->ai_addr);
- 
- 		if (bind(s, (struct sockaddr *)res->ai_addr,
- 		    res->ai_addrlen) == 0)
-@@ -1856,9 +1865,10 @@ udptest(int s)
- }
- 
- void
--set_common_sockopts(int s, int af)
-+set_common_sockopts(int s, const struct sockaddr* sa)
- {
- 	int x = 1;
-+	int af = sa->sa_family;
- 
- # if defined(SO_BROADCAST)
- 	if (bflag) {
-@@ -1869,10 +1879,17 @@ set_common_sockopts(int s, int af)
- 			err(1, NULL);
- 	}
- # endif
--# if defined(TCP_MD5SIG)
-+# if defined(TCP_MD5SIG) && defined(TCP_MD5SIG_MAXKEYLEN)
- 	if (Sflag) {
-+		struct tcp_md5sig sig;
-+		memset(&sig, 0, sizeof(sig));
-+		memcpy(&sig.tcpm_addr, sa, sizeof(struct sockaddr_storage));
-+		sig.tcpm_keylen = TCP_MD5SIG_MAXKEYLEN < strlen(Sflag_password)
-+			? TCP_MD5SIG_MAXKEYLEN
-+			: strlen(Sflag_password);
-+		strlcpy(sig.tcpm_key, Sflag_password, sig.tcpm_keylen);
- 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
--			&x, sizeof(x)) == -1)
-+			&sig, sizeof(sig)) == -1)
- 			err(1, NULL);
- 	}
- # endif
diff --git a/network/netcat-openbsd/patches/0012-destination-port-list.patch b/network/netcat-openbsd/patches/0012-destination-port-list.patch
deleted file mode 100644
index 08dc98cf6b..0000000000
--- a/network/netcat-openbsd/patches/0012-destination-port-list.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From: Guilhem Moulin <guilhem@debian.org>
-Date: Mon, 22 Oct 2018 04:15:52 +0200
-Subject: destination port list
-
----
- nc.1     |   26 ++++++++++++++++---
- netcat.c |   86 ++++++++++++++++++++++++++++++++-------------------------------
- 2 files changed, 68 insertions(+), 44 deletions(-)
-
---- a/nc.1
-+++ b/nc.1
-@@ -414,15 +414,35 @@ The
- flag can be used to tell
- .Nm
- to report open ports,
--rather than initiate a connection.
-+rather than initiate a connection. Usually it's useful to turn on verbose
-+output to stderr by use this option in conjunction with
-+.Fl v
-+option.
-+.Pp
- For example:
- .Bd -literal -offset indent
--$ nc -z host.example.com 20-30
-+$ nc \-zv host.example.com 20-30
- Connection to host.example.com 22 port [tcp/ssh] succeeded!
- Connection to host.example.com 25 port [tcp/smtp] succeeded!
- .Ed
- .Pp
--The port range was specified to limit the search to ports 20 \- 30.
-+The port range was specified to limit the search to ports 20 \- 30, and is
-+scanned by increasing order (unless the
-+.Fl r
-+flag is set).
-+.Pp
-+You can also specify a list of ports to scan, for example:
-+.Bd -literal -offset indent
-+$ nc \-zv host.example.com http 20 22-23
-+nc: connect to host.example.com 80 (tcp) failed: Connection refused
-+nc: connect to host.example.com 20 (tcp) failed: Connection refused
-+Connection to host.example.com port [tcp/ssh] succeeded!
-+nc: connect to host.example.com 23 (tcp) failed: Connection refused
-+.Ed
-+.Pp
-+The ports are scanned by the order you given (unless the
-+.Fl r
-+flag is set).
- .Pp
- Alternatively, it might be useful to know which server software
- is running, and which versions.
---- a/netcat.c
-+++ b/netcat.c
-@@ -191,7 +191,7 @@ int minttl = -1;
- 
- void	atelnet(int, unsigned char *, unsigned int);
- int	strtoport(char *portstr, int udp);
--void	build_ports(char *);
-+void	build_ports(char **);
- void	help(void) __attribute__((noreturn));
- int	local_listen(const char *, const char *, struct addrinfo);
- # if defined(TLS)
-@@ -242,7 +242,7 @@ int
- main(int argc, char *argv[])
- {
- 	int ch, s = -1, ret, socksv;
--	char *host, *uport;
-+	char *host, **uport;
- 	struct addrinfo hints;
- 	struct servent *sv;
- 	socklen_t len;
-@@ -526,11 +526,11 @@ main(int argc, char *argv[])
- 	} else if (argv[0] && !argv[1]) {
- 		if (!lflag)
- 			usage(1);
--		uport = argv[0];
-+		uport = &argv[0];
- 		host = NULL;
- 	} else if (argv[0] && argv[1]) {
- 		host = argv[0];
--		uport = argv[1];
-+		uport = &argv[1];
- 	} else
- 		usage(1);
- 
-@@ -718,7 +718,7 @@ main(int argc, char *argv[])
- 			else
- 				s = unix_listen(host);
- 		} else
--			s = local_listen(host, uport, hints);
-+			s = local_listen(host, *uport, hints);
- 		if (s < 0)
- 			err(1, NULL);
- 
-@@ -1786,57 +1786,61 @@ strtoport(char *portstr, int udp)
-  * that we should try to connect to.
-  */
- void
--build_ports(char *p)
-+build_ports(char **p)
- {
- 	struct servent *sv;
- 	char *n;
- 	int hi, lo, cp;
- 	int x = 0;
-+	int i;
- 
- 	char *proto = proto_name(uflag, dccpflag);
--	sv = getservbyname(p, proto);
--	if (sv) {
--		if (asprintf(&portlist[0], "%d", ntohs(sv->s_port)) < 0)
--			err(1, "asprintf");
--	} else if (isdigit((unsigned char)*p) && (n = strchr(p, '-')) != NULL) {
--		*n = '\0';
--		n++;
--
--		/* Make sure the ports are in order: lowest->highest. */
--		hi = strtoport(n, uflag);
--		lo = strtoport(p, uflag);
--		if (lo > hi) {
--			cp = hi;
--			hi = lo;
--			lo = cp;
--		}
--
--		/*
--		 * Initialize portlist with a random permutation.  Based on
--		 * Knuth, as in ip_randomid() in sys/netinet/ip_id.c.
--		 */
--		if (rflag) {
--			for (x = 0; x <= hi - lo; x++) {
--				cp = arc4random_uniform(x + 1);
--				portlist[x] = portlist[cp];
--				if (asprintf(&portlist[cp], "%d", x + lo) == -1)
--					err(1, "asprintf");
-+	for (i = 0; p[i] != NULL; i++) {
-+		sv = getservbyname(p[i], proto);
-+		if (sv) {
-+			if (asprintf(&portlist[x], "%d", ntohs(sv->s_port)) < 0)
-+				err(1, "asprintf");
-+			x++;
-+		} else if (isdigit((unsigned char)*p[i]) && (n = strchr(p[i], '-')) != NULL) {
-+			*n = '\0';
-+			n++;
-+
-+			/* Make sure the ports are in order: lowest->highest. */
-+			hi = strtoport(n, uflag);
-+			lo = strtoport(p[i], uflag);
-+			if (lo > hi) {
-+				cp = hi;
-+				hi = lo;
-+				lo = cp;
- 			}
--		} else { /* Load ports sequentially. */
-+
-+			/* Load ports sequentially. */
- 			for (cp = lo; cp <= hi; cp++) {
- 				if (asprintf(&portlist[x], "%d", cp) == -1)
- 					err(1, "asprintf");
- 				x++;
- 			}
-+		} else {
-+			hi = strtoport(p[i], uflag);
-+			if (asprintf(&portlist[x], "%d", hi) < 0)
-+				err(1, "asprintf");
-+			x++;
- 		}
--	} else {
--		char *tmp;
-+	}
- 
--		hi = strtoport(p, uflag);
--		if (asprintf(&tmp, "%d", hi) != -1)
--			portlist[0] = tmp;
--		else
--			err(1, NULL);
-+	/*
-+	 * Initialize portlist with a random permutation using
-+	 * Fisher–Yates shuffle.
-+	 */
-+	if (rflag) {
-+		for (i = x-1; i > 0; i--) {
-+			cp = arc4random_uniform(i+1);
-+			if (cp != i) {
-+				n = portlist[i];
-+				portlist[i] = portlist[cp];
-+				portlist[cp] = n;
-+			}
-+		}
- 	}
- }
- 
diff --git a/network/netcat-openbsd/patches/0013-use-flags-to-specify-listen-address.patch b/network/netcat-openbsd/patches/0013-use-flags-to-specify-listen-address.patch
deleted file mode 100644
index 4733112af6..0000000000
--- a/network/netcat-openbsd/patches/0013-use-flags-to-specify-listen-address.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Guilhem Moulin <guilhem@debian.org>
-Date: Mon, 22 Oct 2018 04:50:54 +0200
-Subject: use -s/-p flags to specify listen address
-
----
- nc.1     |   18 ++++++++++++++----
- netcat.c |   51 +++++++++++++++++++++++++++++++--------------------
- 2 files changed, 45 insertions(+), 24 deletions(-)
-
---- a/nc.1
-+++ b/nc.1
-@@ -143,8 +143,20 @@ multiple hosts.
- .It Fl l
- Listen for an incoming connection rather than initiating a
- connection to a remote host.
--Cannot be used together with any of the options
--.Fl psxz .
-+The
-+.Ar destination
-+and
-+.Ar port
-+to listen on can be specified either as non-optional arguments, or with
-+options
-+.Fl s
-+and
-+.Fl p
-+respectively.
-+Cannot be used together with
-+.Fl x
-+or
-+.Fl z .
- Additionally, any timeouts specified with the
- .Fl w
- option are ignored.
-@@ -194,8 +206,6 @@ For
- datagram sockets, specifies the local temporary socket file
- to create and use so that datagrams can be received.
- Cannot be used together with
--.Fl l
--or
- .Fl x .
- .It Fl T Ar keyword
- Change the IPv4 TOS/IPv6 traffic class value.
---- a/netcat.c
-+++ b/netcat.c
-@@ -509,31 +509,42 @@ main(int argc, char *argv[])
- # endif
- 
- 	/* Cruft to make sure options are clean, and used properly. */
--	if (argv[0] && !argv[1] && family == AF_UNIX) {
--# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
--		if (dccpflag)
--			errx(1, "cannot use -Z and -U");
--# endif
--		host = argv[0];
--		uport = NULL;
--	} else if (!argv[0] && lflag) {
--		if (sflag)
--			errx(1, "cannot use -s and -l");
--		if (pflag)
--			errx(1, "cannot use -p and -l");
--		if (zflag)
--			errx(1, "cannot use -z and -l");
--	} else if (argv[0] && !argv[1]) {
--		if (!lflag)
--			usage(1);
--		uport = &argv[0];
--		host = NULL;
--	} else if (argv[0] && argv[1]) {
-+	if (argc == 0 && lflag) {
-+		uport = &pflag;
-+		host = sflag;
-+	} else if (argc == 1 && !pflag &&
-+			/* `nc -l 12345` or `nc -U bar` or `nc -uU -s foo bar` */
-+			(!sflag || (family == AF_UNIX && uflag && !lflag))) {
-+		if (family == AF_UNIX) {
-+			host = argv[0];
-+			uport = NULL;
-+		} else if (lflag) {
-+			host  = NULL;
-+			uport = argv;
-+		}
-+	} else if (argc >= 2) {
-+		if (lflag && (pflag || sflag || argc > 2))
-+			usage(1); /* conflict */
- 		host = argv[0];
- 		uport = &argv[1];
- 	} else
- 		usage(1);
- 
-+	if (family == AF_UNIX) {
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		if (dccpflag)
-+			errx(1, "cannot use -Z and -U");
-+# endif
-+		if (uport && *uport)
-+			errx(1, "cannot use port with -U");
-+		if (!host)
-+			errx(1, "missing socket pathname");
-+	} else if (!uport || !*uport)
-+		errx(1, "missing port number");
-+
-+	if (lflag && zflag)
-+		errx(1, "cannot use -z and -l");
-+
- # if defined(TLS)
- 	if (usetls) {
- 		if (Cflag && unveil(Cflag, "r") == -1)
diff --git a/network/netcat-openbsd/patches/0014-misc-failures-and-features.patch b/network/netcat-openbsd/patches/0014-misc-failures-and-features.patch
deleted file mode 100644
index e3b7bea400..0000000000
--- a/network/netcat-openbsd/patches/0014-misc-failures-and-features.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 19:06:52 +0800
-Subject: misc failures and features
-
----
- Makefile |    3 ++-
- nc.1     |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
- netcat.c |   14 ++++++++++++--
- 3 files changed, 65 insertions(+), 3 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,8 @@
- PROG=	nc
- SRCS=	netcat.c atomicio.c socks.c
- 
--LIBS=  `pkg-config --libs libbsd` -lresolv
-+PKG_CONFIG ?= pkg-config
-+LIBS=  `$(PKG_CONFIG) --libs libbsd` -lresolv
- OBJS=  $(SRCS:.c=.o)
- CFLAGS=  -g -O2
- LDFLAGS=  -Wl,--no-add-needed
---- a/nc.1
-+++ b/nc.1
-@@ -365,6 +365,54 @@ and which side is being used as a
- The connection may be terminated using an
- .Dv EOF
- .Pq Sq ^D .
-+.Pp
-+There is no
-+.Fl c
-+or
-+.Fl e
-+option in this netcat, but you still can execute a command after connection
-+being established by redirecting file descriptors. Be cautious here because
-+opening a port and let anyone connected execute arbitrary command on your
-+site is DANGEROUS. If you really need to do this, here is an example:
-+.Pp
-+On
-+.Sq server
-+side:
-+.Pp
-+.Dl $ rm -f /tmp/f; mkfifo /tmp/f
-+.Dl $ cat /tmp/f | /bin/sh -i 2>&1 | nc -l 127.0.0.1 1234 > /tmp/f
-+.Pp
-+On
-+.Sq client
-+side:
-+.Pp
-+.Dl $ nc host.example.com 1234
-+.Dl $ (shell prompt from host.example.com)
-+.Pp
-+By doing this, you create a fifo at /tmp/f and make nc listen at port 1234
-+of address 127.0.0.1 on
-+.Sq server
-+side, when a
-+.Sq client
-+establishes a connection successfully to that port, /bin/sh gets executed
-+on
-+.Sq server
-+side and the shell prompt is given to
-+.Sq client
-+side.
-+.Pp
-+When connection is terminated,
-+.Nm
-+quits as well. Use
-+.Fl k
-+if you want it keep listening, but if the command quits this option won't
-+restart it or keep
-+.Nm
-+running. Also don't forget to remove the file descriptor once you don't need
-+it anymore:
-+.Pp
-+.Dl $ rm -f /tmp/f
-+.Pp
- .Sh DATA TRANSFER
- The example in the previous section can be expanded to build a
- basic data transfer model.
-@@ -517,6 +565,9 @@ Original implementation by
- .br
- Rewritten with IPv6 support by
- .An Eric Jackson Aq Mt ericj@monkey.org .
-+.br
-+Modified for Debian port by Aron Xu
-+.Aq aron@debian.org .
- .Sh CAVEATS
- UDP port scans using the
- .Fl uz
---- a/netcat.c
-+++ b/netcat.c
-@@ -98,6 +98,7 @@
- #include <netdb.h>
- #include <poll.h>
- #include <signal.h>
-+#include <stddef.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -246,7 +247,10 @@ main(int argc, char *argv[])
- 	struct addrinfo hints;
- 	struct servent *sv;
- 	socklen_t len;
--	struct sockaddr_storage cliaddr;
-+	union {
-+		struct sockaddr_storage storage;
-+		struct sockaddr_un forunix;
-+	} cliaddr;
- 	char *proxy = NULL, *proxyport = NULL;
- 	const char *errstr;
- 	struct addrinfo proxyhints;
-@@ -948,6 +952,8 @@ unix_bind(char *path, int flags)
- 	    0)) == -1)
- 		return -1;
- 
-+	unlink(path);
-+
- 	memset(&s_un, 0, sizeof(struct sockaddr_un));
- 	s_un.sun_family = AF_UNIX;
- 
-@@ -1073,8 +1079,10 @@ unix_connect(char *path)
- 		if ((s = unix_bind(unix_dg_tmp_socket, SOCK_CLOEXEC)) == -1)
- 			return -1;
- 	} else {
--		if ((s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) == -1)
-+		if ((s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) == -1) {
-+			errx(1, "create unix socket failed");
- 			return -1;
-+		}
- 	}
- 
- 	memset(&s_un, 0, sizeof(struct sockaddr_un));
-@@ -1084,10 +1092,12 @@ unix_connect(char *path)
- 	    sizeof(s_un.sun_path)) {
- 		close(s);
- 		errno = ENAMETOOLONG;
-+		warn("unix connect abandoned");
- 		return -1;
- 	}
- 	if (connect(s, (struct sockaddr *)&s_un, sizeof(s_un)) == -1) {
- 		save_errno = errno;
-+		warn("unix connect failed");
- 		close(s);
- 		errno = save_errno;
- 		return -1;
diff --git a/network/netsniff-ng/netsniff-ng.SlackBuild b/network/netsniff-ng/netsniff-ng.SlackBuild
index 8905eb803d..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-2018 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.6}
+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 89247067ae..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.6"
+VERSION="0.6.8"
 HOMEPAGE="http://netsniff-ng.org"
-DOWNLOAD="http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-0.6.6.tar.xz"
-MD5SUM="513f85b6bf93d90c6c616cda4967181b"
+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/doinst.sh b/network/newsboat/doinst.sh
new file mode 100644
index 0000000000..4110f5514d
--- /dev/null
+++ b/network/newsboat/doinst.sh
@@ -0,0 +1,5 @@
+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/newsboat/newsboat.SlackBuild b/network/newsboat/newsboat.SlackBuild
index 9ab0f9e02f..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 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.18}
+VERSION=${VERSION:-2.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -120,7 +120,7 @@ mkdir vendor
       sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -158,6 +158,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/newsboat/newsboat.info b/network/newsboat/newsboat.info
index ed32732276..5898ff4878 100644
--- a/network/newsboat/newsboat.info
+++ b/network/newsboat/newsboat.info
@@ -1,214 +1,216 @@
 PRGNAM="newsboat"
-VERSION="2.18"
+VERSION="2.23"
 HOMEPAGE="https://www.newsboat.org/"
-DOWNLOAD="https://newsboat.org/releases/2.18/newsboat-2.18.tar.xz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.6.9.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/autocfg/autocfg-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace-sys/backtrace-sys-0.1.28.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-set/bit-set-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-vec/bit-vec-0.5.1.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/cc/cc-1.0.29.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.6.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.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/curl-sys/curl-sys-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-1.0.4.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 \
-          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/gettext-rs/gettext-rs-0.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-sys/gettext-sys-0.19.8.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/kernel32-sys/kernel32-sys-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.48.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/locale_config/locale_config-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.1.5.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.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.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/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/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.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.1.3.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/nodrop/nodrop-0.1.13.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.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/once_cell/once_cell-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.46.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.4.0.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/proc-macro2/proc-macro2-0.4.27.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proptest/proptest-0.7.2.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-0.6.11.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/rand-0.5.6.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_chacha/rand_chacha-0.1.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.0.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_isaac/rand_isaac-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_jitter/rand_jitter-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_os/rand_os-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.1.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/rdrand/rdrand-0.4.0.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_users/redox_users-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.4.2.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.5.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.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.13.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/rusty-fork/rusty-fork-0.2.1.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/scopeguard/scopeguard-0.3.3.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/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/smallvec/smallvec-0.6.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.26.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/tempfile/tempfile-3.0.6.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.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.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.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.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/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/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-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.3.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/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.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-segmentation/unicode-segmentation-1.2.1.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/url/url-1.7.2.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/version_check/version_check-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.1.5.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.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/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.2.8.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/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="fc09af09fbdd7ce433a2a5d1a035e7ad \
-        d26d000426208c255a95368923467618 \
-        e1efb9a37395a38bd80ccfc911d4a6e8 \
-        46a048c0b8b765bcbdc131e166410510 \
-        59f345457ff5690527e5a9a863856a75 \
-        b94bcb41f342404852b7d763700fb6fe \
-        d38ff4b8e1d15e7488420ea9c428e8a2 \
-        a5c5256b590620d2344a2e5dc5a79af9 \
-        e9c5e38e5371071eb97de27e204dd3d6 \
-        e5767560aad375059c975285c07022c0 \
-        027635e453eccbfd0a2b02a440e334a6 \
-        85ee799e11dc75b822045f440f00e62a \
-        daa64e5a0e1b6d710877be51f27ccd3c \
-        ed2b1c5fd000f926c2aedb0c3bd1d199 \
-        135f6d6306e50606f0475ada50c33ce2 \
-        1c8b50f8528dd37df7d984e0e4b61bd5 \
-        701334c674b3fc3ace74045e3a2fae50 \
-        25bf715a8e88aeca16633c33f9b6d932 \
-        701d24caea00efef86966950d11900da \
-        6d780ab18da07be9ed423e7edfbcfd7e \
-        e8e663e88ee02ec47cfb984382cb62ae \
-        b0fd8ad50f5e64c71f0daf8af79ca952 \
-        27260b46db6b9ac40318143d70a80ba3 \
-        e5eadbf9c92867ed30b7d9e772e46f10 \
-        118f516871262287864157772d51ca12 \
-        89cabfcb37602a7b200b1a9cd660ee2e \
-        9d033cc2daa6924420a4a89e6705773f \
-        527a21498a2024a22701808bfc3eba54 \
-        330c760718d1130f318457fe4725b0dd \
-        7091a59caa55c94b0b088bf1814b85fd \
-        9b6701c1f22494454d9c6c87187c6b3a \
-        25c6e48abb18260fb7aedcb340cdd8d0 \
-        ac6a4d0d3c5cd5718800d285c2da55c5 \
+MD5SUM="fe5761463f29b71da688ca8a80c77ecf \
+        e1373077f219ed66a14857a718ed79e1 \
+        c9d0c8f38c6686e47c29fe9b409c25c2 \
+        93850f8bf39e61dcf80ce49b5e0943d7 \
+        c83252f91435a921e7e4434956010344 \
+        c6443ec8d007c729ba5482008d0c864d \
+        c0a1f5967a1581beff2565ffeee3fb7b \
+        8f8acc3c1caff2043085a0cc28a92757 \
+        45a867175c81501378699f80724393c0 \
+        6799c26a7eacaf8e58d3e45c6c5add89 \
+        f353cf73f811990f1529b637065de949 \
+        ea2d23ceb9f98853a7dffc6c02884464 \
+        e502e6c6b0dca9c1ae2d99e92b26f645 \
+        b3ebb5d4433417e998d982d46334a6f4 \
+        882dbbc613a93f64c3709b0a2bd0d6dc \
+        74634128440dbc3766bda76fdf0aaa05 \
+        1581b390d17f6e73a43ffc8a7b009e57 \
+        bc79e0eb364df515a33755ac9a581cfd \
+        7f5a0fb65f15b9a7f4b92ead2005437f \
+        965d3dda0ed58748e6f0a615ebb70840 \
+        4444b73f52b93818d14d68b971b1b1a3 \
+        938ac35135c5cc2c735262d8698a0498 \
+        c71702f6505787cd3b70c77a9cd26d93 \
+        7a992127d3bc3b08965068e628ebd36c \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        e3225eb6ecda0f2c3d1d09c8450f7ef8 \
+        27091b1ee345635aa18fb8bfc51f5b1d \
+        704babd757a22f163230a36fa5474890 \
+        3002f779af7b5eeab4161354dc7c79d8 \
+        c7050135ef75f62fcbd5313898ec7884 \
+        69bddbd44804ae43b7f81cb0403b500c \
+        8dc2849c66f31ecaec6a5ff699deb070 \
+        54ac4c56d9ec2800b8428020f24be67c \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        a5ca2def8bdf1deda1d2151bfb0f9800 \
+        1775405476046e602fdf8eb892cca057 \
+        e5768043e447a7423f030c1394440502 \
+        7953eda62592968ef716363c206495ba \
+        6fa7c4b0da26b511570845e41527bc8f \
+        7c81e7a61ec172a229d6fdbc553e883d \
         7916dcd738a8fa6a2798754c20d6e146 \
-        853896d75f0103a9c61f933cb8f1f40a \
+        fa3630e5867493e09296155763e4f4a0 \
+        c291ac2f4465c030c058a7c1bc595783 \
         5a9b94ba54ea1f52f2a496ba982e3282 \
-        8a39d8bd95f15af0840d2049f0e78a37 \
-        92bcd45a654d9e24c86f3465c6387c47 \
-        4092ed5c67c6ff1c6a7bcf463bc40a53 \
-        cbdebc326641fcab42bc92a113548740 \
-        758bb6105f13a925fad3d384af0ecc78 \
-        254017876c89feab72dd61d37a617653 \
-        e0493a4c121cded246f611c435dce2b7 \
-        f59fef46e6ebc8bfcca5bd8c05e23089 \
-        8a5fc6ba84f3ac8a7e43ecb99322866c \
-        87a9d36f5ebe5eae0c3e8d69d58752e1 \
-        4692e7114db87556e0edd3750cdef9ac \
-        44a4077593da78251dbe3152de73ccc5 \
-        4563373184ff931ec276dc1a659d52d2 \
-        ed68fecc548f1bd3e6415764c21af10c \
-        9e99a37f8c37bb953732ef46ac2b12a1 \
-        936be8fb046f02bd6a336ffbbf02b3b3 \
-        793627c8c18012ad77cb3e81fa4c2195 \
-        3ab5a79607a4d260bf61cd99dc82ab05 \
-        8cab41822d03dfa674870315308fa392 \
-        7058895bdca83bbda052d66b087f902e \
-        28b1e6d15e1ba8cf3a2e953ce7fcd3de \
-        74b15f1928431937f14ed91fdc12b542 \
-        43ad2d3886f3b95564b5d46fb7e3ccec \
-        5ccf992fee1f4744f9d1aa9d45d5b5db \
-        3f5b37c228efbd014e7bb617f2abedf1 \
-        7826deb76941fc36c2391951bd65ba47 \
-        c8d655d206cbe48b84a22544d6fc6d15 \
-        3056ab938614a0a76bd60dff8bb3b519 \
-        f91e69d935946bdc258a0ed22dceeaad \
-        54a8acc2e193a77476d7517963cbfdc0 \
-        de7bb5037caf6403d859c56b09fedcd2 \
-        90a40d2cf8b2d7c3d21a80f3af7693ad \
-        d3652677415c9ed4cae3b602316ff8bd \
-        9f099c64e6db617887ba150c117baf13 \
-        09422dcb1cd6e3c30598296d2d3d4798 \
-        cc9ba070db558012ede5e80022020e1b \
-        4d101ab24d14c54937c5f45ece8fad5f \
-        8f316480245db44925b8f70ab3e18559 \
-        b492e0a70603c3903a44ec5cabd3ba21 \
-        500e5bb7d9b5a8882e2e961012391a58 \
-        82d23d1b89a2d4ccb381ba72f0b3f0db \
-        8b4d8c7b6e3a060d365bc1ad650929fa \
-        64111c20b69aa1532fb66b70c4660b55 \
-        3ac52ba7f73e0cd8e00f60d16ff45514 \
-        5b9db74833b5ff325b1b9aa7fe96d5f8 \
-        d155c08de6c18bd55639ffed629894b9 \
-        df95befa0dfecdf80b51ad30deb4d320 \
+        31afb592628dd2c4da5efbc649fd8066 \
+        a8ec1126ef06244ac1e3773981a005f1 \
+        c0e036fd990d0c9cae11b5876a5cb572 \
+        aecd889de42c8168e1bc97a6f2720d8f \
+        b4dcac855af5df71f3383d86c4a96b78 \
+        fd9aa273ad560dedd00ddcf3dbe808ce \
+        edb0836579d7124116fbb2d8eabb3e5b \
+        921832a39e8a8aac72dfd9ed02227a87 \
+        f490982aceabdbd515348f63e638a782 \
+        448bc61aee07661464d98da7660e9a1d \
+        a4ff7abd41c57dfd24bbd4b50edb848f \
+        0736e4f76f4f8f0a29563b0608ca3974 \
+        400f57adb8d5ab059a2df92c7e3b0268 \
+        3181dca31efe33cbed29a45d0ec67848 \
+        ddd3199850a8a6a8db642923ed603a99 \
+        b807d4f7a87f5fbdcc4ef008cca53a4c \
+        66d1cb32dce999907409f636f004b884 \
+        e878596904877d1d7933d8f89a63dd49 \
+        0a80ed36a125ac3cdfa09f8707055873 \
+        bacea6e63b5b0b7a55a8881b47d80f3a \
+        a0f55fda89c0f97784edb18f4c253a49 \
+        b5b168b1af99cbb8c0f5556ffe56f1e5 \
+        b269356e8646f3184a0e8d52a58cee69 \
+        69e9436d5c9889a6fdf199dfc5c3d3fe \
+        f81b88d1f8f9d0bc18849ad58b2f1b66 \
+        381ebb79fffdf657a666ee577323039e \
+        13373372c7ce2e894925d846625a7987 \
+        40d1ab8fd9b6e5e376b0839a9132abe1 \
+        0538d1da369f3e3f0412aa4d735c1b61 \
+        b5926b0ac31b2bca1675c6eb1f936d0b \
+        13268e6ab4023043e6dd8e993ce8b88a \
+        a69721c73263cd2040e1a5f120b03a6f \
+        8d2ed9bfda95009d8f61b5f575e91c13 \
+        b13390ad50aa277e39e4d46f7ed3eb14 \
+        c9defe80406280bcfce4ecf31c0200b3 \
+        83743b5ff7a15361f45fe0a2eb0b1575 \
+        54346edfb0ec58936fa2af45908969ac \
+        6e328718765f2352dd34f10215488fbb \
+        ebdff467249aa3dca005a441dc824236 \
         a8de006fe0c7e373c560dd51599287a8 \
-        baaa166f66e90e94b76b7418afd5df90 \
-        3d311d2cedf2d3d7b11b32baf470b178 \
-        d34a9f507f3ecf7d93c07deb74f1cd7c \
+        a5dd75e77c7324f5c1d2d372c990d0a7 \
+        c6c50e4feea5f4cc4e1fb3c7e88606a5 \
+        097e3652f1adda8e7e425a7f5c288e27 \
+        7bfcad253aff26bc26c5e3521f3ba891 \
         f403bbb812ce1a2d9270d9159cf9e8d3 \
-        60eec117e8efaa29b898e43319da2b05 \
-        8861b627334c6ecbb355741162ea6022 \
-        d7c493ca4f84a7d50b53646421a37487 \
-        5aaf04f9a94a6450e3e4963ddd62b92d \
-        32f0ced8a8881d2c0572b879bf15b91e \
-        9c27232c12abb96c68e10e21f2012639 \
-        e75c0721667b6bc86472ecf7b286d9fc \
-        f48add3d6234e8b9829fa5364509f425 \
-        2c263ce21ea756b9a2cb626a36750efb \
-        c900e7dbce808ff8ced375077b17a163 \
+        62fa1c42f9b351d9c411a4c86eacb707 \
+        4272c279b06b88f8b0ffce7109348e27 \
+        a51c43692084979295641a7ffba4b297 \
+        871061b3dab2a322a13effd0a800b05f \
+        e17e2583e10c6947982de78aeae42a5c \
+        8b01b016a9b6deebc1b43f296057efb5 \
+        6708629acf3d2ecb7404e43255d2df85 \
+        a312b55a428f827a91097d1d8497b02b \
+        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
         db96b50050277bf05a3c68534bbb9586 \
+        b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
-        b44489eb4799c4fabac3fceb48de54f7 \
-        40909511b3d0e2dba891f438715808d0 \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        c533b4ecdd56b5830c4cc79a6cf6f9b4 \
         1628d3f26e3f952d8c43973ade1f2dad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="stfl"
+REQUIRES="stfl rubygem-asciidoctor"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
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 9313aebb91..4c00a14561 100644
--- a/network/nicotine+/nicotine+.SlackBuild
+++ b/network/nicotine+/nicotine+.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=nicotine+
 SRCNAM=nicotine-plus
-VERSION=${VERSION:-1.4.1}
+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
 
-python setup.py install --root=$PKG
+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 5485d503bb..ee5df51c22 100644
--- a/network/nicotine+/nicotine+.info
+++ b/network/nicotine+/nicotine+.info
@@ -1,10 +1,10 @@
 PRGNAM="nicotine+"
-VERSION="1.4.1"
-HOMEPAGE="http://nicotine-plus.org/"
-DOWNLOAD="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1/nicotine-plus-1.4.1.tar.gz"
-MD5SUM="43a6a38ba276dc2a13dce7fd66bdb467"
+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"
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
+REQUIRES="pygobject3-python3"
+MAINTAINER="Sasha Abbott"
+EMAIL="sashaa@disroot.org"
diff --git a/network/nicotine+/slack-desc b/network/nicotine+/slack-desc
index d81df9e3d4..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 PyGTK-2 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/README b/network/nordvpn/README
index 298c79fd38..8f0e00328c 100644
--- a/network/nordvpn/README
+++ b/network/nordvpn/README
@@ -1,5 +1,6 @@
-The NordVPN app for Linux protects your sensitive data with military-grade
-encryption, so that whatever you do online stays secure and private.
+The NordVPN app for Linux protects your sensitive data with
+military-grade encryption, so that whatever you do online stays secure
+and private.
 More than 5000 servers worldwide. No logs of your online activity.
 Secure up to 6 devices with a single account.
 Access online content securely, with no restrictions.
@@ -15,9 +16,9 @@ The following can be used to start/stop NordVPN automatically:
     /etc/rc.d/rc.nordvpn stop
   fi
 
-NOTE: NordVPN has implemented NordLynx (WireGuard protocol) into the app.
-It is still under heavy development. However if you want to try it, you need to install
-these 2 optional dependencies:
+NOTE: NordVPN has implemented NordLynx (WireGuard protocol) into the
+app.  It is still under heavy development. However if you want to try
+it, you need to install these 2 optional dependencies:
 
 wireguard-linux-compat
 wireguard-tools
diff --git a/network/nordvpn/nordvpn.SlackBuild b/network/nordvpn/nordvpn.SlackBuild
index 719ad53827..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.6.1}
+VERSION=${VERSION:-3.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/nordvpn/nordvpn.info b/network/nordvpn/nordvpn.info
index 5edda7c612..1943e15c83 100644
--- a/network/nordvpn/nordvpn.info
+++ b/network/nordvpn/nordvpn.info
@@ -1,10 +1,10 @@
 PRGNAM="nordvpn"
-VERSION="3.6.1"
+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.6.1-1.x86_64.rpm"
-MD5SUM_x86_64="9436104aa4bdf4f0d43e736da372fd83"
+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/README b/network/onedrive/README
index b2925c8e35..4d1699de4e 100644
--- a/network/onedrive/README
+++ b/network/onedrive/README
@@ -1,18 +1,19 @@
-A complete tool to interact with OneDrive on Linux. 
+A complete tool to interact with OneDrive on Linux.
 Built following the UNIX philosophy
 
-What's missing: while local changes are uploaded right away, remote changes are delayed.
+What's missing: while local changes are uploaded right away, remote
+changes are delayed.
 
 After installing the package:
-1) For configuration and Usage, see 
+1) For configuration and Usage, see
 /usr/doc/onedrive-$VERSION/docs/USAGE.md,
 /usr/doc/onedrive-$VERSION/config and
 man onedrive
-2) For Docker support, see 
+2) For Docker support, see
 /usr/doc/onedrive-$VERSION/docs/Docker.md
-3) For Sharepoint group drive in Office 365 business or education, see 
+3) For Sharepoint group drive in Office 365 business or education, see
 /usr/doc/onedrive-$VERSION/docs/Office365.md
-4) If you encounter any bugs you can report them here on Github: 
+4) If you encounter any bugs you can report them here on Github:
 https://github.com/abraunegg/onedrive
-(see /usr/doc/onedrive-$VERSION/README.md for more details how to do this)
-
+(see /usr/doc/onedrive-$VERSION/README.md for more details how to do
+this)
diff --git a/network/onedrive/onedrive.SlackBuild b/network/onedrive/onedrive.SlackBuild
index 6893d0d87d..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.0}
+VERSION=${VERSION:-2.4.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/onedrive/onedrive.info b/network/onedrive/onedrive.info
index adb929240f..06af605f99 100644
--- a/network/onedrive/onedrive.info
+++ b/network/onedrive/onedrive.info
@@ -1,8 +1,8 @@
 PRGNAM="onedrive"
-VERSION="2.4.0"
+VERSION="2.4.7"
 HOMEPAGE="https://github.com/abraunegg/onedrive/releases"
-DOWNLOAD="https://github.com/abraunegg/onedrive/archive/v2.4.0/onedrive-2.4.0.tar.gz"
-MD5SUM="5f79426743be5828163ff4fc2e30e6e2"
+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/onionshare/onionshare.SlackBuild b/network/onionshare/onionshare.SlackBuild
index 75caaab646..9ad5bffabf 100644
--- a/network/onionshare/onionshare.SlackBuild
+++ b/network/onionshare/onionshare.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=onionshare
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/onionshare/onionshare.info b/network/onionshare/onionshare.info
index f54d6f8277..6218a2c976 100644
--- a/network/onionshare/onionshare.info
+++ b/network/onionshare/onionshare.info
@@ -1,10 +1,10 @@
 PRGNAM="onionshare"
-VERSION="2.1"
+VERSION="2.2"
 HOMEPAGE="https://onionshare.org/"
-DOWNLOAD="https://github.com/micahflee/onionshare/archive/v2.1/onionshare-2.1.tar.gz"
-MD5SUM="f991eacdbae6f144e307409b47740f34"
+DOWNLOAD="https://github.com/micahflee/onionshare/archive/v2.2/onionshare-2.2.tar.gz"
+MD5SUM="3ff52742b7e6809b9646605e10b25562"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="tor python3-Flask stem python3-pycrypto PySocks python3-PyQt5 pysha3"
+REQUIRES="tor stem python3-Flask python3-Flask-httpauth python3-pycrypto PySocks python3-PyQt5 pysha3"
 MAINTAINER="MDrights"
 EMAIL="psychi2009@gmail.com"
diff --git a/network/openconnect/openconnect.SlackBuild b/network/openconnect/openconnect.SlackBuild
index 423cf89792..505fb5f503 100644
--- a/network/openconnect/openconnect.SlackBuild
+++ b/network/openconnect/openconnect.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openconnect
-VERSION=${VERSION:-7.08}
+VERSION=${VERSION:-8.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/openconnect/openconnect.info b/network/openconnect/openconnect.info
index d2a600cc2b..474f8e9d00 100644
--- a/network/openconnect/openconnect.info
+++ b/network/openconnect/openconnect.info
@@ -1,10 +1,10 @@
 PRGNAM="openconnect"
-VERSION="7.08"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-DOWNLOAD="ftp://ftp.infradead.org/pub/openconnect/openconnect-7.08.tar.gz"
-MD5SUM="ca2ca1f61b8515879b481dcf6ed4366b"
+VERSION="8.10"
+HOMEPAGE="https://www.infradead.org/openconnect/"
+DOWNLOAD="ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz"
+MD5SUM="d772c3c68afae12252a5377a99352b97"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
+MAINTAINER="Marek Wodzinski"
+EMAIL="majek@w7i.pl"
diff --git a/network/openconnect/slack-desc b/network/openconnect/slack-desc
index addc710418..03c8767563 100644
--- a/network/openconnect/slack-desc
+++ b/network/openconnect/slack-desc
@@ -12,8 +12,8 @@ openconnect: OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is
 openconnect: supported by the ASA5500 Series, by IOS 12.4(9)T or later on Cisco
 openconnect: SR500, 870, 880, 1800, 2800, 3800, 7200 Series, and Cisco 7301
 openconnect: Routers, and probably others.
+openconnect: It supports also Juniper and GlobalProtect VPN protocols and
+openconnect: have partial support for Pulse Connect Secure.
 openconnect:
 openconnect: This is released under the GNU Lesser Public License, version 2.1.
 openconnect:
-openconnect:
-openconnect:
diff --git a/network/openfortivpn/openfortivpn.SlackBuild b/network/openfortivpn/openfortivpn.SlackBuild
index b0dd518e5e..b4b3eb02bb 100644
--- a/network/openfortivpn/openfortivpn.SlackBuild
+++ b/network/openfortivpn/openfortivpn.SlackBuild
@@ -21,9 +21,12 @@
 #  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.
+#
+# Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
+#
 
 PRGNAM=openfortivpn
-VERSION=${VERSION:-1.1.4}
+VERSION=${VERSION:-1.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/openfortivpn/openfortivpn.info b/network/openfortivpn/openfortivpn.info
index 3bae8f084d..f5af3f59fc 100644
--- a/network/openfortivpn/openfortivpn.info
+++ b/network/openfortivpn/openfortivpn.info
@@ -1,10 +1,10 @@
 PRGNAM="openfortivpn"
-VERSION="1.1.4"
+VERSION="1.16.0"
 HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.1.4/openfortivpn-1.1.4.zip"
-MD5SUM="0c091f3306cadcd870b92925d241c011"
+DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.16.0/openfortivpn-1.16.0.zip"
+MD5SUM="49da457d748059d455dec4c6dbff94fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Antonio Taverna"
-EMAIL="antonio.tvr@gmail.com"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/network/openresolv/openresolv.SlackBuild b/network/openresolv/openresolv.SlackBuild
index dc917e8225..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.10.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 d117aee0bb..3a5cdc223e 100644
--- a/network/openresolv/openresolv.info
+++ b/network/openresolv/openresolv.info
@@ -1,8 +1,8 @@
 PRGNAM="openresolv"
-VERSION="3.10.0"
+VERSION="3.12.0"
 HOMEPAGE="https://roy.marples.name/projects/openresolv"
-DOWNLOAD="https://roy.marples.name/downloads/openresolv/openresolv-3.10.0.tar.xz"
-MD5SUM="290bee6d79e65aeb90187bb5d8da7f35"
+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/opensmtpd-extras/opensmtpd-extras.SlackBuild b/network/opensmtpd-extras/opensmtpd-extras.SlackBuild
index 5bd451b169..abea59c70e 100644
--- a/network/opensmtpd-extras/opensmtpd-extras.SlackBuild
+++ b/network/opensmtpd-extras/opensmtpd-extras.SlackBuild
@@ -20,7 +20,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opensmtpd-extras
-VERSION=${VERSION:-6.4.0}
+SRCNAM=OpenSMTPD-extras
+VERSION=${VERSION:-6.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -96,9 +97,9 @@ 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 . \
diff --git a/network/opensmtpd-extras/opensmtpd-extras.info b/network/opensmtpd-extras/opensmtpd-extras.info
index 67e0624fce..d4461b1b3f 100644
--- a/network/opensmtpd-extras/opensmtpd-extras.info
+++ b/network/opensmtpd-extras/opensmtpd-extras.info
@@ -1,8 +1,8 @@
 PRGNAM="opensmtpd-extras"
-VERSION="6.4.0"
+VERSION="6.7.1"
 HOMEPAGE="https://www.opensmtpd.org/"
-DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-extras-6.4.0.tar.gz"
-MD5SUM="9fe974c25af3234cee59c2a9864043da"
+DOWNLOAD="https://github.com/OpenSMTPD/OpenSMTPD-extras/archive/6.7.1/OpenSMTPD-extras-6.7.1.tar.gz"
+MD5SUM="342d3f9eebaf4171df6378642136f075"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="opensmtpd"
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 a9e248e85a..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-69/#b3638.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 79b94b9ce0..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:-69.0.3638.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 e8e6b31d92..1d56dcadf6 100644
--- a/network/opera-developer/opera-developer.info
+++ b/network/opera-developer/opera-developer.info
@@ -1,10 +1,10 @@
 PRGNAM="opera-developer"
-VERSION="69.0.3638.0"
+VERSION="76.0.3995.0"
 HOMEPAGE="https://www.opera.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download3.operacdn.com/pub/opera-developer/69.0.3638.0/linux/opera-developer_69.0.3638.0_amd64.deb"
-MD5SUM_x86_64="ebce0e5ae3b83e6871c2b03eb524ff8d"
+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 c08a25bb48..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-67/#b3575.115
+Changelog: https://blogs.opera.com/desktop/changelog-for-75/#b3969.93
diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild
index d3fea6bab7..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:-67.0.3575.115}
+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 502af57783..e75e83675f 100644
--- a/network/opera/opera.info
+++ b/network/opera/opera.info
@@ -1,10 +1,10 @@
 PRGNAM="opera"
-VERSION="67.0.3575.115"
+VERSION="75.0.3969.93"
 HOMEPAGE="https://www.opera.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download3.operacdn.com/pub/opera/desktop/67.0.3575.115/linux/opera-stable_67.0.3575.115_amd64.deb"
-MD5SUM_x86_64="e2ae63e509e1ffb0433d91bef1a55122"
+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/owncloud-client/owncloud-client.SlackBuild b/network/owncloud-client/owncloud-client.SlackBuild
index 0ee0dd35aa..b5ab05a98d 100644
--- a/network/owncloud-client/owncloud-client.SlackBuild
+++ b/network/owncloud-client/owncloud-client.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for owncloud-client
 
 # Copyright 2013-2018 Christopher Walker Kempner, TX
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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=owncloud-client
-VERSION=${VERSION:-2.4.2}
+VERSION=${VERSION:-2.5.4.11654}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/owncloud-client/owncloud-client.info b/network/owncloud-client/owncloud-client.info
index 118f044e16..5b2da1d1b6 100644
--- a/network/owncloud-client/owncloud-client.info
+++ b/network/owncloud-client/owncloud-client.info
@@ -1,10 +1,10 @@
 PRGNAM="owncloud-client"
-VERSION="2.4.2"
+VERSION="2.5.4.11654"
 HOMEPAGE="https://owncloud.org/"
-DOWNLOAD="https://download.owncloud.com/desktop/stable/owncloudclient-2.4.2.tar.xz"
-MD5SUM="0f1d03650888864ffb045162ef9de49d"
+DOWNLOAD="https://download.owncloud.com/desktop/stable/owncloudclient-2.5.4.11654.tar.xz"
+MD5SUM="cbc65677623df31956a4c4082a2c68a7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5-webkit qtkeychain"
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/network/pCloudDrive/pCloudDrive.SlackBuild b/network/pCloudDrive/pCloudDrive.SlackBuild
index f237ca416d..ed286a3e18 100644
--- a/network/pCloudDrive/pCloudDrive.SlackBuild
+++ b/network/pCloudDrive/pCloudDrive.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pCloudDrive
 
-# Copyright 2019 Igor Alexandrov <igora.vault@gmail.com>
+# Copyright 2020 Igor Alexandrov <igor.alexandrov@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,19 +22,28 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modifid by slackbuilds.org
+
 PRGNAM=pCloudDrive
-VERSION=${VERSION:-1.7.2}
+VERSION=${VERSION:-1.8.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
+  ARCH=$(uname -m)
 fi
 
+case "$ARCH" in
+  i?86) break ;;
+  x86_64) break ;;
+  *)
+    echo "$ARCH is not supported for $PRGNAM-$VERSION"
+    exit 1
+    ;;
+esac
+
+set -e
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -42,13 +51,6 @@ OUTPUT=${OUTPUT:-/tmp}
 
 APPIMGNAM=pcloud
 
-if [ "$ARCH" != "x86_64" -a "$ARCH" != "i586" ]; then
-  echo "$ARCH is not supported for $PRGNAM-$VERSION"
-  exit 1
-fi
-
-set -eu
-
 rm -rf $PKG
 mkdir -p $TMP $OUTPUT $PKG/{install,opt,usr/{bin,doc/$PRGNAM-$VERSION}}
 cd $PKG/opt
@@ -57,7 +59,7 @@ $CWD/$APPIMGNAM --appimage-extract
 mv squashfs-root $PRGNAM
 cd $PKG
 mv $PKG/opt/$PRGNAM/usr/share $PKG/usr
-rm -rf $PKG/opt/$PRGNAM/{usr,AppRun,pcloud.png,pcloud.desktop}
+rm -rf $PKG/opt/$PRGNAM/{usr,AppRun,pcloud.png,pcloud.desktop,resources/app/.vscode}
 install -D -m 644 -t $PKG/usr/share/applications $CWD/pclouddrive.desktop
 
 chown -R root:root .
diff --git a/network/pCloudDrive/pCloudDrive.info b/network/pCloudDrive/pCloudDrive.info
index e785271fdc..9fcaac6eaa 100644
--- a/network/pCloudDrive/pCloudDrive.info
+++ b/network/pCloudDrive/pCloudDrive.info
@@ -1,10 +1,10 @@
 PRGNAM="pCloudDrive"
-VERSION="1.7.2"
+VERSION="1.8.2"
 HOMEPAGE="https://www.pcloud.com"
 DOWNLOAD="https://www.pcloud.com/how-to-install-pcloud-drive-linux.html?download=electron-32"
-MD5SUM="c5dc7d813568926da57b07b948824325"
+MD5SUM="f901d19762baa9f3c5fce9ed6c2b9fed"
 DOWNLOAD_x86_64="https://www.pcloud.com/how-to-install-pcloud-drive-linux.html?download=electron-64"
-MD5SUM_x86_64="9c808b309033b9fff8aee1703f4e2883"
+MD5SUM_x86_64="62560154e26d5b848e7bc3e5c19cc649"
 REQUIRES=""
 MAINTAINER="Igor Alexandrov"
-EMAIL="igora.vault@gmail.com"
+EMAIL="igor.alexandrov@outlook.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 0fd9cb29ac..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.8.1}
+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 c8fcfecb3e..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.8.4"
+VERSION="29.1.1"
 HOMEPAGE="https://www.palemoon.org/"
-DOWNLOAD="http://linux.palemoon.org/datastore/release/palemoon-28.8.4.linux-i686.tar.xz"
-MD5SUM="e3514d27bee59d05c6e8e4c74530e606"
-DOWNLOAD_x86_64="http://linux.palemoon.org/datastore/release/palemoon-28.8.4.linux-x86_64.tar.xz"
-MD5SUM_x86_64="8d683aedc7634dace658197b650993fd"
+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 e6981a7919..61cdab4bc1 100644
--- a/network/palemoon/README
+++ b/network/palemoon/README
@@ -11,46 +11,48 @@ This SlackBuild attempts to compile, build and package Pale Moon,
 Slackware style, in a manner that conforms to official Pale Moon Linux
 releases; while, at the same time, providing useful and easy ways to
 deviate if desired. This SlackBuild may conflict with the alternative
-SlackBuild known, here at SBo, as "palemoon-bin"; which repackages binaries
-offically released by the Pale Moon devs.
+SlackBuild known, here at SBo, as "palemoon-bin"; which repackages
+binaries offically released by the Pale Moon devs.
 
-----------------------------------------------------------------------------
+------------------------------------------------------------------------
 
-See http://docs.slackware.com/howtos:software:palemoon for additional tips and
-help resources.
+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.
+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.
+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.
 
 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 (eventually
-refer to the Pale Moon developers for help).
+If your processor doesn't support sse2 instructions or you get
+segfaults, try looking in the SlackBuild for the OPTIMIZE build option
+(eventually refer to the Pale Moon developers for help).
 
-jack is an optional dependency and, if detected, automatically built. If
-this is undesirable you can blacklist jack, by passing the variable:
+jack-audio-connection-kit is an optional dependency and, if detected,
+automatically built. If this is undesirable you can blacklist jack, by
+passing the variable:
 
   BLACKLIST_JACK=yes ./palemoon.SlackBuild
 
 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 b9240ffc27..321f5f88d0 100644
--- a/network/palemoon/palemoon.SlackBuild
+++ b/network/palemoon/palemoon.SlackBuild
@@ -26,8 +26,10 @@
 # Special thanks to Ponce
 
 PRGNAM=palemoon
-VERSION=${VERSION:-28.8.4}
-SRCNAM=${SRCNAM:-UXP-PM${VERSION}_Release}
+VERSION=${VERSION:-29.1.1}
+SRCNAM1=${SRCNAM1:-Pale-Moon-${VERSION}_Release}
+SRCNAM2=${SRCNAM2:-pale-moon}
+SRCNAM3=${SRCNAM3:-UXP-RELBASE_20210330}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,9 +80,9 @@ fi
 # master trunck of the Pale Moon github repository.
 BRANDING=${BRANDING:---enable-official-branding}
 if [ "$BRANDING" = "NewMoon" ]; then
-	BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unofficial"
+	BRANDING="--disable-official-branding --with-branding=palemoon/branding/unofficial"
 elif [ "$BRANDING" = "unstable" ]; then
-	BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unstable"
+	BRANDING="--disable-official-branding --with-branding=palemoon/branding/unstable"
 fi
 
 rm -rf $PKG $TMP/gold $TMP/$OBJ
@@ -141,9 +143,10 @@ PATH=$TMP/autoconf-tmp/usr/bin:$PATH
 
 # Build Pale Moon
 cd $TMP
-rm -rf $SRCNAM
-tar -xvf $CWD/$SRCNAM.tar.gz
-cd $SRCNAM
+rm -rf $SRCNAM2
+tar -xvf $CWD/$SRCNAM1.tar.gz
+cd $SRCNAM2
+tar -xvf $CWD/$SRCNAM3.tar.gz -C platform --strip-components 1
 
 if [ "${ADNAUSEAM:-block}" = "unblock" ]; then
 	patch -p1 < $CWD/adNauseam-unblock.patch
@@ -165,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/$SRCNAM/.mozconfig"
+export MOZCONFIG="$TMP/$SRCNAM2/.mozconfig"
 export MOZILLA_OFFICIAL=1
 export MOZ_MAKE_FLAGS=$MAKEFLAGS
 export CFLAGS="$SLKCFLAGS"
@@ -217,7 +220,8 @@ echo "ac_add_options --disable-pulseaudio" >> .mozconfig; fi
 if pkg-config --exists jack && [ "${BLACKLIST_JACK:-no}" != "yes" ]; then
 echo "ac_add_options --enable-jack" >> .mozconfig; fi
 
-python2 mach build
+sed -i 's/.\/platform\/mach/"python2\ .\/platform\/mach"/g' mach
+./mach build
 
 ## Clean up; and package Pale Moon.
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
@@ -256,7 +260,7 @@ cat $CWD/palemoon.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  $TMP/$SRCNAM/LEGAL $TMP/$SRCNAM/LICENSE $TMP/$SRCNAM/README.md \
+  $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 6ba340b718..614b3b3b55 100644
--- a/network/palemoon/palemoon.info
+++ b/network/palemoon/palemoon.info
@@ -1,9 +1,11 @@
 PRGNAM="palemoon"
-VERSION="28.8.4"
+VERSION="29.1.1"
 HOMEPAGE="http://www.palemoon.org/"
-DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/PM28.8.4_Release/UXP-PM28.8.4_Release.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="ge6d59dab775da0e2d18294294459da14 \
+MD5SUM="f522cab929ec62382dc30391a590b039 \
+        535724b8fbb0d791cdf48f456969df9f \
         f2994d302cf736e7e71974edfa51da3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/persepolis/README b/network/persepolis/README
index c4e5d5c42f..c58911f78a 100644
--- a/network/persepolis/README
+++ b/network/persepolis/README
@@ -11,5 +11,3 @@ Features:
 * Scheduling downloads
 * Download queuing
 * Finding and downloading video from Youtube, Vimeo, DailyMotion, etc.
-
-Important: you will need to build all the dependencies with python3 support.
diff --git a/network/persepolis/persepolis.SlackBuild b/network/persepolis/persepolis.SlackBuild
index 815f7e217c..8d6e7fc440 100644
--- a/network/persepolis/persepolis.SlackBuild
+++ b/network/persepolis/persepolis.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=persepolis
-VERSION=${VERSION:-3.1.0}
+VERSION=${VERSION:-3.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/persepolis/persepolis.info b/network/persepolis/persepolis.info
index c5252f34dd..d4a9470284 100644
--- a/network/persepolis/persepolis.info
+++ b/network/persepolis/persepolis.info
@@ -1,10 +1,10 @@
 PRGNAM="persepolis"
-VERSION="3.1.0"
+VERSION="3.2.0"
 HOMEPAGE="https://persepolisdm.github.io"
-DOWNLOAD="https://github.com/persepolisdm/persepolis/archive/3.1.0/persepolis-3.1.0.tar.gz"
-MD5SUM="ade1aca47186df8a3521ac3d356c328d"
+DOWNLOAD="https://github.com/persepolisdm/persepolis/archive/3.2.0/persepolis-3.2.0.tar.gz"
+MD5SUM="9a3bf686da0385f78eadca457a9f43fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 python-requests setproctitle psutil aria2 python-notify2 youtube-dl"
+REQUIRES="python3-PyQt5 python-requests setproctitle psutil aria2 python-notify2 ffmpeg youtube-dl"
 MAINTAINER="David Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/network/pexip-infinity-connect/README b/network/pexip-infinity-connect/README
index 55b5c40785..c97ca78f6a 100644
--- a/network/pexip-infinity-connect/README
+++ b/network/pexip-infinity-connect/README
@@ -3,3 +3,5 @@ pexip-infinity-connect (Video Communication Software)
 Pexip simplifies video communication across borders, businesses and
 platforms. It empowers your organization with face-to-face
 collaboration, no matter the location or technology.
+
+This SB script repackages archive to Slackware package
diff --git a/network/pexip-infinity-connect/doinst.sh b/network/pexip-infinity-connect/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/network/pexip-infinity-connect/doinst.sh
+++ b/network/pexip-infinity-connect/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 -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild b/network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild
index 1330433283..357a34a2d0 100644
--- a/network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild
+++ b/network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pexip-infinity-connect
 
-# Copyright 2020 Igor Alexandrov <igora.vault@gmail.com>
+# Copyright 2020 Igor Alexandrov <igor.alexandrov@outlook.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -36,6 +36,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+set -e
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -46,13 +48,11 @@ if [ "$ARCH" != "x86_64" ]; then
   exit 1
 fi
 
-set -e
-
 rm -rf $PKG
-mkdir -p $TMP $OUTPUT $PKG/{install,usr/{bin,lib64,share/applications,doc/$PRGNAM-$VERSION}}
+mkdir -p $TMP $OUTPUT $PKG/{install,opt,usr/{bin,doc/$PRGNAM-$VERSION}}
 cd $PKG
 tar -xvf $CWD/$PRGNAM*.t?z
-mv $SRCNAM usr/lib64/$PRGNAM
+mv $SRCNAM opt/$PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -63,11 +63,12 @@ find -L . \
 find . -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-ln -s ../lib64/$PRGNAM/$PRGNAM usr/bin
-install -m644 $CWD/$PRGNAM.desktop usr/share/applications
+ln -s ../../opt/$PRGNAM/$PRGNAM usr/bin
+install -m 644 -D $CWD/$PRGNAM.desktop -t usr/share/applications
+install -m 644 -D $CWD/$PRGNAM.png -t usr/share/icons/hicolor/48x48/apps
 
-ln -s ../../lib64/$PRGNAM/LICENSE usr/doc/$PRGNAM-$VERSION
-ln -s ../../lib64/$PRGNAM/LICENSES.chromium.html usr/doc/$PRGNAM-$VERSION
+ln -s ../../../opt/$PRGNAM/LICENSE usr/doc/$PRGNAM-$VERSION
+ln -s ../../../opt/$PRGNAM/LICENSES.chromium.html usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.desktop b/network/pexip-infinity-connect/pexip-infinity-connect.desktop
index fb38198b14..aa50e951d4 100644
--- a/network/pexip-infinity-connect/pexip-infinity-connect.desktop
+++ b/network/pexip-infinity-connect/pexip-infinity-connect.desktop
@@ -1,10 +1,10 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=Pexip Infinity Connect
-Exec=/usr/lib64/pexip-infinity-connect/pexip-infinity-connect %u
+Exec=/opt/pexip-infinity-connect/pexip-infinity-connect %u
 Terminal=false
 Type=Application
-Icon=/usr/lib64/pexip-infinity-connect/resources/vendor/snoreToast/app-notifier.png
+Icon=pexip-infinity-connect
 Categories=Network;Communication;Video
 StartupNotify=true
 StartupWMClass=pexip infinity connect
diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.info b/network/pexip-infinity-connect/pexip-infinity-connect.info
index 5f8a0ee5ea..b4b16b73e4 100644
--- a/network/pexip-infinity-connect/pexip-infinity-connect.info
+++ b/network/pexip-infinity-connect/pexip-infinity-connect.info
@@ -1,10 +1,10 @@
 PRGNAM="pexip-infinity-connect"
-VERSION="1.5.1.50296.45.32"
+VERSION="1.6.0.52922.63.120"
 HOMEPAGE="https://www.pexip.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://dl.pexip.com/connect/nextgen/1.5.1/pexip-infinity-connect_1.5.1-50296.45.32_linux-x64.tgz"
-MD5SUM_x86_64="52573149eaa42e02d84bc79fb44474ae"
+DOWNLOAD_x86_64="https://dl.pexip.com/connect/nextgen/1.6/pexip-infinity-connect_1.6.0-52920.61.0_linux-x64.tgz"
+MD5SUM_x86_64="04366b531afd0de6d3258f7c0aa8e08d"
 REQUIRES=""
 MAINTAINER="Igor Alexandrov"
-EMAIL="igora.vault@gmail.com"
+EMAIL="igor.alexandrov@outlook.com"
diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.png b/network/pexip-infinity-connect/pexip-infinity-connect.png
new file mode 100644
index 0000000000..de24120fbe
--- /dev/null
+++ b/network/pexip-infinity-connect/pexip-infinity-connect.png
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/policyd2/policyd2.info b/network/policyd2/policyd2.info
index f5680fd28b..4d32a1233f 100644
--- a/network/policyd2/policyd2.info
+++ b/network/policyd2/policyd2.info
@@ -1,7 +1,7 @@
 PRGNAM="policyd2"
 VERSION="2.0.14"
 HOMEPAGE="http://www.policyd.org/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/cluebringer-v2.0.14.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/cluebringer-v2.0.14.tar.xz"
 MD5SUM="e75cd25a836b316846f5ad8bf09a69a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/postgrey/doinst.sh b/network/postgrey/doinst.sh
index e935335cd0..5bf85c6667 100644
--- a/network/postgrey/doinst.sh
+++ b/network/postgrey/doinst.sh
@@ -21,5 +21,6 @@ preserve_perms() {
 
 config etc/postfix/postgrey_whitelist_clients.new
 config etc/postfix/postgrey_whitelist_recipients.new
+config etc/postgrey.conf.new
 preserve_perms etc/rc.d/rc.postgrey.new
 
diff --git a/network/postgrey/postgrey.SlackBuild b/network/postgrey/postgrey.SlackBuild
index 71fa28387f..0c68baf620 100644
--- a/network/postgrey/postgrey.SlackBuild
+++ b/network/postgrey/postgrey.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=postgrey
-VERSION=${VERSION:-1.34}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.37}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -98,10 +98,13 @@ cp -a policy-test postgrey contrib/postgreyreport $PKG/usr/bin
 mkdir -p $PKG/etc/rc.d
 sed -e s/%POSTGREYUSR%/$POSTGREYUSR/g \
     -e s/%POSTGREYGRP%/$POSTGREYGRP/g \
+    $CWD/postgrey.conf > $PKG/etc/postgrey.conf.new
+sed -e s/%POSTGREYUSR%/$POSTGREYUSR/g \
+    -e s/%POSTGREYGRP%/$POSTGREYGRP/g \
     $CWD/rc.postgrey > $PKG/etc/rc.d/rc.postgrey.new
 
-mkdir -p $PKG/var/{lib,run}/postgrey
-chown $POSTGREYUSR.$POSTGREYGRP $PKG/var/lib/postgrey $PKG/var/run/postgrey
+mkdir -p $PKG/var/lib/postgrey
+chown ${POSTGREYUSR}:${POSTGREYGRP} $PKG/var/lib/postgrey
 
 mkdir -p $PKG/etc/postfix
 cp -a postgrey_whitelist_clients $PKG/etc/postfix/postgrey_whitelist_clients.new
diff --git a/network/postgrey/postgrey.conf b/network/postgrey/postgrey.conf
new file mode 100644
index 0000000000..db34cb398c
--- /dev/null
+++ b/network/postgrey/postgrey.conf
@@ -0,0 +1,10 @@
+# /etc/postgrey.conf
+#
+# This file will be sourced from /etc/rc.d/rc.postgrey
+#
+PORT=10025
+PIDFILE=/var/run/postgrey/postgrey.pid
+USER=%POSTGREYUSR%
+GROUP=%POSTGREYGRP%
+HOST=mail.example.com
+
diff --git a/network/postgrey/postgrey.info b/network/postgrey/postgrey.info
index 802b44f23a..140612fab0 100644
--- a/network/postgrey/postgrey.info
+++ b/network/postgrey/postgrey.info
@@ -1,8 +1,8 @@
 PRGNAM="postgrey"
-VERSION="1.34"
+VERSION="1.37"
 HOMEPAGE="http://postgrey.schweikert.ch/"
-DOWNLOAD="http://postgrey.schweikert.ch/pub/old/postgrey-1.34.tar.gz"
-MD5SUM="f736a7be1094593f1a66cd13f32b39ef"
+DOWNLOAD="http://postgrey.schweikert.ch/pub/postgrey-1.37.tar.gz"
+MD5SUM="2ef30f42ad84f00caf41c49b593b8e2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Net-Server perl-IO-Multiplex perl-BerkeleyDB perl-net-dns"
diff --git a/network/postgrey/rc.postgrey b/network/postgrey/rc.postgrey
index d763884bfa..5c33151085 100644
--- a/network/postgrey/rc.postgrey
+++ b/network/postgrey/rc.postgrey
@@ -1,17 +1,15 @@
 #!/bin/bash
 
-PORT=10025
-PIDFILE=/var/run/postgrey/postgrey.pid
-USER=%POSTGREYUSR%
-GROUP=%POSTGREYGRP%
-HOST=mail.example.com
+. /etc/postgrey.conf || exit 1
 
 postgrey_start() {
   echo "Starting postgrey milter:  /usr/bin/postgrey -d --inet=$PORT --pidfile=$PIDFILE --user=$USER --group=$GROUP --dbdir=/var/lib/postgrey --hostname=$HOST"
-  mkdir -p /var/run/postgrey
+  mkdir -p $(dirname $PIDFILE)
+  chown ${USER}:${GROUP} $(dirname $PIDFILE)
+
   /usr/bin/postgrey -d \
                     --inet=$PORT \
-                    --pidfile=/var/run/postgrey/postgrey.pid \
+                    --pidfile=$PIDFILE \
                     --user=$USER --group=$GROUP \
                     --dbdir=/var/lib/postgrey \
                     --hostname=$HOST
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 af6b8e33f2..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:-hg3627}
-REVISION=${REVISION:-9639c493f4b9}
+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 fbe1d74933..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="hg3627"
+VERSION="hg4464"
 HOMEPAGE="https://modules.prosody.im/mod_cloud_notify.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/9639c493f4b9.tar.gz"
-MD5SUM="c52d0735637830b5621c60f448e4f7db"
+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 bda96dc183..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:-hg3838}
-REVISION=${REVISION:-9f0c10bd4633}
+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 f26f08d558..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="hg3838"
+VERSION="hg4443"
 HOMEPAGE="https://modules.prosody.im/mod_http_upload.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/9f0c10bd4633.tar.gz"
-MD5SUM="073b24d08569fc12b53fd1a9e35d9eee"
+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-offline/README b/network/prosody-mod-smacks-offline/README
deleted file mode 100644
index c0501f9b0d..0000000000
--- a/network/prosody-mod-smacks-offline/README
+++ /dev/null
@@ -1 +0,0 @@
-prosody-mod-smacks-offline (XEP-0198: Stream Management)
diff --git a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.SlackBuild b/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.SlackBuild
deleted file mode 100644
index dd8dc9398b..0000000000
--- a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for prosody-mod-smacks-offline
-
-# Copyright 2017-2018 Andrew Clemons, Wellington, New Zealand
-# 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=prosody-mod-smacks-offline
-MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
-VERSION=${VERSION:-hg1731}
-REVISION=${REVISION:-b912cb8e0b3c}
-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
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf prosody-modules-$REVISION
-tar xvf $CWD/Community-Modules-$REVISION.tar.gz || tar xvf $CWD/$REVISION.tar.gz
-cd Community-Modules-$REVISION
-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/lib$LIBDIRSUFFIX/prosody/modules/
-cp -a $MDLNAM $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/
-
-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/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info b/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info
deleted file mode 100644
index 10d313ae0b..0000000000
--- a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="prosody-mod-smacks-offline"
-VERSION="hg1731"
-HOMEPAGE="https://modules.prosody.im/mod_smacks_offline.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/b912cb8e0b3c.tar.gz"
-MD5SUM="baf3b6674cb42039de6813e4a7fa340f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="prosody"
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-smacks-offline/slack-desc b/network/prosody-mod-smacks-offline/slack-desc
deleted file mode 100644
index 66c3abad87..0000000000
--- a/network/prosody-mod-smacks-offline/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------------------------------------------------------|
-prosody-mod-smacks-offline: prosody-mod-smacks-offline (XEP-0198: Stream Management)
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline:
-prosody-mod-smacks-offline: https://modules.prosody.im/mod_smacks_offline.html
-prosody-mod-smacks-offline:
diff --git a/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild b/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild
index 721c149746..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:-hg3841}
-REVISION=${REVISION:-b5d367798570}
+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 a5ac0fe774..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="hg3841"
+VERSION="hg4463"
 HOMEPAGE="https://modules.prosody.im/mod_smacks.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/b5d367798570.tar.gz"
-MD5SUM="05c51001d9b5e262197878670bd904ea"
+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-turncredentials/README b/network/prosody-mod-turncredentials/README
new file mode 100644
index 0000000000..76b7974ff8
--- /dev/null
+++ b/network/prosody-mod-turncredentials/README
@@ -0,0 +1,3 @@
+prosody-mod-turncredentials (XEP-0215: impl for TURN credentials)
+
+This module provides an implementation for time-limited TURN credentials.
diff --git a/network/prosody-mod-turncredentials/prosody-mod-turncredentials.SlackBuild b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.SlackBuild
new file mode 100644
index 0000000000..c36ac011e2
--- /dev/null
+++ b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.SlackBuild
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Slackware build script for prosody-mod-turncredentials
+
+# Copyright 2020 Andrew Clemons, Wellington, New Zealand
+# 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=prosody-mod-turncredentials
+MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_')
+VERSION=${VERSION:-hg4055}
+REVISION=${REVISION:-cf1304ad2336}
+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
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf Community-Modules-$REVISION
+tar xvf $CWD/Community-Modules-$REVISION.tar.gz || tar xvf $CWD/$REVISION.tar.gz
+cd Community-Modules-$REVISION
+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/lib${LIBDIRSUFFIX}/prosody/modules/
+cp -a $MDLNAM $PKG/usr/lib${LIBDIRSUFFIX}/prosody/modules/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv \
+  $PKG/usr/lib${LIBDIRSUFFIX}/prosody/modules/$MDLNAM/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/network/prosody-mod-turncredentials/prosody-mod-turncredentials.info b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.info
new file mode 100644
index 0000000000..863aeb8bf3
--- /dev/null
+++ b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.info
@@ -0,0 +1,10 @@
+PRGNAM="prosody-mod-turncredentials"
+VERSION="hg4055"
+HOMEPAGE="https://modules.prosody.im/mod_turncredentials.html"
+DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/cf1304ad2336.tar.gz"
+MD5SUM="65f21e5bde5186f0281d731aeadfcb3e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="prosody"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/network/prosody-mod-turncredentials/slack-desc b/network/prosody-mod-turncredentials/slack-desc
new file mode 100644
index 0000000000..a7169445c9
--- /dev/null
+++ b/network/prosody-mod-turncredentials/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------------------------------------------------------|
+prosody-mod-turncredentials: prosody-mod-turncredentials (XEP-0215: time-limited TURN credentials)
+prosody-mod-turncredentials:
+prosody-mod-turncredentials: This module provides an implementation for time-limited TURN
+prosody-mod-turncredentials: credentials.
+prosody-mod-turncredentials:
+prosody-mod-turncredentials:
+prosody-mod-turncredentials:
+prosody-mod-turncredentials:
+prosody-mod-turncredentials:
+prosody-mod-turncredentials: https://modules.prosody.im/mod_turncredentials.html
+prosody-mod-turncredentials:
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 b1a9926823..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:-hg3656}
-REVISION=${REVISION:-3e0f4d727825}
+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 0be790dda8..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="hg3656"
+VERSION="hg4300"
 HOMEPAGE="https://modules.prosody.im/mod_vcard_muc.html"
-DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/3e0f4d727825.tar.gz"
-MD5SUM="15abb1bdc5a4d8af11f4f0a3b80f5924"
+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 ba9d80435b..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.3}
+VERSION=${VERSION:-0.11.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/prosody/prosody.info b/network/prosody/prosody.info
index 93f60043e6..fbf571bd7b 100644
--- a/network/prosody/prosody.info
+++ b/network/prosody/prosody.info
@@ -1,8 +1,8 @@
 PRGNAM="prosody"
-VERSION="0.11.3"
+VERSION="0.11.8"
 HOMEPAGE="http://prosody.im/"
-DOWNLOAD="https://prosody.im/downloads/source/prosody-0.11.3.tar.gz"
-MD5SUM="2cf85cd8f7fc061916d97a169e850a0e"
+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/README b/network/protonmail-bridge/README
new file mode 100644
index 0000000000..7865cc13d4
--- /dev/null
+++ b/network/protonmail-bridge/README
@@ -0,0 +1,13 @@
+The ProtonMail Bridge is an application for paid users that runs on your
+computer in the background and seamlessly encrypts and decrypts your
+mail as it enters and leaves your computer. It allows for full
+integration of your ProtonMail account with any program that supports
+IMAP and SMTP such as Microsoft Outlook, Mozilla Thunderbird and Apple
+Mail.
+
+Once you've installed and adder your account(s) to the Bridge you will
+need to configure your email client.  The setup guide for Thunderbird
+can be found here: https://protonmail.com/bridge/thunderbird
+
+This script repackages the Debian binary provided by Proton
+Technologies.
diff --git a/network/protonmail-bridge/doinst.sh b/network/protonmail-bridge/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/network/protonmail-bridge/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-bridge/protonmail-bridge.SlackBuild b/network/protonmail-bridge/protonmail-bridge.SlackBuild
new file mode 100644
index 0000000000..74e9b33a6d
--- /dev/null
+++ b/network/protonmail-bridge/protonmail-bridge.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Slackware build script for protonmail-bridge
+
+# Copyright 2018-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-bridge
+VERSION=${VERSION:-1.6.9}
+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 Bridge 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-bridge
+ln -s /usr/lib64/protonmail/bridge/proton-bridge-launcher $PKG/usr/bin/protonmail-bridge
+
+mkdir -p $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
+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-bridge/protonmail-bridge.info b/network/protonmail-bridge/protonmail-bridge.info
new file mode 100644
index 0000000000..de81c95d28
--- /dev/null
+++ b/network/protonmail-bridge/protonmail-bridge.info
@@ -0,0 +1,10 @@
+PRGNAM="protonmail-bridge"
+VERSION="1.6.9"
+HOMEPAGE="https://protonmail.com/bridge/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+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-bridge/slack-desc b/network/protonmail-bridge/slack-desc
new file mode 100644
index 0000000000..1c57aa04ba
--- /dev/null
+++ b/network/protonmail-bridge/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-bridge: protonmail-bridge (ProtonMail Bridge)
+protonmail-bridge:
+protonmail-bridge: The Bridge is an application that runs on your computer in the
+protonmail-bridge: background and seamlessly encrypts and decrypts your mail as it
+protonmail-bridge: enters and leaves your computer.
+protonmail-bridge:
+protonmail-bridge: Proton Technologies AG (ProtonMail Bridge developers)
+protonmail-bridge: <bridge@protonmail.ch>
+protonmail-bridge:
+protonmail-bridge:
+protonmail-bridge:
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/README b/network/pulse-sms/README
new file mode 100644
index 0000000000..92232b1ce9
--- /dev/null
+++ b/network/pulse-sms/README
@@ -0,0 +1,7 @@
+pulse-sms (SMS messaging for Desktop)
+
+All phones come with SMS, and anyone can use it. Pulse adds a powerful
+web platform, so that you can stay on top of your conversations.
+
+This is a repackaging of the official binary .deb file
+distributed by Klinker Apps.
diff --git a/network/pulse-sms/doinst.sh b/network/pulse-sms/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/pulse-sms/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/network/pulse-sms/pulse-sms.SlackBuild b/network/pulse-sms/pulse-sms.SlackBuild
new file mode 100644
index 0000000000..081f3c2731
--- /dev/null
+++ b/network/pulse-sms/pulse-sms.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Slackware build script for Pulse SMS
+
+# Copyright 2020 Ebben Aries
+# 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=pulse-sms
+VERSION=${VERSION:-4.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+    ARCH=$( uname -m )
+fi
+
+# Upstream only has binary support for x86_64 at present.
+if [ "$ARCH" = "x86_64" ]; then
+    DEBARCH="amd64"
+else
+    echo "Sorry, the Pulse SMS 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}-$DEBARCH.deb data.tar.xz | tar xJv
+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 {} \;
+
+# create soft link for launcher
+mkdir -p $PKG/usr/bin
+ln -sf /opt/Pulse\ SMS/$PRGNAM $PKG/usr/bin/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp $PKG/usr/share/doc/$PRGNAM/* $PKG/opt/Pulse\ SMS/LICENSE* $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/pulse-sms/pulse-sms.info b/network/pulse-sms/pulse-sms.info
new file mode 100644
index 0000000000..0d653dacb1
--- /dev/null
+++ b/network/pulse-sms/pulse-sms.info
@@ -0,0 +1,10 @@
+PRGNAM="pulse-sms"
+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.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/pulse-sms/slack-desc b/network/pulse-sms/slack-desc
new file mode 100644
index 0000000000..2e3f116432
--- /dev/null
+++ b/network/pulse-sms/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------------------------------------------------------|
+pulse-sms: pulse-sms (SMS messaging for Desktop)
+pulse-sms:
+pulse-sms: All phones come with SMS, and anyone can use it. Pulse adds a powerful
+pulse-sms: web platform, so that you can stay on top of your conversations.
+pulse-sms:
+pulse-sms: This is a repackaging of the official binary .deb file
+pulse-sms: distributed by Klinker Apps.
+pulse-sms:
+pulse-sms: Home-Page: https://messenger.klinkerapps.com/overview
+pulse-sms:
+pulse-sms:
diff --git a/network/purple-facebook/purple-facebook.SlackBuild b/network/purple-facebook/purple-facebook.SlackBuild
index 36398d5f27..3a43430335 100644
--- a/network/purple-facebook/purple-facebook.SlackBuild
+++ b/network/purple-facebook/purple-facebook.SlackBuild
@@ -23,8 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=purple-facebook
-VERSION=${VERSION:-0.9.5_9ff9acf9fa14}
-SRCVERSION=${VERSION/_/-}
+VERSION=${VERSION:-0.9.6}
 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-$SRCVERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+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/network/purple-facebook/purple-facebook.info b/network/purple-facebook/purple-facebook.info
index cec90cebf7..0e5921e0d7 100644
--- a/network/purple-facebook/purple-facebook.info
+++ b/network/purple-facebook/purple-facebook.info
@@ -1,8 +1,8 @@
 PRGNAM="purple-facebook"
-VERSION="0.9.5_9ff9acf9fa14"
+VERSION="0.9.6"
 HOMEPAGE="https://github.com/dequis/purple-facebook"
-DOWNLOAD="http://unrealize.co.uk/source/purple-facebook-0.9.5-9ff9acf9fa14.tar.gz"
-MD5SUM="9122bd8de731a24b0011a93db62d809b"
+DOWNLOAD="https://github.com/dequis/purple-facebook/releases/download/v0.9.6/purple-facebook-0.9.6.tar.gz"
+MD5SUM="fe58b39f835fac3e7616c34364d869a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="json-glib"
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/putty/putty.SlackBuild b/network/putty/putty.SlackBuild
index b315827692..7dd7874f0b 100644
--- a/network/putty/putty.SlackBuild
+++ b/network/putty/putty.SlackBuild
@@ -31,7 +31,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=putty
-VERSION=${VERSION:-0.73}
+VERSION=${VERSION:-0.74}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/putty/putty.info b/network/putty/putty.info
index e75f21be83..eb828e591a 100644
--- a/network/putty/putty.info
+++ b/network/putty/putty.info
@@ -1,8 +1,8 @@
 PRGNAM="putty"
-VERSION="0.73"
+VERSION="0.74"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-DOWNLOAD="https://the.earth.li/~sgtatham/putty/latest/putty-0.73.tar.gz"
-MD5SUM="d4a1797763e11e6a77115d0d0368b566"
+DOWNLOAD="https://the.earth.li/~sgtatham/putty/latest/putty-0.74.tar.gz"
+MD5SUM="dbfa58f22a91b22b7489173e9dd09e30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
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/doinst.sh b/network/qbittorrent-qt5/doinst.sh
deleted file mode 100644
index d3350f3157..0000000000
--- a/network/qbittorrent-qt5/doinst.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild b/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild
deleted file mode 100644
index e9795d11df..0000000000
--- a/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for qbittorrent-qt5
-
-# Copyright 2019 Donald Cooley South Haven, Indiana USA
-# Copyright 2009-2010 David 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=qbittorrent-qt5
-SRCNAM=qBittorrent
-VERSION=${VERSION:-4.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 $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 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
-
-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
-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/qbittorrent-qt5/qbittorrent-qt5.info b/network/qbittorrent-qt5/qbittorrent-qt5.info
deleted file mode 100644
index d7dc86ab6e..0000000000
--- a/network/qbittorrent-qt5/qbittorrent-qt5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qbittorrent-qt5"
-VERSION="4.2.1"
-HOMEPAGE="http://qbittorrent.sourceforge.net"
-DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.2.1/qBittorrent-release-4.2.1.tar.gz"
-MD5SUM="f349ff40dabbd866826636c699e8cf8c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libtorrent-rasterbar qt5"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeus@protonmail.com"
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 731c51c61f..d95396d99f 100644
--- a/network/qbittorrent/README
+++ b/network/qbittorrent/README
@@ -1,11 +1,14 @@
-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 old config directory first, you will find it here:
+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
 
-That way you can return to an older version by swapping directories
-around.
+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 ff00d773dd..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"
+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/README b/network/qutebrowser-tox/README
index aaf656b629..7b852e17a5 100644
--- a/network/qutebrowser-tox/README
+++ b/network/qutebrowser-tox/README
@@ -11,5 +11,5 @@ pre-compiled QtWebEngine binary, but has a couple of caveats:
 * It comes with a QtWebEngine compiled without proprietary codec support
   (such as h.264).
 
-Before version 1.10.0 this SlackBuild used tox to manage virtualenv, hence
-the name of the SlackBuild.
+Before version 1.10.0 this SlackBuild used tox to manage virtualenv,
+hence the name of the SlackBuild.
diff --git a/network/qutebrowser-tox/README.SBo.Widevine b/network/qutebrowser-tox/README.SBo.Widevine
deleted file mode 100644
index e3d4f55732..0000000000
--- a/network/qutebrowser-tox/README.SBo.Widevine
+++ /dev/null
@@ -1,20 +0,0 @@
-Widevine DRM support requires libwidevinecdm.so plugin. Qutebrowser
-searches for it in the following directories:
-
-/opt/google/chrome
-/usr/lib/chromium
-/usr/lib64/chromium
-/usr/lib/chromium-browser
-
-libwidevinecdm.so can be download at
-https://dl.google.com/widevine-cdm/X.X.X.X-linux-x64.zip
-and manually put to one of the above directories. The version "X.X.X.X"
-to download can be found at
-https://dl.google.com/widevine-cdm/versions.txt
-
-libwidevinecdm.so provided by google-chrome from /extra, Alien Bob's
-chromium-widevine-plugin, etc. can be used as well.
-
-To test the Widevine DRM support, go to
-https://shaka-player-demo.appspot.com/demo/
-and play the Sintel video.
diff --git a/network/qutebrowser-tox/qutebrowser-tox.SlackBuild b/network/qutebrowser-tox/qutebrowser-tox.SlackBuild
index 87cca746ad..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,9 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qutebrowser-tox
-VERSION=${VERSION:-1.10.1}
-SSLVERSION=${SSLVERSION:-1.1.1e}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.2.0}
+SSLVERSION=${SSLVERSION:-1.1.1k}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,9 +54,12 @@ cd $PKG/opt
 tar xvf $CWD/qutebrowser-$VERSION.tar.gz
 mv qutebrowser-$VERSION qutebrowser
 cd qutebrowser
-sed -i.bak "s|\(run_venv(venv_dir, 'python3', '-m', 'pip', 'install',\)|\1 \
+sed -i.bak "s|\(run_venv(venv_dir, 'python', '-m', 'pip', 'install',\)|\1 \
 '--no-index', '--find-links=$CWD/',|" scripts/mkvenv.py
 
+sed -i "/env\['PATH'\] = str(bin_path) + os.pathsep + env\['PATH'\]/d" \
+  scripts/asciidoc2html.py
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,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 1fd3aa4f0b..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.10.1"
+VERSION="2.2.0"
 HOMEPAGE="https://qutebrowser.org"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v1.10.1/qutebrowser-1.10.1.tar.gz \
-                 https://files.pythonhosted.org/packages/54/0c/d01aa759fdc501a58f431eb594a17495f15b88da142ce14b5845662c13f3/pip-20.0.2-py2.py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/3d/72/1c1498c1e908e0562b1e1cd30012580baa7d33b5b0ffdbeb5fde2462cc71/setuptools-45.2.0-py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/8c/23/848298cccf8e40f5bbb59009b32848a4c38f4e7f3364297ab3c3e2e2cd14/wheel-0.34.2-py2.py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/a2/db/4313ab3be961f7a763066401fb77f7748373b6094076ae2bda2806988af6/attrs-19.3.0-py2.py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/c9/dc/45cdef1b4d119eb96316b3117e6d5708a08029992b2fee2c143c7a0a5cc5/colorama-0.4.3-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/27/24/4f35961e5c669e96f6559760042a55b9bcfcdb82b9bdb3c8753dbe042e35/Jinja2-2.11.1-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/be/39/32da3184734730c0e4d3fa3b2b5872104668ad6dc1b5a73d8e477e5fe967/Pygments-2.5.2-py2.py3-none-any.whl \
-                 https://files.pythonhosted.org/packages/f9/bd/10398e2c2d2070cc8a9c7153abfbd4ddb2895a2c52a32722ab8689e0cc7d/pyPEG2-2.15.2.tar.gz \
-                 https://files.pythonhosted.org/packages/3d/d9/ea9816aea31beeadccd03f1f8b625ecf8f645bd66744484d162d84803ce5/PyYAML-5.3.tar.gz \
-                 https://files.pythonhosted.org/packages/bb/47/640737c9d2eb76a2bf6e8dc101dd195caea07985f1932976629c02ad1432/PyQt5-5.14.1-5.14.1-cp35.cp36.cp37.cp38-abi3-manylinux2014_x86_64.whl \
-                 https://files.pythonhosted.org/packages/c6/1d/a7ff3caab5e0ec563198dc0544ae3140965065e6ed3901ff23689766e4d0/PyQt5_sip-12.7.1-cp37-cp37m-manylinux1_x86_64.whl \
-                 https://files.pythonhosted.org/packages/47/94/18dc537f482b2f7babdeace5cb7e441724910660bd34f490858ef8562caf/PyQtWebEngine-5.14.0-5.14.1-cp35.cp36.cp37.cp38-abi3-manylinux2014_x86_64.whl \
-                 https://github.com/mozilla/pdf.js/releases/download/v2.3.200/pdfjs-2.3.200-dist.zip \
-                 https://www.openssl.org/source/openssl-1.1.1e.tar.gz"
-MD5SUM_x86_64="013855e1821b81edc0ed709f71342241 \
-               2762a1e7f11cff2bb8f8e69997f11331 \
-               6516c7f3649382e9e5d009ebb048dd28 \
-               8a2e3b6aca9665a0c6abecc4f4ea7090 \
-               15c8ca1fd31e80e02b38064e835ddcd8 \
-               9e6c379e994d31f11945e90bbe7d93f4 \
-               e5e872b22e870f6834d49c1fb2d8a9fb \
-               945f0fc50f46e8f8310ff3184bcec0e7 \
-               ce9334cb93c3fb155b6395458935ad61 \
-               044bef3bf7f2ced9d8df7be47d3cfbde \
-               84057d292808553290f0b78f42c64bbe \
-               adbb0d336b509d6472d3b095a0f1cf30 \
-               9c4328d2ee4094052c368218de4a41ec \
-               2f8847bfe27046376d25c8b64dce76d4 \
-               13a08d09f7046ce7356b83ca5f1562ad \
-               3d493360f527da454d42c90a7f559041 \
-               baeff2a64d2f3d7e0a69b677c9977b57"
+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/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/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 \
+               ff98ca82869ad5e0ecf8208908f3edbe \
+               d9fe06e7758913f32dc09324ff9abfdf \
+               504321e0e009e2fbb194ffde9d9a594a \
+               1dcd07acf2b1875ed09428e1ddf7e028 \
+               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 9e22eb03c3..f1ca3e6236 100644
--- a/network/qutebrowser/README
+++ b/network/qutebrowser/README
@@ -1,29 +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 DEPENDENCIES:
 
-Optional dependency:
+qt5-webkit (for the webkit backend)
+Pygments   (for the :view-source command with the QtWebKit backend.
+            and with QtWebEngine for ":view-source --pygments")
 
-qt5-webkit-annulen (for the webkit backend)
+ADBLOCK NOTE:
 
+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.
 
-NOTE:
+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.
 
-pyPEG2 needs building for python3:
+Instructions to install it into ~/.local/lib with pip3:
 
-PYTHON3=yes ./pyPEG2.SlackBuild
+1. Update llvm to the package in extra/
 
-If you are using sbopkg you can add this as an option on
-their pages before starting the build queue.
+To update with slackpkg:
 
+Edit /etc/slackpkg/slackpkg.conf and change the order of PRIORITY so
+that `extra' is before `%PKGMAIN' in the list:
 
-NOTE 2:
+  PRIORITY=( extra patches %PKGMAIN pasture testing )
 
-There is a list of changes and fixes for versions on the
-release page:
+Run `slackpkg upgrade llvm'
 
-https://github.com/qutebrowser/qutebrowser/releases
+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 33d381dbe4..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.10.1}
+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 8fea4638a1..c7fd782303 100644
--- a/network/qutebrowser/qutebrowser.info
+++ b/network/qutebrowser/qutebrowser.info
@@ -1,10 +1,10 @@
 PRGNAM="qutebrowser"
-VERSION="1.10.1"
+VERSION="2.2.0"
 HOMEPAGE="http://qutebrowser.org/"
-DOWNLOAD="https://github.com/qutebrowser/qutebrowser/releases/download/v1.10.1/qutebrowser-1.10.1.tar.gz"
-MD5SUM="f53345e44557feecc4bca36bdd6a7042"
+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-PyQt5"
+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 52812e7293..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: qt5-webkit-annulen is an optional dependency for the webkit backend.
+qutebrowser: It was inspired by other browsers/addons like Vimperator/Pentadactyl
+qutebrowser: and dwb.
 qutebrowser:
-qutebrowser: https://qutebrowser.org
+qutebrowser: qt5-webkit is an optional dependency for the webkit backend.
 qutebrowser:
+qutebrowser: https://qutebrowser.org
diff --git a/network/r2e/r2e.info b/network/r2e/r2e.info
index 13c53aeefa..4d13aaf2db 100644
--- a/network/r2e/r2e.info
+++ b/network/r2e/r2e.info
@@ -1,7 +1,7 @@
 PRGNAM="r2e"
 VERSION="2.71"
-HOMEPAGE="http://www.allthingsrss.com/rss2email/"
-DOWNLOAD="http://www.allthingsrss.com/rss2email/rss2email-2.71.tar.gz"
+HOMEPAGE="https://web.archive.org/web/20130114170616/http://www.allthingsrss.com/rss2email/"
+DOWNLOAD="https://web.archive.org/web/20130114074037if_/http://www.allthingsrss.com/rss2email/rss2email-2.71.tar.gz"
 MD5SUM="7d7dbac5aa181b07261516213a312f39"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/r8168/r8168.SlackBuild b/network/r8168/r8168.SlackBuild
index f334b7f348..7b9680604b 100644
--- a/network/r8168/r8168.SlackBuild
+++ b/network/r8168/r8168.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=r8168
-VERSION=${VERSION:-8.048.00}
+VERSION=${VERSION:-8.048.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/r8168/r8168.info b/network/r8168/r8168.info
index d68e95b265..506ee476d6 100644
--- a/network/r8168/r8168.info
+++ b/network/r8168/r8168.info
@@ -1,8 +1,8 @@
 PRGNAM="r8168"
-VERSION="8.048.00"
+VERSION="8.048.03"
 HOMEPAGE="https://github.com/mtorromeo/r8168"
-DOWNLOAD="https://github.com/mtorromeo/r8168/archive/8.048.00/r8168-8.048.00.tar.gz"
-MD5SUM="6e53a59a84bf6bad49d7349ba11ea3f8"
+DOWNLOAD="https://github.com/mtorromeo/r8168/archive/8.048.03/r8168-8.048.03.tar.gz"
+MD5SUM="e8a989c5f21718cc48e07ec350abdf12"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/rclone/README b/network/rclone/README
index 77de1242a6..fe1d6364a1 100644
--- a/network/rclone/README
+++ b/network/rclone/README
@@ -1,26 +1,18 @@
-Rclone is a command line program to sync files and directories to and from
-
-    Google Drive
-    Amazon S3
-    Openstack Swift / Rackspace cloud files / Memset Memstore
-    Dropbox
-    Google Cloud Storage
-    Amazon Drive
-    Microsoft One Drive
-    Hubic
-    Backblaze B2
-    Yandex Disk
-    SFTP
-    The local filesystem
+Rclone ("rsync for cloud storage") is a command line program to sync
+files and directories to and from different cloud storage providers.
 
 Features
 
-    MD5/SHA1 hashes checked at all times for file integrity
+    MD5/SHA-1 hashes checked at all times for file integrity
     Timestamps preserved on files
     Partial syncs supported on a whole file basis
     Copy mode to just copy new/changed files
     Sync (one way) mode to make a directory identical
     Check mode to check for file hash equality
-    Can sync to and from network, eg two different cloud accounts
+    Can sync to and from network, e.g. two different cloud accounts
+    Optional large file chunking (Chunker)
     Optional encryption (Crypt)
-    Optional FUSE mount
+    Optional cache (Cache)
+    Optional FUSE mount (rclone mount)
+    Multi-threaded downloads to local disk
+    Can serve local or remote files over HTTP/WebDav/FTP/SFTP/dlna
diff --git a/network/rclone/rclone.SlackBuild b/network/rclone/rclone.SlackBuild
index 8cb280b95d..5e635a093d 100644
--- a/network/rclone/rclone.SlackBuild
+++ b/network/rclone/rclone.SlackBuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for rclone
-
+# Copyright 2019-2021 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2017-2018 Rodrigo Gimenez <estrod[at]zoho[dot]com>
 # All rights reserved.
 #
@@ -22,12 +21,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 PRGNAM=rclone
-VERSION=${VERSION:-1.42}
+VERSION=${VERSION:-1.54.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+set -e
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -36,52 +36,42 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
-  SUFFIX="linux-386"
-elif [ "$ARCH" = "x86_64" ]; then
-  SUFFIX="linux-amd64"
-elif [ "$ARCH" = "arm" ]; then
-  SUFFIX="linux-arm"
+if [ "$ARCH" = "x86_64" ]; then
+  BIT="64bit"
 else
-  echo "$ARCH is not supported." >&2
+  echo "$ARCH is not supported."
   exit 1
 fi
 
-set -e
-
-rm -rf $PKG
+TMP=${TMP:-/tmp/SBo}
+CWD=$(pwd)
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-v$VERSION-$SUFFIX
-unzip $CWD/$PRGNAM-v$VERSION-$SUFFIX.zip
-cd $PRGNAM-v$VERSION-$SUFFIX
+rm -rf $PRGNAM-$VERSION
+unzip -o $CWD/$PRGNAM-v$VERSION-linux-amd64.zip
+cd $PRGNAM-v$VERSION-linux-amd64
 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 -Ddm755 $PKG/usr/bin
-install -m 775 rclone $PKG/usr/bin
-
-install -Ddm 755 $PKG/usr/man/man1
-cp rclone.1 $PKG/usr/man/man1
+rm -rf $PKG
+mkdir -p $PKG/usr/bin/
+mkdir -p $PKG/usr/man/man1/
+cp rclone $PKG/usr/bin/
+cp rclone.1 $PKG/usr/man/man1/
 
 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/ -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 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
+cp -a README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-bin.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/rclone/rclone.info b/network/rclone/rclone.info
index 9d55eef852..1e296f30ce 100644
--- a/network/rclone/rclone.info
+++ b/network/rclone/rclone.info
@@ -1,10 +1,10 @@
 PRGNAM="rclone"
-VERSION="1.42"
+VERSION="1.54.1"
 HOMEPAGE="https://rclone.org"
-DOWNLOAD="https://downloads.rclone.org/v1.42/rclone-v1.42-linux-386.zip"
-MD5SUM="a7cb1d96382d010f8bc2b19e237f917e"
-DOWNLOAD_x86_64="https://downloads.rclone.org/v1.42/rclone-v1.42-linux-amd64.zip"
-MD5SUM_x86_64="f9892658a2c311ef288261095a0d3377"
+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="Rodrigo Gimenez"
-EMAIL="estrod[at]zoho[dot]com"
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/network/rclone/slack-desc b/network/rclone/slack-desc
index a7e2b07cc2..a21c250f16 100644
--- a/network/rclone/slack-desc
+++ b/network/rclone/slack-desc
@@ -8,11 +8,11 @@
       |-----handy-ruler------------------------------------------------------|
 rclone: rclone (rsync for cloud storage)
 rclone:
-rclone: Rclone is a command line program to sync files and directories to
-rclone: and from Google Drive, Amazon S3, Openstack Swift / Rackspace
-rclone: cloud files / Memset Memstore, Dropbox, Google Cloud Storage,
-rclone: Amazon Drive, Microsoft One Drive, Hubic, Backblaze B2, Yandex Disk,
-rclone: SFTP and the local filesystem.
+rclone: Rclone ("rsync for cloud storage") is a command line program to sync
+rclone: files and directories to and from different cloud storage providers.
+rclone:
+rclone: Homepage: https://rclone.org/
+rclone:
 rclone:
 rclone:
 rclone:
diff --git a/network/resilio-sync/slack-desc b/network/resilio-sync/slack-desc
index f301c16178..0652c16225 100644
--- a/network/resilio-sync/slack-desc
+++ b/network/resilio-sync/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
             |-----handy-ruler------------------------------------------------------|
-resilio-sync: Resilio Sync (Sync All Your Data Across All Your Devices)
+resilio-sync: resilio-sync (Sync All Your Data Across All Your Devices)
 resilio-sync:
 resilio-sync: Resilio Sync Home is a simple yet full featured solution for file sync
 resilio-sync: and sharing that's powered by P2P technology for fast and secure
 resilio-sync: transfers.
-resilio-sync: 
+resilio-sync:
 resilio-sync: https://www.resilio.com/individuals/
 resilio-sync:
 resilio-sync:
diff --git a/network/riot-web/riot-web.SlackBuild b/network/riot-web/riot-web.SlackBuild
index 7232729f65..b3a2878311 100644
--- a/network/riot-web/riot-web.SlackBuild
+++ b/network/riot-web/riot-web.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=riot-web
 PKGNAM=riot
-VERSION=${VERSION:-1.5.7}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,7 +76,7 @@ mv ${PKGNAM}-v${VERSION} $PKG/opt/${PRGNAM}
 # Create a script to let the browser to launch the app.
 mkdir -p $PKG/usr/bin
 echo -e "#!/bin/sh
-cd /opt/riot-web && python -m SimpleHTTPServer 8000 &
+cd /opt/riot-web && python3 -m http.server 8000 --bind 127.0.0.1 &
 sleep 5
 $BROWSER http://localhost:8000" \
 	> $PKG/usr/bin/riot-web
diff --git a/network/riot-web/riot-web.info b/network/riot-web/riot-web.info
index efe3e91668..72fd335d9f 100644
--- a/network/riot-web/riot-web.info
+++ b/network/riot-web/riot-web.info
@@ -1,10 +1,10 @@
 PRGNAM="riot-web"
-VERSION="1.5.7"
+VERSION="1.6.0"
 HOMEPAGE="https://riot.im/"
-DOWNLOAD="https://github.com/vector-im/riot-web/releases/download/v1.5.7/riot-v1.5.7.tar.gz"
-MD5SUM="26cd12c57a8e6c3ef9230efb7b95cd5b"
+DOWNLOAD="https://github.com/vector-im/riot-web/releases/download/v1.6.0/riot-v1.6.0.tar.gz"
+MD5SUM="6261bc00b53d68eea81d3db55952bf8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="MDrights"
 EMAIL="psychi2009@gmail.com"
diff --git a/network/rspamd/README b/network/rspamd/README
index 705ffd1689..ea65f2a21e 100644
--- a/network/rspamd/README
+++ b/network/rspamd/README
@@ -13,7 +13,8 @@ available.
 
 Groupname and Username
 
-You must have the "rspamd" group and user to run this script, for example:
+You must have the "rspamd" group and user to run this script, for
+example:
 
   groupadd -g 359 rspamd
   useradd -u 359 -s /bin/false -d /dev/null -g rspamd rspamd
diff --git a/network/rspamd/Toolset.cmake.patch b/network/rspamd/Toolset.cmake.patch
new file mode 100644
index 0000000000..f70735d899
--- /dev/null
+++ b/network/rspamd/Toolset.cmake.patch
@@ -0,0 +1,16 @@
+--- cmake/Toolset.cmake	2020-09-23 18:31:57.275661294 -0600
++++ cmake/Toolset.cmake	2020-09-23 18:32:34.812659218 -0600
+@@ -45,10 +45,10 @@
+ find_program(GOLD_PATH NAMES "ld.gold" "gold")
+ 
+ if(NOT LINKER_NAME)
+-    if(LLD_PATH)
+-        set(LINKER_NAME "lld")
+-    elseif(GOLD_PATH)
++    if(GOLD_PATH)
+         set(LINKER_NAME "gold")
++    elseif(LLD_PATH)
++        set(LINKER_NAME "lld")
+     else()
+         message(STATUS "Use generic 'ld' as a linker")
+     endif()
diff --git a/network/rspamd/doinst.sh b/network/rspamd/doinst.sh
index 533485ecf5..116a6481e5 100644
--- a/network/rspamd/doinst.sh
+++ b/network/rspamd/doinst.sh
@@ -22,5 +22,7 @@ preserve_perms() {
   config $NEW
 }
 
-config etc/rspamd/rspamd.conf.new
+find etc/rspamd -type f -name '*.new' \
+ | while read new ; do config $new ; done
+
 preserve_perms etc/rc.d/rc.rspamd.new
diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild
index 1821c2026b..60ff15d91d 100644
--- a/network/rspamd/rspamd.SlackBuild
+++ b/network/rspamd/rspamd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Rspamd
 
-# Copyright 2018, 2019 Ebben Aries <e@dscp.org>
+# Copyright 2018-2020 Ebben Aries <e@dscp.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=rspamd
-VERSION=${VERSION:-1.9.4}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.5}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -80,8 +80,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 {} \;
 
+# Patch to use correct linker
+# https://github.com/rspamd/rspamd/issues/3168#issuecomment-583849873
+patch -p0 < $CWD/Toolset.cmake.patch
+
 mkdir -p build
 cd build
+  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -104,9 +109,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
 
-# remove empty directory tree
-rmdir -p --ignore-fail-on-non-empty $PKG/usr/share/examples/rspamd
-
 mkdir -p $PKG/var/log/rspamd
 chown rspamd:rspamd $PKG/var/log/rspamd
 chmod 0755 $PKG/var/log/rspamd
diff --git a/network/rspamd/rspamd.info b/network/rspamd/rspamd.info
index 0fd4280c31..8b978a1de4 100644
--- a/network/rspamd/rspamd.info
+++ b/network/rspamd/rspamd.info
@@ -1,10 +1,10 @@
 PRGNAM="rspamd"
-VERSION="1.9.4"
+VERSION="2.5"
 HOMEPAGE="https://rspamd.com"
-DOWNLOAD="https://github.com/rspamd/rspamd/archive/1.9.4/rspamd-1.9.4.tar.gz"
-MD5SUM="930b07b1f55dfc9c46abbe266eae9856"
+DOWNLOAD="https://github.com/rspamd/rspamd/archive/2.5/rspamd-2.5.tar.gz"
+MD5SUM="9b70be38ca7e17ee89373b764fef1ea7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ragel luajit redis hyperscan"
+REQUIRES="ragel luajit redis hyperscan cmake-202x libsodium"
 MAINTAINER="Ebben Aries"
 EMAIL="e@dscp.org"
diff --git a/network/rspamd/slack-desc b/network/rspamd/slack-desc
index 7419034a6b..5fd336b92a 100644
--- a/network/rspamd/slack-desc
+++ b/network/rspamd/slack-desc
@@ -7,13 +7,13 @@
 
       |-----handy-ruler------------------------------------------------------|
 rspamd: rspamd (An advanced spam filtering system)
+rspamd:
 rspamd: Rspamd is an advanced spam filtering system that allows evaluation of
 rspamd: messages by a number of rules including regular expressions,
 rspamd: statistical analysis and custom services such as URL black lists.
 rspamd: Each message is analysed by Rspamd and given a spam score.
-rspamd: According to the spam score and the user's settings Rspamd recommends
-rspamd: an action for the MTA to apply to the message: for example, to pass,
-rspamd: to reject or to add a header. Rspamd is designed to process hundreds
-rspamd: of messages per second simultaneously and has a number of features
-rspamd: available.
+rspamd:
 rspamd: Home-Page: https://rspamd.com
+rspamd:
+rspamd:
+rspamd:
diff --git a/network/rss2email/4b36e28.patch b/network/rss2email/4b36e28.patch
new file mode 100644
index 0000000000..5b6a050c7e
--- /dev/null
+++ b/network/rss2email/4b36e28.patch
@@ -0,0 +1,239 @@
+diff -Naur orig/CHANGELOG new/CHANGELOG
+--- orig/CHANGELOG	2020-08-31 18:03:24.000000000 +0300
++++ new/CHANGELOG	2020-09-05 16:09:45.000000000 +0300
+@@ -1,4 +1,7 @@
+ UNRELEASED
++    * Improve log messages
++    * Remove documentation of `smtp-ssl-protocol` as this option was dropped in 2016
++    * Stop forging SMTP and sendmail envelope sender (#134)
+ 
+ v3.12.2 (2020-08-31)
+     * Fix bug `AttributeError: 'NoneType' object has no attribute 'close'` (#126)
+diff -Naur orig/r2e.1 new/r2e.1
+--- orig/r2e.1	2020-08-31 18:03:24.000000000 +0300
++++ new/r2e.1	2020-09-05 16:09:45.000000000 +0300
+@@ -253,8 +253,6 @@
+ SMTP server
+ .IP smtp-ssl
+ Connect to the SMTP server using SSL
+-.IP smtp-ssl-protocol
+-TLS/SSL version to use on STARTTLS when not using 'smtp-ssl'.
+ .RE
+ .SS IMAP configuration
+ .IP imap-auth
+diff -Naur orig/rss2email/__init__.py new/rss2email/__init__.py
+--- orig/rss2email/__init__.py	2020-08-31 18:03:24.000000000 +0300
++++ new/rss2email/__init__.py	2020-09-05 16:09:45.000000000 +0300
+@@ -26,7 +26,7 @@
+ import sys as _sys
+ 
+ 
+-__version__ = '3.12.2'
++__version__ = '3.12.1'
+ __url__ = 'https://github.com/rss2email/rss2email'
+ __author__ = 'The rss2email maintainers'
+ __email__ = 'rss2email@tremily.us'
+diff -Naur orig/rss2email/config.py new/rss2email/config.py
+--- orig/rss2email/config.py	2020-08-31 18:03:24.000000000 +0300
++++ new/rss2email/config.py	2020-09-05 16:09:45.000000000 +0300
+@@ -83,11 +83,11 @@
+         # Transfer-Encoding. For local mailing it is safe and
+         # convenient to use 8bit.
+         ('use-8bit', str(False)),
+-        # True: Only use the 'from' address.
++        # True: Only use the 'from' address. Overrides the use-publisher-email setting.
+         # False: Use the email address specified by the feed, when possible.
+         ('force-from', str(False)),
+-        # True: Use the publisher's email if you can't find the author's.
+-        # False: Just use the 'from' email instead.
++        # True: Use author's email if found, or use publisher's email if found, or use the 'from' setting.
++        # False: Use author's email if found, or use the 'from' setting.
+         ('use-publisher-email', str(False)),
+         # If empty, only use the feed email address rather than
+         # friendly name plus email address.  Available attributes may
+@@ -132,7 +132,7 @@
+         # because the old entries will not be recorded under their new
+         # link-based ids.
+         ('trust-link', str(False)),
+-        # If 'trust-guid' or 'trust-link' is True, this settings allows to receive
++        # If 'trust-guid' or 'trust-link' is True, this setting allows to receive
+         # a new email message in reply to the previous one when the post changes.
+         ('reply-changes', str(False)),
+         # To most correctly encode emails with international
+diff -Naur orig/rss2email/email.py new/rss2email/email.py
+--- orig/rss2email/email.py	2020-08-31 18:03:24.000000000 +0300
++++ new/rss2email/email.py	2020-09-05 16:09:45.000000000 +0300
+@@ -151,7 +151,7 @@
+             message[key] = _Header(value, encoding)
+     return message
+ 
+-def smtp_send(sender, recipient, message, config=None, section='DEFAULT'):
++def smtp_send(recipient, message, config=None, section='DEFAULT'):
+     if config is None:
+         config = _config.CONFIG
+     server = config.get(section, 'smtp-server')
+@@ -190,7 +190,7 @@
+         except Exception as e:
+             raise _error.SMTPAuthenticationError(
+                 server=server, username=username)
+-    smtp.send_message(message, sender, recipient.split(','))
++    smtp.send_message(message, config.get(section, 'from'), recipient.split(','))
+     smtp.quit()
+ 
+ def imap_send(message, config=None, section='DEFAULT'):
+@@ -345,12 +345,12 @@
+     else:
+         return bytesio.getvalue()
+ 
+-def sendmail_send(sender, recipient, message, config=None, section='DEFAULT'):
++def sendmail_send(recipient, message, config=None, section='DEFAULT'):
+     if config is None:
+         config = _config.CONFIG
+     message_bytes = _flatten(message)
+     sendmail = config.get(section, 'sendmail')
+-    sender_name,sender_addr = _parseaddr(sender)
++    sender_name,sender_addr = _parseaddr(config.get(section, 'from'))
+     _LOG.debug(
+         'sending message to {} via {}'.format(recipient, sendmail))
+     try:
+@@ -366,11 +366,11 @@
+     except Exception as e:
+         raise _error.SendmailError() from e
+ 
+-def send(sender, recipient, message, config=None, section='DEFAULT'):
++def send(recipient, message, config=None, section='DEFAULT'):
+     protocol = config.get(section, 'email-protocol')
+     if protocol == 'smtp':
+         smtp_send(
+-            sender=sender, recipient=recipient, message=message,
++            recipient=recipient, message=message,
+             config=config, section=section)
+     elif protocol == 'imap':
+         imap_send(message=message, config=config, section=section)
+@@ -378,5 +378,5 @@
+         maildir_send(message=message, config=config, section=section)
+     else:
+         sendmail_send(
+-            sender=sender, recipient=recipient, message=message,
++            recipient=recipient, message=message,
+             config=config, section=section)
+diff -Naur orig/rss2email/error.py new/rss2email/error.py
+--- orig/rss2email/error.py	2020-08-31 18:03:24.000000000 +0300
++++ new/rss2email/error.py	2020-09-05 16:09:45.000000000 +0300
+@@ -42,15 +42,14 @@
+ 
+ 
+ class TimeoutError (RSS2EmailError):
+-    def __init__(self, time_limited_function, message=None):
+-        if message is None:
+-            if time_limited_function.error is not None:
+-                message = (
+-                    'error while running time limited function: {}'.format(
+-                        time_limited_function.error[1]))
+-            else:
+-                message = '{} second timeout exceeded'.format(
+-                    time_limited_function.timeout)
++    def __init__(self, time_limited_function):
++        if time_limited_function.error is not None:
++            message = (
++                'error while running time limited function in {}: {}'.format(
++                    time_limited_function.name, time_limited_function.error[1]))
++        else:
++            message = '{} second timeout exceeded in {}'.format(
++                time_limited_function.timeout, time_limited_function.name)
+         super(TimeoutError, self).__init__(message=message)
+         self.time_limited_function = time_limited_function
+ 
+@@ -148,8 +147,9 @@
+ class InvalidFeedConfig (FeedError):
+     def __init__(self, setting, feed, message=None, **kwargs):
+         if not message:
+-            message = "invalid feed configuration {}".format(
+-                {setting: getattr(feed, setting)})
++            message = (
++                "invalid feed configuration '{setting}' in {feed}".format(
++                    setting=getattr(feed, setting), feed=feed))
+         super(InvalidFeedConfig, self).__init__(
+             feed=feed, message=message, **kwargs)
+         self.setting = setting
+diff -Naur orig/rss2email/feed.py new/rss2email/feed.py
+--- orig/rss2email/feed.py	2020-08-31 18:03:24.000000000 +0300
++++ new/rss2email/feed.py	2020-09-05 16:09:45.000000000 +0300
+@@ -373,7 +373,7 @@
+         kwargs = {}
+         if proxy:
+             kwargs['handlers'] = [_urllib_request.ProxyHandler({'http':proxy})]
+-        f = _util.TimeLimitedFunction(timeout, _feedparser.parse)
++        f = _util.TimeLimitedFunction('feed {}'.format(self.name), timeout, _feedparser.parse)
+         return f(self.url, self.etag, modified=self.modified, **kwargs)
+ 
+     def _process(self, parsed):
+@@ -773,9 +773,9 @@
+         if entry.get('summary_detail', None):
+             contents.append(entry.summary_detail)
+         if self.html_mail:
+-            types = ['text/html', 'text/plain']
++            types = ['application/xhtml+xml', 'text/html', 'text/plain']
+         else:
+-            types = ['text/plain', 'text/html']
++            types = ['text/plain', 'text/html', 'application/xhtml+xml']
+         for content_type in types:
+             for content in contents:
+                 if content['type'] == content_type:
+@@ -871,7 +871,7 @@
+         section = self.section
+         if section not in self.config:
+             section = 'DEFAULT'
+-        _email.send(sender=sender, recipient=self.to, message=message,
++        _email.send(recipient=self.to, message=message,
+                     config=self.config, section=section)
+ 
+     def run(self, send=True):
+diff -Naur orig/rss2email/feeds.py new/rss2email/feeds.py
+--- orig/rss2email/feeds.py	2020-08-31 18:03:24.000000000 +0300
++++ new/rss2email/feeds.py	2020-09-05 16:09:45.000000000 +0300
+@@ -239,11 +239,10 @@
+     def load(self, require=False):
+         _LOG.debug('load feed configuration from {}'.format(self.configfiles))
+         if self.configfiles:
+-            self.read_configfiles = self.config.read(self.configfiles)
++            read_configfiles = self.config.read(self.configfiles)
+         else:
+-            self.read_configfiles = []
+-        _LOG.debug('loaded configuration from {}'.format(
+-                self.read_configfiles))
++            read_configfiles = []
++        _LOG.debug('loaded configuration from {}'.format(read_configfiles))
+         self._load_feeds(require=require)
+ 
+     def _load_feeds(self, require):
+diff -Naur orig/rss2email/util.py new/rss2email/util.py
+--- orig/rss2email/util.py	2020-08-31 18:03:24.000000000 +0300
++++ new/rss2email/util.py	2020-09-05 16:09:45.000000000 +0300
+@@ -35,19 +35,20 @@
+     >>> def sleeping_return(sleep, x):
+     ...     time.sleep(sleep)
+     ...     return x
+-    >>> TimeLimitedFunction(0.5, sleeping_return)(0.1, 'x')
++    >>> TimeLimitedFunction('sleeping', 0.5, sleeping_return)(0.1, 'x')
+     'x'
+-    >>> TimeLimitedFunction(0.5, sleeping_return)(10, 'y')
++    >>> TimeLimitedFunction('sleeping', 0.5, sleeping_return)(10, 'y')
+     Traceback (most recent call last):
+       ...
+-    rss2email.error.TimeoutError: 0.5 second timeout exceeded
+-    >>> TimeLimitedFunction(0.5, time.sleep)('x')
++    rss2email.error.TimeoutError: 0.5 second timeout exceeded in sleeping
++    >>> TimeLimitedFunction('sleep', 0.5, time.sleep)('x')
+     Traceback (most recent call last):
+       ...
+-    rss2email.error.TimeoutError: error while running time limited function: a float is required
++    rss2email.error.TimeoutError: error while running time limited function in sleep: a float is required
+     """
+-    def __init__(self, timeout, target, **kwargs):
++    def __init__(self, name, timeout, target, **kwargs):
+         super(TimeLimitedFunction, self).__init__(target=target, daemon=True, **kwargs)
++        self.name = name
+         self.timeout = timeout
+         self.result = None
+         self.error = None
diff --git a/network/rss2email/README b/network/rss2email/README
new file mode 100644
index 0000000000..cdc9dd0f20
--- /dev/null
+++ b/network/rss2email/README
@@ -0,0 +1,8 @@
+A python script that converts RSS/Atom newsfeeds to email.
+
+It is the successor to the rss2email by Aaron Swartz, available on SBo
+as r2e.
+
+rss2email requires feedparser to be built with python3 support.
+
+rss2email will conflict with r2e.
diff --git a/network/rss2email/rss2email.SlackBuild b/network/rss2email/rss2email.SlackBuild
new file mode 100644
index 0000000000..f6e181b909
--- /dev/null
+++ b/network/rss2email/rss2email.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for rss2email
+
+# 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=rss2email
+VERSION=${VERSION:-3.12.2} # Don't forget to remove the patch below!!!
+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
+
+# For ver. 3.12.2 only
+patch -p1 < $CWD/4b36e28.patch
+
+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/man/man1
+gzip -c9 r2e.1 > $PKG/usr/man/man1/r2e.1.gz
+
+install -m 0644 -T -D completion/r2e.zsh $PKG/usr/share/zsh/site-functions/_r2e
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG HACKING.md 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/network/rss2email/rss2email.info b/network/rss2email/rss2email.info
new file mode 100644
index 0000000000..1b46bee487
--- /dev/null
+++ b/network/rss2email/rss2email.info
@@ -0,0 +1,10 @@
+PRGNAM="rss2email"
+VERSION="3.12.2"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+DOWNLOAD="https://github.com/rss2email/rss2email/archive/v3.12.2/rss2email-3.12.2.tar.gz"
+MD5SUM="9975f0c0f637daaa025d09ae54c33a8c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 feedparser html2text"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/rss2email/slack-desc b/network/rss2email/slack-desc
new file mode 100644
index 0000000000..9c4d4fb883
--- /dev/null
+++ b/network/rss2email/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------------------------------------------------------|
+rss2email: rss2email (rss to email gateway)
+rss2email:
+rss2email: A python script that converts RSS/Atom newsfeeds to email.
+rss2email:
+rss2email:
+rss2email:
+rss2email: Homepage: https://github.com/rss2email/rss2email
+rss2email:
+rss2email:
+rss2email:
+rss2email:
diff --git a/network/rtl8821ce/README b/network/rtl8821ce/README
new file mode 100644
index 0000000000..0c7cf68af3
--- /dev/null
+++ b/network/rtl8821ce/README
@@ -0,0 +1,24 @@
+Realtek RTL8821CE Driver maintained by Tomás Pinho for Arch Linux.
+Still, can serve Slackers as well!
+
+NOTE:
+
+  Although the driver builds for kernel 4.4.x as found in -14.2,
+  I only tested it in the field on kernel 5.4.x as found in -current.
+  Also, upstream warns that the source is targeting kernels > 4.14.
+
+To build the package for a kernel different from the running one,
+start the script setting the KERNEL variable as in:
+
+  KERNEL=4.4.14 ./rtl8821ce.SlackBuild
+
+NOTE:
+
+1. If you experience problems using this driver (e.g. a non-working
+   WiFi or Bluetooth), visit project's homepage to learn about possible
+   solutions.
+2. If you want to use this driver on -14.2, but with the kernel from
+   -current, you will need to compile the kernel yourself on -14.2.
+   Otherwise, you will run into compilation errors while building
+   the driver. I have no intent of fixing that, unless you provide me
+   with a working patch. ;-)
diff --git a/network/rtl8821ce/allow-kver-ksrc.patch b/network/rtl8821ce/allow-kver-ksrc.patch
new file mode 100644
index 0000000000..0629f749ee
--- /dev/null
+++ b/network/rtl8821ce/allow-kver-ksrc.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index 5b5dc9a..da26fdd 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1218,8 +1218,8 @@ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/)
+ ARCH ?= $(SUBARCH)
+ CROSS_COMPILE ?=
+-KVER  := $(shell uname -r)
+-KSRC := /lib/modules/$(KVER)/build
++KVER  ?= $(shell uname -r)
++KSRC ?= /lib/modules/$(KVER)/build
+ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
+ INSTALL_PREFIX :=
+ STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging
diff --git a/network/rtl8821ce/doinst.sh b/network/rtl8821ce/doinst.sh
new file mode 100644
index 0000000000..766ff48186
--- /dev/null
+++ b/network/rtl8821ce/doinst.sh
@@ -0,0 +1 @@
+chroot . /sbin/depmod -a @KERNEL@
diff --git a/network/rtl8821ce/opt-for-performance.patch b/network/rtl8821ce/opt-for-performance.patch
new file mode 100644
index 0000000000..636bab7f52
--- /dev/null
+++ b/network/rtl8821ce/opt-for-performance.patch
@@ -0,0 +1,11 @@
+diff --git a/Makefile b/Makefile
+index 5b5dc9a..4cfa841 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)
+-EXTRA_CFLAGS += -O1
++EXTRA_CFLAGS += -O2
+ #EXTRA_CFLAGS += -O3
+ #EXTRA_CFLAGS += -Wall
+ #EXTRA_CFLAGS += -Wextra
diff --git a/network/rtl8821ce/rtl8821ce.SlackBuild b/network/rtl8821ce/rtl8821ce.SlackBuild
new file mode 100644
index 0000000000..7f0c62e51c
--- /dev/null
+++ b/network/rtl8821ce/rtl8821ce.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for Realtek RTL8821CE Driver
+
+# 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=rtl8821ce
+VERSION=${VERSION:-20201006_fe97b50}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+KERNEL=${KERNEL:-$(uname -r)}
+KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
+PKG_VERS=${VERSION}_$(printf "%s" "${KERNEL}" | tr - _)
+
+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=${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 .
+
+# Optimize with -O2, inline with Slackware.
+
+patch -p1 < $CWD/opt-for-performance.patch
+
+# Allow building for kernels other than the running one.
+
+patch -p1 < $CWD/allow-kver-ksrc.patch
+
+make KVER=${KERNEL} KSRC=${KERNELPATH}
+
+mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/realtek/rtlwifi/$PRGNAM
+install -m 0644 8821ce.ko $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/realtek/rtlwifi/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$PKG_VERS
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKG_VERS/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+sed $CWD/doinst.sh -e "s%@KERNEL@%$KERNEL%" > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/rtl8821ce/rtl8821ce.info b/network/rtl8821ce/rtl8821ce.info
new file mode 100644
index 0000000000..a2c50137c9
--- /dev/null
+++ b/network/rtl8821ce/rtl8821ce.info
@@ -0,0 +1,10 @@
+PRGNAM="rtl8821ce"
+VERSION="20201006_fe97b50"
+HOMEPAGE="https://github.com/tomaspinho/rtl8821ce/"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/rtl8821ce/rtl8821ce-20201006_fe97b50.tar.gz"
+MD5SUM="f467f778f099b0f7a1634fe2f8bf0af4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrzej Telszewski"
+EMAIL="atelszewski@gmail.com"
diff --git a/network/rtl8821ce/slack-desc b/network/rtl8821ce/slack-desc
new file mode 100644
index 0000000000..70df3960a0
--- /dev/null
+++ b/network/rtl8821ce/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------------------------------------------------------|
+rtl8821ce: rtl8821ce (Realtek RTL8821CE Driver)
+rtl8821ce:
+rtl8821ce: Realtek RTL8821CE Driver maintained by Tomás Pinho for Arch Linux.
+rtl8821ce: Still, can serve Slackers as well!
+rtl8821ce:
+rtl8821ce: If you experience problems using this driver, please visit
+rtl8821ce: project's homepage to learn about possible solutions.
+rtl8821ce:
+rtl8821ce: Homepage: https://github.com/tomaspinho/rtl8821ce/
+rtl8821ce:
+rtl8821ce:
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 414be4148e..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.16/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 1370c243b1..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.16/README
-Note that the slackbuild removes /usr/share/doc/sfeed; thus, please
-copy necessary files from /usr/doc/sfeed-0.9.16
+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: 
 mkdir -p "$HOME/.sfeed/feeds"
 
 - Initialize sfeedrc, such as by copying and editing the example file:
-cp /usr/doc/sfeed-0.9.16/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.16/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 eaca76bc01..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.16}
+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 ab5a3c5cf5..fbed4d46f6 100644
--- a/network/sfeed/sfeed.info
+++ b/network/sfeed/sfeed.info
@@ -1,8 +1,8 @@
 PRGNAM="sfeed"
-VERSION="0.9.16"
+VERSION="0.9.22"
 HOMEPAGE="https://codemadness.org/releases/sfeed/"
-DOWNLOAD="https://codemadness.org/releases/sfeed/sfeed-0.9.16.tar.gz"
-MD5SUM="84bf9493cc3ca353f728f8582728e9de"
+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/shadowsocks-libev/shadowsocks-libev.SlackBuild b/network/shadowsocks-libev/shadowsocks-libev.SlackBuild
index ddc7378a48..59467093f9 100644
--- a/network/shadowsocks-libev/shadowsocks-libev.SlackBuild
+++ b/network/shadowsocks-libev/shadowsocks-libev.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shadowsocks-libev
-VERSION=${VERSION:-3.3.4}
+VERSION=${VERSION:-3.3.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/shadowsocks-libev/shadowsocks-libev.info b/network/shadowsocks-libev/shadowsocks-libev.info
index 93742892e9..8c7b668ad9 100644
--- a/network/shadowsocks-libev/shadowsocks-libev.info
+++ b/network/shadowsocks-libev/shadowsocks-libev.info
@@ -1,8 +1,8 @@
 PRGNAM="shadowsocks-libev"
-VERSION="3.3.4"
+VERSION="3.3.5"
 HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
-DOWNLOAD="https://github.com/shadowsocks/shadowsocks-libev/releases/download/v3.3.4/shadowsocks-libev-3.3.4.tar.gz"
-MD5SUM="fb41e60db217b658a14fe3519cd78c62"
+DOWNLOAD="https://github.com/shadowsocks/shadowsocks-libev/releases/download/v3.3.5/shadowsocks-libev-3.3.5.tar.gz"
+MD5SUM="891392c245ab4702b70f0053bd3eec6b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mbedtls libsodium libev c-ares"
diff --git a/network/shorewall-core/README b/network/shorewall-core/README
index ef3127a790..1c5b62089a 100644
--- a/network/shorewall-core/README
+++ b/network/shorewall-core/README
@@ -1,15 +1,19 @@
 Shorewall-core (Iptables Made Easy)
 
-The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter
-(iptables) based firewall that can be used on a dedicated firewall system, a
-multi-function gateway/router/server or on a standalone GNU/Linux system.
+The Shoreline Firewall, more commonly known as "Shorewall", is a
+Netfilter (iptables) based firewall that can be used on a dedicated
+firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system.
 
 As of version 4.5, shorewall consists of 3 packages:
-* shorewall-core, containing the common elements to both IPv4 and IPv6 components
+* shorewall-core, containing the common elements to both IPv4 and IPv6
+  components
 * shorewall, the IPv4 component
 * shorewall6, the IPv6 component
 
-The shorewall-core package is needed for both but now you can install the IPv6
-packages without needing the IPv4 one if you are on aIV6 network only.
+The shorewall-core package is needed for both but now you can install
+the IPv6 packages without needing the IPv4 one if you are on aIV6
+network only.
 
-xtables-addons is an optional dependency to use the new per-IP accounting feature.
+xtables-addons is an optional dependency to use the new per-IP
+accounting feature.
diff --git a/network/shorewall-core/shorewall-core.SlackBuild b/network/shorewall-core/shorewall-core.SlackBuild
index dfcfccb0bc..3979b91135 100644
--- a/network/shorewall-core/shorewall-core.SlackBuild
+++ b/network/shorewall-core/shorewall-core.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shorewall-core
-VERSION=${VERSION:-5.2.3.6}
+VERSION=${VERSION:-5.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/shorewall-core/shorewall-core.info b/network/shorewall-core/shorewall-core.info
index 70948ed219..3fd281738a 100644
--- a/network/shorewall-core/shorewall-core.info
+++ b/network/shorewall-core/shorewall-core.info
@@ -1,8 +1,8 @@
 PRGNAM="shorewall-core"
-VERSION="5.2.3.6"
+VERSION="5.2.8"
 HOMEPAGE="https://shorewall.org"
-DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.3/shorewall-core-5.2.3.6.tar.bz2"
-MD5SUM="5b60a268c4093dcc993b092a92399827"
+DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-core-5.2.8.tar.bz2"
+MD5SUM="07c7371fd2896e87f373b760561e41a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/shorewall/README b/network/shorewall/README
index 4586b6a7d0..abb04663cf 100644
--- a/network/shorewall/README
+++ b/network/shorewall/README
@@ -1,13 +1,16 @@
 Shorewall (IPv4 support package for shorewall)
 
-The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter
-(iptables) based firewall that can be used on a dedicated firewall system, a
-multi-function gateway/router/server or on a standalone GNU/Linux system.
+The Shoreline Firewall, more commonly known as "Shorewall", is a
+Netfilter (iptables) based firewall that can be used on a dedicated
+firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system.
 
 As of version 4.5, shorewall consists of 3 packages:
-* shorewall-core, containing the common elements to both IPv4 and IPv6 components
+* shorewall-core, containing the common elements to both IPv4 and IPv6
+  components
 * shorewall, the IPv4 component
 * shorewall6, the IPv6 component
 
-The shorewall-core package is needed for both but now you can install the IPv6
-packages without needing the IPv4 one if you are on aIV6 network only.
+The shorewall-core package is needed for both but now you can install
+the IPv6 packages without needing the IPv4 one if you are on aIV6
+network only.
diff --git a/network/shorewall/shorewall.SlackBuild b/network/shorewall/shorewall.SlackBuild
index 3d7d9058a7..729f735a57 100644
--- a/network/shorewall/shorewall.SlackBuild
+++ b/network/shorewall/shorewall.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shorewall
-VERSION=${VERSION:-5.2.3.6}
+VERSION=${VERSION:-5.2.8}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/shorewall/shorewall.info b/network/shorewall/shorewall.info
index c3c72a4cd0..9cd69afffc 100644
--- a/network/shorewall/shorewall.info
+++ b/network/shorewall/shorewall.info
@@ -1,8 +1,8 @@
 PRGNAM="shorewall"
-VERSION="5.2.3.6"
+VERSION="5.2.8"
 HOMEPAGE="https://shorewall.org"
-DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.3/shorewall-5.2.3.6.tar.bz2"
-MD5SUM="a0bdd3834509bb95b8e1f0cc39905a88"
+DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-5.2.8.tar.bz2"
+MD5SUM="0e4041810f066deef40bf9e57fa79e96"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="shorewall-core"
diff --git a/network/shorewall6/README b/network/shorewall6/README
index 20e94d57ad..0a0309db2c 100644
--- a/network/shorewall6/README
+++ b/network/shorewall6/README
@@ -1,13 +1,16 @@
 Shorewall (IPv6 support package for shorewall)
 
-The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter
-(iptables) based firewall that can be used on a dedicated firewall system, a
-multi-function gateway/router/server or on a standalone GNU/Linux system.
+The Shoreline Firewall, more commonly known as "Shorewall", is a
+Netfilter (iptables) based firewall that can be used on a dedicated
+firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system.
 
 As of version 4.5, shorewall consists of 3 packages:
-* shorewall-core, containing the common elements to both IPv4 and IPv6 components
+* shorewall-core, containing the common elements to both IPv4 and IPv6
+  components
 * shorewall, the IPv4 component
 * shorewall6, the IPv6 component
 
-The shorewall-core package is needed for both but now you can install the IPv6
-packages without needing the IPv4 one if you are on aIV6 network only.
+The shorewall-core package is needed for both but now you can install
+the IPv6 packages without needing the IPv4 one if you are on aIV6
+network only.
diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild
index cd0cbed8a1..234c1390ba 100644
--- a/network/shorewall6/shorewall6.SlackBuild
+++ b/network/shorewall6/shorewall6.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shorewall6
-VERSION=${VERSION:-5.2.3.6}
+VERSION=${VERSION:-5.2.8}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/shorewall6/shorewall6.info b/network/shorewall6/shorewall6.info
index 4edcd20547..eca8a9b2a9 100644
--- a/network/shorewall6/shorewall6.info
+++ b/network/shorewall6/shorewall6.info
@@ -1,8 +1,8 @@
 PRGNAM="shorewall6"
-VERSION="5.2.3.6"
+VERSION="5.2.8"
 HOMEPAGE="https://shorewall.org"
-DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-5.2.3.6.tar.bz2"
-MD5SUM="175c79d405b5d56f7ece54b1fb0d2f8a"
+DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-5.2.8.tar.bz2"
+MD5SUM="4a9a2f55cd40bb2cc17dae0227350c4d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="shorewall-core"
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 94fae884ba..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.32.1}
+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 e24adb82aa..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.32.1"
+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.32.1_amd64.deb"
-MD5SUM_x86_64="b0575757ac7daa4530eda6d83e3b4591"
-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/sipp/sipp.SlackBuild b/network/sipp/sipp.SlackBuild
index 06edad04f4..288eb1c8f1 100644
--- a/network/sipp/sipp.SlackBuild
+++ b/network/sipp/sipp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SIPp
 
-# Copyright 2013-2019 Kent Fritz Mountain View, California, USA
+# Copyright 2013-2020 Kent Fritz Mountain View, 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=sipp
-VERSION=${VERSION:-3.5.2}
+VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -97,7 +97,7 @@ mkdir -p $PKG/usr/share/$PRGNAM/pcap
 cp -a pcap/* $PKG/usr/share/$PRGNAM/pcap
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md LICENSE.txt THANKS CHANGES.md FAQ.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE.txt THANKS CHANGES.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/sipp/sipp.info b/network/sipp/sipp.info
index 79b08686dd..519aa0a9de 100644
--- a/network/sipp/sipp.info
+++ b/network/sipp/sipp.info
@@ -1,8 +1,8 @@
 PRGNAM="sipp"
-VERSION="3.5.2"
+VERSION="3.6.0"
 HOMEPAGE="http://sipp.sourceforge.net"
-DOWNLOAD="https://github.com/SIPp/sipp/releases/download/v3.5.2/sipp-3.5.2.tar.gz"
-MD5SUM="604df972c6ed3ddc598b2b83d7a8ddad"
+DOWNLOAD="https://github.com/SIPp/sipp/releases/download/v3.6.0/sipp-3.6.0.tar.gz"
+MD5SUM="1fd27333d179d786d3f6a67ee451fae9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/skypeforlinux/skypeforlinux.SlackBuild b/network/skypeforlinux/skypeforlinux.SlackBuild
index 89f5e03c3b..600dfc1a7b 100644
--- a/network/skypeforlinux/skypeforlinux.SlackBuild
+++ b/network/skypeforlinux/skypeforlinux.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for skypeforlinux
 
-# Copyright 2017, 2018, 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 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=skypeforlinux
-VERSION=${VERSION:-8.55.0.141}
+VERSION=${VERSION:-8.65.0.76}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/skypeforlinux/skypeforlinux.info b/network/skypeforlinux/skypeforlinux.info
index 8740bffaac..f7f973d7e6 100644
--- a/network/skypeforlinux/skypeforlinux.info
+++ b/network/skypeforlinux/skypeforlinux.info
@@ -1,10 +1,10 @@
 PRGNAM="skypeforlinux"
-VERSION="8.55.0.141"
+VERSION="8.65.0.76"
 HOMEPAGE="https://www.skype.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.55.0.141_amd64.deb"
-MD5SUM_x86_64="d05e42c77723d72d33fdb3e8152a37f5"
+DOWNLOAD_x86_64="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.65.0.76_amd64.deb"
+MD5SUM_x86_64="283a82cefb9dc7ba3baad25e47ce9a82"
 REQUIRES="%README%"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/slack/slack.SlackBuild b/network/slack/slack.SlackBuild
index 4091298ba7..8147f4bd6d 100644
--- a/network/slack/slack.SlackBuild
+++ b/network/slack/slack.SlackBuild
@@ -27,7 +27,7 @@
 
 
 PRGNAM=slack
-VERSION=${VERSION:-4.3.2}
+VERSION=${VERSION:-4.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/slack/slack.info b/network/slack/slack.info
index d460a5b6d1..1149a34c65 100644
--- a/network/slack/slack.info
+++ b/network/slack/slack.info
@@ -1,10 +1,10 @@
 PRGNAM="slack"
-VERSION="4.3.2"
+VERSION="4.4.2"
 HOMEPAGE="https://slack.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://downloads.slack-edge.com/linux_releases/slack-desktop-4.3.2-amd64.deb"
-MD5SUM_x86_64="d6f11e7d87952e7d953154aaa3316a22"
+DOWNLOAD_x86_64="https://downloads.slack-edge.com/linux_releases/slack-desktop-4.4.2-amd64.deb"
+MD5SUM_x86_64="bf426603bbaa765566435893764de83e"
 REQUIRES=""
 MAINTAINER="Pedro R.M. Júnior"
 EMAIL="pedrormjunior@gmail.com"
diff --git a/network/slimjet/doinst.sh b/network/slimjet/doinst.sh
index 65c7e2eeb9..d8b0d0d87b 100644
--- a/network/slimjet/doinst.sh
+++ b/network/slimjet/doinst.sh
@@ -1,3 +1,4 @@
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -7,3 +8,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/network/slimjet/slimjet.SlackBuild b/network/slimjet/slimjet.SlackBuild
index e6b6709e8a..bd57b25c68 100644
--- a/network/slimjet/slimjet.SlackBuild
+++ b/network/slimjet/slimjet.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slimjet
-VERSION=${VERSION:-25.0.11.0}
+VERSION=${VERSION:-26.0.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/slimjet/slimjet.info b/network/slimjet/slimjet.info
index 20a899cbf6..2d5f9599ea 100644
--- a/network/slimjet/slimjet.info
+++ b/network/slimjet/slimjet.info
@@ -1,10 +1,10 @@
 PRGNAM="slimjet"
-VERSION="25.0.11.0"
+VERSION="26.0.5.0"
 HOMEPAGE="https://www.slimjet.com"
 DOWNLOAD="https://www.slimjetbrowser.com/release/slimjet_i386.tar.xz"
-MD5SUM="ddc4c31fb6bdcabb2c71ff1fe6d749a0"
+MD5SUM="01340e4890b6296b33d8eb85d668f874"
 DOWNLOAD_x86_64="https://www.slimjetbrowser.com/release/slimjet_amd64.tar.xz"
-MD5SUM_x86_64="814987a890dd598a501a5f6ba25624d3"
+MD5SUM_x86_64="0759295bbe7a4c252ee94b824f1d9196"
 REQUIRES=""
 MAINTAINER="Skaendo"
 EMAIL="skaendo@linuxmail.org"
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/slack-desc b/network/spamassassin/slack-desc
index da362b6936..ac7015f84a 100644
--- a/network/spamassassin/slack-desc
+++ b/network/spamassassin/slack-desc
@@ -13,7 +13,7 @@ spamassassin: of tests to identify unsolicited bulk email, more commonly
 spamassassin: known as Spam. These tests are applied to email headers and
 spamassassin: content to classify email using advanced statistical methods.
 spamassassin:
-spamassassin: Homepage: http://spamassassin.apache.org
+spamassassin: Homepage: https://spamassassin.apache.org
 spamassassin:
 spamassassin:
 spamassassin:
diff --git a/network/spamassassin/spamassassin.SlackBuild b/network/spamassassin/spamassassin.SlackBuild
index 13f1b0388c..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.2}
+VERSION=${VERSION:-3.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/spamassassin/spamassassin.info b/network/spamassassin/spamassassin.info
index bcea070b64..bfa522dc00 100644
--- a/network/spamassassin/spamassassin.info
+++ b/network/spamassassin/spamassassin.info
@@ -1,8 +1,8 @@
 PRGNAM="spamassassin"
-VERSION="3.4.2"
-HOMEPAGE="http://spamassassin.apache.org/"
-DOWNLOAD="http://www.eu.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.2.tar.bz2"
-MD5SUM="4f4c38a7cd4ae3e3750895ae21d2fc78"
+VERSION="3.4.6"
+HOMEPAGE="https://spamassassin.apache.org/"
+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/speedometer/changelog b/network/speedometer/changelog
new file mode 100644
index 0000000000..3ab3448f88
--- /dev/null
+++ b/network/speedometer/changelog
@@ -0,0 +1,153 @@
+speedometer (2.8-3) unstable; urgency=medium
+
+  * New maintainer. (Closes: #920070)
+  * Switch to Python 3, consequently:
+      - debian/control: updated dependencies to python3.
+      - debian/patches/update-to-python3.patch: added to provide
+        python3 support. (Closes: #943229)
+  * Using new DH level format. Consequently:
+      - debian/compat: removed.
+      - debian/control: Changed from 'debhelper' to 'debhelper-compat' in
+        Build-Depends field and bumped level to 12.
+  * debian/control:
+      - Added the field Rules-Requires-Root: no
+      - Standards-Version: bumped to 4.4.1 (no changes needed)
+      - Switch VCS URLs to salsa.debian.org
+  * debian/copyright:
+      - Added safe uri (https) to Format.
+      - Updated years and rights.
+  * debian/rules:
+      - Added pybuild support.
+      - Updated to reduced format.
+  * debian/salsa-ci.yml: added to provide CI tests for Salsa.
+  * debian/upstream/metadata: created.
+  * debian/upstream.changelog: removed, upstream no longer uses hg repo.
+  * debian/watch:
+      - migrated to version 4.
+      - updated to new repository in Github an using new variables.
+
+
+ -- Giovani Augusto Ferreira <giovani@debian.org>  Tue, 17 Dec 2019 10:43:07 -0300
+
+speedometer (2.8-2) unstable; urgency=medium
+
+  * debian/compat
+    - Updae to 9.
+  * debian/control
+    - (Build-Depends): Update to debhelper 9.
+    - (Homepage): Move field.
+    - (Standards-Version): Update to 3.9.8.
+    - (Vcs-*): Update to anonscm.debian.org.
+  * debian/copyright
+    - Update URLs.
+  * debian/pod2man.mk
+    - Make build reproducible (Closes: 782221).
+      Patch thanks to Reiner Herrmann <reiner@reiner-h.de>.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Wed, 19 Oct 2016 18:25:25 +0300
+
+speedometer (2.8-1) unstable; urgency=low
+
+  [Jari Aalto]
+  * New upstream release
+    - Linear scale (Closes: #415397).
+  * debian/copyright
+    - (Format): Update URL.
+  * debian/rules
+    - (get-changelog): Add more commentary.
+  * debian/upstream.changelog
+    - Update.
+
+  [tony mancill]
+  * Add python-setuptools to Build-Depends
+
+ -- Jari Aalto <jari.aalto@cante.net>  Fri, 09 Dec 2011 14:30:46 +0200
+
+speedometer (2.7-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix Python 2.5.4 DeprecationWarning: The popen2 module is deprecated
+      (Closes: #583573).
+  * debian/compat
+    - Update to 8.
+  * debian/control
+    - (Build-Depends): Update to debhelper 8.
+    - (Standards-Version): Update to 3.9.2.
+  * debian/copyright
+    - Update to DEP5.
+    - (Files: *): Correct license to LGPL 2.1.
+  * debian/*.mk
+    - Minor updates.
+  * debian/speedometer.1.pod
+    - (top level): Proper starting comment.
+    - (DESCRIPTION): Improve documentation to note that
+      traffic must be generated (Closes: #583576).
+    - (EXAMPLES): Adjust indentation.
+    - (SEE ALSO): Add more programs.
+    - (AUTHORS): Adjust wording.
+  * debian/rules
+    - (PKGDIR): New.
+    - (get-changelog): New.
+    - Cleanup rules handled by dh(1).
+
+ -- Jari Aalto <jari.aalto@cante.net>  Thu, 21 Apr 2011 19:34:18 +0300
+
+speedometer (2.6-3) unstable; urgency=low
+
+  * debian/control
+    - (Depends): Update to python-urwid (>= 0.9.9.1), because (0.9.9) is
+      not compatible (Closes: #569070). Update to debhelper 7.1 due to
+      oveerrides in debian/rules
+    - (Standards-Version): update to 3.8.4.
+  * debian/rules:
+    - (binary-indep): Remove unused commands.
+    - (install): remove target.
+    - (override_dh_auto_install): New target.
+    - (.PHONY): cleanup targets.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Mon, 22 Feb 2010 16:18:59 +0200
+
+speedometer (2.6-2) unstable; urgency=low
+
+  * Move to packaging format: 3.0 (quilt).
+  * debian/clean
+    - Move content from 'rules' for dh(1) to use.
+  * debian/compat
+    - Update to 7.
+  * debian/control
+    - (Build-Depends): update to debhelper 7.
+    - (Description): convert examples to bullets.
+    - (Depends): add ${misc:Depends} for debhelper,
+      add version to dependency python-urwid (>= 0.9.1).
+    - (Standards-Version): update to 3.8.3
+  * debian/copyright
+    - (GPL): Use FSF URL (FSF recommendation).
+  * debian/rules
+    - Remove rules obsoleted by dh(1).
+  * debian/source/format
+    - New file.
+  * debian/speedometer.1
+    - Delete file generated from *.pod source (see debian/rules::man).
+  * debian/speedometer.manpages
+    - Move content from 'rules' for dh(1) to use.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Sat, 19 Dec 2009 13:52:03 +0200
+
+speedometer (2.6-1) unstable; urgency=low
+
+  * New upstream version. (Closes: #473420).
+  * debian/changelog
+    - Adjust indentation and layout.
+    - Change time to ISO 8601 notation.
+  * debian/control
+    - (Vcs-*): New fields.
+    - (Homepage): move to separate field.
+    - (Standards-Version): Update to 3.8.0.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Sat, 18 Oct 2008 01:07:47 +0300
+
+speedometer (2.4-1) unstable; urgency=low
+
+  * Initial release (Closes: #404671)
+
+ -- Jari Aalto <jari.aalto@cante.net>  Sat, 13 Jan 2007 20:34:25 +0200
diff --git a/network/speedometer/speedometer.1.pod b/network/speedometer/speedometer.1.pod
new file mode 100644
index 0000000000..7e228f8fae
--- /dev/null
+++ b/network/speedometer/speedometer.1.pod
@@ -0,0 +1,147 @@
+#   Copyright
+#
+#	Copyright (C) 2007-2010 Jari Aalto
+#
+#   License
+#
+#       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 2 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 <http://www.gnu.org/licenses/>.
+#
+#   Description
+#
+#	To learn what TOP LEVEL sections to use in manual pages,
+#	see POSIX/Susv standard and "Utility Description Defaults" at
+#	http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap01.html#tag_01_11
+#
+#	This is manual page in Perl POD format. Read more at
+#	http://perldoc.perl.org/perlpod.html or run command:
+#
+#	    perldoc perlpod | less
+#
+#	To check the syntax:
+#
+#	    podchecker *.pod
+#
+#	Create manual page with command:
+#
+#	    pod2man PAGE.N.pod > PAGE.N
+
+=pod
+
+=head1 NAME
+
+speedometer - measure and display the rate of data across a network connection
+
+=head1 SYNOPSIS
+
+   speedometer [options] tap [[-c] tap] ...
+
+=head1 DESCRIPTION
+
+Monitor network traffic or speed/progress of a file transfer. At least
+one tap option (B<-f>, B<-rx>, B<-tx>) must be entered. Option B<-c>
+starts a new column, otherwise taps are piled vertically.
+
+Note: before you use the program, satrt generating traffic by
+transferring files in/out e.g. with scp(1) in the network you're
+measuring.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-b>
+
+Use old blocky display instead of smoothed display even when UTF-8
+encoding is detected.
+
+=item B<-f filename [size]>
+
+Display download speed with progress bar. This option must be used if
+directly following another file tap without an expected size
+specified.
+
+=item B<-i interval>
+
+Interval in seconds. Examples: 5 or 0.25". Default is 1.
+
+=item B<-p>
+
+Use plain-text display (one tap only).
+
+=item B<-rx iface>
+
+Display bytes received on network interface.
+
+=item B<-tx iface>
+
+Display bytes transmitted on network interface.
+
+=item B<-z>
+
+Report zero size on files that don't exist instead of waiting for them
+to be created
+
+=back
+
+EXAMPLES
+
+How long it will take for my 38MB transfer to finish?
+
+    speedometer favorite_episode.rm $(( 38 * 1024 * 1024 ))
+
+How quickly is another transfer going?
+
+    speedometer dl/big.avi
+
+How fast is this LAN?
+
+    host-a$ cat /dev/zero | nc -l -p 12345
+    host-b$ nc host-a 12345 > /dev/null
+    host-b$ speedometer -rx eth0
+
+How fast is the upstream on this ADSL line?
+
+    speedometer -tx ppp0
+
+How fast can I write data to my filesystem? (with at least 1GB free)
+
+    dd bs=1000000 count=1000 if=/dev/zero of=bigfile &
+    speedometer bigfile
+
+=head1 ENVIRONMENT
+
+None.
+
+=head1 FILES
+
+None.
+
+=head1 SEE ALSO
+
+htop(1)
+iotop(1)
+scp(1)
+top(1)
+vmstat(1)
+
+=head1 AUTHORS
+
+Program was written by Ian Ward <ian.ward@excess.org>
+
+This manual page was written by Jari Aalto <jari.aalto@cante.net>.
+Released under license GNU GPL version 2 or (at your option) any later
+version. For more information about license, visit
+<http://www.gnu.org/copyleft/gpl.html>.
+
+=cut
diff --git a/network/speedometer/speedometer.SlackBuild b/network/speedometer/speedometer.SlackBuild
index 32b374ea93..9fb3e89275 100644
--- a/network/speedometer/speedometer.SlackBuild
+++ b/network/speedometer/speedometer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for speedometer
 
-# Copyright 2015 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
@@ -24,12 +24,12 @@
 
 PRGNAM=speedometer
 VERSION=${VERSION:-2.8}
-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
@@ -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"
@@ -69,15 +69,21 @@ 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
+patch -Np1 < $CWD/update-to-python3.patch
+python3 setup.py install --root=$PKG --optimize=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
 
-DOCS="CHANGELOG"
+# make manpage.
+mkdir -p $PKG/usr/man/man1/
+pod2man $CWD/speedometer.1.pod > $PKG/usr/man/man1/speedometer.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
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+install -Dm644 $CWD/changelog $PKG/usr/doc/$PRGNAM-$VERSION/CHANGELOG
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/speedometer/speedometer.info b/network/speedometer/speedometer.info
index f99c0b453c..0bcb7a15fd 100644
--- a/network/speedometer/speedometer.info
+++ b/network/speedometer/speedometer.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://excess.org/speedometer/speedometer-2.8.tar.gz"
 MD5SUM="aa52b9253117523202d6ec8c110344ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="psutil python3-six python3-urwid"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/network/speedometer/update-to-python3.patch b/network/speedometer/update-to-python3.patch
new file mode 100644
index 0000000000..dfce959f3b
--- /dev/null
+++ b/network/speedometer/update-to-python3.patch
@@ -0,0 +1,174 @@
+Description: Update upstream source to Python 3.
+             Based on fixes at https://github.com/kenduest/speedometer/
+Author: Giovani Augusto Ferreira <giovani@debian.org>
+Last-Update: 2019-12-08
+
+Index: speedometer/speedometer.py
+===================================================================
+--- speedometer.orig/speedometer.py
++++ speedometer/speedometer.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ # speedometer.py
+ # Copyright (C) 2001-2011  Ian Ward
+@@ -21,6 +21,8 @@ import os
+ import string
+ import math
+ import re
++import psutil
++import six
+ 
+ __usage__ = """Usage: speedometer [options] tap [[-c] tap]...
+ Monitor network traffic or speed/progress of a file transfer.  At least one
+@@ -76,6 +78,10 @@ units_per_second = 'bytes'
+ chart_minimum = 2**5
+ chart_maximum = 2**32
+ 
++if six.PY3:
++    def long(*args,**kwargs):
++        return int(*args,**kwargs)
++
+ graph_scale = None
+ def update_scale():
+     """
+@@ -400,7 +406,8 @@ class SpeedGraph:
+         self.log = []
+         self.bar = []
+ 
+-    def get_data(self, (maxcol,maxrow)):
++    def get_data(self, max_col_row):
++        maxcol, maxrow = max_col_row
+         bar = self.bar[-maxcol:]
+         if len(bar) < maxcol:
+             bar = [[0]]*(maxcol-len(bar)) + bar
+@@ -409,8 +416,8 @@ class SpeedGraph:
+     def selectable(self):
+         return False
+ 
+-    def render(self, (maxcol, maxrow), focus=False):
+-
++    def render(self, max_col_row, focus=False):
++        maxcol, maxrow = max_col_row
+         left = max(0, len(self.log)-maxcol)
+         pad = maxcol-(len(self.log)-left)
+ 
+@@ -445,8 +452,8 @@ class SpeedGraph:
+         for i in range(left+max(0, ldist-pad),len(l)-rdist+1):
+             li = l[i]
+             if li == 0: continue
+-            if i and l[i-1]>=li: continue
+-            if l[i+1]>li: continue
++            if i and l[i-1] != None and l[i-1]>=li: continue
++            if li is None or l[i+1]>li: continue
+             highs.append((li, -i))
+ 
+         highs.sort()
+@@ -471,7 +478,7 @@ class SpeedGraph:
+ 
+ 
+ def speed_scale(s):
+-    if s <= 0: return 0
++    if s is None or s <= 0: return 0
+     if logarithmic_scale:
+         s = math.log(s, 2)
+     s = min(graph_range(), max(0, s-graph_min()))
+@@ -498,7 +505,7 @@ def readable_speed(speed):
+     if speed == None or speed < 0: speed = 0
+ 
+     units = "B/s  ", "KiB/s", "MiB/s", "GiB/s", "TiB/s"
+-    step = 1L
++    step = long(1)
+ 
+     for u in units:
+ 
+@@ -511,7 +518,7 @@ def readable_speed(speed):
+         if speed/step < 1024:
+             return "%4d " %(speed/step) + u
+ 
+-        step = step * 1024L
++        step = step * long(1024)
+ 
+     return "%4d " % (speed/(step/1024)) + units[-1]
+ 
+@@ -524,7 +531,7 @@ def readable_speed_bits(speed):
+ 
+     speed = speed * 8
+     units = "b/s  ", "Kib/s", "Mib/s", "Gib/s", "Tib/s"
+-    step = 1L
++    step = long(1)
+ 
+     for u in units:
+ 
+@@ -537,7 +544,7 @@ def readable_speed_bits(speed):
+         if speed/step < 1024:
+             return "%4d " %(speed/step) + u
+ 
+-        step = step * 1024L
++        step = step * long(1024)
+ 
+     return "%4d " % (speed/(step/1024)) + units[-1]
+ 
+@@ -607,18 +614,12 @@ def network_feed(device,rxtx):
+     r = re.compile(r"^\s*" + re.escape(device) + r":(.*)$", re.MULTILINE)
+ 
+     def networkfn(devre=r,rxtx=rxtx):
+-        f = open('/proc/net/dev')
+-        dev_lines = f.read()
+-        f.close()
+-        match = devre.search(dev_lines)
+-        if not match:
+-            return None
+-
+-        parts = match.group(1).split()
+         if rxtx == 'RX':
+-            return long(parts[0])
++            val=psutil.net_io_counters(pernic=True)[device].bytes_recv
+         else:
+-            return long(parts[8])
++            val=psutil.net_io_counters(pernic=True)[device].bytes_sent
++
++        return long(val)
+ 
+     return networkfn
+ 
+@@ -728,7 +729,7 @@ def time_as_units(seconds):
+     # (multiplicative factor, suffix)
+     units = (1,"s"), (60,"m"), (60,"h"), (24,"d"), (7,"w"), (52,"y")
+ 
+-    scale = 1L
++    scale = long(1)
+     topunit = -1
+     # find the top unit to use
+     for mul, suf in units:
+@@ -757,7 +758,7 @@ def readable_time(seconds, columns=None)
+     for value, suf in time_as_units(seconds):
+         new_out = out
+         if out: new_out = new_out + ' '
+-        new_out = new_out + `value` + suf
++        new_out = new_out + value + suf
+         if columns and len(new_out) > columns: break
+         out = new_out
+ 
+@@ -1091,6 +1092,6 @@ def wait_all(cols):
+ if __name__ == "__main__":
+     try:
+         console()
+-    except KeyboardInterrupt, err:
++    except KeyboardInterrupt as err:
+         pass
+ 
+Index: speedometer/setup.py
+===================================================================
+--- speedometer.orig/setup.py
++++ speedometer/setup.py
+@@ -35,7 +35,7 @@ setup_d = {
+     'scripts': ['speedometer.py'],
+     'entry_points': {
+         'console_scripts': ['speedometer = speedometer:console'],},
+-    'install_requires': ['urwid >= 0.9.9.1'],
++    'install_requires': ['urwid >= 0.9.9.1', 'psutil', 'six'],
+     'license':"LGPL",
+     'keywords':"network bandwidth monitor system speed download file progress console",
+     'platforms':"Linux",
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/spice/README b/network/spice/README
index 33f1c5c341..c8f4286b58 100644
--- a/network/spice/README
+++ b/network/spice/README
@@ -7,5 +7,5 @@ without compromising on the user experience.
 
 libcacard is an optional dependency for virtual smartcard support.
 
-lz4, opus, gst-libav, and gst-plugins-bad (with x264 support)  are also
+lz4, opus, gst-libav, and gst-plugins-ugly (with x264 support) are also
 optional dependencies.
diff --git a/network/sqlmap/sqlmap.SlackBuild b/network/sqlmap/sqlmap.SlackBuild
index 0bfd2b7954..287d9a23cc 100644
--- a/network/sqlmap/sqlmap.SlackBuild
+++ b/network/sqlmap/sqlmap.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for sqlmap.
 
 # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015-2018 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2015-2018, 2020 Brenton Earl <brent@exitstatusone.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=sqlmap
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.4.9}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/sqlmap/sqlmap.info b/network/sqlmap/sqlmap.info
index d60732ed67..2d9ff51976 100644
--- a/network/sqlmap/sqlmap.info
+++ b/network/sqlmap/sqlmap.info
@@ -1,8 +1,8 @@
 PRGNAM="sqlmap"
-VERSION="1.2.10"
+VERSION="1.4.9"
 HOMEPAGE="http://sqlmap.org/"
-DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.2.10/sqlmap-1.2.10.tar.gz"
-MD5SUM="55e5aa88807d9ea720edd95792a335a6"
+DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.4.9/sqlmap-1.4.9.tar.gz"
+MD5SUM="f79dac9b60f40ccdb4e1a05797b7cdc6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/squid/rc.squid b/network/squid/rc.squid
index 7aef4777fe..2f3463e6be 100644
--- a/network/squid/rc.squid
+++ b/network/squid/rc.squid
@@ -34,7 +34,7 @@ squid_start() {
 
   # Create piddir and set proper permissions
   mkdir -p /var/run/squid
-  chown root:@SQUIDGROUP@ /var/run/squid
+  chown @SQUIDUSER@:@SQUIDGROUP@ /var/run/squid
 
   echo "Starting Squid:  $SQUIDCMD -F"
   $SQUIDCMD -F
diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild
index 900d9081c8..2f8ef8fce1 100644
--- a/network/squid/squid.SlackBuild
+++ b/network/squid/squid.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=squid
-VERSION=${VERSION:-3.5.26}
+VERSION=${VERSION:-4.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,10 +68,10 @@ 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 {} \;
 
 OPT_ICAP=""
 if [ "${ICAP:-no}" = "yes" ]; then
@@ -117,26 +117,25 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 mkdir -p $PKG/etc/rc.d
-sed -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new
+sed  -e "s,@SQUIDUSER@,$SQUIDUSER," -e "s,@SQUIDGROUP@,$SQUIDGROUP," \
+  $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new
 
 mkdir -p $PKG/etc/logrotate.d
-sed -e "s,@USER@,$SQUIDUSER," -e "s,@GROUP@,$SQUIDGROUP," $CWD/squid.logrotate \
+sed -e "s,@SQUIDUSER@,$SQUIDUSER," -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/squid.logrotate \
   > $PKG/etc/logrotate.d/squid.new
 
-mv $PKG/etc/squid/mime.conf $PKG/etc/squid/mime.conf.new
-mv $PKG/etc/squid/cachemgr.conf $PKG/etc/squid/cachemgr.conf.new
-rm $PKG/etc/squid/squid.conf
-cat $CWD/squid.conf > $PKG/etc/squid/squid.conf.new
-cat $CWD/squid.conf.documented > $PKG/etc/squid/squid.conf.documented
+( cd $PKG/etc/squid
+  for i in mime cachemgr squid ; do mv $i.conf $i.conf.new ; done )
+cp src/squid.conf.documented $PKG/etc/squid/squid.conf.documented
 
 mkdir -p $PKG/var/{cache,lib,run}/squid
 chown $SQUIDUSER:$SQUIDGROUP $PKG/var/{cache,lib,log,run}/squid
 
-## Edit the config file to set the user and group to run as
-sed -i -e 's%^cache_effective_user nobody%cache_effective_user '"$SQUIDUSER"'%g' \
-  $PKG/etc/squid/squid.conf.new
-sed -i -e 's%^cache_effective_group nobody%cache_effective_group '"$SQUIDGROUP"'%g' \
-  $PKG/etc/squid/squid.conf.new
+# Set a chache dir, the user and group to run as and set the pid location
+sed -i "s|^#cache_dir|cache_dir|" $PKG/etc/squid/squid.conf.new
+echo -e "\npid_filename /var/run/squid/squid.pid" >> $PKG/etc/squid/squid.conf.new
+echo "cache_effective_user $SQUIDUSER"            >> $PKG/etc/squid/squid.conf.new
+echo "cache_effective_group $SQUIDGROUP"          >> $PKG/etc/squid/squid.conf.new
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/squid/squid.conf b/network/squid/squid.conf
deleted file mode 100644
index 1e9345bc30..0000000000
--- a/network/squid/squid.conf
+++ /dev/null
@@ -1,7806 +0,0 @@
-#	WELCOME TO SQUID 3.4.10
-#	----------------------------
-#	
-#	This is the documentation for the Squid configuration file.
-#	This documentation can also be found online at:
-#		http://www.squid-cache.org/Doc/config/
-#	
-#	You may wish to look at the Squid home page and wiki for the
-#	FAQ and other documentation:
-#		http://www.squid-cache.org/
-#		http://wiki.squid-cache.org/SquidFaq
-#		http://wiki.squid-cache.org/ConfigExamples
-#	
-#	This documentation shows what the defaults for various directives
-#	happen to be.  If you don't need to change the default, you should
-#	leave the line out of your squid.conf in most cases.
-#	
-#	In some cases "none" refers to no default setting at all,
-#	while in other cases it refers to the value of the option
-#	- the comments for that keyword indicate if this is the case.
-#
-
-#  Configuration options can be included using the "include" directive.
-#  Include takes a list of files to include. Quoting and wildcards are
-#  supported.
-#
-#  For example,
-#
-#  include /path/to/included/file/squid.acl.config
-#
-#  Includes can be nested up to a hard-coded depth of 16 levels.
-#  This arbitrary restriction is to prevent recursive include references
-#  from causing Squid entering an infinite loop whilst trying to load
-#  configuration files.
-#
-#  Values with byte units
-#
-#	Squid accepts size units on some size related directives. All
-#	such directives are documented with a default value displaying
-#	a unit.
-#
-#	Units accepted by Squid are:
-#		bytes - byte
-#		KB - Kilobyte (1024 bytes)
-#		MB - Megabyte
-#		GB - Gigabyte
-#
-#  Values with spaces, quotes, and other special characters
-#
-#	Squid supports directive parameters with spaces, quotes, and other
-#	special characters. Surround such parameters with "double quotes". Use
-#	the configuration_includes_quoted_values directive to enable or
-#	disable that support.
-#
-#	For example;
-#
-#		configuration_includes_quoted_values on
-#		acl group external groupCheck Administrators "Internet Users" Guest
-#		configuration_includes_quoted_values off
-#
-#
-#  Conditional configuration
-#
-#	If-statements can be used to make configuration directives
-#	depend on conditions:
-#
-#	    if <CONDITION>
-#	        ... regular configuration directives ...
-#	    [else
-#	        ... regular configuration directives ...]
-#	    endif
-#
-#	The else part is optional. The keywords "if", "else", and "endif"
-#	must be typed on their own lines, as if they were regular
-#	configuration directives.
-#
-#	NOTE: An else-if condition is not supported.
-#
-#	These individual conditions types are supported:
-#
-#	    true
-#		Always evaluates to true.
-#	    false
-#		Always evaluates to false.
-#	    <integer> = <integer>
-#	        Equality comparison of two integer numbers.
-#
-#
-#  SMP-Related Macros
-#
-#	The following SMP-related preprocessor macros can be used.
-#
-#	${process_name} expands to the current Squid process "name"
-#	(e.g., squid1, squid2, or cache1).
-#
-#	${process_number} expands to the current Squid process
-#	identifier, which is an integer number (e.g., 1, 2, 3) unique
-#	across all Squid processes.
-
-#  TAG: broken_vary_encoding
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: cache_vary
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: collapsed_forwarding
-#	This option is not yet supported by Squid-3. see http://bugs.squid-cache.org/show_bug.cgi?id=3495
-#Default:
-# none
-
-#  TAG: error_map
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: external_refresh_check
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: location_rewrite_program
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: refresh_stale_hit
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: ignore_ims_on_miss
-#	Remove this line. The HTTP/1.1 feature is now configured by 'cache_miss_revalidate'.
-#Default:
-# none
-
-#  TAG: ignore_expect_100
-#	Remove this line. The HTTP/1.1 feature is now fully supported by default.
-#Default:
-# none
-
-#  TAG: dns_v4_fallback
-#	Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant.
-#Default:
-# none
-
-#  TAG: ftp_list_width
-#	Remove this line. Configure FTP page display using the CSS controls in errorpages.css instead.
-#Default:
-# none
-
-#  TAG: maximum_single_addr_tries
-#	Replaced by connect_retries. The behaviour has changed, please read the documentation before altering.
-#Default:
-# none
-
-#  TAG: update_headers
-#	Remove this line. The feature is supported by default in storage types where update is implemented.
-#Default:
-# none
-
-#  TAG: url_rewrite_concurrency
-#	Remove this line. Set the 'concurrency=' option of url_rewrite_children instead.
-#Default:
-# none
-
-#  TAG: dns_testnames
-#	Remove this line. DNS is no longer tested on startup.
-#Default:
-# none
-
-#  TAG: extension_methods
-#	Remove this line. All valid methods for HTTP are accepted by default.
-#Default:
-# none
-
-#  TAG: zero_buffers
-#Default:
-# none
-
-#  TAG: incoming_rate
-#Default:
-# none
-
-#  TAG: server_http11
-#	Remove this line. HTTP/1.1 is supported by default.
-#Default:
-# none
-
-#  TAG: upgrade_http0.9
-#	Remove this line. ICY/1.0 streaming protocol is supported by default.
-#Default:
-# none
-
-#  TAG: zph_local
-#	Alter these entries. Use the qos_flows directive instead.
-#Default:
-# none
-
-#  TAG: header_access
-#	Since squid-3.0 replace with request_header_access or reply_header_access
-#	depending on whether you wish to match client requests or server replies.
-#Default:
-# none
-
-#  TAG: httpd_accel_no_pmtu_disc
-#	Since squid-3.0 use the 'disable-pmtu-discovery' flag on http_port instead.
-#Default:
-# none
-
-#  TAG: wais_relay_host
-#	Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-#  TAG: wais_relay_port
-#	Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-# OPTIONS FOR AUTHENTICATION
-# -----------------------------------------------------------------------------
-
-#  TAG: auth_param
-#	This is used to define parameters for the various authentication
-#	schemes supported by Squid.
-#
-#	format: auth_param scheme parameter [setting]
-#
-#	The order in which authentication schemes are presented to the client is
-#	dependent on the order the scheme first appears in config file. IE
-#	has a bug (it's not RFC 2617 compliant) in that it will use the basic
-#	scheme if basic is the first entry presented, even if more secure
-#	schemes are presented. For now use the order in the recommended
-#	settings section below. If other browsers have difficulties (don't
-#	recognize the schemes offered even if you are using basic) either
-#	put basic first, or disable the other schemes (by commenting out their
-#	program entry).
-#
-#	Once an authentication scheme is fully configured, it can only be
-#	shutdown by shutting squid down and restarting. Changes can be made on
-#	the fly and activated with a reconfigure. I.E. You can change to a
-#	different helper, but not unconfigure the helper completely.
-#
-#	Please note that while this directive defines how Squid processes
-#	authentication it does not automatically activate authentication.
-#	To use authentication you must in addition make use of ACLs based
-#	on login name in http_access (proxy_auth, proxy_auth_regex or
-#	external with %LOGIN used in the format tag). The browser will be
-#	challenged for authentication on the first such acl encountered
-#	in http_access processing and will also be re-challenged for new
-#	login credentials if the request is being denied by a proxy_auth
-#	type acl.
-#
-#	WARNING: authentication can't be used in a transparently intercepting
-#	proxy as the client then thinks it is talking to an origin server and
-#	not the proxy. This is a limitation of bending the TCP/IP protocol to
-#	transparently intercepting port 80, not a limitation in Squid.
-#	Ports flagged 'transparent', 'intercept', or 'tproxy' have
-#	authentication disabled.
-#
-#	=== Parameters for the basic scheme follow. ===
-#
-#	"program" cmdline
-#	Specify the command for the external authenticator.  Such a program
-#	reads a line containing "username password" and	replies with one of
-#	three results:
-#
-#	  OK
-#		the user exists.
-#
-#	  ERR
-#		the user does not exist.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	"ERR" and "BH" results may optionally be followed by message="..."
-#	containing a description available as %m in the returned error page.
-#
-#	If you use an authenticator, make sure you have 1 acl of type
-#	proxy_auth.
-#
-#	By default, the basic authentication scheme is not used unless a
-#	program is specified.
-#
-#	If you want to use the traditional NCSA proxy authentication, set
-#	this line to something like
-#
-#	auth_param basic program /usr/libexec/basic_ncsa_auth /usr/etc/passwd
-#
-#	"utf8" on|off
-#	HTTP uses iso-latin-1 as character set, while some authentication
-#	backends such as LDAP expects UTF-8. If this is set to on Squid will
-#	translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-#	username & password to the helper.
-#
-#	"children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-#	The maximum number of authenticator processes to spawn. If you start too few
-#	Squid will have to wait for them to process a backlog of credential
-#	verifications, slowing it down. When password verifications are
-#	done via a (slow) network you are likely to need lots of
-#	authenticator processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	The concurrency= option sets the number of concurrent requests the
-#	helper can process.  The default of 0 is used for helpers who only
-#	supports one request at a time. Setting this to a number greater than
-#	0 changes the protocol used to include a channel number first on the
-#	request/response line, allowing multiple requests to be sent to the
-#	same helper in parallel without waiting for the response.
-#	Must not be set unless it's known the helper supports this.
-#
-#	auth_param basic children 20 startup=0 idle=1
-#
-#	"realm" realmstring
-#	Specifies the realm name which is to be reported to the
-#	client for the basic proxy authentication scheme (part of
-#	the text the user will see when prompted their username and
-#	password). There is no default.
-#	auth_param basic realm Squid proxy-caching web server
-#
-#	"credentialsttl" timetolive
-#	Specifies how long squid assumes an externally validated
-#	username:password pair is valid for - in other words how
-#	often the helper program is called for that user. Set this
-#	low to force revalidation with short lived passwords.  Note
-#	setting this high does not impact your susceptibility
-#	to replay attacks unless you are using an one-time password
-#	system (such as SecureID).  If you are using such a system,
-#	you will be vulnerable to replay attacks unless you also
-#	use the max_user_ip ACL in an http_access rule.
-#
-#	"casesensitive" on|off
-#	Specifies if usernames are case sensitive. Most user databases are
-#	case insensitive allowing the same username to be spelled using both
-#	lower and upper case letters, but some are case sensitive. This
-#	makes a big difference for user_max_ip ACL processing and similar.
-#	auth_param basic casesensitive off
-#
-#	=== Parameters for the digest scheme follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external authenticator.  Such
-#	a program reads a line containing "username":"realm" and
-#	replies with one of three results:
-#
-#	  OK ha1="..."
-#		the user exists. The ha1= key is mandatory and
-#		contains the appropriate H(A1) value, hex encoded.
-#		See rfc 2616 for the definition of H(A1).
-#
-#	  ERR
-#		the user does not exist.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	"ERR" and "BH" results may optionally be followed by message="..."
-#	containing a description available as %m in the returned error page.
-#
-#	By default, the digest authentication scheme is not used unless a
-#	program is specified.
-#
-#	If you want to use a digest authenticator, set this line to
-#	something like
-#
-#	auth_param digest program /usr/bin/digest_pw_auth /usr/etc/digpass
-#
-#	"utf8" on|off
-#	HTTP uses iso-latin-1 as character set, while some authentication
-#	backends such as LDAP expects UTF-8. If this is set to on Squid will
-#	translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-#	username & password to the helper.
-#
-#	"children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of H(A1) calculations, slowing it down.
-#	When the H(A1) calculations are done via a (slow) network
-#	you are likely to need lots of authenticator processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	The concurrency= option sets the number of concurrent requests the
-#	helper can process.  The default of 0 is used for helpers who only
-#	supports one request at a time. Setting this to a number greater than
-#	0 changes the protocol used to include a channel number first on the
-#	request/response line, allowing multiple requests to be sent to the
-#	same helper in parallel without waiting for the response.
-#	Must not be set unless it's known the helper supports this.
-#
-#	auth_param digest children 20 startup=0 idle=1
-#
-#	"realm" realmstring
-#	Specifies the realm name which is to be reported to the
-#	client for the digest proxy authentication scheme (part of
-#	the text the user will see when prompted their username and
-#	password). There is no default.
-#	auth_param digest realm Squid proxy-caching web server
-#
-#	"nonce_garbage_interval" timeinterval
-#	Specifies the interval that nonces that have been issued
-#	to client_agent's are checked for validity.
-#
-#	"nonce_max_duration" timeinterval
-#	Specifies the maximum length of time a given nonce will be
-#	valid for.
-#
-#	"nonce_max_count" number
-#	Specifies the maximum number of times a given nonce can be
-#	used.
-#
-#	"nonce_strictness" on|off
-#	Determines if squid requires strict increment-by-1 behavior
-#	for nonce counts, or just incrementing (off - for use when
-#	user agents generate nonce counts that occasionally miss 1
-#	(ie, 1,2,4,6)). Default off.
-#
-#	"check_nonce_count" on|off
-#	This directive if set to off can disable the nonce count check
-#	completely to work around buggy digest qop implementations in
-#	certain mainstream browser versions. Default on to check the
-#	nonce count to protect from authentication replay attacks.
-#
-#	"post_workaround" on|off
-#	This is a workaround to certain buggy browsers who sends
-#	an incorrect request digest in POST requests when reusing
-#	the same nonce as acquired earlier on a GET request.
-#
-#	=== NTLM scheme options follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external NTLM authenticator.
-#	Such a program reads exchanged NTLMSSP packets with
-#	the browser via Squid until authentication is completed.
-#	If you use an NTLM authenticator, make sure you have 1 acl
-#	of type proxy_auth.  By default, the NTLM authenticator program
-#	is not used.
-#
-#	auth_param ntlm program /usr/bin/ntlm_auth
-#
-#	"children" numberofchildren [startup=N] [idle=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of credential verifications, slowing it
-#	down. When credential verifications are done via a (slow)
-#	network you are likely to need lots of authenticator
-#	processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	auth_param ntlm children 20 startup=0 idle=1
-#
-#	"keep_alive" on|off
-#	If you experience problems with PUT/POST requests when using the
-#	Negotiate authentication scheme then you can try setting this to
-#	off. This will cause Squid to forcibly close the connection on
-#	the initial requests where the browser asks which schemes are
-#	supported by the proxy.
-#
-#	auth_param ntlm keep_alive on
-#
-#	=== Options for configuring the NEGOTIATE auth-scheme follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external Negotiate authenticator.
-#	This protocol is used in Microsoft Active-Directory enabled setups with
-#	the Microsoft Internet Explorer or Mozilla Firefox browsers.
-#	Its main purpose is to exchange credentials with the Squid proxy
-#	using the Kerberos mechanisms.
-#	If you use a Negotiate authenticator, make sure you have at least
-#	one acl of type proxy_auth active. By default, the negotiate
-#	authenticator program is not used.
-#	The only supported program for this role is the ntlm_auth
-#	program distributed as part of Samba, version 4 or later.
-#
-#	auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego
-#
-#	"children" numberofchildren [startup=N] [idle=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of credential verifications, slowing it
-#	down. When credential verifications are done via a (slow)
-#	network you are likely to need lots of authenticator
-#	processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	auth_param negotiate children 20 startup=0 idle=1
-#
-#	"keep_alive" on|off
-#	If you experience problems with PUT/POST requests when using the
-#	Negotiate authentication scheme then you can try setting this to
-#	off. This will cause Squid to forcibly close the connection on
-#	the initial requests where the browser asks which schemes are
-#	supported by the proxy.
-#
-#	auth_param negotiate keep_alive on
-#
-#	
-#	Examples:
-#
-##Recommended minimum configuration per scheme:
-##auth_param negotiate program <uncomment and complete this line to activate>
-##auth_param negotiate children 20 startup=0 idle=1
-##auth_param negotiate keep_alive on
-##
-##auth_param ntlm program <uncomment and complete this line to activate>
-##auth_param ntlm children 20 startup=0 idle=1
-##auth_param ntlm keep_alive on
-##
-##auth_param digest program <uncomment and complete this line>
-##auth_param digest children 20 startup=0 idle=1
-##auth_param digest realm Squid proxy-caching web server
-##auth_param digest nonce_garbage_interval 5 minutes
-##auth_param digest nonce_max_duration 30 minutes
-##auth_param digest nonce_max_count 50
-##
-##auth_param basic program <uncomment and complete this line>
-##auth_param basic children 5 startup=5 idle=1
-##auth_param basic realm Squid proxy-caching web server
-##auth_param basic credentialsttl 2 hours
-#Default:
-# none
-
-#  TAG: authenticate_cache_garbage_interval
-#	The time period between garbage collection across the username cache.
-#	This is a trade-off between memory utilization (long intervals - say
-#	2 days) and CPU (short intervals - say 1 minute). Only change if you
-#	have good reason to.
-#Default:
-# authenticate_cache_garbage_interval 1 hour
-
-#  TAG: authenticate_ttl
-#	The time a user & their credentials stay in the logged in
-#	user cache since their last request. When the garbage
-#	interval passes, all user credentials that have passed their
-#	TTL are removed from memory.
-#Default:
-# authenticate_ttl 1 hour
-
-#  TAG: authenticate_ip_ttl
-#	If you use proxy authentication and the 'max_user_ip' ACL,
-#	this directive controls how long Squid remembers the IP
-#	addresses associated with each user.  Use a small value
-#	(e.g., 60 seconds) if your users might change addresses
-#	quickly, as is the case with dialup.   You might be safe
-#	using a larger value (e.g., 2 hours) in a corporate LAN
-#	environment with relatively static address assignments.
-#Default:
-# authenticate_ip_ttl 1 second
-
-# ACCESS CONTROLS
-# -----------------------------------------------------------------------------
-
-#  TAG: external_acl_type
-#	This option defines external acl classes using a helper program
-#	to look up the status
-#
-#	  external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..]
-#
-#	Options:
-#
-#	  ttl=n		TTL in seconds for cached results (defaults to 3600
-#	  		for 1 hour)
-#
-#	  negative_ttl=n
-#	  		TTL for cached negative lookups (default same
-#	  		as ttl)
-#
-#	  grace=n	Percentage remaining of TTL where a refresh of a
-#			cached entry should be initiated without needing to
-#			wait for a new reply. (default is for no grace period)
-#
-#	  cache=n	Limit the result cache size, default is 262144.
-#			The expanded FORMAT value is used as the cache key, so
-#			if the details in FORMAT are highly variable a larger
-#			cache may be needed to produce reduction in helper load.
-#
-#	  children-max=n
-#			Maximum number of acl helper processes spawned to service
-#			external acl lookups of this type. (default 20)
-#
-#	  children-startup=n
-#			Minimum number of acl helper processes to spawn during
-#			startup and reconfigure to service external acl lookups
-#			of this type. (default 0)
-#
-#	  children-idle=n
-#			Number of acl helper processes to keep ahead of traffic
-#			loads. Squid will spawn this many at once whenever load
-#			rises above the capabilities of existing processes.
-#			Up to the value of children-max. (default 1)
-#
-#	  concurrency=n	concurrency level per process. Only used with helpers
-#			capable of processing more than one query at a time.
-#
-#	  protocol=2.5	Compatibility mode for Squid-2.5 external acl helpers.
-#
-#	  ipv4 / ipv6	IP protocol used to communicate with this helper.
-#			The default is to auto-detect IPv6 and use it when available.
-#
-#
-#	FORMAT specifications
-#
-#	  %LOGIN	Authenticated user login name
-#	  %EXT_USER	Username from previous external acl
-#	  %EXT_LOG	Log details from previous external acl
-#	  %EXT_TAG	Tag from previous external acl
-#	  %IDENT	Ident user name
-#	  %SRC		Client IP
-#	  %SRCPORT	Client source port
-#	  %URI		Requested URI
-#	  %DST		Requested host
-#	  %PROTO	Requested protocol
-#	  %PORT		Requested port
-#	  %PATH		Requested URL path
-#	  %METHOD	Request method
-#	  %MYADDR	Squid interface address
-#	  %MYPORT	Squid http_port number
-#	  %PATH		Requested URL-path (including query-string if any)
-#	  %USER_CERT	SSL User certificate in PEM format
-#	  %USER_CERTCHAIN SSL User certificate chain in PEM format
-#	  %USER_CERT_xx	SSL User certificate subject attribute xx
-#	  %USER_CA_CERT_xx SSL User certificate issuer attribute xx
-#
-#	  %>{Header}	HTTP request header "Header"
-#	  %>{Hdr:member}
-#	  		HTTP request header "Hdr" list member "member"
-#	  %>{Hdr:;member}
-#	  		HTTP request header list member using ; as
-#	  		list separator. ; can be any non-alphanumeric
-#			character.
-#
-#	  %<{Header}	HTTP reply header "Header"
-#	  %<{Hdr:member}
-#	  		HTTP reply header "Hdr" list member "member"
-#	  %<{Hdr:;member}
-#	  		HTTP reply header list member using ; as
-#	  		list separator. ; can be any non-alphanumeric
-#			character.
-#
-#	  %ACL		The name of the ACL being tested.
-#	  %DATA		The ACL arguments. If not used then any arguments
-#			is automatically added at the end of the line
-#			sent to the helper.
-#			NOTE: this will encode the arguments as one token,
-#			whereas the default will pass each separately.
-#
-#	  %%		The percent sign. Useful for helpers which need
-#			an unchanging input format.
-#
-#
-#	General request syntax:
-#
-#	  [channel-ID] FORMAT-values [acl-values ...]
-#
-#
-#	FORMAT-values consists of transaction details expanded with
-#	whitespace separation per the config file FORMAT specification
-#	using the FORMAT macros listed above.
-#
-#	acl-values consists of any string specified in the referencing
-#	config 'acl ... external' line. see the "acl external" directive.
-#
-#	Request values sent to the helper are URL escaped to protect
-#	each value in requests against whitespaces.
-#
-#	If using protocol=2.5 then the request sent to the helper is not
-#	URL escaped to protect against whitespace.
-#
-#	NOTE: protocol=3.0 is deprecated as no longer necessary.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#
-#	The helper receives lines expanded per the above format specification
-#	and for each input line returns 1 line starting with OK/ERR/BH result
-#	code and optionally followed by additional keywords with more details.
-#
-#
-#	General result syntax:
-#
-#	  [channel-ID] result keyword=value ...
-#
-#	Result consists of one of the codes:
-#
-#	  OK
-#		the ACL test produced a match.
-#
-#	  ERR
-#		the ACL test does not produce a match.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	The meaning of 'a match' is determined by your squid.conf
-#	access control configuration. See the Squid wiki for details.
-#
-#	Defined keywords:
-#
-#	  user=		The users name (login)
-#
-#	  password=	The users password (for login= cache_peer option)
-#
-#	  message=	Message describing the reason for this response.
-#			Available as %o in error pages.
-#			Useful on (ERR and BH results).
-#
-#	  tag=		Apply a tag to a request. Only sets a tag once,
-#			does not alter existing tags.
-#
-#	  log=		String to be logged in access.log. Available as
-#	  		%ea in logformat specifications.
-#
-#	Any keywords may be sent on any response whether OK, ERR or BH.
-#
-#	All response keyword values need to be a single token with URL
-#	escaping, or enclosed in double quotes (") and escaped using \ on
-#	any double quotes or \ characters within the value. The wrapping
-#	double quotes are removed before the value is interpreted by Squid.
-#	\r and \n are also replace by CR and LF.
-#
-#	Some example key values:
-#
-#		user=John%20Smith
-#		user="John Smith"
-#		user="J. \"Bob\" Smith"
-#Default:
-# none
-
-#  TAG: acl
-#	Defining an Access List
-#
-#	Every access list definition must begin with an aclname and acltype, 
-#	followed by either type-specific arguments or a quoted filename that
-#	they are read from.
-#
-#	   acl aclname acltype argument ...
-#	   acl aclname acltype "file" ...
-#
-#	When using "file", the file should contain one item per line.
-#
-#	Some acl types supports options which changes their default behaviour.
-#	The available options are:
-#
-#	-i,+i	By default, regular expressions are CASE-SENSITIVE. To make them
-#		case-insensitive, use the -i option. To return case-sensitive
-#		use the +i option between patterns, or make a new ACL line
-#		without -i.	
-#
-#	-n	Disable lookups and address type conversions.  If lookup or
-#		conversion is required because the parameter type (IP or
-#		domain name) does not match the message address type (domain
-#		name or IP), then the ACL would immediately declare a mismatch
-#		without any warnings or lookups.
-#
-#	--	Used to stop processing all options, in the case the first acl
-#		value has '-' character as first character (for example the '-'
-#		is a valid domain name)
-#
-#	Some acl types require suspending the current request in order
-#	to access some external data source.
-#	Those which do are marked with the tag [slow], those which
-#	don't are marked as [fast].
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl
-#	for further information
-#
-#	***** ACL TYPES AVAILABLE *****
-#
-#	acl aclname src ip-address/mask ...	# clients IP address [fast]
-#	acl aclname src addr1-addr2/mask ...	# range of addresses [fast]
-#	acl aclname dst [-n] ip-address/mask ...	# URL host's IP address [slow]
-#	acl aclname localip ip-address/mask ... # IP address the client connected to [fast]
-#
-#	acl aclname arp      mac-address ... (xx:xx:xx:xx:xx:xx notation)
-#	  # The arp ACL requires the special configure option --enable-arp-acl.
-#	  # Furthermore, the ARP ACL code is not portable to all operating systems.
-#	  # It works on Linux, Solaris, Windows, FreeBSD, and some
-#	  # other *BSD variants.
-#	  # [fast]
-#	  #
-#	  # NOTE: Squid can only determine the MAC address for clients that are on
-#	  # the same subnet. If the client is on a different subnet,
-#	  # then Squid cannot find out its MAC address.
-#
-#	acl aclname srcdomain   .foo.com ...
-#	  # reverse lookup, from client IP [slow]
-#	acl aclname dstdomain [-n] .foo.com ...
-#	  # Destination server from URL [fast]
-#	acl aclname srcdom_regex [-i] \.foo\.com ...
-#	  # regex matching client name [slow]
-#	acl aclname dstdom_regex [-n] [-i] \.foo\.com ...
-#	  # regex matching server [fast]
-#	  #
-#	  # For dstdomain and dstdom_regex a reverse lookup is tried if a IP
-#	  # based URL is used and no match is found. The name "none" is used
-#	  # if the reverse lookup fails.
-#
-#	acl aclname src_as number ...
-#	acl aclname dst_as number ...
-#	  # [fast]
-#	  # Except for access control, AS numbers can be used for
-#	  # routing of requests to specific caches. Here's an
-#	  # example for routing all requests for AS#1241 and only
-#	  # those to mycache.mydomain.net:
-#	  # acl asexample dst_as 1241
-#	  # cache_peer_access mycache.mydomain.net allow asexample
-#	  # cache_peer_access mycache_mydomain.net deny all
-#
-#	acl aclname peername myPeer ...
-#	  # [fast]
-#	  # match against a named cache_peer entry
-#	  # set unique name= on cache_peer lines for reliable use.
-#
-#	acl aclname time [day-abbrevs] [h1:m1-h2:m2]
-#	  # [fast]
-#	  #  day-abbrevs:
-#	  #	S - Sunday
-#	  #	M - Monday
-#	  #	T - Tuesday
-#	  #	W - Wednesday
-#	  #	H - Thursday
-#	  #	F - Friday
-#	  #	A - Saturday
-#	  #  h1:m1 must be less than h2:m2
-#
-#	acl aclname url_regex [-i] ^http:// ...
-#	  # regex matching on whole URL [fast]
-#	acl aclname urllogin [-i] [^a-zA-Z0-9] ...
-#	  # regex matching on URL login field
-#	acl aclname urlpath_regex [-i] \.gif$ ...
-#	  # regex matching on URL path [fast]
-#
-#	acl aclname port 80 70 21 0-1024...   # destination TCP port [fast]
-#	                                      # ranges are alloed
-#	acl aclname localport 3128 ...	      # TCP port the client connected to [fast]
-#	                                      # NP: for interception mode this is usually '80'
-#
-#	acl aclname myportname 3128 ...       # http(s)_port name [fast]
-#
-#	acl aclname proto HTTP FTP ...        # request protocol [fast]
-# 
-#	acl aclname method GET POST ...       # HTTP request method [fast]
-#
-#	acl aclname http_status 200 301 500- 400-403 ... 
-#	  # status code in reply [fast]
-#
-#	acl aclname browser [-i] regexp ...
-#	  # pattern match on User-Agent header (see also req_header below) [fast]
-#
-#	acl aclname referer_regex [-i] regexp ...
-#	  # pattern match on Referer header [fast]
-#	  # Referer is highly unreliable, so use with care
-#
-#	acl aclname ident username ...
-#	acl aclname ident_regex [-i] pattern ...
-#	  # string match on ident output [slow]
-#	  # use REQUIRED to accept any non-null ident.
-#
-#	acl aclname proxy_auth [-i] username ...
-#	acl aclname proxy_auth_regex [-i] pattern ...
-#	  # perform http authentication challenge to the client and match against
-#	  # supplied credentials [slow]
-#	  #
-#	  # takes a list of allowed usernames.
-#	  # use REQUIRED to accept any valid username.
-#	  #
-#	  # Will use proxy authentication in forward-proxy scenarios, and plain
-#	  # http authenticaiton in reverse-proxy scenarios
-#	  #
-#	  # NOTE: when a Proxy-Authentication header is sent but it is not
-#	  # needed during ACL checking the username is NOT logged
-#	  # in access.log.
-#	  #
-#	  # NOTE: proxy_auth requires a EXTERNAL authentication program
-#	  # to check username/password combinations (see
-#	  # auth_param directive).
-#	  #
-#	  # NOTE: proxy_auth can't be used in a transparent/intercepting proxy
-#	  # as the browser needs to be configured for using a proxy in order
-#	  # to respond to proxy authentication.
-#
-#	acl aclname snmp_community string ...
-#	  # A community string to limit access to your SNMP Agent [fast]
-#	  # Example:
-#	  #
-#	  #	acl snmppublic snmp_community public
-#
-#	acl aclname maxconn number
-#	  # This will be matched when the client's IP address has
-#	  # more than <number> TCP connections established. [fast]
-#	  # NOTE: This only measures direct TCP links so X-Forwarded-For
-#	  # indirect clients are not counted.
-#
-#	acl aclname max_user_ip [-s] number
-#	  # This will be matched when the user attempts to log in from more
-#	  # than <number> different ip addresses. The authenticate_ip_ttl
-#	  # parameter controls the timeout on the ip entries. [fast]
-#	  # If -s is specified the limit is strict, denying browsing
-#	  # from any further IP addresses until the ttl has expired. Without
-#	  # -s Squid will just annoy the user by "randomly" denying requests.
-#	  # (the counter is reset each time the limit is reached and a
-#	  # request is denied)
-#	  # NOTE: in acceleration mode or where there is mesh of child proxies,
-#	  # clients may appear to come from multiple addresses if they are
-#	  # going through proxy farms, so a limit of 1 may cause user problems.
-#
-#	acl aclname random probability
-#	  # Pseudo-randomly match requests. Based on the probability given.
-#	  # Probability may be written as a decimal (0.333), fraction (1/3)
-#	  # or ratio of matches:non-matches (3:5).
-#
-#	acl aclname req_mime_type [-i] mime-type ...
-#	  # regex match against the mime type of the request generated
-#	  # by the client. Can be used to detect file upload or some
-#	  # types HTTP tunneling requests [fast]
-#	  # NOTE: This does NOT match the reply. You cannot use this
-#	  # to match the returned file type.
-#
-#	acl aclname req_header header-name [-i] any\.regex\.here
-#	  # regex match against any of the known request headers.  May be
-#	  # thought of as a superset of "browser", "referer" and "mime-type"
-#	  # ACL [fast]
-#
-#	acl aclname rep_mime_type [-i] mime-type ...
-#	  # regex match against the mime type of the reply received by
-#	  # squid. Can be used to detect file download or some
-#	  # types HTTP tunneling requests. [fast]
-#	  # NOTE: This has no effect in http_access rules. It only has
-#	  # effect in rules that affect the reply data stream such as
-#	  # http_reply_access.
-#
-#	acl aclname rep_header header-name [-i] any\.regex\.here
-#	  # regex match against any of the known reply headers. May be
-#	  # thought of as a superset of "browser", "referer" and "mime-type"
-#	  # ACLs [fast]
-#
-#	acl aclname external class_name [arguments...]
-#	  # external ACL lookup via a helper class defined by the
-#	  # external_acl_type directive [slow]
-#
-#	acl aclname user_cert attribute values...
-#	  # match against attributes in a user SSL certificate
-#	  # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-#	acl aclname ca_cert attribute values...
-#	  # match against attributes a users issuing CA SSL certificate
-#	  # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-#	acl aclname ext_user username ...
-#	acl aclname ext_user_regex [-i] pattern ...
-#	  # string match on username returned by external acl helper [slow]
-#	  # use REQUIRED to accept any non-null user name.
-#
-#	acl aclname tag tagvalue ...
-#	  # string match on tag returned by external acl helper [slow]
-#
-#	acl aclname hier_code codename ...
-#	  # string match against squid hierarchy code(s); [fast]
-#	  #  e.g., DIRECT, PARENT_HIT, NONE, etc.
-#	  #
-#	  # NOTE: This has no effect in http_access rules. It only has
-#	  # effect in rules that affect the reply data stream such as
-#	  # http_reply_access.
-#
-#	acl aclname note name [value ...]
-#	  # match transaction annotation [fast]
-#	  # Without values, matches any annotation with a given name.
-#	  # With value(s), matches any annotation with a given name that
-#	  # also has one of the given values.
-#	  # Names and values are compared using a string equality test.
-#	  # Annotation sources include note and adaptation_meta directives
-#	  # as well as helper and eCAP responses.
-#
-#	acl aclname any-of acl1 acl2 ...
-#	  # match any one of the acls [fast or slow]
-#	  # The first matching ACL stops further ACL evaluation.
-#	  #
-#	  # ACLs from multiple any-of lines with the same name are ORed.
-#	  # For example, A = (a1 or a2) or (a3 or a4) can be written as
-#	  #   acl A any-of a1 a2
-#	  #   acl A any-of a3 a4
-#	  #
-#	  # This group ACL is fast if all evaluated ACLs in the group are fast
-#	  # and slow otherwise.
-#
-#	acl aclname all-of acl1 acl2 ... 
-#	  # match all of the acls [fast or slow]
-#	  # The first mismatching ACL stops further ACL evaluation.
-#	  #
-#	  # ACLs from multiple all-of lines with the same name are ORed.
-#	  # For example, B = (b1 and b2) or (b3 and b4) can be written as
-#	  #   acl B all-of b1 b2
-#	  #   acl B all-of b3 b4
-#	  #
-#	  # This group ACL is fast if all evaluated ACLs in the group are fast
-#	  # and slow otherwise.
-#
-#	Examples:
-#		acl macaddress arp 09:00:2b:23:45:67
-#		acl myexample dst_as 1241
-#		acl password proxy_auth REQUIRED
-#		acl fileupload req_mime_type -i ^multipart/form-data$
-#		acl javascript rep_mime_type -i ^application/x-javascript$
-#
-#Default:
-# ACLs all, manager, localhost, and to_localhost are predefined.
-#
-#
-# Recommended minimum configuration:
-#
-
-# Example rule allowing access from your local networks.
-# Adapt to list your (internal) IP networks from where browsing
-# should be allowed
-acl localnet src 10.0.0.0/8	# RFC1918 possible internal network
-acl localnet src 172.16.0.0/12	# RFC1918 possible internal network
-acl localnet src 192.168.0.0/16	# RFC1918 possible internal network
-acl localnet src fc00::/7       # RFC 4193 local private network range
-acl localnet src fe80::/10      # RFC 4291 link-local (directly plugged) machines
-
-acl SSL_ports port 443
-acl Safe_ports port 80		# http
-acl Safe_ports port 21		# ftp
-acl Safe_ports port 443		# https
-acl Safe_ports port 70		# gopher
-acl Safe_ports port 210		# wais
-acl Safe_ports port 1025-65535	# unregistered ports
-acl Safe_ports port 280		# http-mgmt
-acl Safe_ports port 488		# gss-http
-acl Safe_ports port 591		# filemaker
-acl Safe_ports port 777		# multiling http
-acl CONNECT method CONNECT
-
-#  TAG: follow_x_forwarded_for
-#	Allowing or Denying the X-Forwarded-For header to be followed to
-#	find the original source of a request.
-#
-#	Requests may pass through a chain of several other proxies
-#	before reaching us.  The X-Forwarded-For header will contain a
-#	comma-separated list of the IP addresses in the chain, with the
-#	rightmost address being the most recent.
-#
-#	If a request reaches us from a source that is allowed by this
-#	configuration item, then we consult the X-Forwarded-For header
-#	to see where that host received the request from.  If the
-#	X-Forwarded-For header contains multiple addresses, we continue
-#	backtracking until we reach an address for which we are not allowed
-#	to follow the X-Forwarded-For header, or until we reach the first
-#	address in the list. For the purpose of ACL used in the
-#	follow_x_forwarded_for directive the src ACL type always matches
-#	the address we are testing and srcdomain matches its rDNS.
-#
-#	The end result of this process is an IP address that we will
-#	refer to as the indirect client address.  This address may
-#	be treated as the client address for access control, ICAP, delay
-#	pools and logging, depending on the acl_uses_indirect_client,
-#	icap_uses_indirect_client, delay_pool_uses_indirect_client, 
-#	log_uses_indirect_client and tproxy_uses_indirect_client options.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	SECURITY CONSIDERATIONS:
-#
-#		Any host for which we follow the X-Forwarded-For header
-#		can place incorrect information in the header, and Squid
-#		will use the incorrect information as if it were the
-#		source address of the request.  This may enable remote
-#		hosts to bypass any access control restrictions that are
-#		based on the client's source addresses.
-#
-#	For example:
-#
-#		acl localhost src 127.0.0.1
-#		acl my_other_proxy srcdomain .proxy.example.com
-#		follow_x_forwarded_for allow localhost
-#		follow_x_forwarded_for allow my_other_proxy
-#Default:
-# X-Forwarded-For header will be ignored.
-
-#  TAG: acl_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in acl matching.
-#
-#	NOTE: maxconn ACL considers direct TCP links and indirect
-#	      clients will always have zero. So no match.
-#Default:
-# acl_uses_indirect_client on
-
-#  TAG: delay_pool_uses_indirect_client	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-follow-x-forwarded-for and --enable-delay-pools
-#
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in delay pools.
-#Default:
-# delay_pool_uses_indirect_client on
-
-#  TAG: log_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in the access log.
-#Default:
-# log_uses_indirect_client on
-
-#  TAG: tproxy_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address when spoofing the outgoing client.
-#
-#	This has no effect on requests arriving in non-tproxy
-#	mode ports.
-#
-#	SECURITY WARNING: Usage of this option is dangerous
-#	and should not be used trivially. Correct configuration
-#	of follow_x_forewarded_for with a limited set of trusted
-#	sources is required to prevent abuse of your proxy.
-#Default:
-# tproxy_uses_indirect_client off
-
-#  TAG: spoof_client_ip
-#	Control client IP address spoofing of TPROXY traffic based on
-#	defined access lists.
-#
-#	spoof_client_ip allow|deny [!]aclname ...
-#
-#	If there are no "spoof_client_ip" lines present, the default
-#	is to "allow" spoofing of any suitable request.
-#
-#	Note that the cache_peer "no-tproxy" option overrides this ACL.
-#
-#	This clause supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow spoofing on all TPROXY traffic.
-
-#  TAG: http_access
-#	Allowing or Denying access based on defined access lists
-#
-#	Access to the HTTP port:
-#	http_access allow|deny [!]aclname ...
-#
-#	NOTE on default values:
-#
-#	If there are no "access" lines present, the default is to deny
-#	the request.
-#
-#	If none of the "access" lines cause a match, the default is the
-#	opposite of the last line in the list.  If the last line was
-#	deny, the default is allow.  Conversely, if the last line
-#	is allow, the default will be deny.  For these reasons, it is a
-#	good idea to have an "deny all" entry at the end of your access
-#	lists to avoid potential confusion.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Default:
-# Deny, unless rules exist in squid.conf.
-#
-
-#
-# Recommended minimum Access Permission configuration:
-#
-# Deny requests to certain unsafe ports
-http_access deny !Safe_ports
-
-# Deny CONNECT to other than secure SSL ports
-http_access deny CONNECT !SSL_ports
-
-# Only allow cachemgr access from localhost
-http_access allow localhost manager
-http_access deny manager
-
-# We strongly recommend the following be uncommented to protect innocent
-# web applications running on the proxy server who think the only
-# one who can access services on "localhost" is a local user
-#http_access deny to_localhost
-
-#
-# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-#
-
-# Example rule allowing access from your local networks.
-# Adapt localnet in the ACL section to list your (internal) IP networks
-# from where browsing should be allowed
-http_access allow localnet
-http_access allow localhost
-
-# And finally deny all other access to this proxy
-http_access deny all
-
-#  TAG: adapted_http_access
-#	Allowing or Denying access based on defined access lists
-#
-#	Essentially identical to http_access, but runs after redirectors
-#	and ICAP/eCAP adaptation. Allowing access control based on their
-#	output.
-#
-#	If not set then only http_access is used.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: http_reply_access
-#	Allow replies to client requests. This is complementary to http_access.
-#
-#	http_reply_access allow|deny [!] aclname ...
-#
-#	NOTE: if there are no access lines present, the default is to allow
-#	all replies.
-#
-#	If none of the access lines cause a match the opposite of the
-#	last line will apply. Thus it is good practice to end the rules
-#	with an "allow all" or "deny all" entry.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: icp_access
-#	Allowing or Denying access to the ICP port based on defined
-#	access lists
-#
-#	icp_access  allow|deny [!]aclname ...
-#
-#	NOTE: The default if no icp_access lines are present is to
-#	deny all traffic. This default may cause problems with peers
-#	using ICP.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow ICP queries from local networks only
-##icp_access allow localnet
-##icp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: htcp_access
-#	Allowing or Denying access to the HTCP port based on defined
-#	access lists
-#
-#	htcp_access  allow|deny [!]aclname ...
-#
-#	See also htcp_clr_access for details on access control for
-#	cache purge (CLR) HTCP messages.
-#
-#	NOTE: The default if no htcp_access lines are present is to
-#	deny all traffic. This default may cause problems with peers
-#	using the htcp option.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP queries from local networks only
-##htcp_access allow localnet
-##htcp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: htcp_clr_access
-#	Allowing or Denying access to purge content using HTCP based
-#	on defined access lists.
-#	See htcp_access for details on general HTCP access control.
-#
-#	htcp_clr_access  allow|deny [!]aclname ...
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP CLR requests from trusted peers
-#acl htcp_clr_peer src 192.0.2.2 2001:DB8::2
-#htcp_clr_access allow htcp_clr_peer
-#htcp_clr_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: miss_access
-#	Determins whether network access is permitted when satisfying a request.
-#
-#	For example;
-#	    to force your neighbors to use you as a sibling instead of
-#	    a parent.
-#
-#		acl localclients src 192.0.2.0/24 2001:DB8::a:0/64
-#		miss_access deny  !localclients
-#		miss_access allow all
-#
-#	This means only your local clients are allowed to fetch relayed/MISS
-#	replies from the network and all other clients can only fetch cached
-#	objects (HITs).
-#
-#	The default for this setting allows all clients who passed the
-#	http_access rules to relay via this proxy.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: ident_lookup_access
-#	A list of ACL elements which, if matched, cause an ident
-#	(RFC 931) lookup to be performed for this request.  For
-#	example, you might choose to always perform ident lookups
-#	for your main multi-user Unix boxes, but not for your Macs
-#	and PCs.  By default, ident lookups are not performed for
-#	any requests.
-#
-#	To enable ident lookups for specific client addresses, you
-#	can follow this example:
-#
-#	acl ident_aware_hosts src 198.168.1.0/24
-#	ident_lookup_access allow ident_aware_hosts
-#	ident_lookup_access deny all
-#
-#	Only src type ACL checks are fully supported.  A srcdomain
-#	ACL might work at times, but it will not always provide
-#	the correct result.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Unless rules exist in squid.conf, IDENT is not fetched.
-
-#  TAG: reply_body_max_size	size [acl acl...]
-#	This option specifies the maximum size of a reply body. It can be
-#	used to prevent users from downloading very large files, such as
-#	MP3's and movies. When the reply headers are received, the
-#	reply_body_max_size lines are processed, and the first line where
-#	all (if any) listed ACLs are true is used as the maximum body size
-#	for this reply.
-#
-#	This size is checked twice. First when we get the reply headers,
-#	we check the content-length value.  If the content length value exists
-#	and is larger than the allowed size, the request is denied and the
-#	user receives an error message that says "the request or reply
-#	is too large." If there is no content-length, and the reply
-#	size exceeds this limit, the client's connection is just closed
-#	and they will receive a partial reply.
-#
-#	WARNING: downstream caches probably can not detect a partial reply
-#	if there is no content-length header, so they will cache
-#	partial responses and give them out as hits.  You should NOT
-#	use this option if you have downstream caches.
-#
-#	WARNING: A maximum size smaller than the size of squid's error messages
-#	will cause an infinite loop and crash squid. Ensure that the smallest
-#	non-zero value you use is greater that the maximum header size plus
-#	the size of your largest error page.
-#
-#	If you set this parameter none (the default), there will be
-#	no limit imposed.
-#
-#	Configuration Format is:
-#		reply_body_max_size SIZE UNITS [acl ...]
-#	ie.
-#		reply_body_max_size 10 MB
-#
-#Default:
-# No limit is applied.
-
-# NETWORK OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: http_port
-#	Usage:	port [mode] [options]
-#		hostname:port [mode] [options]
-#		1.2.3.4:port [mode] [options]
-#
-#	The socket addresses where Squid will listen for HTTP client
-#	requests.  You may specify multiple socket addresses.
-#	There are three forms: port alone, hostname with port, and
-#	IP address with port.  If you specify a hostname or IP
-#	address, Squid binds the socket to that specific
-#	address. Most likely, you do not need to bind to a specific
-#	address, so you can use the port number alone.
-#
-#	If you are running Squid in accelerator mode, you
-#	probably want to listen on port 80 also, or instead.
-#
-#	The -a command line option may be used to specify additional
-#	port(s) where Squid listens for proxy request. Such ports will
-#	be plain proxy ports with no options.
-#
-#	You may specify multiple socket addresses on multiple lines.
-#
-#	Modes:
-#
-#	   intercept	Support for IP-Layer interception of
-#			outgoing requests without browser settings.
-#			NP: disables authentication and IPv6 on the port.
-#
-#	   tproxy	Support Linux TPROXY for spoofing outgoing
-#			connections using the client IP address.
-#			NP: disables authentication and maybe IPv6 on the port.
-#
-#	   accel	Accelerator / reverse proxy mode
-#
-#	   ssl-bump	For each CONNECT request allowed by ssl_bump ACLs,
-#			establish secure connection with the client and with
-#			the server, decrypt HTTPS messages as they pass through
-#			Squid, and treat them as unencrypted HTTP messages,
-#			becoming the man-in-the-middle.
-#
-#			The ssl_bump option is required to fully enable
-#			bumping of CONNECT requests.
-#
-#	Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-#	Accelerator Mode Options:
-#
-#	   defaultsite=domainname
-#			What to use for the Host: header if it is not present
-#			in a request. Determines what site (not origin server)
-#			accelerators should consider the default.
-#
-#	   no-vhost	Disable using HTTP/1.1 Host header for virtual domain support.
-#
-#	   protocol=	Protocol to reconstruct accelerated requests with.
-#			Defaults to http for http_port and https for
-#			https_port
-#
-#	   vport	Virtual host port support. Using the http_port number
-#			instead of the port passed on Host: headers.
-#
-#	   vport=NN	Virtual host port support. Using the specified port
-#			number instead of the port passed on Host: headers.
-#
-#	   act-as-origin
-#			Act as if this Squid is the origin server.
-#			This currently means generate new Date: and Expires:
-#			headers on HIT instead of adding Age:.
-#
-#	   ignore-cc	Ignore request Cache-Control headers.
-#
-#			WARNING: This option violates HTTP specifications if
-#			used in non-accelerator setups.
-#
-#	   allow-direct	Allow direct forwarding in accelerator mode. Normally
-#			accelerated requests are denied direct forwarding as if
-#			never_direct was used.
-#
-#			WARNING: this option opens accelerator mode to security
-#			vulnerabilities usually only affecting in interception
-#			mode. Make sure to protect forwarding with suitable
-#			http_access rules when using this.
-#
-#
-#	SSL Bump Mode Options:
-#	    In addition to these options ssl-bump requires TLS/SSL options.
-#
-#	   generate-host-certificates[=<on|off>]
-#			Dynamically create SSL server certificates for the
-#			destination hosts of bumped CONNECT requests.When 
-#			enabled, the cert and key options are used to sign
-#			generated certificates. Otherwise generated
-#			certificate will be selfsigned.
-#			If there is a CA certificate lifetime of the generated 
-#			certificate equals lifetime of the CA certificate. If
-#			generated certificate is selfsigned lifetime is three 
-#			years.
-#			This option is enabled by default when ssl-bump is used.
-#			See the ssl-bump option above for more information.
-#			
-#	   dynamic_cert_mem_cache_size=SIZE
-#			Approximate total RAM size spent on cached generated
-#			certificates. If set to zero, caching is disabled. The
-#			default value is 4MB.
-#
-#	TLS / SSL Options:
-#
-#	   cert=	Path to SSL certificate (PEM format).
-#
-#	   key=		Path to SSL private key file (PEM format)
-#			if not specified, the certificate file is
-#			assumed to be a combined certificate and
-#			key file.
-#
-#	   version=	The version of SSL/TLS supported
-#			    1	automatic (default)
-#			    2	SSLv2 only
-#			    3	SSLv3 only
-#			    4	TLSv1.0 only
-#			    5	TLSv1.1 only
-#			    6	TLSv1.2 only
-#
-#	   cipher=	Colon separated list of supported ciphers.
-#			NOTE: some ciphers such as EDH ciphers depend on
-#			      additional settings. If those settings are
-#			      omitted the ciphers may be silently ignored
-#			      by the OpenSSL library.
-#
-#	   options=	Various SSL implementation options. The most important
-#			being:
-#			    NO_SSLv2    Disallow the use of SSLv2
-#			    NO_SSLv3    Disallow the use of SSLv3
-#			    NO_TLSv1    Disallow the use of TLSv1.0
-#			    NO_TLSv1_1  Disallow the use of TLSv1.1
-#			    NO_TLSv1_2  Disallow the use of TLSv1.2
-#			    SINGLE_DH_USE Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			    ALL       Enable various bug workarounds
-#				      suggested as "harmless" by OpenSSL
-#				      Be warned that this reduces SSL/TLS
-#				      strength to some attacks.
-#			See OpenSSL SSL_CTX_set_options documentation for a
-#			complete list of options.
-#
-#	   clientca=	File containing the list of CAs to use when
-#			requesting a client certificate.
-#
-#	   cafile=	File containing additional CA certificates to
-#			use when verifying client certificates. If unset
-#			clientca will be used.
-#
-#	   capath=	Directory containing additional CA certificates
-#			and CRL lists to use when verifying client certificates.
-#
-#	   crlfile=	File of additional CRL lists to use when verifying
-#			the client certificate, in addition to CRLs stored in
-#			the capath. Implies VERIFY_CRL flag below.
-#
-#	   dhparams=	File containing DH parameters for temporary/ephemeral
-#			DH key exchanges. See OpenSSL documentation for details
-#			on how to create this file.
-#			WARNING: EDH ciphers will be silently disabled if this
-#				 option is not set.
-#
-#	   sslflags=	Various flags modifying the use of SSL:
-#			    DELAYED_AUTH
-#				Don't request client certificates
-#				immediately, but wait until acl processing
-#				requires a certificate (not yet implemented).
-#			    NO_DEFAULT_CA
-#				Don't use the default CA lists built in
-#				to OpenSSL.
-#			    NO_SESSION_REUSE
-#				Don't allow for session reuse. Each connection
-#				will result in a new SSL session.
-#			    VERIFY_CRL
-#				Verify CRL lists when accepting client
-#				certificates.
-#			    VERIFY_CRL_ALL
-#				Verify CRL lists for all certificates in the
-#				client certificate chain.
-#
-#	   sslcontext=	SSL session ID context identifier.
-#
-#	Other Options:
-#
-#	   connection-auth[=on|off]
-#	                use connection-auth=off to tell Squid to prevent 
-#	                forwarding Microsoft connection oriented authentication
-#			(NTLM, Negotiate and Kerberos)
-#
-#	   disable-pmtu-discovery=
-#			Control Path-MTU discovery usage:
-#			    off		lets OS decide on what to do (default).
-#			    transparent	disable PMTU discovery when transparent
-#					support is enabled.
-#			    always	disable always PMTU discovery.
-#
-#			In many setups of transparently intercepting proxies
-#			Path-MTU discovery can not work on traffic towards the
-#			clients. This is the case when the intercepting device
-#			does not fully track connections and fails to forward
-#			ICMP must fragment messages to the cache server. If you
-#			have such setup and experience that certain clients
-#			sporadically hang or never complete requests set
-#			disable-pmtu-discovery option to 'transparent'.
-#
-#	   name=	Specifies a internal name for the port. Defaults to
-#			the port specification (port or addr:port)
-#
-#	   tcpkeepalive[=idle,interval,timeout]
-#			Enable TCP keepalive probes of idle connections.
-#			In seconds; idle is the initial time before TCP starts
-#			probing the connection, interval how often to probe, and
-#			timeout the time before giving up.
-#
-#	If you run Squid on a dual-homed machine with an internal
-#	and an external interface we recommend you to specify the
-#	internal address:port in http_port. This way Squid will only be
-#	visible on the internal address.
-#
-#
-
-# Squid normally listens to port 3128
-http_port 3128
-
-#  TAG: https_port
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Usage:  [ip:]port cert=certificate.pem [key=key.pem] [mode] [options...]
-#
-#	The socket address where Squid will listen for client requests made
-#	over TLS or SSL connections. Commonly referred to as HTTPS.
-#
-#	This is most useful for situations where you are running squid in
-#	accelerator mode and you want to do the SSL work at the accelerator level.
-#
-#	You may specify multiple socket addresses on multiple lines,
-#	each with their own SSL certificate and/or options.
-#
-#	Modes:
-#
-#	   accel	Accelerator / reverse proxy mode
-#
-#	   intercept	Support for IP-Layer interception of
-#			outgoing requests without browser settings.
-#			NP: disables authentication and IPv6 on the port.
-#
-#	   tproxy	Support Linux TPROXY for spoofing outgoing
-#			connections using the client IP address.
-#			NP: disables authentication and maybe IPv6 on the port.
-#
-#	   ssl-bump	For each intercepted connection allowed by ssl_bump
-#			ACLs, establish a secure connection with the client and with
-#			the server, decrypt HTTPS messages as they pass through
-#			Squid, and treat them as unencrypted HTTP messages,
-#			becoming the man-in-the-middle.
-#
-#			An "ssl_bump server-first" match is required to
-#			fully enable bumping of intercepted SSL	connections.
-#
-#			Requires tproxy or intercept.
-#
-#	Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-#	See http_port for a list of generic options
-#
-#
-#	SSL Options:
-#
-#	   cert=	Path to SSL certificate (PEM format).
-#
-#	   key=		Path to SSL private key file (PEM format)
-#			if not specified, the certificate file is
-#			assumed to be a combined certificate and
-#			key file.
-#
-#	   version=	The version of SSL/TLS supported
-#			    1	automatic (default)
-#			    2	SSLv2 only
-#			    3	SSLv3 only
-#			    4	TLSv1 only
-#
-#	   cipher=	Colon separated list of supported ciphers.
-#
-#	   options=	Various SSL engine options. The most important
-#			being:
-#			    NO_SSLv2  Disallow the use of SSLv2
-#			    NO_SSLv3  Disallow the use of SSLv3
-#			    NO_TLSv1  Disallow the use of TLSv1
-#			    SINGLE_DH_USE Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			See src/ssl_support.c or OpenSSL SSL_CTX_set_options
-#			documentation for a complete list of options.
-#
-#	   clientca=	File containing the list of CAs to use when
-#			requesting a client certificate.
-#
-#	   cafile=	File containing additional CA certificates to
-#			use when verifying client certificates. If unset
-#			clientca will be used.
-#
-#	   capath=	Directory containing additional CA certificates
-#			and CRL lists to use when verifying client certificates.
-#
-#	   crlfile=	File of additional CRL lists to use when verifying
-#			the client certificate, in addition to CRLs stored in
-#			the capath. Implies VERIFY_CRL flag below.
-#
-#	   dhparams=	File containing DH parameters for temporary/ephemeral
-#			DH key exchanges.
-#
-#	   sslflags=	Various flags modifying the use of SSL:
-#			    DELAYED_AUTH
-#				Don't request client certificates
-#				immediately, but wait until acl processing
-#				requires a certificate (not yet implemented).
-#			    NO_DEFAULT_CA
-#				Don't use the default CA lists built in
-#				to OpenSSL.
-#			    NO_SESSION_REUSE
-#				Don't allow for session reuse. Each connection
-#				will result in a new SSL session.
-#			    VERIFY_CRL
-#				Verify CRL lists when accepting client
-#				certificates.
-#			    VERIFY_CRL_ALL
-#				Verify CRL lists for all certificates in the
-#				client certificate chain.
-#
-#	   sslcontext=	SSL session ID context identifier.
-#
-#	   generate-host-certificates[=<on|off>]
-#			Dynamically create SSL server certificates for the
-#			destination hosts of bumped SSL requests.When
-#			enabled, the cert and key options are used to sign
-#			generated certificates. Otherwise generated
-#			certificate will be selfsigned.
-#			If there is CA certificate life time of generated
-#			certificate equals lifetime of CA certificate. If
-#			generated certificate is selfsigned lifetime is three
-#			years.
-#			This option is enabled by default when SslBump is used.
-#			See the sslBump option above for more information.
-#
-#	   dynamic_cert_mem_cache_size=SIZE
-#			Approximate total RAM size spent on cached generated
-#			certificates. If set to zero, caching is disabled. The
-#			default value is 4MB.
-#
-#	See http_port for a list of available options.
-#Default:
-# none
-
-#  TAG: tcp_outgoing_tos
-#	Allows you to select a TOS/Diffserv value for packets outgoing
-#	on the server side, based on an ACL.
-#
-#	tcp_outgoing_tos ds-field [!]aclname ...
-#
-#	Example where normal_service_net uses the TOS value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	tcp_outgoing_tos 0x00 normal_service_net
-#	tcp_outgoing_tos 0x20 good_service_net
-#
-#	TOS/DSCP values really only have local significance - so you should
-#	know what you're specifying. For more information, see RFC2474,
-#	RFC2475, and RFC3260.
-#
-#	The TOS/DSCP byte must be exactly that - a octet value  0 - 255, or
-#	"default" to use whatever default your host has. Note that in
-#	practice often only multiples of 4 is usable as the two rightmost bits
-#	have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-#	Processing proceeds in the order specified, and stops at first fully
-#	matching line.
-#Default:
-# none
-
-#  TAG: clientside_tos
-#	Allows you to select a TOS/Diffserv value for packets being transmitted
-#	on the client-side, based on an ACL.
-#
-#	clientside_tos ds-field [!]aclname ...
-#
-#	Example where normal_service_net uses the TOS value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	clientside_tos 0x00 normal_service_net
-#	clientside_tos 0x20 good_service_net
-#
-#	Note: This feature is incompatible with qos_flows. Any TOS values set here
-#	will be overwritten by TOS values in qos_flows.
-#Default:
-# none
-
-#  TAG: tcp_outgoing_mark
-# Note: This option is only available if Squid is rebuilt with the
-#       Packet MARK (Linux)
-#
-#	Allows you to apply a Netfilter mark value to outgoing packets
-#	on the server side, based on an ACL.
-#
-#	tcp_outgoing_mark mark-value [!]aclname ...
-#
-#	Example where normal_service_net uses the mark value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	tcp_outgoing_mark 0x00 normal_service_net
-#	tcp_outgoing_mark 0x20 good_service_net
-#Default:
-# none
-
-#  TAG: clientside_mark
-# Note: This option is only available if Squid is rebuilt with the
-#       Packet MARK (Linux)
-#
-#	Allows you to apply a Netfilter mark value to packets being transmitted
-#	on the client-side, based on an ACL.
-#
-#	clientside_mark mark-value [!]aclname ...
-#
-#	Example where normal_service_net uses the mark value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	clientside_mark 0x00 normal_service_net
-#	clientside_mark 0x20 good_service_net
-#
-#	Note: This feature is incompatible with qos_flows. Any mark values set here
-#	will be overwritten by mark values in qos_flows.
-#Default:
-# none
-
-#  TAG: qos_flows
-#	Allows you to select a TOS/DSCP value to mark outgoing
-#	connections to the client, based on where the reply was sourced.
-#	For platforms using netfilter, allows you to set a netfilter mark
-#	value instead of, or in addition to, a TOS value.
-#
-#	By default this functionality is disabled. To enable it with the default
-#	settings simply use "qos_flows mark" or "qos_flows tos". Default
-#	settings will result in the netfilter mark or TOS value being copied
-#	from the upstream connection to the client. Note that it is the connection
-#	CONNMARK value not the packet MARK value that is copied.
-#
-#	It is not currently possible to copy the mark or TOS value from the
-#	client to the upstream connection request.
-#
-#	TOS values really only have local significance - so you should
-#	know what you're specifying. For more information, see RFC2474,
-#	RFC2475, and RFC3260.
-#
-#	The TOS/DSCP byte must be exactly that - a octet value  0 - 255. Note that
-#	in practice often only multiples of 4 is usable as the two rightmost bits
-#	have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-#	Mark values can be any unsigned 32-bit integer value.
-#
-#	This setting is configured by setting the following values:
-#
-#	tos|mark                Whether to set TOS or netfilter mark values
-#
-#	local-hit=0xFF		Value to mark local cache hits.
-#
-#	sibling-hit=0xFF	Value to mark hits from sibling peers.
-#
-#	parent-hit=0xFF		Value to mark hits from parent peers.
-#
-#	miss=0xFF[/mask]	Value to mark cache misses. Takes precedence
-#				over the preserve-miss feature (see below), unless
-#				mask is specified, in which case only the bits
-#				specified in the mask are written.
-#
-#	The TOS variant of the following features are only possible on Linux
-#	and require your kernel to be patched with the TOS preserving ZPH
-#	patch, available from http://zph.bratcheda.org
-#	No patch is needed to preserve the netfilter mark, which will work
-#	with all variants of netfilter.
-#
-#	disable-preserve-miss
-#		This option disables the preservation of the TOS or netfilter
-#		mark. By default, the existing TOS or netfilter mark value of
-#		the response coming from the remote server will be retained
-#		and masked with miss-mark.
-#		NOTE: in the case of a netfilter mark, the mark must be set on
-#		the connection (using the CONNMARK target) not on the packet
-#		(MARK target).
-#
-#	miss-mask=0xFF
-#		Allows you to mask certain bits in the TOS or mark value
-#		received from the remote server, before copying the value to
-#		the TOS sent towards clients.
-#		Default for tos: 0xFF (TOS from server is not changed).
-#		Default for mark: 0xFFFFFFFF (mark from server is not changed).
-#
-#	All of these features require the --enable-zph-qos compilation flag
-#	(enabled by default). Netfilter marking also requires the
-#	libnetfilter_conntrack libraries (--with-netfilter-conntrack) and
-#	libcap 2.09+ (--with-libcap).
-#
-#Default:
-# none
-
-#  TAG: tcp_outgoing_address
-#	Allows you to map requests to different outgoing IP addresses
-#	based on the username or source address of the user making
-#	the request.
-#
-#	tcp_outgoing_address ipaddr [[!]aclname] ...
-#
-#	For example;
-#		Forwarding clients with dedicated IPs for certain subnets.
-#
-#	  acl normal_service_net src 10.0.0.0/24
-#	  acl good_service_net src 10.0.2.0/24
-#
-#	  tcp_outgoing_address 2001:db8::c001 good_service_net
-#	  tcp_outgoing_address 10.1.0.2 good_service_net
-#
-#	  tcp_outgoing_address 2001:db8::beef normal_service_net
-#	  tcp_outgoing_address 10.1.0.1 normal_service_net
-#
-#	  tcp_outgoing_address 2001:db8::1
-#	  tcp_outgoing_address 10.1.0.3
-#
-#	Processing proceeds in the order specified, and stops at first fully
-#	matching line.
-#
-#	Squid will add an implicit IP version test to each line.
-#	Requests going to IPv4 websites will use the outgoing 10.1.0.* addresses.
-#	Requests going to IPv6 websites will use the outgoing 2001:db8:* addresses.
-#
-#
-#	NOTE: The use of this directive using client dependent ACLs is
-#	incompatible with the use of server side persistent connections. To
-#	ensure correct results it is best to set server_persistent_connections
-#	to off when using this directive in such configurations.
-#
-#	NOTE: The use of this directive to set a local IP on outgoing TCP links
-#	is incompatible with using TPROXY to set client IP out outbound TCP links.
-#	When needing to contact peers use the no-tproxy cache_peer option and the
-#	client_dst_passthru directive re-enable normal forwarding such as this.
-#
-#Default:
-# Address selection is performed by the operating system.
-
-#  TAG: host_verify_strict
-#	Regardless of this option setting, when dealing with intercepted
-#	traffic, Squid always verifies that the destination IP address matches
-#	the Host header domain or IP (called 'authority form URL').
-#	
-#	This enforcement is performed to satisfy a MUST-level requirement in
-#	RFC 2616 section 14.23: "The Host field value MUST represent the naming
-#	authority of the origin server or gateway given by the original URL".
-#	
-#	When set to ON:
-#		Squid always responds with an HTTP 409 (Conflict) error
-#		page and logs a security warning if there is no match.
-#	
-#		Squid verifies that the destination IP address matches
-#		the Host header for forward-proxy and reverse-proxy traffic
-#		as well. For those traffic types, Squid also enables the
-#		following checks, comparing the corresponding Host header
-#		and Request-URI components:
-#	
-#		 * The host names (domain or IP) must be identical,
-#		   but valueless or missing Host header disables all checks.
-#		   For the two host names to match, both must be either IP
-#		   or FQDN.
-#	
-#		 * Port numbers must be identical, but if a port is missing
-#		   the scheme-default port is assumed.
-#	
-#	
-#	When set to OFF (the default):
-#		Squid allows suspicious requests to continue but logs a
-#		security warning and blocks caching of the response.
-#	
-#		 * Forward-proxy traffic is not checked at all.
-#	
-#		 * Reverse-proxy traffic is not checked at all.
-#	
-#		 * Intercepted traffic which passes verification is handled
-#		   according to client_dst_passthru.
-#	
-#		 * Intercepted requests which fail verification are sent
-#		   to the client original destination instead of DIRECT.
-#		   This overrides 'client_dst_passthru off'.
-#	
-#		For now suspicious intercepted CONNECT requests are always
-#		responded to with an HTTP 409 (Conflict) error page.
-#	
-#	
-#	SECURITY NOTE:
-#	
-#	As described in CVE-2009-0801 when the Host: header alone is used
-#	to determine the destination of a request it becomes trivial for
-#	malicious scripts on remote websites to bypass browser same-origin
-#	security policy and sandboxing protections.
-#	
-#	The cause of this is that such applets are allowed to perform their
-#	own HTTP stack, in which case the same-origin policy of the browser
-#	sandbox only verifies that the applet tries to contact the same IP
-#	as from where it was loaded at the IP level. The Host: header may
-#	be different from the connected IP and approved origin.
-#	
-#Default:
-# host_verify_strict off
-
-#  TAG: client_dst_passthru
-#	With NAT or TPROXY intercepted traffic Squid may pass the request
-#	directly to the original client destination IP or seek a faster
-#	source using the HTTP Host header.
-#	
-#	Using Host to locate alternative servers can provide faster
-#	connectivity with a range of failure recovery options.
-#	But can also lead to connectivity trouble when the client and
-#	server are attempting stateful interactions unaware of the proxy.
-#	
-#	This option (on by default) prevents alternative DNS entries being
-#	located to send intercepted traffic DIRECT to an origin server.
-#	The clients original destination IP and port will be used instead.
-#	
-#	Regardless of this option setting, when dealing with intercepted
-#	traffic Squid will verify the Host: header and any traffic which
-#	fails Host verification will be treated as if this option were ON.
-#	
-#	see host_verify_strict for details on the verification process.
-#Default:
-# client_dst_passthru on
-
-# SSL OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: ssl_unclean_shutdown
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Some browsers (especially MSIE) bugs out on SSL shutdown
-#	messages.
-#Default:
-# ssl_unclean_shutdown off
-
-#  TAG: ssl_engine
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	The OpenSSL engine to use. You will need to set this if you
-#	would like to use hardware SSL acceleration for example.
-#Default:
-# none
-
-#  TAG: sslproxy_client_certificate
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Client SSL Certificate to use when proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_client_key
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Client SSL Key to use when proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_version
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL version level to use when proxying https:// URLs
-#
-#	The versions of SSL/TLS supported:
-#
-#	    1	automatic (default)
-#	    2	SSLv2 only
-#	    3	SSLv3 only
-#	    4	TLSv1.0 only
-#	    5	TLSv1.1 only
-#	    6	TLSv1.2 only
-#Default:
-# automatic SSL/TLS version negotiation
-
-#  TAG: sslproxy_options
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL implementation options to use when proxying https:// URLs
-#	
-#	The most important being:
-#
-#	    NO_SSLv2    Disallow the use of SSLv2
-#	    NO_SSLv3    Disallow the use of SSLv3
-#	    NO_TLSv1    Disallow the use of TLSv1.0
-#	    NO_TLSv1_1  Disallow the use of TLSv1.1
-#	    NO_TLSv1_2  Disallow the use of TLSv1.2
-#	    SINGLE_DH_USE
-#		      Always create a new key when using temporary/ephemeral
-#		      DH key exchanges
-#	    SSL_OP_NO_TICKET
-#		      Disable use of RFC5077 session tickets. Some servers
-#		      may have problems understanding the TLS extension due
-#		      to ambiguous specification in RFC4507.
-#	    ALL       Enable various bug workarounds suggested as "harmless"
-#		      by OpenSSL. Be warned that this may reduce SSL/TLS
-#		      strength to some attacks.
-#	
-#	See the OpenSSL SSL_CTX_set_options documentation for a
-#	complete list of possible options.
-#Default:
-# none
-
-#  TAG: sslproxy_cipher
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL cipher list to use when proxying https:// URLs
-#
-#	Colon separated list of supported ciphers.
-#Default:
-# none
-
-#  TAG: sslproxy_cafile
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	file containing CA certificates to use when verifying server
-#	certificates while proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_capath
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	directory containing CA certificates to use when verifying
-#	server certificates while proxying https:// URLs
-#Default:
-# none
-
-#  TAG: ssl_bump
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	This option is consulted when a CONNECT request is received on
-#	an http_port (or a new connection is intercepted at an
-#	https_port), provided that port was configured with an ssl-bump
-#	flag. The subsequent data on the connection is either treated as
-#	HTTPS and decrypted OR tunneled at TCP level without decryption,
-#	depending on the first bumping "mode" which ACLs match.
-#
-#	ssl_bump <mode> [!]acl ...
-#
-#	The following bumping modes are supported:
-#
-#	    client-first
-#		Allow bumping of the connection. Establish a secure connection
-#		with the client first, then connect to the server. This old mode
-#		does not allow Squid to mimic server SSL certificate and does
-#		not work with intercepted SSL connections.
-#
-#	    server-first
-#		Allow bumping of the connection. Establish a secure connection
-#		with the server first, then establish a secure connection with
-#		the client, using a mimicked server certificate. Works with both
-#		CONNECT requests and intercepted SSL connections.
-#
-#	    none
-#		Become a TCP tunnel without decoding the connection.
-#		Works with both CONNECT requests and intercepted SSL
-#		connections. This is the default behavior when no
-#		ssl_bump option is given or no ssl_bump ACLs match.
-#
-#	By default, no connections are bumped.
-#
-#	The first matching ssl_bump option wins. If no ACLs match, the
-#	connection is not bumped. Unlike most allow/deny ACL lists, ssl_bump
-#	does not have an implicit "negate the last given option" rule. You
-#	must make that rule explicit if you convert old ssl_bump allow/deny
-#	rules that rely on such an implicit rule.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	See also: http_port ssl-bump, https_port ssl-bump
-#
-#
-#	# Example: Bump all requests except those originating from
-#	# localhost or those going to example.com.
-#
-#	acl broken_sites dstdomain .example.com
-#	ssl_bump none localhost
-#	ssl_bump none broken_sites
-#	ssl_bump server-first all
-#Default:
-# Does not bump unless rules are present in squid.conf
-
-#  TAG: sslproxy_flags
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Various flags modifying the use of SSL while proxying https:// URLs:
-#	    DONT_VERIFY_PEER	Accept certificates that fail verification.
-#				For refined control, see sslproxy_cert_error.
-#	    NO_DEFAULT_CA	Don't use the default CA list built in
-#				to OpenSSL.
-#Default:
-# none
-
-#  TAG: sslproxy_cert_error
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Use this ACL to bypass server certificate validation errors.
-#
-#	For example, the following lines will bypass all validation errors
-#	when talking to servers for example.com. All other
-#	validation errors will result in ERR_SECURE_CONNECT_FAIL error.
-#
-#		acl BrokenButTrustedServers dstdomain example.com
-#		sslproxy_cert_error allow BrokenButTrustedServers
-#		sslproxy_cert_error deny all
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#	Using slow acl types may result in server crashes
-#
-#	Without this option, all server certificate validation errors
-#	terminate the transaction to protect Squid and the client.
-#
-#	SQUID_X509_V_ERR_INFINITE_VALIDATION error cannot be bypassed
-#	but should not happen unless your OpenSSL library is buggy.
-#
-#	SECURITY WARNING:
-#		Bypassing validation errors is dangerous because an
-#		error usually implies that the server cannot be trusted
-#		and the connection may be insecure.
-#
-#	See also: sslproxy_flags and DONT_VERIFY_PEER.
-#Default:
-# Server certificate errors terminate the transaction.
-
-#  TAG: sslproxy_cert_sign
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#
-#        sslproxy_cert_sign <signing algorithm> acl ...
-#
-#        The following certificate signing algorithms are supported:
-#
-#	   signTrusted
-#		Sign using the configured CA certificate which is usually
-#		placed in and trusted by end-user browsers. This is the
-#		default for trusted origin server certificates.
-#
-#	   signUntrusted
-#		Sign to guarantee an X509_V_ERR_CERT_UNTRUSTED browser error.
-#		This is the default for untrusted origin server certificates
-#		that are not self-signed (see ssl::certUntrusted).
-#
-#	   signSelf
-#		Sign using a self-signed certificate with the right CN to
-#		generate a X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT error in the
-#		browser. This is the default for self-signed origin server
-#		certificates (see ssl::certSelfSigned).
-#
-#	This clause only supports fast acl types.
-#
-#	When sslproxy_cert_sign acl(s) match, Squid uses the corresponding
-#	signing algorithm to generate the certificate and ignores all
-#	subsequent sslproxy_cert_sign options (the first match wins). If no
-#	acl(s) match, the default signing algorithm is determined by errors
-#	detected when obtaining and validating the origin server certificate.
-#
-#	WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-#	be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-#	CONNECT request that carries a domain name. In all other cases (CONNECT
-#	to an IP address or an intercepted SSL connection), Squid cannot detect
-#	the domain mismatch at certificate generation time when
-#	bump-server-first is used.
-#Default:
-# none
-
-#  TAG: sslproxy_cert_adapt
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	
-#	sslproxy_cert_adapt <adaptation algorithm> acl ...
-#
-#	The following certificate adaptation algorithms are supported:
-#
-#	   setValidAfter
-#		Sets the "Not After" property to the "Not After" property of
-#		the CA certificate used to sign generated certificates.
-#
-#	   setValidBefore
-#		Sets the "Not Before" property to the "Not Before" property of
-#		the CA certificate used to sign generated certificates.
-#
-#	   setCommonName or setCommonName{CN}
-#		Sets Subject.CN property to the host name specified as a 
-#		CN parameter or, if no explicit CN parameter was specified,
-#		extracted from the CONNECT request. It is a misconfiguration
-#		to use setCommonName without an explicit parameter for
-#		intercepted or tproxied SSL connections.
-#		
-#	This clause only supports fast acl types.
-#
-#	Squid first groups sslproxy_cert_adapt options by adaptation algorithm.
-#	Within a group, when sslproxy_cert_adapt acl(s) match, Squid uses the
-#	corresponding adaptation algorithm to generate the certificate and
-#	ignores all subsequent sslproxy_cert_adapt options in that algorithm's
-#	group (i.e., the first match wins within each algorithm group). If no
-#	acl(s) match, the default mimicking action takes place.
-#
-#	WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-#	be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-#	CONNECT request that carries a domain name. In all other cases (CONNECT
-#	to an IP address or an intercepted SSL connection), Squid cannot detect
-#	the domain mismatch at certificate generation time when
-#	bump-server-first is used.
-#Default:
-# none
-
-#  TAG: sslpassword_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Specify a program used for entering SSL key passphrases
-#	when using encrypted SSL certificate keys. If not specified
-#	keys must either be unencrypted, or Squid started with the -N
-#	option to allow it to query interactively for the passphrase.
-#
-#	The key file name is given as argument to the program allowing
-#	selection of the right password if you have multiple encrypted
-#	keys.
-#Default:
-# none
-
-# OPTIONS RELATING TO EXTERNAL SSL_CRTD 
-# -----------------------------------------------------------------------------
-
-#  TAG: sslcrtd_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl-crtd
-#
-#	Specify the location and options of the executable for ssl_crtd process.
-#	/usr/libexec/ssl_crtd program requires -s and -M parameters
-#	For more information use:
-#		/usr/libexec/ssl_crtd -h
-#Default:
-# sslcrtd_program /usr/libexec/ssl_crtd -s /var/log/squid/lib/ssl_db -M 4MB
-
-#  TAG: sslcrtd_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl-crtd
-#
-#	The maximum number of processes spawn to service ssl server.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=N
-#	
-#	Sets the minimum number of processes to spawn when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few children temporary slows Squid under load while it
-#	tries to spawn enough additional processes to cope with traffic.
-#	
-#		idle=N
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#	
-#	You must have at least one ssl_crtd process.
-#Default:
-# sslcrtd_children 32 startup=5 idle=1
-
-#  TAG: sslcrtvalidator_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Specify the location and options of the executable for ssl_crt_validator
-#	process.
-#
-#	Usage:  sslcrtvalidator_program [ttl=n] [cache=n] path ...
-#
-#	Options:
-#	  ttl=n         TTL in seconds for cached results. The default is 60 secs
-#	  cache=n       limit the result cache size. The default value is 2048
-#Default:
-# none
-
-#  TAG: sslcrtvalidator_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	The maximum number of processes spawn to service SSL server.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=N
-#	
-#	Sets the minimum number of processes to spawn when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few children temporary slows Squid under load while it
-#	tries to spawn enough additional processes to cope with traffic.
-#	
-#		idle=N
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#	
-#	The number of requests each certificate validator helper can handle in
-#	parallel. A value of 0 indicates the certficate validator does not
-#	support concurrency. Defaults to 1.
-#	
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	a request ID in front of the request/response. The request
-#	ID from the request must be echoed back with the response
-#	to that request.
-#	
-#	You must have at least one ssl_crt_validator process.
-#Default:
-# sslcrtvalidator_children 32 startup=5 idle=1 concurrency=1
-
-# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_peer
-#	To specify other caches in a hierarchy, use the format:
-#	
-#		cache_peer hostname type http-port icp-port [options]
-#	
-#	For example,
-#	
-#	#                                        proxy  icp
-#	#          hostname             type     port   port  options
-#	#          -------------------- -------- ----- -----  -----------
-#	cache_peer parent.foo.net       parent    3128  3130  default
-#	cache_peer sib1.foo.net         sibling   3128  3130  proxy-only
-#	cache_peer sib2.foo.net         sibling   3128  3130  proxy-only
-#	cache_peer example.com          parent    80       0  default
-#	cache_peer cdn.example.com      sibling   3128     0  
-#	
-#	      type:	either 'parent', 'sibling', or 'multicast'.
-#	
-#	proxy-port:	The port number where the peer accept HTTP requests.
-#			For other Squid proxies this is usually 3128
-#			For web servers this is usually 80
-#	
-#	  icp-port:	Used for querying neighbor caches about objects.
-#			Set to 0 if the peer does not support ICP or HTCP.
-#			See ICP and HTCP options below for additional details.
-#	
-#	
-#	==== ICP OPTIONS ====
-#	
-#	You MUST also set icp_port and icp_access explicitly when using these options.
-#	The defaults will prevent peer traffic using ICP.
-#	
-#	
-#	no-query	Disable ICP queries to this neighbor.
-#	
-#	multicast-responder
-#			Indicates the named peer is a member of a multicast group.
-#			ICP queries will not be sent directly to the peer, but ICP
-#			replies will be accepted from it.
-#	
-#	closest-only	Indicates that, for ICP_OP_MISS replies, we'll only forward
-#			CLOSEST_PARENT_MISSes and never FIRST_PARENT_MISSes.
-#	
-#	background-ping
-#			To only send ICP queries to this neighbor infrequently.
-#			This is used to keep the neighbor round trip time updated
-#			and is usually used in conjunction with weighted-round-robin.
-#	
-#	
-#	==== HTCP OPTIONS ====
-#	
-#	You MUST also set htcp_port and htcp_access explicitly when using these options.
-#	The defaults will prevent peer traffic using HTCP.
-#	
-#	
-#	htcp		Send HTCP, instead of ICP, queries to the neighbor.
-#			You probably also want to set the "icp-port" to 4827
-#			instead of 3130. This directive accepts a comma separated
-#			list of options described below.
-#	
-#	htcp=oldsquid	Send HTCP to old Squid versions (2.5 or earlier).
-#	
-#	htcp=no-clr	Send HTCP to the neighbor but without
-#			sending any CLR requests.  This cannot be used with
-#			only-clr.
-#	
-#	htcp=only-clr	Send HTCP to the neighbor but ONLY CLR requests.
-#			This cannot be used with no-clr.
-#	
-#	htcp=no-purge-clr
-#			Send HTCP to the neighbor including CLRs but only when
-#			they do not result from PURGE requests.
-#	
-#	htcp=forward-clr
-#			Forward any HTCP CLR requests this proxy receives to the peer.
-#	
-#	
-#	==== PEER SELECTION METHODS ====
-#	
-#	The default peer selection method is ICP, with the first responding peer
-#	being used as source. These options can be used for better load balancing.
-#	
-#	
-#	default		This is a parent cache which can be used as a "last-resort"
-#			if a peer cannot be located by any of the peer-selection methods.
-#			If specified more than once, only the first is used.
-#	
-#	round-robin	Load-Balance parents which should be used in a round-robin
-#			fashion in the absence of any ICP queries.
-#			weight=N can be used to add bias.
-#	
-#	weighted-round-robin
-#			Load-Balance parents which should be used in a round-robin
-#			fashion with the frequency of each parent being based on the
-#			round trip time. Closer parents are used more often.
-#			Usually used for background-ping parents.
-#			weight=N can be used to add bias.
-#	
-#	carp		Load-Balance parents which should be used as a CARP array.
-#			The requests will be distributed among the parents based on the
-#			CARP load balancing hash function based on their weight.
-#	
-#	userhash	Load-balance parents based on the client proxy_auth or ident username.
-#	
-#	sourcehash	Load-balance parents based on the client source IP.
-#
-#	multicast-siblings
-#			To be used only for cache peers of type "multicast".
-#			ALL members of this multicast group have "sibling"
-#			relationship with it, not "parent".  This is to a multicast
-#			group when the requested object would be fetched only from
-#			a "parent" cache, anyway.  It's useful, e.g., when
-#			configuring a pool of redundant Squid proxies, being
-#			members of the same multicast group.
-#	
-#	
-#	==== PEER SELECTION OPTIONS ====
-#	
-#	weight=N	use to affect the selection of a peer during any weighted
-#			peer-selection mechanisms.
-#			The weight must be an integer; default is 1,
-#			larger weights are favored more.
-#			This option does not affect parent selection if a peering
-#			protocol is not in use.
-#	
-#	basetime=N	Specify a base amount to be subtracted from round trip
-#			times of parents.
-#			It is subtracted before division by weight in calculating
-#			which parent to fectch from. If the rtt is less than the
-#			base time the rtt is set to a minimal value.
-#	
-#	ttl=N		Specify a TTL to use when sending multicast ICP queries
-#			to this address.
-#			Only useful when sending to a multicast group.
-#			Because we don't accept ICP replies from random
-#			hosts, you must configure other group members as
-#			peers with the 'multicast-responder' option.
-#	
-#	no-delay	To prevent access to this neighbor from influencing the
-#			delay pools.
-#	
-#	digest-url=URL	Tell Squid to fetch the cache digest (if digests are
-#			enabled) for this host from the specified URL rather
-#			than the Squid default location.
-#	
-#	
-#	==== CARP OPTIONS ====
-#	
-#	carp-key=key-specification
-#			use a different key than the full URL to hash against the peer.
-#			the key-specification is a comma-separated list of the keywords			
-#			scheme, host, port, path, params
-#			Order is not important.
-#	
-#	==== ACCELERATOR / REVERSE-PROXY OPTIONS ====
-#	
-#	originserver	Causes this parent to be contacted as an origin server.
-#			Meant to be used in accelerator setups when the peer
-#			is a web server.
-#	
-#	forceddomain=name
-#			Set the Host header of requests forwarded to this peer.
-#			Useful in accelerator setups where the server (peer)
-#			expects a certain domain name but clients may request
-#			others. ie example.com or www.example.com
-#	
-#	no-digest	Disable request of cache digests.
-#	
-#	no-netdb-exchange
-#			Disables requesting ICMP RTT database (NetDB).
-#	
-#	
-#	==== AUTHENTICATION OPTIONS ====
-#	
-#	login=user:password
-#			If this is a personal/workgroup proxy and your parent
-#			requires proxy authentication.
-#			
-#			Note: The string can include URL escapes (i.e. %20 for
-#			spaces). This also means % must be written as %%.
-#	
-#	login=PASSTHRU
-#			Send login details received from client to this peer.
-#			Both Proxy- and WWW-Authorization headers are passed
-#			without alteration to the peer.
-#			Authentication is not required by Squid for this to work.
-#			
-#			Note: This will pass any form of authentication but
-#			only Basic auth will work through a proxy unless the
-#			connection-auth options are also used.
-#
-#	login=PASS	Send login details received from client to this peer.
-#			Authentication is not required by this option.
-#			
-#			If there are no client-provided authentication headers
-#			to pass on, but username and password are available
-#			from an external ACL user= and password= result tags
-#			they may be sent instead.
-#			
-#			Note: To combine this with proxy_auth both proxies must
-#			share the same user database as HTTP only allows for
-#			a single login (one for proxy, one for origin server).
-#			Also be warned this will expose your users proxy
-#			password to the peer. USE WITH CAUTION
-#	
-#	login=*:password
-#			Send the username to the upstream cache, but with a
-#			fixed password. This is meant to be used when the peer
-#			is in another administrative domain, but it is still
-#			needed to identify each user.
-#			The star can optionally be followed by some extra
-#			information which is added to the username. This can
-#			be used to identify this proxy to the peer, similar to
-#			the login=username:password option above.
-#	
-#	login=NEGOTIATE
-#			If this is a personal/workgroup proxy and your parent
-#			requires a secure proxy authentication.
-#			The first principal from the default keytab or defined by
-#			the environment variable KRB5_KTNAME will be used. 
-#	
-#			WARNING: The connection may transmit requests from multiple
-#			clients. Negotiate often assumes end-to-end authentication
-#			and a single-client. Which is not strictly true here.
-#	
-#	login=NEGOTIATE:principal_name
-#			If this is a personal/workgroup proxy and your parent
-#			requires a secure proxy authentication. 
-#			The principal principal_name from the default keytab or
-#			defined by the environment variable KRB5_KTNAME will be
-#			used.
-#	
-#			WARNING: The connection may transmit requests from multiple
-#			clients. Negotiate often assumes end-to-end authentication
-#			and a single-client. Which is not strictly true here.
-#	
-#	connection-auth=on|off
-#			Tell Squid that this peer does or not support Microsoft
-#			connection oriented authentication, and any such
-#			challenges received from there should be ignored.
-#			Default is auto to automatically determine the status
-#			of the peer.
-#	
-#	
-#	==== SSL / HTTPS / TLS OPTIONS ====
-#	
-#	ssl		Encrypt connections to this peer with SSL/TLS.
-#	
-#	sslcert=/path/to/ssl/certificate
-#			A client SSL certificate to use when connecting to
-#			this peer.
-#	
-#	sslkey=/path/to/ssl/key
-#			The private SSL key corresponding to sslcert above.
-#			If 'sslkey' is not specified 'sslcert' is assumed to
-#			reference a combined file containing both the
-#			certificate and the key.
-#	
-#	sslversion=1|2|3|4|5|6
-#			The SSL version to use when connecting to this peer
-#				1 = automatic (default)
-#				2 = SSL v2 only
-#				3 = SSL v3 only
-#				4 = TLS v1.0 only
-#				5 = TLS v1.1 only
-#				6 = TLS v1.2 only
-#	
-#	sslcipher=...	The list of valid SSL ciphers to use when connecting
-#			to this peer.
-#	
-#	ssloptions=... 	Specify various SSL implementation options:
-#
-#			    NO_SSLv2    Disallow the use of SSLv2
-#			    NO_SSLv3    Disallow the use of SSLv3
-#			    NO_TLSv1    Disallow the use of TLSv1.0
-#			    NO_TLSv1_1  Disallow the use of TLSv1.1
-#			    NO_TLSv1_2  Disallow the use of TLSv1.2
-#			    SINGLE_DH_USE
-#				      Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			    ALL       Enable various bug workarounds
-#				      suggested as "harmless" by OpenSSL
-#				      Be warned that this reduces SSL/TLS
-#				      strength to some attacks.
-#
-#			See the OpenSSL SSL_CTX_set_options documentation for a
-#			more complete list.
-#	
-#	sslcafile=... 	A file containing additional CA certificates to use
-#			when verifying the peer certificate.
-#	
-#	sslcapath=...	A directory containing additional CA certificates to
-#			use when verifying the peer certificate.
-#	
-#	sslcrlfile=... 	A certificate revocation list file to use when
-#			verifying the peer certificate.
-#	
-#	sslflags=...	Specify various flags modifying the SSL implementation:
-#	
-#			DONT_VERIFY_PEER
-#				Accept certificates even if they fail to
-#				verify.
-#			NO_DEFAULT_CA
-#				Don't use the default CA list built in
-#				to OpenSSL.
-#			DONT_VERIFY_DOMAIN
-#				Don't verify the peer certificate
-#				matches the server name
-#	
-#	ssldomain= 	The peer name as advertised in it's certificate.
-#			Used for verifying the correctness of the received peer
-#			certificate. If not specified the peer hostname will be
-#			used.
-#	
-#	front-end-https
-#			Enable the "Front-End-Https: On" header needed when
-#			using Squid as a SSL frontend in front of Microsoft OWA.
-#			See MS KB document Q307347 for details on this header.
-#			If set to auto the header will only be added if the
-#			request is forwarded as a https:// URL.
-#	
-#	
-#	==== GENERAL OPTIONS ====
-#	
-#	connect-timeout=N
-#			A peer-specific connect timeout.
-#			Also see the peer_connect_timeout directive.
-#	
-#	connect-fail-limit=N
-#			How many times connecting to a peer must fail before
-#			it is marked as down. Default is 10.
-#	
-#	allow-miss	Disable Squid's use of only-if-cached when forwarding
-#			requests to siblings. This is primarily useful when
-#			icp_hit_stale is used by the sibling. To extensive use
-#			of this option may result in forwarding loops, and you
-#			should avoid having two-way peerings with this option.
-#			For example to deny peer usage on requests from peer
-#			by denying cache_peer_access if the source is a peer.
-#	
-#	max-conn=N	Limit the amount of connections Squid may open to this
-#			peer. see also 
-#	
-#	name=xxx	Unique name for the peer.
-#			Required if you have multiple peers on the same host
-#			but different ports.
-#			This name can be used in cache_peer_access and similar
-#			directives to dentify the peer.
-#			Can be used by outgoing access controls through the
-#			peername ACL type.
-#	
-#	no-tproxy	Do not use the client-spoof TPROXY support when forwarding
-#			requests to this peer. Use normal address selection instead.
-#			This overrides the spoof_client_ip ACL.
-#	
-#	proxy-only	objects fetched from the peer will not be stored locally.
-#	
-#Default:
-# none
-
-#  TAG: cache_peer_domain
-#	Use to limit the domains for which a neighbor cache will be
-#	queried.
-#
-#	Usage:
-#		cache_peer_domain cache-host domain [domain ...]
-#		cache_peer_domain cache-host !domain
-#
-#	For example, specifying
-#
-#		cache_peer_domain parent.foo.net	.edu
-#
-#	has the effect such that UDP query packets are sent to
-#	'bigserver' only when the requested object exists on a
-#	server in the .edu domain.  Prefixing the domainname
-#	with '!' means the cache will be queried for objects
-#	NOT in that domain.
-#
-#	NOTE:	* Any number of domains may be given for a cache-host,
-#		  either on the same or separate lines.
-#		* When multiple domains are given for a particular
-#		  cache-host, the first matched domain is applied.
-#		* Cache hosts with no domain restrictions are queried
-#		  for all requests.
-#		* There are no defaults.
-#		* There is also a 'cache_peer_access' tag in the ACL
-#		  section.
-#Default:
-# none
-
-#  TAG: cache_peer_access
-#	Similar to 'cache_peer_domain' but provides more flexibility by
-#	using ACL elements.
-#
-#	Usage:
-#		cache_peer_access cache-host allow|deny [!]aclname ...
-#
-#	The syntax is identical to 'http_access' and the other lists of
-#	ACL elements.  See the comments for 'http_access' below, or
-#	the Squid FAQ (http://wiki.squid-cache.org/SquidFaq/SquidAcl).
-#Default:
-# none
-
-#  TAG: neighbor_type_domain
-#	Modify the cache_peer neighbor type when passing requests
-#	about specific domains to the peer.
-#
-#	Usage:
-#		 neighbor_type_domain neighbor parent|sibling domain domain ...
-#
-#	For example:
-#		cache_peer foo.example.com parent 3128 3130
-#		neighbor_type_domain foo.example.com sibling .au .de
-#
-#	The above configuration treats all requests to foo.example.com as a
-#	parent proxy unless the request is for a .au or .de ccTLD domain name.
-#Default:
-# The peer type from cache_peer directive is used for all requests to that peer.
-
-#  TAG: dead_peer_timeout	(seconds)
-#	This controls how long Squid waits to declare a peer cache
-#	as "dead."  If there are no ICP replies received in this
-#	amount of time, Squid will declare the peer dead and not
-#	expect to receive any further ICP replies.  However, it
-#	continues to send ICP queries, and will mark the peer as
-#	alive upon receipt of the first subsequent ICP reply.
-#
-#	This timeout also affects when Squid expects to receive ICP
-#	replies from peers.  If more than 'dead_peer' seconds have
-#	passed since the last ICP reply was received, Squid will not
-#	expect to receive an ICP reply on the next query.  Thus, if
-#	your time between requests is greater than this timeout, you
-#	will see a lot of requests sent DIRECT to origin servers
-#	instead of to your parents.
-#Default:
-# dead_peer_timeout 10 seconds
-
-#  TAG: forward_max_tries
-#	Controls how many different forward paths Squid will try
-#	before giving up. See also forward_timeout.
-#	
-#	NOTE: connect_retries (default: none) can make each of these
-#	possible forwarding paths be tried multiple times.
-#Default:
-# forward_max_tries 10
-
-#  TAG: hierarchy_stoplist
-#	A list of words which, if found in a URL, cause the object to
-#	be handled directly by this cache.  In other words, use this
-#	to not query neighbor caches for certain objects.  You may
-#	list this option multiple times.
-#
-#	Example:
-#		hierarchy_stoplist cgi-bin ?
-#
-#	Note: never_direct overrides this option.
-#Default:
-# none
-
-# MEMORY CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_mem	(bytes)
-#	NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE.
-#	IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL
-#	USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER
-#	THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS.
-#
-#	'cache_mem' specifies the ideal amount of memory to be used
-#	for:
-#		* In-Transit objects
-#		* Hot Objects
-#		* Negative-Cached objects
-#
-#	Data for these objects are stored in 4 KB blocks.  This
-#	parameter specifies the ideal upper limit on the total size of
-#	4 KB blocks allocated.  In-Transit objects take the highest
-#	priority.
-#
-#	In-transit objects have priority over the others.  When
-#	additional space is needed for incoming data, negative-cached
-#	and hot objects will be released.  In other words, the
-#	negative-cached and hot objects will fill up any unused space
-#	not needed for in-transit objects.
-#
-#	If circumstances require, this limit will be exceeded.
-#	Specifically, if your incoming request rate requires more than
-#	'cache_mem' of memory to hold in-transit objects, Squid will
-#	exceed this limit to satisfy the new requests.  When the load
-#	decreases, blocks will be freed until the high-water mark is
-#	reached.  Thereafter, blocks will be used to store hot
-#	objects.
-#
-#	If shared memory caching is enabled, Squid does not use the shared
-#	cache space for in-transit objects, but they still consume as much
-#	local memory as they need. For more details about the shared memory
-#	cache, see memory_cache_shared.
-#Default:
-# cache_mem 256 MB
-
-#  TAG: maximum_object_size_in_memory	(bytes)
-#	Objects greater than this size will not be attempted to kept in
-#	the memory cache. This should be set high enough to keep objects
-#	accessed frequently in memory to improve performance whilst low
-#	enough to keep larger objects from hoarding cache_mem.
-#Default:
-# maximum_object_size_in_memory 512 KB
-
-#  TAG: memory_cache_shared	on|off
-#	Controls whether the memory cache is shared among SMP workers.
-#
-#	The shared memory cache is meant to occupy cache_mem bytes and replace
-#	the non-shared memory cache, although some entities may still be
-#	cached locally by workers for now (e.g., internal and in-transit
-#	objects may be served from a local memory cache even if shared memory
-#	caching is enabled).
-#
-#	By default, the memory cache is shared if and only if all of the
-#	following conditions are satisfied: Squid runs in SMP mode with
-#	multiple workers, cache_mem is positive, and Squid environment
-#	supports required IPC primitives (e.g., POSIX shared memory segments
-#	and GCC-style atomic operations).
-#
-#	To avoid blocking locks, shared memory uses opportunistic algorithms
-#	that do not guarantee that every cachable entity that could have been
-#	shared among SMP workers will actually be shared.
-#
-#	Currently, entities exceeding 32KB in size cannot be shared.
-#Default:
-# "on" where supported if doing memory caching with multiple SMP workers.
-
-#  TAG: memory_cache_mode
-#	Controls which objects to keep in the memory cache (cache_mem)
-#
-#	always	Keep most recently fetched objects in memory (default)
-#
-#	disk	Only disk cache hits are kept in memory, which means
-#		an object must first be cached on disk and then hit
-#		a second time before cached in memory.
-#
-#	network	Only objects fetched from network is kept in memory
-#Default:
-# Keep the most recently fetched objects in memory
-
-#  TAG: memory_replacement_policy
-#	The memory replacement policy parameter determines which
-#	objects are purged from memory when memory space is needed.
-#
-#	See cache_replacement_policy for details on algorithms.
-#Default:
-# memory_replacement_policy lru
-
-# DISK CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_replacement_policy
-#	The cache replacement policy parameter determines which
-#	objects are evicted (replaced) when disk space is needed.
-#
-#	    lru       : Squid's original list based LRU policy
-#	    heap GDSF : Greedy-Dual Size Frequency
-#	    heap LFUDA: Least Frequently Used with Dynamic Aging
-#	    heap LRU  : LRU policy implemented using a heap
-#
-#	Applies to any cache_dir lines listed below this directive.
-#
-#	The LRU policies keeps recently referenced objects.
-#
-#	The heap GDSF policy optimizes object hit rate by keeping smaller
-#	popular objects in cache so it has a better chance of getting a
-#	hit.  It achieves a lower byte hit rate than LFUDA though since
-#	it evicts larger (possibly popular) objects.
-#
-#	The heap LFUDA policy keeps popular objects in cache regardless of
-#	their size and thus optimizes byte hit rate at the expense of
-#	hit rate since one large, popular object will prevent many
-#	smaller, slightly less popular objects from being cached.
-#
-#	Both policies utilize a dynamic aging mechanism that prevents
-#	cache pollution that can otherwise occur with frequency-based
-#	replacement policies.
-#
-#	NOTE: if using the LFUDA replacement policy you should increase
-#	the value of maximum_object_size above its default of 4 MB to
-#	to maximize the potential byte hit rate improvement of LFUDA.
-#
-#	For more information about the GDSF and LFUDA cache replacement
-#	policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html
-#	and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html.
-#Default:
-# cache_replacement_policy lru
-
-#  TAG: minimum_object_size	(bytes)
-#	Objects smaller than this size will NOT be saved on disk.  The
-#	value is specified in bytes, and the default is 0 KB, which
-#	means all responses can be stored.
-#Default:
-# no limit
-
-#  TAG: maximum_object_size	(bytes)
-#	Set the default value for max-size parameter on any cache_dir.
-#	The value is specified in bytes, and the default is 4 MB.
-#	
-#	If you wish to get a high BYTES hit ratio, you should probably
-#	increase this (one 32 MB object hit counts for 3200 10KB
-#	hits).
-#	
-#	If you wish to increase hit ratio more than you want to
-#	save bandwidth you should leave this low.
-#	
-#	NOTE: if using the LFUDA replacement policy you should increase
-#	this value to maximize the byte hit rate improvement of LFUDA!
-#	See cache_replacement_policy for a discussion of this policy.
-#Default:
-# maximum_object_size 4 MB
-
-#  TAG: cache_dir
-#	Format:
-#		cache_dir Type Directory-Name Fs-specific-data [options]
-#
-#	You can specify multiple cache_dir lines to spread the
-#	cache among different disk partitions.
-#
-#	Type specifies the kind of storage system to use. Only "ufs"
-#	is built by default. To enable any of the other storage systems
-#	see the --enable-storeio configure option.
-#
-#	'Directory' is a top-level directory where cache swap
-#	files will be stored.  If you want to use an entire disk
-#	for caching, this can be the mount-point directory.
-#	The directory must exist and be writable by the Squid
-#	process.  Squid will NOT create this directory for you.
-#
-#	In SMP configurations, cache_dir must not precede the workers option
-#	and should use configuration macros or conditionals to give each
-#	worker interested in disk caching a dedicated cache directory.
-#
-#
-#	====  The ufs store type  ====
-#
-#	"ufs" is the old well-known Squid storage format that has always
-#	been there.
-#
-#	Usage:
-#		cache_dir ufs Directory-Name Mbytes L1 L2 [options]
-#
-#	'Mbytes' is the amount of disk space (MB) to use under this
-#	directory.  The default is 100 MB.  Change this to suit your
-#	configuration.  Do NOT put the size of your disk drive here.
-#	Instead, if you want Squid to use the entire disk drive,
-#	subtract 20% and use that value.
-#
-#	'L1' is the number of first-level subdirectories which
-#	will be created under the 'Directory'.  The default is 16.
-#
-#	'L2' is the number of second-level subdirectories which
-#	will be created under each first-level directory.  The default
-#	is 256.
-#
-#
-#	====  The aufs store type  ====
-#
-#	"aufs" uses the same storage format as "ufs", utilizing
-#	POSIX-threads to avoid blocking the main Squid process on
-#	disk-I/O. This was formerly known in Squid as async-io.
-#
-#	Usage:
-#		cache_dir aufs Directory-Name Mbytes L1 L2 [options]
-#
-#	see argument descriptions under ufs above
-#
-#
-#	====  The diskd store type  ====
-#
-#	"diskd" uses the same storage format as "ufs", utilizing a
-#	separate process to avoid blocking the main Squid process on
-#	disk-I/O.
-#
-#	Usage:
-#		cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n]
-#
-#	see argument descriptions under ufs above
-#
-#	Q1 specifies the number of unacknowledged I/O requests when Squid
-#	stops opening new files. If this many messages are in the queues,
-#	Squid won't open new files. Default is 64
-#
-#	Q2 specifies the number of unacknowledged messages when Squid
-#	starts blocking.  If this many messages are in the queues,
-#	Squid blocks until it receives some replies. Default is 72
-#
-#	When Q1 < Q2 (the default), the cache directory is optimized
-#	for lower response time at the expense of a decrease in hit
-#	ratio.  If Q1 > Q2, the cache directory is optimized for
-#	higher hit ratio at the expense of an increase in response
-#	time.
-#
-#
-#	====  The rock store type  ====
-#
-#	Usage:
-#	    cache_dir rock Directory-Name Mbytes <max-size=bytes> [options]
-#
-#	The Rock Store type is a database-style storage. All cached
-#	entries are stored in a "database" file, using fixed-size slots,
-#	one entry per slot. The database size is specified in MB. The
-#	slot size is specified in bytes using the max-size option. See
-#	below for more info on the max-size option.
-#
-#	If possible, Squid using Rock Store creates a dedicated kid
-#	process called "disker" to avoid blocking Squid worker(s) on disk
-#	I/O. One disker kid is created for each rock cache_dir.  Diskers
-#	are created only when Squid, running in daemon mode, has support
-#	for the IpcIo disk I/O module.
-#
-#	swap-timeout=msec: Squid will not start writing a miss to or
-#	reading a hit from disk if it estimates that the swap operation
-#	will take more than the specified number of milliseconds. By
-#	default and when set to zero, disables the disk I/O time limit
-#	enforcement. Ignored when using blocking I/O module because
-#	blocking synchronous I/O does not allow Squid to estimate the
-#	expected swap wait time.
-#
-#	max-swap-rate=swaps/sec: Artificially limits disk access using
-#	the specified I/O rate limit. Swap out requests that
-#	would cause the average I/O rate to exceed the limit are
-#	delayed. Individual swap in requests (i.e., hits or reads) are
-#	not delayed, but they do contribute to measured swap rate and
-#	since they are placed in the same FIFO queue as swap out
-#	requests, they may wait longer if max-swap-rate is smaller.
-#	This is necessary on file systems that buffer "too
-#	many" writes and then start blocking Squid and other processes
-#	while committing those writes to disk.  Usually used together
-#	with swap-timeout to avoid excessive delays and queue overflows
-#	when disk demand exceeds available disk "bandwidth". By default
-#	and when set to zero, disables the disk I/O rate limit
-#	enforcement. Currently supported by IpcIo module only.
-#
-#
-#	====  The coss store type  ====
-#
-#	NP: COSS filesystem in Squid-3 has been deemed too unstable for
-#	    production use and has thus been removed from this release.
-#	    We hope that it can be made usable again soon.
-#
-#	block-size=n defines the "block size" for COSS cache_dir's.
-#	Squid uses file numbers as block numbers.  Since file numbers
-#	are limited to 24 bits, the block size determines the maximum
-#	size of the COSS partition.  The default is 512 bytes, which
-#	leads to a maximum cache_dir size of 512<<24, or 8 GB.  Note
-#	you should not change the coss block size after Squid
-#	has written some objects to the cache_dir.
-#
-#	The coss file store has changed from 2.5. Now it uses a file
-#	called 'stripe' in the directory names in the config - and
-#	this will be created by squid -z.
-#
-#
-#	==== COMMON OPTIONS ====
-#
-#	no-store	no new objects should be stored to this cache_dir.
-#
-#	min-size=n	the minimum object size in bytes this cache_dir
-#			will accept.  It's used to restrict a cache_dir
-#			to only store large objects (e.g. AUFS) while
-#			other stores are optimized for smaller objects
-#			(e.g. COSS).
-#			Defaults to 0.
-#
-#	max-size=n	the maximum object size in bytes this cache_dir
-#			supports.
-#			The value in maximum_object_size directive sets
-#			the default unless more specific details are
-#			available (ie a small store capacity).
-#
-#	Note: To make optimal use of the max-size limits you should order
-#	the cache_dir lines with the smallest max-size value first.
-#
-#	Note for coss, max-size must be less than COSS_MEMBUF_SZ,
-#	which can be changed with the --with-coss-membuf-size=N configure
-#	option.
-#
-#Default:
-# No disk cache. Store cache ojects only in memory.
-#
-
-# Uncomment and adjust the following to add a disk cache directory.
-cache_dir ufs /var/cache/squid 256 16 256
-
-#  TAG: store_dir_select_algorithm
-#	How Squid selects which cache_dir to use when the response
-#	object will fit into more than one.
-#
-#	Regardless of which algorithm is used the cache_dir min-size
-#	and max-size parameters are obeyed. As such they can affect
-#	the selection algorithm by limiting the set of considered
-#	cache_dir.
-#
-#	Algorithms:
-#
-#		least-load
-#
-#	This algorithm is suited to caches with similar cache_dir
-#	sizes and disk speeds.
-#
-#	The disk with the least I/O pending is selected.
-#	When there are multiple disks with the same I/O load ranking
-#	the cache_dir with most available capacity is selected.
-#
-#	When a mix of cache_dir sizes are configured the faster disks
-#	have a naturally lower I/O loading and larger disks have more
-#	capacity. So space used to store objects and data throughput
-#	may be very unbalanced towards larger disks.
-#
-#
-#		round-robin
-#
-#	This algorithm is suited to caches with unequal cache_dir
-#	disk sizes.
-#
-#	Each cache_dir is selected in a rotation. The next suitable
-#	cache_dir is used.
-#
-#	Available cache_dir capacity is only considered in relation
-#	to whether the object will fit and meets the min-size and
-#	max-size parameters.
-#
-#	Disk I/O loading is only considered to prevent overload on slow
-#	disks. This algorithm does not spread objects by size, so any
-#	I/O loading per-disk may appear very unbalanced and volatile.
-#
-#Default:
-# store_dir_select_algorithm least-load
-
-#  TAG: max_open_disk_fds
-#	To avoid having disk as the I/O bottleneck Squid can optionally
-#	bypass the on-disk cache if more than this amount of disk file
-#	descriptors are open.
-#
-#	A value of 0 indicates no limit.
-#Default:
-# no limit
-
-#  TAG: cache_swap_low	(percent, 0-100)
-#	The low-water mark for cache object replacement.
-#	Replacement begins when the swap (disk) usage is above the
-#	low-water mark and attempts to maintain utilization near the
-#	low-water mark.  As swap utilization gets close to high-water
-#	mark object eviction becomes more aggressive.  If utilization is
-#	close to the low-water mark less replacement is done each time.
-#
-#	Defaults are 90% and 95%. If you have a large cache, 5% could be
-#	hundreds of MB. If this is the case you may wish to set these
-#	numbers closer together.
-#
-#	See also cache_swap_high
-#Default:
-# cache_swap_low 90
-
-#  TAG: cache_swap_high	(percent, 0-100)
-#	The high-water mark for cache object replacement.
-#	Replacement begins when the swap (disk) usage is above the
-#	low-water mark and attempts to maintain utilization near the
-#	low-water mark.  As swap utilization gets close to high-water
-#	mark object eviction becomes more aggressive.  If utilization is
-#	close to the low-water mark less replacement is done each time.
-#
-#	Defaults are 90% and 95%. If you have a large cache, 5% could be
-#	hundreds of MB. If this is the case you may wish to set these
-#	numbers closer together.
-#
-#	See also cache_swap_low
-#Default:
-# cache_swap_high 95
-
-# LOGFILE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: logformat
-#	Usage:
-#
-#	logformat <name> <format specification>
-#
-#	Defines an access log format.
-#
-#	The <format specification> is a string with embedded % format codes
-#
-#	% format codes all follow the same basic structure where all but
-#	the formatcode is optional. Output strings are automatically escaped
-#	as required according to their context and the output format
-#	modifiers are usually not needed, but can be specified if an explicit
-#	output format is desired.
-#
-#		% ["|[|'|#] [-] [[0]width] [{argument}] formatcode
-#
-#		"	output in quoted string format
-#		[	output in squid text log format as used by log_mime_hdrs
-#		#	output in URL quoted format
-#		'	output as-is
-#
-#		-	left aligned
-#
-#		width	minimum and/or maximum field width:
-#			    [width_min][.width_max]
-#			When minimum starts with 0, the field is zero-padded.
-#			String values exceeding maximum width are truncated.
-#
-#		{arg}	argument such as header name etc
-#
-#	Format codes:
-#
-#		%	a literal % character
-#		sn	Unique sequence number per log line entry
-#		err_code    The ID of an error response served by Squid or
-#				a similar internal error identifier.
-#		err_detail  Additional err_code-dependent error information.
-#		note	The annotation specified by the argument. Also
-#			logs the adaptation meta headers set by the
-#			adaptation_meta configuration parameter.
-#			If no argument given all annotations logged.
-#			The argument may include a separator to use with
-#			annotation values:
-#                            name[:separator]
-#			By default, multiple note values are separated with ","
-#			and multiple notes are separated with "\r\n".
-#			When logging named notes with %{name}note, the
-#			explicitly configured separator is used between note
-#			values. When logging all notes with %note, the
-#			explicitly configured separator is used between
-#			individual notes. There is currently no way to
-#			specify both value and notes separators when logging
-#			all notes with %note.
-#
-#	Connection related format codes:
-#
-#		>a	Client source IP address
-#		>A	Client FQDN
-#		>p	Client source port
-#		>eui	Client source EUI (MAC address, EUI-48 or EUI-64 identifier)
-#		>la	Local IP address the client connected to
-#		>lp	Local port number the client connected to
-#		>qos    Client connection TOS/DSCP value set by Squid
-#		>nfmark Client connection netfilter mark set by Squid
-#
-#		la	Local listening IP address the client connection was connected to.
-#		lp	Local listening port number the client connection was connected to.
-#
-#		<a	Server IP address of the last server or peer connection
-#		<A	Server FQDN or peer name
-#		<p	Server port number of the last server or peer connection
-#		<la	Local IP address of the last server or peer connection
-#		<lp     Local port number of the last server or peer connection
-#		<qos	Server connection TOS/DSCP value set by Squid
-#		<nfmark Server connection netfilter mark set by Squid
-#
-#	Time related format codes:
-#
-#		ts	Seconds since epoch
-#		tu	subsecond time (milliseconds)
-#		tl	Local time. Optional strftime format argument
-#				default %d/%b/%Y:%H:%M:%S %z
-#		tg	GMT time. Optional strftime format argument
-#				default %d/%b/%Y:%H:%M:%S %z
-#		tr	Response time (milliseconds)
-#		dt	Total time spent making DNS lookups (milliseconds)
-#
-#	Access Control related format codes:
-#
-#		et	Tag returned by external acl
-#		ea	Log string returned by external acl
-#		un	User name (any available)
-#		ul	User name from authentication
-#		ue	User name from external acl helper
-#		ui	User name from ident
-#		us	User name from SSL
-#
-#	HTTP related format codes:
-#
-#		[http::]>h	Original received request header. 
-#				Usually differs from the request header sent by
-#				Squid, although most fields are often preserved.
-#				Accepts optional header field name/value filter
-#				argument using name[:[separator]element] format.
-#		[http::]>ha	Received request header after adaptation and
-#				redirection (pre-cache REQMOD vectoring point).
-#				Usually differs from the request header sent by
-#				Squid, although most fields are often preserved.
-#				Optional header name argument as for >h
-#		[http::]<h	Reply header. Optional header name argument
-#				as for >h
-#		[http::]>Hs	HTTP status code sent to the client
-#		[http::]<Hs	HTTP status code received from the next hop
-#		[http::]<bs	Number of HTTP-equivalent message body bytes 
-#				received from the next hop, excluding chunked
-#				transfer encoding and control messages.
-#				Generated FTP/Gopher listings are treated as
-#				received bodies.
-#		[http::]mt	MIME content type
-#		[http::]rm	Request method (GET/POST etc)
-#		[http::]>rm	Request method from client
-#		[http::]<rm	Request method sent to server or peer
-#		[http::]ru	Request URL from client (historic, filtered for logging)
-#		[http::]>ru	Request URL from client
-#		[http::]<ru	Request URL sent to server or peer
-#		[http::]rp	Request URL-Path excluding hostname
-#		[http::]>rp	Request URL-Path excluding hostname from client
-#		[http::]<rp	Request URL-Path excluding hostname sento to server or peer
-#		[http::]rv	Request protocol version
-#		[http::]>rv	Request protocol version from client
-#		[http::]<rv	Request protocol version sent to server or peer
-#		[http::]<st	Sent reply size including HTTP headers
-#		[http::]>st	Received request size including HTTP headers. In the
-#				case of chunked requests the chunked encoding metadata
-#				are not included
-#		[http::]>sh	Received HTTP request headers size
-#		[http::]<sh	Sent HTTP reply headers size
-#		[http::]st	Request+Reply size including HTTP headers
-#		[http::]<sH	Reply high offset sent
-#		[http::]<sS	Upstream object size
-#		[http::]<pt	Peer response time in milliseconds. The timer starts
-#				when the last request byte is sent to the next hop
-#				and stops when the last response byte is received.
-#		[http::]<tt	Total server-side time in milliseconds. The timer 
-#				starts with the first connect request (or write I/O)
-#				sent to the first selected peer. The timer stops
-#				with the last I/O with the last peer.
-#
-#	Squid handling related format codes:
-#
-#		Ss	Squid request status (TCP_MISS etc)
-#		Sh	Squid hierarchy status (DEFAULT_PARENT etc)
-#
-#	SSL-related format codes:
-#
-#		ssl::bump_mode	SslBump decision for the transaction:
-#
-#				For CONNECT requests that initiated bumping of
-#				a connection and for any request received on
-#				an already bumped connection, Squid logs the
-#				corresponding SslBump mode ("server-first" or
-#				"client-first"). See the ssl_bump option for
-#				more information about these modes.
-#
-#				A "none" token is logged for requests that
-#				triggered "ssl_bump" ACL evaluation matching
-#				either a "none" rule or no rules at all.
-#
-#				In all other cases, a single dash ("-") is
-#				logged.
-#
-#	If ICAP is enabled, the following code becomes available (as
-#	well as ICAP log codes documented with the icap_log option):
-#
-#		icap::tt        Total ICAP processing time for the HTTP
-#				transaction. The timer ticks when ICAP
-#				ACLs are checked and when ICAP
-#				transaction is in progress.
-#
-#	If adaptation is enabled the following three codes become available:
-#
-#		adapt::<last_h	The header of the last ICAP response or
-#				meta-information from the last eCAP
-#				transaction related to the HTTP transaction.
-#				Like <h, accepts an optional header name
-#				argument.
-#
-#		adapt::sum_trs Summed adaptation transaction response
-#				times recorded as a comma-separated list in
-#				the order of transaction start time. Each time
-#				value is recorded as an integer number,
-#				representing response time of one or more
-#				adaptation (ICAP or eCAP) transaction in
-#				milliseconds.  When a failed transaction is
-#				being retried or repeated, its time is not
-#				logged individually but added to the
-#				replacement (next) transaction. See also:
-#				adapt::all_trs.
-#
-#		adapt::all_trs All adaptation transaction response times.
-#				Same as adaptation_strs but response times of
-#				individual transactions are never added
-#				together. Instead, all transaction response
-#				times are recorded individually.
-#
-#	You can prefix adapt::*_trs format codes with adaptation
-#	service name in curly braces to record response time(s) specific
-#	to that service. For example: %{my_service}adapt::sum_trs
-#
-#	If SSL is enabled, the following formating codes become available:
-#
-#		%ssl::>cert_subject The Subject field of the received client
-#				SSL certificate or a dash ('-') if Squid has
-#				received an invalid/malformed certificate or
-#				no certificate at all. Consider encoding the
-#				logged value because Subject often has spaces.
-#
-#		%ssl::>cert_issuer The Issuer field of the received client
-#				SSL certificate or a dash ('-') if Squid has
-#				received an invalid/malformed certificate or
-#				no certificate at all. Consider encoding the
-#				logged value because Issuer often has spaces.
-#
-#	The default formats available (which do not need re-defining) are:
-#
-#logformat squid      %ts.%03tu %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt
-#logformat common     %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st %Ss:%Sh
-#logformat combined   %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh
-#logformat referrer   %ts.%03tu %>a %{Referer}>h %ru
-#logformat useragent  %>a [%tl] "%{User-Agent}>h"
-#
-#	NOTE: When the log_mime_hdrs directive is set to ON.
-#		The squid, common and combined formats have a safely encoded copy
-#		of the mime headers appended to each line within a pair of brackets.
-#
-#	NOTE: The common and combined formats are not quite true to the Apache definition.
-#		The logs from Squid contain an extra status and hierarchy code appended.
-#
-#Default:
-# The format definitions squid, common, combined, referrer, useragent are built in.
-
-#  TAG: access_log
-#	Configures whether and how Squid logs HTTP and ICP transactions.
-#	If access logging is enabled, a single line is logged for every 
-#	matching HTTP or ICP request. The recommended directive formats are:
-#
-#	access_log <module>:<place> [option ...] [acl acl ...]
-#	access_log none [acl acl ...]
-#
-#	The following directive format is accepted but may be deprecated:
-#	access_log <module>:<place> [<logformat name> [acl acl ...]]
-#
-#        In most cases, the first ACL name must not contain the '=' character
-#	and should not be equal to an existing logformat name. You can always
-#	start with an 'all' ACL to work around those restrictions.
-#	
-#	Will log to the specified module:place using the specified format (which
-#	must be defined in a logformat directive) those entries which match
-#	ALL the acl's specified (which must be defined in acl clauses).
-#	If no acl is specified, all requests will be logged to this destination.
-#	
-#	===== Available options for the recommended directive format =====
-#
-#	logformat=name		Names log line format (either built-in or
-#				defined by a logformat directive). Defaults
-#				to 'squid'.
-#
-#	buffer-size=64KB	Defines approximate buffering limit for log
-#				records (see buffered_logs).  Squid should not
-#				keep more than the specified size and, hence,
-#				should flush records before the buffer becomes
-#				full to avoid overflows under normal
-#				conditions (the exact flushing algorithm is
-#				module-dependent though).  The on-error option
-#				controls overflow handling.
-#
-#	on-error=die|drop	Defines action on unrecoverable errors. The
-#				'drop' action ignores (i.e., does not log)
-#				affected log records. The default 'die' action
-#				kills the affected worker. The drop action 
-#				support has not been tested for modules other
-#				than tcp.
-#
-#	===== Modules Currently available =====
-#	
-#	none	Do not log any requests matching these ACL.
-#		Do not specify Place or logformat name.
-#	
-#	stdio	Write each log line to disk immediately at the completion of
-#		each request.
-#		Place: the filename and path to be written.
-#	
-#	daemon	Very similar to stdio. But instead of writing to disk the log
-#		line is passed to a daemon helper for asychronous handling instead.
-#		Place: varies depending on the daemon.
-#		
-#		log_file_daemon Place: the file name and path to be written.
-#	
-#	syslog	To log each request via syslog facility.
-#		Place: The syslog facility and priority level for these entries.
-#		Place Format:  facility.priority
-#
-#		where facility could be any of:
-#			authpriv, daemon, local0 ... local7 or user.
-#
-#		And priority could be any of:
-#			err, warning, notice, info, debug.
-#	
-#	udp	To send each log line as text data to a UDP receiver.
-#		Place: The destination host name or IP and port.
-#		Place Format:   //host:port
-#
-#	tcp	To send each log line as text data to a TCP receiver.
-#		Lines may be accumulated before sending (see buffered_logs).
-#		Place: The destination host name or IP and port.
-#		Place Format:   //host:port
-#
-#	Default:
-#		access_log daemon:/var/log/squid/access.log squid
-#Default:
-# access_log daemon:/var/log/squid/access.log squid
-
-#  TAG: icap_log
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	ICAP log files record ICAP transaction summaries, one line per
-#	transaction.
-#
-#	The icap_log option format is:
-#	icap_log <filepath> [<logformat name> [acl acl ...]]
-#	icap_log none [acl acl ...]]
-#	
-#	Please see access_log option documentation for details. The two
-#	kinds of logs share the overall configuration approach and many
-#	features.
-#
-#	ICAP processing of a single HTTP message or transaction may
-#	require multiple ICAP transactions.  In such cases, multiple
-#	ICAP transaction log lines will correspond to a single access
-#	log line.
-#
-#	ICAP log uses logformat codes that make sense for an ICAP
-#	transaction. Header-related codes are applied to the HTTP header
-#	embedded in an ICAP server response, with the following caveats:
-#	For REQMOD, there is no HTTP response header unless the ICAP
-#	server performed request satisfaction. For RESPMOD, the HTTP
-#	request header is the header sent to the ICAP server. For
-#	OPTIONS, there are no HTTP headers.
-#
-#	The following format codes are also available for ICAP logs:
-#
-#		icap::<A	ICAP server IP address. Similar to <A.
-#
-#		icap::<service_name	ICAP service name from the icap_service
-#				option in Squid configuration file.
-#
-#		icap::ru	ICAP Request-URI. Similar to ru.
-#
-#		icap::rm	ICAP request method (REQMOD, RESPMOD, or 
-#				OPTIONS). Similar to existing rm.
-#
-#		icap::>st	Bytes sent to the ICAP server (TCP payload
-#				only; i.e., what Squid writes to the socket).
-#
-#		icap::<st	Bytes received from the ICAP server (TCP
-#				payload only; i.e., what Squid reads from
-#				the socket).
-#
-#		icap::<bs	Number of message body bytes received from the
-#				ICAP server. ICAP message body, if any, usually
-#				includes encapsulated HTTP message headers and
-#				possibly encapsulated HTTP message body. The
-#				HTTP body part is dechunked before its size is
-#				computed.
-#
-#		icap::tr 	Transaction response time (in
-#				milliseconds).  The timer starts when
-#				the ICAP transaction is created and
-#				stops when the transaction is completed.
-#				Similar to tr.
-#
-#		icap::tio	Transaction I/O time (in milliseconds). The
-#				timer starts when the first ICAP request
-#				byte is scheduled for sending. The timers
-#				stops when the last byte of the ICAP response
-#				is received.
-#
-#		icap::to 	Transaction outcome: ICAP_ERR* for all
-#				transaction errors, ICAP_OPT for OPTION
-#				transactions, ICAP_ECHO for 204
-#				responses, ICAP_MOD for message
-#				modification, and ICAP_SAT for request
-#				satisfaction. Similar to Ss.
-#
-#		icap::Hs	ICAP response status code. Similar to Hs.
-#
-#		icap::>h	ICAP request header(s). Similar to >h.
-#
-#		icap::<h	ICAP response header(s). Similar to <h.
-#
-#	The default ICAP log format, which can be used without an explicit
-#	definition, is called icap_squid:
-#
-#logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size %icap::rm %icap::ru% %un -/%icap::<A -
-#
-#	See also: logformat, log_icap, and %adapt::<last_h 
-#Default:
-# none
-
-#  TAG: logfile_daemon
-#	Specify the path to the logfile-writing daemon. This daemon is
-#	used to write the access and store logs, if configured.
-#
-#	Squid sends a number of commands to the log daemon:
-#	  L<data>\n - logfile data
-#	  R\n - rotate file
-#	  T\n - truncate file
-#	  O\n - reopen file
-#	  F\n - flush file
-#	  r<n>\n - set rotate count to <n>
-#	  b<n>\n - 1 = buffer output, 0 = don't buffer output
-#
-#	No responses is expected.
-#Default:
-# logfile_daemon /usr/libexec/log_file_daemon
-
-#  TAG: log_access
-#	Remove this line. Use acls with access_log directives to control access logging
-#Default:
-# none
-
-#  TAG: log_icap
-#	Remove this line. Use acls with icap_log directives to control icap logging
-#Default:
-# none
-
-#  TAG: stats_collection	allow|deny acl acl...
-#	This options allows you to control which requests gets accounted
-#	in performance counters.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow logging for all transactions.
-
-#  TAG: cache_store_log
-#	Logs the activities of the storage manager.  Shows which
-#	objects are ejected from the cache, and which objects are
-#	saved and for how long.
-#	There are not really utilities to analyze this data, so you can safely
-#	disable it (the default).
-#	
-#	Store log uses modular logging outputs. See access_log for the list
-#	of modules supported.
-#	
-#	Example:
-#		cache_store_log stdio:/var/log/squid/store.log
-#		cache_store_log daemon:/var/log/squid/store.log
-#Default:
-# none
-
-#  TAG: cache_swap_state
-#	Location for the cache "swap.state" file. This index file holds
-#	the metadata of objects saved on disk.  It is used to rebuild
-#	the cache during startup.  Normally this file resides in each
-#	'cache_dir' directory, but you may specify an alternate
-#	pathname here.  Note you must give a full filename, not just
-#	a directory. Since this is the index for the whole object
-#	list you CANNOT periodically rotate it!
-#
-#	If %s can be used in the file name it will be replaced with a
-#	a representation of the cache_dir name where each / is replaced
-#	with '.'. This is needed to allow adding/removing cache_dir
-#	lines when cache_swap_log is being used.
-#
-#	If have more than one 'cache_dir', and %s is not used in the name
-#	these swap logs will have names such as:
-#
-#		cache_swap_log.00
-#		cache_swap_log.01
-#		cache_swap_log.02
-#
-#	The numbered extension (which is added automatically)
-#	corresponds to the order of the 'cache_dir' lines in this
-#	configuration file.  If you change the order of the 'cache_dir'
-#	lines in this file, these index files will NOT correspond to
-#	the correct 'cache_dir' entry (unless you manually rename
-#	them).  We recommend you do NOT use this option.  It is
-#	better to keep these index files in each 'cache_dir' directory.
-#Default:
-# Store the journal inside its cache_dir
-
-#  TAG: logfile_rotate
-#	Specifies the number of logfile rotations to make when you
-#	type 'squid -k rotate'. The default is 10, which will rotate
-#	with extensions 0 through 9. Setting logfile_rotate to 0 will
-#	disable the file name rotation, but the logfiles are still closed
-#	and re-opened. This will enable you to rename the logfiles
-#	yourself just before sending the rotate signal.
-#
-#	Note, the 'squid -k rotate' command normally sends a USR1
-#	signal to the running squid process.  In certain situations
-#	(e.g. on Linux with Async I/O), USR1 is used for other
-#	purposes, so -k rotate uses another signal.  It is best to get
-#	in the habit of using 'squid -k rotate' instead of 'kill -USR1
-#	<pid>'.
-#
-#	Note, from Squid-3.1 this option is only a default for cache.log,
-#	that log can be rotated separately by using debug_options.
-#Default:
-# logfile_rotate 10
-
-#  TAG: emulate_httpd_log
-#	Replace this with an access_log directive using the format 'common' or 'combined'.
-#Default:
-# none
-
-#  TAG: log_ip_on_direct
-#	Remove this option from your config. To log server or peer names use %<A in the log format.
-#Default:
-# none
-
-#  TAG: mime_table
-#	Path to Squid's icon configuration file.
-#
-#	You shouldn't need to change this, but the default file contains
-#	examples and formatting information if you do.
-#Default:
-# mime_table /etc/squid/mime.conf
-
-#  TAG: log_mime_hdrs	on|off
-#	The Cache can record both the request and the response MIME
-#	headers for each HTTP transaction.  The headers are encoded
-#	safely and will appear as two bracketed fields at the end of
-#	the access log (for either the native or httpd-emulated log
-#	formats).  To enable this logging set log_mime_hdrs to 'on'.
-#Default:
-# log_mime_hdrs off
-
-#  TAG: useragent_log
-#	Replace this with an access_log directive using the format 'useragent'.
-#Default:
-# none
-
-#  TAG: referer_log
-#	Replace this with an access_log directive using the format 'referrer'.
-#Default:
-# none
-
-#  TAG: pid_filename
-#	A filename to write the process-id to.  To disable, enter "none".
-#Default:
-pid_filename /var/run/squid/squid.pid
-
-#  TAG: log_fqdn
-#	Remove this option from your config. To log FQDN use %>A in the log format.
-#Default:
-# none
-
-#  TAG: client_netmask
-#	A netmask for client addresses in logfiles and cachemgr output.
-#	Change this to protect the privacy of your cache clients.
-#	A netmask of 255.255.255.0 will log all IP's in that range with
-#	the last digit set to '0'.
-#Default:
-# Log full client IP address
-
-#  TAG: forward_log
-#	Use a regular access.log with ACL limiting it to MISS events.
-#Default:
-# none
-
-#  TAG: strip_query_terms
-#	By default, Squid strips query terms from requested URLs before
-#	logging.  This protects your user's privacy and reduces log size.
-#
-#	When investigating HIT/MISS or other caching behaviour you
-#	will need to disable this to see the full URL used by Squid.
-#Default:
-# strip_query_terms on
-
-#  TAG: buffered_logs	on|off
-#	Whether to write/send access_log records ASAP or accumulate them and
-#	then write/send them in larger chunks. Buffering may improve
-#	performance because it decreases the number of I/Os. However,
-#	buffering increases the delay before log records become available to
-#	the final recipient (e.g., a disk file or logging daemon) and,
-#	hence, increases the risk of log records loss.
-#
-#	Note that even when buffered_logs are off, Squid may have to buffer
-#	records if it cannot write/send them immediately due to pending I/Os
-#	(e.g., the I/O writing the previous log record) or connectivity loss.
-#
-#	Currently honored by 'daemon' and 'tcp' access_log modules only.
-#Default:
-# buffered_logs off
-
-#  TAG: netdb_filename
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Where Squid stores it's netdb journal.
-#	When enabled this journal preserves netdb state between restarts.
-#
-#	To disable, enter "none".
-#Default:
-# netdb_filename stdio:/var/log/squid/netdb.state
-
-# OPTIONS FOR TROUBLESHOOTING
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_log
-#	Squid administrative logging file.
-#
-#	This is where general information about Squid behavior goes. You can
-#	increase the amount of data logged to this file and how often it is
-#	rotated with "debug_options"
-#Default:
-# cache_log /var/log/squid/cache.log
-
-#  TAG: debug_options
-#	Logging options are set as section,level where each source file
-#	is assigned a unique section.  Lower levels result in less
-#	output,  Full debugging (level 9) can result in a very large
-#	log file, so be careful.
-#
-#	The magic word "ALL" sets debugging levels for all sections.
-#	The default is to run with "ALL,1" to record important warnings.
-#
-#	The rotate=N option can be used to keep more or less of these logs
-#	than would otherwise be kept by logfile_rotate.
-#	For most uses a single log should be enough to monitor current
-#	events affecting Squid.
-#Default:
-# Log all critical and important messages.
-
-#  TAG: coredump_dir
-#	By default Squid leaves core files in the directory from where
-#	it was started. If you set 'coredump_dir' to a directory
-#	that exists, Squid will chdir() to that directory at startup
-#	and coredump files will be left there.
-#
-#Default:
-# Use the directory from where Squid was started.
-#
-
-# Leave coredumps in the first cache dir
-coredump_dir /var/log/squid/cache/squid
-
-# OPTIONS FOR FTP GATEWAYING
-# -----------------------------------------------------------------------------
-
-#  TAG: ftp_user
-#	If you want the anonymous login password to be more informative
-#	(and enable the use of picky FTP servers), set this to something
-#	reasonable for your domain, like wwwuser@somewhere.net
-#
-#	The reason why this is domainless by default is the
-#	request can be made on the behalf of a user in any domain,
-#	depending on how the cache is used.
-#	Some FTP server also validate the email address is valid
-#	(for example perl.com).
-#Default:
-# ftp_user Squid@
-
-#  TAG: ftp_passive
-#	If your firewall does not allow Squid to use passive
-#	connections, turn off this option.
-#
-#	Use of ftp_epsv_all option requires this to be ON.
-#Default:
-# ftp_passive on
-
-#  TAG: ftp_epsv_all
-#	FTP Protocol extensions permit the use of a special "EPSV ALL" command.
-#
-#	NATs may be able to put the connection on a "fast path" through the
-#	translator, as the EPRT command will never be used and therefore,
-#	translation of the data portion of the segments will never be needed.
-#
-#	When a client only expects to do two-way FTP transfers this may be
-#	useful.
-#	If squid finds that it must do a three-way FTP transfer after issuing
-#	an EPSV ALL command, the FTP session will fail.
-#
-#	If you have any doubts about this option do not use it.
-#	Squid will nicely attempt all other connection methods.
-#
-#	Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv_all off
-
-#  TAG: ftp_epsv
-#	FTP Protocol extensions permit the use of a special "EPSV" command.
-#
-#	NATs may be able to put the connection on a "fast path" through the
-#	translator using EPSV, as the EPRT command will never be used
-#	and therefore, translation of the data portion of the segments 
-#	will never be needed.
-#
-#	Turning this OFF will prevent EPSV being attempted.
-#	WARNING: Doing so will convert Squid back to the old behavior with all
-#	the related problems with external NAT devices/layers.
-#
-#	Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv on
-
-#  TAG: ftp_eprt
-#	FTP Protocol extensions permit the use of a special "EPRT" command.
-#
-#	This extension provides a protocol neutral alternative to the
-#	IPv4-only PORT command. When supported it enables active FTP data
-#	channels over IPv6 and efficient NAT handling.
-#
-#	Turning this OFF will prevent EPRT being attempted and will skip
-#	straight to using PORT for IPv4 servers.
-#
-#	Some devices are known to not handle this extension correctly and
-#	may result in crashes. Devices which suport EPRT enough to fail
-#	cleanly will result in Squid attempting PORT anyway. This directive
-#	should only be disabled when EPRT results in device failures.
-#
-#	WARNING: Doing so will convert Squid back to the old behavior with all
-#	the related problems with external NAT devices/layers and IPv4-only FTP.
-#Default:
-# ftp_eprt on
-
-#  TAG: ftp_sanitycheck
-#	For security and data integrity reasons Squid by default performs
-#	sanity checks of the addresses of FTP data connections ensure the
-#	data connection is to the requested server. If you need to allow
-#	FTP connections to servers using another IP address for the data
-#	connection turn this off.
-#Default:
-# ftp_sanitycheck on
-
-#  TAG: ftp_telnet_protocol
-#	The FTP protocol is officially defined to use the telnet protocol
-#	as transport channel for the control connection. However, many
-#	implementations are broken and does not respect this aspect of
-#	the FTP protocol.
-#
-#	If you have trouble accessing files with ASCII code 255 in the
-#	path or similar problems involving this ASCII code you can
-#	try setting this directive to off. If that helps, report to the
-#	operator of the FTP server in question that their FTP server
-#	is broken and does not follow the FTP standard.
-#Default:
-# ftp_telnet_protocol on
-
-# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS
-# -----------------------------------------------------------------------------
-
-#  TAG: diskd_program
-#	Specify the location of the diskd executable.
-#	Note this is only useful if you have compiled in
-#	diskd as one of the store io modules.
-#Default:
-# diskd_program /usr/libexec/diskd
-
-#  TAG: unlinkd_program
-#	Specify the location of the executable for file deletion process.
-#Default:
-# unlinkd_program /usr/libexec/unlinkd
-
-#  TAG: pinger_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Specify the location of the executable for the pinger process.
-#Default:
-# pinger_program /usr/libexec/pinger
-
-#  TAG: pinger_enable
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Control whether the pinger is active at run-time.
-#	Enables turning ICMP pinger on and off with a simple
-#	squid -k reconfigure.
-#Default:
-# pinger_enable on
-
-# OPTIONS FOR URL REWRITING
-# -----------------------------------------------------------------------------
-
-#  TAG: url_rewrite_program
-#	Specify the location of the executable URL rewriter to use.
-#	Since they can perform almost any function there isn't one included.
-#
-#	For each requested URL, the rewriter will receive on line with the format
-#
-#	  [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-#	After processing the request the helper must reply using the following format:
-#
-#	  [channel-ID <SP>] result [<SP> kv-pairs]
-#
-#	The result code can be:
-#
-#	  OK status=30N url="..."
-#		Redirect the URL to the one supplied in 'url='.
-#		'status=' is optional and contains the status code to send
-#		the client in Squids HTTP response. It must be one of the
-#		HTTP redirect status codes: 301, 302, 303, 307, 308.
-#		When no status is given Squid will use 302.
-#
-#	  OK rewrite-url="..."
-#		Rewrite the URL to the one supplied in 'rewrite-url='.
-#		The new URL is fetched directly by Squid and returned to
-#		the client as the response to its request.
-#
-#	  OK
-#		When neither of url= and rewrite-url= are sent Squid does
-#		not change the URL.
-#
-#	  ERR
-#		Do not change the URL.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified. The 'message=' key name is
-#		reserved for delivering a log message.
-#
-#
-#	In the future, the interface protocol will be extended with
-#	key=value pairs ("kv-pairs" shown above).  Helper programs
-#	should be prepared to receive and possibly ignore additional
-#	whitespace-separated tokens on each input line.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#	WARNING: URL re-writing ability should be avoided whenever possible.
-#		 Use the URL redirect form of response instead.
-#
-#	Re-write creates a difference in the state held by the client
-#	and server. Possibly causing confusion when the server response
-#	contains snippets of its view state. Embeded URLs, response
-#	and content Location headers, etc. are not re-written by this
-#	interface.
-#
-#	By default, a URL rewriter is not used.
-#Default:
-# none
-
-#  TAG: url_rewrite_children
-#	The maximum number of redirector processes to spawn. If you limit
-#	it too few Squid will have to wait for them to process a backlog of
-#	URLs, slowing it down. If you allow too many they will use RAM
-#	and other system resources noticably.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#
-#	The number of requests each redirector helper can handle in
-#	parallel. Defaults to 0 which indicates the redirector
-#	is a old-style single threaded redirector.
-#
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	an ID in front of the request/response. The ID from the request
-#	must be echoed back with the response to that request.
-#Default:
-# url_rewrite_children 20 startup=0 idle=1 concurrency=0
-
-#  TAG: url_rewrite_host_header
-#	To preserve same-origin security policies in browsers and
-#	prevent Host: header forgery by redirectors Squid rewrites
-#	any Host: header in redirected requests.
-#	
-#	If you are running an accelerator this may not be a wanted
-#	effect of a redirector. This directive enables you disable
-#	Host: alteration in reverse-proxy traffic.
-#	
-#	WARNING: Entries are cached on the result of the URL rewriting
-#	process, so be careful if you have domain-virtual hosts.
-#	
-#	WARNING: Squid and other software verifies the URL and Host
-#	are matching, so be careful not to relay through other proxies
-#	or inspecting firewalls with this disabled.
-#Default:
-# url_rewrite_host_header on
-
-#  TAG: url_rewrite_access
-#	If defined, this access list specifies which requests are
-#	sent to the redirector processes.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: url_rewrite_bypass
-#	When this is 'on', a request will not go through the
-#	redirector if all the helpers are busy.  If this is 'off'
-#	and the redirector queue grows too large, Squid will exit
-#	with a FATAL error and ask you to increase the number of
-#	redirectors.  You should only enable this if the redirectors
-#	are not critical to your caching system.  If you use
-#	redirectors for access control, and you enable this option,
-#	users may have access to pages they should not
-#	be allowed to request.
-#Default:
-# url_rewrite_bypass off
-
-# OPTIONS FOR STORE ID
-# -----------------------------------------------------------------------------
-
-#  TAG: store_id_program
-#	Specify the location of the executable StoreID helper to use.
-#	Since they can perform almost any function there isn't one included.
-#
-#	For each requested URL, the helper will receive one line with the format
-#
-#	  [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-#	After processing the request the helper must reply using the following format:
-#
-#	  [channel-ID <SP>] result [<SP> kv-pairs]
-#
-#	The result code can be:
-#
-#	  OK store-id="..."
-#		Use the StoreID supplied in 'store-id='.
-#
-#	  ERR
-#		The default is to use HTTP request URL as the store ID.
-#
-#	  BH
-#		An internal error occured in the helper, preventing
-#		a result being identified.
-#
-#
-#	Helper programs should be prepared to receive and possibly ignore additional
-#	kv-pairs with keys they do not support.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#	NOTE: when using StoreID refresh_pattern will apply to the StoreID
-#	      returned from the helper and not the URL.
-#
-#	WARNING: Wrong StoreID value returned by a careless helper may result
-#	         in the wrong cached response returned to the user.
-#
-#	By default, a StoreID helper is not used.
-#Default:
-# none
-
-#  TAG: store_id_children
-#	The maximum number of StoreID helper processes to spawn. If you limit
-#	it too few Squid will have to wait for them to process a backlog of
-#	requests, slowing it down. If you allow too many they will use RAM
-#	and other system resources noticably.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#
-#	The number of requests each storeID helper can handle in
-#	parallel. Defaults to 0 which indicates the helper
-#	is a old-style single threaded program.
-#
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	an ID in front of the request/response. The ID from the request
-#	must be echoed back with the response to that request.
-#Default:
-# store_id_children 20 startup=0 idle=1 concurrency=0
-
-#  TAG: store_id_access
-#	If defined, this access list specifies which requests are
-#	sent to the StoreID processes.  By default all requests
-#	are sent.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: store_id_bypass
-#	When this is 'on', a request will not go through the
-#	helper if all helpers are busy.  If this is 'off'
-#	and the helper queue grows too large, Squid will exit
-#	with a FATAL error and ask you to increase the number of
-#	helpers.  You should only enable this if the helperss
-#	are not critical to your caching system.  If you use
-#	helpers for critical caching components, and you enable this 
-#	option,	users may not get objects from cache.
-#Default:
-# store_id_bypass on
-
-# OPTIONS FOR TUNING THE CACHE
-# -----------------------------------------------------------------------------
-
-#  TAG: cache
-#	A list of ACL elements which, if matched and denied, cause the request to
-#	not be satisfied from the cache and the reply to not be cached.
-#	In other words, use this to force certain objects to never be cached.
-#
-#	You must use the words 'allow' or 'deny' to indicate whether items
-#	matching the ACL should be allowed or denied into the cache.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow caching, unless rules exist in squid.conf.
-
-#  TAG: max_stale	time-units
-#	This option puts an upper limit on how stale content Squid
-#	will serve from the cache if cache validation fails.
-#	Can be overriden by the refresh_pattern max-stale option.
-#Default:
-# max_stale 1 week
-
-#  TAG: refresh_pattern
-#	usage: refresh_pattern [-i] regex min percent max [options]
-#
-#	By default, regular expressions are CASE-SENSITIVE.  To make
-#	them case-insensitive, use the -i option.
-#
-#	'Min' is the time (in minutes) an object without an explicit
-#	expiry time should be considered fresh. The recommended
-#	value is 0, any higher values may cause dynamic applications
-#	to be erroneously cached unless the application designer
-#	has taken the appropriate actions.
-#
-#	'Percent' is a percentage of the objects age (time since last
-#	modification age) an object without explicit expiry time
-#	will be considered fresh.
-#
-#	'Max' is an upper limit on how long objects without an explicit
-#	expiry time will be considered fresh.
-#
-#	options: override-expire
-#		 override-lastmod
-#		 reload-into-ims
-#		 ignore-reload
-#		 ignore-no-store
-#		 ignore-must-revalidate
-#		 ignore-private
-#		 ignore-auth
-#		 max-stale=NN
-#		 refresh-ims
-#		 store-stale
-#
-#		override-expire enforces min age even if the server
-#		sent an explicit expiry time (e.g., with the
-#		Expires: header or Cache-Control: max-age). Doing this
-#		VIOLATES the HTTP standard.  Enabling this feature
-#		could make you liable for problems which it causes.
-#
-#		Note: override-expire does not enforce staleness - it only extends
-#		freshness / min. If the server returns a Expires time which
-#		is longer than your max time, Squid will still consider
-#		the object fresh for that period of time.
-#
-#		override-lastmod enforces min age even on objects
-#		that were modified recently.
-#
-#		reload-into-ims changes a client no-cache or ``reload''
-#		request for a cached entry into a conditional request using
-#		If-Modified-Since and/or If-None-Match headers, provided the
-#		cached entry has a Last-Modified and/or a strong ETag header.
-#		Doing this VIOLATES the HTTP standard. Enabling this feature
-#		could make you liable for problems which it causes.
-#
-#		ignore-reload ignores a client no-cache or ``reload''
-#		header. Doing this VIOLATES the HTTP standard. Enabling
-#		this feature could make you liable for problems which
-#		it causes.
-#
-#		ignore-no-store ignores any ``Cache-control: no-store''
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-must-revalidate ignores any ``Cache-Control: must-revalidate``
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-private ignores any ``Cache-control: private''
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-auth caches responses to requests with authorization,
-#		as if the originserver had sent ``Cache-control: public''
-#		in the response header. Doing this VIOLATES the HTTP standard.
-#		Enabling this feature could make you liable for problems which
-#		it causes.
-#
-#		refresh-ims causes squid to contact the origin server
-#		when a client issues an If-Modified-Since request. This
-#		ensures that the client will receive an updated version
-#		if one is available.
-#
-#		store-stale stores responses even if they don't have explicit 
-#		freshness or a validator (i.e., Last-Modified or an ETag) 
-#		present, or if they're already stale. By default, Squid will 
-#		not cache such responses because they usually can't be
-#		reused. Note that such responses will be stale by default.
-#
-#		max-stale=NN provide a maximum staleness factor. Squid won't
-#		serve objects more stale than this even if it failed to
-#		validate the object. Default: use the max_stale global limit.
-#
-#	Basically a cached object is:
-#
-#		FRESH if expires < now, else STALE
-#		STALE if age > max
-#		FRESH if lm-factor < percent, else STALE
-#		FRESH if age < min
-#		else STALE
-#
-#	The refresh_pattern lines are checked in the order listed here.
-#	The first entry which matches is used.  If none of the entries
-#	match the default will be used.
-#
-#	Note, you must uncomment all the default lines if you want
-#	to change one. The default setting is only active if none is
-#	used.
-#
-#
-
-#
-# Add any of your own refresh_pattern entries above these.
-#
-refresh_pattern ^ftp:		1440	20%	10080
-refresh_pattern ^gopher:	1440	0%	1440
-refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
-refresh_pattern .		0	20%	4320
-
-#  TAG: quick_abort_min	(KB)
-#Default:
-# quick_abort_min 16 KB
-
-#  TAG: quick_abort_max	(KB)
-#Default:
-# quick_abort_max 16 KB
-
-#  TAG: quick_abort_pct	(percent)
-#	The cache by default continues downloading aborted requests
-#	which are almost completed (less than 16 KB remaining). This
-#	may be undesirable on slow (e.g. SLIP) links and/or very busy
-#	caches.  Impatient users may tie up file descriptors and
-#	bandwidth by repeatedly requesting and immediately aborting
-#	downloads.
-#
-#	When the user aborts a request, Squid will check the
-#	quick_abort values to the amount of data transferred until
-#	then.
-#
-#	If the transfer has less than 'quick_abort_min' KB remaining,
-#	it will finish the retrieval.
-#
-#	If the transfer has more than 'quick_abort_max' KB remaining,
-#	it will abort the retrieval.
-#
-#	If more than 'quick_abort_pct' of the transfer has completed,
-#	it will finish the retrieval.
-#
-#	If you do not want any retrieval to continue after the client
-#	has aborted, set both 'quick_abort_min' and 'quick_abort_max'
-#	to '0 KB'.
-#
-#	If you want retrievals to always continue if they are being
-#	cached set 'quick_abort_min' to '-1 KB'.
-#Default:
-# quick_abort_pct 95
-
-#  TAG: read_ahead_gap	buffer-size
-#	The amount of data the cache will buffer ahead of what has been
-#	sent to the client when retrieving an object from another server.
-#Default:
-# read_ahead_gap 16 KB
-
-#  TAG: negative_ttl	time-units
-#	Set the Default Time-to-Live (TTL) for failed requests.
-#	Certain types of failures (such as "connection refused" and
-#	"404 Not Found") are able to be negatively-cached for a short time.
-#	Modern web servers should provide Expires: header, however if they
-#	do not this can provide a minimum TTL.
-#	The default is not to cache errors with unknown expiry details.
-#
-#	Note that this is different from negative caching of DNS lookups.
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#Default:
-# negative_ttl 0 seconds
-
-#  TAG: positive_dns_ttl	time-units
-#	Upper limit on how long Squid will cache positive DNS responses.
-#	Default is 6 hours (360 minutes). This directive must be set
-#	larger than negative_dns_ttl.
-#Default:
-# positive_dns_ttl 6 hours
-
-#  TAG: negative_dns_ttl	time-units
-#	Time-to-Live (TTL) for negative caching of failed DNS lookups.
-#	This also sets the lower cache limit on positive lookups.
-#	Minimum value is 1 second, and it is not recommendable to go
-#	much below 10 seconds.
-#Default:
-# negative_dns_ttl 1 minutes
-
-#  TAG: range_offset_limit	size [acl acl...]
-#	usage: (size) [units] [[!]aclname]
-#	
-#	Sets an upper limit on how far (number of bytes) into the file 
-#	a Range request	may be to cause Squid to prefetch the whole file. 
-#	If beyond this limit, Squid forwards the Range request as it is and 
-#	the result is NOT cached.
-#	
-#	This is to stop a far ahead range request (lets say start at 17MB)
-#	from making Squid fetch the whole object up to that point before
-#	sending anything to the client.
-#	
-#	Multiple range_offset_limit lines may be specified, and they will 
-#	be searched from top to bottom on each request until a match is found. 
-#	The first match found will be used.  If no line matches a request, the 
-#	default limit of 0 bytes will be used.
-#	
-#	'size' is the limit specified as a number of units.
-#	
-#	'units' specifies whether to use bytes, KB, MB, etc.
-#	If no units are specified bytes are assumed.
-#	
-#	A size of 0 causes Squid to never fetch more than the
-#	client requested. (default)
-#	
-#	A size of 'none' causes Squid to always fetch the object from the
-#	beginning so it may cache the result. (2.0 style)
-#	
-#	'aclname' is the name of a defined ACL.
-#	
-#	NP: Using 'none' as the byte value here will override any quick_abort settings 
-#	    that may otherwise apply to the range request. The range request will
-#	    be fully fetched from start to finish regardless of the client
-#	    actions. This affects bandwidth usage.
-#Default:
-# none
-
-#  TAG: minimum_expiry_time	(seconds)
-#	The minimum caching time according to (Expires - Date)
-#	headers Squid honors if the object can't be revalidated.
-#	The default is 60 seconds.
-#
-#	In reverse proxy environments it might be desirable to honor
-#	shorter object lifetimes. It is most likely better to make
-#	your server return a meaningful Last-Modified header however.
-#
-#	In ESI environments where page fragments often have short
-#	lifetimes, this will often be best set to 0.
-#Default:
-# minimum_expiry_time 60 seconds
-
-#  TAG: store_avg_object_size	(bytes)
-#	Average object size, used to estimate number of objects your
-#	cache can hold.  The default is 13 KB.
-#
-#	This is used to pre-seed the cache index memory allocation to
-#	reduce expensive reallocate operations while handling clients
-#	traffic. Too-large values may result in memory allocation during
-#	peak traffic, too-small values will result in wasted memory.
-#
-#	Check the cache manager 'info' report metrics for the real
-#	object sizes seen by your Squid before tuning this.
-#Default:
-# store_avg_object_size 13 KB
-
-#  TAG: store_objects_per_bucket
-#	Target number of objects per bucket in the store hash table.
-#	Lowering this value increases the total number of buckets and
-#	also the storage maintenance rate.  The default is 20.
-#Default:
-# store_objects_per_bucket 20
-
-# HTTP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: request_header_max_size	(KB)
-#	This specifies the maximum size for HTTP headers in a request.
-#	Request headers are usually relatively small (about 512 bytes).
-#	Placing a limit on the request header size will catch certain
-#	bugs (for example with persistent connections) and possibly
-#	buffer-overflow or denial-of-service attacks.
-#Default:
-# request_header_max_size 64 KB
-
-#  TAG: reply_header_max_size	(KB)
-#	This specifies the maximum size for HTTP headers in a reply.
-#	Reply headers are usually relatively small (about 512 bytes).
-#	Placing a limit on the reply header size will catch certain
-#	bugs (for example with persistent connections) and possibly
-#	buffer-overflow or denial-of-service attacks.
-#Default:
-# reply_header_max_size 64 KB
-
-#  TAG: request_body_max_size	(bytes)
-#	This specifies the maximum size for an HTTP request body.
-#	In other words, the maximum size of a PUT/POST request.
-#	A user who attempts to send a request with a body larger
-#	than this limit receives an "Invalid Request" error message.
-#	If you set this parameter to a zero (the default), there will
-#	be no limit imposed.
-#
-#	See also client_request_buffer_max_size for an alternative
-#	limitation on client uploads which can be configured.
-#Default:
-# No limit.
-
-#  TAG: client_request_buffer_max_size	(bytes)
-#	This specifies the maximum buffer size of a client request.
-#	It prevents squid eating too much memory when somebody uploads
-#	a large file.
-#Default:
-# client_request_buffer_max_size 512 KB
-
-#  TAG: chunked_request_body_max_size	(bytes)
-#	A broken or confused HTTP/1.1 client may send a chunked HTTP
-#	request to Squid. Squid does not have full support for that
-#	feature yet. To cope with such requests, Squid buffers the
-#	entire request and then dechunks request body to create a
-#	plain HTTP/1.0 request with a known content length. The plain
-#	request is then used by the rest of Squid code as usual.
-#
-#	The option value specifies the maximum size of the buffer used
-#	to hold the request before the conversion. If the chunked
-#	request size exceeds the specified limit, the conversion
-#	fails, and the client receives an "unsupported request" error,
-#	as if dechunking was disabled.
-#
-#	Dechunking is enabled by default. To disable conversion of
-#	chunked requests, set the maximum to zero.
-#
-#	Request dechunking feature and this option in particular are a
-#	temporary hack. When chunking requests and responses are fully
-#	supported, there will be no need to buffer a chunked request.
-#Default:
-# chunked_request_body_max_size 64 KB
-
-#  TAG: broken_posts
-#	A list of ACL elements which, if matched, causes Squid to send
-#	an extra CRLF pair after the body of a PUT/POST request.
-#
-#	Some HTTP servers has broken implementations of PUT/POST,
-#	and rely on an extra CRLF pair sent by some WWW clients.
-#
-#	Quote from RFC2616 section 4.1 on this matter:
-#
-#	  Note: certain buggy HTTP/1.0 client implementations generate an
-#	  extra CRLF's after a POST request. To restate what is explicitly
-#	  forbidden by the BNF, an HTTP/1.1 client must not preface or follow
-#	  a request with an extra CRLF.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# acl buggy_server url_regex ^http://....
-# broken_posts allow buggy_server
-#Default:
-# Obey RFC 2616.
-
-#  TAG: adaptation_uses_indirect_client	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)
-#
-#	Controls whether the indirect client IP address (instead of the direct
-#	client IP address) is passed to adaptation services.
-#
-#	See also: follow_x_forwarded_for adaptation_send_client_ip
-#Default:
-# adaptation_uses_indirect_client on
-
-#  TAG: via	on|off
-#	If set (default), Squid will include a Via header in requests and
-#	replies as required by RFC2616.
-#Default:
-# via on
-
-#  TAG: ie_refresh	on|off
-#	Microsoft Internet Explorer up until version 5.5 Service
-#	Pack 1 has an issue with transparent proxies, wherein it
-#	is impossible to force a refresh.  Turning this on provides
-#	a partial fix to the problem, by causing all IMS-REFRESH
-#	requests from older IE versions to check the origin server
-#	for fresh content.  This reduces hit ratio by some amount
-#	(~10% in my experience), but allows users to actually get
-#	fresh content when they want it.  Note because Squid
-#	cannot tell if the user is using 5.5 or 5.5SP1, the behavior
-#	of 5.5 is unchanged from old versions of Squid (i.e. a
-#	forced refresh is impossible).  Newer versions of IE will,
-#	hopefully, continue to have the new behavior and will be
-#	handled based on that assumption.  This option defaults to
-#	the old Squid behavior, which is better for hit ratios but
-#	worse for clients using IE, if they need to be able to
-#	force fresh content.
-#Default:
-# ie_refresh off
-
-#  TAG: vary_ignore_expire	on|off
-#	Many HTTP servers supporting Vary gives such objects
-#	immediate expiry time with no cache-control header
-#	when requested by a HTTP/1.0 client. This option
-#	enables Squid to ignore such expiry times until
-#	HTTP/1.1 is fully implemented.
-#
-#	WARNING: If turned on this may eventually cause some
-#	varying objects not intended for caching to get cached.
-#Default:
-# vary_ignore_expire off
-
-#  TAG: request_entities
-#	Squid defaults to deny GET and HEAD requests with request entities,
-#	as the meaning of such requests are undefined in the HTTP standard
-#	even if not explicitly forbidden.
-#
-#	Set this directive to on if you have clients which insists
-#	on sending request entities in GET or HEAD requests. But be warned
-#	that there is server software (both proxies and web servers) which
-#	can fail to properly process this kind of request which may make you
-#	vulnerable to cache pollution attacks if enabled.
-#Default:
-# request_entities off
-
-#  TAG: request_header_access
-#	Usage: request_header_access header_name allow|deny [!]aclname ...
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#
-#	This option replaces the old 'anonymize_headers' and the
-#	older 'http_anonymizer' option with something that is much
-#	more configurable. A list of ACLs for each header name allows
-#	removal of specific header fields under specific conditions.
-#
-#	This option only applies to outgoing HTTP request headers (i.e.,
-#	headers sent by Squid to the next HTTP hop such as a cache peer
-#	or an origin server). The option has no effect during cache hit
-#	detection. The equivalent adaptation vectoring point in ICAP
-#	terminology is post-cache REQMOD.
-#
-#	The option is applied to individual outgoing request header
-#	fields. For each request header field F, Squid uses the first
-#	qualifying sets of request_header_access rules:
-#
-#	    1. Rules with header_name equal to F's name.
-#	    2. Rules with header_name 'Other', provided F's name is not
-#	       on the hard-coded list of commonly used HTTP header names.
-#	    3. Rules with header_name 'All'.
-#
-#	Within that qualifying rule set, rule ACLs are checked as usual.
-#	If ACLs of an "allow" rule match, the header field is allowed to
-#	go through as is. If ACLs of a "deny" rule match, the header is
-#	removed and request_header_replace is then checked to identify
-#	if the removed header has a replacement. If no rules within the
-#	set have matching ACLs, the header field is left as is.
-#
-#	For example, to achieve the same behavior as the old
-#	'http_anonymizer standard' option, you should use:
-#
-#		request_header_access From deny all
-#		request_header_access Referer deny all
-#		request_header_access User-Agent deny all
-#
-#	Or, to reproduce the old 'http_anonymizer paranoid' feature
-#	you should use:
-#
-#		request_header_access Authorization allow all
-#		request_header_access Proxy-Authorization allow all
-#		request_header_access Cache-Control allow all
-#		request_header_access Content-Length allow all
-#		request_header_access Content-Type allow all
-#		request_header_access Date allow all
-#		request_header_access Host allow all
-#		request_header_access If-Modified-Since allow all
-#		request_header_access Pragma allow all
-#		request_header_access Accept allow all
-#		request_header_access Accept-Charset allow all
-#		request_header_access Accept-Encoding allow all
-#		request_header_access Accept-Language allow all
-#		request_header_access Connection allow all
-#		request_header_access All deny all
-#
-#	HTTP reply headers are controlled with the reply_header_access directive.
-#
-#	By default, all headers are allowed (no anonymizing is performed).
-#Default:
-# No limits.
-
-#  TAG: reply_header_access
-#	Usage: reply_header_access header_name allow|deny [!]aclname ...
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#
-#	This option only applies to reply headers, i.e., from the
-#	server to the client.
-#
-#	This is the same as request_header_access, but in the other
-#	direction. Please see request_header_access for detailed
-#	documentation.
-#
-#	For example, to achieve the same behavior as the old
-#	'http_anonymizer standard' option, you should use:
-#
-#		reply_header_access Server deny all
-#		reply_header_access WWW-Authenticate deny all
-#		reply_header_access Link deny all
-#
-#	Or, to reproduce the old 'http_anonymizer paranoid' feature
-#	you should use:
-#
-#		reply_header_access Allow allow all
-#		reply_header_access WWW-Authenticate allow all
-#		reply_header_access Proxy-Authenticate allow all
-#		reply_header_access Cache-Control allow all
-#		reply_header_access Content-Encoding allow all
-#		reply_header_access Content-Length allow all
-#		reply_header_access Content-Type allow all
-#		reply_header_access Date allow all
-#		reply_header_access Expires allow all
-#		reply_header_access Last-Modified allow all
-#		reply_header_access Location allow all
-#		reply_header_access Pragma allow all
-#		reply_header_access Content-Language allow all
-#		reply_header_access Retry-After allow all
-#		reply_header_access Title allow all
-#		reply_header_access Content-Disposition allow all
-#		reply_header_access Connection allow all
-#		reply_header_access All deny all
-#
-#	HTTP request headers are controlled with the request_header_access directive.
-#
-#	By default, all headers are allowed (no anonymizing is
-#	performed).
-#Default:
-# No limits.
-
-#  TAG: request_header_replace
-#	Usage:   request_header_replace header_name message
-#	Example: request_header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit)
-#
-#	This option allows you to change the contents of headers
-#	denied with request_header_access above, by replacing them
-#	with some fixed string.
-#
-#	This only applies to request headers, not reply headers.
-#
-#	By default, headers are removed if denied.
-#Default:
-# none
-
-#  TAG: reply_header_replace
-#        Usage:   reply_header_replace header_name message
-#        Example: reply_header_replace Server Foo/1.0
-#
-#        This option allows you to change the contents of headers
-#        denied with reply_header_access above, by replacing them
-#        with some fixed string.
-#
-#        This only applies to reply headers, not request headers.
-#
-#        By default, headers are removed if denied.
-#Default:
-# none
-
-#  TAG: request_header_add
-#	Usage:   request_header_add field-name field-value acl1 [acl2] ...
-#	Example: request_header_add X-Client-CA "CA=%ssl::>cert_issuer" all
-#
-#	This option adds header fields to outgoing HTTP requests (i.e.,
-#	request headers sent by Squid to the next HTTP hop such as a
-#	cache peer or an origin server). The option has no effect during
-#	cache hit detection. The equivalent adaptation vectoring point
-#	in ICAP terminology is post-cache REQMOD.
-#
-#	Field-name is a token specifying an HTTP header name. If a
-#	standard HTTP header name is used, Squid does not check whether
-#	the new header conflicts with any existing headers or violates
-#	HTTP rules. If the request to be modified already contains a
-#	field with the same name, the old field is preserved but the
-#	header field values are not merged.
-#
-#	Field-value is either a token or a quoted string. If quoted
-#	string format is used, then the surrounding quotes are removed
-#	while escape sequences and %macros are processed.
-#
-#	In theory, all of the logformat codes can be used as %macros.
-#	However, unlike logging (which happens at the very end of
-#	transaction lifetime), the transaction may not yet have enough
-#	information to expand a macro when the new header value is needed.
-#	And some information may already be available to Squid but not yet
-#	committed where the macro expansion code can access it (report
-#	such instances!). The macro will be expanded into a single dash
-#	('-') in such cases. Not all macros have been tested.
-#
-#	One or more Squid ACLs may be specified to restrict header
-#	injection to matching requests. As always in squid.conf, all
-#	ACLs in an option ACL list must be satisfied for the insertion
-#	to happen. The request_header_add option supports fast ACLs
-#	only.
-#Default:
-# none
-
-#  TAG: note
-#	This option used to log custom information about the master
-#	transaction. For example, an admin may configure Squid to log
-#	which "user group" the transaction belongs to, where "user group"
-#	will be determined based on a set of ACLs and not [just]
-#	authentication information.
-#	Values of key/value pairs can be logged using %{key}note macros:
-#
-#	    note key value acl ...
-#	    logformat myFormat ... %{key}note ...
-#Default:
-# none
-
-#  TAG: relaxed_header_parser	on|off|warn
-#	In the default "on" setting Squid accepts certain forms
-#	of non-compliant HTTP messages where it is unambiguous
-#	what the sending application intended even if the message
-#	is not correctly formatted. The messages is then normalized
-#	to the correct form when forwarded by Squid.
-#
-#	If set to "warn" then a warning will be emitted in cache.log
-#	each time such HTTP error is encountered.
-#
-#	If set to "off" then such HTTP errors will cause the request
-#	or response to be rejected.
-#Default:
-# relaxed_header_parser on
-
-# TIMEOUTS
-# -----------------------------------------------------------------------------
-
-#  TAG: forward_timeout	time-units
-#	This parameter specifies how long Squid should at most attempt in
-#	finding a forwarding path for the request before giving up.
-#Default:
-# forward_timeout 4 minutes
-
-#  TAG: connect_timeout	time-units
-#	This parameter specifies how long to wait for the TCP connect to
-#	the requested server or peer to complete before Squid should
-#	attempt to find another path where to forward the request.
-#Default:
-# connect_timeout 1 minute
-
-#  TAG: peer_connect_timeout	time-units
-#	This parameter specifies how long to wait for a pending TCP
-#	connection to a peer cache.  The default is 30 seconds.   You
-#	may also set different timeout values for individual neighbors
-#	with the 'connect-timeout' option on a 'cache_peer' line.
-#Default:
-# peer_connect_timeout 30 seconds
-
-#  TAG: read_timeout	time-units
-#	The read_timeout is applied on server-side connections.  After
-#	each successful read(), the timeout will be extended by this
-#	amount.  If no data is read again after this amount of time,
-#	the request is aborted and logged with ERR_READ_TIMEOUT.  The
-#	default is 15 minutes.
-#Default:
-# read_timeout 15 minutes
-
-#  TAG: write_timeout	time-units
-#	This timeout is tracked for all connections that have data
-#	available for writing and are waiting for the socket to become
-#	ready. After each successful write, the timeout is extended by
-#	the configured amount. If Squid has data to write but the
-#	connection is not ready for the configured duration, the
-#	transaction associated with the connection is terminated. The
-#	default is 15 minutes.
-#Default:
-# write_timeout 15 minutes
-
-#  TAG: request_timeout
-#	How long to wait for complete HTTP request headers after initial
-#	connection establishment.
-#Default:
-# request_timeout 5 minutes
-
-#  TAG: client_idle_pconn_timeout
-#	How long to wait for the next HTTP request on a persistent
-#	client connection after the previous request completes.
-#Default:
-# client_idle_pconn_timeout 2 minutes
-
-#  TAG: client_lifetime	time-units
-#	The maximum amount of time a client (browser) is allowed to
-#	remain connected to the cache process.  This protects the Cache
-#	from having a lot of sockets (and hence file descriptors) tied up
-#	in a CLOSE_WAIT state from remote clients that go away without
-#	properly shutting down (either because of a network failure or
-#	because of a poor client implementation).  The default is one
-#	day, 1440 minutes.
-#
-#	NOTE:  The default value is intended to be much larger than any
-#	client would ever need to be connected to your cache.  You
-#	should probably change client_lifetime only as a last resort.
-#	If you seem to have many client connections tying up
-#	filedescriptors, we recommend first tuning the read_timeout,
-#	request_timeout, persistent_request_timeout and quick_abort values.
-#Default:
-# client_lifetime 1 day
-
-#  TAG: half_closed_clients
-#	Some clients may shutdown the sending side of their TCP
-#	connections, while leaving their receiving sides open.	Sometimes,
-#	Squid can not tell the difference between a half-closed and a
-#	fully-closed TCP connection.
-#
-#	By default, Squid will immediately close client connections when
-#	read(2) returns "no more data to read."
-#
-#	Change this option to 'on' and Squid will keep open connections
-#	until a read(2) or write(2) on the socket returns an error.
-#	This may show some benefits for reverse proxies. But if not
-#	it is recommended to leave OFF.
-#Default:
-# half_closed_clients off
-
-#  TAG: server_idle_pconn_timeout
-#	Timeout for idle persistent connections to servers and other
-#	proxies.
-#Default:
-# server_idle_pconn_timeout 1 minute
-
-#  TAG: ident_timeout
-#	Maximum time to wait for IDENT lookups to complete.
-#
-#	If this is too high, and you enabled IDENT lookups from untrusted
-#	users, you might be susceptible to denial-of-service by having
-#	many ident requests going at once.
-#Default:
-# ident_timeout 10 seconds
-
-#  TAG: shutdown_lifetime	time-units
-#	When SIGTERM or SIGHUP is received, the cache is put into
-#	"shutdown pending" mode until all active sockets are closed.
-#	This value is the lifetime to set for all open descriptors
-#	during shutdown mode.  Any active clients after this many
-#	seconds will receive a 'timeout' message.
-#Default:
-# shutdown_lifetime 30 seconds
-
-# ADMINISTRATIVE PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_mgr
-#	Email-address of local cache manager who will receive
-#	mail if the cache dies.  The default is "webmaster".
-#Default:
-# cache_mgr webmaster
-
-#  TAG: mail_from
-#	From: email-address for mail sent when the cache dies.
-#	The default is to use 'squid@unique_hostname'.
-#
-#	See also: unique_hostname directive.
-#Default:
-# none
-
-#  TAG: mail_program
-#	Email program used to send mail if the cache dies.
-#	The default is "mail". The specified program must comply
-#	with the standard Unix mail syntax:
-#	  mail-program recipient < mailfile
-#
-#	Optional command line options can be specified.
-#Default:
-# mail_program mail
-
-#  TAG: cache_effective_user
-#	If you start Squid as root, it will change its effective/real
-#	UID/GID to the user specified below.  The default is to change
-#	to UID of nobody.
-#	see also; cache_effective_group
-#Default:
-# cache_effective_user nobody
-
-#  TAG: cache_effective_group
-#	Squid sets the GID to the effective user's default group ID
-#	(taken from the password file) and supplementary group list
-#	from the groups membership.
-#
-#	If you want Squid to run with a specific GID regardless of
-#	the group memberships of the effective user then set this
-#	to the group (or GID) you want Squid to run as. When set
-#	all other group privileges of the effective user are ignored
-#	and only this GID is effective. If Squid is not started as
-#	root the user starting Squid MUST be member of the specified
-#	group.
-#
-#	This option is not recommended by the Squid Team.
-#	Our preference is for administrators to configure a secure
-#	user account for squid with UID/GID matching system policies.
-#Default:
-# Use system group memberships of the cache_effective_user account
-
-#  TAG: httpd_suppress_version_string	on|off
-#	Suppress Squid version string info in HTTP headers and HTML error pages.
-#Default:
-# httpd_suppress_version_string off
-
-#  TAG: visible_hostname
-#	If you want to present a special hostname in error messages, etc,
-#	define this.  Otherwise, the return value of gethostname()
-#	will be used. If you have multiple caches in a cluster and
-#	get errors about IP-forwarding you must set them to have individual
-#	names with this setting.
-#Default:
-# Automatically detect the system host name
-
-#  TAG: unique_hostname
-#	If you want to have multiple machines with the same
-#	'visible_hostname' you must give each machine a different
-#	'unique_hostname' so forwarding loops can be detected.
-#Default:
-# Copy the value from visible_hostname
-
-#  TAG: hostname_aliases
-#	A list of other DNS names your cache has.
-#Default:
-# none
-
-#  TAG: umask
-#	Minimum umask which should be enforced while the proxy
-#	is running, in addition to the umask set at startup.
-#
-#	For a traditional octal representation of umasks, start
-#        your value with 0.
-#Default:
-# umask 027
-
-# OPTIONS FOR THE CACHE REGISTRATION SERVICE
-# -----------------------------------------------------------------------------
-#
-#	This section contains parameters for the (optional) cache
-#	announcement service.  This service is provided to help
-#	cache administrators locate one another in order to join or
-#	create cache hierarchies.
-#
-#	An 'announcement' message is sent (via UDP) to the registration
-#	service by Squid.  By default, the announcement message is NOT
-#	SENT unless you enable it with 'announce_period' below.
-#
-#	The announcement message includes your hostname, plus the
-#	following information from this configuration file:
-#
-#		http_port
-#		icp_port
-#		cache_mgr
-#
-#	All current information is processed regularly and made
-#	available on the Web at http://www.ircache.net/Cache/Tracker/.
-
-#  TAG: announce_period
-#	This is how frequently to send cache announcements.
-#
-#	To enable announcing your cache, just set an announce period.
-#
-#	Example:
-#		announce_period 1 day
-#Default:
-# Announcement messages disabled.
-
-#  TAG: announce_host
-#	Set the hostname where announce registration messages will be sent.
-#
-#	See also announce_port and announce_file
-#Default:
-# announce_host tracker.ircache.net
-
-#  TAG: announce_file
-#	The contents of this file will be included in the announce
-#	registration messages.
-#Default:
-# none
-
-#  TAG: announce_port
-#	Set the port where announce registration messages will be sent.
-#
-#	See also announce_host and announce_file
-#Default:
-# announce_port 3131
-
-# HTTPD-ACCELERATOR OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: httpd_accel_surrogate_id
-#	Surrogates (http://www.esi.org/architecture_spec_1.0.html)
-#	need an identification token to allow control targeting. Because
-#	a farm of surrogates may all perform the same tasks, they may share
-#	an identification token.
-#Default:
-# visible_hostname is used if no specific ID is set.
-
-#  TAG: http_accel_surrogate_remote	on|off
-#	Remote surrogates (such as those in a CDN) honour the header
-#	"Surrogate-Control: no-store-remote".
-#
-#	Set this to on to have squid behave as a remote surrogate.
-#Default:
-# http_accel_surrogate_remote off
-
-#  TAG: esi_parser	libxml2|expat|custom
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-esi
-#
-#	ESI markup is not strictly XML compatible. The custom ESI parser
-#	will give higher performance, but cannot handle non ASCII character
-#	encodings.
-#Default:
-# esi_parser custom
-
-# DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This represents the number of delay pools to be used.  For example,
-#	if you have one class 2 delay pool and one class 3 delays pool, you
-#	have a total of 2 delay pools.
-#
-#	See also delay_parameters, delay_class, delay_access for pool
-#	configuration details.
-#Default:
-# delay_pools 0
-
-#  TAG: delay_class
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This defines the class of each delay pool.  There must be exactly one
-#	delay_class line for each delay pool.  For example, to define two
-#	delay pools, one of class 2 and one of class 3, the settings above
-#	and here would be:
-#
-#	Example:
-#	    delay_pools 4      # 4 delay pools
-#	    delay_class 1 2    # pool 1 is a class 2 pool
-#	    delay_class 2 3    # pool 2 is a class 3 pool
-#	    delay_class 3 4    # pool 3 is a class 4 pool
-#	    delay_class 4 5    # pool 4 is a class 5 pool
-#
-#	The delay pool classes are:
-#
-#		class 1		Everything is limited by a single aggregate
-#				bucket.
-#
-#		class 2 	Everything is limited by a single aggregate
-#				bucket as well as an "individual" bucket chosen
-#				from bits 25 through 32 of the IPv4 address.
-#
-#		class 3		Everything is limited by a single aggregate
-#				bucket as well as a "network" bucket chosen
-#				from bits 17 through 24 of the IP address and a
-#				"individual" bucket chosen from bits 17 through
-#				32 of the IPv4 address.
-#
-#		class 4		Everything in a class 3 delay pool, with an
-#				additional limit on a per user basis. This
-#				only takes effect if the username is established
-#				in advance - by forcing authentication in your
-#				http_access rules.
-#
-#		class 5		Requests are grouped according their tag (see
-#				external_acl's tag= reply).
-#
-#
-#	Each pool also requires a delay_parameters directive to configure the pool size
-#	and speed limits used whenever the pool is applied to a request. Along with
-#	a set of delay_access directives to determine when it is used.
-#
-#	NOTE: If an IP address is a.b.c.d
-#		-> bits 25 through 32 are "d"
-#		-> bits 17 through 24 are "c"
-#		-> bits 17 through 32 are "c * 256 + d"
-#
-#	NOTE-2: Due to the use of bitmasks in class 2,3,4 pools they only apply to
-#		IPv4 traffic. Class 1 and 5 pools may be used with IPv6 traffic.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	See also delay_parameters and delay_access.
-#Default:
-# none
-
-#  TAG: delay_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This is used to determine which delay pool a request falls into.
-#
-#	delay_access is sorted per pool and the matching starts with pool 1,
-#	then pool 2, ..., and finally pool N. The first delay pool where the
-#	request is allowed is selected for the request. If it does not allow
-#	the request to any pool then the request is not delayed (default).
-#
-#	For example, if you want some_big_clients in delay
-#	pool 1 and lotsa_little_clients in delay pool 2:
-#
-#		delay_access 1 allow some_big_clients
-#		delay_access 1 deny all
-#		delay_access 2 allow lotsa_little_clients
-#		delay_access 2 deny all
-#		delay_access 3 allow authenticated_clients
-#
-#	See also delay_parameters and delay_class.
-#
-#Default:
-# Deny using the pool, unless allow rules exist in squid.conf for the pool.
-
-#  TAG: delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This defines the parameters for a delay pool.  Each delay pool has
-#	a number of "buckets" associated with it, as explained in the
-#	description of delay_class.
-#
-#	For a class 1 delay pool, the syntax is:
-#		delay_pools pool 1
-#		delay_parameters pool aggregate
-#
-#	For a class 2 delay pool:
-#		delay_pools pool 2
-#		delay_parameters pool aggregate individual
-#
-#	For a class 3 delay pool:
-#		delay_pools pool 3
-#		delay_parameters pool aggregate network individual
-#
-#	For a class 4 delay pool:
-#		delay_pools pool 4
-#		delay_parameters pool aggregate network individual user
-#
-#	For a class 5 delay pool:
-#		delay_pools pool 5
-#		delay_parameters pool tagrate
-#
-#	The option variables are:
-#
-#		pool		a pool number - ie, a number between 1 and the
-#				number specified in delay_pools as used in
-#				delay_class lines.
-#
-#		aggregate	the speed limit parameters for the aggregate bucket
-#				(class 1, 2, 3).
-#
-#		individual	the speed limit parameters for the individual
-#				buckets (class 2, 3).
-#
-#		network		the speed limit parameters for the network buckets
-#				(class 3).
-#
-#		user		the speed limit parameters for the user buckets
-#				(class 4).
-#
-#		tagrate		the speed limit parameters for the tag buckets
-#				(class 5).
-#
-#	A pair of delay parameters is written restore/maximum, where restore is
-#	the number of bytes (not bits - modem and network speeds are usually
-#	quoted in bits) per second placed into the bucket, and maximum is the
-#	maximum number of bytes which can be in the bucket at any time.
-#
-#	There must be one delay_parameters line for each delay pool.
-#
-#
-#	For example, if delay pool number 1 is a class 2 delay pool as in the
-#	above example, and is being used to strictly limit each host to 64Kbit/sec
-#	(plus overheads), with no overall limit, the line is:
-#
-#		delay_parameters 1 -1/-1 8000/8000
-#
-#	Note that 8 x 8000 KByte/sec -> 64Kbit/sec.
-#
-#	Note that the figure -1 is used to represent "unlimited".
-#
-#
-#	And, if delay pool number 2 is a class 3 delay pool as in the above
-#	example, and you want to limit it to a total of 256Kbit/sec (strict limit)
-#	with each 8-bit network permitted 64Kbit/sec (strict limit) and each
-#	individual host permitted 4800bit/sec with a bucket maximum size of 64Kbits
-#	to permit a decent web page to be downloaded at a decent speed
-#	(if the network is not being limited due to overuse) but slow down
-#	large downloads more significantly:
-#
-#		delay_parameters 2 32000/32000 8000/8000 600/8000
-#
-#	Note that 8 x 32000 KByte/sec -> 256Kbit/sec.
-#		  8 x  8000 KByte/sec ->  64Kbit/sec.
-#		  8 x   600 Byte/sec  -> 4800bit/sec.
-#
-#
-#	Finally, for a class 4 delay pool as in the example - each user will
-#	be limited to 128Kbits/sec no matter how many workstations they are logged into.:
-#
-#		delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000
-#
-#
-#	See also delay_class and delay_access.
-#
-#Default:
-# none
-
-#  TAG: delay_initial_bucket_level	(percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	The initial bucket percentage is used to determine how much is put
-#	in each bucket when squid starts, is reconfigured, or first notices
-#	a host accessing it (in class 2 and class 3, individual hosts and
-#	networks only have buckets associated with them once they have been
-#	"seen" by squid).
-#Default:
-# delay_initial_bucket_level 50
-
-# CLIENT DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: client_delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option specifies the number of client delay pools used. It must
-#	preceed other client_delay_* options.
-#
-#	Example:
-#		client_delay_pools 2
-#
-#	See also client_delay_parameters and client_delay_access.
-#Default:
-# client_delay_pools 0
-
-#  TAG: client_delay_initial_bucket_level	(percent, 0-no_limit)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option determines the initial bucket size as a percentage of
-#	max_bucket_size from client_delay_parameters. Buckets are created
-#	at the time of the "first" connection from the matching IP. Idle
-#	buckets are periodically deleted up.
-#
-#	You can specify more than 100 percent but note that such "oversized"
-#	buckets are not refilled until their size goes down to max_bucket_size
-#	from client_delay_parameters.
-#
-#	Example:
-#		client_delay_initial_bucket_level 50
-#Default:
-# client_delay_initial_bucket_level 50
-
-#  TAG: client_delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#
-#	This option configures client-side bandwidth limits using the
-#	following format:
-#
-#	    client_delay_parameters pool speed_limit max_bucket_size
-#
-#	pool is an integer ID used for client_delay_access matching.
-#
-#	speed_limit is bytes added to the bucket per second.
-#
-#	max_bucket_size is the maximum size of a bucket, enforced after any
-#	speed_limit additions.
-#
-#	Please see the delay_parameters option for more information and
-#	examples.
-#
-#	Example:
-#		client_delay_parameters 1 1024 2048
-#		client_delay_parameters 2 51200 16384
-#
-#	See also client_delay_access.
-#
-#Default:
-# none
-
-#  TAG: client_delay_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option determines the client-side delay pool for the
-#	request:
-#
-#	    client_delay_access pool_ID allow|deny acl_name
-#
-#	All client_delay_access options are checked in their pool ID
-#	order, starting with pool 1. The first checked pool with allowed
-#	request is selected for the request. If no ACL matches or there
-#	are no client_delay_access options, the request bandwidth is not
-#	limited.
-#
-#	The ACL-selected pool is then used to find the
-#	client_delay_parameters for the request. Client-side pools are
-#	not used to aggregate clients. Clients are always aggregated
-#	based on their source IP addresses (one bucket per source IP).
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#	Additionally, only the client TCP connection details are available.
-#	ACLs testing HTTP properties will not work.
-#
-#	Please see delay_access for more examples.
-#
-#	Example:
-#		client_delay_access 1 allow low_rate_network
-#		client_delay_access 2 allow vips_network
-#
-#
-#	See also client_delay_parameters and client_delay_pools.
-#Default:
-# Deny use of the pool, unless allow rules exist in squid.conf for the pool.
-
-# WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: wccp_router
-#	Use this option to define your WCCP ``home'' router for
-#	Squid.
-#
-#	wccp_router supports a single WCCP(v1) router
-#
-#	wccp2_router supports multiple WCCPv2 routers
-#
-#	only one of the two may be used at the same time and defines
-#	which version of WCCP to use.
-#Default:
-# WCCP disabled.
-
-#  TAG: wccp2_router
-#	Use this option to define your WCCP ``home'' router for
-#	Squid.
-#
-#	wccp_router supports a single WCCP(v1) router
-#
-#	wccp2_router supports multiple WCCPv2 routers
-#
-#	only one of the two may be used at the same time and defines
-#	which version of WCCP to use.
-#Default:
-# WCCPv2 disabled.
-
-#  TAG: wccp_version
-#	This directive is only relevant if you need to set up WCCP(v1)
-#	to some very old and end-of-life Cisco routers. In all other
-#	setups it must be left unset or at the default setting.
-#	It defines an internal version in the WCCP(v1) protocol,
-#	with version 4 being the officially documented protocol.
-#
-#	According to some users, Cisco IOS 11.2 and earlier only
-#	support WCCP version 3.  If you're using that or an earlier
-#	version of IOS, you may need to change this value to 3, otherwise
-#	do not specify this parameter.
-#Default:
-# wccp_version 4
-
-#  TAG: wccp2_rebuild_wait
-#	If this is enabled Squid will wait for the cache dir rebuild to finish
-#	before sending the first wccp2 HereIAm packet
-#Default:
-# wccp2_rebuild_wait on
-
-#  TAG: wccp2_forwarding_method
-#	WCCP2 allows the setting of forwarding methods between the
-#	router/switch and the cache.  Valid values are as follows:
-#
-#	gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-#	l2  - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-#	Currently (as of IOS 12.4) cisco routers only support GRE.
-#	Cisco switches only support the L2 redirect assignment method.
-#Default:
-# wccp2_forwarding_method gre
-
-#  TAG: wccp2_return_method
-#	WCCP2 allows the setting of return methods between the
-#	router/switch and the cache for packets that the cache
-#	decides not to handle.  Valid values are as follows:
-#
-#	gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-#	l2  - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-#	Currently (as of IOS 12.4) cisco routers only support GRE.
-#	Cisco switches only support the L2 redirect assignment.
-#
-#	If the "ip wccp redirect exclude in" command has been
-#	enabled on the cache interface, then it is still safe for
-#	the proxy server to use a l2 redirect method even if this
-#	option is set to GRE.
-#Default:
-# wccp2_return_method gre
-
-#  TAG: wccp2_assignment_method
-#	WCCP2 allows the setting of methods to assign the WCCP hash
-#	Valid values are as follows:
-#
-#	hash - Hash assignment
-#	mask - Mask assignment
-#
-#	As a general rule, cisco routers support the hash assignment method
-#	and cisco switches support the mask assignment method.
-#Default:
-# wccp2_assignment_method hash
-
-#  TAG: wccp2_service
-#	WCCP2 allows for multiple traffic services. There are two
-#	types: "standard" and "dynamic". The standard type defines
-#	one service id - http (id 0). The dynamic service ids can be from
-#	51 to 255 inclusive.  In order to use a dynamic service id
-#	one must define the type of traffic to be redirected; this is done
-#	using the wccp2_service_info option.
-#
-#	The "standard" type does not require a wccp2_service_info option,
-#	just specifying the service id will suffice.
-#
-#	MD5 service authentication can be enabled by adding
-#	"password=<password>" to the end of this service declaration.
-#
-#	Examples:
-#
-#	wccp2_service standard 0	# for the 'web-cache' standard service
-#	wccp2_service dynamic 80	# a dynamic service type which will be
-#					# fleshed out with subsequent options.
-#	wccp2_service standard 0 password=foo
-#Default:
-# Use the 'web-cache' standard service.
-
-#  TAG: wccp2_service_info
-#	Dynamic WCCPv2 services require further information to define the
-#	traffic you wish to have diverted.
-#
-#	The format is:
-#
-#	wccp2_service_info <id> protocol=<protocol> flags=<flag>,<flag>..
-#	    priority=<priority> ports=<port>,<port>..
-#
-#	The relevant WCCPv2 flags:
-#	+ src_ip_hash, dst_ip_hash
-#	+ source_port_hash, dst_port_hash
-#	+ src_ip_alt_hash, dst_ip_alt_hash
-#	+ src_port_alt_hash, dst_port_alt_hash
-#	+ ports_source
-#
-#	The port list can be one to eight entries.
-#
-#	Example:
-#
-#	wccp2_service_info 80 protocol=tcp flags=src_ip_hash,ports_source
-#	    priority=240 ports=80
-#
-#	Note: the service id must have been defined by a previous
-#	'wccp2_service dynamic <id>' entry.
-#Default:
-# none
-
-#  TAG: wccp2_weight
-#	Each cache server gets assigned a set of the destination
-#	hash proportional to their weight.
-#Default:
-# wccp2_weight 10000
-
-#  TAG: wccp_address
-#	Use this option if you require WCCPv2 to use a specific
-#	interface address.
-#
-#	The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-#  TAG: wccp2_address
-#	Use this option if you require WCCP to use a specific
-#	interface address.
-#
-#	The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-# PERSISTENT CONNECTION HANDLING
-# -----------------------------------------------------------------------------
-#
-# Also see "pconn_timeout" in the TIMEOUTS section
-
-#  TAG: client_persistent_connections
-#	Persistent connection support for clients.
-#	Squid uses persistent connections (when allowed). You can use
-#	this option to disable persistent connections with clients.
-#Default:
-# client_persistent_connections on
-
-#  TAG: server_persistent_connections
-#	Persistent connection support for servers.
-#	Squid uses persistent connections (when allowed). You can use
-#	this option to disable persistent connections with servers.
-#Default:
-# server_persistent_connections on
-
-#  TAG: persistent_connection_after_error
-#	With this directive the use of persistent connections after
-#	HTTP errors can be disabled. Useful if you have clients
-#	who fail to handle errors on persistent connections proper.
-#Default:
-# persistent_connection_after_error on
-
-#  TAG: detect_broken_pconn
-#	Some servers have been found to incorrectly signal the use
-#	of HTTP/1.0 persistent connections even on replies not
-#	compatible, causing significant delays. This server problem
-#	has mostly been seen on redirects.
-#
-#	By enabling this directive Squid attempts to detect such
-#	broken replies and automatically assume the reply is finished
-#	after 10 seconds timeout.
-#Default:
-# detect_broken_pconn off
-
-# CACHE DIGEST OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: digest_generation
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This controls whether the server will generate a Cache Digest
-#	of its contents.  By default, Cache Digest generation is
-#	enabled if Squid is compiled with --enable-cache-digests defined.
-#Default:
-# digest_generation on
-
-#  TAG: digest_bits_per_entry
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the number of bits of the server's Cache Digest which
-#	will be associated with the Digest entry for a given HTTP
-#	Method and URL (public key) combination.  The default is 5.
-#Default:
-# digest_bits_per_entry 5
-
-#  TAG: digest_rebuild_period	(seconds)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the wait time between Cache Digest rebuilds.
-#Default:
-# digest_rebuild_period 1 hour
-
-#  TAG: digest_rewrite_period	(seconds)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the wait time between Cache Digest writes to
-#	disk.
-#Default:
-# digest_rewrite_period 1 hour
-
-#  TAG: digest_swapout_chunk_size	(bytes)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the number of bytes of the Cache Digest to write to
-#	disk at a time.  It defaults to 4096 bytes (4KB), the Squid
-#	default swap page.
-#Default:
-# digest_swapout_chunk_size 4096 bytes
-
-#  TAG: digest_rebuild_chunk_percentage	(percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the percentage of the Cache Digest to be scanned at a
-#	time.  By default it is set to 10% of the Cache Digest.
-#Default:
-# digest_rebuild_chunk_percentage 10
-
-# SNMP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: snmp_port
-#	The port number where Squid listens for SNMP requests. To enable
-#	SNMP support set this to a suitable port number. Port number
-#	3401 is often used for the Squid SNMP agent. By default it's
-#	set to "0" (disabled)
-#
-#	Example:
-#		snmp_port 3401
-#Default:
-# SNMP disabled.
-
-#  TAG: snmp_access
-#	Allowing or denying access to the SNMP port.
-#
-#	All access to the agent is denied by default.
-#	usage:
-#
-#	snmp_access allow|deny [!]aclname ...
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# snmp_access allow snmppublic localhost
-# snmp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: snmp_incoming_address
-#	Just like 'udp_incoming_address', but for the SNMP port.
-#
-#	snmp_incoming_address	is used for the SNMP socket receiving
-#				messages from SNMP agents.
-#
-#	The default snmp_incoming_address is to listen on all
-#	available network interfaces.
-#Default:
-# Accept SNMP packets from all machine interfaces.
-
-#  TAG: snmp_outgoing_address
-#	Just like 'udp_outgoing_address', but for the SNMP port.
-#
-#	snmp_outgoing_address	is used for SNMP packets returned to SNMP
-#				agents.
-#
-#	If snmp_outgoing_address is not set it will use the same socket
-#	as snmp_incoming_address. Only change this if you want to have
-#	SNMP replies sent using another address than where this Squid
-#	listens for SNMP queries.
-#
-#	NOTE, snmp_incoming_address and snmp_outgoing_address can not have
-#	the same value since they both use the same port.
-#Default:
-# Use snmp_incoming_address or an address selected by the operating system.
-
-# ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icp_port
-#	The port number where Squid sends and receives ICP queries to
-#	and from neighbor caches.  The standard UDP port for ICP is 3130.
-#
-#	Example:
-#		icp_port 3130
-#Default:
-# ICP disabled.
-
-#  TAG: htcp_port
-#	The port number where Squid sends and receives HTCP queries to
-#	and from neighbor caches.  To turn it on you want to set it to
-#	4827.
-#
-#	Example:
-#		htcp_port 4827
-#Default:
-# HTCP disabled.
-
-#  TAG: log_icp_queries	on|off
-#	If set, ICP queries are logged to access.log. You may wish
-#	do disable this if your ICP load is VERY high to speed things
-#	up or to simplify log analysis.
-#Default:
-# log_icp_queries on
-
-#  TAG: udp_incoming_address
-#	udp_incoming_address	is used for UDP packets received from other
-#				caches.
-#
-#	The default behavior is to not bind to any specific address.
-#
-#	Only change this if you want to have all UDP queries received on
-#	a specific interface/address.
-#
-#	NOTE: udp_incoming_address is used by the ICP, HTCP, and DNS
-#	modules. Altering it will affect all of them in the same manner.
-#
-#	see also; udp_outgoing_address
-#
-#	NOTE, udp_incoming_address and udp_outgoing_address can not
-#	have the same value since they both use the same port.
-#Default:
-# Accept packets from all machine interfaces.
-
-#  TAG: udp_outgoing_address
-#	udp_outgoing_address	is used for UDP packets sent out to other
-#				caches.
-#
-#	The default behavior is to not bind to any specific address.
-#
-#	Instead it will use the same socket as udp_incoming_address.
-#	Only change this if you want to have UDP queries sent using another
-#	address than where this Squid listens for UDP queries from other
-#	caches.
-#
-#	NOTE: udp_outgoing_address is used by the ICP, HTCP, and DNS
-#	modules. Altering it will affect all of them in the same manner.
-#
-#	see also; udp_incoming_address
-#
-#	NOTE, udp_incoming_address and udp_outgoing_address can not
-#	have the same value since they both use the same port.
-#Default:
-# Use udp_incoming_address or an address selected by the operating system.
-
-#  TAG: icp_hit_stale	on|off
-#	If you want to return ICP_HIT for stale cache objects, set this
-#	option to 'on'.  If you have sibling relationships with caches
-#	in other administrative domains, this should be 'off'.  If you only
-#	have sibling relationships with caches under your control,
-#	it is probably okay to set this to 'on'.
-#	If set to 'on', your siblings should use the option "allow-miss"
-#	on their cache_peer lines for connecting to you.
-#Default:
-# icp_hit_stale off
-
-#  TAG: minimum_direct_hops
-#	If using the ICMP pinging stuff, do direct fetches for sites
-#	which are no more than this many hops away.
-#Default:
-# minimum_direct_hops 4
-
-#  TAG: minimum_direct_rtt	(msec)
-#	If using the ICMP pinging stuff, do direct fetches for sites
-#	which are no more than this many rtt milliseconds away.
-#Default:
-# minimum_direct_rtt 400
-
-#  TAG: netdb_low
-#	The low water mark for the ICMP measurement database.
-#
-#	Note: high watermark controlled by netdb_high directive.
-#
-#	These watermarks are counts, not percents.  The defaults are
-#	(low) 900 and (high) 1000.  When the high water mark is
-#	reached, database entries will be deleted until the low
-#	mark is reached.
-#Default:
-# netdb_low 900
-
-#  TAG: netdb_high
-#	The high water mark for the ICMP measurement database.
-#
-#	Note: low watermark controlled by netdb_low directive.
-#
-#	These watermarks are counts, not percents.  The defaults are
-#	(low) 900 and (high) 1000.  When the high water mark is
-#	reached, database entries will be deleted until the low
-#	mark is reached.
-#Default:
-# netdb_high 1000
-
-#  TAG: netdb_ping_period
-#	The minimum period for measuring a site.  There will be at
-#	least this much delay between successive pings to the same
-#	network.  The default is five minutes.
-#Default:
-# netdb_ping_period 5 minutes
-
-#  TAG: query_icmp	on|off
-#	If you want to ask your peers to include ICMP data in their ICP
-#	replies, enable this option.
-#
-#	If your peer has configured Squid (during compilation) with
-#	'--enable-icmp' that peer will send ICMP pings to origin server
-#	sites of the URLs it receives.  If you enable this option the
-#	ICP replies from that peer will include the ICMP data (if available).
-#	Then, when choosing a parent cache, Squid will choose the parent with
-#	the minimal RTT to the origin server.  When this happens, the
-#	hierarchy field of the access.log will be
-#	"CLOSEST_PARENT_MISS".  This option is off by default.
-#Default:
-# query_icmp off
-
-#  TAG: test_reachability	on|off
-#	When this is 'on', ICP MISS replies will be ICP_MISS_NOFETCH
-#	instead of ICP_MISS if the target host is NOT in the ICMP
-#	database, or has a zero RTT.
-#Default:
-# test_reachability off
-
-#  TAG: icp_query_timeout	(msec)
-#	Normally Squid will automatically determine an optimal ICP
-#	query timeout value based on the round-trip-time of recent ICP
-#	queries.  If you want to override the value determined by
-#	Squid, set this 'icp_query_timeout' to a non-zero value.  This
-#	value is specified in MILLISECONDS, so, to use a 2-second
-#	timeout (the old default), you would write:
-#
-#		icp_query_timeout 2000
-#Default:
-# Dynamic detection.
-
-#  TAG: maximum_icp_query_timeout	(msec)
-#	Normally the ICP query timeout is determined dynamically.  But
-#	sometimes it can lead to very large values (say 5 seconds).
-#	Use this option to put an upper limit on the dynamic timeout
-#	value.  Do NOT use this option to always use a fixed (instead
-#	of a dynamic) timeout value. To set a fixed timeout see the
-#	'icp_query_timeout' directive.
-#Default:
-# maximum_icp_query_timeout 2000
-
-#  TAG: minimum_icp_query_timeout	(msec)
-#	Normally the ICP query timeout is determined dynamically.  But
-#	sometimes it can lead to very small timeouts, even lower than
-#	the normal latency variance on your link due to traffic.
-#	Use this option to put an lower limit on the dynamic timeout
-#	value.  Do NOT use this option to always use a fixed (instead
-#	of a dynamic) timeout value. To set a fixed timeout see the
-#	'icp_query_timeout' directive.
-#Default:
-# minimum_icp_query_timeout 5
-
-#  TAG: background_ping_rate	time-units
-#	Controls how often the ICP pings are sent to siblings that
-#	have background-ping set.
-#Default:
-# background_ping_rate 10 seconds
-
-# MULTICAST ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: mcast_groups
-#	This tag specifies a list of multicast groups which your server
-#	should join to receive multicasted ICP queries.
-#
-#	NOTE!  Be very careful what you put here!  Be sure you
-#	understand the difference between an ICP _query_ and an ICP
-#	_reply_.  This option is to be set only if you want to RECEIVE
-#	multicast queries.  Do NOT set this option to SEND multicast
-#	ICP (use cache_peer for that).  ICP replies are always sent via
-#	unicast, so this option does not affect whether or not you will
-#	receive replies from multicast group members.
-#
-#	You must be very careful to NOT use a multicast address which
-#	is already in use by another group of caches.
-#
-#	If you are unsure about multicast, please read the Multicast
-#	chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/).
-#
-#	Usage: mcast_groups 239.128.16.128 224.0.1.20
-#
-#	By default, Squid doesn't listen on any multicast groups.
-#Default:
-# none
-
-#  TAG: mcast_miss_addr
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	If you enable this option, every "cache miss" URL will
-#	be sent out on the specified multicast address.
-#
-#	Do not enable this option unless you are are absolutely
-#	certain you understand what you are doing.
-#Default:
-# disabled.
-
-#  TAG: mcast_miss_ttl
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	This is the time-to-live value for packets multicasted
-#	when multicasting off cache miss URLs is enabled.  By
-#	default this is set to 'site scope', i.e. 16.
-#Default:
-# mcast_miss_ttl 16
-
-#  TAG: mcast_miss_port
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	This is the port number to be used in conjunction with
-#	'mcast_miss_addr'.
-#Default:
-# mcast_miss_port 3135
-
-#  TAG: mcast_miss_encode_key
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	The URLs that are sent in the multicast miss stream are
-#	encrypted.  This is the encryption key.
-#Default:
-# mcast_miss_encode_key XXXXXXXXXXXXXXXX
-
-#  TAG: mcast_icp_query_timeout	(msec)
-#	For multicast peers, Squid regularly sends out ICP "probes" to
-#	count how many other peers are listening on the given multicast
-#	address.  This value specifies how long Squid should wait to
-#	count all the replies.  The default is 2000 msec, or 2
-#	seconds.
-#Default:
-# mcast_icp_query_timeout 2000
-
-# INTERNAL ICON OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icon_directory
-#	Where the icons are stored. These are normally kept in
-#	/usr/share/squid/icons
-#Default:
-# icon_directory /usr/share/squid/icons
-
-#  TAG: global_internal_static
-#	This directive controls is Squid should intercept all requests for
-#	/squid-internal-static/ no matter which host the URL is requesting
-#	(default on setting), or if nothing special should be done for
-#	such URLs (off setting). The purpose of this directive is to make
-#	icons etc work better in complex cache hierarchies where it may
-#	not always be possible for all corners in the cache mesh to reach
-#	the server generating a directory listing.
-#Default:
-# global_internal_static on
-
-#  TAG: short_icon_urls
-#	If this is enabled Squid will use short URLs for icons.
-#	If disabled it will revert to the old behavior of including
-#	it's own name and port in the URL.
-#
-#	If you run a complex cache hierarchy with a mix of Squid and
-#	other proxies you may need to disable this directive.
-#Default:
-# short_icon_urls on
-
-# ERROR PAGE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: error_directory
-#	If you wish to create your own versions of the default
-#	error files to customize them to suit your company copy
-#	the error/template files to another directory and point
-#	this tag at them.
-#
-#	WARNING: This option will disable multi-language support
-#	         on error pages if used.
-#
-#	The squid developers are interested in making squid available in
-#	a wide variety of languages. If you are making translations for a
-#	language that Squid does not currently provide please consider
-#	contributing your translation back to the project.
-#	http://wiki.squid-cache.org/Translations
-#
-#	The squid developers working on translations are happy to supply drop-in
-#	translated error files in exchange for any new language contributions.
-#Default:
-# Send error pages in the clients preferred language
-
-#  TAG: error_default_language
-#	Set the default language which squid will send error pages in
-#	if no existing translation matches the clients language
-#	preferences.
-#
-#	If unset (default) generic English will be used.
-#
-#	The squid developers are interested in making squid available in
-#	a wide variety of languages. If you are interested in making
-#	translations for any language see the squid wiki for details.
-#	http://wiki.squid-cache.org/Translations
-#Default:
-# Generate English language pages.
-
-#  TAG: error_log_languages
-#	Log to cache.log what languages users are attempting to
-#	auto-negotiate for translations.
-#
-#	Successful negotiations are not logged. Only failures
-#	have meaning to indicate that Squid may need an upgrade
-#	of its error page translations.
-#Default:
-# error_log_languages on
-
-#  TAG: err_page_stylesheet
-#	CSS Stylesheet to pattern the display of Squid default error pages.
-#
-#	For information on CSS see http://www.w3.org/Style/CSS/
-#Default:
-# err_page_stylesheet /etc/squid/errorpage.css
-
-#  TAG: err_html_text
-#	HTML text to include in error messages.  Make this a "mailto"
-#	URL to your admin address, or maybe just a link to your
-#	organizations Web page.
-#
-#	To include this in your error messages, you must rewrite
-#	the error template files (found in the "errors" directory).
-#	Wherever you want the 'err_html_text' line to appear,
-#	insert a %L tag in the error template file.
-#Default:
-# none
-
-#  TAG: email_err_data	on|off
-#	If enabled, information about the occurred error will be
-#	included in the mailto links of the ERR pages (if %W is set)
-#	so that the email body contains the data.
-#	Syntax is <A HREF="mailto:%w%W">%w</A>
-#Default:
-# email_err_data on
-
-#  TAG: deny_info
-#	Usage:   deny_info err_page_name acl
-#	or       deny_info http://... acl
-#	or       deny_info TCP_RESET acl
-#
-#	This can be used to return a ERR_ page for requests which
-#	do not pass the 'http_access' rules.  Squid remembers the last
-#	acl it evaluated in http_access, and if a 'deny_info' line exists
-#	for that ACL Squid returns a corresponding error page.
-#
-#	The acl is typically the last acl on the http_access deny line which
-#	denied access. The exceptions to this rule are:
-#	- When Squid needs to request authentication credentials. It's then
-#	  the first authentication related acl encountered
-#	- When none of the http_access lines matches. It's then the last
-#	  acl processed on the last http_access line.
-#	- When the decision to deny access was made by an adaptation service,
-#	  the acl name is the corresponding eCAP or ICAP service_name.
-#
-#	NP: If providing your own custom error pages with error_directory
-#	    you may also specify them by your custom file name:
-#	    Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys
-#
-#	By defaut Squid will send "403 Forbidden". A different 4xx or 5xx
-#	may be specified by prefixing the file name with the code and a colon.
-#	e.g. 404:ERR_CUSTOM_ACCESS_DENIED
-#
-#	Alternatively you can tell Squid to reset the TCP connection
-#	by specifying TCP_RESET.
-#
-#	Or you can specify an error URL or URL pattern. The browsers will
-#	get redirected to the specified URL after formatting tags have
-#	been replaced. Redirect will be done with 302 or 307 according to
-#	HTTP/1.1 specs. A different 3xx code may be specified by prefixing
-#	the URL. e.g. 303:http://example.com/
-#
-#	URL FORMAT TAGS:
-#		%a	- username (if available. Password NOT included)
-#		%B	- FTP path URL
-#		%e	- Error number
-#		%E	- Error description
-#		%h	- Squid hostname
-#		%H	- Request domain name
-#		%i	- Client IP Address
-#		%M	- Request Method
-#		%o	- Message result from external ACL helper
-#		%p	- Request Port number
-#		%P	- Request Protocol name
-#		%R	- Request URL path
-#		%T	- Timestamp in RFC 1123 format
-#		%U	- Full canonical URL from client
-#			  (HTTPS URLs terminate with *)
-#		%u	- Full canonical URL from client
-#		%w	- Admin email from squid.conf
-#		%x	- Error name
-#		%%	- Literal percent (%) code
-#
-#Default:
-# none
-
-# OPTIONS INFLUENCING REQUEST FORWARDING 
-# -----------------------------------------------------------------------------
-
-#  TAG: nonhierarchical_direct
-#	By default, Squid will send any non-hierarchical requests
-#	(matching hierarchy_stoplist or not cacheable request type) direct
-#	to origin servers.
-#
-#	When this is set to "off", Squid will prefer to send these
-#	requests to parents.
-#
-#	Note that in most configurations, by turning this off you will only
-#	add latency to these request without any improvement in global hit
-#	ratio.
-#
-#	This option only sets a preference. If the parent is unavailable a
-#	direct connection to the origin server may still be attempted. To
-#	completely prevent direct connections use never_direct.
-#Default:
-# nonhierarchical_direct on
-
-#  TAG: prefer_direct
-#	Normally Squid tries to use parents for most requests. If you for some
-#	reason like it to first try going direct and only use a parent if
-#	going direct fails set this to on.
-#
-#	By combining nonhierarchical_direct off and prefer_direct on you
-#	can set up Squid to use a parent as a backup path if going direct
-#	fails.
-#
-#	Note: If you want Squid to use parents for all requests see
-#	the never_direct directive. prefer_direct only modifies how Squid
-#	acts on cacheable requests.
-#Default:
-# prefer_direct off
-
-#  TAG: cache_miss_revalidate	on|off
-#	RFC 7232 defines a conditional request mechanism to prevent
-#	response objects being unnecessarily transferred over the network.
-#	If that mechanism is used by the client and a cache MISS occurs
-#	it can prevent new cache entries being created.
-#
-#	This option determines whether Squid on cache MISS will pass the
-#	client revalidation request to the server or tries to fetch new
-#	content for caching. It can be useful while the cache is mostly
-#	empty to more quickly have the cache populated by generating
-#	non-conditional GETs.
-#
-#	When set to 'on' (default), Squid will pass all client If-* headers
-#	to the server. This permits server responses without a cacheable
-#	payload to be delivered and on MISS no new cache entry is created.
-#
-#	When set to 'off' and if the request is cacheable, Squid will
-#	remove the clients If-Modified-Since and If-None-Match headers from
-#	the request sent to the server. This requests a 200 status response
-#	from the server to create a new cache entry with.
-#Default:
-# cache_miss_revalidate on
-
-#  TAG: always_direct
-#	Usage: always_direct allow|deny [!]aclname ...
-#
-#	Here you can use ACL elements to specify requests which should
-#	ALWAYS be forwarded by Squid to the origin servers without using
-#	any peers.  For example, to always directly forward requests for
-#	local servers ignoring any parents or siblings you may have use
-#	something like:
-#
-#		acl local-servers dstdomain my.domain.net
-#		always_direct allow local-servers
-#
-#	To always forward FTP requests directly, use
-#
-#		acl FTP proto FTP
-#		always_direct allow FTP
-#
-#	NOTE: There is a similar, but opposite option named
-#	'never_direct'.  You need to be aware that "always_direct deny
-#	foo" is NOT the same thing as "never_direct allow foo".  You
-#	may need to use a deny rule to exclude a more-specific case of
-#	some other rule.  Example:
-#
-#		acl local-external dstdomain external.foo.net
-#		acl local-servers dstdomain  .foo.net
-#		always_direct deny local-external
-#		always_direct allow local-servers
-#
-#	NOTE: If your goal is to make the client forward the request
-#	directly to the origin server bypassing Squid then this needs
-#	to be done in the client configuration. Squid configuration
-#	can only tell Squid how Squid should fetch the object.
-#
-#	NOTE: This directive is not related to caching. The replies
-#	is cached as usual even if you use always_direct. To not cache
-#	the replies see the 'cache' directive.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Prevent any cache_peer being used for this request.
-
-#  TAG: never_direct
-#	Usage: never_direct allow|deny [!]aclname ...
-#
-#	never_direct is the opposite of always_direct.  Please read
-#	the description for always_direct if you have not already.
-#
-#	With 'never_direct' you can use ACL elements to specify
-#	requests which should NEVER be forwarded directly to origin
-#	servers.  For example, to force the use of a proxy for all
-#	requests, except those in your local domain use something like:
-#
-#		acl local-servers dstdomain .foo.net
-#		never_direct deny local-servers
-#		never_direct allow all
-#
-#	or if Squid is inside a firewall and there are local intranet
-#	servers inside the firewall use something like:
-#
-#		acl local-intranet dstdomain .foo.net
-#		acl local-external dstdomain external.foo.net
-#		always_direct deny local-external
-#		always_direct allow local-intranet
-#		never_direct allow all
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow DNS results to be used for this request.
-
-# ADVANCED NETWORKING OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: incoming_udp_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_udp_average 6
-
-#  TAG: incoming_tcp_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_tcp_average 4
-
-#  TAG: incoming_dns_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_dns_average 4
-
-#  TAG: min_udp_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_udp_poll_cnt 8
-
-#  TAG: min_dns_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_dns_poll_cnt 8
-
-#  TAG: min_tcp_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_tcp_poll_cnt 8
-
-#  TAG: accept_filter
-#	FreeBSD:
-#
-#	The name of an accept(2) filter to install on Squid's
-#	listen socket(s).  This feature is perhaps specific to
-#	FreeBSD and requires support in the kernel.
-#
-#	The 'httpready' filter delays delivering new connections
-#	to Squid until a full HTTP request has been received.
-#	See the accf_http(9) man page for details.
-#
-#	The 'dataready' filter delays delivering new connections
-#	to Squid until there is some data to process.
-#	See the accf_dataready(9) man page for details.
-#
-#	Linux:
-#	
-#	The 'data' filter delays delivering of new connections
-#	to Squid until there is some data to process by TCP_ACCEPT_DEFER.
-#	You may optionally specify a number of seconds to wait by
-#	'data=N' where N is the number of seconds. Defaults to 30
-#	if not specified.  See the tcp(7) man page for details.
-#EXAMPLE:
-## FreeBSD
-#accept_filter httpready
-## Linux
-#accept_filter data
-#Default:
-# none
-
-#  TAG: client_ip_max_connections
-#	Set an absolute limit on the number of connections a single
-#	client IP can use. Any more than this and Squid will begin to drop
-#	new connections from the client until it closes some links.
-#
-#	Note that this is a global limit. It affects all HTTP, HTCP, Gopher and FTP
-#	connections from the client. For finer control use the ACL access controls.
-#
-#	Requires client_db to be enabled (the default).
-#
-#	WARNING: This may noticably slow down traffic received via external proxies
-#	or NAT devices and cause them to rebound error messages back to their clients.
-#Default:
-# No limit.
-
-#  TAG: tcp_recv_bufsize	(bytes)
-#	Size of receive buffer to set for TCP sockets.  Probably just
-#	as easy to change your kernel's default.
-#	Omit from squid.conf to use the default buffer size.
-#Default:
-# Use operating system TCP defaults.
-
-# ICAP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icap_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	If you want to enable the ICAP module support, set this to on.
-#Default:
-# icap_enable off
-
-#  TAG: icap_connect_timeout
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This parameter specifies how long to wait for the TCP connect to
-#	the requested ICAP server to complete before giving up and either
-#	terminating the HTTP transaction or bypassing the failure.
-#
-#	The default for optional services is peer_connect_timeout.
-#	The default for essential services is connect_timeout.
-#	If this option is explicitly set, its value applies to all services.
-#Default:
-# none
-
-#  TAG: icap_io_timeout	time-units
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This parameter specifies how long to wait for an I/O activity on
-#	an established, active ICAP connection before giving up and
-#	either terminating the HTTP transaction or bypassing the
-#	failure.
-#Default:
-# Use read_timeout.
-
-#  TAG: icap_service_failure_limit	limit [in memory-depth time-units]
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The limit specifies the number of failures that Squid tolerates
-#	when establishing a new TCP connection with an ICAP service. If
-#	the number of failures exceeds the limit, the ICAP service is
-#	not used for new ICAP requests until it is time to refresh its
-#	OPTIONS.
-#
-#	A negative value disables the limit. Without the limit, an ICAP
-#	service will not be considered down due to connectivity failures
-#	between ICAP OPTIONS requests.
-#
-#	Squid forgets ICAP service failures older than the specified
-#	value of memory-depth. The memory fading algorithm 
-#	is approximate because Squid does not remember individual 
-#	errors but groups them instead, splitting the option
-#	value into ten time slots of equal length.
-#
-#	When memory-depth is 0 and by default this option has no 
-#	effect on service failure expiration.
-#
-#	Squid always forgets failures when updating service settings
-#	using an ICAP OPTIONS transaction, regardless of this option
-#	setting.
-#
-#	For example,
-#		# suspend service usage after 10 failures in 5 seconds:
-#		icap_service_failure_limit 10 in 5 seconds
-#Default:
-# icap_service_failure_limit 10
-
-#  TAG: icap_service_revival_delay
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The delay specifies the number of seconds to wait after an ICAP
-#	OPTIONS request failure before requesting the options again. The
-#	failed ICAP service is considered "down" until fresh OPTIONS are
-#	fetched.
-#
-#	The actual delay cannot be smaller than the hardcoded minimum
-#	delay of 30 seconds.
-#Default:
-# icap_service_revival_delay 180
-
-#  TAG: icap_preview_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The ICAP Preview feature allows the ICAP server to handle the
-#	HTTP message by looking only at the beginning of the message body
-#	or even without receiving the body at all. In some environments, 
-#	previews greatly speedup ICAP processing.
-#
-#	During an ICAP OPTIONS transaction, the server may tell	Squid what
-#	HTTP messages should be previewed and how big the preview should be.
-#	Squid will not use Preview if the server did not request one.
-#
-#	To disable ICAP Preview for all ICAP services, regardless of
-#	individual ICAP server OPTIONS responses, set this option to "off".
-#Example:
-#icap_preview_enable off
-#Default:
-# icap_preview_enable on
-
-#  TAG: icap_preview_size
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The default size of preview data to be sent to the ICAP server.
-#	This value might be overwritten on a per server basis by OPTIONS requests.
-#Default:
-# No preview sent.
-
-#  TAG: icap_206_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	206 (Partial Content) responses is an ICAP extension that allows the
-#	ICAP agents to optionally combine adapted and original HTTP message
-#	content. The decision to combine is postponed until the end of the
-#	ICAP response. Squid supports Partial Content extension by default.
-#
-#	Activation of the Partial Content extension is negotiated with each
-#	ICAP service during OPTIONS exchange. Most ICAP servers should handle
-#	negotation correctly even if they do not support the extension, but
-#	some might fail. To disable Partial Content support for all ICAP
-#	services and to avoid any negotiation, set this option to "off".
-#
-#	Example:
-#	    icap_206_enable off
-#Default:
-# icap_206_enable on
-
-#  TAG: icap_default_options_ttl
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The default TTL value for ICAP OPTIONS responses that don't have
-#	an Options-TTL header.
-#Default:
-# icap_default_options_ttl 60
-
-#  TAG: icap_persistent_connections	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Whether or not Squid should use persistent connections to
-#	an ICAP server.
-#Default:
-# icap_persistent_connections on
-
-#  TAG: adaptation_send_client_ip	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	If enabled, Squid shares HTTP client IP information with adaptation
-#	services. For ICAP, Squid adds the X-Client-IP header to ICAP requests.
-#	For eCAP, Squid sets the libecap::metaClientIp transaction option.
-#
-#	See also: adaptation_uses_indirect_client
-#Default:
-# adaptation_send_client_ip off
-
-#  TAG: adaptation_send_username	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	This sends authenticated HTTP client username (if available) to
-#	the adaptation service.
-#
-#	For ICAP, the username value is encoded based on the
-#	icap_client_username_encode option and is sent using the header
-#	specified by the icap_client_username_header option.
-#Default:
-# adaptation_send_username off
-
-#  TAG: icap_client_username_header
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	ICAP request header name to use for adaptation_send_username.
-#Default:
-# icap_client_username_header X-Client-Username
-
-#  TAG: icap_client_username_encode	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Whether to base64 encode the authenticated client username.
-#Default:
-# icap_client_username_encode off
-
-#  TAG: icap_service
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Defines a single ICAP service using the following format:
-#
-#	icap_service id vectoring_point uri [option ...]
-#
-#	id: ID
-#		an opaque identifier or name which is used to direct traffic to
-#		this specific service. Must be unique among all adaptation
-#		services in squid.conf.
-#
-#	vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-#		This specifies at which point of transaction processing the
-#		ICAP service should be activated. *_postcache vectoring points
-#		are not yet supported.
-#
-#	uri: icap://servername:port/servicepath
-#		ICAP server and service location.
-#
-#	ICAP does not allow a single service to handle both REQMOD and RESPMOD
-#	transactions. Squid does not enforce that requirement. You can specify
-#	services with the same service_url and different vectoring_points. You
-#	can even specify multiple identical services as long as their
-#	service_names differ.
-#
-#	To activate a service, use the adaptation_access directive. To group
-#	services, use adaptation_service_chain and adaptation_service_set.
-#
-#	Service options are separated by white space. ICAP services support
-#	the following name=value options:
-#
-#	bypass=on|off|1|0
-#		If set to 'on' or '1', the ICAP service is treated as
-#		optional. If the service cannot be reached or malfunctions,
-#		Squid will try to ignore any errors and process the message as
-#		if the service was not enabled. No all ICAP errors can be
-#		bypassed.  If set to 0, the ICAP service is treated as
-#		essential and all ICAP errors will result in an error page
-#		returned to the HTTP client.
-#
-#		Bypass is off by default: services are treated as essential.
-#
-#	routing=on|off|1|0
-#		If set to 'on' or '1', the ICAP service is allowed to
-#		dynamically change the current message adaptation plan by
-#		returning a chain of services to be used next. The services
-#		are specified using the X-Next-Services ICAP response header
-#		value, formatted as a comma-separated list of service names.
-#		Each named service should be configured in squid.conf. Other
-#		services are ignored. An empty X-Next-Services value results
-#		in an empty plan which ends the current adaptation.
-#
-#		Dynamic adaptation plan may cross or cover multiple supported
-#		vectoring points in their natural processing order.
-#
-#		Routing is not allowed by default: the ICAP X-Next-Services
-#		response header is ignored.
-#
-#	ipv6=on|off
-#		Only has effect on split-stack systems. The default on those systems
-#		is to use IPv4-only connections. When set to 'on' this option will
-#		make Squid use IPv6-only connections to contact this ICAP service.
-#
-#	on-overload=block|bypass|wait|force
-#		If the service Max-Connections limit has been reached, do
-#		one of the following for each new ICAP transaction:
-#		  * block:  send an HTTP error response to the client
-#		  * bypass: ignore the "over-connected" ICAP service
-#		  * wait:   wait (in a FIFO queue) for an ICAP connection slot
-#		  * force:  proceed, ignoring the Max-Connections limit 
-#
-#		In SMP mode with N workers, each worker assumes the service
-#		connection limit is Max-Connections/N, even though not all
-#		workers may use a given service.
-#
-#		The default value is "bypass" if service is bypassable,
-#		otherwise it is set to "wait".
-#		
-#
-#	max-conn=number
-#		Use the given number as the Max-Connections limit, regardless
-#		of the Max-Connections value given by the service, if any.
-#
-#	Older icap_service format without optional named parameters is
-#	deprecated but supported for backward compatibility.
-#
-#Example:
-#icap_service svcBlocker reqmod_precache icap://icap1.mydomain.net:1344/reqmod bypass=0
-#icap_service svcLogger reqmod_precache icap://icap2.mydomain.net:1344/respmod routing=on
-#Default:
-# none
-
-#  TAG: icap_class
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This deprecated option was documented to define an ICAP service
-#	chain, even though it actually defined a set of similar, redundant
-#	services, and the chains were not supported. 
-#
-#	To define a set of redundant services, please use the
-#	adaptation_service_set directive. For service chains, use
-#	adaptation_service_chain.
-#Default:
-# none
-
-#  TAG: icap_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This option is deprecated. Please use adaptation_access, which
-#	has the same ICAP functionality, but comes with better
-#	documentation, and eCAP support.
-#Default:
-# none
-
-# eCAP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: ecap_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap
-#
-#	Controls whether eCAP support is enabled.
-#Default:
-# ecap_enable off
-
-#  TAG: ecap_service
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap
-#
-#	Defines a single eCAP service
-#
-#	ecap_service id vectoring_point uri [option ...]
-#
-#        id: ID
-#		an opaque identifier or name which is used to direct traffic to
-#		this specific service. Must be unique among all adaptation
-#		services in squid.conf.
-#
-#	vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-#		This specifies at which point of transaction processing the
-#		eCAP service should be activated. *_postcache vectoring points
-#		are not yet supported.
-#
-#	uri: ecap://vendor/service_name?custom&cgi=style&parameters=optional
-#		Squid uses the eCAP service URI to match this configuration
-#		line with one of the dynamically loaded services. Each loaded
-#		eCAP service must have a unique URI. Obtain the right URI from
-#		the service provider.
-#
-#	To activate a service, use the adaptation_access directive. To group
-#	services, use adaptation_service_chain and adaptation_service_set.
-#
-#	Service options are separated by white space. eCAP services support
-#	the following name=value options:
-#
-#	bypass=on|off|1|0
-#		If set to 'on' or '1', the eCAP service is treated as optional.
-#		If the service cannot be reached or malfunctions, Squid will try
-#		to ignore any errors and process the message as if the service
-#		was not enabled. No all eCAP errors can be bypassed.
-#		If set to 'off' or '0', the eCAP service is treated as essential
-#		and all eCAP errors will result in an error page returned to the
-#		HTTP client.
-#
-#                Bypass is off by default: services are treated as essential.
-#
-#	routing=on|off|1|0
-#		If set to 'on' or '1', the eCAP service is allowed to
-#		dynamically change the current message adaptation plan by
-#		returning a chain of services to be used next.
-#
-#		Dynamic adaptation plan may cross or cover multiple supported
-#		vectoring points in their natural processing order.
-#
-#		Routing is not allowed by default.
-#
-#	Older ecap_service format without optional named parameters is
-#	deprecated but supported for backward compatibility.
-#
-#
-#Example:
-#ecap_service s1 reqmod_precache ecap://filters.R.us/leakDetector?on_error=block bypass=off
-#ecap_service s2 respmod_precache ecap://filters.R.us/virusFilter config=/etc/vf.cfg bypass=on
-#Default:
-# none
-
-#  TAG: loadable_modules
-#	Instructs Squid to load the specified dynamic module(s) or activate
-#	preloaded module(s).
-#Example:
-#loadable_modules /usr/lib/MinimalAdapter.so
-#Default:
-# none
-
-# MESSAGE ADAPTATION OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: adaptation_service_set
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#
-#	Configures an ordered set of similar, redundant services. This is
-#	useful when hot standby or backup adaptation servers are available.
-#
-#	    adaptation_service_set set_name service_name1 service_name2 ...
-#
-# 	The named services are used in the set declaration order. The first
-#	applicable adaptation service from the set is used first. The next
-#	applicable service is tried if and only if the transaction with the
-#	previous service fails and the message waiting to be adapted is still
-#	intact.
-#
-#	When adaptation starts, broken services are ignored as if they were
-#	not a part of the set. A broken service is a down optional service.
-#
-#	The services in a set must be attached to the same vectoring point
-#	(e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-#	If all services in a set are optional then adaptation failures are
-#	bypassable. If all services in the set are essential, then a
-#	transaction failure with one service may still be retried using
-#	another service from the set, but when all services fail, the master
-#	transaction fails as well.
-#
-#	A set may contain a mix of optional and essential services, but that
-#	is likely to lead to surprising results because broken services become
-#	ignored (see above), making previously bypassable failures fatal.
-#	Technically, it is the bypassability of the last failed service that
-#	matters.
-#
-#	See also: adaptation_access adaptation_service_chain
-#
-#Example:
-#adaptation_service_set svcBlocker urlFilterPrimary urlFilterBackup
-#adaptation service_set svcLogger loggerLocal loggerRemote
-#Default:
-# none
-
-#  TAG: adaptation_service_chain
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#
-#	Configures a list of complementary services that will be applied
-#	one-by-one, forming an adaptation chain or pipeline. This is useful
-#	when Squid must perform different adaptations on the same message.
-#
-#	    adaptation_service_chain chain_name service_name1 svc_name2 ...
-#
-# 	The named services are used in the chain declaration order. The first
-#	applicable adaptation service from the chain is used first. The next
-#	applicable service is applied to the successful adaptation results of
-#	the previous service in the chain.
-#
-#	When adaptation starts, broken services are ignored as if they were
-#	not a part of the chain. A broken service is a down optional service.
-#
-#	Request satisfaction terminates the adaptation chain because Squid
-#	does not currently allow declaration of RESPMOD services at the
-#	"reqmod_precache" vectoring point (see icap_service or ecap_service).
-#
-#	The services in a chain must be attached to the same vectoring point
-#	(e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-#	A chain may contain a mix of optional and essential services. If an
-#	essential adaptation fails (or the failure cannot be bypassed for
-#	other reasons), the master transaction fails. Otherwise, the failure
-#	is bypassed as if the failed adaptation service was not in the chain.
-#
-#	See also: adaptation_access adaptation_service_set
-#
-#Example:
-#adaptation_service_chain svcRequest requestLogger urlFilter leakDetector
-#Default:
-# none
-
-#  TAG: adaptation_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	Sends an HTTP transaction to an ICAP or eCAP adaptation	service.
-#
-#	adaptation_access service_name allow|deny [!]aclname...
-#	adaptation_access set_name     allow|deny [!]aclname...
-#
-#	At each supported vectoring point, the adaptation_access
-#	statements are processed in the order they appear in this
-#	configuration file. Statements pointing to the following services
-#	are ignored (i.e., skipped without checking their ACL):
-#
-#	    - services serving different vectoring points
-#	    - "broken-but-bypassable" services
-#	    - "up" services configured to ignore such transactions
-#              (e.g., based on the ICAP Transfer-Ignore header).
-#
-#        When a set_name is used, all services in the set are checked
-#	using the same rules, to find the first applicable one. See
-#	adaptation_service_set for details.
-#
-#	If an access list is checked and there is a match, the
-#	processing stops: For an "allow" rule, the corresponding
-#	adaptation service is used for the transaction. For a "deny"
-#	rule, no adaptation service is activated.
-#
-#	It is currently not possible to apply more than one adaptation
-#	service at the same vectoring point to the same HTTP transaction.
-#
-#        See also: icap_service and ecap_service
-#
-#Example:
-#adaptation_access service_1 allow all
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: adaptation_service_iteration_limit
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	Limits the number of iterations allowed when applying adaptation
-#	services to a message. If your longest adaptation set or chain
-#	may have more than 16 services, increase the limit beyond its
-#	default value of 16. If detecting infinite iteration loops sooner
-#	is critical, make the iteration limit match the actual number
-#	of services in your longest adaptation set or chain.
-#
-#	Infinite adaptation loops are most likely with routing services.
-#
-#	See also: icap_service routing=1
-#Default:
-# adaptation_service_iteration_limit 16
-
-#  TAG: adaptation_masterx_shared_names
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	For each master transaction (i.e., the HTTP request and response
-#	sequence, including all related ICAP and eCAP exchanges), Squid
-#	maintains a table of metadata. The table entries are (name, value)
-#	pairs shared among eCAP and ICAP exchanges. The table is destroyed
-#	with the master transaction.
-#
-#	This option specifies the table entry names that Squid must accept
-#	from and forward to the adaptation transactions.
-#
-#	An ICAP REQMOD or RESPMOD transaction may set an entry in the 
-#	shared table by returning an ICAP header field with a name 
-#	specified in adaptation_masterx_shared_names.
-#
-#	An eCAP REQMOD or RESPMOD transaction may set an entry in the
-#	shared table by implementing the libecap::visitEachOption() API
-#	to provide an option with a name specified in
-#	adaptation_masterx_shared_names.
-#
-#	Squid will store and forward the set entry to subsequent adaptation
-#	transactions within the same master transaction scope.
-#
-#	Only one shared entry name is supported at this time.
-#
-#Example:
-## share authentication information among ICAP services
-#adaptation_masterx_shared_names X-Subscriber-ID
-#Default:
-# none
-
-#  TAG: adaptation_meta
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	This option allows Squid administrator to add custom ICAP request
-#	headers or eCAP options to Squid ICAP requests or eCAP transactions.
-#	Use it to pass custom authentication tokens and other
-#	transaction-state related meta information to an ICAP/eCAP service.
-#	
-#	The addition of a meta header is ACL-driven:
-#		adaptation_meta name value [!]aclname ...
-#	
-#	Processing for a given header name stops after the first ACL list match.
-#	Thus, it is impossible to add two headers with the same name. If no ACL
-#	lists match for a given header name, no such header is added. For 
-#	example:
-#	
-#		# do not debug transactions except for those that need debugging
-#		adaptation_meta X-Debug 1 needs_debugging
-#	
-#		# log all transactions except for those that must remain secret
-#		adaptation_meta X-Log 1 !keep_secret
-#	
-#		# mark transactions from users in the "G 1" group
-#		adaptation_meta X-Authenticated-Groups "G 1" authed_as_G1
-#	
-#	The "value" parameter may be a regular squid.conf token or a "double
-#	quoted string". Within the quoted string, use backslash (\) to escape
-#	any character, which is currently only useful for escaping backslashes
-#	and double quotes. For example,
-#	    "this string has one backslash (\\) and two \"quotes\""
-#
-#	Used adaptation_meta header values may be logged via %note
-#	logformat code. If multiple adaptation_meta headers with the same name
-#	are used during master transaction lifetime, the header values are
-#	logged in the order they were used and duplicate values are ignored
-#	(only the first repeated value will be logged).
-#Default:
-# none
-
-#  TAG: icap_retry
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This ACL determines which retriable ICAP transactions are
-#	retried. Transactions that received a complete ICAP response
-#	and did not have to consume or produce HTTP bodies to receive
-#	that response are usually retriable.
-#
-#	icap_retry allow|deny [!]aclname ...
-#
-#	Squid automatically retries some ICAP I/O timeouts and errors
-#	due to persistent connection race conditions.
-#
-#	See also: icap_retry_limit
-#Default:
-# icap_retry deny all
-
-#  TAG: icap_retry_limit
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Limits the number of retries allowed.
-#
-#	Communication errors due to persistent connection race
-#	conditions are unavoidable, automatically retried, and do not
-#	count against this limit.
-#
-#	See also: icap_retry
-#Default:
-# No retries are allowed.
-
-# DNS OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: check_hostnames
-#	For security and stability reasons Squid can check
-#	hostnames for Internet standard RFC compliance. If you want
-#	Squid to perform these checks turn this directive on.
-#Default:
-# check_hostnames off
-
-#  TAG: allow_underscore
-#	Underscore characters is not strictly allowed in Internet hostnames
-#	but nevertheless used by many sites. Set this to off if you want
-#	Squid to be strict about the standard.
-#	This check is performed only when check_hostnames is set to on.
-#Default:
-# allow_underscore on
-
-#  TAG: cache_dns_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --disable-internal-dns
-#
-#	Specify the location of the executable for dnslookup process.
-#Default:
-# cache_dns_program /usr/libexec/dnsserver
-
-#  TAG: dns_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --disable-internal-dns
-#
-#	The maximum number of processes spawn to service DNS name lookups.
-#	If you limit it too few Squid will have to wait for them to process
-#	a backlog of requests, slowing it down. If you allow too many they
-#	will use RAM and other system resources noticably.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#Default:
-# dns_children 32 startup=1 idle=1
-
-#  TAG: dns_retransmit_interval
-#	Initial retransmit interval for DNS queries. The interval is
-#	doubled each time all configured DNS servers have been tried.
-#Default:
-# dns_retransmit_interval 5 seconds
-
-#  TAG: dns_timeout
-#	DNS Query timeout. If no response is received to a DNS query
-#	within this time all DNS servers for the queried domain
-#	are assumed to be unavailable.
-#Default:
-# dns_timeout 30 seconds
-
-#  TAG: dns_packet_max
-#	Maximum number of bytes packet size to advertise via EDNS.
-#	Set to "none" to disable EDNS large packet support.
-#	
-#	For legacy reasons DNS UDP replies will default to 512 bytes which
-#	is too small for many responses. EDNS provides a means for Squid to
-#	negotiate receiving larger responses back immediately without having
-#	to failover with repeat requests. Responses larger than this limit
-#	will retain the old behaviour of failover to TCP DNS.
-#	
-#	Squid has no real fixed limit internally, but allowing packet sizes
-#	over 1500 bytes requires network jumbogram support and is usually not
-#	necessary.
-#	
-#	WARNING: The RFC also indicates that some older resolvers will reply
-#	with failure of the whole request if the extension is added. Some
-#	resolvers have already been identified which will reply with mangled
-#	EDNS response on occasion. Usually in response to many-KB jumbogram
-#	sizes being advertised by Squid.
-#	Squid will currently treat these both as an unable-to-resolve domain
-#	even if it would be resolvable without EDNS.
-#Default:
-# EDNS disabled
-
-#  TAG: dns_defnames	on|off
-#	Normally the RES_DEFNAMES resolver option is disabled
-#	(see res_init(3)).  This prevents caches in a hierarchy
-#	from interpreting single-component hostnames locally.  To allow
-#	Squid to handle single-component names, enable this option.
-#Default:
-# Search for single-label domain names is disabled.
-
-#  TAG: dns_multicast_local	on|off
-#	When set to on, Squid sends multicast DNS lookups on the local
-#	network for domains ending in .local and .arpa.
-#	This enables local servers and devices to be contacted in an
-#	ad-hoc or zero-configuration network environment.
-#Default:
-# Search for .local and .arpa names is disabled.
-
-#  TAG: dns_nameservers
-#	Use this if you want to specify a list of DNS name servers
-#	(IP addresses) to use instead of those given in your
-#	/etc/resolv.conf file.
-#
-#	On Windows platforms, if no value is specified here or in
-#	the /etc/resolv.conf file, the list of DNS name servers are
-#	taken from the Windows registry, both static and dynamic DHCP
-#	configurations are supported.
-#
-#	Example: dns_nameservers 10.0.0.1 192.172.0.4
-#Default:
-# Use operating system definitions
-
-#  TAG: hosts_file
-#	Location of the host-local IP name-address associations
-#	database. Most Operating Systems have such a file on different
-#	default locations:
-#	- Un*X & Linux:    /etc/hosts
-#	- Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts
-#			   (%SystemRoot% value install default is c:\winnt)
-#	- Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts
-#			   (%SystemRoot% value install default is c:\windows)
-#	- Windows 9x/Me:   %windir%\hosts
-#			   (%windir% value is usually c:\windows)
-#	- Cygwin:	   /etc/hosts
-#
-#	The file contains newline-separated definitions, in the
-#	form ip_address_in_dotted_form name [name ...] names are
-#	whitespace-separated. Lines beginning with an hash (#)
-#	character are comments.
-#
-#	The file is checked at startup and upon configuration.
-#	If set to 'none', it won't be checked.
-#	If append_domain is used, that domain will be added to
-#	domain-local (i.e. not containing any dot character) host
-#	definitions.
-#Default:
-# hosts_file /etc/hosts
-
-#  TAG: append_domain
-#	Appends local domain name to hostnames without any dots in
-#	them.  append_domain must begin with a period.
-#
-#	Be warned there are now Internet names with no dots in
-#	them using only top-domain names, so setting this may
-#	cause some Internet sites to become unavailable.
-#
-#Example:
-# append_domain .yourdomain.com
-#Default:
-# Use operating system definitions
-
-#  TAG: ignore_unknown_nameservers
-#	By default Squid checks that DNS responses are received
-#	from the same IP addresses they are sent to.  If they
-#	don't match, Squid ignores the response and writes a warning
-#	message to cache.log.  You can allow responses from unknown
-#	nameservers by setting this option to 'off'.
-#Default:
-# ignore_unknown_nameservers on
-
-#  TAG: dns_v4_first
-#	With the IPv6 Internet being as fast or faster than IPv4 Internet
-#	for most networks Squid prefers to contact websites over IPv6.
-#
-#	This option reverses the order of preference to make Squid contact
-#	dual-stack websites over IPv4 first. Squid will still perform both
-#	IPv6 and IPv4 DNS lookups before connecting.
-#
-#	WARNING:
-#	  This option will restrict the situations under which IPv6
-#	  connectivity is used (and tested). Hiding network problems
-#	  which would otherwise be detected and warned about.
-#Default:
-# dns_v4_first off
-
-#  TAG: ipcache_size	(number of entries)
-#	Maximum number of DNS IP cache entries.
-#Default:
-# ipcache_size 1024
-
-#  TAG: ipcache_low	(percent)
-#Default:
-# ipcache_low 90
-
-#  TAG: ipcache_high	(percent)
-#	The size, low-, and high-water marks for the IP cache.
-#Default:
-# ipcache_high 95
-
-#  TAG: fqdncache_size	(number of entries)
-#	Maximum number of FQDN cache entries.
-#Default:
-# fqdncache_size 1024
-
-# MISCELLANEOUS
-# -----------------------------------------------------------------------------
-
-#  TAG: configuration_includes_quoted_values	on|off
-#	Previous Squid versions have defined "quoted/string" as syntax for
-#	ACL to signifiy the value is an included file containing values and
-#	has treated the " characters in other places of the configuration file
-#	as part of the parameter value it was used for.
-#
-#	For compatibility with existing installations that behaviour
-#	remains the default.
-#
-#	If this directive is set to 'on', Squid will start parsing each
-#	"quoted string" as a single configuration directive parameter. The
-#	quotes are stripped before the parameter value is interpreted or use.
-#
-#	That will continue for all lines until this directive is set to 'off',
-#	where Squid will return to the default configuration parsing.
-#
-#	For example;
-#
-#		configuration_includes_quoted_values on
-#		acl group external groupCheck Administrators "Internet Users" Guest
-#		configuration_includes_quoted_values off
-#
-#Default:
-# configuration_includes_quoted_values off
-
-#  TAG: memory_pools	on|off
-#	If set, Squid will keep pools of allocated (but unused) memory
-#	available for future use.  If memory is a premium on your
-#	system and you believe your malloc library outperforms Squid
-#	routines, disable this.
-#Default:
-# memory_pools on
-
-#  TAG: memory_pools_limit	(bytes)
-#	Used only with memory_pools on:
-#	memory_pools_limit 50 MB
-#
-#	If set to a non-zero value, Squid will keep at most the specified
-#	limit of allocated (but unused) memory in memory pools. All free()
-#	requests that exceed this limit will be handled by your malloc
-#	library. Squid does not pre-allocate any memory, just safe-keeps
-#	objects that otherwise would be free()d. Thus, it is safe to set
-#	memory_pools_limit to a reasonably high value even if your
-#	configuration will use less memory.
-#
-#	If set to none, Squid will keep all memory it can. That is, there
-#	will be no limit on the total amount of memory used for safe-keeping.
-#
-#	To disable memory allocation optimization, do not set
-#	memory_pools_limit to 0 or none. Set memory_pools to "off" instead.
-#
-#	An overhead for maintaining memory pools is not taken into account
-#	when the limit is checked. This overhead is close to four bytes per
-#	object kept. However, pools may actually _save_ memory because of
-#	reduced memory thrashing in your malloc library.
-#Default:
-# memory_pools_limit 5 MB
-
-#  TAG: forwarded_for	on|off|transparent|truncate|delete
-#	If set to "on", Squid will append your client's IP address
-#	in the HTTP requests it forwards. By default it looks like:
-#
-#		X-Forwarded-For: 192.1.2.3
-#
-#	If set to "off", it will appear as
-#
-#		X-Forwarded-For: unknown
-#
-#	If set to "transparent", Squid will not alter the
-#	X-Forwarded-For header in any way.
-#
-#	If set to "delete", Squid will delete the entire
-#	X-Forwarded-For header.
-#
-#	If set to "truncate", Squid will remove all existing
-#	X-Forwarded-For entries, and place the client IP as the sole entry.
-#Default:
-# forwarded_for on
-
-#  TAG: cachemgr_passwd
-#	Specify passwords for cachemgr operations.
-#
-#	Usage: cachemgr_passwd password action action ...
-#
-#	Some valid actions are (see cache manager menu for a full list):
-#		5min
-#		60min
-#		asndb
-#		authenticator
-#		cbdata
-#		client_list
-#		comm_incoming
-#		config *
-#		counters
-#		delay
-#		digest_stats
-#		dns
-#		events
-#		filedescriptors
-#		fqdncache
-#		histograms
-#		http_headers
-#		info
-#		io
-#		ipcache
-#		mem
-#		menu
-#		netdb
-#		non_peers
-#		objects
-#		offline_toggle *
-#		pconn
-#		peer_select
-#		reconfigure *
-#		redirector
-#		refresh
-#		server_list
-#		shutdown *
-#		store_digest
-#		storedir
-#		utilization
-#		via_headers
-#		vm_objects
-#
-#	* Indicates actions which will not be performed without a
-#	  valid password, others can be performed if not listed here.
-#
-#	To disable an action, set the password to "disable".
-#	To allow performing an action without a password, set the
-#	password to "none".
-#
-#	Use the keyword "all" to set the same password for all actions.
-#
-#Example:
-# cachemgr_passwd secret shutdown
-# cachemgr_passwd lesssssssecret info stats/objects
-# cachemgr_passwd disable all
-#Default:
-# No password. Actions which require password are denied.
-
-#  TAG: client_db	on|off
-#	If you want to disable collecting per-client statistics,
-#	turn off client_db here.
-#Default:
-# client_db on
-
-#  TAG: refresh_all_ims	on|off
-#	When you enable this option, squid will always check
-#	the origin server for an update when a client sends an
-#	If-Modified-Since request.  Many browsers use IMS
-#	requests when the user requests a reload, and this
-#	ensures those clients receive the latest version.
-#
-#	By default (off), squid may return a Not Modified response
-#	based on the age of the cached version.
-#Default:
-# refresh_all_ims off
-
-#  TAG: reload_into_ims	on|off
-#	When you enable this option, client no-cache or ``reload''
-#	requests will be changed to If-Modified-Since requests.
-#	Doing this VIOLATES the HTTP standard.  Enabling this
-#	feature could make you liable for problems which it
-#	causes.
-#
-#	see also refresh_pattern for a more selective approach.
-#Default:
-# reload_into_ims off
-
-#  TAG: connect_retries
-#	This sets the maximum number of connection attempts made for each
-#	TCP connection. The connect_retries attempts must all still
-#	complete within the connection timeout period.
-#
-#	The default is not to re-try if the first connection attempt fails.
-#	The (not recommended) maximum is 10 tries.
-#
-#	A warning message will be generated if it is set to a too-high
-#	value and the configured value will be over-ridden.
-#
-#	Note: These re-tries are in addition to forward_max_tries
-#	which limit how many different addresses may be tried to find
-#	a useful server.
-#Default:
-# Do not retry failed connections.
-
-#  TAG: retry_on_error
-#	If set to ON Squid will automatically retry requests when
-#	receiving an error response with status 403 (Forbidden),
-#	500 (Internal Error), 501 or 503 (Service not available).
-#	Status 502 and 504 (Gateway errors) are always retried.
-#	
-#	This is mainly useful if you are in a complex cache hierarchy to
-#	work around access control errors.
-#	
-#	NOTE: This retry will attempt to find another working destination.
-#	Which is different from the server which just failed.
-#Default:
-# retry_on_error off
-
-#  TAG: as_whois_server
-#	WHOIS server to query for AS numbers.  NOTE: AS numbers are
-#	queried only when Squid starts up, not for every request.
-#Default:
-# as_whois_server whois.ra.net
-
-#  TAG: offline_mode
-#	Enable this option and Squid will never try to validate cached
-#	objects.
-#Default:
-# offline_mode off
-
-#  TAG: uri_whitespace
-#	What to do with requests that have whitespace characters in the
-#	URI.  Options:
-#
-#	strip:  The whitespace characters are stripped out of the URL.
-#		This is the behavior recommended by RFC2396 and RFC3986
-#		for tolerant handling of generic URI.
-#		NOTE: This is one difference between generic URI and HTTP URLs.
-#
-#	deny:   The request is denied.  The user receives an "Invalid
-#		Request" message.
-#		This is the behaviour recommended by RFC2616 for safe
-#		handling of HTTP request URL.
-#
-#	allow:  The request is allowed and the URI is not changed.  The
-#		whitespace characters remain in the URI.  Note the
-#		whitespace is passed to redirector processes if they
-#		are in use.
-#		Note this may be considered a violation of RFC2616
-#		request parsing where whitespace is prohibited in the
-#		URL field.
-#
-#	encode:	The request is allowed and the whitespace characters are
-#		encoded according to RFC1738.
-#
-#	chop:	The request is allowed and the URI is chopped at the
-#		first whitespace.
-#
-#
-#	NOTE the current Squid implementation of encode and chop violates
-#	RFC2616 by not using a 301 redirect after altering the URL.
-#Default:
-# uri_whitespace strip
-
-#  TAG: chroot
-#	Specifies a directory where Squid should do a chroot() while
-#	initializing.  This also causes Squid to fully drop root
-#	privileges after initializing.  This means, for example, if you
-#	use a HTTP port less than 1024 and try to reconfigure, you may
-#	get an error saying that Squid can not open the port.
-#Default:
-# none
-
-#  TAG: balance_on_multiple_ip
-#	Modern IP resolvers in squid sort lookup results by preferred access.
-#	By default squid will use these IP in order and only rotates to
-#	the next listed when the most preffered fails.
-#
-#	Some load balancing servers based on round robin DNS have been
-#	found not to preserve user session state across requests
-#	to different IP addresses.
-#
-#	Enabling this directive Squid rotates IP's per request.
-#Default:
-# balance_on_multiple_ip off
-
-#  TAG: pipeline_prefetch
-#	HTTP clients may send a pipeline of 1+N requests to Squid using a
-#	single connection, without waiting for Squid to respond to the first
-#	of those requests. This option limits the number of concurrent
-#	requests Squid will try to handle in parallel. If set to N, Squid
-#	will try to receive and process up to 1+N requests on the same
-#	connection concurrently.
-#
-#	Defaults to 0 (off) for bandwidth management and access logging
-#	reasons.
-#
-#	NOTE: pipelining requires persistent connections to clients.
-#
-#	WARNING: pipelining breaks NTLM and Negotiate/Kerberos authentication.
-#Default:
-# Do not pre-parse pipelined requests.
-
-#  TAG: high_response_time_warning	(msec)
-#	If the one-minute median response time exceeds this value,
-#	Squid prints a WARNING with debug level 0 to get the
-#	administrators attention.  The value is in milliseconds.
-#Default:
-# disabled.
-
-#  TAG: high_page_fault_warning
-#	If the one-minute average page fault rate exceeds this
-#	value, Squid prints a WARNING with debug level 0 to get
-#	the administrators attention.  The value is in page faults
-#	per second.
-#Default:
-# disabled.
-
-#  TAG: high_memory_warning
-# Note: This option is only available if Squid is rebuilt with the
-#       GNU Malloc with mstats()
-#
-#	If the memory usage (as determined by mallinfo) exceeds
-#	this amount, Squid prints a WARNING with debug level 0 to get
-#	the administrators attention.
-#Default:
-# disabled.
-
-#  TAG: sleep_after_fork	(microseconds)
-#	When this is set to a non-zero value, the main Squid process
-#	sleeps the specified number of microseconds after a fork()
-#	system call. This sleep may help the situation where your
-#	system reports fork() failures due to lack of (virtual)
-#	memory. Note, however, if you have a lot of child
-#	processes, these sleep delays will add up and your
-#	Squid will not service requests for some amount of time
-#	until all the child processes have been started.
-#	On Windows value less then 1000 (1 milliseconds) are
-#	rounded to 1000.
-#Default:
-# sleep_after_fork 0
-
-#  TAG: windows_ipaddrchangemonitor	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       MS Windows
-#
-#	On Windows Squid by default will monitor IP address changes and will 
-#	reconfigure itself after any detected event. This is very useful for
-#	proxies connected to internet with dial-up interfaces.
-#	In some cases (a Proxy server acting as VPN gateway is one) it could be
-#	desiderable to disable this behaviour setting this to 'off'.
-#	Note: after changing this, Squid service must be restarted.
-#Default:
-# windows_ipaddrchangemonitor on
-
-#  TAG: eui_lookup
-#	Whether to lookup the EUI or MAC address of a connected client.
-#Default:
-# eui_lookup on
-
-#  TAG: max_filedescriptors
-#	Reduce the maximum number of filedescriptors supported below
-#	the usual operating system defaults.
-#
-#	Remove from squid.conf to inherit the current ulimit setting.
-#
-#	Note: Changing this requires a restart of Squid. Also
-#	not all I/O types supports large values (eg on Windows).
-#Default:
-# Use operating system limits set by ulimit.
-
-#  TAG: workers
-#	Number of main Squid processes or "workers" to fork and maintain.
-#	0: "no daemon" mode, like running "squid -N ..."
-#	1: "no SMP" mode, start one main Squid process daemon (default)
-#	N: start N main Squid process daemons (i.e., SMP mode)
-#
-#	In SMP mode, each worker does nearly all what a single Squid daemon
-#	does (e.g., listen on http_port and forward HTTP requests).
-#Default:
-# SMP support disabled.
-
-#  TAG: cpu_affinity_map
-#	Usage: cpu_affinity_map process_numbers=P1,P2,... cores=C1,C2,...
-#
-#	Sets 1:1 mapping between Squid processes and CPU cores. For example,
-#
-#	    cpu_affinity_map process_numbers=1,2,3,4 cores=1,3,5,7
-#
-#	affects processes 1 through 4 only and places them on the first
-#	four even cores, starting with core #1.
-#
-#	CPU cores are numbered starting from 1. Requires support for
-#	sched_getaffinity(2) and sched_setaffinity(2) system calls.
-#
-#	Multiple cpu_affinity_map options are merged.
-#
-#	See also: workers
-#Default:
-# Let operating system decide.
-
diff --git a/network/squid/squid.conf.documented b/network/squid/squid.conf.documented
deleted file mode 100644
index bd70bbfa5f..0000000000
--- a/network/squid/squid.conf.documented
+++ /dev/null
@@ -1,7806 +0,0 @@
-#	WELCOME TO SQUID 3.4.10
-#	----------------------------
-#	
-#	This is the documentation for the Squid configuration file.
-#	This documentation can also be found online at:
-#		http://www.squid-cache.org/Doc/config/
-#	
-#	You may wish to look at the Squid home page and wiki for the
-#	FAQ and other documentation:
-#		http://www.squid-cache.org/
-#		http://wiki.squid-cache.org/SquidFaq
-#		http://wiki.squid-cache.org/ConfigExamples
-#	
-#	This documentation shows what the defaults for various directives
-#	happen to be.  If you don't need to change the default, you should
-#	leave the line out of your squid.conf in most cases.
-#	
-#	In some cases "none" refers to no default setting at all,
-#	while in other cases it refers to the value of the option
-#	- the comments for that keyword indicate if this is the case.
-#
-
-#  Configuration options can be included using the "include" directive.
-#  Include takes a list of files to include. Quoting and wildcards are
-#  supported.
-#
-#  For example,
-#
-#  include /path/to/included/file/squid.acl.config
-#
-#  Includes can be nested up to a hard-coded depth of 16 levels.
-#  This arbitrary restriction is to prevent recursive include references
-#  from causing Squid entering an infinite loop whilst trying to load
-#  configuration files.
-#
-#  Values with byte units
-#
-#	Squid accepts size units on some size related directives. All
-#	such directives are documented with a default value displaying
-#	a unit.
-#
-#	Units accepted by Squid are:
-#		bytes - byte
-#		KB - Kilobyte (1024 bytes)
-#		MB - Megabyte
-#		GB - Gigabyte
-#
-#  Values with spaces, quotes, and other special characters
-#
-#	Squid supports directive parameters with spaces, quotes, and other
-#	special characters. Surround such parameters with "double quotes". Use
-#	the configuration_includes_quoted_values directive to enable or
-#	disable that support.
-#
-#	For example;
-#
-#		configuration_includes_quoted_values on
-#		acl group external groupCheck Administrators "Internet Users" Guest
-#		configuration_includes_quoted_values off
-#
-#
-#  Conditional configuration
-#
-#	If-statements can be used to make configuration directives
-#	depend on conditions:
-#
-#	    if <CONDITION>
-#	        ... regular configuration directives ...
-#	    [else
-#	        ... regular configuration directives ...]
-#	    endif
-#
-#	The else part is optional. The keywords "if", "else", and "endif"
-#	must be typed on their own lines, as if they were regular
-#	configuration directives.
-#
-#	NOTE: An else-if condition is not supported.
-#
-#	These individual conditions types are supported:
-#
-#	    true
-#		Always evaluates to true.
-#	    false
-#		Always evaluates to false.
-#	    <integer> = <integer>
-#	        Equality comparison of two integer numbers.
-#
-#
-#  SMP-Related Macros
-#
-#	The following SMP-related preprocessor macros can be used.
-#
-#	${process_name} expands to the current Squid process "name"
-#	(e.g., squid1, squid2, or cache1).
-#
-#	${process_number} expands to the current Squid process
-#	identifier, which is an integer number (e.g., 1, 2, 3) unique
-#	across all Squid processes.
-
-#  TAG: broken_vary_encoding
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: cache_vary
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: collapsed_forwarding
-#	This option is not yet supported by Squid-3. see http://bugs.squid-cache.org/show_bug.cgi?id=3495
-#Default:
-# none
-
-#  TAG: error_map
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: external_refresh_check
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: location_rewrite_program
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: refresh_stale_hit
-#	This option is not yet supported by Squid-3.
-#Default:
-# none
-
-#  TAG: ignore_ims_on_miss
-#	Remove this line. The HTTP/1.1 feature is now configured by 'cache_miss_revalidate'.
-#Default:
-# none
-
-#  TAG: ignore_expect_100
-#	Remove this line. The HTTP/1.1 feature is now fully supported by default.
-#Default:
-# none
-
-#  TAG: dns_v4_fallback
-#	Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant.
-#Default:
-# none
-
-#  TAG: ftp_list_width
-#	Remove this line. Configure FTP page display using the CSS controls in errorpages.css instead.
-#Default:
-# none
-
-#  TAG: maximum_single_addr_tries
-#	Replaced by connect_retries. The behaviour has changed, please read the documentation before altering.
-#Default:
-# none
-
-#  TAG: update_headers
-#	Remove this line. The feature is supported by default in storage types where update is implemented.
-#Default:
-# none
-
-#  TAG: url_rewrite_concurrency
-#	Remove this line. Set the 'concurrency=' option of url_rewrite_children instead.
-#Default:
-# none
-
-#  TAG: dns_testnames
-#	Remove this line. DNS is no longer tested on startup.
-#Default:
-# none
-
-#  TAG: extension_methods
-#	Remove this line. All valid methods for HTTP are accepted by default.
-#Default:
-# none
-
-#  TAG: zero_buffers
-#Default:
-# none
-
-#  TAG: incoming_rate
-#Default:
-# none
-
-#  TAG: server_http11
-#	Remove this line. HTTP/1.1 is supported by default.
-#Default:
-# none
-
-#  TAG: upgrade_http0.9
-#	Remove this line. ICY/1.0 streaming protocol is supported by default.
-#Default:
-# none
-
-#  TAG: zph_local
-#	Alter these entries. Use the qos_flows directive instead.
-#Default:
-# none
-
-#  TAG: header_access
-#	Since squid-3.0 replace with request_header_access or reply_header_access
-#	depending on whether you wish to match client requests or server replies.
-#Default:
-# none
-
-#  TAG: httpd_accel_no_pmtu_disc
-#	Since squid-3.0 use the 'disable-pmtu-discovery' flag on http_port instead.
-#Default:
-# none
-
-#  TAG: wais_relay_host
-#	Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-#  TAG: wais_relay_port
-#	Replace this line with 'cache_peer' configuration.
-#Default:
-# none
-
-# OPTIONS FOR AUTHENTICATION
-# -----------------------------------------------------------------------------
-
-#  TAG: auth_param
-#	This is used to define parameters for the various authentication
-#	schemes supported by Squid.
-#
-#	format: auth_param scheme parameter [setting]
-#
-#	The order in which authentication schemes are presented to the client is
-#	dependent on the order the scheme first appears in config file. IE
-#	has a bug (it's not RFC 2617 compliant) in that it will use the basic
-#	scheme if basic is the first entry presented, even if more secure
-#	schemes are presented. For now use the order in the recommended
-#	settings section below. If other browsers have difficulties (don't
-#	recognize the schemes offered even if you are using basic) either
-#	put basic first, or disable the other schemes (by commenting out their
-#	program entry).
-#
-#	Once an authentication scheme is fully configured, it can only be
-#	shutdown by shutting squid down and restarting. Changes can be made on
-#	the fly and activated with a reconfigure. I.E. You can change to a
-#	different helper, but not unconfigure the helper completely.
-#
-#	Please note that while this directive defines how Squid processes
-#	authentication it does not automatically activate authentication.
-#	To use authentication you must in addition make use of ACLs based
-#	on login name in http_access (proxy_auth, proxy_auth_regex or
-#	external with %LOGIN used in the format tag). The browser will be
-#	challenged for authentication on the first such acl encountered
-#	in http_access processing and will also be re-challenged for new
-#	login credentials if the request is being denied by a proxy_auth
-#	type acl.
-#
-#	WARNING: authentication can't be used in a transparently intercepting
-#	proxy as the client then thinks it is talking to an origin server and
-#	not the proxy. This is a limitation of bending the TCP/IP protocol to
-#	transparently intercepting port 80, not a limitation in Squid.
-#	Ports flagged 'transparent', 'intercept', or 'tproxy' have
-#	authentication disabled.
-#
-#	=== Parameters for the basic scheme follow. ===
-#
-#	"program" cmdline
-#	Specify the command for the external authenticator.  Such a program
-#	reads a line containing "username password" and	replies with one of
-#	three results:
-#
-#	  OK
-#		the user exists.
-#
-#	  ERR
-#		the user does not exist.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	"ERR" and "BH" results may optionally be followed by message="..."
-#	containing a description available as %m in the returned error page.
-#
-#	If you use an authenticator, make sure you have 1 acl of type
-#	proxy_auth.
-#
-#	By default, the basic authentication scheme is not used unless a
-#	program is specified.
-#
-#	If you want to use the traditional NCSA proxy authentication, set
-#	this line to something like
-#
-#	auth_param basic program /usr/libexec/basic_ncsa_auth /usr/etc/passwd
-#
-#	"utf8" on|off
-#	HTTP uses iso-latin-1 as character set, while some authentication
-#	backends such as LDAP expects UTF-8. If this is set to on Squid will
-#	translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-#	username & password to the helper.
-#
-#	"children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-#	The maximum number of authenticator processes to spawn. If you start too few
-#	Squid will have to wait for them to process a backlog of credential
-#	verifications, slowing it down. When password verifications are
-#	done via a (slow) network you are likely to need lots of
-#	authenticator processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	The concurrency= option sets the number of concurrent requests the
-#	helper can process.  The default of 0 is used for helpers who only
-#	supports one request at a time. Setting this to a number greater than
-#	0 changes the protocol used to include a channel number first on the
-#	request/response line, allowing multiple requests to be sent to the
-#	same helper in parallel without waiting for the response.
-#	Must not be set unless it's known the helper supports this.
-#
-#	auth_param basic children 20 startup=0 idle=1
-#
-#	"realm" realmstring
-#	Specifies the realm name which is to be reported to the
-#	client for the basic proxy authentication scheme (part of
-#	the text the user will see when prompted their username and
-#	password). There is no default.
-#	auth_param basic realm Squid proxy-caching web server
-#
-#	"credentialsttl" timetolive
-#	Specifies how long squid assumes an externally validated
-#	username:password pair is valid for - in other words how
-#	often the helper program is called for that user. Set this
-#	low to force revalidation with short lived passwords.  Note
-#	setting this high does not impact your susceptibility
-#	to replay attacks unless you are using an one-time password
-#	system (such as SecureID).  If you are using such a system,
-#	you will be vulnerable to replay attacks unless you also
-#	use the max_user_ip ACL in an http_access rule.
-#
-#	"casesensitive" on|off
-#	Specifies if usernames are case sensitive. Most user databases are
-#	case insensitive allowing the same username to be spelled using both
-#	lower and upper case letters, but some are case sensitive. This
-#	makes a big difference for user_max_ip ACL processing and similar.
-#	auth_param basic casesensitive off
-#
-#	=== Parameters for the digest scheme follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external authenticator.  Such
-#	a program reads a line containing "username":"realm" and
-#	replies with one of three results:
-#
-#	  OK ha1="..."
-#		the user exists. The ha1= key is mandatory and
-#		contains the appropriate H(A1) value, hex encoded.
-#		See rfc 2616 for the definition of H(A1).
-#
-#	  ERR
-#		the user does not exist.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	"ERR" and "BH" results may optionally be followed by message="..."
-#	containing a description available as %m in the returned error page.
-#
-#	By default, the digest authentication scheme is not used unless a
-#	program is specified.
-#
-#	If you want to use a digest authenticator, set this line to
-#	something like
-#
-#	auth_param digest program /usr/bin/digest_pw_auth /usr/etc/digpass
-#
-#	"utf8" on|off
-#	HTTP uses iso-latin-1 as character set, while some authentication
-#	backends such as LDAP expects UTF-8. If this is set to on Squid will
-#	translate the HTTP iso-latin-1 charset to UTF-8 before sending the
-#	username & password to the helper.
-#
-#	"children" numberofchildren [startup=N] [idle=N] [concurrency=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of H(A1) calculations, slowing it down.
-#	When the H(A1) calculations are done via a (slow) network
-#	you are likely to need lots of authenticator processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	The concurrency= option sets the number of concurrent requests the
-#	helper can process.  The default of 0 is used for helpers who only
-#	supports one request at a time. Setting this to a number greater than
-#	0 changes the protocol used to include a channel number first on the
-#	request/response line, allowing multiple requests to be sent to the
-#	same helper in parallel without waiting for the response.
-#	Must not be set unless it's known the helper supports this.
-#
-#	auth_param digest children 20 startup=0 idle=1
-#
-#	"realm" realmstring
-#	Specifies the realm name which is to be reported to the
-#	client for the digest proxy authentication scheme (part of
-#	the text the user will see when prompted their username and
-#	password). There is no default.
-#	auth_param digest realm Squid proxy-caching web server
-#
-#	"nonce_garbage_interval" timeinterval
-#	Specifies the interval that nonces that have been issued
-#	to client_agent's are checked for validity.
-#
-#	"nonce_max_duration" timeinterval
-#	Specifies the maximum length of time a given nonce will be
-#	valid for.
-#
-#	"nonce_max_count" number
-#	Specifies the maximum number of times a given nonce can be
-#	used.
-#
-#	"nonce_strictness" on|off
-#	Determines if squid requires strict increment-by-1 behavior
-#	for nonce counts, or just incrementing (off - for use when
-#	user agents generate nonce counts that occasionally miss 1
-#	(ie, 1,2,4,6)). Default off.
-#
-#	"check_nonce_count" on|off
-#	This directive if set to off can disable the nonce count check
-#	completely to work around buggy digest qop implementations in
-#	certain mainstream browser versions. Default on to check the
-#	nonce count to protect from authentication replay attacks.
-#
-#	"post_workaround" on|off
-#	This is a workaround to certain buggy browsers who sends
-#	an incorrect request digest in POST requests when reusing
-#	the same nonce as acquired earlier on a GET request.
-#
-#	=== NTLM scheme options follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external NTLM authenticator.
-#	Such a program reads exchanged NTLMSSP packets with
-#	the browser via Squid until authentication is completed.
-#	If you use an NTLM authenticator, make sure you have 1 acl
-#	of type proxy_auth.  By default, the NTLM authenticator program
-#	is not used.
-#
-#	auth_param ntlm program /usr/bin/ntlm_auth
-#
-#	"children" numberofchildren [startup=N] [idle=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of credential verifications, slowing it
-#	down. When credential verifications are done via a (slow)
-#	network you are likely to need lots of authenticator
-#	processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	auth_param ntlm children 20 startup=0 idle=1
-#
-#	"keep_alive" on|off
-#	If you experience problems with PUT/POST requests when using the
-#	Negotiate authentication scheme then you can try setting this to
-#	off. This will cause Squid to forcibly close the connection on
-#	the initial requests where the browser asks which schemes are
-#	supported by the proxy.
-#
-#	auth_param ntlm keep_alive on
-#
-#	=== Options for configuring the NEGOTIATE auth-scheme follow ===
-#
-#	"program" cmdline
-#	Specify the command for the external Negotiate authenticator.
-#	This protocol is used in Microsoft Active-Directory enabled setups with
-#	the Microsoft Internet Explorer or Mozilla Firefox browsers.
-#	Its main purpose is to exchange credentials with the Squid proxy
-#	using the Kerberos mechanisms.
-#	If you use a Negotiate authenticator, make sure you have at least
-#	one acl of type proxy_auth active. By default, the negotiate
-#	authenticator program is not used.
-#	The only supported program for this role is the ntlm_auth
-#	program distributed as part of Samba, version 4 or later.
-#
-#	auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego
-#
-#	"children" numberofchildren [startup=N] [idle=N]
-#	The maximum number of authenticator processes to spawn (default 5).
-#	If you start too few Squid will have to wait for them to
-#	process a backlog of credential verifications, slowing it
-#	down. When credential verifications are done via a (slow)
-#	network you are likely to need lots of authenticator
-#	processes.
-#
-#	The startup= and idle= options permit some skew in the exact amount
-#	run. A minimum of startup=N will begin during startup and reconfigure.
-#	Squid will start more in groups of up to idle=N in an attempt to meet
-#	traffic needs and to keep idle=N free above those traffic needs up to
-#	the maximum.
-#
-#	auth_param negotiate children 20 startup=0 idle=1
-#
-#	"keep_alive" on|off
-#	If you experience problems with PUT/POST requests when using the
-#	Negotiate authentication scheme then you can try setting this to
-#	off. This will cause Squid to forcibly close the connection on
-#	the initial requests where the browser asks which schemes are
-#	supported by the proxy.
-#
-#	auth_param negotiate keep_alive on
-#
-#	
-#	Examples:
-#
-##Recommended minimum configuration per scheme:
-##auth_param negotiate program <uncomment and complete this line to activate>
-##auth_param negotiate children 20 startup=0 idle=1
-##auth_param negotiate keep_alive on
-##
-##auth_param ntlm program <uncomment and complete this line to activate>
-##auth_param ntlm children 20 startup=0 idle=1
-##auth_param ntlm keep_alive on
-##
-##auth_param digest program <uncomment and complete this line>
-##auth_param digest children 20 startup=0 idle=1
-##auth_param digest realm Squid proxy-caching web server
-##auth_param digest nonce_garbage_interval 5 minutes
-##auth_param digest nonce_max_duration 30 minutes
-##auth_param digest nonce_max_count 50
-##
-##auth_param basic program <uncomment and complete this line>
-##auth_param basic children 5 startup=5 idle=1
-##auth_param basic realm Squid proxy-caching web server
-##auth_param basic credentialsttl 2 hours
-#Default:
-# none
-
-#  TAG: authenticate_cache_garbage_interval
-#	The time period between garbage collection across the username cache.
-#	This is a trade-off between memory utilization (long intervals - say
-#	2 days) and CPU (short intervals - say 1 minute). Only change if you
-#	have good reason to.
-#Default:
-# authenticate_cache_garbage_interval 1 hour
-
-#  TAG: authenticate_ttl
-#	The time a user & their credentials stay in the logged in
-#	user cache since their last request. When the garbage
-#	interval passes, all user credentials that have passed their
-#	TTL are removed from memory.
-#Default:
-# authenticate_ttl 1 hour
-
-#  TAG: authenticate_ip_ttl
-#	If you use proxy authentication and the 'max_user_ip' ACL,
-#	this directive controls how long Squid remembers the IP
-#	addresses associated with each user.  Use a small value
-#	(e.g., 60 seconds) if your users might change addresses
-#	quickly, as is the case with dialup.   You might be safe
-#	using a larger value (e.g., 2 hours) in a corporate LAN
-#	environment with relatively static address assignments.
-#Default:
-# authenticate_ip_ttl 1 second
-
-# ACCESS CONTROLS
-# -----------------------------------------------------------------------------
-
-#  TAG: external_acl_type
-#	This option defines external acl classes using a helper program
-#	to look up the status
-#
-#	  external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..]
-#
-#	Options:
-#
-#	  ttl=n		TTL in seconds for cached results (defaults to 3600
-#	  		for 1 hour)
-#
-#	  negative_ttl=n
-#	  		TTL for cached negative lookups (default same
-#	  		as ttl)
-#
-#	  grace=n	Percentage remaining of TTL where a refresh of a
-#			cached entry should be initiated without needing to
-#			wait for a new reply. (default is for no grace period)
-#
-#	  cache=n	Limit the result cache size, default is 262144.
-#			The expanded FORMAT value is used as the cache key, so
-#			if the details in FORMAT are highly variable a larger
-#			cache may be needed to produce reduction in helper load.
-#
-#	  children-max=n
-#			Maximum number of acl helper processes spawned to service
-#			external acl lookups of this type. (default 20)
-#
-#	  children-startup=n
-#			Minimum number of acl helper processes to spawn during
-#			startup and reconfigure to service external acl lookups
-#			of this type. (default 0)
-#
-#	  children-idle=n
-#			Number of acl helper processes to keep ahead of traffic
-#			loads. Squid will spawn this many at once whenever load
-#			rises above the capabilities of existing processes.
-#			Up to the value of children-max. (default 1)
-#
-#	  concurrency=n	concurrency level per process. Only used with helpers
-#			capable of processing more than one query at a time.
-#
-#	  protocol=2.5	Compatibility mode for Squid-2.5 external acl helpers.
-#
-#	  ipv4 / ipv6	IP protocol used to communicate with this helper.
-#			The default is to auto-detect IPv6 and use it when available.
-#
-#
-#	FORMAT specifications
-#
-#	  %LOGIN	Authenticated user login name
-#	  %EXT_USER	Username from previous external acl
-#	  %EXT_LOG	Log details from previous external acl
-#	  %EXT_TAG	Tag from previous external acl
-#	  %IDENT	Ident user name
-#	  %SRC		Client IP
-#	  %SRCPORT	Client source port
-#	  %URI		Requested URI
-#	  %DST		Requested host
-#	  %PROTO	Requested protocol
-#	  %PORT		Requested port
-#	  %PATH		Requested URL path
-#	  %METHOD	Request method
-#	  %MYADDR	Squid interface address
-#	  %MYPORT	Squid http_port number
-#	  %PATH		Requested URL-path (including query-string if any)
-#	  %USER_CERT	SSL User certificate in PEM format
-#	  %USER_CERTCHAIN SSL User certificate chain in PEM format
-#	  %USER_CERT_xx	SSL User certificate subject attribute xx
-#	  %USER_CA_CERT_xx SSL User certificate issuer attribute xx
-#
-#	  %>{Header}	HTTP request header "Header"
-#	  %>{Hdr:member}
-#	  		HTTP request header "Hdr" list member "member"
-#	  %>{Hdr:;member}
-#	  		HTTP request header list member using ; as
-#	  		list separator. ; can be any non-alphanumeric
-#			character.
-#
-#	  %<{Header}	HTTP reply header "Header"
-#	  %<{Hdr:member}
-#	  		HTTP reply header "Hdr" list member "member"
-#	  %<{Hdr:;member}
-#	  		HTTP reply header list member using ; as
-#	  		list separator. ; can be any non-alphanumeric
-#			character.
-#
-#	  %ACL		The name of the ACL being tested.
-#	  %DATA		The ACL arguments. If not used then any arguments
-#			is automatically added at the end of the line
-#			sent to the helper.
-#			NOTE: this will encode the arguments as one token,
-#			whereas the default will pass each separately.
-#
-#	  %%		The percent sign. Useful for helpers which need
-#			an unchanging input format.
-#
-#
-#	General request syntax:
-#
-#	  [channel-ID] FORMAT-values [acl-values ...]
-#
-#
-#	FORMAT-values consists of transaction details expanded with
-#	whitespace separation per the config file FORMAT specification
-#	using the FORMAT macros listed above.
-#
-#	acl-values consists of any string specified in the referencing
-#	config 'acl ... external' line. see the "acl external" directive.
-#
-#	Request values sent to the helper are URL escaped to protect
-#	each value in requests against whitespaces.
-#
-#	If using protocol=2.5 then the request sent to the helper is not
-#	URL escaped to protect against whitespace.
-#
-#	NOTE: protocol=3.0 is deprecated as no longer necessary.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#
-#	The helper receives lines expanded per the above format specification
-#	and for each input line returns 1 line starting with OK/ERR/BH result
-#	code and optionally followed by additional keywords with more details.
-#
-#
-#	General result syntax:
-#
-#	  [channel-ID] result keyword=value ...
-#
-#	Result consists of one of the codes:
-#
-#	  OK
-#		the ACL test produced a match.
-#
-#	  ERR
-#		the ACL test does not produce a match.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified.
-#
-#	The meaning of 'a match' is determined by your squid.conf
-#	access control configuration. See the Squid wiki for details.
-#
-#	Defined keywords:
-#
-#	  user=		The users name (login)
-#
-#	  password=	The users password (for login= cache_peer option)
-#
-#	  message=	Message describing the reason for this response.
-#			Available as %o in error pages.
-#			Useful on (ERR and BH results).
-#
-#	  tag=		Apply a tag to a request. Only sets a tag once,
-#			does not alter existing tags.
-#
-#	  log=		String to be logged in access.log. Available as
-#	  		%ea in logformat specifications.
-#
-#	Any keywords may be sent on any response whether OK, ERR or BH.
-#
-#	All response keyword values need to be a single token with URL
-#	escaping, or enclosed in double quotes (") and escaped using \ on
-#	any double quotes or \ characters within the value. The wrapping
-#	double quotes are removed before the value is interpreted by Squid.
-#	\r and \n are also replace by CR and LF.
-#
-#	Some example key values:
-#
-#		user=John%20Smith
-#		user="John Smith"
-#		user="J. \"Bob\" Smith"
-#Default:
-# none
-
-#  TAG: acl
-#	Defining an Access List
-#
-#	Every access list definition must begin with an aclname and acltype, 
-#	followed by either type-specific arguments or a quoted filename that
-#	they are read from.
-#
-#	   acl aclname acltype argument ...
-#	   acl aclname acltype "file" ...
-#
-#	When using "file", the file should contain one item per line.
-#
-#	Some acl types supports options which changes their default behaviour.
-#	The available options are:
-#
-#	-i,+i	By default, regular expressions are CASE-SENSITIVE. To make them
-#		case-insensitive, use the -i option. To return case-sensitive
-#		use the +i option between patterns, or make a new ACL line
-#		without -i.	
-#
-#	-n	Disable lookups and address type conversions.  If lookup or
-#		conversion is required because the parameter type (IP or
-#		domain name) does not match the message address type (domain
-#		name or IP), then the ACL would immediately declare a mismatch
-#		without any warnings or lookups.
-#
-#	--	Used to stop processing all options, in the case the first acl
-#		value has '-' character as first character (for example the '-'
-#		is a valid domain name)
-#
-#	Some acl types require suspending the current request in order
-#	to access some external data source.
-#	Those which do are marked with the tag [slow], those which
-#	don't are marked as [fast].
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl
-#	for further information
-#
-#	***** ACL TYPES AVAILABLE *****
-#
-#	acl aclname src ip-address/mask ...	# clients IP address [fast]
-#	acl aclname src addr1-addr2/mask ...	# range of addresses [fast]
-#	acl aclname dst [-n] ip-address/mask ...	# URL host's IP address [slow]
-#	acl aclname localip ip-address/mask ... # IP address the client connected to [fast]
-#
-#	acl aclname arp      mac-address ... (xx:xx:xx:xx:xx:xx notation)
-#	  # The arp ACL requires the special configure option --enable-arp-acl.
-#	  # Furthermore, the ARP ACL code is not portable to all operating systems.
-#	  # It works on Linux, Solaris, Windows, FreeBSD, and some
-#	  # other *BSD variants.
-#	  # [fast]
-#	  #
-#	  # NOTE: Squid can only determine the MAC address for clients that are on
-#	  # the same subnet. If the client is on a different subnet,
-#	  # then Squid cannot find out its MAC address.
-#
-#	acl aclname srcdomain   .foo.com ...
-#	  # reverse lookup, from client IP [slow]
-#	acl aclname dstdomain [-n] .foo.com ...
-#	  # Destination server from URL [fast]
-#	acl aclname srcdom_regex [-i] \.foo\.com ...
-#	  # regex matching client name [slow]
-#	acl aclname dstdom_regex [-n] [-i] \.foo\.com ...
-#	  # regex matching server [fast]
-#	  #
-#	  # For dstdomain and dstdom_regex a reverse lookup is tried if a IP
-#	  # based URL is used and no match is found. The name "none" is used
-#	  # if the reverse lookup fails.
-#
-#	acl aclname src_as number ...
-#	acl aclname dst_as number ...
-#	  # [fast]
-#	  # Except for access control, AS numbers can be used for
-#	  # routing of requests to specific caches. Here's an
-#	  # example for routing all requests for AS#1241 and only
-#	  # those to mycache.mydomain.net:
-#	  # acl asexample dst_as 1241
-#	  # cache_peer_access mycache.mydomain.net allow asexample
-#	  # cache_peer_access mycache_mydomain.net deny all
-#
-#	acl aclname peername myPeer ...
-#	  # [fast]
-#	  # match against a named cache_peer entry
-#	  # set unique name= on cache_peer lines for reliable use.
-#
-#	acl aclname time [day-abbrevs] [h1:m1-h2:m2]
-#	  # [fast]
-#	  #  day-abbrevs:
-#	  #	S - Sunday
-#	  #	M - Monday
-#	  #	T - Tuesday
-#	  #	W - Wednesday
-#	  #	H - Thursday
-#	  #	F - Friday
-#	  #	A - Saturday
-#	  #  h1:m1 must be less than h2:m2
-#
-#	acl aclname url_regex [-i] ^http:// ...
-#	  # regex matching on whole URL [fast]
-#	acl aclname urllogin [-i] [^a-zA-Z0-9] ...
-#	  # regex matching on URL login field
-#	acl aclname urlpath_regex [-i] \.gif$ ...
-#	  # regex matching on URL path [fast]
-#
-#	acl aclname port 80 70 21 0-1024...   # destination TCP port [fast]
-#	                                      # ranges are alloed
-#	acl aclname localport 3128 ...	      # TCP port the client connected to [fast]
-#	                                      # NP: for interception mode this is usually '80'
-#
-#	acl aclname myportname 3128 ...       # http(s)_port name [fast]
-#
-#	acl aclname proto HTTP FTP ...        # request protocol [fast]
-# 
-#	acl aclname method GET POST ...       # HTTP request method [fast]
-#
-#	acl aclname http_status 200 301 500- 400-403 ... 
-#	  # status code in reply [fast]
-#
-#	acl aclname browser [-i] regexp ...
-#	  # pattern match on User-Agent header (see also req_header below) [fast]
-#
-#	acl aclname referer_regex [-i] regexp ...
-#	  # pattern match on Referer header [fast]
-#	  # Referer is highly unreliable, so use with care
-#
-#	acl aclname ident username ...
-#	acl aclname ident_regex [-i] pattern ...
-#	  # string match on ident output [slow]
-#	  # use REQUIRED to accept any non-null ident.
-#
-#	acl aclname proxy_auth [-i] username ...
-#	acl aclname proxy_auth_regex [-i] pattern ...
-#	  # perform http authentication challenge to the client and match against
-#	  # supplied credentials [slow]
-#	  #
-#	  # takes a list of allowed usernames.
-#	  # use REQUIRED to accept any valid username.
-#	  #
-#	  # Will use proxy authentication in forward-proxy scenarios, and plain
-#	  # http authenticaiton in reverse-proxy scenarios
-#	  #
-#	  # NOTE: when a Proxy-Authentication header is sent but it is not
-#	  # needed during ACL checking the username is NOT logged
-#	  # in access.log.
-#	  #
-#	  # NOTE: proxy_auth requires a EXTERNAL authentication program
-#	  # to check username/password combinations (see
-#	  # auth_param directive).
-#	  #
-#	  # NOTE: proxy_auth can't be used in a transparent/intercepting proxy
-#	  # as the browser needs to be configured for using a proxy in order
-#	  # to respond to proxy authentication.
-#
-#	acl aclname snmp_community string ...
-#	  # A community string to limit access to your SNMP Agent [fast]
-#	  # Example:
-#	  #
-#	  #	acl snmppublic snmp_community public
-#
-#	acl aclname maxconn number
-#	  # This will be matched when the client's IP address has
-#	  # more than <number> TCP connections established. [fast]
-#	  # NOTE: This only measures direct TCP links so X-Forwarded-For
-#	  # indirect clients are not counted.
-#
-#	acl aclname max_user_ip [-s] number
-#	  # This will be matched when the user attempts to log in from more
-#	  # than <number> different ip addresses. The authenticate_ip_ttl
-#	  # parameter controls the timeout on the ip entries. [fast]
-#	  # If -s is specified the limit is strict, denying browsing
-#	  # from any further IP addresses until the ttl has expired. Without
-#	  # -s Squid will just annoy the user by "randomly" denying requests.
-#	  # (the counter is reset each time the limit is reached and a
-#	  # request is denied)
-#	  # NOTE: in acceleration mode or where there is mesh of child proxies,
-#	  # clients may appear to come from multiple addresses if they are
-#	  # going through proxy farms, so a limit of 1 may cause user problems.
-#
-#	acl aclname random probability
-#	  # Pseudo-randomly match requests. Based on the probability given.
-#	  # Probability may be written as a decimal (0.333), fraction (1/3)
-#	  # or ratio of matches:non-matches (3:5).
-#
-#	acl aclname req_mime_type [-i] mime-type ...
-#	  # regex match against the mime type of the request generated
-#	  # by the client. Can be used to detect file upload or some
-#	  # types HTTP tunneling requests [fast]
-#	  # NOTE: This does NOT match the reply. You cannot use this
-#	  # to match the returned file type.
-#
-#	acl aclname req_header header-name [-i] any\.regex\.here
-#	  # regex match against any of the known request headers.  May be
-#	  # thought of as a superset of "browser", "referer" and "mime-type"
-#	  # ACL [fast]
-#
-#	acl aclname rep_mime_type [-i] mime-type ...
-#	  # regex match against the mime type of the reply received by
-#	  # squid. Can be used to detect file download or some
-#	  # types HTTP tunneling requests. [fast]
-#	  # NOTE: This has no effect in http_access rules. It only has
-#	  # effect in rules that affect the reply data stream such as
-#	  # http_reply_access.
-#
-#	acl aclname rep_header header-name [-i] any\.regex\.here
-#	  # regex match against any of the known reply headers. May be
-#	  # thought of as a superset of "browser", "referer" and "mime-type"
-#	  # ACLs [fast]
-#
-#	acl aclname external class_name [arguments...]
-#	  # external ACL lookup via a helper class defined by the
-#	  # external_acl_type directive [slow]
-#
-#	acl aclname user_cert attribute values...
-#	  # match against attributes in a user SSL certificate
-#	  # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-#	acl aclname ca_cert attribute values...
-#	  # match against attributes a users issuing CA SSL certificate
-#	  # attribute is one of DN/C/O/CN/L/ST [fast]
-#
-#	acl aclname ext_user username ...
-#	acl aclname ext_user_regex [-i] pattern ...
-#	  # string match on username returned by external acl helper [slow]
-#	  # use REQUIRED to accept any non-null user name.
-#
-#	acl aclname tag tagvalue ...
-#	  # string match on tag returned by external acl helper [slow]
-#
-#	acl aclname hier_code codename ...
-#	  # string match against squid hierarchy code(s); [fast]
-#	  #  e.g., DIRECT, PARENT_HIT, NONE, etc.
-#	  #
-#	  # NOTE: This has no effect in http_access rules. It only has
-#	  # effect in rules that affect the reply data stream such as
-#	  # http_reply_access.
-#
-#	acl aclname note name [value ...]
-#	  # match transaction annotation [fast]
-#	  # Without values, matches any annotation with a given name.
-#	  # With value(s), matches any annotation with a given name that
-#	  # also has one of the given values.
-#	  # Names and values are compared using a string equality test.
-#	  # Annotation sources include note and adaptation_meta directives
-#	  # as well as helper and eCAP responses.
-#
-#	acl aclname any-of acl1 acl2 ...
-#	  # match any one of the acls [fast or slow]
-#	  # The first matching ACL stops further ACL evaluation.
-#	  #
-#	  # ACLs from multiple any-of lines with the same name are ORed.
-#	  # For example, A = (a1 or a2) or (a3 or a4) can be written as
-#	  #   acl A any-of a1 a2
-#	  #   acl A any-of a3 a4
-#	  #
-#	  # This group ACL is fast if all evaluated ACLs in the group are fast
-#	  # and slow otherwise.
-#
-#	acl aclname all-of acl1 acl2 ... 
-#	  # match all of the acls [fast or slow]
-#	  # The first mismatching ACL stops further ACL evaluation.
-#	  #
-#	  # ACLs from multiple all-of lines with the same name are ORed.
-#	  # For example, B = (b1 and b2) or (b3 and b4) can be written as
-#	  #   acl B all-of b1 b2
-#	  #   acl B all-of b3 b4
-#	  #
-#	  # This group ACL is fast if all evaluated ACLs in the group are fast
-#	  # and slow otherwise.
-#
-#	Examples:
-#		acl macaddress arp 09:00:2b:23:45:67
-#		acl myexample dst_as 1241
-#		acl password proxy_auth REQUIRED
-#		acl fileupload req_mime_type -i ^multipart/form-data$
-#		acl javascript rep_mime_type -i ^application/x-javascript$
-#
-#Default:
-# ACLs all, manager, localhost, and to_localhost are predefined.
-#
-#
-# Recommended minimum configuration:
-#
-
-# Example rule allowing access from your local networks.
-# Adapt to list your (internal) IP networks from where browsing
-# should be allowed
-acl localnet src 10.0.0.0/8	# RFC1918 possible internal network
-acl localnet src 172.16.0.0/12	# RFC1918 possible internal network
-acl localnet src 192.168.0.0/16	# RFC1918 possible internal network
-acl localnet src fc00::/7       # RFC 4193 local private network range
-acl localnet src fe80::/10      # RFC 4291 link-local (directly plugged) machines
-
-acl SSL_ports port 443
-acl Safe_ports port 80		# http
-acl Safe_ports port 21		# ftp
-acl Safe_ports port 443		# https
-acl Safe_ports port 70		# gopher
-acl Safe_ports port 210		# wais
-acl Safe_ports port 1025-65535	# unregistered ports
-acl Safe_ports port 280		# http-mgmt
-acl Safe_ports port 488		# gss-http
-acl Safe_ports port 591		# filemaker
-acl Safe_ports port 777		# multiling http
-acl CONNECT method CONNECT
-
-#  TAG: follow_x_forwarded_for
-#	Allowing or Denying the X-Forwarded-For header to be followed to
-#	find the original source of a request.
-#
-#	Requests may pass through a chain of several other proxies
-#	before reaching us.  The X-Forwarded-For header will contain a
-#	comma-separated list of the IP addresses in the chain, with the
-#	rightmost address being the most recent.
-#
-#	If a request reaches us from a source that is allowed by this
-#	configuration item, then we consult the X-Forwarded-For header
-#	to see where that host received the request from.  If the
-#	X-Forwarded-For header contains multiple addresses, we continue
-#	backtracking until we reach an address for which we are not allowed
-#	to follow the X-Forwarded-For header, or until we reach the first
-#	address in the list. For the purpose of ACL used in the
-#	follow_x_forwarded_for directive the src ACL type always matches
-#	the address we are testing and srcdomain matches its rDNS.
-#
-#	The end result of this process is an IP address that we will
-#	refer to as the indirect client address.  This address may
-#	be treated as the client address for access control, ICAP, delay
-#	pools and logging, depending on the acl_uses_indirect_client,
-#	icap_uses_indirect_client, delay_pool_uses_indirect_client, 
-#	log_uses_indirect_client and tproxy_uses_indirect_client options.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	SECURITY CONSIDERATIONS:
-#
-#		Any host for which we follow the X-Forwarded-For header
-#		can place incorrect information in the header, and Squid
-#		will use the incorrect information as if it were the
-#		source address of the request.  This may enable remote
-#		hosts to bypass any access control restrictions that are
-#		based on the client's source addresses.
-#
-#	For example:
-#
-#		acl localhost src 127.0.0.1
-#		acl my_other_proxy srcdomain .proxy.example.com
-#		follow_x_forwarded_for allow localhost
-#		follow_x_forwarded_for allow my_other_proxy
-#Default:
-# X-Forwarded-For header will be ignored.
-
-#  TAG: acl_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in acl matching.
-#
-#	NOTE: maxconn ACL considers direct TCP links and indirect
-#	      clients will always have zero. So no match.
-#Default:
-# acl_uses_indirect_client on
-
-#  TAG: delay_pool_uses_indirect_client	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-follow-x-forwarded-for and --enable-delay-pools
-#
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in delay pools.
-#Default:
-# delay_pool_uses_indirect_client on
-
-#  TAG: log_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address in the access log.
-#Default:
-# log_uses_indirect_client on
-
-#  TAG: tproxy_uses_indirect_client	on|off
-#	Controls whether the indirect client address
-#	(see follow_x_forwarded_for) is used instead of the
-#	direct client address when spoofing the outgoing client.
-#
-#	This has no effect on requests arriving in non-tproxy
-#	mode ports.
-#
-#	SECURITY WARNING: Usage of this option is dangerous
-#	and should not be used trivially. Correct configuration
-#	of follow_x_forewarded_for with a limited set of trusted
-#	sources is required to prevent abuse of your proxy.
-#Default:
-# tproxy_uses_indirect_client off
-
-#  TAG: spoof_client_ip
-#	Control client IP address spoofing of TPROXY traffic based on
-#	defined access lists.
-#
-#	spoof_client_ip allow|deny [!]aclname ...
-#
-#	If there are no "spoof_client_ip" lines present, the default
-#	is to "allow" spoofing of any suitable request.
-#
-#	Note that the cache_peer "no-tproxy" option overrides this ACL.
-#
-#	This clause supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow spoofing on all TPROXY traffic.
-
-#  TAG: http_access
-#	Allowing or Denying access based on defined access lists
-#
-#	Access to the HTTP port:
-#	http_access allow|deny [!]aclname ...
-#
-#	NOTE on default values:
-#
-#	If there are no "access" lines present, the default is to deny
-#	the request.
-#
-#	If none of the "access" lines cause a match, the default is the
-#	opposite of the last line in the list.  If the last line was
-#	deny, the default is allow.  Conversely, if the last line
-#	is allow, the default will be deny.  For these reasons, it is a
-#	good idea to have an "deny all" entry at the end of your access
-#	lists to avoid potential confusion.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Default:
-# Deny, unless rules exist in squid.conf.
-#
-
-#
-# Recommended minimum Access Permission configuration:
-#
-# Deny requests to certain unsafe ports
-http_access deny !Safe_ports
-
-# Deny CONNECT to other than secure SSL ports
-http_access deny CONNECT !SSL_ports
-
-# Only allow cachemgr access from localhost
-http_access allow localhost manager
-http_access deny manager
-
-# We strongly recommend the following be uncommented to protect innocent
-# web applications running on the proxy server who think the only
-# one who can access services on "localhost" is a local user
-#http_access deny to_localhost
-
-#
-# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-#
-
-# Example rule allowing access from your local networks.
-# Adapt localnet in the ACL section to list your (internal) IP networks
-# from where browsing should be allowed
-http_access allow localnet
-http_access allow localhost
-
-# And finally deny all other access to this proxy
-http_access deny all
-
-#  TAG: adapted_http_access
-#	Allowing or Denying access based on defined access lists
-#
-#	Essentially identical to http_access, but runs after redirectors
-#	and ICAP/eCAP adaptation. Allowing access control based on their
-#	output.
-#
-#	If not set then only http_access is used.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: http_reply_access
-#	Allow replies to client requests. This is complementary to http_access.
-#
-#	http_reply_access allow|deny [!] aclname ...
-#
-#	NOTE: if there are no access lines present, the default is to allow
-#	all replies.
-#
-#	If none of the access lines cause a match the opposite of the
-#	last line will apply. Thus it is good practice to end the rules
-#	with an "allow all" or "deny all" entry.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: icp_access
-#	Allowing or Denying access to the ICP port based on defined
-#	access lists
-#
-#	icp_access  allow|deny [!]aclname ...
-#
-#	NOTE: The default if no icp_access lines are present is to
-#	deny all traffic. This default may cause problems with peers
-#	using ICP.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow ICP queries from local networks only
-##icp_access allow localnet
-##icp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: htcp_access
-#	Allowing or Denying access to the HTCP port based on defined
-#	access lists
-#
-#	htcp_access  allow|deny [!]aclname ...
-#
-#	See also htcp_clr_access for details on access control for
-#	cache purge (CLR) HTCP messages.
-#
-#	NOTE: The default if no htcp_access lines are present is to
-#	deny all traffic. This default may cause problems with peers
-#	using the htcp option.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP queries from local networks only
-##htcp_access allow localnet
-##htcp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: htcp_clr_access
-#	Allowing or Denying access to purge content using HTCP based
-#	on defined access lists.
-#	See htcp_access for details on general HTCP access control.
-#
-#	htcp_clr_access  allow|deny [!]aclname ...
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-## Allow HTCP CLR requests from trusted peers
-#acl htcp_clr_peer src 192.0.2.2 2001:DB8::2
-#htcp_clr_access allow htcp_clr_peer
-#htcp_clr_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: miss_access
-#	Determins whether network access is permitted when satisfying a request.
-#
-#	For example;
-#	    to force your neighbors to use you as a sibling instead of
-#	    a parent.
-#
-#		acl localclients src 192.0.2.0/24 2001:DB8::a:0/64
-#		miss_access deny  !localclients
-#		miss_access allow all
-#
-#	This means only your local clients are allowed to fetch relayed/MISS
-#	replies from the network and all other clients can only fetch cached
-#	objects (HITs).
-#
-#	The default for this setting allows all clients who passed the
-#	http_access rules to relay via this proxy.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: ident_lookup_access
-#	A list of ACL elements which, if matched, cause an ident
-#	(RFC 931) lookup to be performed for this request.  For
-#	example, you might choose to always perform ident lookups
-#	for your main multi-user Unix boxes, but not for your Macs
-#	and PCs.  By default, ident lookups are not performed for
-#	any requests.
-#
-#	To enable ident lookups for specific client addresses, you
-#	can follow this example:
-#
-#	acl ident_aware_hosts src 198.168.1.0/24
-#	ident_lookup_access allow ident_aware_hosts
-#	ident_lookup_access deny all
-#
-#	Only src type ACL checks are fully supported.  A srcdomain
-#	ACL might work at times, but it will not always provide
-#	the correct result.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Unless rules exist in squid.conf, IDENT is not fetched.
-
-#  TAG: reply_body_max_size	size [acl acl...]
-#	This option specifies the maximum size of a reply body. It can be
-#	used to prevent users from downloading very large files, such as
-#	MP3's and movies. When the reply headers are received, the
-#	reply_body_max_size lines are processed, and the first line where
-#	all (if any) listed ACLs are true is used as the maximum body size
-#	for this reply.
-#
-#	This size is checked twice. First when we get the reply headers,
-#	we check the content-length value.  If the content length value exists
-#	and is larger than the allowed size, the request is denied and the
-#	user receives an error message that says "the request or reply
-#	is too large." If there is no content-length, and the reply
-#	size exceeds this limit, the client's connection is just closed
-#	and they will receive a partial reply.
-#
-#	WARNING: downstream caches probably can not detect a partial reply
-#	if there is no content-length header, so they will cache
-#	partial responses and give them out as hits.  You should NOT
-#	use this option if you have downstream caches.
-#
-#	WARNING: A maximum size smaller than the size of squid's error messages
-#	will cause an infinite loop and crash squid. Ensure that the smallest
-#	non-zero value you use is greater that the maximum header size plus
-#	the size of your largest error page.
-#
-#	If you set this parameter none (the default), there will be
-#	no limit imposed.
-#
-#	Configuration Format is:
-#		reply_body_max_size SIZE UNITS [acl ...]
-#	ie.
-#		reply_body_max_size 10 MB
-#
-#Default:
-# No limit is applied.
-
-# NETWORK OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: http_port
-#	Usage:	port [mode] [options]
-#		hostname:port [mode] [options]
-#		1.2.3.4:port [mode] [options]
-#
-#	The socket addresses where Squid will listen for HTTP client
-#	requests.  You may specify multiple socket addresses.
-#	There are three forms: port alone, hostname with port, and
-#	IP address with port.  If you specify a hostname or IP
-#	address, Squid binds the socket to that specific
-#	address. Most likely, you do not need to bind to a specific
-#	address, so you can use the port number alone.
-#
-#	If you are running Squid in accelerator mode, you
-#	probably want to listen on port 80 also, or instead.
-#
-#	The -a command line option may be used to specify additional
-#	port(s) where Squid listens for proxy request. Such ports will
-#	be plain proxy ports with no options.
-#
-#	You may specify multiple socket addresses on multiple lines.
-#
-#	Modes:
-#
-#	   intercept	Support for IP-Layer interception of
-#			outgoing requests without browser settings.
-#			NP: disables authentication and IPv6 on the port.
-#
-#	   tproxy	Support Linux TPROXY for spoofing outgoing
-#			connections using the client IP address.
-#			NP: disables authentication and maybe IPv6 on the port.
-#
-#	   accel	Accelerator / reverse proxy mode
-#
-#	   ssl-bump	For each CONNECT request allowed by ssl_bump ACLs,
-#			establish secure connection with the client and with
-#			the server, decrypt HTTPS messages as they pass through
-#			Squid, and treat them as unencrypted HTTP messages,
-#			becoming the man-in-the-middle.
-#
-#			The ssl_bump option is required to fully enable
-#			bumping of CONNECT requests.
-#
-#	Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-#	Accelerator Mode Options:
-#
-#	   defaultsite=domainname
-#			What to use for the Host: header if it is not present
-#			in a request. Determines what site (not origin server)
-#			accelerators should consider the default.
-#
-#	   no-vhost	Disable using HTTP/1.1 Host header for virtual domain support.
-#
-#	   protocol=	Protocol to reconstruct accelerated requests with.
-#			Defaults to http for http_port and https for
-#			https_port
-#
-#	   vport	Virtual host port support. Using the http_port number
-#			instead of the port passed on Host: headers.
-#
-#	   vport=NN	Virtual host port support. Using the specified port
-#			number instead of the port passed on Host: headers.
-#
-#	   act-as-origin
-#			Act as if this Squid is the origin server.
-#			This currently means generate new Date: and Expires:
-#			headers on HIT instead of adding Age:.
-#
-#	   ignore-cc	Ignore request Cache-Control headers.
-#
-#			WARNING: This option violates HTTP specifications if
-#			used in non-accelerator setups.
-#
-#	   allow-direct	Allow direct forwarding in accelerator mode. Normally
-#			accelerated requests are denied direct forwarding as if
-#			never_direct was used.
-#
-#			WARNING: this option opens accelerator mode to security
-#			vulnerabilities usually only affecting in interception
-#			mode. Make sure to protect forwarding with suitable
-#			http_access rules when using this.
-#
-#
-#	SSL Bump Mode Options:
-#	    In addition to these options ssl-bump requires TLS/SSL options.
-#
-#	   generate-host-certificates[=<on|off>]
-#			Dynamically create SSL server certificates for the
-#			destination hosts of bumped CONNECT requests.When 
-#			enabled, the cert and key options are used to sign
-#			generated certificates. Otherwise generated
-#			certificate will be selfsigned.
-#			If there is a CA certificate lifetime of the generated 
-#			certificate equals lifetime of the CA certificate. If
-#			generated certificate is selfsigned lifetime is three 
-#			years.
-#			This option is enabled by default when ssl-bump is used.
-#			See the ssl-bump option above for more information.
-#			
-#	   dynamic_cert_mem_cache_size=SIZE
-#			Approximate total RAM size spent on cached generated
-#			certificates. If set to zero, caching is disabled. The
-#			default value is 4MB.
-#
-#	TLS / SSL Options:
-#
-#	   cert=	Path to SSL certificate (PEM format).
-#
-#	   key=		Path to SSL private key file (PEM format)
-#			if not specified, the certificate file is
-#			assumed to be a combined certificate and
-#			key file.
-#
-#	   version=	The version of SSL/TLS supported
-#			    1	automatic (default)
-#			    2	SSLv2 only
-#			    3	SSLv3 only
-#			    4	TLSv1.0 only
-#			    5	TLSv1.1 only
-#			    6	TLSv1.2 only
-#
-#	   cipher=	Colon separated list of supported ciphers.
-#			NOTE: some ciphers such as EDH ciphers depend on
-#			      additional settings. If those settings are
-#			      omitted the ciphers may be silently ignored
-#			      by the OpenSSL library.
-#
-#	   options=	Various SSL implementation options. The most important
-#			being:
-#			    NO_SSLv2    Disallow the use of SSLv2
-#			    NO_SSLv3    Disallow the use of SSLv3
-#			    NO_TLSv1    Disallow the use of TLSv1.0
-#			    NO_TLSv1_1  Disallow the use of TLSv1.1
-#			    NO_TLSv1_2  Disallow the use of TLSv1.2
-#			    SINGLE_DH_USE Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			    ALL       Enable various bug workarounds
-#				      suggested as "harmless" by OpenSSL
-#				      Be warned that this reduces SSL/TLS
-#				      strength to some attacks.
-#			See OpenSSL SSL_CTX_set_options documentation for a
-#			complete list of options.
-#
-#	   clientca=	File containing the list of CAs to use when
-#			requesting a client certificate.
-#
-#	   cafile=	File containing additional CA certificates to
-#			use when verifying client certificates. If unset
-#			clientca will be used.
-#
-#	   capath=	Directory containing additional CA certificates
-#			and CRL lists to use when verifying client certificates.
-#
-#	   crlfile=	File of additional CRL lists to use when verifying
-#			the client certificate, in addition to CRLs stored in
-#			the capath. Implies VERIFY_CRL flag below.
-#
-#	   dhparams=	File containing DH parameters for temporary/ephemeral
-#			DH key exchanges. See OpenSSL documentation for details
-#			on how to create this file.
-#			WARNING: EDH ciphers will be silently disabled if this
-#				 option is not set.
-#
-#	   sslflags=	Various flags modifying the use of SSL:
-#			    DELAYED_AUTH
-#				Don't request client certificates
-#				immediately, but wait until acl processing
-#				requires a certificate (not yet implemented).
-#			    NO_DEFAULT_CA
-#				Don't use the default CA lists built in
-#				to OpenSSL.
-#			    NO_SESSION_REUSE
-#				Don't allow for session reuse. Each connection
-#				will result in a new SSL session.
-#			    VERIFY_CRL
-#				Verify CRL lists when accepting client
-#				certificates.
-#			    VERIFY_CRL_ALL
-#				Verify CRL lists for all certificates in the
-#				client certificate chain.
-#
-#	   sslcontext=	SSL session ID context identifier.
-#
-#	Other Options:
-#
-#	   connection-auth[=on|off]
-#	                use connection-auth=off to tell Squid to prevent 
-#	                forwarding Microsoft connection oriented authentication
-#			(NTLM, Negotiate and Kerberos)
-#
-#	   disable-pmtu-discovery=
-#			Control Path-MTU discovery usage:
-#			    off		lets OS decide on what to do (default).
-#			    transparent	disable PMTU discovery when transparent
-#					support is enabled.
-#			    always	disable always PMTU discovery.
-#
-#			In many setups of transparently intercepting proxies
-#			Path-MTU discovery can not work on traffic towards the
-#			clients. This is the case when the intercepting device
-#			does not fully track connections and fails to forward
-#			ICMP must fragment messages to the cache server. If you
-#			have such setup and experience that certain clients
-#			sporadically hang or never complete requests set
-#			disable-pmtu-discovery option to 'transparent'.
-#
-#	   name=	Specifies a internal name for the port. Defaults to
-#			the port specification (port or addr:port)
-#
-#	   tcpkeepalive[=idle,interval,timeout]
-#			Enable TCP keepalive probes of idle connections.
-#			In seconds; idle is the initial time before TCP starts
-#			probing the connection, interval how often to probe, and
-#			timeout the time before giving up.
-#
-#	If you run Squid on a dual-homed machine with an internal
-#	and an external interface we recommend you to specify the
-#	internal address:port in http_port. This way Squid will only be
-#	visible on the internal address.
-#
-#
-
-# Squid normally listens to port 3128
-http_port 3128
-
-#  TAG: https_port
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Usage:  [ip:]port cert=certificate.pem [key=key.pem] [mode] [options...]
-#
-#	The socket address where Squid will listen for client requests made
-#	over TLS or SSL connections. Commonly referred to as HTTPS.
-#
-#	This is most useful for situations where you are running squid in
-#	accelerator mode and you want to do the SSL work at the accelerator level.
-#
-#	You may specify multiple socket addresses on multiple lines,
-#	each with their own SSL certificate and/or options.
-#
-#	Modes:
-#
-#	   accel	Accelerator / reverse proxy mode
-#
-#	   intercept	Support for IP-Layer interception of
-#			outgoing requests without browser settings.
-#			NP: disables authentication and IPv6 on the port.
-#
-#	   tproxy	Support Linux TPROXY for spoofing outgoing
-#			connections using the client IP address.
-#			NP: disables authentication and maybe IPv6 on the port.
-#
-#	   ssl-bump	For each intercepted connection allowed by ssl_bump
-#			ACLs, establish a secure connection with the client and with
-#			the server, decrypt HTTPS messages as they pass through
-#			Squid, and treat them as unencrypted HTTP messages,
-#			becoming the man-in-the-middle.
-#
-#			An "ssl_bump server-first" match is required to
-#			fully enable bumping of intercepted SSL	connections.
-#
-#			Requires tproxy or intercept.
-#
-#	Omitting the mode flag causes default forward proxy mode to be used.
-#
-#
-#	See http_port for a list of generic options
-#
-#
-#	SSL Options:
-#
-#	   cert=	Path to SSL certificate (PEM format).
-#
-#	   key=		Path to SSL private key file (PEM format)
-#			if not specified, the certificate file is
-#			assumed to be a combined certificate and
-#			key file.
-#
-#	   version=	The version of SSL/TLS supported
-#			    1	automatic (default)
-#			    2	SSLv2 only
-#			    3	SSLv3 only
-#			    4	TLSv1 only
-#
-#	   cipher=	Colon separated list of supported ciphers.
-#
-#	   options=	Various SSL engine options. The most important
-#			being:
-#			    NO_SSLv2  Disallow the use of SSLv2
-#			    NO_SSLv3  Disallow the use of SSLv3
-#			    NO_TLSv1  Disallow the use of TLSv1
-#			    SINGLE_DH_USE Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			See src/ssl_support.c or OpenSSL SSL_CTX_set_options
-#			documentation for a complete list of options.
-#
-#	   clientca=	File containing the list of CAs to use when
-#			requesting a client certificate.
-#
-#	   cafile=	File containing additional CA certificates to
-#			use when verifying client certificates. If unset
-#			clientca will be used.
-#
-#	   capath=	Directory containing additional CA certificates
-#			and CRL lists to use when verifying client certificates.
-#
-#	   crlfile=	File of additional CRL lists to use when verifying
-#			the client certificate, in addition to CRLs stored in
-#			the capath. Implies VERIFY_CRL flag below.
-#
-#	   dhparams=	File containing DH parameters for temporary/ephemeral
-#			DH key exchanges.
-#
-#	   sslflags=	Various flags modifying the use of SSL:
-#			    DELAYED_AUTH
-#				Don't request client certificates
-#				immediately, but wait until acl processing
-#				requires a certificate (not yet implemented).
-#			    NO_DEFAULT_CA
-#				Don't use the default CA lists built in
-#				to OpenSSL.
-#			    NO_SESSION_REUSE
-#				Don't allow for session reuse. Each connection
-#				will result in a new SSL session.
-#			    VERIFY_CRL
-#				Verify CRL lists when accepting client
-#				certificates.
-#			    VERIFY_CRL_ALL
-#				Verify CRL lists for all certificates in the
-#				client certificate chain.
-#
-#	   sslcontext=	SSL session ID context identifier.
-#
-#	   generate-host-certificates[=<on|off>]
-#			Dynamically create SSL server certificates for the
-#			destination hosts of bumped SSL requests.When
-#			enabled, the cert and key options are used to sign
-#			generated certificates. Otherwise generated
-#			certificate will be selfsigned.
-#			If there is CA certificate life time of generated
-#			certificate equals lifetime of CA certificate. If
-#			generated certificate is selfsigned lifetime is three
-#			years.
-#			This option is enabled by default when SslBump is used.
-#			See the sslBump option above for more information.
-#
-#	   dynamic_cert_mem_cache_size=SIZE
-#			Approximate total RAM size spent on cached generated
-#			certificates. If set to zero, caching is disabled. The
-#			default value is 4MB.
-#
-#	See http_port for a list of available options.
-#Default:
-# none
-
-#  TAG: tcp_outgoing_tos
-#	Allows you to select a TOS/Diffserv value for packets outgoing
-#	on the server side, based on an ACL.
-#
-#	tcp_outgoing_tos ds-field [!]aclname ...
-#
-#	Example where normal_service_net uses the TOS value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	tcp_outgoing_tos 0x00 normal_service_net
-#	tcp_outgoing_tos 0x20 good_service_net
-#
-#	TOS/DSCP values really only have local significance - so you should
-#	know what you're specifying. For more information, see RFC2474,
-#	RFC2475, and RFC3260.
-#
-#	The TOS/DSCP byte must be exactly that - a octet value  0 - 255, or
-#	"default" to use whatever default your host has. Note that in
-#	practice often only multiples of 4 is usable as the two rightmost bits
-#	have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-#	Processing proceeds in the order specified, and stops at first fully
-#	matching line.
-#Default:
-# none
-
-#  TAG: clientside_tos
-#	Allows you to select a TOS/Diffserv value for packets being transmitted
-#	on the client-side, based on an ACL.
-#
-#	clientside_tos ds-field [!]aclname ...
-#
-#	Example where normal_service_net uses the TOS value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	clientside_tos 0x00 normal_service_net
-#	clientside_tos 0x20 good_service_net
-#
-#	Note: This feature is incompatible with qos_flows. Any TOS values set here
-#	will be overwritten by TOS values in qos_flows.
-#Default:
-# none
-
-#  TAG: tcp_outgoing_mark
-# Note: This option is only available if Squid is rebuilt with the
-#       Packet MARK (Linux)
-#
-#	Allows you to apply a Netfilter mark value to outgoing packets
-#	on the server side, based on an ACL.
-#
-#	tcp_outgoing_mark mark-value [!]aclname ...
-#
-#	Example where normal_service_net uses the mark value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	tcp_outgoing_mark 0x00 normal_service_net
-#	tcp_outgoing_mark 0x20 good_service_net
-#Default:
-# none
-
-#  TAG: clientside_mark
-# Note: This option is only available if Squid is rebuilt with the
-#       Packet MARK (Linux)
-#
-#	Allows you to apply a Netfilter mark value to packets being transmitted
-#	on the client-side, based on an ACL.
-#
-#	clientside_mark mark-value [!]aclname ...
-#
-#	Example where normal_service_net uses the mark value 0x00
-#	and good_service_net uses 0x20
-#
-#	acl normal_service_net src 10.0.0.0/24
-#	acl good_service_net src 10.0.1.0/24
-#	clientside_mark 0x00 normal_service_net
-#	clientside_mark 0x20 good_service_net
-#
-#	Note: This feature is incompatible with qos_flows. Any mark values set here
-#	will be overwritten by mark values in qos_flows.
-#Default:
-# none
-
-#  TAG: qos_flows
-#	Allows you to select a TOS/DSCP value to mark outgoing
-#	connections to the client, based on where the reply was sourced.
-#	For platforms using netfilter, allows you to set a netfilter mark
-#	value instead of, or in addition to, a TOS value.
-#
-#	By default this functionality is disabled. To enable it with the default
-#	settings simply use "qos_flows mark" or "qos_flows tos". Default
-#	settings will result in the netfilter mark or TOS value being copied
-#	from the upstream connection to the client. Note that it is the connection
-#	CONNMARK value not the packet MARK value that is copied.
-#
-#	It is not currently possible to copy the mark or TOS value from the
-#	client to the upstream connection request.
-#
-#	TOS values really only have local significance - so you should
-#	know what you're specifying. For more information, see RFC2474,
-#	RFC2475, and RFC3260.
-#
-#	The TOS/DSCP byte must be exactly that - a octet value  0 - 255. Note that
-#	in practice often only multiples of 4 is usable as the two rightmost bits
-#	have been redefined for use by ECN (RFC 3168 section 23.1).
-#
-#	Mark values can be any unsigned 32-bit integer value.
-#
-#	This setting is configured by setting the following values:
-#
-#	tos|mark                Whether to set TOS or netfilter mark values
-#
-#	local-hit=0xFF		Value to mark local cache hits.
-#
-#	sibling-hit=0xFF	Value to mark hits from sibling peers.
-#
-#	parent-hit=0xFF		Value to mark hits from parent peers.
-#
-#	miss=0xFF[/mask]	Value to mark cache misses. Takes precedence
-#				over the preserve-miss feature (see below), unless
-#				mask is specified, in which case only the bits
-#				specified in the mask are written.
-#
-#	The TOS variant of the following features are only possible on Linux
-#	and require your kernel to be patched with the TOS preserving ZPH
-#	patch, available from http://zph.bratcheda.org
-#	No patch is needed to preserve the netfilter mark, which will work
-#	with all variants of netfilter.
-#
-#	disable-preserve-miss
-#		This option disables the preservation of the TOS or netfilter
-#		mark. By default, the existing TOS or netfilter mark value of
-#		the response coming from the remote server will be retained
-#		and masked with miss-mark.
-#		NOTE: in the case of a netfilter mark, the mark must be set on
-#		the connection (using the CONNMARK target) not on the packet
-#		(MARK target).
-#
-#	miss-mask=0xFF
-#		Allows you to mask certain bits in the TOS or mark value
-#		received from the remote server, before copying the value to
-#		the TOS sent towards clients.
-#		Default for tos: 0xFF (TOS from server is not changed).
-#		Default for mark: 0xFFFFFFFF (mark from server is not changed).
-#
-#	All of these features require the --enable-zph-qos compilation flag
-#	(enabled by default). Netfilter marking also requires the
-#	libnetfilter_conntrack libraries (--with-netfilter-conntrack) and
-#	libcap 2.09+ (--with-libcap).
-#
-#Default:
-# none
-
-#  TAG: tcp_outgoing_address
-#	Allows you to map requests to different outgoing IP addresses
-#	based on the username or source address of the user making
-#	the request.
-#
-#	tcp_outgoing_address ipaddr [[!]aclname] ...
-#
-#	For example;
-#		Forwarding clients with dedicated IPs for certain subnets.
-#
-#	  acl normal_service_net src 10.0.0.0/24
-#	  acl good_service_net src 10.0.2.0/24
-#
-#	  tcp_outgoing_address 2001:db8::c001 good_service_net
-#	  tcp_outgoing_address 10.1.0.2 good_service_net
-#
-#	  tcp_outgoing_address 2001:db8::beef normal_service_net
-#	  tcp_outgoing_address 10.1.0.1 normal_service_net
-#
-#	  tcp_outgoing_address 2001:db8::1
-#	  tcp_outgoing_address 10.1.0.3
-#
-#	Processing proceeds in the order specified, and stops at first fully
-#	matching line.
-#
-#	Squid will add an implicit IP version test to each line.
-#	Requests going to IPv4 websites will use the outgoing 10.1.0.* addresses.
-#	Requests going to IPv6 websites will use the outgoing 2001:db8:* addresses.
-#
-#
-#	NOTE: The use of this directive using client dependent ACLs is
-#	incompatible with the use of server side persistent connections. To
-#	ensure correct results it is best to set server_persistent_connections
-#	to off when using this directive in such configurations.
-#
-#	NOTE: The use of this directive to set a local IP on outgoing TCP links
-#	is incompatible with using TPROXY to set client IP out outbound TCP links.
-#	When needing to contact peers use the no-tproxy cache_peer option and the
-#	client_dst_passthru directive re-enable normal forwarding such as this.
-#
-#Default:
-# Address selection is performed by the operating system.
-
-#  TAG: host_verify_strict
-#	Regardless of this option setting, when dealing with intercepted
-#	traffic, Squid always verifies that the destination IP address matches
-#	the Host header domain or IP (called 'authority form URL').
-#	
-#	This enforcement is performed to satisfy a MUST-level requirement in
-#	RFC 2616 section 14.23: "The Host field value MUST represent the naming
-#	authority of the origin server or gateway given by the original URL".
-#	
-#	When set to ON:
-#		Squid always responds with an HTTP 409 (Conflict) error
-#		page and logs a security warning if there is no match.
-#	
-#		Squid verifies that the destination IP address matches
-#		the Host header for forward-proxy and reverse-proxy traffic
-#		as well. For those traffic types, Squid also enables the
-#		following checks, comparing the corresponding Host header
-#		and Request-URI components:
-#	
-#		 * The host names (domain or IP) must be identical,
-#		   but valueless or missing Host header disables all checks.
-#		   For the two host names to match, both must be either IP
-#		   or FQDN.
-#	
-#		 * Port numbers must be identical, but if a port is missing
-#		   the scheme-default port is assumed.
-#	
-#	
-#	When set to OFF (the default):
-#		Squid allows suspicious requests to continue but logs a
-#		security warning and blocks caching of the response.
-#	
-#		 * Forward-proxy traffic is not checked at all.
-#	
-#		 * Reverse-proxy traffic is not checked at all.
-#	
-#		 * Intercepted traffic which passes verification is handled
-#		   according to client_dst_passthru.
-#	
-#		 * Intercepted requests which fail verification are sent
-#		   to the client original destination instead of DIRECT.
-#		   This overrides 'client_dst_passthru off'.
-#	
-#		For now suspicious intercepted CONNECT requests are always
-#		responded to with an HTTP 409 (Conflict) error page.
-#	
-#	
-#	SECURITY NOTE:
-#	
-#	As described in CVE-2009-0801 when the Host: header alone is used
-#	to determine the destination of a request it becomes trivial for
-#	malicious scripts on remote websites to bypass browser same-origin
-#	security policy and sandboxing protections.
-#	
-#	The cause of this is that such applets are allowed to perform their
-#	own HTTP stack, in which case the same-origin policy of the browser
-#	sandbox only verifies that the applet tries to contact the same IP
-#	as from where it was loaded at the IP level. The Host: header may
-#	be different from the connected IP and approved origin.
-#	
-#Default:
-# host_verify_strict off
-
-#  TAG: client_dst_passthru
-#	With NAT or TPROXY intercepted traffic Squid may pass the request
-#	directly to the original client destination IP or seek a faster
-#	source using the HTTP Host header.
-#	
-#	Using Host to locate alternative servers can provide faster
-#	connectivity with a range of failure recovery options.
-#	But can also lead to connectivity trouble when the client and
-#	server are attempting stateful interactions unaware of the proxy.
-#	
-#	This option (on by default) prevents alternative DNS entries being
-#	located to send intercepted traffic DIRECT to an origin server.
-#	The clients original destination IP and port will be used instead.
-#	
-#	Regardless of this option setting, when dealing with intercepted
-#	traffic Squid will verify the Host: header and any traffic which
-#	fails Host verification will be treated as if this option were ON.
-#	
-#	see host_verify_strict for details on the verification process.
-#Default:
-# client_dst_passthru on
-
-# SSL OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: ssl_unclean_shutdown
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Some browsers (especially MSIE) bugs out on SSL shutdown
-#	messages.
-#Default:
-# ssl_unclean_shutdown off
-
-#  TAG: ssl_engine
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	The OpenSSL engine to use. You will need to set this if you
-#	would like to use hardware SSL acceleration for example.
-#Default:
-# none
-
-#  TAG: sslproxy_client_certificate
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Client SSL Certificate to use when proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_client_key
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Client SSL Key to use when proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_version
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL version level to use when proxying https:// URLs
-#
-#	The versions of SSL/TLS supported:
-#
-#	    1	automatic (default)
-#	    2	SSLv2 only
-#	    3	SSLv3 only
-#	    4	TLSv1.0 only
-#	    5	TLSv1.1 only
-#	    6	TLSv1.2 only
-#Default:
-# automatic SSL/TLS version negotiation
-
-#  TAG: sslproxy_options
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL implementation options to use when proxying https:// URLs
-#	
-#	The most important being:
-#
-#	    NO_SSLv2    Disallow the use of SSLv2
-#	    NO_SSLv3    Disallow the use of SSLv3
-#	    NO_TLSv1    Disallow the use of TLSv1.0
-#	    NO_TLSv1_1  Disallow the use of TLSv1.1
-#	    NO_TLSv1_2  Disallow the use of TLSv1.2
-#	    SINGLE_DH_USE
-#		      Always create a new key when using temporary/ephemeral
-#		      DH key exchanges
-#	    SSL_OP_NO_TICKET
-#		      Disable use of RFC5077 session tickets. Some servers
-#		      may have problems understanding the TLS extension due
-#		      to ambiguous specification in RFC4507.
-#	    ALL       Enable various bug workarounds suggested as "harmless"
-#		      by OpenSSL. Be warned that this may reduce SSL/TLS
-#		      strength to some attacks.
-#	
-#	See the OpenSSL SSL_CTX_set_options documentation for a
-#	complete list of possible options.
-#Default:
-# none
-
-#  TAG: sslproxy_cipher
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	SSL cipher list to use when proxying https:// URLs
-#
-#	Colon separated list of supported ciphers.
-#Default:
-# none
-
-#  TAG: sslproxy_cafile
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	file containing CA certificates to use when verifying server
-#	certificates while proxying https:// URLs
-#Default:
-# none
-
-#  TAG: sslproxy_capath
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	directory containing CA certificates to use when verifying
-#	server certificates while proxying https:// URLs
-#Default:
-# none
-
-#  TAG: ssl_bump
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	This option is consulted when a CONNECT request is received on
-#	an http_port (or a new connection is intercepted at an
-#	https_port), provided that port was configured with an ssl-bump
-#	flag. The subsequent data on the connection is either treated as
-#	HTTPS and decrypted OR tunneled at TCP level without decryption,
-#	depending on the first bumping "mode" which ACLs match.
-#
-#	ssl_bump <mode> [!]acl ...
-#
-#	The following bumping modes are supported:
-#
-#	    client-first
-#		Allow bumping of the connection. Establish a secure connection
-#		with the client first, then connect to the server. This old mode
-#		does not allow Squid to mimic server SSL certificate and does
-#		not work with intercepted SSL connections.
-#
-#	    server-first
-#		Allow bumping of the connection. Establish a secure connection
-#		with the server first, then establish a secure connection with
-#		the client, using a mimicked server certificate. Works with both
-#		CONNECT requests and intercepted SSL connections.
-#
-#	    none
-#		Become a TCP tunnel without decoding the connection.
-#		Works with both CONNECT requests and intercepted SSL
-#		connections. This is the default behavior when no
-#		ssl_bump option is given or no ssl_bump ACLs match.
-#
-#	By default, no connections are bumped.
-#
-#	The first matching ssl_bump option wins. If no ACLs match, the
-#	connection is not bumped. Unlike most allow/deny ACL lists, ssl_bump
-#	does not have an implicit "negate the last given option" rule. You
-#	must make that rule explicit if you convert old ssl_bump allow/deny
-#	rules that rely on such an implicit rule.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	See also: http_port ssl-bump, https_port ssl-bump
-#
-#
-#	# Example: Bump all requests except those originating from
-#	# localhost or those going to example.com.
-#
-#	acl broken_sites dstdomain .example.com
-#	ssl_bump none localhost
-#	ssl_bump none broken_sites
-#	ssl_bump server-first all
-#Default:
-# Does not bump unless rules are present in squid.conf
-
-#  TAG: sslproxy_flags
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Various flags modifying the use of SSL while proxying https:// URLs:
-#	    DONT_VERIFY_PEER	Accept certificates that fail verification.
-#				For refined control, see sslproxy_cert_error.
-#	    NO_DEFAULT_CA	Don't use the default CA list built in
-#				to OpenSSL.
-#Default:
-# none
-
-#  TAG: sslproxy_cert_error
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Use this ACL to bypass server certificate validation errors.
-#
-#	For example, the following lines will bypass all validation errors
-#	when talking to servers for example.com. All other
-#	validation errors will result in ERR_SECURE_CONNECT_FAIL error.
-#
-#		acl BrokenButTrustedServers dstdomain example.com
-#		sslproxy_cert_error allow BrokenButTrustedServers
-#		sslproxy_cert_error deny all
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#	Using slow acl types may result in server crashes
-#
-#	Without this option, all server certificate validation errors
-#	terminate the transaction to protect Squid and the client.
-#
-#	SQUID_X509_V_ERR_INFINITE_VALIDATION error cannot be bypassed
-#	but should not happen unless your OpenSSL library is buggy.
-#
-#	SECURITY WARNING:
-#		Bypassing validation errors is dangerous because an
-#		error usually implies that the server cannot be trusted
-#		and the connection may be insecure.
-#
-#	See also: sslproxy_flags and DONT_VERIFY_PEER.
-#Default:
-# Server certificate errors terminate the transaction.
-
-#  TAG: sslproxy_cert_sign
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#
-#        sslproxy_cert_sign <signing algorithm> acl ...
-#
-#        The following certificate signing algorithms are supported:
-#
-#	   signTrusted
-#		Sign using the configured CA certificate which is usually
-#		placed in and trusted by end-user browsers. This is the
-#		default for trusted origin server certificates.
-#
-#	   signUntrusted
-#		Sign to guarantee an X509_V_ERR_CERT_UNTRUSTED browser error.
-#		This is the default for untrusted origin server certificates
-#		that are not self-signed (see ssl::certUntrusted).
-#
-#	   signSelf
-#		Sign using a self-signed certificate with the right CN to
-#		generate a X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT error in the
-#		browser. This is the default for self-signed origin server
-#		certificates (see ssl::certSelfSigned).
-#
-#	This clause only supports fast acl types.
-#
-#	When sslproxy_cert_sign acl(s) match, Squid uses the corresponding
-#	signing algorithm to generate the certificate and ignores all
-#	subsequent sslproxy_cert_sign options (the first match wins). If no
-#	acl(s) match, the default signing algorithm is determined by errors
-#	detected when obtaining and validating the origin server certificate.
-#
-#	WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-#	be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-#	CONNECT request that carries a domain name. In all other cases (CONNECT
-#	to an IP address or an intercepted SSL connection), Squid cannot detect
-#	the domain mismatch at certificate generation time when
-#	bump-server-first is used.
-#Default:
-# none
-
-#  TAG: sslproxy_cert_adapt
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	
-#	sslproxy_cert_adapt <adaptation algorithm> acl ...
-#
-#	The following certificate adaptation algorithms are supported:
-#
-#	   setValidAfter
-#		Sets the "Not After" property to the "Not After" property of
-#		the CA certificate used to sign generated certificates.
-#
-#	   setValidBefore
-#		Sets the "Not Before" property to the "Not Before" property of
-#		the CA certificate used to sign generated certificates.
-#
-#	   setCommonName or setCommonName{CN}
-#		Sets Subject.CN property to the host name specified as a 
-#		CN parameter or, if no explicit CN parameter was specified,
-#		extracted from the CONNECT request. It is a misconfiguration
-#		to use setCommonName without an explicit parameter for
-#		intercepted or tproxied SSL connections.
-#		
-#	This clause only supports fast acl types.
-#
-#	Squid first groups sslproxy_cert_adapt options by adaptation algorithm.
-#	Within a group, when sslproxy_cert_adapt acl(s) match, Squid uses the
-#	corresponding adaptation algorithm to generate the certificate and
-#	ignores all subsequent sslproxy_cert_adapt options in that algorithm's
-#	group (i.e., the first match wins within each algorithm group). If no
-#	acl(s) match, the default mimicking action takes place.
-#
-#	WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can
-#	be used with sslproxy_cert_adapt, but if and only if Squid is bumping a
-#	CONNECT request that carries a domain name. In all other cases (CONNECT
-#	to an IP address or an intercepted SSL connection), Squid cannot detect
-#	the domain mismatch at certificate generation time when
-#	bump-server-first is used.
-#Default:
-# none
-
-#  TAG: sslpassword_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Specify a program used for entering SSL key passphrases
-#	when using encrypted SSL certificate keys. If not specified
-#	keys must either be unencrypted, or Squid started with the -N
-#	option to allow it to query interactively for the passphrase.
-#
-#	The key file name is given as argument to the program allowing
-#	selection of the right password if you have multiple encrypted
-#	keys.
-#Default:
-# none
-
-# OPTIONS RELATING TO EXTERNAL SSL_CRTD 
-# -----------------------------------------------------------------------------
-
-#  TAG: sslcrtd_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl-crtd
-#
-#	Specify the location and options of the executable for ssl_crtd process.
-#	/usr/libexec/ssl_crtd program requires -s and -M parameters
-#	For more information use:
-#		/usr/libexec/ssl_crtd -h
-#Default:
-# sslcrtd_program /usr/libexec/ssl_crtd -s /var/log/squid/lib/ssl_db -M 4MB
-
-#  TAG: sslcrtd_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl-crtd
-#
-#	The maximum number of processes spawn to service ssl server.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=N
-#	
-#	Sets the minimum number of processes to spawn when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few children temporary slows Squid under load while it
-#	tries to spawn enough additional processes to cope with traffic.
-#	
-#		idle=N
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#	
-#	You must have at least one ssl_crtd process.
-#Default:
-# sslcrtd_children 32 startup=5 idle=1
-
-#  TAG: sslcrtvalidator_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	Specify the location and options of the executable for ssl_crt_validator
-#	process.
-#
-#	Usage:  sslcrtvalidator_program [ttl=n] [cache=n] path ...
-#
-#	Options:
-#	  ttl=n         TTL in seconds for cached results. The default is 60 secs
-#	  cache=n       limit the result cache size. The default value is 2048
-#Default:
-# none
-
-#  TAG: sslcrtvalidator_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ssl
-#
-#	The maximum number of processes spawn to service SSL server.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=N
-#	
-#	Sets the minimum number of processes to spawn when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few children temporary slows Squid under load while it
-#	tries to spawn enough additional processes to cope with traffic.
-#	
-#		idle=N
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#	
-#	The number of requests each certificate validator helper can handle in
-#	parallel. A value of 0 indicates the certficate validator does not
-#	support concurrency. Defaults to 1.
-#	
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	a request ID in front of the request/response. The request
-#	ID from the request must be echoed back with the response
-#	to that request.
-#	
-#	You must have at least one ssl_crt_validator process.
-#Default:
-# sslcrtvalidator_children 32 startup=5 idle=1 concurrency=1
-
-# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_peer
-#	To specify other caches in a hierarchy, use the format:
-#	
-#		cache_peer hostname type http-port icp-port [options]
-#	
-#	For example,
-#	
-#	#                                        proxy  icp
-#	#          hostname             type     port   port  options
-#	#          -------------------- -------- ----- -----  -----------
-#	cache_peer parent.foo.net       parent    3128  3130  default
-#	cache_peer sib1.foo.net         sibling   3128  3130  proxy-only
-#	cache_peer sib2.foo.net         sibling   3128  3130  proxy-only
-#	cache_peer example.com          parent    80       0  default
-#	cache_peer cdn.example.com      sibling   3128     0  
-#	
-#	      type:	either 'parent', 'sibling', or 'multicast'.
-#	
-#	proxy-port:	The port number where the peer accept HTTP requests.
-#			For other Squid proxies this is usually 3128
-#			For web servers this is usually 80
-#	
-#	  icp-port:	Used for querying neighbor caches about objects.
-#			Set to 0 if the peer does not support ICP or HTCP.
-#			See ICP and HTCP options below for additional details.
-#	
-#	
-#	==== ICP OPTIONS ====
-#	
-#	You MUST also set icp_port and icp_access explicitly when using these options.
-#	The defaults will prevent peer traffic using ICP.
-#	
-#	
-#	no-query	Disable ICP queries to this neighbor.
-#	
-#	multicast-responder
-#			Indicates the named peer is a member of a multicast group.
-#			ICP queries will not be sent directly to the peer, but ICP
-#			replies will be accepted from it.
-#	
-#	closest-only	Indicates that, for ICP_OP_MISS replies, we'll only forward
-#			CLOSEST_PARENT_MISSes and never FIRST_PARENT_MISSes.
-#	
-#	background-ping
-#			To only send ICP queries to this neighbor infrequently.
-#			This is used to keep the neighbor round trip time updated
-#			and is usually used in conjunction with weighted-round-robin.
-#	
-#	
-#	==== HTCP OPTIONS ====
-#	
-#	You MUST also set htcp_port and htcp_access explicitly when using these options.
-#	The defaults will prevent peer traffic using HTCP.
-#	
-#	
-#	htcp		Send HTCP, instead of ICP, queries to the neighbor.
-#			You probably also want to set the "icp-port" to 4827
-#			instead of 3130. This directive accepts a comma separated
-#			list of options described below.
-#	
-#	htcp=oldsquid	Send HTCP to old Squid versions (2.5 or earlier).
-#	
-#	htcp=no-clr	Send HTCP to the neighbor but without
-#			sending any CLR requests.  This cannot be used with
-#			only-clr.
-#	
-#	htcp=only-clr	Send HTCP to the neighbor but ONLY CLR requests.
-#			This cannot be used with no-clr.
-#	
-#	htcp=no-purge-clr
-#			Send HTCP to the neighbor including CLRs but only when
-#			they do not result from PURGE requests.
-#	
-#	htcp=forward-clr
-#			Forward any HTCP CLR requests this proxy receives to the peer.
-#	
-#	
-#	==== PEER SELECTION METHODS ====
-#	
-#	The default peer selection method is ICP, with the first responding peer
-#	being used as source. These options can be used for better load balancing.
-#	
-#	
-#	default		This is a parent cache which can be used as a "last-resort"
-#			if a peer cannot be located by any of the peer-selection methods.
-#			If specified more than once, only the first is used.
-#	
-#	round-robin	Load-Balance parents which should be used in a round-robin
-#			fashion in the absence of any ICP queries.
-#			weight=N can be used to add bias.
-#	
-#	weighted-round-robin
-#			Load-Balance parents which should be used in a round-robin
-#			fashion with the frequency of each parent being based on the
-#			round trip time. Closer parents are used more often.
-#			Usually used for background-ping parents.
-#			weight=N can be used to add bias.
-#	
-#	carp		Load-Balance parents which should be used as a CARP array.
-#			The requests will be distributed among the parents based on the
-#			CARP load balancing hash function based on their weight.
-#	
-#	userhash	Load-balance parents based on the client proxy_auth or ident username.
-#	
-#	sourcehash	Load-balance parents based on the client source IP.
-#
-#	multicast-siblings
-#			To be used only for cache peers of type "multicast".
-#			ALL members of this multicast group have "sibling"
-#			relationship with it, not "parent".  This is to a multicast
-#			group when the requested object would be fetched only from
-#			a "parent" cache, anyway.  It's useful, e.g., when
-#			configuring a pool of redundant Squid proxies, being
-#			members of the same multicast group.
-#	
-#	
-#	==== PEER SELECTION OPTIONS ====
-#	
-#	weight=N	use to affect the selection of a peer during any weighted
-#			peer-selection mechanisms.
-#			The weight must be an integer; default is 1,
-#			larger weights are favored more.
-#			This option does not affect parent selection if a peering
-#			protocol is not in use.
-#	
-#	basetime=N	Specify a base amount to be subtracted from round trip
-#			times of parents.
-#			It is subtracted before division by weight in calculating
-#			which parent to fectch from. If the rtt is less than the
-#			base time the rtt is set to a minimal value.
-#	
-#	ttl=N		Specify a TTL to use when sending multicast ICP queries
-#			to this address.
-#			Only useful when sending to a multicast group.
-#			Because we don't accept ICP replies from random
-#			hosts, you must configure other group members as
-#			peers with the 'multicast-responder' option.
-#	
-#	no-delay	To prevent access to this neighbor from influencing the
-#			delay pools.
-#	
-#	digest-url=URL	Tell Squid to fetch the cache digest (if digests are
-#			enabled) for this host from the specified URL rather
-#			than the Squid default location.
-#	
-#	
-#	==== CARP OPTIONS ====
-#	
-#	carp-key=key-specification
-#			use a different key than the full URL to hash against the peer.
-#			the key-specification is a comma-separated list of the keywords			
-#			scheme, host, port, path, params
-#			Order is not important.
-#	
-#	==== ACCELERATOR / REVERSE-PROXY OPTIONS ====
-#	
-#	originserver	Causes this parent to be contacted as an origin server.
-#			Meant to be used in accelerator setups when the peer
-#			is a web server.
-#	
-#	forceddomain=name
-#			Set the Host header of requests forwarded to this peer.
-#			Useful in accelerator setups where the server (peer)
-#			expects a certain domain name but clients may request
-#			others. ie example.com or www.example.com
-#	
-#	no-digest	Disable request of cache digests.
-#	
-#	no-netdb-exchange
-#			Disables requesting ICMP RTT database (NetDB).
-#	
-#	
-#	==== AUTHENTICATION OPTIONS ====
-#	
-#	login=user:password
-#			If this is a personal/workgroup proxy and your parent
-#			requires proxy authentication.
-#			
-#			Note: The string can include URL escapes (i.e. %20 for
-#			spaces). This also means % must be written as %%.
-#	
-#	login=PASSTHRU
-#			Send login details received from client to this peer.
-#			Both Proxy- and WWW-Authorization headers are passed
-#			without alteration to the peer.
-#			Authentication is not required by Squid for this to work.
-#			
-#			Note: This will pass any form of authentication but
-#			only Basic auth will work through a proxy unless the
-#			connection-auth options are also used.
-#
-#	login=PASS	Send login details received from client to this peer.
-#			Authentication is not required by this option.
-#			
-#			If there are no client-provided authentication headers
-#			to pass on, but username and password are available
-#			from an external ACL user= and password= result tags
-#			they may be sent instead.
-#			
-#			Note: To combine this with proxy_auth both proxies must
-#			share the same user database as HTTP only allows for
-#			a single login (one for proxy, one for origin server).
-#			Also be warned this will expose your users proxy
-#			password to the peer. USE WITH CAUTION
-#	
-#	login=*:password
-#			Send the username to the upstream cache, but with a
-#			fixed password. This is meant to be used when the peer
-#			is in another administrative domain, but it is still
-#			needed to identify each user.
-#			The star can optionally be followed by some extra
-#			information which is added to the username. This can
-#			be used to identify this proxy to the peer, similar to
-#			the login=username:password option above.
-#	
-#	login=NEGOTIATE
-#			If this is a personal/workgroup proxy and your parent
-#			requires a secure proxy authentication.
-#			The first principal from the default keytab or defined by
-#			the environment variable KRB5_KTNAME will be used. 
-#	
-#			WARNING: The connection may transmit requests from multiple
-#			clients. Negotiate often assumes end-to-end authentication
-#			and a single-client. Which is not strictly true here.
-#	
-#	login=NEGOTIATE:principal_name
-#			If this is a personal/workgroup proxy and your parent
-#			requires a secure proxy authentication. 
-#			The principal principal_name from the default keytab or
-#			defined by the environment variable KRB5_KTNAME will be
-#			used.
-#	
-#			WARNING: The connection may transmit requests from multiple
-#			clients. Negotiate often assumes end-to-end authentication
-#			and a single-client. Which is not strictly true here.
-#	
-#	connection-auth=on|off
-#			Tell Squid that this peer does or not support Microsoft
-#			connection oriented authentication, and any such
-#			challenges received from there should be ignored.
-#			Default is auto to automatically determine the status
-#			of the peer.
-#	
-#	
-#	==== SSL / HTTPS / TLS OPTIONS ====
-#	
-#	ssl		Encrypt connections to this peer with SSL/TLS.
-#	
-#	sslcert=/path/to/ssl/certificate
-#			A client SSL certificate to use when connecting to
-#			this peer.
-#	
-#	sslkey=/path/to/ssl/key
-#			The private SSL key corresponding to sslcert above.
-#			If 'sslkey' is not specified 'sslcert' is assumed to
-#			reference a combined file containing both the
-#			certificate and the key.
-#	
-#	sslversion=1|2|3|4|5|6
-#			The SSL version to use when connecting to this peer
-#				1 = automatic (default)
-#				2 = SSL v2 only
-#				3 = SSL v3 only
-#				4 = TLS v1.0 only
-#				5 = TLS v1.1 only
-#				6 = TLS v1.2 only
-#	
-#	sslcipher=...	The list of valid SSL ciphers to use when connecting
-#			to this peer.
-#	
-#	ssloptions=... 	Specify various SSL implementation options:
-#
-#			    NO_SSLv2    Disallow the use of SSLv2
-#			    NO_SSLv3    Disallow the use of SSLv3
-#			    NO_TLSv1    Disallow the use of TLSv1.0
-#			    NO_TLSv1_1  Disallow the use of TLSv1.1
-#			    NO_TLSv1_2  Disallow the use of TLSv1.2
-#			    SINGLE_DH_USE
-#				      Always create a new key when using
-#				      temporary/ephemeral DH key exchanges
-#			    ALL       Enable various bug workarounds
-#				      suggested as "harmless" by OpenSSL
-#				      Be warned that this reduces SSL/TLS
-#				      strength to some attacks.
-#
-#			See the OpenSSL SSL_CTX_set_options documentation for a
-#			more complete list.
-#	
-#	sslcafile=... 	A file containing additional CA certificates to use
-#			when verifying the peer certificate.
-#	
-#	sslcapath=...	A directory containing additional CA certificates to
-#			use when verifying the peer certificate.
-#	
-#	sslcrlfile=... 	A certificate revocation list file to use when
-#			verifying the peer certificate.
-#	
-#	sslflags=...	Specify various flags modifying the SSL implementation:
-#	
-#			DONT_VERIFY_PEER
-#				Accept certificates even if they fail to
-#				verify.
-#			NO_DEFAULT_CA
-#				Don't use the default CA list built in
-#				to OpenSSL.
-#			DONT_VERIFY_DOMAIN
-#				Don't verify the peer certificate
-#				matches the server name
-#	
-#	ssldomain= 	The peer name as advertised in it's certificate.
-#			Used for verifying the correctness of the received peer
-#			certificate. If not specified the peer hostname will be
-#			used.
-#	
-#	front-end-https
-#			Enable the "Front-End-Https: On" header needed when
-#			using Squid as a SSL frontend in front of Microsoft OWA.
-#			See MS KB document Q307347 for details on this header.
-#			If set to auto the header will only be added if the
-#			request is forwarded as a https:// URL.
-#	
-#	
-#	==== GENERAL OPTIONS ====
-#	
-#	connect-timeout=N
-#			A peer-specific connect timeout.
-#			Also see the peer_connect_timeout directive.
-#	
-#	connect-fail-limit=N
-#			How many times connecting to a peer must fail before
-#			it is marked as down. Default is 10.
-#	
-#	allow-miss	Disable Squid's use of only-if-cached when forwarding
-#			requests to siblings. This is primarily useful when
-#			icp_hit_stale is used by the sibling. To extensive use
-#			of this option may result in forwarding loops, and you
-#			should avoid having two-way peerings with this option.
-#			For example to deny peer usage on requests from peer
-#			by denying cache_peer_access if the source is a peer.
-#	
-#	max-conn=N	Limit the amount of connections Squid may open to this
-#			peer. see also 
-#	
-#	name=xxx	Unique name for the peer.
-#			Required if you have multiple peers on the same host
-#			but different ports.
-#			This name can be used in cache_peer_access and similar
-#			directives to dentify the peer.
-#			Can be used by outgoing access controls through the
-#			peername ACL type.
-#	
-#	no-tproxy	Do not use the client-spoof TPROXY support when forwarding
-#			requests to this peer. Use normal address selection instead.
-#			This overrides the spoof_client_ip ACL.
-#	
-#	proxy-only	objects fetched from the peer will not be stored locally.
-#	
-#Default:
-# none
-
-#  TAG: cache_peer_domain
-#	Use to limit the domains for which a neighbor cache will be
-#	queried.
-#
-#	Usage:
-#		cache_peer_domain cache-host domain [domain ...]
-#		cache_peer_domain cache-host !domain
-#
-#	For example, specifying
-#
-#		cache_peer_domain parent.foo.net	.edu
-#
-#	has the effect such that UDP query packets are sent to
-#	'bigserver' only when the requested object exists on a
-#	server in the .edu domain.  Prefixing the domainname
-#	with '!' means the cache will be queried for objects
-#	NOT in that domain.
-#
-#	NOTE:	* Any number of domains may be given for a cache-host,
-#		  either on the same or separate lines.
-#		* When multiple domains are given for a particular
-#		  cache-host, the first matched domain is applied.
-#		* Cache hosts with no domain restrictions are queried
-#		  for all requests.
-#		* There are no defaults.
-#		* There is also a 'cache_peer_access' tag in the ACL
-#		  section.
-#Default:
-# none
-
-#  TAG: cache_peer_access
-#	Similar to 'cache_peer_domain' but provides more flexibility by
-#	using ACL elements.
-#
-#	Usage:
-#		cache_peer_access cache-host allow|deny [!]aclname ...
-#
-#	The syntax is identical to 'http_access' and the other lists of
-#	ACL elements.  See the comments for 'http_access' below, or
-#	the Squid FAQ (http://wiki.squid-cache.org/SquidFaq/SquidAcl).
-#Default:
-# none
-
-#  TAG: neighbor_type_domain
-#	Modify the cache_peer neighbor type when passing requests
-#	about specific domains to the peer.
-#
-#	Usage:
-#		 neighbor_type_domain neighbor parent|sibling domain domain ...
-#
-#	For example:
-#		cache_peer foo.example.com parent 3128 3130
-#		neighbor_type_domain foo.example.com sibling .au .de
-#
-#	The above configuration treats all requests to foo.example.com as a
-#	parent proxy unless the request is for a .au or .de ccTLD domain name.
-#Default:
-# The peer type from cache_peer directive is used for all requests to that peer.
-
-#  TAG: dead_peer_timeout	(seconds)
-#	This controls how long Squid waits to declare a peer cache
-#	as "dead."  If there are no ICP replies received in this
-#	amount of time, Squid will declare the peer dead and not
-#	expect to receive any further ICP replies.  However, it
-#	continues to send ICP queries, and will mark the peer as
-#	alive upon receipt of the first subsequent ICP reply.
-#
-#	This timeout also affects when Squid expects to receive ICP
-#	replies from peers.  If more than 'dead_peer' seconds have
-#	passed since the last ICP reply was received, Squid will not
-#	expect to receive an ICP reply on the next query.  Thus, if
-#	your time between requests is greater than this timeout, you
-#	will see a lot of requests sent DIRECT to origin servers
-#	instead of to your parents.
-#Default:
-# dead_peer_timeout 10 seconds
-
-#  TAG: forward_max_tries
-#	Controls how many different forward paths Squid will try
-#	before giving up. See also forward_timeout.
-#	
-#	NOTE: connect_retries (default: none) can make each of these
-#	possible forwarding paths be tried multiple times.
-#Default:
-# forward_max_tries 10
-
-#  TAG: hierarchy_stoplist
-#	A list of words which, if found in a URL, cause the object to
-#	be handled directly by this cache.  In other words, use this
-#	to not query neighbor caches for certain objects.  You may
-#	list this option multiple times.
-#
-#	Example:
-#		hierarchy_stoplist cgi-bin ?
-#
-#	Note: never_direct overrides this option.
-#Default:
-# none
-
-# MEMORY CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_mem	(bytes)
-#	NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE.
-#	IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL
-#	USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER
-#	THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS.
-#
-#	'cache_mem' specifies the ideal amount of memory to be used
-#	for:
-#		* In-Transit objects
-#		* Hot Objects
-#		* Negative-Cached objects
-#
-#	Data for these objects are stored in 4 KB blocks.  This
-#	parameter specifies the ideal upper limit on the total size of
-#	4 KB blocks allocated.  In-Transit objects take the highest
-#	priority.
-#
-#	In-transit objects have priority over the others.  When
-#	additional space is needed for incoming data, negative-cached
-#	and hot objects will be released.  In other words, the
-#	negative-cached and hot objects will fill up any unused space
-#	not needed for in-transit objects.
-#
-#	If circumstances require, this limit will be exceeded.
-#	Specifically, if your incoming request rate requires more than
-#	'cache_mem' of memory to hold in-transit objects, Squid will
-#	exceed this limit to satisfy the new requests.  When the load
-#	decreases, blocks will be freed until the high-water mark is
-#	reached.  Thereafter, blocks will be used to store hot
-#	objects.
-#
-#	If shared memory caching is enabled, Squid does not use the shared
-#	cache space for in-transit objects, but they still consume as much
-#	local memory as they need. For more details about the shared memory
-#	cache, see memory_cache_shared.
-#Default:
-# cache_mem 256 MB
-
-#  TAG: maximum_object_size_in_memory	(bytes)
-#	Objects greater than this size will not be attempted to kept in
-#	the memory cache. This should be set high enough to keep objects
-#	accessed frequently in memory to improve performance whilst low
-#	enough to keep larger objects from hoarding cache_mem.
-#Default:
-# maximum_object_size_in_memory 512 KB
-
-#  TAG: memory_cache_shared	on|off
-#	Controls whether the memory cache is shared among SMP workers.
-#
-#	The shared memory cache is meant to occupy cache_mem bytes and replace
-#	the non-shared memory cache, although some entities may still be
-#	cached locally by workers for now (e.g., internal and in-transit
-#	objects may be served from a local memory cache even if shared memory
-#	caching is enabled).
-#
-#	By default, the memory cache is shared if and only if all of the
-#	following conditions are satisfied: Squid runs in SMP mode with
-#	multiple workers, cache_mem is positive, and Squid environment
-#	supports required IPC primitives (e.g., POSIX shared memory segments
-#	and GCC-style atomic operations).
-#
-#	To avoid blocking locks, shared memory uses opportunistic algorithms
-#	that do not guarantee that every cachable entity that could have been
-#	shared among SMP workers will actually be shared.
-#
-#	Currently, entities exceeding 32KB in size cannot be shared.
-#Default:
-# "on" where supported if doing memory caching with multiple SMP workers.
-
-#  TAG: memory_cache_mode
-#	Controls which objects to keep in the memory cache (cache_mem)
-#
-#	always	Keep most recently fetched objects in memory (default)
-#
-#	disk	Only disk cache hits are kept in memory, which means
-#		an object must first be cached on disk and then hit
-#		a second time before cached in memory.
-#
-#	network	Only objects fetched from network is kept in memory
-#Default:
-# Keep the most recently fetched objects in memory
-
-#  TAG: memory_replacement_policy
-#	The memory replacement policy parameter determines which
-#	objects are purged from memory when memory space is needed.
-#
-#	See cache_replacement_policy for details on algorithms.
-#Default:
-# memory_replacement_policy lru
-
-# DISK CACHE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_replacement_policy
-#	The cache replacement policy parameter determines which
-#	objects are evicted (replaced) when disk space is needed.
-#
-#	    lru       : Squid's original list based LRU policy
-#	    heap GDSF : Greedy-Dual Size Frequency
-#	    heap LFUDA: Least Frequently Used with Dynamic Aging
-#	    heap LRU  : LRU policy implemented using a heap
-#
-#	Applies to any cache_dir lines listed below this directive.
-#
-#	The LRU policies keeps recently referenced objects.
-#
-#	The heap GDSF policy optimizes object hit rate by keeping smaller
-#	popular objects in cache so it has a better chance of getting a
-#	hit.  It achieves a lower byte hit rate than LFUDA though since
-#	it evicts larger (possibly popular) objects.
-#
-#	The heap LFUDA policy keeps popular objects in cache regardless of
-#	their size and thus optimizes byte hit rate at the expense of
-#	hit rate since one large, popular object will prevent many
-#	smaller, slightly less popular objects from being cached.
-#
-#	Both policies utilize a dynamic aging mechanism that prevents
-#	cache pollution that can otherwise occur with frequency-based
-#	replacement policies.
-#
-#	NOTE: if using the LFUDA replacement policy you should increase
-#	the value of maximum_object_size above its default of 4 MB to
-#	to maximize the potential byte hit rate improvement of LFUDA.
-#
-#	For more information about the GDSF and LFUDA cache replacement
-#	policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html
-#	and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html.
-#Default:
-# cache_replacement_policy lru
-
-#  TAG: minimum_object_size	(bytes)
-#	Objects smaller than this size will NOT be saved on disk.  The
-#	value is specified in bytes, and the default is 0 KB, which
-#	means all responses can be stored.
-#Default:
-# no limit
-
-#  TAG: maximum_object_size	(bytes)
-#	Set the default value for max-size parameter on any cache_dir.
-#	The value is specified in bytes, and the default is 4 MB.
-#	
-#	If you wish to get a high BYTES hit ratio, you should probably
-#	increase this (one 32 MB object hit counts for 3200 10KB
-#	hits).
-#	
-#	If you wish to increase hit ratio more than you want to
-#	save bandwidth you should leave this low.
-#	
-#	NOTE: if using the LFUDA replacement policy you should increase
-#	this value to maximize the byte hit rate improvement of LFUDA!
-#	See cache_replacement_policy for a discussion of this policy.
-#Default:
-# maximum_object_size 4 MB
-
-#  TAG: cache_dir
-#	Format:
-#		cache_dir Type Directory-Name Fs-specific-data [options]
-#
-#	You can specify multiple cache_dir lines to spread the
-#	cache among different disk partitions.
-#
-#	Type specifies the kind of storage system to use. Only "ufs"
-#	is built by default. To enable any of the other storage systems
-#	see the --enable-storeio configure option.
-#
-#	'Directory' is a top-level directory where cache swap
-#	files will be stored.  If you want to use an entire disk
-#	for caching, this can be the mount-point directory.
-#	The directory must exist and be writable by the Squid
-#	process.  Squid will NOT create this directory for you.
-#
-#	In SMP configurations, cache_dir must not precede the workers option
-#	and should use configuration macros or conditionals to give each
-#	worker interested in disk caching a dedicated cache directory.
-#
-#
-#	====  The ufs store type  ====
-#
-#	"ufs" is the old well-known Squid storage format that has always
-#	been there.
-#
-#	Usage:
-#		cache_dir ufs Directory-Name Mbytes L1 L2 [options]
-#
-#	'Mbytes' is the amount of disk space (MB) to use under this
-#	directory.  The default is 100 MB.  Change this to suit your
-#	configuration.  Do NOT put the size of your disk drive here.
-#	Instead, if you want Squid to use the entire disk drive,
-#	subtract 20% and use that value.
-#
-#	'L1' is the number of first-level subdirectories which
-#	will be created under the 'Directory'.  The default is 16.
-#
-#	'L2' is the number of second-level subdirectories which
-#	will be created under each first-level directory.  The default
-#	is 256.
-#
-#
-#	====  The aufs store type  ====
-#
-#	"aufs" uses the same storage format as "ufs", utilizing
-#	POSIX-threads to avoid blocking the main Squid process on
-#	disk-I/O. This was formerly known in Squid as async-io.
-#
-#	Usage:
-#		cache_dir aufs Directory-Name Mbytes L1 L2 [options]
-#
-#	see argument descriptions under ufs above
-#
-#
-#	====  The diskd store type  ====
-#
-#	"diskd" uses the same storage format as "ufs", utilizing a
-#	separate process to avoid blocking the main Squid process on
-#	disk-I/O.
-#
-#	Usage:
-#		cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n]
-#
-#	see argument descriptions under ufs above
-#
-#	Q1 specifies the number of unacknowledged I/O requests when Squid
-#	stops opening new files. If this many messages are in the queues,
-#	Squid won't open new files. Default is 64
-#
-#	Q2 specifies the number of unacknowledged messages when Squid
-#	starts blocking.  If this many messages are in the queues,
-#	Squid blocks until it receives some replies. Default is 72
-#
-#	When Q1 < Q2 (the default), the cache directory is optimized
-#	for lower response time at the expense of a decrease in hit
-#	ratio.  If Q1 > Q2, the cache directory is optimized for
-#	higher hit ratio at the expense of an increase in response
-#	time.
-#
-#
-#	====  The rock store type  ====
-#
-#	Usage:
-#	    cache_dir rock Directory-Name Mbytes <max-size=bytes> [options]
-#
-#	The Rock Store type is a database-style storage. All cached
-#	entries are stored in a "database" file, using fixed-size slots,
-#	one entry per slot. The database size is specified in MB. The
-#	slot size is specified in bytes using the max-size option. See
-#	below for more info on the max-size option.
-#
-#	If possible, Squid using Rock Store creates a dedicated kid
-#	process called "disker" to avoid blocking Squid worker(s) on disk
-#	I/O. One disker kid is created for each rock cache_dir.  Diskers
-#	are created only when Squid, running in daemon mode, has support
-#	for the IpcIo disk I/O module.
-#
-#	swap-timeout=msec: Squid will not start writing a miss to or
-#	reading a hit from disk if it estimates that the swap operation
-#	will take more than the specified number of milliseconds. By
-#	default and when set to zero, disables the disk I/O time limit
-#	enforcement. Ignored when using blocking I/O module because
-#	blocking synchronous I/O does not allow Squid to estimate the
-#	expected swap wait time.
-#
-#	max-swap-rate=swaps/sec: Artificially limits disk access using
-#	the specified I/O rate limit. Swap out requests that
-#	would cause the average I/O rate to exceed the limit are
-#	delayed. Individual swap in requests (i.e., hits or reads) are
-#	not delayed, but they do contribute to measured swap rate and
-#	since they are placed in the same FIFO queue as swap out
-#	requests, they may wait longer if max-swap-rate is smaller.
-#	This is necessary on file systems that buffer "too
-#	many" writes and then start blocking Squid and other processes
-#	while committing those writes to disk.  Usually used together
-#	with swap-timeout to avoid excessive delays and queue overflows
-#	when disk demand exceeds available disk "bandwidth". By default
-#	and when set to zero, disables the disk I/O rate limit
-#	enforcement. Currently supported by IpcIo module only.
-#
-#
-#	====  The coss store type  ====
-#
-#	NP: COSS filesystem in Squid-3 has been deemed too unstable for
-#	    production use and has thus been removed from this release.
-#	    We hope that it can be made usable again soon.
-#
-#	block-size=n defines the "block size" for COSS cache_dir's.
-#	Squid uses file numbers as block numbers.  Since file numbers
-#	are limited to 24 bits, the block size determines the maximum
-#	size of the COSS partition.  The default is 512 bytes, which
-#	leads to a maximum cache_dir size of 512<<24, or 8 GB.  Note
-#	you should not change the coss block size after Squid
-#	has written some objects to the cache_dir.
-#
-#	The coss file store has changed from 2.5. Now it uses a file
-#	called 'stripe' in the directory names in the config - and
-#	this will be created by squid -z.
-#
-#
-#	==== COMMON OPTIONS ====
-#
-#	no-store	no new objects should be stored to this cache_dir.
-#
-#	min-size=n	the minimum object size in bytes this cache_dir
-#			will accept.  It's used to restrict a cache_dir
-#			to only store large objects (e.g. AUFS) while
-#			other stores are optimized for smaller objects
-#			(e.g. COSS).
-#			Defaults to 0.
-#
-#	max-size=n	the maximum object size in bytes this cache_dir
-#			supports.
-#			The value in maximum_object_size directive sets
-#			the default unless more specific details are
-#			available (ie a small store capacity).
-#
-#	Note: To make optimal use of the max-size limits you should order
-#	the cache_dir lines with the smallest max-size value first.
-#
-#	Note for coss, max-size must be less than COSS_MEMBUF_SZ,
-#	which can be changed with the --with-coss-membuf-size=N configure
-#	option.
-#
-#Default:
-# No disk cache. Store cache ojects only in memory.
-#
-
-# Uncomment and adjust the following to add a disk cache directory.
-#cache_dir ufs /var/log/squid/cache/squid 100 16 256
-
-#  TAG: store_dir_select_algorithm
-#	How Squid selects which cache_dir to use when the response
-#	object will fit into more than one.
-#
-#	Regardless of which algorithm is used the cache_dir min-size
-#	and max-size parameters are obeyed. As such they can affect
-#	the selection algorithm by limiting the set of considered
-#	cache_dir.
-#
-#	Algorithms:
-#
-#		least-load
-#
-#	This algorithm is suited to caches with similar cache_dir
-#	sizes and disk speeds.
-#
-#	The disk with the least I/O pending is selected.
-#	When there are multiple disks with the same I/O load ranking
-#	the cache_dir with most available capacity is selected.
-#
-#	When a mix of cache_dir sizes are configured the faster disks
-#	have a naturally lower I/O loading and larger disks have more
-#	capacity. So space used to store objects and data throughput
-#	may be very unbalanced towards larger disks.
-#
-#
-#		round-robin
-#
-#	This algorithm is suited to caches with unequal cache_dir
-#	disk sizes.
-#
-#	Each cache_dir is selected in a rotation. The next suitable
-#	cache_dir is used.
-#
-#	Available cache_dir capacity is only considered in relation
-#	to whether the object will fit and meets the min-size and
-#	max-size parameters.
-#
-#	Disk I/O loading is only considered to prevent overload on slow
-#	disks. This algorithm does not spread objects by size, so any
-#	I/O loading per-disk may appear very unbalanced and volatile.
-#
-#Default:
-# store_dir_select_algorithm least-load
-
-#  TAG: max_open_disk_fds
-#	To avoid having disk as the I/O bottleneck Squid can optionally
-#	bypass the on-disk cache if more than this amount of disk file
-#	descriptors are open.
-#
-#	A value of 0 indicates no limit.
-#Default:
-# no limit
-
-#  TAG: cache_swap_low	(percent, 0-100)
-#	The low-water mark for cache object replacement.
-#	Replacement begins when the swap (disk) usage is above the
-#	low-water mark and attempts to maintain utilization near the
-#	low-water mark.  As swap utilization gets close to high-water
-#	mark object eviction becomes more aggressive.  If utilization is
-#	close to the low-water mark less replacement is done each time.
-#
-#	Defaults are 90% and 95%. If you have a large cache, 5% could be
-#	hundreds of MB. If this is the case you may wish to set these
-#	numbers closer together.
-#
-#	See also cache_swap_high
-#Default:
-# cache_swap_low 90
-
-#  TAG: cache_swap_high	(percent, 0-100)
-#	The high-water mark for cache object replacement.
-#	Replacement begins when the swap (disk) usage is above the
-#	low-water mark and attempts to maintain utilization near the
-#	low-water mark.  As swap utilization gets close to high-water
-#	mark object eviction becomes more aggressive.  If utilization is
-#	close to the low-water mark less replacement is done each time.
-#
-#	Defaults are 90% and 95%. If you have a large cache, 5% could be
-#	hundreds of MB. If this is the case you may wish to set these
-#	numbers closer together.
-#
-#	See also cache_swap_low
-#Default:
-# cache_swap_high 95
-
-# LOGFILE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: logformat
-#	Usage:
-#
-#	logformat <name> <format specification>
-#
-#	Defines an access log format.
-#
-#	The <format specification> is a string with embedded % format codes
-#
-#	% format codes all follow the same basic structure where all but
-#	the formatcode is optional. Output strings are automatically escaped
-#	as required according to their context and the output format
-#	modifiers are usually not needed, but can be specified if an explicit
-#	output format is desired.
-#
-#		% ["|[|'|#] [-] [[0]width] [{argument}] formatcode
-#
-#		"	output in quoted string format
-#		[	output in squid text log format as used by log_mime_hdrs
-#		#	output in URL quoted format
-#		'	output as-is
-#
-#		-	left aligned
-#
-#		width	minimum and/or maximum field width:
-#			    [width_min][.width_max]
-#			When minimum starts with 0, the field is zero-padded.
-#			String values exceeding maximum width are truncated.
-#
-#		{arg}	argument such as header name etc
-#
-#	Format codes:
-#
-#		%	a literal % character
-#		sn	Unique sequence number per log line entry
-#		err_code    The ID of an error response served by Squid or
-#				a similar internal error identifier.
-#		err_detail  Additional err_code-dependent error information.
-#		note	The annotation specified by the argument. Also
-#			logs the adaptation meta headers set by the
-#			adaptation_meta configuration parameter.
-#			If no argument given all annotations logged.
-#			The argument may include a separator to use with
-#			annotation values:
-#                            name[:separator]
-#			By default, multiple note values are separated with ","
-#			and multiple notes are separated with "\r\n".
-#			When logging named notes with %{name}note, the
-#			explicitly configured separator is used between note
-#			values. When logging all notes with %note, the
-#			explicitly configured separator is used between
-#			individual notes. There is currently no way to
-#			specify both value and notes separators when logging
-#			all notes with %note.
-#
-#	Connection related format codes:
-#
-#		>a	Client source IP address
-#		>A	Client FQDN
-#		>p	Client source port
-#		>eui	Client source EUI (MAC address, EUI-48 or EUI-64 identifier)
-#		>la	Local IP address the client connected to
-#		>lp	Local port number the client connected to
-#		>qos    Client connection TOS/DSCP value set by Squid
-#		>nfmark Client connection netfilter mark set by Squid
-#
-#		la	Local listening IP address the client connection was connected to.
-#		lp	Local listening port number the client connection was connected to.
-#
-#		<a	Server IP address of the last server or peer connection
-#		<A	Server FQDN or peer name
-#		<p	Server port number of the last server or peer connection
-#		<la	Local IP address of the last server or peer connection
-#		<lp     Local port number of the last server or peer connection
-#		<qos	Server connection TOS/DSCP value set by Squid
-#		<nfmark Server connection netfilter mark set by Squid
-#
-#	Time related format codes:
-#
-#		ts	Seconds since epoch
-#		tu	subsecond time (milliseconds)
-#		tl	Local time. Optional strftime format argument
-#				default %d/%b/%Y:%H:%M:%S %z
-#		tg	GMT time. Optional strftime format argument
-#				default %d/%b/%Y:%H:%M:%S %z
-#		tr	Response time (milliseconds)
-#		dt	Total time spent making DNS lookups (milliseconds)
-#
-#	Access Control related format codes:
-#
-#		et	Tag returned by external acl
-#		ea	Log string returned by external acl
-#		un	User name (any available)
-#		ul	User name from authentication
-#		ue	User name from external acl helper
-#		ui	User name from ident
-#		us	User name from SSL
-#
-#	HTTP related format codes:
-#
-#		[http::]>h	Original received request header. 
-#				Usually differs from the request header sent by
-#				Squid, although most fields are often preserved.
-#				Accepts optional header field name/value filter
-#				argument using name[:[separator]element] format.
-#		[http::]>ha	Received request header after adaptation and
-#				redirection (pre-cache REQMOD vectoring point).
-#				Usually differs from the request header sent by
-#				Squid, although most fields are often preserved.
-#				Optional header name argument as for >h
-#		[http::]<h	Reply header. Optional header name argument
-#				as for >h
-#		[http::]>Hs	HTTP status code sent to the client
-#		[http::]<Hs	HTTP status code received from the next hop
-#		[http::]<bs	Number of HTTP-equivalent message body bytes 
-#				received from the next hop, excluding chunked
-#				transfer encoding and control messages.
-#				Generated FTP/Gopher listings are treated as
-#				received bodies.
-#		[http::]mt	MIME content type
-#		[http::]rm	Request method (GET/POST etc)
-#		[http::]>rm	Request method from client
-#		[http::]<rm	Request method sent to server or peer
-#		[http::]ru	Request URL from client (historic, filtered for logging)
-#		[http::]>ru	Request URL from client
-#		[http::]<ru	Request URL sent to server or peer
-#		[http::]rp	Request URL-Path excluding hostname
-#		[http::]>rp	Request URL-Path excluding hostname from client
-#		[http::]<rp	Request URL-Path excluding hostname sento to server or peer
-#		[http::]rv	Request protocol version
-#		[http::]>rv	Request protocol version from client
-#		[http::]<rv	Request protocol version sent to server or peer
-#		[http::]<st	Sent reply size including HTTP headers
-#		[http::]>st	Received request size including HTTP headers. In the
-#				case of chunked requests the chunked encoding metadata
-#				are not included
-#		[http::]>sh	Received HTTP request headers size
-#		[http::]<sh	Sent HTTP reply headers size
-#		[http::]st	Request+Reply size including HTTP headers
-#		[http::]<sH	Reply high offset sent
-#		[http::]<sS	Upstream object size
-#		[http::]<pt	Peer response time in milliseconds. The timer starts
-#				when the last request byte is sent to the next hop
-#				and stops when the last response byte is received.
-#		[http::]<tt	Total server-side time in milliseconds. The timer 
-#				starts with the first connect request (or write I/O)
-#				sent to the first selected peer. The timer stops
-#				with the last I/O with the last peer.
-#
-#	Squid handling related format codes:
-#
-#		Ss	Squid request status (TCP_MISS etc)
-#		Sh	Squid hierarchy status (DEFAULT_PARENT etc)
-#
-#	SSL-related format codes:
-#
-#		ssl::bump_mode	SslBump decision for the transaction:
-#
-#				For CONNECT requests that initiated bumping of
-#				a connection and for any request received on
-#				an already bumped connection, Squid logs the
-#				corresponding SslBump mode ("server-first" or
-#				"client-first"). See the ssl_bump option for
-#				more information about these modes.
-#
-#				A "none" token is logged for requests that
-#				triggered "ssl_bump" ACL evaluation matching
-#				either a "none" rule or no rules at all.
-#
-#				In all other cases, a single dash ("-") is
-#				logged.
-#
-#	If ICAP is enabled, the following code becomes available (as
-#	well as ICAP log codes documented with the icap_log option):
-#
-#		icap::tt        Total ICAP processing time for the HTTP
-#				transaction. The timer ticks when ICAP
-#				ACLs are checked and when ICAP
-#				transaction is in progress.
-#
-#	If adaptation is enabled the following three codes become available:
-#
-#		adapt::<last_h	The header of the last ICAP response or
-#				meta-information from the last eCAP
-#				transaction related to the HTTP transaction.
-#				Like <h, accepts an optional header name
-#				argument.
-#
-#		adapt::sum_trs Summed adaptation transaction response
-#				times recorded as a comma-separated list in
-#				the order of transaction start time. Each time
-#				value is recorded as an integer number,
-#				representing response time of one or more
-#				adaptation (ICAP or eCAP) transaction in
-#				milliseconds.  When a failed transaction is
-#				being retried or repeated, its time is not
-#				logged individually but added to the
-#				replacement (next) transaction. See also:
-#				adapt::all_trs.
-#
-#		adapt::all_trs All adaptation transaction response times.
-#				Same as adaptation_strs but response times of
-#				individual transactions are never added
-#				together. Instead, all transaction response
-#				times are recorded individually.
-#
-#	You can prefix adapt::*_trs format codes with adaptation
-#	service name in curly braces to record response time(s) specific
-#	to that service. For example: %{my_service}adapt::sum_trs
-#
-#	If SSL is enabled, the following formating codes become available:
-#
-#		%ssl::>cert_subject The Subject field of the received client
-#				SSL certificate or a dash ('-') if Squid has
-#				received an invalid/malformed certificate or
-#				no certificate at all. Consider encoding the
-#				logged value because Subject often has spaces.
-#
-#		%ssl::>cert_issuer The Issuer field of the received client
-#				SSL certificate or a dash ('-') if Squid has
-#				received an invalid/malformed certificate or
-#				no certificate at all. Consider encoding the
-#				logged value because Issuer often has spaces.
-#
-#	The default formats available (which do not need re-defining) are:
-#
-#logformat squid      %ts.%03tu %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt
-#logformat common     %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st %Ss:%Sh
-#logformat combined   %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh
-#logformat referrer   %ts.%03tu %>a %{Referer}>h %ru
-#logformat useragent  %>a [%tl] "%{User-Agent}>h"
-#
-#	NOTE: When the log_mime_hdrs directive is set to ON.
-#		The squid, common and combined formats have a safely encoded copy
-#		of the mime headers appended to each line within a pair of brackets.
-#
-#	NOTE: The common and combined formats are not quite true to the Apache definition.
-#		The logs from Squid contain an extra status and hierarchy code appended.
-#
-#Default:
-# The format definitions squid, common, combined, referrer, useragent are built in.
-
-#  TAG: access_log
-#	Configures whether and how Squid logs HTTP and ICP transactions.
-#	If access logging is enabled, a single line is logged for every 
-#	matching HTTP or ICP request. The recommended directive formats are:
-#
-#	access_log <module>:<place> [option ...] [acl acl ...]
-#	access_log none [acl acl ...]
-#
-#	The following directive format is accepted but may be deprecated:
-#	access_log <module>:<place> [<logformat name> [acl acl ...]]
-#
-#        In most cases, the first ACL name must not contain the '=' character
-#	and should not be equal to an existing logformat name. You can always
-#	start with an 'all' ACL to work around those restrictions.
-#	
-#	Will log to the specified module:place using the specified format (which
-#	must be defined in a logformat directive) those entries which match
-#	ALL the acl's specified (which must be defined in acl clauses).
-#	If no acl is specified, all requests will be logged to this destination.
-#	
-#	===== Available options for the recommended directive format =====
-#
-#	logformat=name		Names log line format (either built-in or
-#				defined by a logformat directive). Defaults
-#				to 'squid'.
-#
-#	buffer-size=64KB	Defines approximate buffering limit for log
-#				records (see buffered_logs).  Squid should not
-#				keep more than the specified size and, hence,
-#				should flush records before the buffer becomes
-#				full to avoid overflows under normal
-#				conditions (the exact flushing algorithm is
-#				module-dependent though).  The on-error option
-#				controls overflow handling.
-#
-#	on-error=die|drop	Defines action on unrecoverable errors. The
-#				'drop' action ignores (i.e., does not log)
-#				affected log records. The default 'die' action
-#				kills the affected worker. The drop action 
-#				support has not been tested for modules other
-#				than tcp.
-#
-#	===== Modules Currently available =====
-#	
-#	none	Do not log any requests matching these ACL.
-#		Do not specify Place or logformat name.
-#	
-#	stdio	Write each log line to disk immediately at the completion of
-#		each request.
-#		Place: the filename and path to be written.
-#	
-#	daemon	Very similar to stdio. But instead of writing to disk the log
-#		line is passed to a daemon helper for asychronous handling instead.
-#		Place: varies depending on the daemon.
-#		
-#		log_file_daemon Place: the file name and path to be written.
-#	
-#	syslog	To log each request via syslog facility.
-#		Place: The syslog facility and priority level for these entries.
-#		Place Format:  facility.priority
-#
-#		where facility could be any of:
-#			authpriv, daemon, local0 ... local7 or user.
-#
-#		And priority could be any of:
-#			err, warning, notice, info, debug.
-#	
-#	udp	To send each log line as text data to a UDP receiver.
-#		Place: The destination host name or IP and port.
-#		Place Format:   //host:port
-#
-#	tcp	To send each log line as text data to a TCP receiver.
-#		Lines may be accumulated before sending (see buffered_logs).
-#		Place: The destination host name or IP and port.
-#		Place Format:   //host:port
-#
-#	Default:
-#		access_log daemon:/var/log/squid/access.log squid
-#Default:
-# access_log daemon:/var/log/squid/access.log squid
-
-#  TAG: icap_log
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	ICAP log files record ICAP transaction summaries, one line per
-#	transaction.
-#
-#	The icap_log option format is:
-#	icap_log <filepath> [<logformat name> [acl acl ...]]
-#	icap_log none [acl acl ...]]
-#	
-#	Please see access_log option documentation for details. The two
-#	kinds of logs share the overall configuration approach and many
-#	features.
-#
-#	ICAP processing of a single HTTP message or transaction may
-#	require multiple ICAP transactions.  In such cases, multiple
-#	ICAP transaction log lines will correspond to a single access
-#	log line.
-#
-#	ICAP log uses logformat codes that make sense for an ICAP
-#	transaction. Header-related codes are applied to the HTTP header
-#	embedded in an ICAP server response, with the following caveats:
-#	For REQMOD, there is no HTTP response header unless the ICAP
-#	server performed request satisfaction. For RESPMOD, the HTTP
-#	request header is the header sent to the ICAP server. For
-#	OPTIONS, there are no HTTP headers.
-#
-#	The following format codes are also available for ICAP logs:
-#
-#		icap::<A	ICAP server IP address. Similar to <A.
-#
-#		icap::<service_name	ICAP service name from the icap_service
-#				option in Squid configuration file.
-#
-#		icap::ru	ICAP Request-URI. Similar to ru.
-#
-#		icap::rm	ICAP request method (REQMOD, RESPMOD, or 
-#				OPTIONS). Similar to existing rm.
-#
-#		icap::>st	Bytes sent to the ICAP server (TCP payload
-#				only; i.e., what Squid writes to the socket).
-#
-#		icap::<st	Bytes received from the ICAP server (TCP
-#				payload only; i.e., what Squid reads from
-#				the socket).
-#
-#		icap::<bs	Number of message body bytes received from the
-#				ICAP server. ICAP message body, if any, usually
-#				includes encapsulated HTTP message headers and
-#				possibly encapsulated HTTP message body. The
-#				HTTP body part is dechunked before its size is
-#				computed.
-#
-#		icap::tr 	Transaction response time (in
-#				milliseconds).  The timer starts when
-#				the ICAP transaction is created and
-#				stops when the transaction is completed.
-#				Similar to tr.
-#
-#		icap::tio	Transaction I/O time (in milliseconds). The
-#				timer starts when the first ICAP request
-#				byte is scheduled for sending. The timers
-#				stops when the last byte of the ICAP response
-#				is received.
-#
-#		icap::to 	Transaction outcome: ICAP_ERR* for all
-#				transaction errors, ICAP_OPT for OPTION
-#				transactions, ICAP_ECHO for 204
-#				responses, ICAP_MOD for message
-#				modification, and ICAP_SAT for request
-#				satisfaction. Similar to Ss.
-#
-#		icap::Hs	ICAP response status code. Similar to Hs.
-#
-#		icap::>h	ICAP request header(s). Similar to >h.
-#
-#		icap::<h	ICAP response header(s). Similar to <h.
-#
-#	The default ICAP log format, which can be used without an explicit
-#	definition, is called icap_squid:
-#
-#logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size %icap::rm %icap::ru% %un -/%icap::<A -
-#
-#	See also: logformat, log_icap, and %adapt::<last_h 
-#Default:
-# none
-
-#  TAG: logfile_daemon
-#	Specify the path to the logfile-writing daemon. This daemon is
-#	used to write the access and store logs, if configured.
-#
-#	Squid sends a number of commands to the log daemon:
-#	  L<data>\n - logfile data
-#	  R\n - rotate file
-#	  T\n - truncate file
-#	  O\n - reopen file
-#	  F\n - flush file
-#	  r<n>\n - set rotate count to <n>
-#	  b<n>\n - 1 = buffer output, 0 = don't buffer output
-#
-#	No responses is expected.
-#Default:
-# logfile_daemon /usr/libexec/log_file_daemon
-
-#  TAG: log_access
-#	Remove this line. Use acls with access_log directives to control access logging
-#Default:
-# none
-
-#  TAG: log_icap
-#	Remove this line. Use acls with icap_log directives to control icap logging
-#Default:
-# none
-
-#  TAG: stats_collection	allow|deny acl acl...
-#	This options allows you to control which requests gets accounted
-#	in performance counters.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow logging for all transactions.
-
-#  TAG: cache_store_log
-#	Logs the activities of the storage manager.  Shows which
-#	objects are ejected from the cache, and which objects are
-#	saved and for how long.
-#	There are not really utilities to analyze this data, so you can safely
-#	disable it (the default).
-#	
-#	Store log uses modular logging outputs. See access_log for the list
-#	of modules supported.
-#	
-#	Example:
-#		cache_store_log stdio:/var/log/squid/store.log
-#		cache_store_log daemon:/var/log/squid/store.log
-#Default:
-# none
-
-#  TAG: cache_swap_state
-#	Location for the cache "swap.state" file. This index file holds
-#	the metadata of objects saved on disk.  It is used to rebuild
-#	the cache during startup.  Normally this file resides in each
-#	'cache_dir' directory, but you may specify an alternate
-#	pathname here.  Note you must give a full filename, not just
-#	a directory. Since this is the index for the whole object
-#	list you CANNOT periodically rotate it!
-#
-#	If %s can be used in the file name it will be replaced with a
-#	a representation of the cache_dir name where each / is replaced
-#	with '.'. This is needed to allow adding/removing cache_dir
-#	lines when cache_swap_log is being used.
-#
-#	If have more than one 'cache_dir', and %s is not used in the name
-#	these swap logs will have names such as:
-#
-#		cache_swap_log.00
-#		cache_swap_log.01
-#		cache_swap_log.02
-#
-#	The numbered extension (which is added automatically)
-#	corresponds to the order of the 'cache_dir' lines in this
-#	configuration file.  If you change the order of the 'cache_dir'
-#	lines in this file, these index files will NOT correspond to
-#	the correct 'cache_dir' entry (unless you manually rename
-#	them).  We recommend you do NOT use this option.  It is
-#	better to keep these index files in each 'cache_dir' directory.
-#Default:
-# Store the journal inside its cache_dir
-
-#  TAG: logfile_rotate
-#	Specifies the number of logfile rotations to make when you
-#	type 'squid -k rotate'. The default is 10, which will rotate
-#	with extensions 0 through 9. Setting logfile_rotate to 0 will
-#	disable the file name rotation, but the logfiles are still closed
-#	and re-opened. This will enable you to rename the logfiles
-#	yourself just before sending the rotate signal.
-#
-#	Note, the 'squid -k rotate' command normally sends a USR1
-#	signal to the running squid process.  In certain situations
-#	(e.g. on Linux with Async I/O), USR1 is used for other
-#	purposes, so -k rotate uses another signal.  It is best to get
-#	in the habit of using 'squid -k rotate' instead of 'kill -USR1
-#	<pid>'.
-#
-#	Note, from Squid-3.1 this option is only a default for cache.log,
-#	that log can be rotated separately by using debug_options.
-#Default:
-# logfile_rotate 10
-
-#  TAG: emulate_httpd_log
-#	Replace this with an access_log directive using the format 'common' or 'combined'.
-#Default:
-# none
-
-#  TAG: log_ip_on_direct
-#	Remove this option from your config. To log server or peer names use %<A in the log format.
-#Default:
-# none
-
-#  TAG: mime_table
-#	Path to Squid's icon configuration file.
-#
-#	You shouldn't need to change this, but the default file contains
-#	examples and formatting information if you do.
-#Default:
-# mime_table /etc/squid/mime.conf
-
-#  TAG: log_mime_hdrs	on|off
-#	The Cache can record both the request and the response MIME
-#	headers for each HTTP transaction.  The headers are encoded
-#	safely and will appear as two bracketed fields at the end of
-#	the access log (for either the native or httpd-emulated log
-#	formats).  To enable this logging set log_mime_hdrs to 'on'.
-#Default:
-# log_mime_hdrs off
-
-#  TAG: useragent_log
-#	Replace this with an access_log directive using the format 'useragent'.
-#Default:
-# none
-
-#  TAG: referer_log
-#	Replace this with an access_log directive using the format 'referrer'.
-#Default:
-# none
-
-#  TAG: pid_filename
-#	A filename to write the process-id to.  To disable, enter "none".
-#Default:
-# pid_filename /var/run/squid
-
-#  TAG: log_fqdn
-#	Remove this option from your config. To log FQDN use %>A in the log format.
-#Default:
-# none
-
-#  TAG: client_netmask
-#	A netmask for client addresses in logfiles and cachemgr output.
-#	Change this to protect the privacy of your cache clients.
-#	A netmask of 255.255.255.0 will log all IP's in that range with
-#	the last digit set to '0'.
-#Default:
-# Log full client IP address
-
-#  TAG: forward_log
-#	Use a regular access.log with ACL limiting it to MISS events.
-#Default:
-# none
-
-#  TAG: strip_query_terms
-#	By default, Squid strips query terms from requested URLs before
-#	logging.  This protects your user's privacy and reduces log size.
-#
-#	When investigating HIT/MISS or other caching behaviour you
-#	will need to disable this to see the full URL used by Squid.
-#Default:
-# strip_query_terms on
-
-#  TAG: buffered_logs	on|off
-#	Whether to write/send access_log records ASAP or accumulate them and
-#	then write/send them in larger chunks. Buffering may improve
-#	performance because it decreases the number of I/Os. However,
-#	buffering increases the delay before log records become available to
-#	the final recipient (e.g., a disk file or logging daemon) and,
-#	hence, increases the risk of log records loss.
-#
-#	Note that even when buffered_logs are off, Squid may have to buffer
-#	records if it cannot write/send them immediately due to pending I/Os
-#	(e.g., the I/O writing the previous log record) or connectivity loss.
-#
-#	Currently honored by 'daemon' and 'tcp' access_log modules only.
-#Default:
-# buffered_logs off
-
-#  TAG: netdb_filename
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Where Squid stores it's netdb journal.
-#	When enabled this journal preserves netdb state between restarts.
-#
-#	To disable, enter "none".
-#Default:
-# netdb_filename stdio:/var/log/squid/netdb.state
-
-# OPTIONS FOR TROUBLESHOOTING
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_log
-#	Squid administrative logging file.
-#
-#	This is where general information about Squid behavior goes. You can
-#	increase the amount of data logged to this file and how often it is
-#	rotated with "debug_options"
-#Default:
-# cache_log /var/log/squid/cache.log
-
-#  TAG: debug_options
-#	Logging options are set as section,level where each source file
-#	is assigned a unique section.  Lower levels result in less
-#	output,  Full debugging (level 9) can result in a very large
-#	log file, so be careful.
-#
-#	The magic word "ALL" sets debugging levels for all sections.
-#	The default is to run with "ALL,1" to record important warnings.
-#
-#	The rotate=N option can be used to keep more or less of these logs
-#	than would otherwise be kept by logfile_rotate.
-#	For most uses a single log should be enough to monitor current
-#	events affecting Squid.
-#Default:
-# Log all critical and important messages.
-
-#  TAG: coredump_dir
-#	By default Squid leaves core files in the directory from where
-#	it was started. If you set 'coredump_dir' to a directory
-#	that exists, Squid will chdir() to that directory at startup
-#	and coredump files will be left there.
-#
-#Default:
-# Use the directory from where Squid was started.
-#
-
-# Leave coredumps in the first cache dir
-coredump_dir /var/log/squid/cache/squid
-
-# OPTIONS FOR FTP GATEWAYING
-# -----------------------------------------------------------------------------
-
-#  TAG: ftp_user
-#	If you want the anonymous login password to be more informative
-#	(and enable the use of picky FTP servers), set this to something
-#	reasonable for your domain, like wwwuser@somewhere.net
-#
-#	The reason why this is domainless by default is the
-#	request can be made on the behalf of a user in any domain,
-#	depending on how the cache is used.
-#	Some FTP server also validate the email address is valid
-#	(for example perl.com).
-#Default:
-# ftp_user Squid@
-
-#  TAG: ftp_passive
-#	If your firewall does not allow Squid to use passive
-#	connections, turn off this option.
-#
-#	Use of ftp_epsv_all option requires this to be ON.
-#Default:
-# ftp_passive on
-
-#  TAG: ftp_epsv_all
-#	FTP Protocol extensions permit the use of a special "EPSV ALL" command.
-#
-#	NATs may be able to put the connection on a "fast path" through the
-#	translator, as the EPRT command will never be used and therefore,
-#	translation of the data portion of the segments will never be needed.
-#
-#	When a client only expects to do two-way FTP transfers this may be
-#	useful.
-#	If squid finds that it must do a three-way FTP transfer after issuing
-#	an EPSV ALL command, the FTP session will fail.
-#
-#	If you have any doubts about this option do not use it.
-#	Squid will nicely attempt all other connection methods.
-#
-#	Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv_all off
-
-#  TAG: ftp_epsv
-#	FTP Protocol extensions permit the use of a special "EPSV" command.
-#
-#	NATs may be able to put the connection on a "fast path" through the
-#	translator using EPSV, as the EPRT command will never be used
-#	and therefore, translation of the data portion of the segments 
-#	will never be needed.
-#
-#	Turning this OFF will prevent EPSV being attempted.
-#	WARNING: Doing so will convert Squid back to the old behavior with all
-#	the related problems with external NAT devices/layers.
-#
-#	Requires ftp_passive to be ON (default) for any effect.
-#Default:
-# ftp_epsv on
-
-#  TAG: ftp_eprt
-#	FTP Protocol extensions permit the use of a special "EPRT" command.
-#
-#	This extension provides a protocol neutral alternative to the
-#	IPv4-only PORT command. When supported it enables active FTP data
-#	channels over IPv6 and efficient NAT handling.
-#
-#	Turning this OFF will prevent EPRT being attempted and will skip
-#	straight to using PORT for IPv4 servers.
-#
-#	Some devices are known to not handle this extension correctly and
-#	may result in crashes. Devices which suport EPRT enough to fail
-#	cleanly will result in Squid attempting PORT anyway. This directive
-#	should only be disabled when EPRT results in device failures.
-#
-#	WARNING: Doing so will convert Squid back to the old behavior with all
-#	the related problems with external NAT devices/layers and IPv4-only FTP.
-#Default:
-# ftp_eprt on
-
-#  TAG: ftp_sanitycheck
-#	For security and data integrity reasons Squid by default performs
-#	sanity checks of the addresses of FTP data connections ensure the
-#	data connection is to the requested server. If you need to allow
-#	FTP connections to servers using another IP address for the data
-#	connection turn this off.
-#Default:
-# ftp_sanitycheck on
-
-#  TAG: ftp_telnet_protocol
-#	The FTP protocol is officially defined to use the telnet protocol
-#	as transport channel for the control connection. However, many
-#	implementations are broken and does not respect this aspect of
-#	the FTP protocol.
-#
-#	If you have trouble accessing files with ASCII code 255 in the
-#	path or similar problems involving this ASCII code you can
-#	try setting this directive to off. If that helps, report to the
-#	operator of the FTP server in question that their FTP server
-#	is broken and does not follow the FTP standard.
-#Default:
-# ftp_telnet_protocol on
-
-# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS
-# -----------------------------------------------------------------------------
-
-#  TAG: diskd_program
-#	Specify the location of the diskd executable.
-#	Note this is only useful if you have compiled in
-#	diskd as one of the store io modules.
-#Default:
-# diskd_program /usr/libexec/diskd
-
-#  TAG: unlinkd_program
-#	Specify the location of the executable for file deletion process.
-#Default:
-# unlinkd_program /usr/libexec/unlinkd
-
-#  TAG: pinger_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Specify the location of the executable for the pinger process.
-#Default:
-# pinger_program /usr/libexec/pinger
-
-#  TAG: pinger_enable
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icmp
-#
-#	Control whether the pinger is active at run-time.
-#	Enables turning ICMP pinger on and off with a simple
-#	squid -k reconfigure.
-#Default:
-# pinger_enable on
-
-# OPTIONS FOR URL REWRITING
-# -----------------------------------------------------------------------------
-
-#  TAG: url_rewrite_program
-#	Specify the location of the executable URL rewriter to use.
-#	Since they can perform almost any function there isn't one included.
-#
-#	For each requested URL, the rewriter will receive on line with the format
-#
-#	  [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-#	After processing the request the helper must reply using the following format:
-#
-#	  [channel-ID <SP>] result [<SP> kv-pairs]
-#
-#	The result code can be:
-#
-#	  OK status=30N url="..."
-#		Redirect the URL to the one supplied in 'url='.
-#		'status=' is optional and contains the status code to send
-#		the client in Squids HTTP response. It must be one of the
-#		HTTP redirect status codes: 301, 302, 303, 307, 308.
-#		When no status is given Squid will use 302.
-#
-#	  OK rewrite-url="..."
-#		Rewrite the URL to the one supplied in 'rewrite-url='.
-#		The new URL is fetched directly by Squid and returned to
-#		the client as the response to its request.
-#
-#	  OK
-#		When neither of url= and rewrite-url= are sent Squid does
-#		not change the URL.
-#
-#	  ERR
-#		Do not change the URL.
-#
-#	  BH
-#		An internal error occurred in the helper, preventing
-#		a result being identified. The 'message=' key name is
-#		reserved for delivering a log message.
-#
-#
-#	In the future, the interface protocol will be extended with
-#	key=value pairs ("kv-pairs" shown above).  Helper programs
-#	should be prepared to receive and possibly ignore additional
-#	whitespace-separated tokens on each input line.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#	WARNING: URL re-writing ability should be avoided whenever possible.
-#		 Use the URL redirect form of response instead.
-#
-#	Re-write creates a difference in the state held by the client
-#	and server. Possibly causing confusion when the server response
-#	contains snippets of its view state. Embeded URLs, response
-#	and content Location headers, etc. are not re-written by this
-#	interface.
-#
-#	By default, a URL rewriter is not used.
-#Default:
-# none
-
-#  TAG: url_rewrite_children
-#	The maximum number of redirector processes to spawn. If you limit
-#	it too few Squid will have to wait for them to process a backlog of
-#	URLs, slowing it down. If you allow too many they will use RAM
-#	and other system resources noticably.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#
-#	The number of requests each redirector helper can handle in
-#	parallel. Defaults to 0 which indicates the redirector
-#	is a old-style single threaded redirector.
-#
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	an ID in front of the request/response. The ID from the request
-#	must be echoed back with the response to that request.
-#Default:
-# url_rewrite_children 20 startup=0 idle=1 concurrency=0
-
-#  TAG: url_rewrite_host_header
-#	To preserve same-origin security policies in browsers and
-#	prevent Host: header forgery by redirectors Squid rewrites
-#	any Host: header in redirected requests.
-#	
-#	If you are running an accelerator this may not be a wanted
-#	effect of a redirector. This directive enables you disable
-#	Host: alteration in reverse-proxy traffic.
-#	
-#	WARNING: Entries are cached on the result of the URL rewriting
-#	process, so be careful if you have domain-virtual hosts.
-#	
-#	WARNING: Squid and other software verifies the URL and Host
-#	are matching, so be careful not to relay through other proxies
-#	or inspecting firewalls with this disabled.
-#Default:
-# url_rewrite_host_header on
-
-#  TAG: url_rewrite_access
-#	If defined, this access list specifies which requests are
-#	sent to the redirector processes.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: url_rewrite_bypass
-#	When this is 'on', a request will not go through the
-#	redirector if all the helpers are busy.  If this is 'off'
-#	and the redirector queue grows too large, Squid will exit
-#	with a FATAL error and ask you to increase the number of
-#	redirectors.  You should only enable this if the redirectors
-#	are not critical to your caching system.  If you use
-#	redirectors for access control, and you enable this option,
-#	users may have access to pages they should not
-#	be allowed to request.
-#Default:
-# url_rewrite_bypass off
-
-# OPTIONS FOR STORE ID
-# -----------------------------------------------------------------------------
-
-#  TAG: store_id_program
-#	Specify the location of the executable StoreID helper to use.
-#	Since they can perform almost any function there isn't one included.
-#
-#	For each requested URL, the helper will receive one line with the format
-#
-#	  [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
-#
-#
-#	After processing the request the helper must reply using the following format:
-#
-#	  [channel-ID <SP>] result [<SP> kv-pairs]
-#
-#	The result code can be:
-#
-#	  OK store-id="..."
-#		Use the StoreID supplied in 'store-id='.
-#
-#	  ERR
-#		The default is to use HTTP request URL as the store ID.
-#
-#	  BH
-#		An internal error occured in the helper, preventing
-#		a result being identified.
-#
-#
-#	Helper programs should be prepared to receive and possibly ignore additional
-#	kv-pairs with keys they do not support.
-#
-#	When using the concurrency= option the protocol is changed by
-#	introducing a query channel tag in front of the request/response.
-#	The query channel tag is a number between 0 and concurrency-1.
-#	This value must be echoed back unchanged to Squid as the first part
-#	of the response relating to its request.
-#
-#	NOTE: when using StoreID refresh_pattern will apply to the StoreID
-#	      returned from the helper and not the URL.
-#
-#	WARNING: Wrong StoreID value returned by a careless helper may result
-#	         in the wrong cached response returned to the user.
-#
-#	By default, a StoreID helper is not used.
-#Default:
-# none
-
-#  TAG: store_id_children
-#	The maximum number of StoreID helper processes to spawn. If you limit
-#	it too few Squid will have to wait for them to process a backlog of
-#	requests, slowing it down. If you allow too many they will use RAM
-#	and other system resources noticably.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#
-#		concurrency=
-#
-#	The number of requests each storeID helper can handle in
-#	parallel. Defaults to 0 which indicates the helper
-#	is a old-style single threaded program.
-#
-#	When this directive is set to a value >= 1 then the protocol
-#	used to communicate with the helper is modified to include
-#	an ID in front of the request/response. The ID from the request
-#	must be echoed back with the response to that request.
-#Default:
-# store_id_children 20 startup=0 idle=1 concurrency=0
-
-#  TAG: store_id_access
-#	If defined, this access list specifies which requests are
-#	sent to the StoreID processes.  By default all requests
-#	are sent.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: store_id_bypass
-#	When this is 'on', a request will not go through the
-#	helper if all helpers are busy.  If this is 'off'
-#	and the helper queue grows too large, Squid will exit
-#	with a FATAL error and ask you to increase the number of
-#	helpers.  You should only enable this if the helperss
-#	are not critical to your caching system.  If you use
-#	helpers for critical caching components, and you enable this 
-#	option,	users may not get objects from cache.
-#Default:
-# store_id_bypass on
-
-# OPTIONS FOR TUNING THE CACHE
-# -----------------------------------------------------------------------------
-
-#  TAG: cache
-#	A list of ACL elements which, if matched and denied, cause the request to
-#	not be satisfied from the cache and the reply to not be cached.
-#	In other words, use this to force certain objects to never be cached.
-#
-#	You must use the words 'allow' or 'deny' to indicate whether items
-#	matching the ACL should be allowed or denied into the cache.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow caching, unless rules exist in squid.conf.
-
-#  TAG: max_stale	time-units
-#	This option puts an upper limit on how stale content Squid
-#	will serve from the cache if cache validation fails.
-#	Can be overriden by the refresh_pattern max-stale option.
-#Default:
-# max_stale 1 week
-
-#  TAG: refresh_pattern
-#	usage: refresh_pattern [-i] regex min percent max [options]
-#
-#	By default, regular expressions are CASE-SENSITIVE.  To make
-#	them case-insensitive, use the -i option.
-#
-#	'Min' is the time (in minutes) an object without an explicit
-#	expiry time should be considered fresh. The recommended
-#	value is 0, any higher values may cause dynamic applications
-#	to be erroneously cached unless the application designer
-#	has taken the appropriate actions.
-#
-#	'Percent' is a percentage of the objects age (time since last
-#	modification age) an object without explicit expiry time
-#	will be considered fresh.
-#
-#	'Max' is an upper limit on how long objects without an explicit
-#	expiry time will be considered fresh.
-#
-#	options: override-expire
-#		 override-lastmod
-#		 reload-into-ims
-#		 ignore-reload
-#		 ignore-no-store
-#		 ignore-must-revalidate
-#		 ignore-private
-#		 ignore-auth
-#		 max-stale=NN
-#		 refresh-ims
-#		 store-stale
-#
-#		override-expire enforces min age even if the server
-#		sent an explicit expiry time (e.g., with the
-#		Expires: header or Cache-Control: max-age). Doing this
-#		VIOLATES the HTTP standard.  Enabling this feature
-#		could make you liable for problems which it causes.
-#
-#		Note: override-expire does not enforce staleness - it only extends
-#		freshness / min. If the server returns a Expires time which
-#		is longer than your max time, Squid will still consider
-#		the object fresh for that period of time.
-#
-#		override-lastmod enforces min age even on objects
-#		that were modified recently.
-#
-#		reload-into-ims changes a client no-cache or ``reload''
-#		request for a cached entry into a conditional request using
-#		If-Modified-Since and/or If-None-Match headers, provided the
-#		cached entry has a Last-Modified and/or a strong ETag header.
-#		Doing this VIOLATES the HTTP standard. Enabling this feature
-#		could make you liable for problems which it causes.
-#
-#		ignore-reload ignores a client no-cache or ``reload''
-#		header. Doing this VIOLATES the HTTP standard. Enabling
-#		this feature could make you liable for problems which
-#		it causes.
-#
-#		ignore-no-store ignores any ``Cache-control: no-store''
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-must-revalidate ignores any ``Cache-Control: must-revalidate``
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-private ignores any ``Cache-control: private''
-#		headers received from a server. Doing this VIOLATES
-#		the HTTP standard. Enabling this feature could make you
-#		liable for problems which it causes.
-#
-#		ignore-auth caches responses to requests with authorization,
-#		as if the originserver had sent ``Cache-control: public''
-#		in the response header. Doing this VIOLATES the HTTP standard.
-#		Enabling this feature could make you liable for problems which
-#		it causes.
-#
-#		refresh-ims causes squid to contact the origin server
-#		when a client issues an If-Modified-Since request. This
-#		ensures that the client will receive an updated version
-#		if one is available.
-#
-#		store-stale stores responses even if they don't have explicit 
-#		freshness or a validator (i.e., Last-Modified or an ETag) 
-#		present, or if they're already stale. By default, Squid will 
-#		not cache such responses because they usually can't be
-#		reused. Note that such responses will be stale by default.
-#
-#		max-stale=NN provide a maximum staleness factor. Squid won't
-#		serve objects more stale than this even if it failed to
-#		validate the object. Default: use the max_stale global limit.
-#
-#	Basically a cached object is:
-#
-#		FRESH if expires < now, else STALE
-#		STALE if age > max
-#		FRESH if lm-factor < percent, else STALE
-#		FRESH if age < min
-#		else STALE
-#
-#	The refresh_pattern lines are checked in the order listed here.
-#	The first entry which matches is used.  If none of the entries
-#	match the default will be used.
-#
-#	Note, you must uncomment all the default lines if you want
-#	to change one. The default setting is only active if none is
-#	used.
-#
-#
-
-#
-# Add any of your own refresh_pattern entries above these.
-#
-refresh_pattern ^ftp:		1440	20%	10080
-refresh_pattern ^gopher:	1440	0%	1440
-refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
-refresh_pattern .		0	20%	4320
-
-#  TAG: quick_abort_min	(KB)
-#Default:
-# quick_abort_min 16 KB
-
-#  TAG: quick_abort_max	(KB)
-#Default:
-# quick_abort_max 16 KB
-
-#  TAG: quick_abort_pct	(percent)
-#	The cache by default continues downloading aborted requests
-#	which are almost completed (less than 16 KB remaining). This
-#	may be undesirable on slow (e.g. SLIP) links and/or very busy
-#	caches.  Impatient users may tie up file descriptors and
-#	bandwidth by repeatedly requesting and immediately aborting
-#	downloads.
-#
-#	When the user aborts a request, Squid will check the
-#	quick_abort values to the amount of data transferred until
-#	then.
-#
-#	If the transfer has less than 'quick_abort_min' KB remaining,
-#	it will finish the retrieval.
-#
-#	If the transfer has more than 'quick_abort_max' KB remaining,
-#	it will abort the retrieval.
-#
-#	If more than 'quick_abort_pct' of the transfer has completed,
-#	it will finish the retrieval.
-#
-#	If you do not want any retrieval to continue after the client
-#	has aborted, set both 'quick_abort_min' and 'quick_abort_max'
-#	to '0 KB'.
-#
-#	If you want retrievals to always continue if they are being
-#	cached set 'quick_abort_min' to '-1 KB'.
-#Default:
-# quick_abort_pct 95
-
-#  TAG: read_ahead_gap	buffer-size
-#	The amount of data the cache will buffer ahead of what has been
-#	sent to the client when retrieving an object from another server.
-#Default:
-# read_ahead_gap 16 KB
-
-#  TAG: negative_ttl	time-units
-#	Set the Default Time-to-Live (TTL) for failed requests.
-#	Certain types of failures (such as "connection refused" and
-#	"404 Not Found") are able to be negatively-cached for a short time.
-#	Modern web servers should provide Expires: header, however if they
-#	do not this can provide a minimum TTL.
-#	The default is not to cache errors with unknown expiry details.
-#
-#	Note that this is different from negative caching of DNS lookups.
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#Default:
-# negative_ttl 0 seconds
-
-#  TAG: positive_dns_ttl	time-units
-#	Upper limit on how long Squid will cache positive DNS responses.
-#	Default is 6 hours (360 minutes). This directive must be set
-#	larger than negative_dns_ttl.
-#Default:
-# positive_dns_ttl 6 hours
-
-#  TAG: negative_dns_ttl	time-units
-#	Time-to-Live (TTL) for negative caching of failed DNS lookups.
-#	This also sets the lower cache limit on positive lookups.
-#	Minimum value is 1 second, and it is not recommendable to go
-#	much below 10 seconds.
-#Default:
-# negative_dns_ttl 1 minutes
-
-#  TAG: range_offset_limit	size [acl acl...]
-#	usage: (size) [units] [[!]aclname]
-#	
-#	Sets an upper limit on how far (number of bytes) into the file 
-#	a Range request	may be to cause Squid to prefetch the whole file. 
-#	If beyond this limit, Squid forwards the Range request as it is and 
-#	the result is NOT cached.
-#	
-#	This is to stop a far ahead range request (lets say start at 17MB)
-#	from making Squid fetch the whole object up to that point before
-#	sending anything to the client.
-#	
-#	Multiple range_offset_limit lines may be specified, and they will 
-#	be searched from top to bottom on each request until a match is found. 
-#	The first match found will be used.  If no line matches a request, the 
-#	default limit of 0 bytes will be used.
-#	
-#	'size' is the limit specified as a number of units.
-#	
-#	'units' specifies whether to use bytes, KB, MB, etc.
-#	If no units are specified bytes are assumed.
-#	
-#	A size of 0 causes Squid to never fetch more than the
-#	client requested. (default)
-#	
-#	A size of 'none' causes Squid to always fetch the object from the
-#	beginning so it may cache the result. (2.0 style)
-#	
-#	'aclname' is the name of a defined ACL.
-#	
-#	NP: Using 'none' as the byte value here will override any quick_abort settings 
-#	    that may otherwise apply to the range request. The range request will
-#	    be fully fetched from start to finish regardless of the client
-#	    actions. This affects bandwidth usage.
-#Default:
-# none
-
-#  TAG: minimum_expiry_time	(seconds)
-#	The minimum caching time according to (Expires - Date)
-#	headers Squid honors if the object can't be revalidated.
-#	The default is 60 seconds.
-#
-#	In reverse proxy environments it might be desirable to honor
-#	shorter object lifetimes. It is most likely better to make
-#	your server return a meaningful Last-Modified header however.
-#
-#	In ESI environments where page fragments often have short
-#	lifetimes, this will often be best set to 0.
-#Default:
-# minimum_expiry_time 60 seconds
-
-#  TAG: store_avg_object_size	(bytes)
-#	Average object size, used to estimate number of objects your
-#	cache can hold.  The default is 13 KB.
-#
-#	This is used to pre-seed the cache index memory allocation to
-#	reduce expensive reallocate operations while handling clients
-#	traffic. Too-large values may result in memory allocation during
-#	peak traffic, too-small values will result in wasted memory.
-#
-#	Check the cache manager 'info' report metrics for the real
-#	object sizes seen by your Squid before tuning this.
-#Default:
-# store_avg_object_size 13 KB
-
-#  TAG: store_objects_per_bucket
-#	Target number of objects per bucket in the store hash table.
-#	Lowering this value increases the total number of buckets and
-#	also the storage maintenance rate.  The default is 20.
-#Default:
-# store_objects_per_bucket 20
-
-# HTTP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: request_header_max_size	(KB)
-#	This specifies the maximum size for HTTP headers in a request.
-#	Request headers are usually relatively small (about 512 bytes).
-#	Placing a limit on the request header size will catch certain
-#	bugs (for example with persistent connections) and possibly
-#	buffer-overflow or denial-of-service attacks.
-#Default:
-# request_header_max_size 64 KB
-
-#  TAG: reply_header_max_size	(KB)
-#	This specifies the maximum size for HTTP headers in a reply.
-#	Reply headers are usually relatively small (about 512 bytes).
-#	Placing a limit on the reply header size will catch certain
-#	bugs (for example with persistent connections) and possibly
-#	buffer-overflow or denial-of-service attacks.
-#Default:
-# reply_header_max_size 64 KB
-
-#  TAG: request_body_max_size	(bytes)
-#	This specifies the maximum size for an HTTP request body.
-#	In other words, the maximum size of a PUT/POST request.
-#	A user who attempts to send a request with a body larger
-#	than this limit receives an "Invalid Request" error message.
-#	If you set this parameter to a zero (the default), there will
-#	be no limit imposed.
-#
-#	See also client_request_buffer_max_size for an alternative
-#	limitation on client uploads which can be configured.
-#Default:
-# No limit.
-
-#  TAG: client_request_buffer_max_size	(bytes)
-#	This specifies the maximum buffer size of a client request.
-#	It prevents squid eating too much memory when somebody uploads
-#	a large file.
-#Default:
-# client_request_buffer_max_size 512 KB
-
-#  TAG: chunked_request_body_max_size	(bytes)
-#	A broken or confused HTTP/1.1 client may send a chunked HTTP
-#	request to Squid. Squid does not have full support for that
-#	feature yet. To cope with such requests, Squid buffers the
-#	entire request and then dechunks request body to create a
-#	plain HTTP/1.0 request with a known content length. The plain
-#	request is then used by the rest of Squid code as usual.
-#
-#	The option value specifies the maximum size of the buffer used
-#	to hold the request before the conversion. If the chunked
-#	request size exceeds the specified limit, the conversion
-#	fails, and the client receives an "unsupported request" error,
-#	as if dechunking was disabled.
-#
-#	Dechunking is enabled by default. To disable conversion of
-#	chunked requests, set the maximum to zero.
-#
-#	Request dechunking feature and this option in particular are a
-#	temporary hack. When chunking requests and responses are fully
-#	supported, there will be no need to buffer a chunked request.
-#Default:
-# chunked_request_body_max_size 64 KB
-
-#  TAG: broken_posts
-#	A list of ACL elements which, if matched, causes Squid to send
-#	an extra CRLF pair after the body of a PUT/POST request.
-#
-#	Some HTTP servers has broken implementations of PUT/POST,
-#	and rely on an extra CRLF pair sent by some WWW clients.
-#
-#	Quote from RFC2616 section 4.1 on this matter:
-#
-#	  Note: certain buggy HTTP/1.0 client implementations generate an
-#	  extra CRLF's after a POST request. To restate what is explicitly
-#	  forbidden by the BNF, an HTTP/1.1 client must not preface or follow
-#	  a request with an extra CRLF.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# acl buggy_server url_regex ^http://....
-# broken_posts allow buggy_server
-#Default:
-# Obey RFC 2616.
-
-#  TAG: adaptation_uses_indirect_client	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)
-#
-#	Controls whether the indirect client IP address (instead of the direct
-#	client IP address) is passed to adaptation services.
-#
-#	See also: follow_x_forwarded_for adaptation_send_client_ip
-#Default:
-# adaptation_uses_indirect_client on
-
-#  TAG: via	on|off
-#	If set (default), Squid will include a Via header in requests and
-#	replies as required by RFC2616.
-#Default:
-# via on
-
-#  TAG: ie_refresh	on|off
-#	Microsoft Internet Explorer up until version 5.5 Service
-#	Pack 1 has an issue with transparent proxies, wherein it
-#	is impossible to force a refresh.  Turning this on provides
-#	a partial fix to the problem, by causing all IMS-REFRESH
-#	requests from older IE versions to check the origin server
-#	for fresh content.  This reduces hit ratio by some amount
-#	(~10% in my experience), but allows users to actually get
-#	fresh content when they want it.  Note because Squid
-#	cannot tell if the user is using 5.5 or 5.5SP1, the behavior
-#	of 5.5 is unchanged from old versions of Squid (i.e. a
-#	forced refresh is impossible).  Newer versions of IE will,
-#	hopefully, continue to have the new behavior and will be
-#	handled based on that assumption.  This option defaults to
-#	the old Squid behavior, which is better for hit ratios but
-#	worse for clients using IE, if they need to be able to
-#	force fresh content.
-#Default:
-# ie_refresh off
-
-#  TAG: vary_ignore_expire	on|off
-#	Many HTTP servers supporting Vary gives such objects
-#	immediate expiry time with no cache-control header
-#	when requested by a HTTP/1.0 client. This option
-#	enables Squid to ignore such expiry times until
-#	HTTP/1.1 is fully implemented.
-#
-#	WARNING: If turned on this may eventually cause some
-#	varying objects not intended for caching to get cached.
-#Default:
-# vary_ignore_expire off
-
-#  TAG: request_entities
-#	Squid defaults to deny GET and HEAD requests with request entities,
-#	as the meaning of such requests are undefined in the HTTP standard
-#	even if not explicitly forbidden.
-#
-#	Set this directive to on if you have clients which insists
-#	on sending request entities in GET or HEAD requests. But be warned
-#	that there is server software (both proxies and web servers) which
-#	can fail to properly process this kind of request which may make you
-#	vulnerable to cache pollution attacks if enabled.
-#Default:
-# request_entities off
-
-#  TAG: request_header_access
-#	Usage: request_header_access header_name allow|deny [!]aclname ...
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#
-#	This option replaces the old 'anonymize_headers' and the
-#	older 'http_anonymizer' option with something that is much
-#	more configurable. A list of ACLs for each header name allows
-#	removal of specific header fields under specific conditions.
-#
-#	This option only applies to outgoing HTTP request headers (i.e.,
-#	headers sent by Squid to the next HTTP hop such as a cache peer
-#	or an origin server). The option has no effect during cache hit
-#	detection. The equivalent adaptation vectoring point in ICAP
-#	terminology is post-cache REQMOD.
-#
-#	The option is applied to individual outgoing request header
-#	fields. For each request header field F, Squid uses the first
-#	qualifying sets of request_header_access rules:
-#
-#	    1. Rules with header_name equal to F's name.
-#	    2. Rules with header_name 'Other', provided F's name is not
-#	       on the hard-coded list of commonly used HTTP header names.
-#	    3. Rules with header_name 'All'.
-#
-#	Within that qualifying rule set, rule ACLs are checked as usual.
-#	If ACLs of an "allow" rule match, the header field is allowed to
-#	go through as is. If ACLs of a "deny" rule match, the header is
-#	removed and request_header_replace is then checked to identify
-#	if the removed header has a replacement. If no rules within the
-#	set have matching ACLs, the header field is left as is.
-#
-#	For example, to achieve the same behavior as the old
-#	'http_anonymizer standard' option, you should use:
-#
-#		request_header_access From deny all
-#		request_header_access Referer deny all
-#		request_header_access User-Agent deny all
-#
-#	Or, to reproduce the old 'http_anonymizer paranoid' feature
-#	you should use:
-#
-#		request_header_access Authorization allow all
-#		request_header_access Proxy-Authorization allow all
-#		request_header_access Cache-Control allow all
-#		request_header_access Content-Length allow all
-#		request_header_access Content-Type allow all
-#		request_header_access Date allow all
-#		request_header_access Host allow all
-#		request_header_access If-Modified-Since allow all
-#		request_header_access Pragma allow all
-#		request_header_access Accept allow all
-#		request_header_access Accept-Charset allow all
-#		request_header_access Accept-Encoding allow all
-#		request_header_access Accept-Language allow all
-#		request_header_access Connection allow all
-#		request_header_access All deny all
-#
-#	HTTP reply headers are controlled with the reply_header_access directive.
-#
-#	By default, all headers are allowed (no anonymizing is performed).
-#Default:
-# No limits.
-
-#  TAG: reply_header_access
-#	Usage: reply_header_access header_name allow|deny [!]aclname ...
-#
-#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
-#	this feature could make you liable for problems which it
-#	causes.
-#
-#	This option only applies to reply headers, i.e., from the
-#	server to the client.
-#
-#	This is the same as request_header_access, but in the other
-#	direction. Please see request_header_access for detailed
-#	documentation.
-#
-#	For example, to achieve the same behavior as the old
-#	'http_anonymizer standard' option, you should use:
-#
-#		reply_header_access Server deny all
-#		reply_header_access WWW-Authenticate deny all
-#		reply_header_access Link deny all
-#
-#	Or, to reproduce the old 'http_anonymizer paranoid' feature
-#	you should use:
-#
-#		reply_header_access Allow allow all
-#		reply_header_access WWW-Authenticate allow all
-#		reply_header_access Proxy-Authenticate allow all
-#		reply_header_access Cache-Control allow all
-#		reply_header_access Content-Encoding allow all
-#		reply_header_access Content-Length allow all
-#		reply_header_access Content-Type allow all
-#		reply_header_access Date allow all
-#		reply_header_access Expires allow all
-#		reply_header_access Last-Modified allow all
-#		reply_header_access Location allow all
-#		reply_header_access Pragma allow all
-#		reply_header_access Content-Language allow all
-#		reply_header_access Retry-After allow all
-#		reply_header_access Title allow all
-#		reply_header_access Content-Disposition allow all
-#		reply_header_access Connection allow all
-#		reply_header_access All deny all
-#
-#	HTTP request headers are controlled with the request_header_access directive.
-#
-#	By default, all headers are allowed (no anonymizing is
-#	performed).
-#Default:
-# No limits.
-
-#  TAG: request_header_replace
-#	Usage:   request_header_replace header_name message
-#	Example: request_header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit)
-#
-#	This option allows you to change the contents of headers
-#	denied with request_header_access above, by replacing them
-#	with some fixed string.
-#
-#	This only applies to request headers, not reply headers.
-#
-#	By default, headers are removed if denied.
-#Default:
-# none
-
-#  TAG: reply_header_replace
-#        Usage:   reply_header_replace header_name message
-#        Example: reply_header_replace Server Foo/1.0
-#
-#        This option allows you to change the contents of headers
-#        denied with reply_header_access above, by replacing them
-#        with some fixed string.
-#
-#        This only applies to reply headers, not request headers.
-#
-#        By default, headers are removed if denied.
-#Default:
-# none
-
-#  TAG: request_header_add
-#	Usage:   request_header_add field-name field-value acl1 [acl2] ...
-#	Example: request_header_add X-Client-CA "CA=%ssl::>cert_issuer" all
-#
-#	This option adds header fields to outgoing HTTP requests (i.e.,
-#	request headers sent by Squid to the next HTTP hop such as a
-#	cache peer or an origin server). The option has no effect during
-#	cache hit detection. The equivalent adaptation vectoring point
-#	in ICAP terminology is post-cache REQMOD.
-#
-#	Field-name is a token specifying an HTTP header name. If a
-#	standard HTTP header name is used, Squid does not check whether
-#	the new header conflicts with any existing headers or violates
-#	HTTP rules. If the request to be modified already contains a
-#	field with the same name, the old field is preserved but the
-#	header field values are not merged.
-#
-#	Field-value is either a token or a quoted string. If quoted
-#	string format is used, then the surrounding quotes are removed
-#	while escape sequences and %macros are processed.
-#
-#	In theory, all of the logformat codes can be used as %macros.
-#	However, unlike logging (which happens at the very end of
-#	transaction lifetime), the transaction may not yet have enough
-#	information to expand a macro when the new header value is needed.
-#	And some information may already be available to Squid but not yet
-#	committed where the macro expansion code can access it (report
-#	such instances!). The macro will be expanded into a single dash
-#	('-') in such cases. Not all macros have been tested.
-#
-#	One or more Squid ACLs may be specified to restrict header
-#	injection to matching requests. As always in squid.conf, all
-#	ACLs in an option ACL list must be satisfied for the insertion
-#	to happen. The request_header_add option supports fast ACLs
-#	only.
-#Default:
-# none
-
-#  TAG: note
-#	This option used to log custom information about the master
-#	transaction. For example, an admin may configure Squid to log
-#	which "user group" the transaction belongs to, where "user group"
-#	will be determined based on a set of ACLs and not [just]
-#	authentication information.
-#	Values of key/value pairs can be logged using %{key}note macros:
-#
-#	    note key value acl ...
-#	    logformat myFormat ... %{key}note ...
-#Default:
-# none
-
-#  TAG: relaxed_header_parser	on|off|warn
-#	In the default "on" setting Squid accepts certain forms
-#	of non-compliant HTTP messages where it is unambiguous
-#	what the sending application intended even if the message
-#	is not correctly formatted. The messages is then normalized
-#	to the correct form when forwarded by Squid.
-#
-#	If set to "warn" then a warning will be emitted in cache.log
-#	each time such HTTP error is encountered.
-#
-#	If set to "off" then such HTTP errors will cause the request
-#	or response to be rejected.
-#Default:
-# relaxed_header_parser on
-
-# TIMEOUTS
-# -----------------------------------------------------------------------------
-
-#  TAG: forward_timeout	time-units
-#	This parameter specifies how long Squid should at most attempt in
-#	finding a forwarding path for the request before giving up.
-#Default:
-# forward_timeout 4 minutes
-
-#  TAG: connect_timeout	time-units
-#	This parameter specifies how long to wait for the TCP connect to
-#	the requested server or peer to complete before Squid should
-#	attempt to find another path where to forward the request.
-#Default:
-# connect_timeout 1 minute
-
-#  TAG: peer_connect_timeout	time-units
-#	This parameter specifies how long to wait for a pending TCP
-#	connection to a peer cache.  The default is 30 seconds.   You
-#	may also set different timeout values for individual neighbors
-#	with the 'connect-timeout' option on a 'cache_peer' line.
-#Default:
-# peer_connect_timeout 30 seconds
-
-#  TAG: read_timeout	time-units
-#	The read_timeout is applied on server-side connections.  After
-#	each successful read(), the timeout will be extended by this
-#	amount.  If no data is read again after this amount of time,
-#	the request is aborted and logged with ERR_READ_TIMEOUT.  The
-#	default is 15 minutes.
-#Default:
-# read_timeout 15 minutes
-
-#  TAG: write_timeout	time-units
-#	This timeout is tracked for all connections that have data
-#	available for writing and are waiting for the socket to become
-#	ready. After each successful write, the timeout is extended by
-#	the configured amount. If Squid has data to write but the
-#	connection is not ready for the configured duration, the
-#	transaction associated with the connection is terminated. The
-#	default is 15 minutes.
-#Default:
-# write_timeout 15 minutes
-
-#  TAG: request_timeout
-#	How long to wait for complete HTTP request headers after initial
-#	connection establishment.
-#Default:
-# request_timeout 5 minutes
-
-#  TAG: client_idle_pconn_timeout
-#	How long to wait for the next HTTP request on a persistent
-#	client connection after the previous request completes.
-#Default:
-# client_idle_pconn_timeout 2 minutes
-
-#  TAG: client_lifetime	time-units
-#	The maximum amount of time a client (browser) is allowed to
-#	remain connected to the cache process.  This protects the Cache
-#	from having a lot of sockets (and hence file descriptors) tied up
-#	in a CLOSE_WAIT state from remote clients that go away without
-#	properly shutting down (either because of a network failure or
-#	because of a poor client implementation).  The default is one
-#	day, 1440 minutes.
-#
-#	NOTE:  The default value is intended to be much larger than any
-#	client would ever need to be connected to your cache.  You
-#	should probably change client_lifetime only as a last resort.
-#	If you seem to have many client connections tying up
-#	filedescriptors, we recommend first tuning the read_timeout,
-#	request_timeout, persistent_request_timeout and quick_abort values.
-#Default:
-# client_lifetime 1 day
-
-#  TAG: half_closed_clients
-#	Some clients may shutdown the sending side of their TCP
-#	connections, while leaving their receiving sides open.	Sometimes,
-#	Squid can not tell the difference between a half-closed and a
-#	fully-closed TCP connection.
-#
-#	By default, Squid will immediately close client connections when
-#	read(2) returns "no more data to read."
-#
-#	Change this option to 'on' and Squid will keep open connections
-#	until a read(2) or write(2) on the socket returns an error.
-#	This may show some benefits for reverse proxies. But if not
-#	it is recommended to leave OFF.
-#Default:
-# half_closed_clients off
-
-#  TAG: server_idle_pconn_timeout
-#	Timeout for idle persistent connections to servers and other
-#	proxies.
-#Default:
-# server_idle_pconn_timeout 1 minute
-
-#  TAG: ident_timeout
-#	Maximum time to wait for IDENT lookups to complete.
-#
-#	If this is too high, and you enabled IDENT lookups from untrusted
-#	users, you might be susceptible to denial-of-service by having
-#	many ident requests going at once.
-#Default:
-# ident_timeout 10 seconds
-
-#  TAG: shutdown_lifetime	time-units
-#	When SIGTERM or SIGHUP is received, the cache is put into
-#	"shutdown pending" mode until all active sockets are closed.
-#	This value is the lifetime to set for all open descriptors
-#	during shutdown mode.  Any active clients after this many
-#	seconds will receive a 'timeout' message.
-#Default:
-# shutdown_lifetime 30 seconds
-
-# ADMINISTRATIVE PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: cache_mgr
-#	Email-address of local cache manager who will receive
-#	mail if the cache dies.  The default is "webmaster".
-#Default:
-# cache_mgr webmaster
-
-#  TAG: mail_from
-#	From: email-address for mail sent when the cache dies.
-#	The default is to use 'squid@unique_hostname'.
-#
-#	See also: unique_hostname directive.
-#Default:
-# none
-
-#  TAG: mail_program
-#	Email program used to send mail if the cache dies.
-#	The default is "mail". The specified program must comply
-#	with the standard Unix mail syntax:
-#	  mail-program recipient < mailfile
-#
-#	Optional command line options can be specified.
-#Default:
-# mail_program mail
-
-#  TAG: cache_effective_user
-#	If you start Squid as root, it will change its effective/real
-#	UID/GID to the user specified below.  The default is to change
-#	to UID of nobody.
-#	see also; cache_effective_group
-#Default:
-# cache_effective_user nobody
-
-#  TAG: cache_effective_group
-#	Squid sets the GID to the effective user's default group ID
-#	(taken from the password file) and supplementary group list
-#	from the groups membership.
-#
-#	If you want Squid to run with a specific GID regardless of
-#	the group memberships of the effective user then set this
-#	to the group (or GID) you want Squid to run as. When set
-#	all other group privileges of the effective user are ignored
-#	and only this GID is effective. If Squid is not started as
-#	root the user starting Squid MUST be member of the specified
-#	group.
-#
-#	This option is not recommended by the Squid Team.
-#	Our preference is for administrators to configure a secure
-#	user account for squid with UID/GID matching system policies.
-#Default:
-# Use system group memberships of the cache_effective_user account
-
-#  TAG: httpd_suppress_version_string	on|off
-#	Suppress Squid version string info in HTTP headers and HTML error pages.
-#Default:
-# httpd_suppress_version_string off
-
-#  TAG: visible_hostname
-#	If you want to present a special hostname in error messages, etc,
-#	define this.  Otherwise, the return value of gethostname()
-#	will be used. If you have multiple caches in a cluster and
-#	get errors about IP-forwarding you must set them to have individual
-#	names with this setting.
-#Default:
-# Automatically detect the system host name
-
-#  TAG: unique_hostname
-#	If you want to have multiple machines with the same
-#	'visible_hostname' you must give each machine a different
-#	'unique_hostname' so forwarding loops can be detected.
-#Default:
-# Copy the value from visible_hostname
-
-#  TAG: hostname_aliases
-#	A list of other DNS names your cache has.
-#Default:
-# none
-
-#  TAG: umask
-#	Minimum umask which should be enforced while the proxy
-#	is running, in addition to the umask set at startup.
-#
-#	For a traditional octal representation of umasks, start
-#        your value with 0.
-#Default:
-# umask 027
-
-# OPTIONS FOR THE CACHE REGISTRATION SERVICE
-# -----------------------------------------------------------------------------
-#
-#	This section contains parameters for the (optional) cache
-#	announcement service.  This service is provided to help
-#	cache administrators locate one another in order to join or
-#	create cache hierarchies.
-#
-#	An 'announcement' message is sent (via UDP) to the registration
-#	service by Squid.  By default, the announcement message is NOT
-#	SENT unless you enable it with 'announce_period' below.
-#
-#	The announcement message includes your hostname, plus the
-#	following information from this configuration file:
-#
-#		http_port
-#		icp_port
-#		cache_mgr
-#
-#	All current information is processed regularly and made
-#	available on the Web at http://www.ircache.net/Cache/Tracker/.
-
-#  TAG: announce_period
-#	This is how frequently to send cache announcements.
-#
-#	To enable announcing your cache, just set an announce period.
-#
-#	Example:
-#		announce_period 1 day
-#Default:
-# Announcement messages disabled.
-
-#  TAG: announce_host
-#	Set the hostname where announce registration messages will be sent.
-#
-#	See also announce_port and announce_file
-#Default:
-# announce_host tracker.ircache.net
-
-#  TAG: announce_file
-#	The contents of this file will be included in the announce
-#	registration messages.
-#Default:
-# none
-
-#  TAG: announce_port
-#	Set the port where announce registration messages will be sent.
-#
-#	See also announce_host and announce_file
-#Default:
-# announce_port 3131
-
-# HTTPD-ACCELERATOR OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: httpd_accel_surrogate_id
-#	Surrogates (http://www.esi.org/architecture_spec_1.0.html)
-#	need an identification token to allow control targeting. Because
-#	a farm of surrogates may all perform the same tasks, they may share
-#	an identification token.
-#Default:
-# visible_hostname is used if no specific ID is set.
-
-#  TAG: http_accel_surrogate_remote	on|off
-#	Remote surrogates (such as those in a CDN) honour the header
-#	"Surrogate-Control: no-store-remote".
-#
-#	Set this to on to have squid behave as a remote surrogate.
-#Default:
-# http_accel_surrogate_remote off
-
-#  TAG: esi_parser	libxml2|expat|custom
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-esi
-#
-#	ESI markup is not strictly XML compatible. The custom ESI parser
-#	will give higher performance, but cannot handle non ASCII character
-#	encodings.
-#Default:
-# esi_parser custom
-
-# DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This represents the number of delay pools to be used.  For example,
-#	if you have one class 2 delay pool and one class 3 delays pool, you
-#	have a total of 2 delay pools.
-#
-#	See also delay_parameters, delay_class, delay_access for pool
-#	configuration details.
-#Default:
-# delay_pools 0
-
-#  TAG: delay_class
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This defines the class of each delay pool.  There must be exactly one
-#	delay_class line for each delay pool.  For example, to define two
-#	delay pools, one of class 2 and one of class 3, the settings above
-#	and here would be:
-#
-#	Example:
-#	    delay_pools 4      # 4 delay pools
-#	    delay_class 1 2    # pool 1 is a class 2 pool
-#	    delay_class 2 3    # pool 2 is a class 3 pool
-#	    delay_class 3 4    # pool 3 is a class 4 pool
-#	    delay_class 4 5    # pool 4 is a class 5 pool
-#
-#	The delay pool classes are:
-#
-#		class 1		Everything is limited by a single aggregate
-#				bucket.
-#
-#		class 2 	Everything is limited by a single aggregate
-#				bucket as well as an "individual" bucket chosen
-#				from bits 25 through 32 of the IPv4 address.
-#
-#		class 3		Everything is limited by a single aggregate
-#				bucket as well as a "network" bucket chosen
-#				from bits 17 through 24 of the IP address and a
-#				"individual" bucket chosen from bits 17 through
-#				32 of the IPv4 address.
-#
-#		class 4		Everything in a class 3 delay pool, with an
-#				additional limit on a per user basis. This
-#				only takes effect if the username is established
-#				in advance - by forcing authentication in your
-#				http_access rules.
-#
-#		class 5		Requests are grouped according their tag (see
-#				external_acl's tag= reply).
-#
-#
-#	Each pool also requires a delay_parameters directive to configure the pool size
-#	and speed limits used whenever the pool is applied to a request. Along with
-#	a set of delay_access directives to determine when it is used.
-#
-#	NOTE: If an IP address is a.b.c.d
-#		-> bits 25 through 32 are "d"
-#		-> bits 17 through 24 are "c"
-#		-> bits 17 through 32 are "c * 256 + d"
-#
-#	NOTE-2: Due to the use of bitmasks in class 2,3,4 pools they only apply to
-#		IPv4 traffic. Class 1 and 5 pools may be used with IPv6 traffic.
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#	See also delay_parameters and delay_access.
-#Default:
-# none
-
-#  TAG: delay_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This is used to determine which delay pool a request falls into.
-#
-#	delay_access is sorted per pool and the matching starts with pool 1,
-#	then pool 2, ..., and finally pool N. The first delay pool where the
-#	request is allowed is selected for the request. If it does not allow
-#	the request to any pool then the request is not delayed (default).
-#
-#	For example, if you want some_big_clients in delay
-#	pool 1 and lotsa_little_clients in delay pool 2:
-#
-#		delay_access 1 allow some_big_clients
-#		delay_access 1 deny all
-#		delay_access 2 allow lotsa_little_clients
-#		delay_access 2 deny all
-#		delay_access 3 allow authenticated_clients
-#
-#	See also delay_parameters and delay_class.
-#
-#Default:
-# Deny using the pool, unless allow rules exist in squid.conf for the pool.
-
-#  TAG: delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This defines the parameters for a delay pool.  Each delay pool has
-#	a number of "buckets" associated with it, as explained in the
-#	description of delay_class.
-#
-#	For a class 1 delay pool, the syntax is:
-#		delay_pools pool 1
-#		delay_parameters pool aggregate
-#
-#	For a class 2 delay pool:
-#		delay_pools pool 2
-#		delay_parameters pool aggregate individual
-#
-#	For a class 3 delay pool:
-#		delay_pools pool 3
-#		delay_parameters pool aggregate network individual
-#
-#	For a class 4 delay pool:
-#		delay_pools pool 4
-#		delay_parameters pool aggregate network individual user
-#
-#	For a class 5 delay pool:
-#		delay_pools pool 5
-#		delay_parameters pool tagrate
-#
-#	The option variables are:
-#
-#		pool		a pool number - ie, a number between 1 and the
-#				number specified in delay_pools as used in
-#				delay_class lines.
-#
-#		aggregate	the speed limit parameters for the aggregate bucket
-#				(class 1, 2, 3).
-#
-#		individual	the speed limit parameters for the individual
-#				buckets (class 2, 3).
-#
-#		network		the speed limit parameters for the network buckets
-#				(class 3).
-#
-#		user		the speed limit parameters for the user buckets
-#				(class 4).
-#
-#		tagrate		the speed limit parameters for the tag buckets
-#				(class 5).
-#
-#	A pair of delay parameters is written restore/maximum, where restore is
-#	the number of bytes (not bits - modem and network speeds are usually
-#	quoted in bits) per second placed into the bucket, and maximum is the
-#	maximum number of bytes which can be in the bucket at any time.
-#
-#	There must be one delay_parameters line for each delay pool.
-#
-#
-#	For example, if delay pool number 1 is a class 2 delay pool as in the
-#	above example, and is being used to strictly limit each host to 64Kbit/sec
-#	(plus overheads), with no overall limit, the line is:
-#
-#		delay_parameters 1 -1/-1 8000/8000
-#
-#	Note that 8 x 8000 KByte/sec -> 64Kbit/sec.
-#
-#	Note that the figure -1 is used to represent "unlimited".
-#
-#
-#	And, if delay pool number 2 is a class 3 delay pool as in the above
-#	example, and you want to limit it to a total of 256Kbit/sec (strict limit)
-#	with each 8-bit network permitted 64Kbit/sec (strict limit) and each
-#	individual host permitted 4800bit/sec with a bucket maximum size of 64Kbits
-#	to permit a decent web page to be downloaded at a decent speed
-#	(if the network is not being limited due to overuse) but slow down
-#	large downloads more significantly:
-#
-#		delay_parameters 2 32000/32000 8000/8000 600/8000
-#
-#	Note that 8 x 32000 KByte/sec -> 256Kbit/sec.
-#		  8 x  8000 KByte/sec ->  64Kbit/sec.
-#		  8 x   600 Byte/sec  -> 4800bit/sec.
-#
-#
-#	Finally, for a class 4 delay pool as in the example - each user will
-#	be limited to 128Kbits/sec no matter how many workstations they are logged into.:
-#
-#		delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000
-#
-#
-#	See also delay_class and delay_access.
-#
-#Default:
-# none
-
-#  TAG: delay_initial_bucket_level	(percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	The initial bucket percentage is used to determine how much is put
-#	in each bucket when squid starts, is reconfigured, or first notices
-#	a host accessing it (in class 2 and class 3, individual hosts and
-#	networks only have buckets associated with them once they have been
-#	"seen" by squid).
-#Default:
-# delay_initial_bucket_level 50
-
-# CLIENT DELAY POOL PARAMETERS
-# -----------------------------------------------------------------------------
-
-#  TAG: client_delay_pools
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option specifies the number of client delay pools used. It must
-#	preceed other client_delay_* options.
-#
-#	Example:
-#		client_delay_pools 2
-#
-#	See also client_delay_parameters and client_delay_access.
-#Default:
-# client_delay_pools 0
-
-#  TAG: client_delay_initial_bucket_level	(percent, 0-no_limit)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option determines the initial bucket size as a percentage of
-#	max_bucket_size from client_delay_parameters. Buckets are created
-#	at the time of the "first" connection from the matching IP. Idle
-#	buckets are periodically deleted up.
-#
-#	You can specify more than 100 percent but note that such "oversized"
-#	buckets are not refilled until their size goes down to max_bucket_size
-#	from client_delay_parameters.
-#
-#	Example:
-#		client_delay_initial_bucket_level 50
-#Default:
-# client_delay_initial_bucket_level 50
-
-#  TAG: client_delay_parameters
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#
-#	This option configures client-side bandwidth limits using the
-#	following format:
-#
-#	    client_delay_parameters pool speed_limit max_bucket_size
-#
-#	pool is an integer ID used for client_delay_access matching.
-#
-#	speed_limit is bytes added to the bucket per second.
-#
-#	max_bucket_size is the maximum size of a bucket, enforced after any
-#	speed_limit additions.
-#
-#	Please see the delay_parameters option for more information and
-#	examples.
-#
-#	Example:
-#		client_delay_parameters 1 1024 2048
-#		client_delay_parameters 2 51200 16384
-#
-#	See also client_delay_access.
-#
-#Default:
-# none
-
-#  TAG: client_delay_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-delay-pools
-#
-#	This option determines the client-side delay pool for the
-#	request:
-#
-#	    client_delay_access pool_ID allow|deny acl_name
-#
-#	All client_delay_access options are checked in their pool ID
-#	order, starting with pool 1. The first checked pool with allowed
-#	request is selected for the request. If no ACL matches or there
-#	are no client_delay_access options, the request bandwidth is not
-#	limited.
-#
-#	The ACL-selected pool is then used to find the
-#	client_delay_parameters for the request. Client-side pools are
-#	not used to aggregate clients. Clients are always aggregated
-#	based on their source IP addresses (one bucket per source IP).
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#	Additionally, only the client TCP connection details are available.
-#	ACLs testing HTTP properties will not work.
-#
-#	Please see delay_access for more examples.
-#
-#	Example:
-#		client_delay_access 1 allow low_rate_network
-#		client_delay_access 2 allow vips_network
-#
-#
-#	See also client_delay_parameters and client_delay_pools.
-#Default:
-# Deny use of the pool, unless allow rules exist in squid.conf for the pool.
-
-# WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: wccp_router
-#	Use this option to define your WCCP ``home'' router for
-#	Squid.
-#
-#	wccp_router supports a single WCCP(v1) router
-#
-#	wccp2_router supports multiple WCCPv2 routers
-#
-#	only one of the two may be used at the same time and defines
-#	which version of WCCP to use.
-#Default:
-# WCCP disabled.
-
-#  TAG: wccp2_router
-#	Use this option to define your WCCP ``home'' router for
-#	Squid.
-#
-#	wccp_router supports a single WCCP(v1) router
-#
-#	wccp2_router supports multiple WCCPv2 routers
-#
-#	only one of the two may be used at the same time and defines
-#	which version of WCCP to use.
-#Default:
-# WCCPv2 disabled.
-
-#  TAG: wccp_version
-#	This directive is only relevant if you need to set up WCCP(v1)
-#	to some very old and end-of-life Cisco routers. In all other
-#	setups it must be left unset or at the default setting.
-#	It defines an internal version in the WCCP(v1) protocol,
-#	with version 4 being the officially documented protocol.
-#
-#	According to some users, Cisco IOS 11.2 and earlier only
-#	support WCCP version 3.  If you're using that or an earlier
-#	version of IOS, you may need to change this value to 3, otherwise
-#	do not specify this parameter.
-#Default:
-# wccp_version 4
-
-#  TAG: wccp2_rebuild_wait
-#	If this is enabled Squid will wait for the cache dir rebuild to finish
-#	before sending the first wccp2 HereIAm packet
-#Default:
-# wccp2_rebuild_wait on
-
-#  TAG: wccp2_forwarding_method
-#	WCCP2 allows the setting of forwarding methods between the
-#	router/switch and the cache.  Valid values are as follows:
-#
-#	gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-#	l2  - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-#	Currently (as of IOS 12.4) cisco routers only support GRE.
-#	Cisco switches only support the L2 redirect assignment method.
-#Default:
-# wccp2_forwarding_method gre
-
-#  TAG: wccp2_return_method
-#	WCCP2 allows the setting of return methods between the
-#	router/switch and the cache for packets that the cache
-#	decides not to handle.  Valid values are as follows:
-#
-#	gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
-#	l2  - L2 redirect (forward the packet using Layer 2/MAC rewriting)
-#
-#	Currently (as of IOS 12.4) cisco routers only support GRE.
-#	Cisco switches only support the L2 redirect assignment.
-#
-#	If the "ip wccp redirect exclude in" command has been
-#	enabled on the cache interface, then it is still safe for
-#	the proxy server to use a l2 redirect method even if this
-#	option is set to GRE.
-#Default:
-# wccp2_return_method gre
-
-#  TAG: wccp2_assignment_method
-#	WCCP2 allows the setting of methods to assign the WCCP hash
-#	Valid values are as follows:
-#
-#	hash - Hash assignment
-#	mask - Mask assignment
-#
-#	As a general rule, cisco routers support the hash assignment method
-#	and cisco switches support the mask assignment method.
-#Default:
-# wccp2_assignment_method hash
-
-#  TAG: wccp2_service
-#	WCCP2 allows for multiple traffic services. There are two
-#	types: "standard" and "dynamic". The standard type defines
-#	one service id - http (id 0). The dynamic service ids can be from
-#	51 to 255 inclusive.  In order to use a dynamic service id
-#	one must define the type of traffic to be redirected; this is done
-#	using the wccp2_service_info option.
-#
-#	The "standard" type does not require a wccp2_service_info option,
-#	just specifying the service id will suffice.
-#
-#	MD5 service authentication can be enabled by adding
-#	"password=<password>" to the end of this service declaration.
-#
-#	Examples:
-#
-#	wccp2_service standard 0	# for the 'web-cache' standard service
-#	wccp2_service dynamic 80	# a dynamic service type which will be
-#					# fleshed out with subsequent options.
-#	wccp2_service standard 0 password=foo
-#Default:
-# Use the 'web-cache' standard service.
-
-#  TAG: wccp2_service_info
-#	Dynamic WCCPv2 services require further information to define the
-#	traffic you wish to have diverted.
-#
-#	The format is:
-#
-#	wccp2_service_info <id> protocol=<protocol> flags=<flag>,<flag>..
-#	    priority=<priority> ports=<port>,<port>..
-#
-#	The relevant WCCPv2 flags:
-#	+ src_ip_hash, dst_ip_hash
-#	+ source_port_hash, dst_port_hash
-#	+ src_ip_alt_hash, dst_ip_alt_hash
-#	+ src_port_alt_hash, dst_port_alt_hash
-#	+ ports_source
-#
-#	The port list can be one to eight entries.
-#
-#	Example:
-#
-#	wccp2_service_info 80 protocol=tcp flags=src_ip_hash,ports_source
-#	    priority=240 ports=80
-#
-#	Note: the service id must have been defined by a previous
-#	'wccp2_service dynamic <id>' entry.
-#Default:
-# none
-
-#  TAG: wccp2_weight
-#	Each cache server gets assigned a set of the destination
-#	hash proportional to their weight.
-#Default:
-# wccp2_weight 10000
-
-#  TAG: wccp_address
-#	Use this option if you require WCCPv2 to use a specific
-#	interface address.
-#
-#	The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-#  TAG: wccp2_address
-#	Use this option if you require WCCP to use a specific
-#	interface address.
-#
-#	The default behavior is to not bind to any specific address.
-#Default:
-# Address selected by the operating system.
-
-# PERSISTENT CONNECTION HANDLING
-# -----------------------------------------------------------------------------
-#
-# Also see "pconn_timeout" in the TIMEOUTS section
-
-#  TAG: client_persistent_connections
-#	Persistent connection support for clients.
-#	Squid uses persistent connections (when allowed). You can use
-#	this option to disable persistent connections with clients.
-#Default:
-# client_persistent_connections on
-
-#  TAG: server_persistent_connections
-#	Persistent connection support for servers.
-#	Squid uses persistent connections (when allowed). You can use
-#	this option to disable persistent connections with servers.
-#Default:
-# server_persistent_connections on
-
-#  TAG: persistent_connection_after_error
-#	With this directive the use of persistent connections after
-#	HTTP errors can be disabled. Useful if you have clients
-#	who fail to handle errors on persistent connections proper.
-#Default:
-# persistent_connection_after_error on
-
-#  TAG: detect_broken_pconn
-#	Some servers have been found to incorrectly signal the use
-#	of HTTP/1.0 persistent connections even on replies not
-#	compatible, causing significant delays. This server problem
-#	has mostly been seen on redirects.
-#
-#	By enabling this directive Squid attempts to detect such
-#	broken replies and automatically assume the reply is finished
-#	after 10 seconds timeout.
-#Default:
-# detect_broken_pconn off
-
-# CACHE DIGEST OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: digest_generation
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This controls whether the server will generate a Cache Digest
-#	of its contents.  By default, Cache Digest generation is
-#	enabled if Squid is compiled with --enable-cache-digests defined.
-#Default:
-# digest_generation on
-
-#  TAG: digest_bits_per_entry
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the number of bits of the server's Cache Digest which
-#	will be associated with the Digest entry for a given HTTP
-#	Method and URL (public key) combination.  The default is 5.
-#Default:
-# digest_bits_per_entry 5
-
-#  TAG: digest_rebuild_period	(seconds)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the wait time between Cache Digest rebuilds.
-#Default:
-# digest_rebuild_period 1 hour
-
-#  TAG: digest_rewrite_period	(seconds)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the wait time between Cache Digest writes to
-#	disk.
-#Default:
-# digest_rewrite_period 1 hour
-
-#  TAG: digest_swapout_chunk_size	(bytes)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the number of bytes of the Cache Digest to write to
-#	disk at a time.  It defaults to 4096 bytes (4KB), the Squid
-#	default swap page.
-#Default:
-# digest_swapout_chunk_size 4096 bytes
-
-#  TAG: digest_rebuild_chunk_percentage	(percent, 0-100)
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-cache-digests
-#
-#	This is the percentage of the Cache Digest to be scanned at a
-#	time.  By default it is set to 10% of the Cache Digest.
-#Default:
-# digest_rebuild_chunk_percentage 10
-
-# SNMP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: snmp_port
-#	The port number where Squid listens for SNMP requests. To enable
-#	SNMP support set this to a suitable port number. Port number
-#	3401 is often used for the Squid SNMP agent. By default it's
-#	set to "0" (disabled)
-#
-#	Example:
-#		snmp_port 3401
-#Default:
-# SNMP disabled.
-
-#  TAG: snmp_access
-#	Allowing or denying access to the SNMP port.
-#
-#	All access to the agent is denied by default.
-#	usage:
-#
-#	snmp_access allow|deny [!]aclname ...
-#
-#	This clause only supports fast acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#
-#Example:
-# snmp_access allow snmppublic localhost
-# snmp_access deny all
-#Default:
-# Deny, unless rules exist in squid.conf.
-
-#  TAG: snmp_incoming_address
-#	Just like 'udp_incoming_address', but for the SNMP port.
-#
-#	snmp_incoming_address	is used for the SNMP socket receiving
-#				messages from SNMP agents.
-#
-#	The default snmp_incoming_address is to listen on all
-#	available network interfaces.
-#Default:
-# Accept SNMP packets from all machine interfaces.
-
-#  TAG: snmp_outgoing_address
-#	Just like 'udp_outgoing_address', but for the SNMP port.
-#
-#	snmp_outgoing_address	is used for SNMP packets returned to SNMP
-#				agents.
-#
-#	If snmp_outgoing_address is not set it will use the same socket
-#	as snmp_incoming_address. Only change this if you want to have
-#	SNMP replies sent using another address than where this Squid
-#	listens for SNMP queries.
-#
-#	NOTE, snmp_incoming_address and snmp_outgoing_address can not have
-#	the same value since they both use the same port.
-#Default:
-# Use snmp_incoming_address or an address selected by the operating system.
-
-# ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icp_port
-#	The port number where Squid sends and receives ICP queries to
-#	and from neighbor caches.  The standard UDP port for ICP is 3130.
-#
-#	Example:
-#		icp_port 3130
-#Default:
-# ICP disabled.
-
-#  TAG: htcp_port
-#	The port number where Squid sends and receives HTCP queries to
-#	and from neighbor caches.  To turn it on you want to set it to
-#	4827.
-#
-#	Example:
-#		htcp_port 4827
-#Default:
-# HTCP disabled.
-
-#  TAG: log_icp_queries	on|off
-#	If set, ICP queries are logged to access.log. You may wish
-#	do disable this if your ICP load is VERY high to speed things
-#	up or to simplify log analysis.
-#Default:
-# log_icp_queries on
-
-#  TAG: udp_incoming_address
-#	udp_incoming_address	is used for UDP packets received from other
-#				caches.
-#
-#	The default behavior is to not bind to any specific address.
-#
-#	Only change this if you want to have all UDP queries received on
-#	a specific interface/address.
-#
-#	NOTE: udp_incoming_address is used by the ICP, HTCP, and DNS
-#	modules. Altering it will affect all of them in the same manner.
-#
-#	see also; udp_outgoing_address
-#
-#	NOTE, udp_incoming_address and udp_outgoing_address can not
-#	have the same value since they both use the same port.
-#Default:
-# Accept packets from all machine interfaces.
-
-#  TAG: udp_outgoing_address
-#	udp_outgoing_address	is used for UDP packets sent out to other
-#				caches.
-#
-#	The default behavior is to not bind to any specific address.
-#
-#	Instead it will use the same socket as udp_incoming_address.
-#	Only change this if you want to have UDP queries sent using another
-#	address than where this Squid listens for UDP queries from other
-#	caches.
-#
-#	NOTE: udp_outgoing_address is used by the ICP, HTCP, and DNS
-#	modules. Altering it will affect all of them in the same manner.
-#
-#	see also; udp_incoming_address
-#
-#	NOTE, udp_incoming_address and udp_outgoing_address can not
-#	have the same value since they both use the same port.
-#Default:
-# Use udp_incoming_address or an address selected by the operating system.
-
-#  TAG: icp_hit_stale	on|off
-#	If you want to return ICP_HIT for stale cache objects, set this
-#	option to 'on'.  If you have sibling relationships with caches
-#	in other administrative domains, this should be 'off'.  If you only
-#	have sibling relationships with caches under your control,
-#	it is probably okay to set this to 'on'.
-#	If set to 'on', your siblings should use the option "allow-miss"
-#	on their cache_peer lines for connecting to you.
-#Default:
-# icp_hit_stale off
-
-#  TAG: minimum_direct_hops
-#	If using the ICMP pinging stuff, do direct fetches for sites
-#	which are no more than this many hops away.
-#Default:
-# minimum_direct_hops 4
-
-#  TAG: minimum_direct_rtt	(msec)
-#	If using the ICMP pinging stuff, do direct fetches for sites
-#	which are no more than this many rtt milliseconds away.
-#Default:
-# minimum_direct_rtt 400
-
-#  TAG: netdb_low
-#	The low water mark for the ICMP measurement database.
-#
-#	Note: high watermark controlled by netdb_high directive.
-#
-#	These watermarks are counts, not percents.  The defaults are
-#	(low) 900 and (high) 1000.  When the high water mark is
-#	reached, database entries will be deleted until the low
-#	mark is reached.
-#Default:
-# netdb_low 900
-
-#  TAG: netdb_high
-#	The high water mark for the ICMP measurement database.
-#
-#	Note: low watermark controlled by netdb_low directive.
-#
-#	These watermarks are counts, not percents.  The defaults are
-#	(low) 900 and (high) 1000.  When the high water mark is
-#	reached, database entries will be deleted until the low
-#	mark is reached.
-#Default:
-# netdb_high 1000
-
-#  TAG: netdb_ping_period
-#	The minimum period for measuring a site.  There will be at
-#	least this much delay between successive pings to the same
-#	network.  The default is five minutes.
-#Default:
-# netdb_ping_period 5 minutes
-
-#  TAG: query_icmp	on|off
-#	If you want to ask your peers to include ICMP data in their ICP
-#	replies, enable this option.
-#
-#	If your peer has configured Squid (during compilation) with
-#	'--enable-icmp' that peer will send ICMP pings to origin server
-#	sites of the URLs it receives.  If you enable this option the
-#	ICP replies from that peer will include the ICMP data (if available).
-#	Then, when choosing a parent cache, Squid will choose the parent with
-#	the minimal RTT to the origin server.  When this happens, the
-#	hierarchy field of the access.log will be
-#	"CLOSEST_PARENT_MISS".  This option is off by default.
-#Default:
-# query_icmp off
-
-#  TAG: test_reachability	on|off
-#	When this is 'on', ICP MISS replies will be ICP_MISS_NOFETCH
-#	instead of ICP_MISS if the target host is NOT in the ICMP
-#	database, or has a zero RTT.
-#Default:
-# test_reachability off
-
-#  TAG: icp_query_timeout	(msec)
-#	Normally Squid will automatically determine an optimal ICP
-#	query timeout value based on the round-trip-time of recent ICP
-#	queries.  If you want to override the value determined by
-#	Squid, set this 'icp_query_timeout' to a non-zero value.  This
-#	value is specified in MILLISECONDS, so, to use a 2-second
-#	timeout (the old default), you would write:
-#
-#		icp_query_timeout 2000
-#Default:
-# Dynamic detection.
-
-#  TAG: maximum_icp_query_timeout	(msec)
-#	Normally the ICP query timeout is determined dynamically.  But
-#	sometimes it can lead to very large values (say 5 seconds).
-#	Use this option to put an upper limit on the dynamic timeout
-#	value.  Do NOT use this option to always use a fixed (instead
-#	of a dynamic) timeout value. To set a fixed timeout see the
-#	'icp_query_timeout' directive.
-#Default:
-# maximum_icp_query_timeout 2000
-
-#  TAG: minimum_icp_query_timeout	(msec)
-#	Normally the ICP query timeout is determined dynamically.  But
-#	sometimes it can lead to very small timeouts, even lower than
-#	the normal latency variance on your link due to traffic.
-#	Use this option to put an lower limit on the dynamic timeout
-#	value.  Do NOT use this option to always use a fixed (instead
-#	of a dynamic) timeout value. To set a fixed timeout see the
-#	'icp_query_timeout' directive.
-#Default:
-# minimum_icp_query_timeout 5
-
-#  TAG: background_ping_rate	time-units
-#	Controls how often the ICP pings are sent to siblings that
-#	have background-ping set.
-#Default:
-# background_ping_rate 10 seconds
-
-# MULTICAST ICP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: mcast_groups
-#	This tag specifies a list of multicast groups which your server
-#	should join to receive multicasted ICP queries.
-#
-#	NOTE!  Be very careful what you put here!  Be sure you
-#	understand the difference between an ICP _query_ and an ICP
-#	_reply_.  This option is to be set only if you want to RECEIVE
-#	multicast queries.  Do NOT set this option to SEND multicast
-#	ICP (use cache_peer for that).  ICP replies are always sent via
-#	unicast, so this option does not affect whether or not you will
-#	receive replies from multicast group members.
-#
-#	You must be very careful to NOT use a multicast address which
-#	is already in use by another group of caches.
-#
-#	If you are unsure about multicast, please read the Multicast
-#	chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/).
-#
-#	Usage: mcast_groups 239.128.16.128 224.0.1.20
-#
-#	By default, Squid doesn't listen on any multicast groups.
-#Default:
-# none
-
-#  TAG: mcast_miss_addr
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	If you enable this option, every "cache miss" URL will
-#	be sent out on the specified multicast address.
-#
-#	Do not enable this option unless you are are absolutely
-#	certain you understand what you are doing.
-#Default:
-# disabled.
-
-#  TAG: mcast_miss_ttl
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	This is the time-to-live value for packets multicasted
-#	when multicasting off cache miss URLs is enabled.  By
-#	default this is set to 'site scope', i.e. 16.
-#Default:
-# mcast_miss_ttl 16
-
-#  TAG: mcast_miss_port
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	This is the port number to be used in conjunction with
-#	'mcast_miss_addr'.
-#Default:
-# mcast_miss_port 3135
-
-#  TAG: mcast_miss_encode_key
-# Note: This option is only available if Squid is rebuilt with the
-#       -DMULTICAST_MISS_STREAM define
-#
-#	The URLs that are sent in the multicast miss stream are
-#	encrypted.  This is the encryption key.
-#Default:
-# mcast_miss_encode_key XXXXXXXXXXXXXXXX
-
-#  TAG: mcast_icp_query_timeout	(msec)
-#	For multicast peers, Squid regularly sends out ICP "probes" to
-#	count how many other peers are listening on the given multicast
-#	address.  This value specifies how long Squid should wait to
-#	count all the replies.  The default is 2000 msec, or 2
-#	seconds.
-#Default:
-# mcast_icp_query_timeout 2000
-
-# INTERNAL ICON OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icon_directory
-#	Where the icons are stored. These are normally kept in
-#	/usr/share/squid/icons
-#Default:
-# icon_directory /usr/share/squid/icons
-
-#  TAG: global_internal_static
-#	This directive controls is Squid should intercept all requests for
-#	/squid-internal-static/ no matter which host the URL is requesting
-#	(default on setting), or if nothing special should be done for
-#	such URLs (off setting). The purpose of this directive is to make
-#	icons etc work better in complex cache hierarchies where it may
-#	not always be possible for all corners in the cache mesh to reach
-#	the server generating a directory listing.
-#Default:
-# global_internal_static on
-
-#  TAG: short_icon_urls
-#	If this is enabled Squid will use short URLs for icons.
-#	If disabled it will revert to the old behavior of including
-#	it's own name and port in the URL.
-#
-#	If you run a complex cache hierarchy with a mix of Squid and
-#	other proxies you may need to disable this directive.
-#Default:
-# short_icon_urls on
-
-# ERROR PAGE OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: error_directory
-#	If you wish to create your own versions of the default
-#	error files to customize them to suit your company copy
-#	the error/template files to another directory and point
-#	this tag at them.
-#
-#	WARNING: This option will disable multi-language support
-#	         on error pages if used.
-#
-#	The squid developers are interested in making squid available in
-#	a wide variety of languages. If you are making translations for a
-#	language that Squid does not currently provide please consider
-#	contributing your translation back to the project.
-#	http://wiki.squid-cache.org/Translations
-#
-#	The squid developers working on translations are happy to supply drop-in
-#	translated error files in exchange for any new language contributions.
-#Default:
-# Send error pages in the clients preferred language
-
-#  TAG: error_default_language
-#	Set the default language which squid will send error pages in
-#	if no existing translation matches the clients language
-#	preferences.
-#
-#	If unset (default) generic English will be used.
-#
-#	The squid developers are interested in making squid available in
-#	a wide variety of languages. If you are interested in making
-#	translations for any language see the squid wiki for details.
-#	http://wiki.squid-cache.org/Translations
-#Default:
-# Generate English language pages.
-
-#  TAG: error_log_languages
-#	Log to cache.log what languages users are attempting to
-#	auto-negotiate for translations.
-#
-#	Successful negotiations are not logged. Only failures
-#	have meaning to indicate that Squid may need an upgrade
-#	of its error page translations.
-#Default:
-# error_log_languages on
-
-#  TAG: err_page_stylesheet
-#	CSS Stylesheet to pattern the display of Squid default error pages.
-#
-#	For information on CSS see http://www.w3.org/Style/CSS/
-#Default:
-# err_page_stylesheet /etc/squid/errorpage.css
-
-#  TAG: err_html_text
-#	HTML text to include in error messages.  Make this a "mailto"
-#	URL to your admin address, or maybe just a link to your
-#	organizations Web page.
-#
-#	To include this in your error messages, you must rewrite
-#	the error template files (found in the "errors" directory).
-#	Wherever you want the 'err_html_text' line to appear,
-#	insert a %L tag in the error template file.
-#Default:
-# none
-
-#  TAG: email_err_data	on|off
-#	If enabled, information about the occurred error will be
-#	included in the mailto links of the ERR pages (if %W is set)
-#	so that the email body contains the data.
-#	Syntax is <A HREF="mailto:%w%W">%w</A>
-#Default:
-# email_err_data on
-
-#  TAG: deny_info
-#	Usage:   deny_info err_page_name acl
-#	or       deny_info http://... acl
-#	or       deny_info TCP_RESET acl
-#
-#	This can be used to return a ERR_ page for requests which
-#	do not pass the 'http_access' rules.  Squid remembers the last
-#	acl it evaluated in http_access, and if a 'deny_info' line exists
-#	for that ACL Squid returns a corresponding error page.
-#
-#	The acl is typically the last acl on the http_access deny line which
-#	denied access. The exceptions to this rule are:
-#	- When Squid needs to request authentication credentials. It's then
-#	  the first authentication related acl encountered
-#	- When none of the http_access lines matches. It's then the last
-#	  acl processed on the last http_access line.
-#	- When the decision to deny access was made by an adaptation service,
-#	  the acl name is the corresponding eCAP or ICAP service_name.
-#
-#	NP: If providing your own custom error pages with error_directory
-#	    you may also specify them by your custom file name:
-#	    Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys
-#
-#	By defaut Squid will send "403 Forbidden". A different 4xx or 5xx
-#	may be specified by prefixing the file name with the code and a colon.
-#	e.g. 404:ERR_CUSTOM_ACCESS_DENIED
-#
-#	Alternatively you can tell Squid to reset the TCP connection
-#	by specifying TCP_RESET.
-#
-#	Or you can specify an error URL or URL pattern. The browsers will
-#	get redirected to the specified URL after formatting tags have
-#	been replaced. Redirect will be done with 302 or 307 according to
-#	HTTP/1.1 specs. A different 3xx code may be specified by prefixing
-#	the URL. e.g. 303:http://example.com/
-#
-#	URL FORMAT TAGS:
-#		%a	- username (if available. Password NOT included)
-#		%B	- FTP path URL
-#		%e	- Error number
-#		%E	- Error description
-#		%h	- Squid hostname
-#		%H	- Request domain name
-#		%i	- Client IP Address
-#		%M	- Request Method
-#		%o	- Message result from external ACL helper
-#		%p	- Request Port number
-#		%P	- Request Protocol name
-#		%R	- Request URL path
-#		%T	- Timestamp in RFC 1123 format
-#		%U	- Full canonical URL from client
-#			  (HTTPS URLs terminate with *)
-#		%u	- Full canonical URL from client
-#		%w	- Admin email from squid.conf
-#		%x	- Error name
-#		%%	- Literal percent (%) code
-#
-#Default:
-# none
-
-# OPTIONS INFLUENCING REQUEST FORWARDING 
-# -----------------------------------------------------------------------------
-
-#  TAG: nonhierarchical_direct
-#	By default, Squid will send any non-hierarchical requests
-#	(matching hierarchy_stoplist or not cacheable request type) direct
-#	to origin servers.
-#
-#	When this is set to "off", Squid will prefer to send these
-#	requests to parents.
-#
-#	Note that in most configurations, by turning this off you will only
-#	add latency to these request without any improvement in global hit
-#	ratio.
-#
-#	This option only sets a preference. If the parent is unavailable a
-#	direct connection to the origin server may still be attempted. To
-#	completely prevent direct connections use never_direct.
-#Default:
-# nonhierarchical_direct on
-
-#  TAG: prefer_direct
-#	Normally Squid tries to use parents for most requests. If you for some
-#	reason like it to first try going direct and only use a parent if
-#	going direct fails set this to on.
-#
-#	By combining nonhierarchical_direct off and prefer_direct on you
-#	can set up Squid to use a parent as a backup path if going direct
-#	fails.
-#
-#	Note: If you want Squid to use parents for all requests see
-#	the never_direct directive. prefer_direct only modifies how Squid
-#	acts on cacheable requests.
-#Default:
-# prefer_direct off
-
-#  TAG: cache_miss_revalidate	on|off
-#	RFC 7232 defines a conditional request mechanism to prevent
-#	response objects being unnecessarily transferred over the network.
-#	If that mechanism is used by the client and a cache MISS occurs
-#	it can prevent new cache entries being created.
-#
-#	This option determines whether Squid on cache MISS will pass the
-#	client revalidation request to the server or tries to fetch new
-#	content for caching. It can be useful while the cache is mostly
-#	empty to more quickly have the cache populated by generating
-#	non-conditional GETs.
-#
-#	When set to 'on' (default), Squid will pass all client If-* headers
-#	to the server. This permits server responses without a cacheable
-#	payload to be delivered and on MISS no new cache entry is created.
-#
-#	When set to 'off' and if the request is cacheable, Squid will
-#	remove the clients If-Modified-Since and If-None-Match headers from
-#	the request sent to the server. This requests a 200 status response
-#	from the server to create a new cache entry with.
-#Default:
-# cache_miss_revalidate on
-
-#  TAG: always_direct
-#	Usage: always_direct allow|deny [!]aclname ...
-#
-#	Here you can use ACL elements to specify requests which should
-#	ALWAYS be forwarded by Squid to the origin servers without using
-#	any peers.  For example, to always directly forward requests for
-#	local servers ignoring any parents or siblings you may have use
-#	something like:
-#
-#		acl local-servers dstdomain my.domain.net
-#		always_direct allow local-servers
-#
-#	To always forward FTP requests directly, use
-#
-#		acl FTP proto FTP
-#		always_direct allow FTP
-#
-#	NOTE: There is a similar, but opposite option named
-#	'never_direct'.  You need to be aware that "always_direct deny
-#	foo" is NOT the same thing as "never_direct allow foo".  You
-#	may need to use a deny rule to exclude a more-specific case of
-#	some other rule.  Example:
-#
-#		acl local-external dstdomain external.foo.net
-#		acl local-servers dstdomain  .foo.net
-#		always_direct deny local-external
-#		always_direct allow local-servers
-#
-#	NOTE: If your goal is to make the client forward the request
-#	directly to the origin server bypassing Squid then this needs
-#	to be done in the client configuration. Squid configuration
-#	can only tell Squid how Squid should fetch the object.
-#
-#	NOTE: This directive is not related to caching. The replies
-#	is cached as usual even if you use always_direct. To not cache
-#	the replies see the 'cache' directive.
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Prevent any cache_peer being used for this request.
-
-#  TAG: never_direct
-#	Usage: never_direct allow|deny [!]aclname ...
-#
-#	never_direct is the opposite of always_direct.  Please read
-#	the description for always_direct if you have not already.
-#
-#	With 'never_direct' you can use ACL elements to specify
-#	requests which should NEVER be forwarded directly to origin
-#	servers.  For example, to force the use of a proxy for all
-#	requests, except those in your local domain use something like:
-#
-#		acl local-servers dstdomain .foo.net
-#		never_direct deny local-servers
-#		never_direct allow all
-#
-#	or if Squid is inside a firewall and there are local intranet
-#	servers inside the firewall use something like:
-#
-#		acl local-intranet dstdomain .foo.net
-#		acl local-external dstdomain external.foo.net
-#		always_direct deny local-external
-#		always_direct allow local-intranet
-#		never_direct allow all
-#
-#	This clause supports both fast and slow acl types.
-#	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
-#Default:
-# Allow DNS results to be used for this request.
-
-# ADVANCED NETWORKING OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: incoming_udp_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_udp_average 6
-
-#  TAG: incoming_tcp_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_tcp_average 4
-
-#  TAG: incoming_dns_average
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# incoming_dns_average 4
-
-#  TAG: min_udp_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_udp_poll_cnt 8
-
-#  TAG: min_dns_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_dns_poll_cnt 8
-
-#  TAG: min_tcp_poll_cnt
-#	Heavy voodoo here.  I can't even believe you are reading this.
-#	Are you crazy?  Don't even think about adjusting these unless
-#	you understand the algorithms in comm_select.c first!
-#Default:
-# min_tcp_poll_cnt 8
-
-#  TAG: accept_filter
-#	FreeBSD:
-#
-#	The name of an accept(2) filter to install on Squid's
-#	listen socket(s).  This feature is perhaps specific to
-#	FreeBSD and requires support in the kernel.
-#
-#	The 'httpready' filter delays delivering new connections
-#	to Squid until a full HTTP request has been received.
-#	See the accf_http(9) man page for details.
-#
-#	The 'dataready' filter delays delivering new connections
-#	to Squid until there is some data to process.
-#	See the accf_dataready(9) man page for details.
-#
-#	Linux:
-#	
-#	The 'data' filter delays delivering of new connections
-#	to Squid until there is some data to process by TCP_ACCEPT_DEFER.
-#	You may optionally specify a number of seconds to wait by
-#	'data=N' where N is the number of seconds. Defaults to 30
-#	if not specified.  See the tcp(7) man page for details.
-#EXAMPLE:
-## FreeBSD
-#accept_filter httpready
-## Linux
-#accept_filter data
-#Default:
-# none
-
-#  TAG: client_ip_max_connections
-#	Set an absolute limit on the number of connections a single
-#	client IP can use. Any more than this and Squid will begin to drop
-#	new connections from the client until it closes some links.
-#
-#	Note that this is a global limit. It affects all HTTP, HTCP, Gopher and FTP
-#	connections from the client. For finer control use the ACL access controls.
-#
-#	Requires client_db to be enabled (the default).
-#
-#	WARNING: This may noticably slow down traffic received via external proxies
-#	or NAT devices and cause them to rebound error messages back to their clients.
-#Default:
-# No limit.
-
-#  TAG: tcp_recv_bufsize	(bytes)
-#	Size of receive buffer to set for TCP sockets.  Probably just
-#	as easy to change your kernel's default.
-#	Omit from squid.conf to use the default buffer size.
-#Default:
-# Use operating system TCP defaults.
-
-# ICAP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: icap_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	If you want to enable the ICAP module support, set this to on.
-#Default:
-# icap_enable off
-
-#  TAG: icap_connect_timeout
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This parameter specifies how long to wait for the TCP connect to
-#	the requested ICAP server to complete before giving up and either
-#	terminating the HTTP transaction or bypassing the failure.
-#
-#	The default for optional services is peer_connect_timeout.
-#	The default for essential services is connect_timeout.
-#	If this option is explicitly set, its value applies to all services.
-#Default:
-# none
-
-#  TAG: icap_io_timeout	time-units
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This parameter specifies how long to wait for an I/O activity on
-#	an established, active ICAP connection before giving up and
-#	either terminating the HTTP transaction or bypassing the
-#	failure.
-#Default:
-# Use read_timeout.
-
-#  TAG: icap_service_failure_limit	limit [in memory-depth time-units]
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The limit specifies the number of failures that Squid tolerates
-#	when establishing a new TCP connection with an ICAP service. If
-#	the number of failures exceeds the limit, the ICAP service is
-#	not used for new ICAP requests until it is time to refresh its
-#	OPTIONS.
-#
-#	A negative value disables the limit. Without the limit, an ICAP
-#	service will not be considered down due to connectivity failures
-#	between ICAP OPTIONS requests.
-#
-#	Squid forgets ICAP service failures older than the specified
-#	value of memory-depth. The memory fading algorithm 
-#	is approximate because Squid does not remember individual 
-#	errors but groups them instead, splitting the option
-#	value into ten time slots of equal length.
-#
-#	When memory-depth is 0 and by default this option has no 
-#	effect on service failure expiration.
-#
-#	Squid always forgets failures when updating service settings
-#	using an ICAP OPTIONS transaction, regardless of this option
-#	setting.
-#
-#	For example,
-#		# suspend service usage after 10 failures in 5 seconds:
-#		icap_service_failure_limit 10 in 5 seconds
-#Default:
-# icap_service_failure_limit 10
-
-#  TAG: icap_service_revival_delay
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The delay specifies the number of seconds to wait after an ICAP
-#	OPTIONS request failure before requesting the options again. The
-#	failed ICAP service is considered "down" until fresh OPTIONS are
-#	fetched.
-#
-#	The actual delay cannot be smaller than the hardcoded minimum
-#	delay of 30 seconds.
-#Default:
-# icap_service_revival_delay 180
-
-#  TAG: icap_preview_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The ICAP Preview feature allows the ICAP server to handle the
-#	HTTP message by looking only at the beginning of the message body
-#	or even without receiving the body at all. In some environments, 
-#	previews greatly speedup ICAP processing.
-#
-#	During an ICAP OPTIONS transaction, the server may tell	Squid what
-#	HTTP messages should be previewed and how big the preview should be.
-#	Squid will not use Preview if the server did not request one.
-#
-#	To disable ICAP Preview for all ICAP services, regardless of
-#	individual ICAP server OPTIONS responses, set this option to "off".
-#Example:
-#icap_preview_enable off
-#Default:
-# icap_preview_enable on
-
-#  TAG: icap_preview_size
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The default size of preview data to be sent to the ICAP server.
-#	This value might be overwritten on a per server basis by OPTIONS requests.
-#Default:
-# No preview sent.
-
-#  TAG: icap_206_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	206 (Partial Content) responses is an ICAP extension that allows the
-#	ICAP agents to optionally combine adapted and original HTTP message
-#	content. The decision to combine is postponed until the end of the
-#	ICAP response. Squid supports Partial Content extension by default.
-#
-#	Activation of the Partial Content extension is negotiated with each
-#	ICAP service during OPTIONS exchange. Most ICAP servers should handle
-#	negotation correctly even if they do not support the extension, but
-#	some might fail. To disable Partial Content support for all ICAP
-#	services and to avoid any negotiation, set this option to "off".
-#
-#	Example:
-#	    icap_206_enable off
-#Default:
-# icap_206_enable on
-
-#  TAG: icap_default_options_ttl
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	The default TTL value for ICAP OPTIONS responses that don't have
-#	an Options-TTL header.
-#Default:
-# icap_default_options_ttl 60
-
-#  TAG: icap_persistent_connections	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Whether or not Squid should use persistent connections to
-#	an ICAP server.
-#Default:
-# icap_persistent_connections on
-
-#  TAG: adaptation_send_client_ip	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	If enabled, Squid shares HTTP client IP information with adaptation
-#	services. For ICAP, Squid adds the X-Client-IP header to ICAP requests.
-#	For eCAP, Squid sets the libecap::metaClientIp transaction option.
-#
-#	See also: adaptation_uses_indirect_client
-#Default:
-# adaptation_send_client_ip off
-
-#  TAG: adaptation_send_username	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	This sends authenticated HTTP client username (if available) to
-#	the adaptation service.
-#
-#	For ICAP, the username value is encoded based on the
-#	icap_client_username_encode option and is sent using the header
-#	specified by the icap_client_username_header option.
-#Default:
-# adaptation_send_username off
-
-#  TAG: icap_client_username_header
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	ICAP request header name to use for adaptation_send_username.
-#Default:
-# icap_client_username_header X-Client-Username
-
-#  TAG: icap_client_username_encode	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Whether to base64 encode the authenticated client username.
-#Default:
-# icap_client_username_encode off
-
-#  TAG: icap_service
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Defines a single ICAP service using the following format:
-#
-#	icap_service id vectoring_point uri [option ...]
-#
-#	id: ID
-#		an opaque identifier or name which is used to direct traffic to
-#		this specific service. Must be unique among all adaptation
-#		services in squid.conf.
-#
-#	vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-#		This specifies at which point of transaction processing the
-#		ICAP service should be activated. *_postcache vectoring points
-#		are not yet supported.
-#
-#	uri: icap://servername:port/servicepath
-#		ICAP server and service location.
-#
-#	ICAP does not allow a single service to handle both REQMOD and RESPMOD
-#	transactions. Squid does not enforce that requirement. You can specify
-#	services with the same service_url and different vectoring_points. You
-#	can even specify multiple identical services as long as their
-#	service_names differ.
-#
-#	To activate a service, use the adaptation_access directive. To group
-#	services, use adaptation_service_chain and adaptation_service_set.
-#
-#	Service options are separated by white space. ICAP services support
-#	the following name=value options:
-#
-#	bypass=on|off|1|0
-#		If set to 'on' or '1', the ICAP service is treated as
-#		optional. If the service cannot be reached or malfunctions,
-#		Squid will try to ignore any errors and process the message as
-#		if the service was not enabled. No all ICAP errors can be
-#		bypassed.  If set to 0, the ICAP service is treated as
-#		essential and all ICAP errors will result in an error page
-#		returned to the HTTP client.
-#
-#		Bypass is off by default: services are treated as essential.
-#
-#	routing=on|off|1|0
-#		If set to 'on' or '1', the ICAP service is allowed to
-#		dynamically change the current message adaptation plan by
-#		returning a chain of services to be used next. The services
-#		are specified using the X-Next-Services ICAP response header
-#		value, formatted as a comma-separated list of service names.
-#		Each named service should be configured in squid.conf. Other
-#		services are ignored. An empty X-Next-Services value results
-#		in an empty plan which ends the current adaptation.
-#
-#		Dynamic adaptation plan may cross or cover multiple supported
-#		vectoring points in their natural processing order.
-#
-#		Routing is not allowed by default: the ICAP X-Next-Services
-#		response header is ignored.
-#
-#	ipv6=on|off
-#		Only has effect on split-stack systems. The default on those systems
-#		is to use IPv4-only connections. When set to 'on' this option will
-#		make Squid use IPv6-only connections to contact this ICAP service.
-#
-#	on-overload=block|bypass|wait|force
-#		If the service Max-Connections limit has been reached, do
-#		one of the following for each new ICAP transaction:
-#		  * block:  send an HTTP error response to the client
-#		  * bypass: ignore the "over-connected" ICAP service
-#		  * wait:   wait (in a FIFO queue) for an ICAP connection slot
-#		  * force:  proceed, ignoring the Max-Connections limit 
-#
-#		In SMP mode with N workers, each worker assumes the service
-#		connection limit is Max-Connections/N, even though not all
-#		workers may use a given service.
-#
-#		The default value is "bypass" if service is bypassable,
-#		otherwise it is set to "wait".
-#		
-#
-#	max-conn=number
-#		Use the given number as the Max-Connections limit, regardless
-#		of the Max-Connections value given by the service, if any.
-#
-#	Older icap_service format without optional named parameters is
-#	deprecated but supported for backward compatibility.
-#
-#Example:
-#icap_service svcBlocker reqmod_precache icap://icap1.mydomain.net:1344/reqmod bypass=0
-#icap_service svcLogger reqmod_precache icap://icap2.mydomain.net:1344/respmod routing=on
-#Default:
-# none
-
-#  TAG: icap_class
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This deprecated option was documented to define an ICAP service
-#	chain, even though it actually defined a set of similar, redundant
-#	services, and the chains were not supported. 
-#
-#	To define a set of redundant services, please use the
-#	adaptation_service_set directive. For service chains, use
-#	adaptation_service_chain.
-#Default:
-# none
-
-#  TAG: icap_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This option is deprecated. Please use adaptation_access, which
-#	has the same ICAP functionality, but comes with better
-#	documentation, and eCAP support.
-#Default:
-# none
-
-# eCAP OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: ecap_enable	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap
-#
-#	Controls whether eCAP support is enabled.
-#Default:
-# ecap_enable off
-
-#  TAG: ecap_service
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap
-#
-#	Defines a single eCAP service
-#
-#	ecap_service id vectoring_point uri [option ...]
-#
-#        id: ID
-#		an opaque identifier or name which is used to direct traffic to
-#		this specific service. Must be unique among all adaptation
-#		services in squid.conf.
-#
-#	vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache
-#		This specifies at which point of transaction processing the
-#		eCAP service should be activated. *_postcache vectoring points
-#		are not yet supported.
-#
-#	uri: ecap://vendor/service_name?custom&cgi=style&parameters=optional
-#		Squid uses the eCAP service URI to match this configuration
-#		line with one of the dynamically loaded services. Each loaded
-#		eCAP service must have a unique URI. Obtain the right URI from
-#		the service provider.
-#
-#	To activate a service, use the adaptation_access directive. To group
-#	services, use adaptation_service_chain and adaptation_service_set.
-#
-#	Service options are separated by white space. eCAP services support
-#	the following name=value options:
-#
-#	bypass=on|off|1|0
-#		If set to 'on' or '1', the eCAP service is treated as optional.
-#		If the service cannot be reached or malfunctions, Squid will try
-#		to ignore any errors and process the message as if the service
-#		was not enabled. No all eCAP errors can be bypassed.
-#		If set to 'off' or '0', the eCAP service is treated as essential
-#		and all eCAP errors will result in an error page returned to the
-#		HTTP client.
-#
-#                Bypass is off by default: services are treated as essential.
-#
-#	routing=on|off|1|0
-#		If set to 'on' or '1', the eCAP service is allowed to
-#		dynamically change the current message adaptation plan by
-#		returning a chain of services to be used next.
-#
-#		Dynamic adaptation plan may cross or cover multiple supported
-#		vectoring points in their natural processing order.
-#
-#		Routing is not allowed by default.
-#
-#	Older ecap_service format without optional named parameters is
-#	deprecated but supported for backward compatibility.
-#
-#
-#Example:
-#ecap_service s1 reqmod_precache ecap://filters.R.us/leakDetector?on_error=block bypass=off
-#ecap_service s2 respmod_precache ecap://filters.R.us/virusFilter config=/etc/vf.cfg bypass=on
-#Default:
-# none
-
-#  TAG: loadable_modules
-#	Instructs Squid to load the specified dynamic module(s) or activate
-#	preloaded module(s).
-#Example:
-#loadable_modules /usr/lib/MinimalAdapter.so
-#Default:
-# none
-
-# MESSAGE ADAPTATION OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: adaptation_service_set
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#
-#	Configures an ordered set of similar, redundant services. This is
-#	useful when hot standby or backup adaptation servers are available.
-#
-#	    adaptation_service_set set_name service_name1 service_name2 ...
-#
-# 	The named services are used in the set declaration order. The first
-#	applicable adaptation service from the set is used first. The next
-#	applicable service is tried if and only if the transaction with the
-#	previous service fails and the message waiting to be adapted is still
-#	intact.
-#
-#	When adaptation starts, broken services are ignored as if they were
-#	not a part of the set. A broken service is a down optional service.
-#
-#	The services in a set must be attached to the same vectoring point
-#	(e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-#	If all services in a set are optional then adaptation failures are
-#	bypassable. If all services in the set are essential, then a
-#	transaction failure with one service may still be retried using
-#	another service from the set, but when all services fail, the master
-#	transaction fails as well.
-#
-#	A set may contain a mix of optional and essential services, but that
-#	is likely to lead to surprising results because broken services become
-#	ignored (see above), making previously bypassable failures fatal.
-#	Technically, it is the bypassability of the last failed service that
-#	matters.
-#
-#	See also: adaptation_access adaptation_service_chain
-#
-#Example:
-#adaptation_service_set svcBlocker urlFilterPrimary urlFilterBackup
-#adaptation service_set svcLogger loggerLocal loggerRemote
-#Default:
-# none
-
-#  TAG: adaptation_service_chain
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#
-#	Configures a list of complementary services that will be applied
-#	one-by-one, forming an adaptation chain or pipeline. This is useful
-#	when Squid must perform different adaptations on the same message.
-#
-#	    adaptation_service_chain chain_name service_name1 svc_name2 ...
-#
-# 	The named services are used in the chain declaration order. The first
-#	applicable adaptation service from the chain is used first. The next
-#	applicable service is applied to the successful adaptation results of
-#	the previous service in the chain.
-#
-#	When adaptation starts, broken services are ignored as if they were
-#	not a part of the chain. A broken service is a down optional service.
-#
-#	Request satisfaction terminates the adaptation chain because Squid
-#	does not currently allow declaration of RESPMOD services at the
-#	"reqmod_precache" vectoring point (see icap_service or ecap_service).
-#
-#	The services in a chain must be attached to the same vectoring point
-#	(e.g., pre-cache) and use the same adaptation method (e.g., REQMOD).
-#
-#	A chain may contain a mix of optional and essential services. If an
-#	essential adaptation fails (or the failure cannot be bypassed for
-#	other reasons), the master transaction fails. Otherwise, the failure
-#	is bypassed as if the failed adaptation service was not in the chain.
-#
-#	See also: adaptation_access adaptation_service_set
-#
-#Example:
-#adaptation_service_chain svcRequest requestLogger urlFilter leakDetector
-#Default:
-# none
-
-#  TAG: adaptation_access
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	Sends an HTTP transaction to an ICAP or eCAP adaptation	service.
-#
-#	adaptation_access service_name allow|deny [!]aclname...
-#	adaptation_access set_name     allow|deny [!]aclname...
-#
-#	At each supported vectoring point, the adaptation_access
-#	statements are processed in the order they appear in this
-#	configuration file. Statements pointing to the following services
-#	are ignored (i.e., skipped without checking their ACL):
-#
-#	    - services serving different vectoring points
-#	    - "broken-but-bypassable" services
-#	    - "up" services configured to ignore such transactions
-#              (e.g., based on the ICAP Transfer-Ignore header).
-#
-#        When a set_name is used, all services in the set are checked
-#	using the same rules, to find the first applicable one. See
-#	adaptation_service_set for details.
-#
-#	If an access list is checked and there is a match, the
-#	processing stops: For an "allow" rule, the corresponding
-#	adaptation service is used for the transaction. For a "deny"
-#	rule, no adaptation service is activated.
-#
-#	It is currently not possible to apply more than one adaptation
-#	service at the same vectoring point to the same HTTP transaction.
-#
-#        See also: icap_service and ecap_service
-#
-#Example:
-#adaptation_access service_1 allow all
-#Default:
-# Allow, unless rules exist in squid.conf.
-
-#  TAG: adaptation_service_iteration_limit
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	Limits the number of iterations allowed when applying adaptation
-#	services to a message. If your longest adaptation set or chain
-#	may have more than 16 services, increase the limit beyond its
-#	default value of 16. If detecting infinite iteration loops sooner
-#	is critical, make the iteration limit match the actual number
-#	of services in your longest adaptation set or chain.
-#
-#	Infinite adaptation loops are most likely with routing services.
-#
-#	See also: icap_service routing=1
-#Default:
-# adaptation_service_iteration_limit 16
-
-#  TAG: adaptation_masterx_shared_names
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	For each master transaction (i.e., the HTTP request and response
-#	sequence, including all related ICAP and eCAP exchanges), Squid
-#	maintains a table of metadata. The table entries are (name, value)
-#	pairs shared among eCAP and ICAP exchanges. The table is destroyed
-#	with the master transaction.
-#
-#	This option specifies the table entry names that Squid must accept
-#	from and forward to the adaptation transactions.
-#
-#	An ICAP REQMOD or RESPMOD transaction may set an entry in the 
-#	shared table by returning an ICAP header field with a name 
-#	specified in adaptation_masterx_shared_names.
-#
-#	An eCAP REQMOD or RESPMOD transaction may set an entry in the
-#	shared table by implementing the libecap::visitEachOption() API
-#	to provide an option with a name specified in
-#	adaptation_masterx_shared_names.
-#
-#	Squid will store and forward the set entry to subsequent adaptation
-#	transactions within the same master transaction scope.
-#
-#	Only one shared entry name is supported at this time.
-#
-#Example:
-## share authentication information among ICAP services
-#adaptation_masterx_shared_names X-Subscriber-ID
-#Default:
-# none
-
-#  TAG: adaptation_meta
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-ecap or --enable-icap-client
-#
-#	This option allows Squid administrator to add custom ICAP request
-#	headers or eCAP options to Squid ICAP requests or eCAP transactions.
-#	Use it to pass custom authentication tokens and other
-#	transaction-state related meta information to an ICAP/eCAP service.
-#	
-#	The addition of a meta header is ACL-driven:
-#		adaptation_meta name value [!]aclname ...
-#	
-#	Processing for a given header name stops after the first ACL list match.
-#	Thus, it is impossible to add two headers with the same name. If no ACL
-#	lists match for a given header name, no such header is added. For 
-#	example:
-#	
-#		# do not debug transactions except for those that need debugging
-#		adaptation_meta X-Debug 1 needs_debugging
-#	
-#		# log all transactions except for those that must remain secret
-#		adaptation_meta X-Log 1 !keep_secret
-#	
-#		# mark transactions from users in the "G 1" group
-#		adaptation_meta X-Authenticated-Groups "G 1" authed_as_G1
-#	
-#	The "value" parameter may be a regular squid.conf token or a "double
-#	quoted string". Within the quoted string, use backslash (\) to escape
-#	any character, which is currently only useful for escaping backslashes
-#	and double quotes. For example,
-#	    "this string has one backslash (\\) and two \"quotes\""
-#
-#	Used adaptation_meta header values may be logged via %note
-#	logformat code. If multiple adaptation_meta headers with the same name
-#	are used during master transaction lifetime, the header values are
-#	logged in the order they were used and duplicate values are ignored
-#	(only the first repeated value will be logged).
-#Default:
-# none
-
-#  TAG: icap_retry
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	This ACL determines which retriable ICAP transactions are
-#	retried. Transactions that received a complete ICAP response
-#	and did not have to consume or produce HTTP bodies to receive
-#	that response are usually retriable.
-#
-#	icap_retry allow|deny [!]aclname ...
-#
-#	Squid automatically retries some ICAP I/O timeouts and errors
-#	due to persistent connection race conditions.
-#
-#	See also: icap_retry_limit
-#Default:
-# icap_retry deny all
-
-#  TAG: icap_retry_limit
-# Note: This option is only available if Squid is rebuilt with the
-#       --enable-icap-client
-#
-#	Limits the number of retries allowed.
-#
-#	Communication errors due to persistent connection race
-#	conditions are unavoidable, automatically retried, and do not
-#	count against this limit.
-#
-#	See also: icap_retry
-#Default:
-# No retries are allowed.
-
-# DNS OPTIONS
-# -----------------------------------------------------------------------------
-
-#  TAG: check_hostnames
-#	For security and stability reasons Squid can check
-#	hostnames for Internet standard RFC compliance. If you want
-#	Squid to perform these checks turn this directive on.
-#Default:
-# check_hostnames off
-
-#  TAG: allow_underscore
-#	Underscore characters is not strictly allowed in Internet hostnames
-#	but nevertheless used by many sites. Set this to off if you want
-#	Squid to be strict about the standard.
-#	This check is performed only when check_hostnames is set to on.
-#Default:
-# allow_underscore on
-
-#  TAG: cache_dns_program
-# Note: This option is only available if Squid is rebuilt with the
-#       --disable-internal-dns
-#
-#	Specify the location of the executable for dnslookup process.
-#Default:
-# cache_dns_program /usr/libexec/dnsserver
-
-#  TAG: dns_children
-# Note: This option is only available if Squid is rebuilt with the
-#       --disable-internal-dns
-#
-#	The maximum number of processes spawn to service DNS name lookups.
-#	If you limit it too few Squid will have to wait for them to process
-#	a backlog of requests, slowing it down. If you allow too many they
-#	will use RAM and other system resources noticably.
-#	The maximum this may be safely set to is 32.
-#	
-#	The startup= and idle= options allow some measure of skew in your
-#	tuning.
-#	
-#		startup=
-#	
-#	Sets a minimum of how many processes are to be spawned when Squid
-#	starts or reconfigures. When set to zero the first request will
-#	cause spawning of the first child process to handle it.
-#	
-#	Starting too few will cause an initial slowdown in traffic as Squid
-#	attempts to simultaneously spawn enough processes to cope.
-#	
-#		idle=
-#	
-#	Sets a minimum of how many processes Squid is to try and keep available
-#	at all times. When traffic begins to rise above what the existing
-#	processes can handle this many more will be spawned up to the maximum
-#	configured. A minimum setting of 1 is required.
-#Default:
-# dns_children 32 startup=1 idle=1
-
-#  TAG: dns_retransmit_interval
-#	Initial retransmit interval for DNS queries. The interval is
-#	doubled each time all configured DNS servers have been tried.
-#Default:
-# dns_retransmit_interval 5 seconds
-
-#  TAG: dns_timeout
-#	DNS Query timeout. If no response is received to a DNS query
-#	within this time all DNS servers for the queried domain
-#	are assumed to be unavailable.
-#Default:
-# dns_timeout 30 seconds
-
-#  TAG: dns_packet_max
-#	Maximum number of bytes packet size to advertise via EDNS.
-#	Set to "none" to disable EDNS large packet support.
-#	
-#	For legacy reasons DNS UDP replies will default to 512 bytes which
-#	is too small for many responses. EDNS provides a means for Squid to
-#	negotiate receiving larger responses back immediately without having
-#	to failover with repeat requests. Responses larger than this limit
-#	will retain the old behaviour of failover to TCP DNS.
-#	
-#	Squid has no real fixed limit internally, but allowing packet sizes
-#	over 1500 bytes requires network jumbogram support and is usually not
-#	necessary.
-#	
-#	WARNING: The RFC also indicates that some older resolvers will reply
-#	with failure of the whole request if the extension is added. Some
-#	resolvers have already been identified which will reply with mangled
-#	EDNS response on occasion. Usually in response to many-KB jumbogram
-#	sizes being advertised by Squid.
-#	Squid will currently treat these both as an unable-to-resolve domain
-#	even if it would be resolvable without EDNS.
-#Default:
-# EDNS disabled
-
-#  TAG: dns_defnames	on|off
-#	Normally the RES_DEFNAMES resolver option is disabled
-#	(see res_init(3)).  This prevents caches in a hierarchy
-#	from interpreting single-component hostnames locally.  To allow
-#	Squid to handle single-component names, enable this option.
-#Default:
-# Search for single-label domain names is disabled.
-
-#  TAG: dns_multicast_local	on|off
-#	When set to on, Squid sends multicast DNS lookups on the local
-#	network for domains ending in .local and .arpa.
-#	This enables local servers and devices to be contacted in an
-#	ad-hoc or zero-configuration network environment.
-#Default:
-# Search for .local and .arpa names is disabled.
-
-#  TAG: dns_nameservers
-#	Use this if you want to specify a list of DNS name servers
-#	(IP addresses) to use instead of those given in your
-#	/etc/resolv.conf file.
-#
-#	On Windows platforms, if no value is specified here or in
-#	the /etc/resolv.conf file, the list of DNS name servers are
-#	taken from the Windows registry, both static and dynamic DHCP
-#	configurations are supported.
-#
-#	Example: dns_nameservers 10.0.0.1 192.172.0.4
-#Default:
-# Use operating system definitions
-
-#  TAG: hosts_file
-#	Location of the host-local IP name-address associations
-#	database. Most Operating Systems have such a file on different
-#	default locations:
-#	- Un*X & Linux:    /etc/hosts
-#	- Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts
-#			   (%SystemRoot% value install default is c:\winnt)
-#	- Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts
-#			   (%SystemRoot% value install default is c:\windows)
-#	- Windows 9x/Me:   %windir%\hosts
-#			   (%windir% value is usually c:\windows)
-#	- Cygwin:	   /etc/hosts
-#
-#	The file contains newline-separated definitions, in the
-#	form ip_address_in_dotted_form name [name ...] names are
-#	whitespace-separated. Lines beginning with an hash (#)
-#	character are comments.
-#
-#	The file is checked at startup and upon configuration.
-#	If set to 'none', it won't be checked.
-#	If append_domain is used, that domain will be added to
-#	domain-local (i.e. not containing any dot character) host
-#	definitions.
-#Default:
-# hosts_file /etc/hosts
-
-#  TAG: append_domain
-#	Appends local domain name to hostnames without any dots in
-#	them.  append_domain must begin with a period.
-#
-#	Be warned there are now Internet names with no dots in
-#	them using only top-domain names, so setting this may
-#	cause some Internet sites to become unavailable.
-#
-#Example:
-# append_domain .yourdomain.com
-#Default:
-# Use operating system definitions
-
-#  TAG: ignore_unknown_nameservers
-#	By default Squid checks that DNS responses are received
-#	from the same IP addresses they are sent to.  If they
-#	don't match, Squid ignores the response and writes a warning
-#	message to cache.log.  You can allow responses from unknown
-#	nameservers by setting this option to 'off'.
-#Default:
-# ignore_unknown_nameservers on
-
-#  TAG: dns_v4_first
-#	With the IPv6 Internet being as fast or faster than IPv4 Internet
-#	for most networks Squid prefers to contact websites over IPv6.
-#
-#	This option reverses the order of preference to make Squid contact
-#	dual-stack websites over IPv4 first. Squid will still perform both
-#	IPv6 and IPv4 DNS lookups before connecting.
-#
-#	WARNING:
-#	  This option will restrict the situations under which IPv6
-#	  connectivity is used (and tested). Hiding network problems
-#	  which would otherwise be detected and warned about.
-#Default:
-# dns_v4_first off
-
-#  TAG: ipcache_size	(number of entries)
-#	Maximum number of DNS IP cache entries.
-#Default:
-# ipcache_size 1024
-
-#  TAG: ipcache_low	(percent)
-#Default:
-# ipcache_low 90
-
-#  TAG: ipcache_high	(percent)
-#	The size, low-, and high-water marks for the IP cache.
-#Default:
-# ipcache_high 95
-
-#  TAG: fqdncache_size	(number of entries)
-#	Maximum number of FQDN cache entries.
-#Default:
-# fqdncache_size 1024
-
-# MISCELLANEOUS
-# -----------------------------------------------------------------------------
-
-#  TAG: configuration_includes_quoted_values	on|off
-#	Previous Squid versions have defined "quoted/string" as syntax for
-#	ACL to signifiy the value is an included file containing values and
-#	has treated the " characters in other places of the configuration file
-#	as part of the parameter value it was used for.
-#
-#	For compatibility with existing installations that behaviour
-#	remains the default.
-#
-#	If this directive is set to 'on', Squid will start parsing each
-#	"quoted string" as a single configuration directive parameter. The
-#	quotes are stripped before the parameter value is interpreted or use.
-#
-#	That will continue for all lines until this directive is set to 'off',
-#	where Squid will return to the default configuration parsing.
-#
-#	For example;
-#
-#		configuration_includes_quoted_values on
-#		acl group external groupCheck Administrators "Internet Users" Guest
-#		configuration_includes_quoted_values off
-#
-#Default:
-# configuration_includes_quoted_values off
-
-#  TAG: memory_pools	on|off
-#	If set, Squid will keep pools of allocated (but unused) memory
-#	available for future use.  If memory is a premium on your
-#	system and you believe your malloc library outperforms Squid
-#	routines, disable this.
-#Default:
-# memory_pools on
-
-#  TAG: memory_pools_limit	(bytes)
-#	Used only with memory_pools on:
-#	memory_pools_limit 50 MB
-#
-#	If set to a non-zero value, Squid will keep at most the specified
-#	limit of allocated (but unused) memory in memory pools. All free()
-#	requests that exceed this limit will be handled by your malloc
-#	library. Squid does not pre-allocate any memory, just safe-keeps
-#	objects that otherwise would be free()d. Thus, it is safe to set
-#	memory_pools_limit to a reasonably high value even if your
-#	configuration will use less memory.
-#
-#	If set to none, Squid will keep all memory it can. That is, there
-#	will be no limit on the total amount of memory used for safe-keeping.
-#
-#	To disable memory allocation optimization, do not set
-#	memory_pools_limit to 0 or none. Set memory_pools to "off" instead.
-#
-#	An overhead for maintaining memory pools is not taken into account
-#	when the limit is checked. This overhead is close to four bytes per
-#	object kept. However, pools may actually _save_ memory because of
-#	reduced memory thrashing in your malloc library.
-#Default:
-# memory_pools_limit 5 MB
-
-#  TAG: forwarded_for	on|off|transparent|truncate|delete
-#	If set to "on", Squid will append your client's IP address
-#	in the HTTP requests it forwards. By default it looks like:
-#
-#		X-Forwarded-For: 192.1.2.3
-#
-#	If set to "off", it will appear as
-#
-#		X-Forwarded-For: unknown
-#
-#	If set to "transparent", Squid will not alter the
-#	X-Forwarded-For header in any way.
-#
-#	If set to "delete", Squid will delete the entire
-#	X-Forwarded-For header.
-#
-#	If set to "truncate", Squid will remove all existing
-#	X-Forwarded-For entries, and place the client IP as the sole entry.
-#Default:
-# forwarded_for on
-
-#  TAG: cachemgr_passwd
-#	Specify passwords for cachemgr operations.
-#
-#	Usage: cachemgr_passwd password action action ...
-#
-#	Some valid actions are (see cache manager menu for a full list):
-#		5min
-#		60min
-#		asndb
-#		authenticator
-#		cbdata
-#		client_list
-#		comm_incoming
-#		config *
-#		counters
-#		delay
-#		digest_stats
-#		dns
-#		events
-#		filedescriptors
-#		fqdncache
-#		histograms
-#		http_headers
-#		info
-#		io
-#		ipcache
-#		mem
-#		menu
-#		netdb
-#		non_peers
-#		objects
-#		offline_toggle *
-#		pconn
-#		peer_select
-#		reconfigure *
-#		redirector
-#		refresh
-#		server_list
-#		shutdown *
-#		store_digest
-#		storedir
-#		utilization
-#		via_headers
-#		vm_objects
-#
-#	* Indicates actions which will not be performed without a
-#	  valid password, others can be performed if not listed here.
-#
-#	To disable an action, set the password to "disable".
-#	To allow performing an action without a password, set the
-#	password to "none".
-#
-#	Use the keyword "all" to set the same password for all actions.
-#
-#Example:
-# cachemgr_passwd secret shutdown
-# cachemgr_passwd lesssssssecret info stats/objects
-# cachemgr_passwd disable all
-#Default:
-# No password. Actions which require password are denied.
-
-#  TAG: client_db	on|off
-#	If you want to disable collecting per-client statistics,
-#	turn off client_db here.
-#Default:
-# client_db on
-
-#  TAG: refresh_all_ims	on|off
-#	When you enable this option, squid will always check
-#	the origin server for an update when a client sends an
-#	If-Modified-Since request.  Many browsers use IMS
-#	requests when the user requests a reload, and this
-#	ensures those clients receive the latest version.
-#
-#	By default (off), squid may return a Not Modified response
-#	based on the age of the cached version.
-#Default:
-# refresh_all_ims off
-
-#  TAG: reload_into_ims	on|off
-#	When you enable this option, client no-cache or ``reload''
-#	requests will be changed to If-Modified-Since requests.
-#	Doing this VIOLATES the HTTP standard.  Enabling this
-#	feature could make you liable for problems which it
-#	causes.
-#
-#	see also refresh_pattern for a more selective approach.
-#Default:
-# reload_into_ims off
-
-#  TAG: connect_retries
-#	This sets the maximum number of connection attempts made for each
-#	TCP connection. The connect_retries attempts must all still
-#	complete within the connection timeout period.
-#
-#	The default is not to re-try if the first connection attempt fails.
-#	The (not recommended) maximum is 10 tries.
-#
-#	A warning message will be generated if it is set to a too-high
-#	value and the configured value will be over-ridden.
-#
-#	Note: These re-tries are in addition to forward_max_tries
-#	which limit how many different addresses may be tried to find
-#	a useful server.
-#Default:
-# Do not retry failed connections.
-
-#  TAG: retry_on_error
-#	If set to ON Squid will automatically retry requests when
-#	receiving an error response with status 403 (Forbidden),
-#	500 (Internal Error), 501 or 503 (Service not available).
-#	Status 502 and 504 (Gateway errors) are always retried.
-#	
-#	This is mainly useful if you are in a complex cache hierarchy to
-#	work around access control errors.
-#	
-#	NOTE: This retry will attempt to find another working destination.
-#	Which is different from the server which just failed.
-#Default:
-# retry_on_error off
-
-#  TAG: as_whois_server
-#	WHOIS server to query for AS numbers.  NOTE: AS numbers are
-#	queried only when Squid starts up, not for every request.
-#Default:
-# as_whois_server whois.ra.net
-
-#  TAG: offline_mode
-#	Enable this option and Squid will never try to validate cached
-#	objects.
-#Default:
-# offline_mode off
-
-#  TAG: uri_whitespace
-#	What to do with requests that have whitespace characters in the
-#	URI.  Options:
-#
-#	strip:  The whitespace characters are stripped out of the URL.
-#		This is the behavior recommended by RFC2396 and RFC3986
-#		for tolerant handling of generic URI.
-#		NOTE: This is one difference between generic URI and HTTP URLs.
-#
-#	deny:   The request is denied.  The user receives an "Invalid
-#		Request" message.
-#		This is the behaviour recommended by RFC2616 for safe
-#		handling of HTTP request URL.
-#
-#	allow:  The request is allowed and the URI is not changed.  The
-#		whitespace characters remain in the URI.  Note the
-#		whitespace is passed to redirector processes if they
-#		are in use.
-#		Note this may be considered a violation of RFC2616
-#		request parsing where whitespace is prohibited in the
-#		URL field.
-#
-#	encode:	The request is allowed and the whitespace characters are
-#		encoded according to RFC1738.
-#
-#	chop:	The request is allowed and the URI is chopped at the
-#		first whitespace.
-#
-#
-#	NOTE the current Squid implementation of encode and chop violates
-#	RFC2616 by not using a 301 redirect after altering the URL.
-#Default:
-# uri_whitespace strip
-
-#  TAG: chroot
-#	Specifies a directory where Squid should do a chroot() while
-#	initializing.  This also causes Squid to fully drop root
-#	privileges after initializing.  This means, for example, if you
-#	use a HTTP port less than 1024 and try to reconfigure, you may
-#	get an error saying that Squid can not open the port.
-#Default:
-# none
-
-#  TAG: balance_on_multiple_ip
-#	Modern IP resolvers in squid sort lookup results by preferred access.
-#	By default squid will use these IP in order and only rotates to
-#	the next listed when the most preffered fails.
-#
-#	Some load balancing servers based on round robin DNS have been
-#	found not to preserve user session state across requests
-#	to different IP addresses.
-#
-#	Enabling this directive Squid rotates IP's per request.
-#Default:
-# balance_on_multiple_ip off
-
-#  TAG: pipeline_prefetch
-#	HTTP clients may send a pipeline of 1+N requests to Squid using a
-#	single connection, without waiting for Squid to respond to the first
-#	of those requests. This option limits the number of concurrent
-#	requests Squid will try to handle in parallel. If set to N, Squid
-#	will try to receive and process up to 1+N requests on the same
-#	connection concurrently.
-#
-#	Defaults to 0 (off) for bandwidth management and access logging
-#	reasons.
-#
-#	NOTE: pipelining requires persistent connections to clients.
-#
-#	WARNING: pipelining breaks NTLM and Negotiate/Kerberos authentication.
-#Default:
-# Do not pre-parse pipelined requests.
-
-#  TAG: high_response_time_warning	(msec)
-#	If the one-minute median response time exceeds this value,
-#	Squid prints a WARNING with debug level 0 to get the
-#	administrators attention.  The value is in milliseconds.
-#Default:
-# disabled.
-
-#  TAG: high_page_fault_warning
-#	If the one-minute average page fault rate exceeds this
-#	value, Squid prints a WARNING with debug level 0 to get
-#	the administrators attention.  The value is in page faults
-#	per second.
-#Default:
-# disabled.
-
-#  TAG: high_memory_warning
-# Note: This option is only available if Squid is rebuilt with the
-#       GNU Malloc with mstats()
-#
-#	If the memory usage (as determined by mallinfo) exceeds
-#	this amount, Squid prints a WARNING with debug level 0 to get
-#	the administrators attention.
-#Default:
-# disabled.
-
-#  TAG: sleep_after_fork	(microseconds)
-#	When this is set to a non-zero value, the main Squid process
-#	sleeps the specified number of microseconds after a fork()
-#	system call. This sleep may help the situation where your
-#	system reports fork() failures due to lack of (virtual)
-#	memory. Note, however, if you have a lot of child
-#	processes, these sleep delays will add up and your
-#	Squid will not service requests for some amount of time
-#	until all the child processes have been started.
-#	On Windows value less then 1000 (1 milliseconds) are
-#	rounded to 1000.
-#Default:
-# sleep_after_fork 0
-
-#  TAG: windows_ipaddrchangemonitor	on|off
-# Note: This option is only available if Squid is rebuilt with the
-#       MS Windows
-#
-#	On Windows Squid by default will monitor IP address changes and will 
-#	reconfigure itself after any detected event. This is very useful for
-#	proxies connected to internet with dial-up interfaces.
-#	In some cases (a Proxy server acting as VPN gateway is one) it could be
-#	desiderable to disable this behaviour setting this to 'off'.
-#	Note: after changing this, Squid service must be restarted.
-#Default:
-# windows_ipaddrchangemonitor on
-
-#  TAG: eui_lookup
-#	Whether to lookup the EUI or MAC address of a connected client.
-#Default:
-# eui_lookup on
-
-#  TAG: max_filedescriptors
-#	Reduce the maximum number of filedescriptors supported below
-#	the usual operating system defaults.
-#
-#	Remove from squid.conf to inherit the current ulimit setting.
-#
-#	Note: Changing this requires a restart of Squid. Also
-#	not all I/O types supports large values (eg on Windows).
-#Default:
-# Use operating system limits set by ulimit.
-
-#  TAG: workers
-#	Number of main Squid processes or "workers" to fork and maintain.
-#	0: "no daemon" mode, like running "squid -N ..."
-#	1: "no SMP" mode, start one main Squid process daemon (default)
-#	N: start N main Squid process daemons (i.e., SMP mode)
-#
-#	In SMP mode, each worker does nearly all what a single Squid daemon
-#	does (e.g., listen on http_port and forward HTTP requests).
-#Default:
-# SMP support disabled.
-
-#  TAG: cpu_affinity_map
-#	Usage: cpu_affinity_map process_numbers=P1,P2,... cores=C1,C2,...
-#
-#	Sets 1:1 mapping between Squid processes and CPU cores. For example,
-#
-#	    cpu_affinity_map process_numbers=1,2,3,4 cores=1,3,5,7
-#
-#	affects processes 1 through 4 only and places them on the first
-#	four even cores, starting with core #1.
-#
-#	CPU cores are numbered starting from 1. Requires support for
-#	sched_getaffinity(2) and sched_setaffinity(2) system calls.
-#
-#	Multiple cpu_affinity_map options are merged.
-#
-#	See also: workers
-#Default:
-# Let operating system decide.
-
diff --git a/network/squid/squid.info b/network/squid/squid.info
index 720212f47b..b8cace6555 100644
--- a/network/squid/squid.info
+++ b/network/squid/squid.info
@@ -1,8 +1,8 @@
 PRGNAM="squid"
-VERSION="3.5.26"
+VERSION="4.13"
 HOMEPAGE="http://www.squid-cache.org/"
-DOWNLOAD="http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.26.tar.xz"
-MD5SUM="510e2c84773879c00d0e7ced997864d9"
+DOWNLOAD="http://www.squid-cache.org/Versions/v4/squid-4.13.tar.xz"
+MD5SUM="492e54afc15821141ff1d1d9903854d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/squid/squid.logrotate b/network/squid/squid.logrotate
index eeca36223f..9c2b9c2816 100644
--- a/network/squid/squid.logrotate
+++ b/network/squid/squid.logrotate
@@ -7,7 +7,7 @@
 # reopen squid.log, effectively using the new logfile.  The old logfile
 # (squid.log.1) will be compressed by logrotate's next invocation.
 /var/log/squid/*.log {
-    su @USER@ @GROUP@
+    su @SQUIDUSER@ @SQUIDGROUP@
     weekly
     rotate 5
     compress
diff --git a/network/squirrelmail/README b/network/squirrelmail/README
index 7e80293e18..fe88288631 100644
--- a/network/squirrelmail/README
+++ b/network/squirrelmail/README
@@ -1,8 +1,9 @@
 quirrelMail is a project that provides both a web-based email client
-and a proxy server for the IMAP protocol. SquirrelMail webmail is available
-for any platform supporting PHP. The SquirrelMail webmail client itself is a
-complete webmail system, but extra features are available in the form of
-plugins. There are over 200 third-party plugins available for download from
-the SquirrelMail website and SquirrelMail ships with several "standard" or
-"core" plugins. SquirrelMail webmail has been translated into over 50
+and a proxy server for the IMAP protocol. SquirrelMail webmail
+is available for any platform supporting PHP. The SquirrelMail
+webmail client itself is a complete webmail system, but extra
+features are available in the form of plugins. There are over 200
+third-party plugins available for download from the SquirrelMail
+website and SquirrelMail ships with several "standard" or "core"
+plugins. SquirrelMail webmail has been translated into over 50
 languages.
diff --git a/network/squirrelmail/slack-desc b/network/squirrelmail/slack-desc
index 87fde985a6..f357150415 100644
--- a/network/squirrelmail/slack-desc
+++ b/network/squirrelmail/slack-desc
@@ -16,3 +16,4 @@ squirrelmail:
 squirrelmail:
 squirrelmail:
 squirrelmail:
+squirrelmail:
diff --git a/network/squirrelmail/squirrelmail.info b/network/squirrelmail/squirrelmail.info
index 165fc379af..6c983f39ae 100644
--- a/network/squirrelmail/squirrelmail.info
+++ b/network/squirrelmail/squirrelmail.info
@@ -1,10 +1,10 @@
 PRGNAM="squirrelmail"
 VERSION="1.4.22"
 HOMEPAGE="https://squirrelmail.sourceforge.net"
-DOWNLOAD="https://downloads.sourceforge.net/project/squirrelmail/stable/1.4.22/squirrelmail-webmail-1.4.22.tar.gz
-https://sourceforge.net/projects/squirrelmail/files/locales/1.4.18-20090526/locales-1.4.18-20090526-src.tar.gz"
-MD5SUM="ae9e2bc7f4fa58162b6152fcb0cbb3a5
-fc5258ad981f866844955e27a0fb9b67"
+DOWNLOAD="https://downloads.sourceforge.net/project/squirrelmail/stable/1.4.22/squirrelmail-webmail-1.4.22.tar.gz \
+          https://sourceforge.net/projects/squirrelmail/files/locales/1.4.18-20090526/locales-1.4.18-20090526-src.tar.gz"
+MD5SUM="ae9e2bc7f4fa58162b6152fcb0cbb3a5 \
+        fc5258ad981f866844955e27a0fb9b67"
 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/fixrst.diff b/network/sshfs-fuse/fixrst.diff
deleted file mode 100644
index 4bf148f5d5..0000000000
--- a/network/sshfs-fuse/fixrst.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur sshfs-3.6.0/sshfs.rst sshfs-3.6.0.patched/sshfs.rst
---- sshfs-3.6.0/sshfs.rst	2019-11-03 04:34:29.000000000 -0500
-+++ sshfs-3.6.0.patched/sshfs.rst	2020-01-01 03:49:22.746410220 -0500
-@@ -205,13 +205,11 @@
- -o direct_io
-    This option disables the use of page cache (file content cache) in 
-    the kernel for this filesystem.
--   This has several affects:
--   1. Each read() or write() system call will initiate one or more read or
--      write operations, data will not be cached in the kernel.
--   2. The return value of the read() and write() system calls will correspond 
--      to the return values of the read and write operations. This is useful 
--      for example if the file size is not known in advance (before reading it).
--      e.g. /proc filesystem 
-+   This has several effects:
-+
-+   1. Each read() or write() system call will initiate one or more read or write operations, data will not be cached in the kernel.
-+
-+   2. The return value of the read() and write() system calls will correspond to the return values of the read and write operations. This is useful for example if the file size is not known in advance (before reading it).  e.g. /proc filesystem 
- 
- In addition, SSHFS accepts several options common to all FUSE file
- systems. These are described in the `mount.fuse` manpage (look
diff --git a/network/sshfs-fuse/sshfs-fuse.SlackBuild b/network/sshfs-fuse/sshfs-fuse.SlackBuild
index 1a4e9412a0..c473ebeec4 100644
--- a/network/sshfs-fuse/sshfs-fuse.SlackBuild
+++ b/network/sshfs-fuse/sshfs-fuse.SlackBuild
@@ -24,17 +24,15 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
-# Note: I'm aware the fixrst.diff isn't being applied. Please leave
-# it in the repo, it's the source for the sshfs.1.gz, which *is*
-# installed. Need the diff to comply with the GPL.
-
+# 20201208 bkw: update for v3.7.1.
+# 20200804 bkw: update for v3.7.0.
 # 20200101 bkw:
 # - take over maintenance
 # - update for v3.6.0. too many changes to build old versions.
 
 PRGNAM=sshfs-fuse
 SRCNAM=sshfs
-VERSION=${VERSION:-3.6.0}
+VERSION=${VERSION:-3.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -94,8 +92,6 @@ cd build
 cd ..
 
 # Use prebuilt man page, so this build doesn't depend on docutils.
-# Also, the supplied sshfs.rst is slightly broken, this man page was
-# made from a slightly fixed version (see fixrst.diff).
 # Don't use the one installed by ninja, if there was one.
 MANDIR=$PKG/usr/man/man1
 rm -f $MANDIR/$SRCNAM.1
diff --git a/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info
index 8503f7fa0c..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.6.0"
+VERSION="3.7.1"
 HOMEPAGE="https://github.com/libfuse/sshfs"
-DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.6.0/sshfs-3.6.0.tar.xz"
-MD5SUM="7f7685ebefdea10c5fc44a54e9500e36"
+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/sshfs-fuse/sshfs.1.gz b/network/sshfs-fuse/sshfs.1.gz
index fb079bef57..182444d7a1 100644
--- a/network/sshfs-fuse/sshfs.1.gz
+++ b/network/sshfs-fuse/sshfs.1.gz
diff --git a/network/sshuttle/sshuttle.SlackBuild b/network/sshuttle/sshuttle.SlackBuild
index f32c5cbaef..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:-0.78.5}
+VERSION=${VERSION:-1.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,7 +72,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
 
 mkdir -p $PKG/usr/man/man8
 cat $TMP/$PRGNAM-$VERSION/Documentation/$PRGNAM.8 | gzip -9c > \
diff --git a/network/sshuttle/sshuttle.info b/network/sshuttle/sshuttle.info
index 852a5e81ba..bf996f1487 100644
--- a/network/sshuttle/sshuttle.info
+++ b/network/sshuttle/sshuttle.info
@@ -1,10 +1,10 @@
 PRGNAM="sshuttle"
-VERSION="0.78.5"
+VERSION="1.0.5"
 HOMEPAGE="https://github.com/sshuttle/sshuttle"
-DOWNLOAD="https://pypi.python.org/packages/source/s/sshuttle/sshuttle-0.78.5.tar.gz"
-MD5SUM="c1ef2d0f5e919c5ced27f0c5538c6d00"
+DOWNLOAD="https://pypi.python.org/packages/source/s/sshuttle/sshuttle-1.0.5.tar.gz"
+MD5SUM="10c9765f2cc2a3e3e080a4a218428cc4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pytest-runner"
+REQUIRES="python3"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"
diff --git a/network/sslscan/README b/network/sslscan/README
index 6626f8fa0c..f20fe6373c 100644
--- a/network/sslscan/README
+++ b/network/sslscan/README
@@ -3,8 +3,8 @@ ciphers that are supported.  SSLScan is designed to be easy, lean and
 fast.  The output includes prefered ciphers of the SSL service, the
 certificate, and is in Text and XML formats.
 
-Upstream recommends building statically against OpenSSL 1.0.2 (with weak
-ciphers and small DH keys re-enabled) for the widest compatibility for
-scanning. You can build against the system openssl with:
+Upstream recommends building statically against OpenSSL 1.1.1 for the
+widest compatibility for scanning. You can build against the system
+openssl with:
 
 STATIC=no ./sslscan.SlackBuild
diff --git a/network/sslscan/sslscan.SlackBuild b/network/sslscan/sslscan.SlackBuild
index 2292ef2d7b..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-2019  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:-1.11.13}
+VERSION=${VERSION:-2.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,9 +65,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-rbsec
-tar xvf $CWD/$PRGNAM-$VERSION-rbsec.tar.gz
-cd $PRGNAM-$VERSION-rbsec
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 
 sed -i 's/^\(\.openssl.is.fresh:\).*$/\1/' Makefile
 sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile
@@ -75,7 +75,7 @@ sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile
 STATIC=${STATIC:-yes}
 
 if [ "$STATIC" = "yes" ] ; then
-  OPENSSLVERSION=${OPENSSLVERSION:-83abb7af5cee7dd1c9ab500a10a776c586a18f1b}
+  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 69dc61865c..43d38b4602 100644
--- a/network/sslscan/sslscan.info
+++ b/network/sslscan/sslscan.info
@@ -1,10 +1,10 @@
 PRGNAM="sslscan"
-VERSION="1.11.13"
+VERSION="2.0.9"
 HOMEPAGE="https://github.com/rbsec/sslscan"
-DOWNLOAD="https://github.com/rbsec/sslscan/archive/1.11.13-rbsec/sslscan-1.11.13-rbsec.tar.gz \
-          https://github.com/PeterMosmans/openssl/archive/83abb7af5cee7dd1c9ab500a10a776c586a18f1b/openssl-83abb7af5cee7dd1c9ab500a10a776c586a18f1b.tar.gz"
-MD5SUM="ca73b626b93dc228989241b4decd42e6 \
-        7bc7d20f588c8467fdfcddd92a88e3d9"
+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/README b/network/syncthing/README
index 6037811cca..86b1197e66 100644
--- a/network/syncthing/README
+++ b/network/syncthing/README
@@ -8,8 +8,8 @@ on a local network, or between remote devices over the Internet.
 Before you can build Syncthing, you have to create a syncthing
 user and group (used when running syncthing as a system-wide daemon):
 
-# groupadd -g 307 syncthing
-# useradd -d /var/lib/syncthing -g syncthing -s /bin/bash -u 307 syncthing
+groupadd -g 307 syncthing
+useradd -d /var/lib/syncthing -g syncthing -s /bin/bash -u 307 syncthing
 
 This package includes a rc.syncthing startup script, suitable for
 running Syncthing as a system daemon - such as on a server.
diff --git a/network/syncthing/syncthing.SlackBuild b/network/syncthing/syncthing.SlackBuild
index c36a3c8d03..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.3.4}
+VERSION=${VERSION:-1.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/syncthing/syncthing.info b/network/syncthing/syncthing.info
index 76801e5723..ded831ebd6 100644
--- a/network/syncthing/syncthing.info
+++ b/network/syncthing/syncthing.info
@@ -1,10 +1,10 @@
 PRGNAM="syncthing"
-VERSION="1.3.4"
+VERSION="1.14.0"
 HOMEPAGE="https://syncthing.net"
-DOWNLOAD="https://github.com/syncthing/syncthing/releases/download/v1.3.4/syncthing-linux-386-v1.3.4.tar.gz"
-MD5SUM="f7086b808eb88de113d6d6fef6859632"
-DOWNLOAD_x86_64="https://github.com/syncthing/syncthing/releases/download/v1.3.4/syncthing-linux-amd64-v1.3.4.tar.gz"
-MD5SUM_x86_64="127c1b75227608ca9b05a96de3c9475a"
+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/t38modem/README b/network/t38modem/README
index 8b80ff7d18..d9f5eb211b 100644
--- a/network/t38modem/README
+++ b/network/t38modem/README
@@ -4,7 +4,18 @@ What is t38modem?
  * From IP network view point it's a H.323/SIP endpoint with T.38 fax support.
  * From your view point it's a gateway between an application and IP network.
 
-This package requires both the OPAL and ptlib packages (both available on
-SlackBuilds.)  After building and installing OPAL package keep the OPAL source
-tree on disk.  This package will point to OPAL source tree and use files created
-during its build processes to create this package.
+After installation update the /etc/rc.d/rc.t38modem.conf file with your SIP
+account details and add the following to your /etc/rc.d/rc.local script:
+
+  if [ -x /etc/rc.d/rc.t38modem ]; then
+    /etc/rc.d/rc.t38modem start
+  fi
+
+Optionally, you can add the following to your /etc/rc.d/rc.local_shutdown:
+
+  if [ -x /etc/rc.d/rc.t38modem ]; then
+    /etc/rc.d/rc.t38modem stop
+  fi
+
+If you are using this package with Asterisk there is a sample resetmodem script
+that can be placed in the your /var/spool/hylafax/etc directory.
diff --git a/network/t38modem/doinst.sh b/network/t38modem/doinst.sh
new file mode 100644
index 0000000000..29b7e602de
--- /dev/null
+++ b/network/t38modem/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
+}
+
+preserve_perms etc/rc.d/rc.t38modem.new
+config etc/rc.d/rc.t38modem.conf.new
+
diff --git a/network/t38modem/rc.t38modem b/network/t38modem/rc.t38modem
new file mode 100644
index 0000000000..158debc2ef
--- /dev/null
+++ b/network/t38modem/rc.t38modem
@@ -0,0 +1,152 @@
+#!/bin/sh
+
+#############################
+# READ T38MODEM CONFIG FILE #
+#############################
+
+# Get the configuration information from /etc/rc.d/rc.t38modem.conf:
+. /etc/rc.d/rc.t38modem.conf
+
+###########
+# LOGGING #
+###########
+
+# If possible, log events in /var/log/messages:
+if [ -f /var/run/syslogd.pid -a -x /usr/bin/logger ]; then
+  LOGGER=/usr/bin/logger
+else # output to stdout/stderr:
+  LOGGER=/bin/cat
+fi
+
+MAXMODEMS=6
+
+# Function to return PID of modem instance:
+modem_pid() {
+  PID=$(ps -C t38modem -o pid,cmd | grep ${1} | grep -v grep | awk '{print $1}')
+  echo "$PID"
+}
+
+# Function to start modem interface:
+modem_up() {
+  i=0
+  while [ $i -lt $MAXMODEMS ]; do
+    if [ "${MODEMNAME[$i]}" = "${1}" ]; then
+      PID=$(modem_pid "${1}")
+      if [ -n "$PID" ]; then
+        echo "Modem "${1}" already up..."
+      else
+        echo "Starting t38modem on ${1}..."
+        # Build PTTY name
+        PTTY=${PTTY[$i]}
+        if [ -z "${PTTY}" ]; then
+          PTTY="+/dev/${MODEMNAME[$i]}"
+        fi
+        # Start t38modem
+        nohup \
+          /usr/bin/t38modem \
+          --no-h323 \
+          --sip-t38-udptl-redundancy ${T38_REDUNDANCY[$i]} \
+          --sip-listen udp\$*:${LISTEN_PORT[$i]} \
+          --sip-register ${SIP_ACCOUNT[$i]}@${SIP_SERVER[$i]},${SIP_PASSWORD[$i]} \
+          --ptty ${PTTY} \
+          --force-fax-mode \
+          --route "modem:.*=sip:<dn>@${SIP_SERVER[$i]}" \
+          --route "sip:.*=modem:<dn>" \
+          > /dev/null 2>&1 &
+      fi
+      break
+    fi
+    i=$(($i+1))
+  done
+}
+
+# Function to stop modem interface:
+modem_down() {
+  PID=$(modem_pid "${1}")
+  if [ -n "$PID" ]; then
+    echo "Stopping t38modem for modem ${1}..."
+    kill $PID
+  fi
+}
+
+# Function to report status on modem interface:
+modem_status() {
+  PID=$(modem_pid "${1}")
+  echo -n "Modem ${1}: "
+  if [ -n "$PID" ]; then
+    echo "up"
+  else
+    echo "down"
+  fi
+}
+
+# Function to bring modems up:
+start() {
+  for i in ${MODEMNAME[@]} ; do
+    modem_up $i
+  done
+}
+
+# Function to take modems down:
+stop() {
+  for i in ${MODEMNAME[@]} ; do
+    modem_down $i
+  done
+}
+
+# Function to query modem states:
+status() {
+  for i in ${MODEMNAME[@]} ; do
+    modem_status $i
+  done
+}
+
+############
+### MAIN ###
+############
+
+case "$1" in
+'start')
+  start
+  ;;
+'stop')
+  stop
+  ;;
+'restart')
+  stop
+  sleep 5
+  start
+  ;;
+'status')
+  status
+  ;;
+*_start)
+  MODEM=$(echo $1 | /bin/cut -d '_' -f 1)
+  modem_up $MODEM
+  ;;
+*_stop)
+  MODEM=$(echo $1 | /bin/cut -d '_' -f 1)
+  modem_down $MODEM
+  ;;
+*_restart)
+  MODEM=$(echo $1 | /bin/cut -d '_' -f 1)
+  modem_down $MODEM
+  sleep 5
+  modem_up $MODEM
+  ;;
+*_status)
+  MODEM=$(echo $1 | /bin/cut -d '_' -f 1)
+  modem_status $MODEM
+  ;;
+*_up)
+  MODEM=$(echo $1 | /bin/cut -d '_' -f 1)
+  modem_up $MODEM
+  ;;
+*_down)
+  MODEM=$(echo $1 | /bin/cut -d '_' -f 1)
+  modem_down $MODEM
+  ;;
+*)
+  echo "usage: $0 start|stop|restart|status"
+esac
+
diff --git a/network/t38modem/rc.t38modem.conf b/network/t38modem/rc.t38modem.conf
new file mode 100644
index 0000000000..bb05c85527
--- /dev/null
+++ b/network/t38modem/rc.t38modem.conf
@@ -0,0 +1,40 @@
+#####################################################
+# Must be set to the number of modems in the config #
+#####################################################
+
+# Config information for modem0:
+MODEMNAME[0]="ttyx0"
+PTTY[0]=""
+SIP_SERVER[0]=
+SIP_ACCOUNT[0]=
+SIP_PASSWORD[0]=
+LISTEN_PORT[0]=5060
+T38_REDUNDANCY[0]=3
+
+# Config information for modem1:
+MODEMNAME[1]="ttyx1"
+PTTY[1]=""
+SIP_SERVER[1]=
+SIP_ACCOUNT[1]=
+SIP_PASSWORD[1]=
+LISTEN_PORT[1]=5061
+T38_REDUNDANCY[1]=3
+
+# Config information for modem2:
+MODEMNAME[2]="ttyx2"
+PTTY[2]=""
+SIP_SERVER[2]=
+SIP_ACCOUNT[2]=
+SIP_PASSWORD[2]=
+LISTEN_PORT[2]=5062
+T38_REDUNDANCY[2]=3
+
+# Config information for modem3:
+MODEMNAME[3]="ttyx3"
+PTTY[3]=""
+SIP_SERVER[3]=
+SIP_ACCOUNT[3]=
+SIP_PASSWORD[3]=
+LISTEN_PORT[3]=5063
+T38_REDUNDANCY[3]=3
+
diff --git a/network/t38modem/resetmodem b/network/t38modem/resetmodem
new file mode 100644
index 0000000000..661cec143c
--- /dev/null
+++ b/network/t38modem/resetmodem
@@ -0,0 +1,28 @@
+#!/usr/bin/bash
+
+# This script can be used to unwedge a stuck t38modem virtual modem.  In order
+# to use this script, you'll need to do the following:
+#
+# Use the /etc/rc.d/rc.t38modem script provided to start/stop t38modem.  This
+# will allow you to start up multiple virtual modems using a separate t38modem
+# process for each line.  You can then start/stop/restart an individual modem
+# line without interrupting the other ongoing faxes.
+#
+# Using visudo, add the following to /etc/sudoers:
+#
+#     # Hylafax system commands
+#     uucp ALL=(ALL) NOPASSWD: /etc/rc.d/rc.t38modem
+#
+# Copy this file to the /var/spool/hylafax/etc and set its execute bit:
+#
+#     cp /usr/doc/hylafax-3.15/Hylafax/resetmodem /var/spool/hylafax/etc
+#     chmod +x /var/spool/hylafax/etc/resetmodem
+#
+
+DEV=$(basename $1)
+
+if [ "$DEV" = "ttyx0" -o "$DEV" = "ttyx1" -o "$DEV" = "ttyx2" -o "$DEV" = "ttyx3" ]; then
+  sudo /etc/rc.d/rc.t38modem "${DEV}_restart"
+fi
+
+
diff --git a/network/t38modem/slack-desc b/network/t38modem/slack-desc
index a650441304..032acfd2f1 100644
--- a/network/t38modem/slack-desc
+++ b/network/t38modem/slack-desc
@@ -16,4 +16,4 @@ t38modem: support
 t38modem: * From your view point it's a gateway between an application and IP
 t38modem: network
 t38modem:
-t38modem: Homepage: https://sourceforge.net/projects/t38modem/
+t38modem: Homepage: https://github.com/T38Modem/t38modem
diff --git a/network/t38modem/t38modem.SlackBuild b/network/t38modem/t38modem.SlackBuild
index b0690134e9..489b096299 100644
--- a/network/t38modem/t38modem.SlackBuild
+++ b/network/t38modem/t38modem.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for t38modem
 
-# Copyright 2015  Christopher Walker Copperas Cove, TX
+# Copyright 2015-2020  Chris Walker Kempner, TX
 # 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=t38modem
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-3.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
@@ -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"
@@ -61,8 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
-tar xvf $CWD/${PRGNAM}_${VERSION}-4.debian.tar.gz
+unzip $CWD/$PRGNAM-$VERSION.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,23 +70,21 @@ 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 patches
-#
-patch -p1 <$TMP/debian/patches/t38modem-opal3.10-patch
-patch -p1 <$TMP/debian/patches/spelling-error-fix
-patch -p1 <$TMP/debian/patches/opal-3.10.7.patch
-patch -p1 <$TMP/debian/patches/opal-3.10.9.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 PTLIBDIR=/usr/share/ptlib \
-OPALDIR=$TMP/opal-${OPALVER:-3.10.10} \
-  make USE_UNIX98_PTY=1 USE_LEGACY_PTY=1 USE_OPAL=1 opt
+OPALDIR=$TMP/opal-${OPALVER:-3.10.15} \
+  make USE_UNIX98_PTY=1 USE_LEGACY_PTY=1 USE_OPAL=1
 
 # Install binaries, READMEs, etc.,
 mkdir -p $PKG/usr/bin
-install -o root -g root obj_linux_*_opal/t38modem $PKG/usr/bin
+install -o root -g root t38modem $PKG/usr/bin
+
+mkdir -p $PKG/etc/rc.d
+install -o root -g root $CWD/rc.t38modem \
+  $PKG/etc/rc.d/rc.t38modem.new
+install -o root -g root -m 600 $CWD/rc.t38modem.conf \
+  $PKG/etc/rc.d/rc.t38modem.conf.new
 
 # Strip binaries and libraries
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -99,12 +96,14 @@ cp -a \
   $TMP/$PRGNAM-$VERSION/ReadMe.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
+  $CWD/resetmodem \
   $TMP/$PRGNAM-$VERSION/HylaFAX/config.ttyx \
   $PKG/usr/doc/$PRGNAM-$VERSION/HylaFAX
 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/t38modem/t38modem.info b/network/t38modem/t38modem.info
index bcab7eff84..09a7c9dc50 100644
--- a/network/t38modem/t38modem.info
+++ b/network/t38modem/t38modem.info
@@ -1,12 +1,10 @@
 PRGNAM="t38modem"
-VERSION="2.0.0"
-HOMEPAGE="https://sourceforge.net/projects/t38modem/"
-DOWNLOAD="http://http.debian.net/debian/pool/main/t/t38modem/t38modem_2.0.0.orig.tar.gz \
-          http://http.debian.net/debian/pool/main/t/t38modem/t38modem_2.0.0-4.debian.tar.gz"
-MD5SUM="ffcb224ac414693f2d0a5af720d4952a \
-        8072c6645a33f2660a58acd6f651d42a"
+VERSION="3.15"
+HOMEPAGE="https://github.com/T38Modem/t38modem"
+DOWNLOAD="https://github.com/T38Modem/t38modem/archive/3.15/t38modem-3.15.zip"
+MD5SUM="c340d2b6657ba81eaaab4a816367bbe0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="opal"
-MAINTAINER="Christopher Walker"
+REQUIRES="t38modem-opal"
+MAINTAINER="Chris Walker"
 EMAIL="kris240376@gmail.com"
diff --git a/network/t50/README b/network/t50/README
index e6e317daaa..28bef4771d 100644
--- a/network/t50/README
+++ b/network/t50/README
@@ -1,9 +1,9 @@
-T50 is a tool designed to perform stress testing on a variety of infrastructure
-network devices, covering some regular protocols (ICMP, IGMP, TCP and UDP),
-some infrastructure specific protocols (GRE, IPSec and  RSVP) and some routing
-protocols (RIP, EIGRP and OSPF).
+T50 is a tool designed to perform stress testing on a variety of
+infrastructure network devices, covering some regular protocols (ICMP,
+IGMP, TCP and UDP), some infrastructure specific protocols (GRE, IPSec
+and  RSVP) and some routing protocols (RIP, EIGRP and OSPF).
 
-The main differentiator of T50 is that it is able to send all protocols
-sequentially using one single SOCKET, and it is capable of being used to
-modify network routes, letting IT Security Professionals perform advanced
-tests.
+The main differentiator of T50 is that it is able to send all
+protocols sequentially using one single SOCKET, and it is capable of
+being used to modify network routes, letting IT Security Professionals
+perform advanced tests.
diff --git a/network/t50/t50.SlackBuild b/network/t50/t50.SlackBuild
index 3232fc40ef..4974b5c28b 100644
--- a/network/t50/t50.SlackBuild
+++ b/network/t50/t50.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for t50
 
-# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
+# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/network/tcptunnel/tcptunnel.SlackBuild b/network/tcptunnel/tcptunnel.SlackBuild
index 2d85b1481b..3f85fa60b3 100644
--- a/network/tcptunnel/tcptunnel.SlackBuild
+++ b/network/tcptunnel/tcptunnel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tcptunnel
 
-# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
+# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
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 f88374b013..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.4.4445}
+VERSION=${VERSION:-15.16.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/teamviewer/teamviewer.info b/network/teamviewer/teamviewer.info
index 85663b37d6..217c4407c8 100644
--- a/network/teamviewer/teamviewer.info
+++ b/network/teamviewer/teamviewer.info
@@ -1,10 +1,10 @@
 PRGNAM="teamviewer"
-VERSION="15.4.4445"
+VERSION="15.16.8"
 HOMEPAGE="https://www.teamviewer.com/"
-DOWNLOAD="https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.4.4445_i386.deb"
-MD5SUM="e03e1ff130812185e9aab591b8f113fb"
-DOWNLOAD_x86_64="https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.4.4445_amd64.deb"
-MD5SUM_x86_64="ddfaf157cc8dd875af94577c3b312962"
+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 2ecd4bb547..9f1ff6eff5 100644
--- a/network/telegram/telegram.SlackBuild
+++ b/network/telegram/telegram.SlackBuild
@@ -28,7 +28,7 @@
 PRGNAM=telegram
 SRCNAM=tsetup
 SRCDIR=Telegram
-VERSION=${VERSION:-1.9.21}
+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 1ce640e26f..dbee2cd1c0 100644
--- a/network/telegram/telegram.info
+++ b/network/telegram/telegram.info
@@ -1,10 +1,10 @@
 PRGNAM="telegram"
-VERSION="1.9.21"
+VERSION="2.7.1"
 HOMEPAGE="https://telegram.org"
-DOWNLOAD="https://updates.tdesktop.com/tlinux32/tsetup32.1.9.21.tar.xz"
-MD5SUM="dfe6d1b7b63af7ab7adacf96ebef47ea"
-DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.1.9.21.tar.xz"
-MD5SUM_x86_64="e2319d7f1846eaff765eaf3cadd19505"
+DOWNLOAD="https://updates.tdesktop.com/tlinux32/tsetup32.2.4.4.tar.xz"
+MD5SUM="857865fb0baa7aabadf3a6136f8276ba"
+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/tgt/README b/network/tgt/README
new file mode 100644
index 0000000000..838e2479b2
--- /dev/null
+++ b/network/tgt/README
@@ -0,0 +1,7 @@
+tgt (SCSI target driver)
+
+SCSI target driver (iSCSI, Fibre Channel, SRP, etc) creation and
+maintenance.
+
+This is the user-space code.  You most probably already have the
+kernel-space code enabled.
diff --git a/network/tgt/doinst.sh b/network/tgt/doinst.sh
new file mode 100644
index 0000000000..65a8251910
--- /dev/null
+++ b/network/tgt/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 cop
+y
+    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/tgt/targets.conf.new
+preserve_perms etc/rc.d/rc.tgtd.new
diff --git a/network/tgt/slack-desc b/network/tgt/slack-desc
new file mode 100644
index 0000000000..175ba0a648
--- /dev/null
+++ b/network/tgt/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------------------------------------------------------|
+tgt: tgt (SCSI target driver)
+tgt:
+tgt: SCSI target driver (iSCSI, Fibre Channel, SRP, etc) creation and
+tgt: maintenance.
+tgt:
+tgt: This is the user-space code.  You most probably already have the
+tgt: kernel-space code enabled.
+tgt:
+tgt:
+tgt:
+tgt:
diff --git a/network/tgt/tgt.SlackBuild b/network/tgt/tgt.SlackBuild
new file mode 100644
index 0000000000..b3ea1b3ef4
--- /dev/null
+++ b/network/tgt/tgt.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for tgt
+
+# Copyright 2020 Pierre-Philipp Braun, 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=tgt
+VERSION=${VERSION:-1.0.79}
+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
+mandir=/usr/man docdir=/usr/doc/$PRGNAM-$VERSION make install DESTDIR=$PKG
+mv $PKG/etc/tgt/targets.conf $PKG/etc/tgt/targets.conf.new
+
+install -D -m 0644 scripts/initd.sample $PKG/etc/rc.d/rc.tgtd.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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README doc/README.* doc/tmf.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 0644 $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
+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/tgt/tgt.info b/network/tgt/tgt.info
new file mode 100644
index 0000000000..142c1e7a26
--- /dev/null
+++ b/network/tgt/tgt.info
@@ -0,0 +1,10 @@
+PRGNAM="tgt"
+VERSION="1.0.79"
+HOMEPAGE="http://stgt.sourceforge.net/"
+DOWNLOAD="https://github.com/fujita/tgt/archive/v1.0.79/tgt-1.0.79.tar.gz"
+MD5SUM="89483668b4841d740a5f3332a20d6dc9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
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/tinc/tinc.SlackBuild b/network/tinc/tinc.SlackBuild
index 62c3ac436e..377d327691 100644
--- a/network/tinc/tinc.SlackBuild
+++ b/network/tinc/tinc.SlackBuild
@@ -32,7 +32,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tinc
-VERSION=${VERSION:-1.0.35}
+VERSION=${VERSION:-1.0.36}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/tinc/tinc.info b/network/tinc/tinc.info
index a8ea7750a3..8cd88c74d3 100644
--- a/network/tinc/tinc.info
+++ b/network/tinc/tinc.info
@@ -1,8 +1,8 @@
 PRGNAM="tinc"
-VERSION="1.0.35"
+VERSION="1.0.36"
 HOMEPAGE="https://www.tinc-vpn.org/"
-DOWNLOAD="https://www.tinc-vpn.org/packages/tinc-1.0.35.tar.gz"
-MD5SUM="c44f3eaf6264319953d0cff56f2e98d4"
+DOWNLOAD="https://www.tinc-vpn.org/packages/tinc-1.0.36.tar.gz"
+MD5SUM="535b58ee026ec9551954dcc6ed56edca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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 85be50d74b..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:-9.0.7}
+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 2d5f28ce85..2b8d5d838a 100644
--- a/network/tor-browser/tor-browser.info
+++ b/network/tor-browser/tor-browser.info
@@ -1,10 +1,10 @@
 PRGNAM="tor-browser"
-VERSION="9.0.7"
+VERSION="10.0.15"
 HOMEPAGE="https://www.torproject.org"
-DOWNLOAD="https://dist.torproject.org/torbrowser/9.0.7/tor-browser-linux32-9.0.7_en-US.tar.xz"
-MD5SUM="9efdc36ed8033240c9b6ef1f024e8cf4"
-DOWNLOAD_x86_64="https://dist.torproject.org/torbrowser/9.0.7/tor-browser-linux64-9.0.7_en-US.tar.xz"
-MD5SUM_x86_64="bfca4bd9effe1a60a9e87fd023bbd2af"
+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 9d9dfdeec5..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.2.7}
+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 a2f8cc7266..ee4a5c1eaf 100644
--- a/network/tor/tor.info
+++ b/network/tor/tor.info
@@ -1,8 +1,8 @@
 PRGNAM="tor"
-VERSION="0.4.2.7"
+VERSION="0.4.5.7"
 HOMEPAGE="https://www.torproject.org/"
-DOWNLOAD="https://dist.torproject.org/tor-0.4.2.7.tar.gz"
-MD5SUM="a4b338b9f7444f4f89259c9736ff74c8"
+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/translate-shell/README b/network/translate-shell/README
index 7cd3d46a23..0f422b9d78 100644
--- a/network/translate-shell/README
+++ b/network/translate-shell/README
@@ -1,6 +1,6 @@
 Translate Shell (formerly Google Translate CLI) is a command-line
 translator powered by Google Translate (default), Bing Translator,
-Yandex.Translate, DeepL Translator and Apertium.
+Yandex.Translate, and Apertium.
 
 If you prefer zsh over bash:
   $ TARGET=zsh ./translate-shell.SlackBuild
diff --git a/network/translate-shell/slack-desc b/network/translate-shell/slack-desc
index 102dd6e2b3..955c32dacb 100644
--- a/network/translate-shell/slack-desc
+++ b/network/translate-shell/slack-desc
@@ -10,7 +10,7 @@ translate-shell: translate-shell (a command-line translator)
 translate-shell:
 translate-shell: Translate Shell (formerly Google Translate CLI) is a command-line
 translate-shell: translator powered by Google Translate (default), Bing Translator,
-translate-shell: Yandex.Translate, DeepL Translator and Apertium.
+translate-shell: Yandex.Translate, and Apertium.
 translate-shell:
 translate-shell:
 translate-shell:
diff --git a/network/translate-shell/translate-shell.SlackBuild b/network/translate-shell/translate-shell.SlackBuild
index 712d4e73e1..dfc622e051 100644
--- a/network/translate-shell/translate-shell.SlackBuild
+++ b/network/translate-shell/translate-shell.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for translate-shell
 
-# Copyright 2018 Azure Zanculmarktum <zanculmarktum@gmail.com>
+# Copyright 2018, 2019, 2020 Azure Zanculmarktum <zanculmarktum@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=translate-shell
-VERSION=${VERSION:-0.9.6.7}
+VERSION=${VERSION:-0.9.6.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,6 +75,7 @@ sed -i \
   -e '/^PREFIX/s,\(/usr\)/local,\1,' \
   -e '/^TARGET/s,bash,'"$TARGET"',' \
   -e '/\$(PREFIX)\/share\/man/s/\(\$(PREFIX)\)\/share\(\/man\)/\1\2/' \
+  -e '/install \$(MANDIR)\/\$(COMMAND)\.1/s,install,& -m644,' \
   Makefile
 
 make
@@ -84,7 +85,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 CONTRIBUTING.md LICENSE Makefile README.md README.template.md WAIVER $PKG/usr/doc/$PRGNAM-$VERSION
+cp -p CONTRIBUTING.md LICENSE README.md README.template.md WAIVER $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/translate-shell/translate-shell.info b/network/translate-shell/translate-shell.info
index c9859006a1..fdd3759d71 100644
--- a/network/translate-shell/translate-shell.info
+++ b/network/translate-shell/translate-shell.info
@@ -1,8 +1,8 @@
 PRGNAM="translate-shell"
-VERSION="0.9.6.7"
+VERSION="0.9.6.11"
 HOMEPAGE="https://www.soimort.org/translate-shell/"
-DOWNLOAD="https://github.com/soimort/translate-shell/archive/v0.9.6.7/translate-shell-0.9.6.7.tar.gz"
-MD5SUM="ceed584244a77a9eb3c08d9dea2405ba"
+DOWNLOAD="https://github.com/soimort/translate-shell/archive/v0.9.6.11/translate-shell-0.9.6.11.tar.gz"
+MD5SUM="f40e7b0ee66e30ec15481336df58ecba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/transmission-qt4/README b/network/transmission-qt4/README
new file mode 100644
index 0000000000..2fdfaa20f7
--- /dev/null
+++ b/network/transmission-qt4/README
@@ -0,0 +1,10 @@
+transmission-qt4 (bittorrent client)
+
+Transmission is a lightweight open source BitTorrent client, providing
+useful functionality without feature bloat. It consists of a daemon, a
+GTK+, Qt and CLI client.
+
+This is an older release of transmission, and only the Qt4 client is
+provided. For the rest of the components (the GTK+ client, the daemon,
+and the command-line client), install the main transmission package.
+It's safe to install both transmission and transmission-qt4.
diff --git a/network/transmission-qt4/doinst.sh b/network/transmission-qt4/doinst.sh
new file mode 100644
index 0000000000..19ad22754d
--- /dev/null
+++ b/network/transmission-qt4/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+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/transmission-qt4/slack-desc b/network/transmission-qt4/slack-desc
new file mode 100644
index 0000000000..5dca7159e2
--- /dev/null
+++ b/network/transmission-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------------------------------------------------------|
+transmission-qt4: transmission-qt4 (bittorrent client)
+transmission-qt4:
+transmission-qt4: Transmission is a lightweight open source BitTorrent client,
+transmission-qt4: providing useful functionality without feature bloat.
+transmission-qt4: It consists of a daemon, a GTK+, Qt and CLI client.
+transmission-qt4:
+transmission-qt4: This is an older release of transmission. Only the Qt4 client is
+transmission-qt4: provided.
+transmission-qt4:
+transmission-qt4: Homepage: http://transmissionbt.com/
+transmission-qt4:
diff --git a/network/transmission-qt4/transmission-qt4.SlackBuild b/network/transmission-qt4/transmission-qt4.SlackBuild
new file mode 100644
index 0000000000..0fe8bab7ba
--- /dev/null
+++ b/network/transmission-qt4/transmission-qt4.SlackBuild
@@ -0,0 +1,147 @@
+#!/bin/sh
+# Slackware build script for transmission
+
+# Copyright 2007 Vasilis Papavasileiou <email removed>
+# Copyright 2008-2011 Iskar Enev <email removed>
+# Copyright 2011-2013 Niels Horn, Rio de Janeiro, Brazil
+# Copyright 2015 B. Watson <yalhcru@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.
+
+# 20200525 bkw: new build, forked from the previous
+# transmission.SlackBuild. This will go away when Slack 15 releases.
+
+PRGNAM=transmission-qt4
+VERSION=${VERSION:-2.94}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=transmission
+
+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}
+
+DOCS="AUTHORS COPYING INSTALL NEWS README"
+
+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
+mkdir -p $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+
+sed -i -e 's%-g -O3 -funroll-loops %%g' configure.ac
+sed -i -e 's%-ggdb3 %%g' configure.ac
+
+# fix for -current (does no harm on stable). ref:
+# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13b5e88c6e9c7bd2698d844cb5ed127ed809f7e
+rm -f m4/glib-gettext.m4
+
+# Thanks Larry Hajali
+autoreconf -ivf
+
+CC=gcc CXX=g++ \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --disable-static \
+  --verbose \
+  --with-gtk=no \
+  --disable-cli \
+  --disable-daemon \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
+
+# build libraries (but don't install them). this also wastefully builds
+# the tools, which we aren't going to install.
+make
+
+# build and install the Qt client
+# Fix hard-coded path of man file of Qt client
+sed -i "s|share/man/|man/|" qt/qtr.pro
+
+# Needed when using Qt4
+# https://trac.transmissionbt.com/ticket/5700#comment:2
+echo "QMAKE_CXXFLAGS += -std=c++11" >> qt/qtr.pro
+
+cd qt
+  qmake \
+    QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+    QMAKE_CFLAGS+="$SLKCFLAGS" \
+    qtr.pro
+  sed -i -e 's% -g % %g' Makefile
+  make
+
+  make install \
+    INSTALL_ROOT=$PKG/usr \
+    INSTALL_PROGRAM="install -m0755 -p -s"
+  gzip -9 $PKG/usr/man/man1/*.1
+
+  mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
+
+  # thanks to b1101 for catching this:
+  sed -i '/^Icon/s|transmission$|&-qt|' transmission-qt.desktop
+
+  install -m644 transmission-qt.desktop $PKG/usr/share/applications/transmission-qt.desktop
+  install -m644 icons/transmission.png  $PKG/usr/share/pixmaps/transmission-qt.png
+cd -
+
+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
+
+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/transmission-qt4/transmission-qt4.info b/network/transmission-qt4/transmission-qt4.info
new file mode 100644
index 0000000000..9d175a2bcc
--- /dev/null
+++ b/network/transmission-qt4/transmission-qt4.info
@@ -0,0 +1,10 @@
+PRGNAM="transmission-qt4"
+VERSION="2.94"
+HOMEPAGE="http://www.transmissionbt.com/"
+DOWNLOAD="https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"
+MD5SUM="c92829294edfa391c046407eeb16358a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/transmission-remote-gtk/README b/network/transmission-remote-gtk/README
index 41c17ca20c..c47f4be41c 100644
--- a/network/transmission-remote-gtk/README
+++ b/network/transmission-remote-gtk/README
@@ -1,3 +1,5 @@
+transmission-remote-gtk (transmission remote control GUI)
+
 transmission-remote-gtk is a cross-platform application for remote
 management of the Transmission BitTorrent client using its RPC interface.
 
@@ -8,4 +10,13 @@ management of the Transmission BitTorrent client using its RPC interface.
    priorities, add/edit/remove trackers.
  * Change remote settings like global limits, download directory, and
    connectivity preferences.
- * Russian, Polish, Korean, and German, Spanish, Ukranian translations. 
+ * UI translations for many languages.
+
+Optional dependencies, detected at compile time:
+
+GeoIP - used to display country flags next to IP addresses.
+libappindicator3 - used for integration with KDE's taskbar.
+libmrss - used for built-in RSS reader.
+
+If you want to build without libnotify (desktop notifications) support,
+set NOTIFY=no in the script's environment.
diff --git a/network/transmission-remote-gtk/slack-desc b/network/transmission-remote-gtk/slack-desc
index 78af7c256a..5c44ee8e02 100644
--- a/network/transmission-remote-gtk/slack-desc
+++ b/network/transmission-remote-gtk/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                        |-----handy-ruler------------------------------------------------------|
-transmission-remote-gtk: transmission-remote-gtk (Transmission Bittorrent remote GUI)
+transmission-remote-gtk: transmission-remote-gtk (transmission remote control GUI)
 transmission-remote-gtk:
-transmission-remote-gtk: transmission-remote-gtk is a GTK applicatoin for remote management of
+transmission-remote-gtk: transmission-remote-gtk is a GTK application for remote management of
 transmission-remote-gtk: the Transmission BitTorrent client via its RPC interface.
 transmission-remote-gtk:
-transmission-remote-gtk: Homepage: http://code.google.com/p/transmission-remote-gtk/
-transmission-remote-gtk:
-transmission-remote-gtk:
-transmission-remote-gtk:
+transmission-remote-gtk: Build options:
+transmission-remote-gtk: @opts@
 transmission-remote-gtk:
+transmission-remote-gtk: Homepage:
+transmission-remote-gtk: https://github.com/transmission-remote-gtk/transmission-remote-gtk/
 transmission-remote-gtk:
diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
index 677e991256..4daa00e722 100644
--- a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
+++ b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for transmission-remote-gtk
 
 # Copyright 2012-2016  Chris Walker Copperas Cove, TX
+# Copyright 2020 B. Watson <yalhcru@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,8 +32,19 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200526 bkw:
+# - take over maintenance
+# - update for v1.4.1
+# - add NOTIFY=no to build --without-libnotify
+# - add README note and slack-desc support for optional deps
+# - fix homepage and typo in slack-desc
+# - build tweaks
+# - get rid of the list of translation languages in README, it's
+#   no longer accurate (several more added) and I can't be bothered
+#   to keep it up-to-date.
+
 PRGNAM=transmission-remote-gtk
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,40 +81,43 @@ 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 {} \+
+
+[ "${NOTIFY:-yes}" = "no" ] && NOTIFYOPT="--without-libnotify"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  $NOTIFYOPT \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
 make V=1
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.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
+# 20200526 bkw: lots of optional deps, let the slack-desc keep track of them
+ldd $PKG/usr/bin/$PRGNAM > ldd.tmp
+for i in libnotify libappindicator3 libmrss GeoIP; do
+  opts+="$i:"
+  grep -q $i ldd.tmp && opts+="yes " || opts+="no "
+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
+# 20200526 bkw: this doesn't belong in a package
+rm -f $PKG/usr/share/applications/mimeinfo.cache
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING 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
+sed "s,@opts@,$opts," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.info b/network/transmission-remote-gtk/transmission-remote-gtk.info
index 80f1eaffc3..0a7fb4be88 100644
--- a/network/transmission-remote-gtk/transmission-remote-gtk.info
+++ b/network/transmission-remote-gtk/transmission-remote-gtk.info
@@ -1,10 +1,10 @@
 PRGNAM="transmission-remote-gtk"
-VERSION="1.2"
+VERSION="1.4.1"
 HOMEPAGE="https://github.com/transmission-remote-gtk/transmission-remote-gtk/"
-DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.2/transmission-remote-gtk-1.2.tar.gz"
-MD5SUM="dfb485390b49c1f0af5063b44a4fef03"
+DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.4.1/transmission-remote-gtk-1.4.1.tar.xz"
+MD5SUM="5955f2d80e51c14fa6bf137c9c2bac74"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="transmission json-glib"
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/transmission/README b/network/transmission/README
index cd8bc73444..6b73e94c74 100644
--- a/network/transmission/README
+++ b/network/transmission/README
@@ -1,13 +1,20 @@
+transmission (bittorrent client)
+
 Transmission is a lightweight open source BitTorrent client, providing
 useful functionality without feature bloat. It consists of a daemon, a
-GTK+, Qt and CLI client.
+GTK+ client, and CLI client [*].
 
-By default, all 4 components are built. Specific parts can be disabled
+By default, all 3 components are built. Specific parts can be disabled
 by setting one or more environment variables:
 
 GTK=no
-QT=no
 CLI=no
 DAEMON=no
 
-At least one component must be enabled (so all 4 set to "no" won't work).
+At least one component must be enabled (so all 3 set to "no" won't work).
+
+[*] If you're wondering about the Qt client that was in the previous
+    version of transmission: It's no longer possible to build on
+    Slackware 14.2 as of transmission-3.0.0, due to outdated g++ and
+    libstdc++. If you don't mind using an older version of transmission
+    (2.94), you can install transmission-qt4 to get a Qt GUI.
diff --git a/network/transmission/transmission.SlackBuild b/network/transmission/transmission.SlackBuild
index 274d96b02c..e29bb915e2 100644
--- a/network/transmission/transmission.SlackBuild
+++ b/network/transmission/transmission.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 # Slackware build script for transmission
 
-# Copyright 2007 Vasilis Papavasileiou <el03020 at mail dot ntua dot gr>
-# Copyright 2008-2011 Iskar Enev <iskar.enev[@]gmail.com>
+# Copyright 2007 Vasilis Papavasileiou <email removed>
+# Copyright 2008-2011 Iskar Enev <email removed>
 # Copyright 2011-2013 Niels Horn, Rio de Janeiro, Brazil
 # Copyright 2015 B. Watson <yalhcru@gmail.com>
 # All rights reserved.
@@ -24,23 +24,22 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20180207 bkw: update for v2.93
-
+# 20200525 bkw: update for v3.00.
+#               Drop Qt GUI and QT=yes, due to 14.2's old gcc/libstdc++.
+#               It will come back when 15.0 releases.
+# 20180611 bkw: update for v2.94.
+# 20180207 bkw: update for v2.93.
 # 20180116 bkw: security fix, BUILD=2. See:
 #               https://github.com/transmission/transmission/pull/468
 #               Thanks to Freenode user lord_ for pointing this out.
-
-# 20180611 bkw: update for v2.94
-
 # 20170621 bkw: fix build on -current.
-
 # 20150204 bkw: allow user to disable the various components.
 # By default, all are enabled. We can disable transmission-gtk,
 # transmission-qt, transmission-cli, and/or transmission-daemon.
 # But disabling them all is no good.
 
 PRGNAM=transmission
-VERSION=${VERSION:-2.94}
+VERSION=${VERSION:-3.00}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,7 +56,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCUMENTATION="AUTHORS COPYING INSTALL NEWS README"
+DOCS="AUTHORS COPYING NEWS.md README.md"
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -75,15 +74,34 @@ fi
 
 set -e
 
+# 20200525 bkw: I had to drop the Qt client, let's make sure the user
+# knows that.
+if [ "${QT:-no}" != "no" ]; then
+  cat <<EOF 1>&2
+
+**********************************************************************
+The Qt GUI in this version of transmission can't be built on Slackware
+14.2. If you don't mind using an older version of transmission, you
+can install transmission-qt4 to get a Qt GUI.
+**********************************************************************
+
+EOF
+  exit 1
+fi
+
 GTK="${GTK:-yes}"
-QT="${QT:-yes}"
+#QT="${QT:-yes}"
 CLI="${CLI:-yes}"
 DAEMON="${DAEMON:-yes}"
 
-if [ "$GTK" != "yes" -a "$QT" != "yes" -a "$CLI" != "yes" -a "$DAEMON" != "yes" ]; then
+if [ "$GTK" != "yes" -a "$CLI" != "yes" -a "$DAEMON" != "yes" ]; then
   cat <<EOF 1>&2
+
+******************************************************************
 Can't build transmission with everything disabled, at least one of
-GTK QT CLI DAEMON must be 'yes'.
+GTK CLI DAEMON must be 'yes'.
+******************************************************************
+
 EOF
   exit 1
 fi
@@ -101,16 +119,8 @@ mkdir -p $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 {} \;
-
-# Fix CVE-2018-5702 for transmission-2.92. Patch came from:
-# https://github.com/transmission/transmission/files/1624507/transmission-fix-dns-rebinding-vuln.patch.txt
-#patch -p1 < $CWD/transmission-fix-dns-rebinding-vuln.diff
-# Not needed for >= 2.93
+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%-g -O3 -funroll-loops %%g' configure.ac
 sed -i -e 's%-ggdb3 %%g' configure.ac
@@ -139,11 +149,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
-# build daemon, GTK and cli client (unless disabled)
+# Build daemon, GTK and cli client (unless disabled). This also builds
+# the tools (transmission-create and friends).
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+
+if false; then
+# As of 3.0.0, transmission-qt can't be built on Slackware 14.2.
+# Needs a newer g++ and libstdc++ than we have.
+# Left here for reference when 15.0 comes out.
+#if [ "$QT" = "yes" ]; then
 
-if [ "$QT" = "yes" ]; then
   # build the Qt client (transmission-qt) unless disabled
   # Fix hard-coded path of man file of Qt client
   sed -i "s|share/man/|man/|" qt/qtr.pro
@@ -153,7 +169,7 @@ if [ "$QT" = "yes" ]; then
   echo "QMAKE_CXXFLAGS += -std=c++11" >> qt/qtr.pro
 
   cd $TMP/$PRGNAM-$VERSION/qt
-    qmake \
+    qmake-qt5 \
       QMAKE_CXXFLAGS+="$SLKCFLAGS" \
       QMAKE_CFLAGS+="$SLKCFLAGS" \
       qtr.pro
@@ -167,18 +183,15 @@ if [ "$QT" = "yes" ]; then
   cd -
 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/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
-cp -a $DOCUMENTATION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-sed "s,@opts@,GTK=$GTK QT=$QT CLI=$CLI DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc
+#sed "s,@opts@,GTK=$GTK QT=$QT CLI=$CLI DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@opts@,GTK=$GTK CLI=$CLI DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/network/transmission/transmission.info b/network/transmission/transmission.info
index 6abe22b5a6..7c8faf5cc6 100644
--- a/network/transmission/transmission.info
+++ b/network/transmission/transmission.info
@@ -1,8 +1,8 @@
 PRGNAM="transmission"
-VERSION="2.94"
+VERSION="3.00"
 HOMEPAGE="http://www.transmissionbt.com/"
-DOWNLOAD="https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"
-MD5SUM="c92829294edfa391c046407eeb16358a"
+DOWNLOAD="https://github.com/transmission/transmission-releases/raw/master/transmission-3.00.tar.xz"
+MD5SUM="a23a32672b83c89b9b61e90408f53d98"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/tribler/tribler.info b/network/tribler/tribler.info
index cf064beca4..a9f6fb0f92 100644
--- a/network/tribler/tribler.info
+++ b/network/tribler/tribler.info
@@ -1,10 +1,10 @@
 PRGNAM="tribler"
 VERSION="6.4.0"
 HOMEPAGE="https://www.tribler.org/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/tribler-6.4.0.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/tribler-6.4.0.tar.xz"
 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 9657894033..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-2019 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.1}
+VERSION=${VERSION:-0.18.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/uTox/uTox.info b/network/uTox/uTox.info
index 56b306d3fc..de041273db 100644
--- a/network/uTox/uTox.info
+++ b/network/uTox/uTox.info
@@ -1,8 +1,8 @@
 PRGNAM="uTox"
-VERSION="0.17.1"
+VERSION="0.18.1"
 HOMEPAGE="https://github.com/uTox/uTox"
-DOWNLOAD="https://github.com/uTox/uTox/releases/download/v0.17.1/uTox-0.17.1-full.tar.gz"
-MD5SUM="f8a01d98c673f4fd0065e156c655575a"
+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/ufw/ufw.SlackBuild b/network/ufw/ufw.SlackBuild
index 0ce87b08aa..5fd512f1d9 100644
--- a/network/ufw/ufw.SlackBuild
+++ b/network/ufw/ufw.SlackBuild
@@ -26,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ufw
-VERSION=${VERSION:-0.35}
+VERSION=${VERSION:-0.36}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,6 +75,11 @@ find -L . \
 patch -p1 --verbose < $CWD/ufw.conf.patch
 patch -p1 --verbose < $CWD/ufw-0.35-fix-iptables-path.patch
 
+# Python3 support
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
 python setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/network/ufw/ufw.info b/network/ufw/ufw.info
index a65a7c07a8..1d396dca15 100644
--- a/network/ufw/ufw.info
+++ b/network/ufw/ufw.info
@@ -1,8 +1,8 @@
 PRGNAM="ufw"
-VERSION="0.35"
+VERSION="0.36"
 HOMEPAGE="https://launchpad.net/ufw"
-DOWNLOAD="https://launchpad.net/ufw/0.35/0.35/+download/ufw-0.35.tar.gz"
-MD5SUM="b7cd2dd4e4e98e46df125fee06edff92"
+DOWNLOAD="https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz"
+MD5SUM="6d8ab1506da21ae003f4628f93d05781"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/unbound/unbound.SlackBuild b/network/unbound/unbound.SlackBuild
index b6afe4f68b..a305c32a7a 100644
--- a/network/unbound/unbound.SlackBuild
+++ b/network/unbound/unbound.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for unbound
 
-# Copyright 2018 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
+# Copyright 2020 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
 # 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=unbound
-VERSION=${VERSION:-1.9.5}
+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 c29d57c70c..0d32e3cc39 100644
--- a/network/unbound/unbound.info
+++ b/network/unbound/unbound.info
@@ -1,8 +1,8 @@
 PRGNAM="unbound"
-VERSION="1.9.5"
+VERSION="1.13.1"
 HOMEPAGE="https://nlnetlabs.nl/projects/unbound/about/"
-DOWNLOAD="https://nlnetlabs.nl/downloads/unbound/unbound-1.9.5.tar.gz"
-MD5SUM="deb7a3c52fec66323b508c0be4be4849"
+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/urlgrabber/urlgrabber.SlackBuild b/network/urlgrabber/urlgrabber.SlackBuild
index c49952cba5..b629712bab 100644
--- a/network/urlgrabber/urlgrabber.SlackBuild
+++ b/network/urlgrabber/urlgrabber.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for urlgrabber
 
 # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad>
+# Copyright 2020 Ricardo J. Barberis <ricardo.barberis@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/network/urlgrabber/urlgrabber.info b/network/urlgrabber/urlgrabber.info
index ac9096d1c5..d0394d72f6 100644
--- a/network/urlgrabber/urlgrabber.info
+++ b/network/urlgrabber/urlgrabber.info
@@ -6,5 +6,5 @@ MD5SUM="7cff064649619355d329b26d75872f60"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Javier Rojas"
-EMAIL="jerojasro@devnull.li"
+MAINTAINER="Ricardo J. Barberis"
+EMAIL="ricardo.barberis@gmail.com"
diff --git a/network/urlscan/urlscan.SlackBuild b/network/urlscan/urlscan.SlackBuild
index 53135d4c57..3ab9b11d11 100644
--- a/network/urlscan/urlscan.SlackBuild
+++ b/network/urlscan/urlscan.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for urlscan
-# Copyright 2019 abooksigun <abooksigun09@gmail.com>
+# Copyright 2020 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=urlscan
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.9.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,10 +63,10 @@ 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 {} \;
+ \( -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 --optimize=1
 
@@ -76,8 +76,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 cp -r $PKG/usr/share/man $PKG/usr
 rm -r $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
+for man in $( find $PKG/usr/man -type f ); do
+  gzip -9 $man
+done
+
+for man in $( find $PKG/usr/man -type l ); do
+  ln -s $( readlink $man ).gz $man.gz
+  rm $man
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -t $PKG/usr/doc/$PRGNAM-$VERSION README.rst COPYING requirements.txt
diff --git a/network/urlscan/urlscan.info b/network/urlscan/urlscan.info
index dd9689a567..8ca34f658a 100644
--- a/network/urlscan/urlscan.info
+++ b/network/urlscan/urlscan.info
@@ -1,8 +1,8 @@
 PRGNAM="urlscan"
-VERSION="0.9.4"
+VERSION="0.9.5"
 HOMEPAGE="https://github.com/firecat53/urlscan"
-DOWNLOAD="https://github.com/firecat53/urlscan/archive/0.9.4/urlscan-0.9.4.tar.gz"
-MD5SUM="5c735bbb872248f0d981b4efcde257ac"
+DOWNLOAD="https://github.com/firecat53/urlscan/archive/0.9.5/urlscan-0.9.5.tar.gz"
+MD5SUM="6b9434208dbcfd12dd4dde74b4b41b21"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-urwid"
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 5e73f47f49..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.3.1}
+VERSION=${VERSION:-6.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/varnish/varnish.info b/network/varnish/varnish.info
index f3c3528b9e..17e7902b96 100644
--- a/network/varnish/varnish.info
+++ b/network/varnish/varnish.info
@@ -1,8 +1,8 @@
 PRGNAM="varnish"
-VERSION="6.3.1"
+VERSION="6.5.1"
 HOMEPAGE="https://www.varnish-cache.org/"
-DOWNLOAD="https://varnish-cache.org/_downloads/varnish-6.3.1.tgz"
-MD5SUM="f99276b2fdeddb4779423bdc1b5738a8"
+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 fd25239731..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:-2.11.1811.47}
-FFMPEG_VERSION="80.0.3987.87"
+VERSION=${VERSION:-3.7.2218.52}
+FFMPEG_VERSION="89.0.4389.90"
 WIDEVINE_VERSION="4.10.1582.2"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -64,7 +64,7 @@ ar p $CWD/chromium-codecs-ffmpeg-extra_${FFMPEG_VERSION}-*_${BITS}.deb \
 
 if [ "x$BITS" = "xarmhf" ] ; then
   echo "This script doesn't support installing Widevine on ARM."
-else
+elif [ "x$BITS" = "xi386" ] ; then
   rm -f opt/vivaldi/WidevineCdm
   mkdir -p opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS}
   unzip -oq $CWD/${WIDEVINE_VERSION}-linux-${WBITS}.zip \
diff --git a/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info
index da50f47a42..c26ed60304 100644
--- a/network/vivaldi/vivaldi.info
+++ b/network/vivaldi/vivaldi.info
@@ -1,18 +1,16 @@
 PRGNAM="vivaldi"
-VERSION="2.11.1811.47"
+VERSION="3.7.2218.52"
 HOMEPAGE="https://vivaldi.com"
-DOWNLOAD="https://downloads.vivaldi.com/stable/vivaldi-stable_2.11.1811.47-1_i386.deb \
-          https://launchpadlibrarian.net/463728933/chromium-codecs-ffmpeg-extra_80.0.3987.87-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="39afd56ad1d76a59dde0475d7d321b06 \
-        e594d02d7589352ea1eaf31cc4ca965a \
+MD5SUM="688dcaabbded8a31e70c2be6a5ba3ddf \
+        00d2f09afa9447e9a506c9a4ff52bbdd \
         247a331a4d5bceb9f20366a39136a4fa"
-DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_2.11.1811.47-1_amd64.deb \
-                 https://launchpadlibrarian.net/463843052/chromium-codecs-ffmpeg-extra_80.0.3987.87-0ubuntu0.16.04.1_amd64.deb \
-                 https://dl.google.com/widevine-cdm/4.10.1582.2-linux-x64.zip"
-MD5SUM_x86_64="1746886e7c0eb95f6a5fe6d81473e130 \
-               414fcd8df51da6a67724368cc9674138 \
-               8134e03da1af89cb70caa4c587d7269e"
-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/w3m/w3m.SlackBuild b/network/w3m/w3m.SlackBuild
index ea6880f8f7..416eba172e 100644
--- a/network/w3m/w3m.SlackBuild
+++ b/network/w3m/w3m.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=w3m
 VERSION=${VERSION:-0.5.3_37}
-PATCHVERSION=${VERSION//_/-}
+PATCHVERSION=$(echo $VERSION | sed "s/_/-/g")
 SRCVERSION=${SRCVERSION:-0.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
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/doinst.sh b/network/waterfox/doinst.sh
deleted file mode 100644
index 9a8ded3c60..0000000000
--- a/network/waterfox/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/waterfox/slack-desc b/network/waterfox/slack-desc
deleted file mode 100644
index bdaed00ed4..0000000000
--- a/network/waterfox/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------------------------------------------------------|
-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:
diff --git a/network/waterfox/waterfox.SlackBuild b/network/waterfox/waterfox.SlackBuild
deleted file mode 100644
index abdd1ecfa0..0000000000
--- a/network/waterfox/waterfox.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for waterfox
-# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA
-
-# Based on the pale moon SlackBuilds by:
-# Copyright 2015 pomfland
-# Copyright 2017 skaendo <skaendo at excite 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=waterfox
-SRCNAM=waterfox-classic
-VERSION=${VERSION:-2020.02.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}
-
-# 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
-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 waterfox into /opt
-mkdir -p $PKG/opt/waterfox
-cp -vr * $PKG/opt/waterfox
-
-# 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
-
-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/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/slack-desc b/network/weboob/slack-desc
deleted file mode 100644
index 2985003e0f..0000000000
--- a/network/weboob/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------------------------------------------------------|
-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:
diff --git a/network/weboob/weboob.SlackBuild b/network/weboob/weboob.SlackBuild
deleted file mode 100644
index 7652566c9d..0000000000
--- a/network/weboob/weboob.SlackBuild
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for weboob
-
-# Copyright (C) 2011,  Brice Lopez <brice@lopez.banh-bao.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=weboob
-VERSION=${VERSION:-0.a}
-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/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-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 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
-
-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
-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/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 47b39c1d59..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.7.1}
+VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/weechat/weechat.info b/network/weechat/weechat.info
index 2dbf30b7cb..90780d1f44 100644
--- a/network/weechat/weechat.info
+++ b/network/weechat/weechat.info
@@ -1,8 +1,8 @@
 PRGNAM="weechat"
-VERSION="2.7.1"
+VERSION="3.1"
 HOMEPAGE="http://www.weechat.org"
-DOWNLOAD="http://weechat.org/files/src/weechat-2.7.1.tar.bz2"
-MD5SUM="5d187f3b21bf06c1cc0b59d667dcf9a0"
+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/README b/network/wire/README
index 40cff1e57c..930951df16 100644
--- a/network/wire/README
+++ b/network/wire/README
@@ -4,9 +4,9 @@ Our personal and professional data is at the center of a new economy.
 The information we share on social networks, via email, and messaging
 services is being used to build profiles. These profiles are in turn
 used to sell us products and services through targeted advertising and
-suggestion. The data collected is vast, detailed, and often very personal.
-Vast resources are being spent to refine the profiles, all without
-transparency, policy or oversight.
+suggestion. The data collected is vast, detailed, and often very
+personal.  Vast resources are being spent to refine the profiles, all
+without transparency, policy or oversight.
 
 Our personal and professional online communications should not be part
 of this economy. In the physical world we talk with each other directly.
diff --git a/network/wire/wire.SlackBuild b/network/wire/wire.SlackBuild
index 160bd830cf..d8216bbb3c 100644
--- a/network/wire/wire.SlackBuild
+++ b/network/wire/wire.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for wire
 
-# Copyright 2016-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2016-2019 Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2020 David O'Shaughnessy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +24,16 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wire
-VERSION=${VERSION:-3.5.2881}
+VERSION=${VERSION:-3.24.2939}
 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
+    case "$( uname -m )" in
+	i?86) ARCH=i586 ;;
+	arm*) ARCH=arm ;;
+	*) ARCH=$( uname -m ) ;;
+    esac
 fi
 
 CWD=$(pwd)
@@ -41,24 +42,27 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
+    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
+    SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+    SLKCFLAGS="-O2"
+    LIBDIRSUFFIX=""
 fi
 
 set -e
 
-DEBARCH="i386"
+# Upstream only has binary support for x86_64.
 if [ "$ARCH" = "x86_64" ]; then
     DEBARCH="amd64"
+else
+    echo "Sorry, the Wire binary is only available for x86_64."
+    exit 1
 fi
 
 rm -rf $PKG
@@ -66,26 +70,26 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION && cd $PRGNAM-$VERSION
-ar p $CWD/$PRGNAM\_$VERSION\_$DEBARCH.deb data.tar.xz | tar xJv
+ar p $CWD/${PRGNAM^}-$VERSION\_$DEBARCH.deb data.tar.xz | tar xJv
 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 {} \;
+     \( -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 data
 mkdir -p $PKG/opt/${PRGNAM^}
 cp -rf opt/${PRGNAM^}/* $PKG/opt/${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
+    | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Create soft link for launcher
 mkdir -p $PKG/usr/bin
 (
- cd $PKG/usr/bin
- ln -sf /opt/${PRGNAM^}/$PRGNAM-desktop $PRGNAM-desktop
+    cd $PKG/usr/bin
+    ln -sf /opt/${PRGNAM^}/$PRGNAM-desktop $PRGNAM-desktop
 )
 
 # Install .desktop file
@@ -96,12 +100,12 @@ cat usr/share/applications/$PRGNAM-desktop.desktop > \
 # Install .desktop icon
 mkdir -p $PKG/usr/share/pixmaps
 install -D -m0644 usr/share/icons/hicolor/32x32/apps/$PRGNAM-desktop.png \
-    $PKG/usr/share/pixmaps/$PRGNAM-desktop.png
+	$PKG/usr/share/pixmaps/$PRGNAM-desktop.png
 
 gunzip usr/share/doc/$PRGNAM-desktop/changelog.gz
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a usr/share/doc/$PRGNAM-desktop/changelog opt/${PRGNAM^}/LICENSE* \
-    $PKG/usr/doc/$PRGNAM-$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/wire/wire.info b/network/wire/wire.info
index 5bb7ae21fa..d904ad0ea5 100644
--- a/network/wire/wire.info
+++ b/network/wire/wire.info
@@ -1,10 +1,10 @@
 PRGNAM="wire"
-VERSION="3.5.2881"
+VERSION="3.24.2939"
 HOMEPAGE="https://wire.com/"
-DOWNLOAD="https://wire-app.wire.com/linux/debian/pool/main/wire_3.5.2881_i386.deb"
-MD5SUM="8482c67aef41b11637cb655bc52ad843"
-DOWNLOAD_x86_64="https://wire-app.wire.com/linux/debian/pool/main/wire_3.5.2881_amd64.deb"
-MD5SUM_x86_64="3737d3b06ef0daa378ae6de06f76373a"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://wire-app.wire.com/linux/Wire-3.24.2939_amd64.deb"
+MD5SUM_x86_64="f6ef6b45745579dac66d46a6d319ddf8"
 REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+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 f82acd3f36..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:-0.0.20200318}
+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 68559eef09..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="0.0.20200318"
+VERSION="1.0.20210219"
 HOMEPAGE="https://www.wireguard.com/"
-DOWNLOAD="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-0.0.20200318.tar.xz"
-MD5SUM="c6031b160a8c3c391a13e383f972fed3"
+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 c5bfcc5233..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.20200319}
+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 11ee4c4361..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.20200319"
+VERSION="1.0.20210315"
 HOMEPAGE="https://www.wireguard.com/"
-DOWNLOAD="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200319.tar.xz"
-MD5SUM="36cd9411f56bc5dcaac29bbab6fd9c67"
+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 5a3ff05795..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.2}
+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 c5f9772354..8bbdeb1031 100644
--- a/network/wireshark/wireshark.info
+++ b/network/wireshark/wireshark.info
@@ -1,10 +1,10 @@
 PRGNAM="wireshark"
-VERSION="3.2.2"
+VERSION="3.4.4"
 HOMEPAGE="https://www.wireshark.org/"
-DOWNLOAD="https://1.as.dl.wireshark.org/src/wireshark-3.2.2.tar.xz"
-MD5SUM="e468b78e1176e0212b13ef809f59dcbb"
+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/README b/network/wp-cli/README
new file mode 100644
index 0000000000..2d60038e8c
--- /dev/null
+++ b/network/wp-cli/README
@@ -0,0 +1,13 @@
+
+WP-CLI is a set of command-line tools for managing WordPress
+installations.
+
+WP-CLI need phar extension to build and to work
+
+Enable the phar extension in your php.ini and
+disable the readonly setting for the phar extension:
+	Set phar.readonly to Off
+
+Also disable open_basedir
+because likely to cause errors with wp-cli
+
diff --git a/network/wp-cli/files/LICENSE b/network/wp-cli/files/LICENSE
new file mode 100644
index 0000000000..017ee0bf17
--- /dev/null
+++ b/network/wp-cli/files/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (C) 2011-2019 WP-CLI Development Group (https://github.com/wp-cli/wp-cli/contributors)
+
+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.
diff --git a/network/wp-cli/files/wp-completion.bash b/network/wp-cli/files/wp-completion.bash
new file mode 100644
index 0000000000..9df572b6d6
--- /dev/null
+++ b/network/wp-cli/files/wp-completion.bash
@@ -0,0 +1,23 @@
+# bash completion for the `wp` command
+
+_wp_complete() {
+	local OLD_IFS="$IFS"
+	local cur=${COMP_WORDS[COMP_CWORD]}
+
+	IFS=$'\n';  # want to preserve spaces at the end
+	local opts="$(wp cli completions --line="$COMP_LINE" --point="$COMP_POINT")"
+
+	if [[ "$opts" =~ \<file\>\s* ]]
+	then
+		COMPREPLY=( $(compgen -f -- $cur) )
+	elif [[ $opts = "" ]]
+	then
+		COMPREPLY=( $(compgen -f -- $cur) )
+	else
+		COMPREPLY=( ${opts[*]} )
+	fi
+
+	IFS="$OLD_IFS"
+	return 0
+}
+complete -o nospace -F _wp_complete wp
diff --git a/network/wp-cli/slack-desc b/network/wp-cli/slack-desc
new file mode 100644
index 0000000000..4687cb903d
--- /dev/null
+++ b/network/wp-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------------------------------------------------------|
+wp-cli: wp-cli (A command line interface for WordPress)
+wp-cli:
+wp-cli: WP-CLI is a set of command-line tools for managing WordPress 
+wp-cli: installations.
+wp-cli:
+wp-cli: http://wp-cli.org
+wp-cli:
+wp-cli:
+wp-cli:
+wp-cli:
+wp-cli:
diff --git a/network/wp-cli/wp-cli.SlackBuild b/network/wp-cli/wp-cli.SlackBuild
new file mode 100644
index 0000000000..ac1e8df938
--- /dev/null
+++ b/network/wp-cli/wp-cli.SlackBuild
@@ -0,0 +1,59 @@
+#!/bin/sh
+#
+# Slackware build script for wp-cli
+#
+# Copyright 2016-2020 Corrado Franco (https://corradofranco.it)
+# All rights reserved.
+#
+# 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 2 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/>.
+#
+
+CWD=$(pwd)
+
+PRGNAM=wp-cli
+VERSION=${VERSION:-2.4.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 $PKG $OUTPUT
+
+install -Dm755 $CWD/$PRGNAM-$VERSION.phar $PKG/usr/bin/wp
+
+# Install bash completion
+install -Dm644 $CWD/files/wp-completion.bash $PKG/etc/bash_completion.d/wp
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $CWD/files/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION || true
+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/wp-cli/wp-cli.info b/network/wp-cli/wp-cli.info
new file mode 100644
index 0000000000..fbe573dcfa
--- /dev/null
+++ b/network/wp-cli/wp-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="wp-cli"
+VERSION="2.4.0"
+HOMEPAGE="http://wp-cli.org/"
+DOWNLOAD="https://github.com/wp-cli/wp-cli-bundle/releases/download/v2.4.0/wp-cli-2.4.0.phar"
+MD5SUM="dedd5a662b80cda66e9e25d44c23b25c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="composer"
+MAINTAINER="Corrado Franco"
+EMAIL="conraid (at) linux (dot) it"
diff --git a/network/wsdd2/README b/network/wsdd2/README
new file mode 100644
index 0000000000..f5e8736ab7
--- /dev/null
+++ b/network/wsdd2/README
@@ -0,0 +1,31 @@
+wsdd2 (WSD/LLMNR Descovery/Name Service Daemon)
+
+Provides samba share descovery for clients who don't support netbios
+or are running ip6 (which netbios does not support).
+Effectively this allows modern windows computers to find samba
+shares, and allows you to avoid smb1/smb2 for which there are many
+exploits in the wild. This is based on the NETGEAR implimentation.
+
+NOTE: make sure you allow local ip6 connections in your samba config
+otherwise there will be no shares found. if you use "hosts allow"
+then add     fc00::/7 fe80::/64 ::1
+to the list of your local ip4 addresses so that local ip6 pcs can
+use your shares.
+
+NOTE2: make sure ports 5357 (tcp) and 3702 (udp) are open if you
+are using a firewall.
+
+to get wsdd2 to run automatically on startup add the following lines
+in /etc/rc.d/rc.local
+
+#start wsdd2 daemon if samba is configured
+if [ -x /etc/rc.d/rc.wsdd2 ]; then
+   /etc/rc.d/rc.wsdd2 start
+fi
+
+and to stop it on shutdown, add the following to
+samba section in /etc/rc.d/rc.local_shutdown
+
+if [ -x /etc/rc.d/rc.wsdd2 ]; then
+   /etc/rc.d/rc.wsdd2 stop
+fi
diff --git a/network/wsdd2/README.allowip6 b/network/wsdd2/README.allowip6
new file mode 100644
index 0000000000..85009e9325
--- /dev/null
+++ b/network/wsdd2/README.allowip6
@@ -0,0 +1,17 @@
+It may be obvious, but its easy to forget; to access samba shares
+using ip6 you need to allow ip6 addresses access to the server. If
+you want to limit access to local ip6 addresses and you are using
+the "hosts allow" option in smb.conf then add the following
+address/masks to the end of any ip4 addresses you alread have listed
+
+ fc00::/7 fe80::/64 ::1
+
+this will allow link-local, unique-local, and local loop ip6 addresses
+
+Even if a machine has a public ip6 address, it will also have a
+link-local one for ip6 sublayer operations of the Neighbor Discovery
+Protocol as well as for some other protocols such as DHCPv6
+
+if you are using a firewall, don't forget to allow access to port
+5357 (tcp) and 3702 (udp) otherwise wsdd2 will not work.
+
diff --git a/network/wsdd2/doinst.sh b/network/wsdd2/doinst.sh
new file mode 100644
index 0000000000..194630ea25
--- /dev/null
+++ b/network/wsdd2/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
+    chmod +x $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.wsdd2.new
diff --git a/network/wsdd2/rc.wsdd2 b/network/wsdd2/rc.wsdd2
new file mode 100644
index 0000000000..594e1faab5
--- /dev/null
+++ b/network/wsdd2/rc.wsdd2
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# /etc/rc.d/rc.wsdd2
+#
+# start/stop/restart the wsdd2 daemon.
+#
+# To make wsdd2 start automatically at boot make sure this
+# file is executable, and add the following entry to rc.local
+# after the samba test (uncommented)
+
+# if [ -x /etc/rc.d/rc.wsdd2 ]; then
+#   /etc/rc.d/rc.wsdd2 start
+# fi
+
+# you may also add the following entry to rc.local_shutdown
+# (uncommented)
+
+# if [ -x /etc/rc.d/rc.wsdd2 ]; then
+#   /etc/rc.d/rc.wsdd2 stop
+# fi
+
+wsdd2_start() {
+  if [ -r /etc/samba/smb.conf -a -x /etc/rc.d/rc.samba -a -x /usr/sbin/wsdd2 ]; then
+    echo "Starting wsdd2: /usr/bin/wsdd2 -d"
+    /usr/sbin/wsdd2 -d
+  elif [ ! -r /etc/samba/smb.conf ]; then
+    echo "ERROR: samba not configured, so wsdd2 has no service to advertise"
+  fi
+}
+wsdd2_stop() {
+  #check something is running before trying to kill it.
+  if [ "x`ps -A|grep ' wsdd2'|wc -l`" != "x0" ]; then
+    killall wsdd2
+  fi
+}
+wsdd2_restart() {
+  wsdd2_stop
+  sleep 1
+  wsdd2_start
+}
+case "$1" in
+'start')
+  #we don't want to run this more than once,
+  #so kill off any instance already running
+  wsdd2_stop
+  wsdd2_start
+  ;;
+'stop')
+  wsdd2_stop
+  ;;
+'restart')
+  wsdd2_restart
+  ;;
+*)
+  # default is start
+  wsdd2_start
+esac
+
diff --git a/network/wsdd2/slack-desc b/network/wsdd2/slack-desc
new file mode 100644
index 0000000000..31fade9c60
--- /dev/null
+++ b/network/wsdd2/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------------------------------------------------------|
+wsdd2: wsdd2 (WSD/LLMNR Descovery/Name Service Daemon)
+wsdd2:
+wsdd2: Provides samba share browsing for clients who don't support netbios
+wsdd2: or are running ip6 (which netbios does not support).
+wsdd2: Effectively this allows modern windows computers to find samba
+wsdd2: shares, and allows you to avoid smb1/smb2 for which there are many
+wsdd2: exploits in the wild. This is based on the NETGEAR implimentation.
+wsdd2:
+wsdd2: Don't forget to allow local ip6 connections in your smb.conf file.
+wsdd2:
+wsdd2: Home Page https://github/Andy2244/wsdd2
diff --git a/network/wsdd2/wsdd2.SlackBuild b/network/wsdd2/wsdd2.SlackBuild
new file mode 100644
index 0000000000..deff03a691
--- /dev/null
+++ b/network/wsdd2/wsdd2.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for wsdd2
+
+# Copyright 2020 Tim Dickson Scotland
+# 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=wsdd2
+VERSION=${VERSION:-1.8.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}
+
+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 {} \;
+
+#we are going to have to fix Makefile as we don't want systemd stuff
+sed -i "/systemd/d" Makefile
+
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+make install DESTDIR=$PKG MANINSTALLDIR="usr/man" INSTALLPREFIX="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
+
+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
+
+#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
+cat $CWD/README.allowip6 > $PKG/usr/doc/$PRGNAM-$VERSION/README.allowip6
+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/wsdd2/wsdd2.info b/network/wsdd2/wsdd2.info
new file mode 100644
index 0000000000..1fbfb16814
--- /dev/null
+++ b/network/wsdd2/wsdd2.info
@@ -0,0 +1,10 @@
+PRGNAM="wsdd2"
+VERSION="1.8.3.2"
+HOMEPAGE="https://github.com/Andy2244/wsdd2"
+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%"
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
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/README b/network/yadifa/README
index 718a975704..6eace606e7 100644
--- a/network/yadifa/README
+++ b/network/yadifa/README
@@ -1,15 +1,16 @@
-Lightweight authoritative Name Server with DNSSEC capabilities. Developed by
-the passionate people behind the .eu top-level domain, YADIFA has been built
-from scratch to face today’s DNS challenges, with no compromise on security,
-speed and stability, to offer a better and safer Internet experience.
+Lightweight authoritative Name Server with DNSSEC
+capabilities. Developed by the passionate people behind the .eu
+top-level domain, YADIFA has been built from scratch to face today’s
+DNS challenges, with no compromise on security, speed and stability,
+to offer a better and safer Internet experience.
 
-Package binaries and shared objects linked here dynamically, but by-default
-configure script links it statically, for performance consideration. Static
-linking makes sence only on heavy loaded environment (10+ Mbit DNS traffic,
-5000+ queries/second per server).
+Package binaries and shared objects linked here dynamically, but
+by-default configure script links it statically, for performance
+consideration. Static linking makes sence only on heavy loaded
+environment (10+ Mbit DNS traffic, 5000+ queries/second per server).
 
-YADIFA requires its own user in order to run securely. It is not advised to
-run services as root user without special reason.
+YADIFA requires its own user in order to run securely. It is not
+advised to run services as root user without special reason.
 
 
 To add yadifa user in system run as root:
@@ -24,14 +25,14 @@ if [ -x /etc/rc.d/rc.yadifa ]; then
 	/etc/rc.d/rc.yadifa start
 fi
 
-By default this package compiles as shared binaries, but if required it is
-possible to build it statically. YADIFA' source by default links staticaly,
-because of performance considerations, but in pracatice it takes less effort
-to support shared linked binaries. But if you really need it just set
-environment variable and run SlackBuild:
+By default this package compiles as shared binaries, but if required
+it is possible to build it statically. YADIFA's source by default links
+statically, because of performance considerations, but in practice it
+takes less effort to support shared linked binaries. But if you really
+need it just set environment variable and run SlackBuild:
 
 USESTATIC=yes ./yadifa.SlackBuild
 
-In case of using static build of YADIFA, you should re-build and re-install
-yadifa package each time openssl recieves update to keep your installation
-secure.
\ No newline at end of file
+If you use a static build of YADIFA, you should re-build and
+re-install the yadifa package each time openssl recieves an update,
+to keep your installation secure.
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 c38646071b..9e7a4d78cc 100644
--- a/network/yle-dl/README
+++ b/network/yle-dl/README
@@ -1,5 +1,5 @@
 yle-dl is a tool for downloading media files from the video streaming
 services of the Finnish national broadcasting company Yle.
 
-rtmpdump is an optional dependency.  It's needed for downloading some Elävä
-Arkisto streams.
+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 a15ca58157..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:-20200222}
+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 7f84308eac..4445a4ab55 100644
--- a/network/yle-dl/yle-dl.info
+++ b/network/yle-dl/yle-dl.info
@@ -1,10 +1,10 @@
 PRGNAM="yle-dl"
-VERSION="20200222"
+VERSION="20210212"
 HOMEPAGE="https://aajanki.github.io/yle-dl/"
-DOWNLOAD="https://github.com/aajanki/yle-dl/archive/20200222/yle-dl-20200222.tar.gz"
-MD5SUM="d966fb9ade774931ba6488b625939456"
+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 mini-amf pycryptodomex 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 eaccf75da9..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.03.08}
+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 967d8b1a9b..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.03.08"
+VERSION="2021.02.22"
 HOMEPAGE="http://www.yt-dl.org/"
-DOWNLOAD="https://yt-dl.org/downloads/2020.03.08/youtube-dl-2020.03.08.tar.gz"
-MD5SUM="06c9e1ef679676399c724f5d738835f1"
+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/youtube-upload/README b/network/youtube-upload/README
index fae729bbbe..30973b3c00 100644
--- a/network/youtube-upload/README
+++ b/network/youtube-upload/README
@@ -1,2 +1,2 @@
 Youtube-upload is a command line Python script that uploads videos
-to Youtube using the YouTube APIv3.
\ No newline at end of file
+to Youtube using the YouTube APIv3.
diff --git a/network/zabbix_agentd/zabbix_agentd.SlackBuild b/network/zabbix_agentd/zabbix_agentd.SlackBuild
index 3de0be7091..cd9b8c58d9 100644
--- a/network/zabbix_agentd/zabbix_agentd.SlackBuild
+++ b/network/zabbix_agentd/zabbix_agentd.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zabbix_agentd
-VERSION=${VERSION:-4.4.4}
+VERSION=${VERSION:-4.4.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/zabbix_agentd/zabbix_agentd.info b/network/zabbix_agentd/zabbix_agentd.info
index 1092192d1e..61da085d68 100644
--- a/network/zabbix_agentd/zabbix_agentd.info
+++ b/network/zabbix_agentd/zabbix_agentd.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_agentd"
-VERSION="4.4.4"
+VERSION="4.4.7"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.4/zabbix-4.4.4.tar.gz"
-MD5SUM="9ac0cd663f7d3162f9206ddcc7ca7d9f"
+DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.7/zabbix-4.4.7.tar.gz"
+MD5SUM="24e5a166694db45ebb461757074fb02d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="jdk"
 MAINTAINER="zux"
 EMAIL="zux@pie-dabas.net"
diff --git a/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild b/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild
index 1ee6da8847..7c8b0784cc 100644
--- a/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild
+++ b/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zabbix_java_gateway
-VERSION=${VERSION:-4.4.4}
+VERSION=${VERSION:-4.4.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/zabbix_java_gateway/zabbix_java_gateway.info b/network/zabbix_java_gateway/zabbix_java_gateway.info
index f8eac1b629..a7ba6ccf87 100644
--- a/network/zabbix_java_gateway/zabbix_java_gateway.info
+++ b/network/zabbix_java_gateway/zabbix_java_gateway.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_java_gateway"
-VERSION="4.4.4"
+VERSION="4.4.7"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.4/zabbix-4.4.4.tar.gz"
-MD5SUM="9ac0cd663f7d3162f9206ddcc7ca7d9f"
+DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.7/zabbix-4.4.7.tar.gz"
+MD5SUM="24e5a166694db45ebb461757074fb02d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="iksemel jdk"
+REQUIRES="jdk"
 MAINTAINER="zux"
 EMAIL="zux@pie-dabas.net"
diff --git a/network/zabbix_proxy/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild
index 47833ce69a..e756aa423d 100644
--- a/network/zabbix_proxy/zabbix_proxy.SlackBuild
+++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zabbix_proxy
-VERSION=${VERSION:-4.4.4}
+VERSION=${VERSION:-4.4.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/zabbix_proxy/zabbix_proxy.info b/network/zabbix_proxy/zabbix_proxy.info
index 18647a4f6f..da13ccd813 100644
--- a/network/zabbix_proxy/zabbix_proxy.info
+++ b/network/zabbix_proxy/zabbix_proxy.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_proxy"
-VERSION="4.4.4"
+VERSION="4.4.7"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.4/zabbix-4.4.4.tar.gz"
-MD5SUM="9ac0cd663f7d3162f9206ddcc7ca7d9f"
+DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.7/zabbix-4.4.7.tar.gz"
+MD5SUM="24e5a166694db45ebb461757074fb02d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="iksemel jdk"
+REQUIRES="jdk"
 MAINTAINER="zux"
 EMAIL="zux@pie-dabas.net"
diff --git a/network/zabbix_server/zabbix_server.SlackBuild b/network/zabbix_server/zabbix_server.SlackBuild
index 98c7743920..b157f3d0b8 100644
--- a/network/zabbix_server/zabbix_server.SlackBuild
+++ b/network/zabbix_server/zabbix_server.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zabbix_server
-VERSION=${VERSION:-4.4.4}
+VERSION=${VERSION:-4.4.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/zabbix_server/zabbix_server.info b/network/zabbix_server/zabbix_server.info
index 32f6a11d6c..29456fc927 100644
--- a/network/zabbix_server/zabbix_server.info
+++ b/network/zabbix_server/zabbix_server.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_server"
-VERSION="4.4.4"
+VERSION="4.4.7"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.4/zabbix-4.4.4.tar.gz"
-MD5SUM="9ac0cd663f7d3162f9206ddcc7ca7d9f"
+DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.7/zabbix-4.4.7.tar.gz"
+MD5SUM="24e5a166694db45ebb461757074fb02d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="iksemel"
+REQUIRES=""
 MAINTAINER="zux"
 EMAIL="zux@pie-dabas.net"
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 95a7a0072d..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.1}
+VERSION=${VERSION:-3.0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -99,3 +99,4 @@ 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/zeek/zeek.info b/network/zeek/zeek.info
index 2b90abcb8a..db3ca5dc9a 100644
--- a/network/zeek/zeek.info
+++ b/network/zeek/zeek.info
@@ -1,10 +1,10 @@
 PRGNAM="zeek"
-VERSION="3.0.1"
+VERSION="3.0.13"
 HOMEPAGE="https://www.zeek.org"
-DOWNLOAD="https://www.zeek.org/downloads/zeek-3.0.1.tar.gz"
-MD5SUM="8067e609e8ac988131505f1d7da9c348"
+DOWNLOAD="https://download.zeek.org/zeek-3.0.13.tar.gz"
+MD5SUM="1c331fabaef8376d1fd741b8b4cfec06"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Michael Edie"
-EMAIL="michael@edie.io"
+EMAIL="michael@sawbox.net"
diff --git a/network/zoom-linux/doinst.sh b/network/zoom-linux/doinst.sh
index 408a29c514..f355da8d41 100644
--- a/network/zoom-linux/doinst.sh
+++ b/network/zoom-linux/doinst.sh
@@ -1,6 +1,3 @@
-( cd usr/bin ; rm -rf zoom-linux )
-( cd usr/bin ; ln -sf /opt/zoom-linux/ZoomLauncher zoom-linux )
-
 if [ -x /usr/bin/xdg-mime ]; then
     /usr/bin/xdg-mime install /usr/share/mime/packages/zoom-linux.xml
 fi
diff --git a/network/zoom-linux/slack-desc b/network/zoom-linux/slack-desc
index 99a5379e41..3b2bfaadeb 100644
--- a/network/zoom-linux/slack-desc
+++ b/network/zoom-linux/slack-desc
@@ -8,9 +8,9 @@
           |-----handy-ruler------------------------------------------------------|
 zoom-linux: zoom-linux (Video conferencing client)
 zoom-linux:
-zoom-linux: Stay connected wherever you go - start or join a 100-person
+zoom-linux: Stay connected wherever you go – start or join a 100-person
 zoom-linux: meeting with crystal-clear, face-to-face video, high quality
-zoom-linux: screen sharing, and instant messaging - for free!
+zoom-linux: screen sharing, and instant messaging – for free!
 zoom-linux:
 zoom-linux: Join any meeting and host unlimited 1:1 meetings for free.
 zoom-linux: Free group meetings are limited to 40 minutes.
diff --git a/network/zoom-linux/zoom-linux.SlackBuild b/network/zoom-linux/zoom-linux.SlackBuild
index fb00632b2d..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,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zoom-linux
+VERSION=${VERSION:-5.6.13632.0328} # may be overridden by source!
 SRCNAM=zoom
-VERSION=${VERSION:-3.5.374815.0324}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,6 +57,8 @@ case "$ARCH" in
     ;;
 esac
 
+VERSION=$(tar JxOf $SRC.tar.xz zoom/version.txt)
+
 set -e
 
 rm -rf $PKG
@@ -75,6 +77,10 @@ find -L . \
 mkdir -p $PKG/opt/$PRGNAM
 cp -a * $PKG/opt/$PRGNAM
 
+mkdir -p $PKG/usr/bin
+cd $PKG/usr/bin
+ln -sf /opt/zoom-linux/ZoomLauncher zoom-linux
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/zoom-linux/zoom-linux.info b/network/zoom-linux/zoom-linux.info
index 7591e6a385..2375c3f896 100644
--- a/network/zoom-linux/zoom-linux.info
+++ b/network/zoom-linux/zoom-linux.info
@@ -1,10 +1,10 @@
 PRGNAM="zoom-linux"
-VERSION="3.5.374815.0324"
+VERSION="5.6.13632.0328"
 HOMEPAGE="https://www.zoom.us/"
-DOWNLOAD="https://www.zoom.us/client/3.5.374815.0324/zoom_i686.tar.xz"
-MD5SUM="725bc58490a641619c6f4847ae968fc7"
-DOWNLOAD_x86_64="https://www.zoom.us/client/3.5.374815.0324/zoom_x86_64.tar.xz"
-MD5SUM_x86_64="49fcd551dfec92f1ba359ca89ed5455e"
+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.SlackBuild b/office/CherryTree/CherryTree.SlackBuild
index a257ed7aa7..39e2a57da2 100644
--- a/office/CherryTree/CherryTree.SlackBuild
+++ b/office/CherryTree/CherryTree.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CherryTree
 
-# 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
@@ -24,7 +24,7 @@
 
 PRGNAM=CherryTree
 SRCNAM=${PRGNAM,,}
-VERSION=${VERSION:-0.38.9}
+VERSION=${VERSION:-0.39.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/CherryTree/CherryTree.info b/office/CherryTree/CherryTree.info
index f35d0a0513..7d8f5e0c14 100644
--- a/office/CherryTree/CherryTree.info
+++ b/office/CherryTree/CherryTree.info
@@ -1,8 +1,8 @@
 PRGNAM="CherryTree"
-VERSION="0.38.9"
+VERSION="0.39.2"
 HOMEPAGE="http://www.giuspen.com/cherrytree"
-DOWNLOAD="http://www.giuspen.com/software/cherrytree-0.38.9.tar.xz"
-MD5SUM="98ad1d7f1f4fa8d28400444a70b6b8a5"
+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/LibreOffice/README b/office/LibreOffice/README
index 69c212624c..dc7ee5981e 100644
--- a/office/LibreOffice/README
+++ b/office/LibreOffice/README
@@ -35,10 +35,10 @@ Build time environment variables that may be set to vary features are as follows
   VLC="yes"
    This requires the vlc package (available from SBo) to be installed.
 
-3. disable kde4 support (enabled by default) with:
+2. disable kde4 support (enabled by default) with:
   KDE4="no"
 
-4. support additional languages by overriding the LOLANGS variable, whose
+3. support additional languages by overriding the LOLANGS variable, whose
    default setting is LOLANGS="de es fr id it ja nl vi zh-CN". Note that en-US
    is always added to whatever LOLANGS is set. Thus building with, for example,
       LOLANGS="de" sh LibreOffice
@@ -46,7 +46,7 @@ Build time environment variables that may be set to vary features are as follows
    Additionally, setting LOLANGS="ALL" will build in support for all available
    languages.
 
-5. A number of Java Development Kits are suitable for building LibreOffice.
+4. A number of Java Development Kits are suitable for building LibreOffice.
    The default JDK for this SlackBuild is openjdk7. Others may be chosen by
    setting the JAVA environment variable when running the SlackBuild. Recognised
    values are openjdk7 (the default, not explicitly required), openjdk8 and jdk
@@ -58,7 +58,7 @@ Build time environment variables that may be set to vary features are as follows
    apache-ant package is needed to build LibreOffice.
    Finally, setting JAVA=no will build LibreOffice without any Java support.
 
-6. The number of parallel make jobs used by the LibreOffice build system defaults
+5. The number of parallel make jobs used by the LibreOffice build system defaults
    to the number of available cpu cores. If the MAKEFLAGS environment variable
    contains the -j option e.g.
        MAKEFLAGS=-j6
@@ -69,7 +69,7 @@ Build time environment variables that may be set to vary features are as follows
    which would limit building to a single make process, overriding any value set
    with the -j option in MAKEFLAGS.
 
-7. Use of ccache during building is turned off by default to save disk space (and
+6. Use of ccache during building is turned off by default to save disk space (and
    possible build failure due to lack of disk space). It may be reinstated by
    setting the USE_CCACHE environment to "yes" e.g.
        USE_CCACHE=yes sh LibreOffice.SlackBuild
@@ -90,5 +90,11 @@ to locate and open the downloaded .oxt file. The new dictionary will now appear
 in the Extension Manager.
 
 Some people have experienced difficulties building LibreOffice while a previoius
-version is still installed. It is therefore recommended that any previous version
-is removed while building LibreOffice.
+version is still installed. It is therefore recommended that any previous
+version should be removed before building LibreOffice. As well as removing any
+LibreOffice installation, it is important to also clear environment variables
+that were set by the installation i.e.
+       /sbin/removepkg LibreOffice
+       unset UNO_PATH
+       unset URE_BOOTSTRAP
+
diff --git a/office/MasterPDFEditor/MasterPDFEditor.SlackBuild b/office/MasterPDFEditor/MasterPDFEditor.SlackBuild
index 6472b6c20b..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.4.38}
+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.amd64"
+  SOURCEARCH="-qt5.x86_64"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  echo "Architecture is not supported."
+  exit 1
 fi
 
 set -e
@@ -66,13 +58,15 @@ mkdir -p $TMP $PKG $OUTPUT $PKG/opt
 cd $TMP
 rm -rf $SRCNAM-$MAJVER
 tar xvf $CWD/${SRCNAM}-${VERSION}${SOURCEARCH}.tar.gz
-chown -R root:root $SRCNAM-$MAJVER
-find -L $SRCNAM-$MAJVER \
+cd $SRCNAM-$MAJVER
+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 ..
 mv $SRCNAM-$MAJVER $PKG/opt
 cd $PKG/opt/$SRCNAM-$MAJVER
 
diff --git a/office/MasterPDFEditor/MasterPDFEditor.info b/office/MasterPDFEditor/MasterPDFEditor.info
index 7562e63de6..89126ec4b3 100644
--- a/office/MasterPDFEditor/MasterPDFEditor.info
+++ b/office/MasterPDFEditor/MasterPDFEditor.info
@@ -1,10 +1,10 @@
 PRGNAM="MasterPDFEditor"
-VERSION="5.4.38"
+VERSION="5.7.53"
 HOMEPAGE="https://code-industry.net/"
-DOWNLOAD="https://code-industry.net/public/master-pdf-editor-5.4.38.i386.tar.gz"
-MD5SUM="d58ae450bbe5cef074bcecfca9d82adb"
-DOWNLOAD_x86_64="https://code-industry.net/public/master-pdf-editor-5.4.38-qt4.amd64.tar.gz"
-MD5SUM_x86_64="008fe3c5d56f78ee455a3c6183ed5b4e"
-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 8f185b679e..6ef68b9b5c 100644
--- a/office/ProjectLibre/ProjectLibre.SlackBuild
+++ b/office/ProjectLibre/ProjectLibre.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # SlackBuild Script for ProjectLibre
 
-# Copyright 2012-2019 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.1}
+VERSION=${VERSION:-1.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/ProjectLibre/ProjectLibre.info b/office/ProjectLibre/ProjectLibre.info
index 4959778b6a..e29265ce12 100644
--- a/office/ProjectLibre/ProjectLibre.info
+++ b/office/ProjectLibre/ProjectLibre.info
@@ -1,8 +1,8 @@
 PRGNAM="ProjectLibre"
-VERSION="1.9.1"
+VERSION="1.9.3"
 HOMEPAGE="https://sourceforge.net/projects/projectlibre/"
-DOWNLOAD="https://downloads.sourceforge.net/projectlibre/projectlibre-1.9.1.tar.gz"
-MD5SUM="93083e41a364a6b3d140b03c68ce2eee"
+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 9d0bb84f03..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.0}
+VERSION=${VERSION:-5.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/SOGo/SOGo.info b/office/SOGo/SOGo.info
index 253994099e..257b204e19 100644
--- a/office/SOGo/SOGo.info
+++ b/office/SOGo/SOGo.info
@@ -1,16 +1,16 @@
 PRGNAM="SOGo"
-VERSION="4.3.0"
+VERSION="5.0.1"
 HOMEPAGE="https://sogo.nu/"
-DOWNLOAD="https://sogo.nu/files/downloads/SOGo/Sources/SOGo-4.3.0.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="4205c6d4f1c7e79035bcf67650eab859 \
-        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/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index 77fdffe278..15aea248f5 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -26,11 +26,14 @@
 # work correctly on Slackware
 # Now maintained by Robby Workman <rworkman@slackbuilds.org>
 
+# 20200622 bkw: updated for v3.0.4, which fixes the flickering issue.
+# abiword-docs hasn't seen a new release, we're still on 3.0.2 there.
+
 PRGNAM=abiword
-VERSION=${VERSION:-3.0.2}
-DOCSVER=$VERSION	# version of abiword-docs
+VERSION=${VERSION:-3.0.4}
+DOCSVER=3.0.2   	# version of abiword-docs
 DOCTAR=3.0.1		# sigh, the tarball contains abiword-docs-3.0.1 still
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,8 +80,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# https://bugs.archlinux.org/task/46659
-patch -p1 < $CWD/bug13815.patch
+# 20200622 bkw: don't let abiword create /root/.config/abiword/profile
+# during the build process. Don't break ccache in the process.
+mkdir -p tmphome
+export CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache}
+export HOME=$( pwd )/tmphome
 
 CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \
 CFLAGS="$SLKCFLAGS" \
@@ -98,7 +104,7 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
 # Now install the separate abiword-docs
 cd abiword-docs-$DOCTAR
@@ -118,16 +124,13 @@ cd abiword-docs-$DOCTAR
   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
 
+# 20200622 bkw: Skip useless docs. NEWS and ChangeLog are 0-byte placeholders,
+# INSTALL is generic GNU confgure instructions.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  *.txt *.TXT AUTHORS COPYING ChangeLog INSTALL NEWS README \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt *.TXT AUTHORS 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/office/abiword/abiword.info b/office/abiword/abiword.info
index 45f7615d73..bd7961e57c 100644
--- a/office/abiword/abiword.info
+++ b/office/abiword/abiword.info
@@ -1,9 +1,9 @@
 PRGNAM="abiword"
-VERSION="3.0.2"
+VERSION="3.0.4"
 HOMEPAGE="http://www.abisource.com"
-DOWNLOAD="http://abisource.com/downloads/abiword/3.0.2/source/abiword-3.0.2.tar.gz \
+DOWNLOAD="http://abisource.com/downloads/abiword/3.0.4/source/abiword-3.0.4.tar.gz \
           http://abisource.com/downloads/abiword/3.0.2/source/abiword-docs-3.0.2.tar.gz"
-MD5SUM="cda6dd58c747c133b421cc7eb18f5796 \
+MD5SUM="04e31887049a8c72297881bc153b77c4 \
         c92c0e1e2081db20757231a53d80c338"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/office/anorack/README b/office/anorack/README
index 0f2124c1a3..20c4d5f4bd 100644
--- a/office/anorack/README
+++ b/office/anorack/README
@@ -1,9 +1,9 @@
 The English language has two indefinite articles:
 
   a: used before words that begin with a consonant sound (e.g., a
-    program, a host, a user);
-  an: used before words that begin with a vowel sound (e.g., an
-    example, an hour, an undefined variable).
+	 program, a host, a user);
+  an: used before words that begin with a vowel sound (e.g., an example,
+      an hour, an undefined variable).
 
 anorack is a specialized spell-checker that finds incorrect indefinite
 articles.
diff --git a/office/anorack/anorack.SlackBuild b/office/anorack/anorack.SlackBuild
index 228e2983b8..fc2d4bb0d7 100644
--- a/office/anorack/anorack.SlackBuild
+++ b/office/anorack/anorack.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for anorack
 
-# Copyright 2018-2020 Donald Cooley South Haven, Indiana USA
+# Copyright 2018-2020 Donald Cooley, South Haven, Indiana, 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=anorack
-VERSION=${VERSION:-0.2.5}
+VERSION=${VERSION:-0.2.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/anorack/anorack.info b/office/anorack/anorack.info
index 3e5dc196af..8f4af25894 100644
--- a/office/anorack/anorack.info
+++ b/office/anorack/anorack.info
@@ -1,8 +1,8 @@
 PRGNAM="anorack"
-VERSION="0.2.5"
+VERSION="0.2.7"
 HOMEPAGE="https://jwilk.net/software/anorack"
-DOWNLOAD="https://github.com/jwilk/anorack/releases/download/0.2.5/anorack-0.2.5.tar.gz"
-MD5SUM="0ec9aa6e604450010fea5981920f4f47"
+DOWNLOAD="https://github.com/jwilk/anorack/releases/download/0.2.7/anorack-0.2.7.tar.gz"
+MD5SUM="a1220ec4e4f50cc249813b42b89d105c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3 espeak"
diff --git a/office/aspell6-es/README b/office/aspell6-es/README
deleted file mode 100644
index 5ab9815f7c..0000000000
--- a/office/aspell6-es/README
+++ /dev/null
@@ -1,14 +0,0 @@
-aspell6-es (Spanish language files for aspell)
-
-Spanish language files for aspell version >=0.60.6.
-
-The COES Spanish Language Tools are a research field of the
-Departamento de Arquitectura y Tecnología de Sistemas Informáticos
-(DATSI) of the Universidad Politécnica de Madrid (UPM) and the
-Departamento de Informática of the Universidad CarlosIII de Madrid.
-
-The main task of this research is to to develop an extensive set of
-Spanish grammatical rules and to apply them to test correctness on
-documents written in Spanish. To enhance distribution, COES is
-integrated with the ispell tool. COES is being distributed for free
-since the end of 1994.
diff --git a/office/aspell6-es/aspell6-es.SlackBuild b/office/aspell6-es/aspell6-es.SlackBuild
deleted file mode 100644
index ee2bedce5a..0000000000
--- a/office/aspell6-es/aspell6-es.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for aspell6-es
-
-# Copyright 2017 David O'Shaughnessy
-# 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=aspell6-es
-VERSION=${VERSION:-1.11_2}
-SRCVER=$(echo $VERSION | tr _ -)
-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.bz2
-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 {} \;
-
-./configure
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README COPYING 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/office/aspell6-es/aspell6-es.info b/office/aspell6-es/aspell6-es.info
deleted file mode 100644
index 382e930ad2..0000000000
--- a/office/aspell6-es/aspell6-es.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="aspell6-es"
-VERSION="1.11_2"
-HOMEPAGE="http://www.datsi.fi.upm.es/~coes/coes.html"
-DOWNLOAD="http://www.datsi.fi.upm.es/~coes/aspell6-es-1.11-2.tar.bz2"
-MD5SUM="8406336a89c64e47e96f4153d0af70c4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David O'Shaughnessy"
-EMAIL="dev@osh.id.au"
diff --git a/office/aspell6-es/slack-desc b/office/aspell6-es/slack-desc
deleted file mode 100644
index d2f73844e9..0000000000
--- a/office/aspell6-es/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------------------------------------------------------|
-aspell6-es: aspell6-es (Spanish language files for aspell)
-aspell6-es:
-aspell6-es: Spanish language files for aspell version >=0.60.6. 
-aspell6-es:
-aspell6-es: The COES Spanish Language Tools are a research field of the
-aspell6-es: Departamento de Arquitectura y Tecnologia de Sistemas Informaticos
-aspell6-es: (DATSI) of the Universidad Politecnica de Madrid (UPM) and the
-aspell6-es: Departamento de Informatica of the Universidad CarlosIII de Madrid.
-aspell6-es:
-aspell6-es: (http://www.datsi.fi.upm.es/~coes/coes.html)
-aspell6-es:
diff --git a/office/calcurse/README b/office/calcurse/README
index 0332ff35b4..be95ad316f 100644
--- a/office/calcurse/README
+++ b/office/calcurse/README
@@ -1,6 +1,9 @@
-calcurse is a calendar and scheduling application for the command line. It
-helps keep track of events, appointments and everyday tasks. A configurable
-notification system reminds user of upcoming deadlines, the curses based
-interface can be customized to suit user needs and a very powerful set of
-command line options can be used to filter and format appointments, making
-it suitable for use in scripts.
+Calcurse is a calendar and scheduling application for the command line.
+It helps keep track of events, appointments and everyday tasks. A
+configurable notification system reminds user of upcoming deadlines, the
+curses based interface can be customized to suit user needs and a very
+powerful set of command line options can be used to filter and format
+appointments, making it suitable for use in scripts.
+
+There is an optional dependency on httplib2 if you want to use the
+calcurse-caldav utility.
diff --git a/office/calcurse/calcurse.SlackBuild b/office/calcurse/calcurse.SlackBuild
index 02c4c2c2ff..41c8d29ce6 100644
--- a/office/calcurse/calcurse.SlackBuild
+++ b/office/calcurse/calcurse.SlackBuild
@@ -27,8 +27,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=calcurse
-VERSION=${VERSION:-4.5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.7.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -73,10 +73,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 {} \;
 
-# Fix a problem with DST
-# https://lists.calcurse.org/bugs/msg00281.html
-patch -p1 <$CWD/dst_change.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/office/calcurse/calcurse.info b/office/calcurse/calcurse.info
index a38861365d..d3a8a11736 100644
--- a/office/calcurse/calcurse.info
+++ b/office/calcurse/calcurse.info
@@ -1,8 +1,8 @@
 PRGNAM="calcurse"
-VERSION="4.5.0"
+VERSION="4.7.1"
 HOMEPAGE="http://calcurse.org/"
-DOWNLOAD="https://calcurse.org/files/calcurse-4.5.0.tar.gz"
-MD5SUM="26e8c3e47a5cde45d216525b1e1e464d"
+DOWNLOAD="https://calcurse.org/files/calcurse-4.7.1.tar.gz"
+MD5SUM="1645068d2a15da6c773f231a1441a760"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/calcurse/dst_change.patch b/office/calcurse/dst_change.patch
deleted file mode 100644
index db0800db79..0000000000
--- a/office/calcurse/dst_change.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/src/utils.c b/src/utils.c
---- a/src/utils.c	2019-06-16 20:04:39.000000000 +0100
-+++ b/src/utils.c	2019-08-01 16:12:00.864953675 +0100
-@@ -526,9 +526,11 @@
- 	t.tm_mon += delta_month;
- 	t.tm_mday += delta_day;
- 
-+  t.tm_isdst = -1;
- 	if (mktime(&t) == -1) {
- 		return 1;
- 	} else {
-+		t.tm_isdst = -1;
- 		*date = t;
- 		return 0;
- 	}
diff --git a/office/calibre-bin/calibre-bin.SlackBuild b/office/calibre-bin/calibre-bin.SlackBuild
index 6cac59e8f6..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:-4.13.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 6c3fe3f8d7..66002b3a25 100644
--- a/office/calibre-bin/calibre-bin.info
+++ b/office/calibre-bin/calibre-bin.info
@@ -1,10 +1,10 @@
 PRGNAM="calibre-bin"
-VERSION="4.13.0"
+VERSION="5.15.0"
 HOMEPAGE="https://calibre-ebook.com"
-DOWNLOAD="https://download.calibre-ebook.com/4.13.0/calibre-4.13.0-i686.txz"
-MD5SUM="922cacb5bb7faf72ed5b4a775164262f"
-DOWNLOAD_x86_64="https://download.calibre-ebook.com/4.13.0/calibre-4.13.0-x86_64.txz"
-MD5SUM_x86_64="cdab4f5a12164f076d1d524a783e2c61"
+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/README b/office/coolreader/README
index e12c827494..ca7de57c79 100644
--- a/office/coolreader/README
+++ b/office/coolreader/README
@@ -5,4 +5,14 @@ CoolReader is an e-book reader for various platforms.
 Supported file formats include plain text, HTML, RTF, Microsoft Word
 (.doc), Palm Pilot (.prc, .pdb, .pml, .mobi), FB2, and EPUB.
 
-Note: the executable and man page are called "cr3", not "coolreader".
+Optional dependencies: The default user interface is Qt4, which
+doesn't require anything extra. If you prefer Qt5 or wxWidgets:
+
+qt5 - install qt5, then run: GUI=qt5 ./coolreader.SlackBuild
+
+wx - install wxPython or wxGTK3 (last one installed 'wins'), then run:
+     GUI=wx ./coolreader.SlackBuild
+
+Note: coolreader is "chatty": it logs a lot of meaningless warnings
+and errors to stderr. Unless there's an actual problem with the
+application, you can ignore this stuff.
diff --git a/office/coolreader/coolreader.SlackBuild b/office/coolreader/coolreader.SlackBuild
index ce30ee6681..4464360dad 100644
--- a/office/coolreader/coolreader.SlackBuild
+++ b/office/coolreader/coolreader.SlackBuild
@@ -23,6 +23,21 @@
 # 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.
+# - replace useless/inaccurate man page with our own.
+
 # 20200126 bkw, BUILD=2:
 # - take over maintenance
 # - i486 => i586
@@ -32,15 +47,10 @@
 # - save/load settings (.ini file) to ~/.cr3, not /usr/share/cr3.
 
 PRGNAM=coolreader
-VERSION=${VERSION:-3.0.56}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.2.54}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ORIG_PRGNAM=cr3
-ORIG_VERSION=$VERSION-7
-ORIG_DIRNAME=cr$ORIG_VERSION
-ORIG_FILENAME=${ORIG_PRGNAM}_$VERSION.orig.tar.gz
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -70,51 +80,119 @@ fi
 
 set -e
 
+FBDVER=${FBDVER:-1.0.10}
+LUBVER=${LUBVER:-4.3}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $ORIG_DIRNAME
-tar xvf $CWD/$ORIG_FILENAME
-cd $ORIG_DIRNAME
-chown -R root:root .
-
-# Fix upstream typo
-sed -i 's,documetn,document,g' cr3qt/src/*.ui cr3qt/src/i18n/*.ts
+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' \
+       -e '/find_package(FriBidi)/d' \
+       CMakeLists.txt
+
+# Install the docs in the right place for Slackware.
+sed -i "s,share/doc/cr3,doc/$PRGNAM-$VERSION," cr3qt/CMakeLists.txt
+
+# 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.
+
+GUI=${GUI:-QT}
+GUI="$( echo $GUI | tr a-z A-Z )"
+case "$GUI" in
+  QT)  UI=Qt4
+       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)" ;;
+  *)   echo "*** Unsupported GUI '$GUI', use one of: QT QT5 WX"
+       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
 
-# Don't try to load/save .ini file from /usr/share
-patch -p1 < $CWD/inifile.diff
+echo "=== Building $UI GUI"
 
 mkdir -p build
 cd build
-cmake \
-  -D CMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -D CMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -D CMAKE_INSTALL_PREFIX=/usr \
-  -D LIB_SUFFIX=${LIBDIRSUFFIX} \
-  -D CMAKE_BUILD_TYPE=Release \
-  -D MAX_IMAGE_SCALE_MUL=2 \
-  -D DOC_DATA_COMPRESSION_LEVEL=3 \
-  -D DOC_BUFFER_SIZE=0x1400000 \
-  -D GUI=QT ..
-make VERBOSE=1
-make install DESTDIR=$PKG
+  cmake \
+    -D USE_UNRAR=1 \
+    -D CMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -D CMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D LIB_SUFFIX=${LIBDIRSUFFIX} \
+    -D CMAKE_BUILD_TYPE=Release \
+    -D MAX_IMAGE_SCALE_MUL=2 \
+    -D DOC_DATA_COMPRESSION_LEVEL=3 \
+    -D DOC_BUFFER_SIZE=0x1400000 \
+    -D GUI=$GUI ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
 cd ..
 
-strip $PKG/usr/bin/$ORIG_PRGNAM
-
-mkdir -p $PKG/usr/man
-mv $PKG/usr/share/man/* $PKG/usr/man
+# Upstream's man page doesn't document all the options, and incorrectly
+# refers to the (nonexistent) info page. It's also hardcoded to install
+# to /usr/share/man.
 rm -rf $PKG/usr/share/man
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/cr3.1 > $PKG/usr/man/man1/cr3.1.gz
 
-sed -i '/Icon/s|\.png||' $PKG/usr/share/applications/$ORIG_PRGNAM.desktop
+# Tired of having to remember the binary's called something other than
+# the package and source name.
+ln -s cr3 $PKG/usr/bin/$PRGNAM
+ln -s cr3.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
 
+# This dir already exists with GUI=QT or QT5, but not WX.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$ORIG_PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
+cp -a README.md cr3gui/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
+sed "s,@UI@,$UI," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/office/coolreader/coolreader.info b/office/coolreader/coolreader.info
index 2a462222f6..975d7c9aee 100644
--- a/office/coolreader/coolreader.info
+++ b/office/coolreader/coolreader.info
@@ -1,8 +1,12 @@
 PRGNAM="coolreader"
-VERSION="3.0.56"
-HOMEPAGE="https://sourceforge.net/projects/crengine/"
-DOWNLOAD="https://downloads.sourceforge.net/crengine/CoolReader3/cr3_3.0.56.orig.tar.gz"
-MD5SUM="cc221a608a1b5fea2db5a519c14eeb39"
+VERSION="3.2.54"
+HOMEPAGE="https://github.com/buggins/coolreader"
+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/cr3.1 b/office/coolreader/cr3.1
new file mode 100644
index 0000000000..fda4cb2375
--- /dev/null
+++ b/office/coolreader/cr3.1
@@ -0,0 +1,85 @@
+.\" Man page generated from reStructuredText.
+.
+.TH CR3 1 "2020-10-19" "3.2.49" "SlackBuilds.org"
+.SH NAME
+cr3 \- coolreader (e-book reader)
+.
+.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 cr3(1) man page. Convert with:
+.
+.\" rst2man.py cr3.rst > cr3.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+cr3 [\fI\-options\fP] [filename]
+.SH DESCRIPTION
+.sp
+CoolReader is an e\-book reader for various platforms.
+.sp
+Supported file formats include plain text, HTML, RTF, Microsoft Word
+(.doc), Palm Pilot (.prc, .pdb, .pml, .mobi), FB2, and EPUB.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-\-version
+Output version number.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-?, \-h, \-\-help
+Output usage string.
+.TP
+.B \-\-loglevel=ERROR|WARN|INFO|DEBUG|TRACE
+Set logging level.
+.TP
+.B \-\-logfile=<filename>|stdout|stderr
+Set log file. Default is stderr.
+.UNINDENT
+.SH FILES
+.INDENT 0.0
+.TP
+.B ~/.cr3/
+Per\-user configuration, cache, and bookmarks. It\(aqs not recommended to
+edit \fBcr3.ini\fP by hand.
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/coolreader\-3.2.49/COPYING for license information.
+.SH AUTHORS
+.sp
+cr3 was written by Vadim Lopatin, aka buggins.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The cr3 homepage: \fI\%https://github.com/buggins/coolreader\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/office/coolreader/cr3.rst b/office/coolreader/cr3.rst
new file mode 100644
index 0000000000..04b3abe02e
--- /dev/null
+++ b/office/coolreader/cr3.rst
@@ -0,0 +1,74 @@
+.. RST source for cr3(1) man page. Convert with:
+..   rst2man.py cr3.rst > cr3.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. Note to SBo admins: Please don't include this file in the doc dir
+.. in the package. It's here because it's the source for the man page.
+
+.. |version| replace:: 3.2.49
+.. |date| date::
+
+===
+cr3
+===
+
+--------------------------
+coolreader (e-book reader)
+--------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+cr3 [*-options*] [filename]
+
+DESCRIPTION
+===========
+
+CoolReader is an e-book reader for various platforms.
+
+Supported file formats include plain text, HTML, RTF, Microsoft Word
+(.doc), Palm Pilot (.prc, .pdb, .pml, .mobi), FB2, and EPUB.
+
+OPTIONS
+=======
+
+--version   Output version number.
+
+-?, -h, --help
+            Output usage string.
+
+--loglevel=ERROR|WARN|INFO|DEBUG|TRACE
+            Set logging level.
+
+--logfile=<filename>|stdout|stderr
+            Set log file. Default is stderr.
+
+FILES
+=====
+
+~/.cr3/
+   Per-user configuration, cache, and bookmarks. It's not recommended to
+   edit **cr3.ini** by hand.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/coolreader-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+cr3 was written by Vadim Lopatin, aka buggins.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The cr3 homepage: https://github.com/buggins/coolreader
diff --git a/office/coolreader/inifile.diff b/office/coolreader/inifile.diff
deleted file mode 100644
index 9290599e69..0000000000
--- a/office/coolreader/inifile.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cr3.0.56-7/cr3qt/src/mainwindow.cpp cr3.0.56-7.patched/cr3qt/src/mainwindow.cpp
---- cr3.0.56-7/cr3qt/src/mainwindow.cpp	2012-03-21 01:39:19.000000000 -0400
-+++ cr3.0.56-7.patched/cr3qt/src/mainwindow.cpp	2020-01-26 19:26:09.590595122 -0500
-@@ -79,7 +79,6 @@
-     QString bookmarksDir = homeDir + "bookmarks";
-     QString histFile = exeDir + "cr3hist.bmk";
-     QString histFile2 = homeDir + "cr3hist.bmk";
--    QString iniFile2 = exeDir + "cr3.ini";
-     QString iniFile = homeDir + "cr3.ini";
-     QString cssFile = homeDir + "fb2.css";
-     QString cssFile2 = exeDir + "fb2.css";
-@@ -91,8 +90,7 @@
- 
-     ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE );
-     ui->view->setPropsChangeCallback( this );
--    if ( !ui->view->loadSettings( iniFile ) )
--        ui->view->loadSettings( iniFile2 );
-+    ui->view->loadSettings( iniFile );
-     if ( !ui->view->loadHistory( histFile ) )
-         ui->view->loadHistory( histFile2 );
-     if ( !ui->view->loadCSS( cssFile ) )
diff --git a/office/coolreader/slack-desc b/office/coolreader/slack-desc
index ed6f84a707..655f530274 100644
--- a/office/coolreader/slack-desc
+++ b/office/coolreader/slack-desc
@@ -13,7 +13,7 @@ coolreader:
 coolreader: Supported file formats include plain text, HTML, RTF, Microsoft Word
 coolreader: (.doc), Palm Pilot (.prc, .pdb, .pml, .mobi), FB2, and EPUB.
 coolreader:
-coolreader: Homepage: https://sourceforge.net/projects/crengine/
-coolreader:
+coolreader: This package built with the @UI@ user interface.
 coolreader:
+coolreader: Homepage: https://sourceforge.net/projects/crengine/
 coolreader:
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/fbpdf/fbpdf.info b/office/fbpdf/fbpdf.info
index 95dc64c565..00b76dd479 100644
--- a/office/fbpdf/fbpdf.info
+++ b/office/fbpdf/fbpdf.info
@@ -1,7 +1,7 @@
 PRGNAM="fbpdf"
 VERSION="20161202"
 HOMEPAGE="http://litcave.rudi.ir/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/fbpdf-20161202.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/fbpdf-20161202.tar.gz"
 MD5SUM="f022012d639e1b93d3ae1e547f79df55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/office/focuswriter-legacy/README b/office/focuswriter-legacy/README
new file mode 100644
index 0000000000..080dda1e89
--- /dev/null
+++ b/office/focuswriter-legacy/README
@@ -0,0 +1,8 @@
+FocusWriter is a fullscreen, distraction-free word processor designed
+to immerse you as much as possible in your work. 
+The program autosaves your progress, and reloads the last files you
+had open to make it easy to jump back in during your next writing
+session, and has many other features that make it such that only one
+thing matters: your writing.
+
+Newer versions of FocusWriter depend on qt5.
diff --git a/office/focuswriter-legacy/doinst.sh b/office/focuswriter-legacy/doinst.sh
new file mode 100644
index 0000000000..4a25de5e6f
--- /dev/null
+++ b/office/focuswriter-legacy/doinst.sh
@@ -0,0 +1,10 @@
+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/office/focuswriter-legacy/focuswriter-legacy.SlackBuild b/office/focuswriter-legacy/focuswriter-legacy.SlackBuild
new file mode 100644
index 0000000000..e3044ba089
--- /dev/null
+++ b/office/focuswriter-legacy/focuswriter-legacy.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for focuswriter-legacy
+
+# Copyright 2014 Scalzi Giuseppe Switzerland
+# Updated 2016 Morten Juhl-Johansen Zölde-Fejér
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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=focuswriter-legacy
+VERSION=${VERSION:-1.5.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=focuswriter
+
+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-src.tar.bz2
+cd $SRCNAM-$VERSION
+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 PREFIX=/usr
+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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+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/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/focuswriter-legacy/focuswriter-legacy.info b/office/focuswriter-legacy/focuswriter-legacy.info
new file mode 100644
index 0000000000..0e81abdae1
--- /dev/null
+++ b/office/focuswriter-legacy/focuswriter-legacy.info
@@ -0,0 +1,10 @@
+PRGNAM="focuswriter-legacy"
+VERSION="1.5.7"
+HOMEPAGE="https://gottcode.org/focuswriter/"
+DOWNLOAD="https://gottcode.org/focuswriter/focuswriter-1.5.7-src.tar.bz2"
+MD5SUM="088dd0b696b60b3cc6c59793ec5eea6d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/office/focuswriter-legacy/slack-desc b/office/focuswriter-legacy/slack-desc
new file mode 100644
index 0000000000..7268bb3acf
--- /dev/null
+++ b/office/focuswriter-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------------------------------------------------------|
+focuswriter-legacy: focuswriter-legacy (distraction-free word processor)
+focuswriter-legacy:
+focuswriter-legacy: FocusWriter is a fullscreen, distraction-free word processor designed
+focuswriter-legacy: to immerse you as much as possible in your work.
+focuswriter-legacy: The program autosaves your progress, and reloads the last files you
+focuswriter-legacy: had open to make it easy to jump back in during your next writing
+focuswriter-legacy: session, and has many other features that make it such that only one
+focuswriter-legacy: thing matters: your writing.
+focuswriter-legacy:
+focuswriter-legacy: http://gottcode.org/focuswriter/
+focuswriter-legacy:
diff --git a/office/focuswriter/README b/office/focuswriter/README
index 61463f8371..0c98992a0c 100644
--- a/office/focuswriter/README
+++ b/office/focuswriter/README
@@ -1,6 +1,9 @@
-FocusWriter is a fullscreen, distraction-free word processor
-designed to immerse you as much as possible in your work. 
+FocusWriter is a fullscreen, distraction-free word processor designed
+to immerse you as much as possible in your work. 
 The program autosaves your progress, and reloads the last files you
 had open to make it easy to jump back in during your next writing
 session, and has many other features that make it such that only one
 thing matters: your writing.
+
+A focuswriter-legacy SlackBuild, which does not depend on qt5,
+is available.
diff --git a/office/focuswriter/focuswriter.SlackBuild b/office/focuswriter/focuswriter.SlackBuild
index c3dec34066..586ffff733 100644
--- a/office/focuswriter/focuswriter.SlackBuild
+++ b/office/focuswriter/focuswriter.SlackBuild
@@ -3,8 +3,9 @@
 # Slackware build script for focuswriter
 
 # Copyright 2014 Scalzi Giuseppe Switzerland
-# All rights reserved.
 # Updated 2016 Morten Juhl-Johansen Zölde-Fejér
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -24,13 +25,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=focuswriter
-VERSION=${VERSION:-1.5.7}
+VERSION=${VERSION:-1.7.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
@@ -41,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"
@@ -69,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 {} \;
 
-qmake PREFIX=/usr
+qmake-qt5 PREFIX=/usr
 make
 make install INSTALL_ROOT=$PKG
 
diff --git a/office/focuswriter/focuswriter.info b/office/focuswriter/focuswriter.info
index 7d11e63118..7e46d02fbc 100644
--- a/office/focuswriter/focuswriter.info
+++ b/office/focuswriter/focuswriter.info
@@ -1,10 +1,10 @@
 PRGNAM="focuswriter"
-VERSION="1.5.7"
+VERSION="1.7.6"
 HOMEPAGE="https://gottcode.org/focuswriter/"
-DOWNLOAD="https://gottcode.org/focuswriter/focuswriter-1.5.7-src.tar.bz2"
-MD5SUM="088dd0b696b60b3cc6c59793ec5eea6d"
+DOWNLOAD="https://gottcode.org/focuswriter/focuswriter-1.7.6-src.tar.bz2"
+MD5SUM="ba9e316b4bc0c4568d71f7dc3cd64fff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Morten Juhl-Johansen Zölde-Fejér"
-EMAIL="mjjzf@syntaktisk.dk"
+REQUIRES="qt5"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/office/focuswriter/slack-desc b/office/focuswriter/slack-desc
index 32385b11ef..b742081979 100644
--- a/office/focuswriter/slack-desc
+++ b/office/focuswriter/slack-desc
@@ -8,8 +8,8 @@
            |-----handy-ruler------------------------------------------------------|
 focuswriter: focuswriter (distraction-free word processor)
 focuswriter:
-focuswriter: FocusWriter is a fullscreen, distraction-free word processor
-focuswriter: designed to immerse you as much as possible in your work.
+focuswriter: FocusWriter is a fullscreen, distraction-free word processor designed
+focuswriter: to immerse you as much as possible in your work.
 focuswriter: The program autosaves your progress, and reloads the last files you
 focuswriter: had open to make it easy to jump back in during your next writing
 focuswriter: session, and has many other features that make it such that only one
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/fop-legacy/README.postinst b/office/fop-legacy/README.postinst
new file mode 100644
index 0000000000..d079a0e881
--- /dev/null
+++ b/office/fop-legacy/README.postinst
@@ -0,0 +1,13 @@
+After installing, create .foprc in your home dir with the following
+
+FOP_OPTS="-Xmx###m"
+FOP_HOME="/opt/fop"
+
+Delete and replace the #'s with the amount of RAM your computer has 
+in megabytes.
+
+Use can run "free -m" in the terminal to get the info:
+Example :
+
+FOP_OPTS="-Xmx1024m"     // If you have a GB RAM
+FOP_HOME="/opt/fop"
diff --git a/office/fop-legacy/fop-legacy.SlackBuild b/office/fop-legacy/fop-legacy.SlackBuild
new file mode 100644
index 0000000000..24f7faefb6
--- /dev/null
+++ b/office/fop-legacy/fop-legacy.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# 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
+# 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=fop-legacy
+SRCNAM=fop
+VERSION=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 $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION-src.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 {} \;
+
+# Increase hyphenation stacksize from 512k to 1M:
+sed -e '/hyph\.stack/s/512k/1M/' -i fop/build.xml
+
+# 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/
+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}/${PRGNAM} $PKG/usr/bin/ )
+
+# 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
+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/fop-legacy/fop-legacy.info b/office/fop-legacy/fop-legacy.info
new file mode 100644
index 0000000000..45a81bef04
--- /dev/null
+++ b/office/fop-legacy/fop-legacy.info
@@ -0,0 +1,12 @@
+PRGNAM="fop-legacy"
+VERSION="2.3"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+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"
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
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 fe7aab4c22..063a19b2f8 100644
--- a/office/fop/README
+++ b/office/fop/README
@@ -13,4 +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.
 
-jai is an optional but recommended dependency.
+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.
+
+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.
+
+jai and jai-imageio are optional but recommended dependencies.
diff --git a/office/fop/fop.SlackBuild b/office/fop/fop.SlackBuild
index 82871cd44f..80b4d2bea5 100644
--- a/office/fop/fop.SlackBuild
+++ b/office/fop/fop.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for fop
 
 # Copyright 2015 Thorn Inurcide USA
+# Copyright 2020, 2021 Lenard Spencer, Orlando, Florida, USA
 # 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=fop
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,23 +70,40 @@ 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 an Issue with Java 8 (thanks LFS):
-sed -i '\@</javad@i\
-<arg value="-Xdoclint:none"/>\
-<arg value="--allow-script-in-comments"/>' fop/build.xml
+if [ "${JDK11:-no}" = "yes" ]; then
+# Fix an Issue with Java 11 and newer:
+  sed -i '\@</javad@i\
+  <arg value="-Xdoclint:none"/>\
+  <arg value="--allow-script-in-comments"/>\
+  <arg value="--ignore-source-errors"/>' \
+    fop/build.xml
+# With jdk11 and newer, the minimum source version is 1.7, while
+# the fop build system has 1.6.  Change it here:
+  sed -e 's/1\.6/1.7/' \
+    -i fop/build.xml
+else
+  # Fix an Issue with Java 8 and older:
+  sed -i '\@</javad@i\
+  <arg value="--allow-script-in-comments"/>' fop/build.xml
+fi
 
-# Increase hyphenation stacksize from 512k to 1M (thanks LFS):
+# Increase hyphenation stacksize from 512k to 1M:
 sed -e '/hyph\.stack/s/512k/1M/' -i fop/build.xml
 
-# Compiles with apache-ant:
-ant -f fop/build.xml compile
-ant -f fop/build.xml jar-main
-ant -f fop/build.xml javadocs
+# Copy updated {pdf,font}box files:
+rm fop/lib/fontbox-2.0.*.jar || true
+cp $CWD/{font,pdf}box-2.0.*.jar fop/lib
 
-mkdir -p $PKG/opt/$PRGNAM-$VERSION
-install -v -d -m755 $PKG/opt/$PRGNAM-$VERSION/
+# 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/
 mv build/javadocs .
 cp -va build conf examples javadocs fop* lib \
  $PKG/opt/$PRGNAM-$VERSION )
diff --git a/office/fop/fop.info b/office/fop/fop.info
index 1037a04203..9cfe10aec6 100644
--- a/office/fop/fop.info
+++ b/office/fop/fop.info
@@ -1,10 +1,16 @@
 PRGNAM="fop"
-VERSION="2.4"
+VERSION="2.6"
 HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.4-src.tar.gz"
-MD5SUM="e379d5916bc705b6fd3808a77f5d8478"
+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="1d6bc84d2ab7f971bbc628080e3c307f \
+        f9aa90c666c88ff29e3cd34c15d538ca \
+        6b71c42c567d419f068f46f410dcc3a5 \
+        bf9c09bf05108ef9661b8f08d91c2336"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="apache-ant"
+REQUIRES="apache-ant apache-maven"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/office/ganttproject/ganttproject.SlackBuild b/office/ganttproject/ganttproject.SlackBuild
index 448ff3b7b2..7938d4f30d 100644
--- a/office/ganttproject/ganttproject.SlackBuild
+++ b/office/ganttproject/ganttproject.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ganttproject
-VERSION=${VERSION:-2.8.9}
-VERSION_BUILD=${VERSION_BUILD:-r2335}
+VERSION=${VERSION:-2.8.11}
+VERSION_BUILD=${VERSION_BUILD:-r2396}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/ganttproject/ganttproject.info b/office/ganttproject/ganttproject.info
index 8e3b533e97..1bbdb9834b 100644
--- a/office/ganttproject/ganttproject.info
+++ b/office/ganttproject/ganttproject.info
@@ -1,8 +1,8 @@
 PRGNAM="ganttproject"
-VERSION="2.8.9"
+VERSION="2.8.11"
 HOMEPAGE="https://www.ganttproject.biz"
-DOWNLOAD="https://github.com/bardsoftware/ganttproject/releases/download/ganttproject-2.8.9/ganttproject_2.8.9-r2335-1_all.deb"
-MD5SUM="ac90e0290098b4b35e793356ef84518c"
+DOWNLOAD="https://github.com/bardsoftware/ganttproject/releases/download/ganttproject-2.8.11/ganttproject_2.8.11-r2396-1_all.deb"
+MD5SUM="a7b7c90c4e96b8995dd55fb314f103e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/office/ghostwriter/README b/office/ghostwriter/README
new file mode 100644
index 0000000000..b3755370a4
--- /dev/null
+++ b/office/ghostwriter/README
@@ -0,0 +1,13 @@
+ghostwriter is a distraction-free Markdown editor, featuring a full
+screen mode and a clean interface. With Markdown, you can write now,
+and format later.
+
+Some of the features include:
+
+- built-in and custom themes,
+- live HTML preview,
+- export to multiple formats,
+- navigation with outline,
+- focus and Hemingway modes,
+- document and session statistics,
+- drag and drop images.
diff --git a/office/ghostwriter/doinst.sh b/office/ghostwriter/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/office/ghostwriter/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/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
new file mode 100644
index 0000000000..f9b6b2b7aa
--- /dev/null
+++ b/office/ghostwriter/ghostwriter.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for ghostwriter
+
+# Copyright 2021 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=ghostwriter
+VERSION=${VERSION:-1.8.1}
+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 .
+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|"
+
+qmake-qt5 -r $PRGNAM.pro      \
+  QMAKE_CFLAGS="$SLKCFLAGS"   \
+  QMAKE_CXXFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr
+
+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
+
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a {BUILD_MAC,CHANGELOG,CREDITS,README}.md 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
+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/ghostwriter/ghostwriter.info b/office/ghostwriter/ghostwriter.info
new file mode 100644
index 0000000000..cbc1933ccf
--- /dev/null
+++ b/office/ghostwriter/ghostwriter.info
@@ -0,0 +1,10 @@
+PRGNAM="ghostwriter"
+VERSION="1.8.1"
+HOMEPAGE="https://wereturtle.github.io/ghostwriter/"
+DOWNLOAD="https://github.com/wereturtle/ghostwriter/archive/v1.8.1/ghostwriter-1.8.1.tar.gz"
+MD5SUM="67f6b671a8e10bc91872fd65dea2b78f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5"
+MAINTAINER="Andrzej Telszewski"
+EMAIL="andrzej@telszewski.com"
diff --git a/office/ghostwriter/slack-desc b/office/ghostwriter/slack-desc
new file mode 100644
index 0000000000..a710c6fd2b
--- /dev/null
+++ b/office/ghostwriter/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------------------------------------------------------|
+ghostwriter: ghostwriter (distraction-free Markdown editor)
+ghostwriter:
+ghostwriter: ghostwriter is a distraction-free Markdown editor, featuring a full
+ghostwriter: screen mode and a clean interface. With Markdown, you can write now,
+ghostwriter: and format later.
+ghostwriter:
+ghostwriter: Homepage: https://wereturtle.github.io/ghostwriter/
+ghostwriter:
+ghostwriter:
+ghostwriter:
+ghostwriter:
diff --git a/office/gnucash-docs/README b/office/gnucash-docs/README
index 3d2b9e1337..0dbc6ce019 100644
--- a/office/gnucash-docs/README
+++ b/office/gnucash-docs/README
@@ -2,7 +2,7 @@ This is the documentation package for Gnucash.
 
 This builds the internal help and user guides for Gnucash.
 
-For the HTML help and user guides to read outside the Gnucash
+For the HTML help and user guides to read outside of the Gnucash
 application, pass HTML="yes" to the script.
 
 For the EPUB help and user guides, pass EPUB="yes" to the script.
diff --git a/office/gnucash-docs/gnucash-docs.SlackBuild b/office/gnucash-docs/gnucash-docs.SlackBuild
index 21f881a860..d43e8ff27f 100644
--- a/office/gnucash-docs/gnucash-docs.SlackBuild
+++ b/office/gnucash-docs/gnucash-docs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gnucash-docs
 
-# Copyright 2018 Lenard Spencer  <lspencer31@cfl.rr.com>
+# Copyright 2018, 2019, 2020 Lenard Spencer  <lenardrspencer@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=gnucash-docs
 DESTNAM=gnucash
-VERSION=${VERSION:-3.8}
+VERSION=${VERSION:-3.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -38,10 +38,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 ARCH=noarch # does not install any binary files
 
-# Set DOCLANG to C if it is empty:
-if [ ! "$DOCLANG" ]; then
-  DOCLANG=C
-fi
+DOCLANG=${DOCLANG:-"C"}
 
 set -e
 
@@ -69,14 +66,10 @@ make -j1 install DESTDIR=$PKG docdir=/usr/doc/$DESTNAM-$VERSION
 
 if [ "$HTML" = "yes" ]; then
   mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION/html
-  cd guide/${DOCLANG:-C} || cd guide/C
-  echo "in `pwd`"
-  sleep 2
+  cd guide/$DOCLANG || cd guide/C
   make html
   cp -vR gnucash-guide $PKG/usr/doc/$DESTNAM-$VERSION/html
-  cd ../../help/${DOCLANG:-C} || cd ../../help/C
-  echo "in `pwd`"
-  sleep 2
+  cd ../../help/$DOCLANG || cd ../../help/C
   make html
   cp -vR gnucash-help $PKG/usr/doc/$DESTNAM-$VERSION/html
   cd ../..
@@ -85,14 +78,10 @@ fi
 if [ -x /opt/fop/fop ]; then
   if [ "$PDF" = "yes" ]; then
     mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION
-    cd guide/${DOCLANG:-C} || cd guide/C
-    echo "in `pwd`"
-    sleep 2
+    cd guide/$DOCLANG || cd guide/C
     make pdf
     cp -vR gnucash-guide.pdf $PKG/usr/doc/$DESTNAM-$VERSION
-    cd ../../help/${DOCLANG:-C} || cd ../../help/C
-    echo "in `pwd`"
-    sleep 2
+    cd ../../help/$DOCLANG || cd ../../help/C
     make pdf
     cp -vR gnucash-help.pdf $PKG/usr/doc/$DESTNAM-$VERSION
     cd ../..
@@ -101,14 +90,10 @@ fi
 
 if [ "$EPUB" = "yes" ]; then
   mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION
-  cd guide/${DOCLANG:-C} || cd guide/C
-  echo "in `pwd`"
-  sleep 2
+  cd guide/$DOCLANG || cd guide/C
   make epub
   cp -vR gnucash-guide.epub $PKG/usr/doc/$DESTNAM-$VERSION
-  cd ../../help/${DOCLANG:-C} || cd ../../help/C
-  echo "in `pwd`"
-  sleep 2
+  cd ../../help/$DOCLANG || cd ../../help/C
   make epub
   cp -vR gnucash-help.epub $PKG/usr/doc/$DESTNAM-$VERSION
   cd ../..
diff --git a/office/gnucash-docs/gnucash-docs.info b/office/gnucash-docs/gnucash-docs.info
index 1d1056fe95..e2e666940f 100644
--- a/office/gnucash-docs/gnucash-docs.info
+++ b/office/gnucash-docs/gnucash-docs.info
@@ -1,8 +1,8 @@
 PRGNAM="gnucash-docs"
-VERSION="3.8"
+VERSION="3.11"
 HOMEPAGE="http://www.gnucash.org"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-3.8.tar.gz"
-MD5SUM="ffd685d87bf784999a9d758acd12c0e0"
+DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-3.11.tar.gz"
+MD5SUM="1886563b1fc7b2582a19a96484609581"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gnucash rarian yelp"
diff --git a/office/gnucash-legacy-docs/gnucash-legacy-docs.SlackBuild b/office/gnucash-legacy-docs/gnucash-legacy-docs.SlackBuild
index 4be745e8eb..754e917070 100644
--- a/office/gnucash-legacy-docs/gnucash-legacy-docs.SlackBuild
+++ b/office/gnucash-legacy-docs/gnucash-legacy-docs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gnucash-legacy-docs
 
-# Copyright 2018 Lenard Spencer  <lspencer31@cfl.rr.com>
+# Copyright 2018, 2019, 2020 Lenard Spencer  <lenardrspencer@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
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 c7e7923415..c203787a98 100644
--- a/office/gnucash-legacy/gnucash-legacy.SlackBuild
+++ b/office/gnucash-legacy/gnucash-legacy.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for gnucash-legacy
 
 # Copyright 2015  Trayan Denev, tdenev@gmail.com
-# This version Copyright 2018 Lenard Spencer <lspencer31@cfl.rr.com>
+# Copyright 2018 Lenard Spencer <lenardrspencer@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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/gnucash/README b/office/gnucash/README
index 20215f5293..35bbcb0a93 100644
--- a/office/gnucash/README
+++ b/office/gnucash/README
@@ -8,20 +8,33 @@ As quick and intuitive to use as a checkbook register, it is based
 on professional accounting principles to ensure balanced books and
 accurate reports.
 
-The dependencies webkitgtk, goffice0.8 and libgnomecanvas have been
-dropped, with webkit2gtk, python3, and gtest being the new dependencies.
-
 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.
 
 If you want the SQL database integration, you must first have libdbi
-and libdbi-drivers installed (with postgresql support), and then pass
-the DBI="yes" flag.
+and libdbi-drivers installed and pass DBI="yes" to the build script.
+
+The script now incudes an option to build with ninja.  To use this
+option, make sure ninja is installed and pass NINJA="yes" to the
+build script.
 
 NOTE:  You must remove any previous installation of Gnucash before
-running this script, otherwise the build will fail.
+running this script, otherwise the build will most likely fail.
+
+This script builds version 3.11.  If you need the old stable 2.6.x
+series, please use gnucash-legacy, also available on SBo.
+
+Please note version 3.11 will be the last for Slackware 14.2.
+Version 4.x will NOT build on 14.2 because of outdated dependencies
+(gcc, cmake, and glib2 among others).
+
+NOTE FOR CURRENT/15.0
 
-This script builds version 3.x which is now considered stable by the
-upstream developers.  If you need the old stable 2.6.x series, please
-use gnucash-legacy, also available on SBo.
+If you are building on current (15.0 EXPERIMENTAL), you will need the
+guile2.2 package from Ponce's -current repo.  Alternatively, you can
+download version 4.1 or later from the gnucash website and build that
+by passing VERSION=4.(1 or later) to the script without having to
+install guile2.2.  (Version 4.0 still requires guile2.2.)
diff --git a/office/gnucash/gnucash-boost-1.73.patch b/office/gnucash/gnucash-boost-1.73.patch
new file mode 100644
index 0000000000..ab3a015199
--- /dev/null
+++ b/office/gnucash/gnucash-boost-1.73.patch
@@ -0,0 +1,10 @@
+--- gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp.orig 2020-05-11 19:38:43.108485371 +0000
++++ gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
+@@ -34,6 +34,7 @@ extern "C" {
+ #include "gnc-commodity.h"
+ }
+
++#include <algorithm>
+ #include <string>
+ #include <vector>
+ #include <boost/optional.hpp>
diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild
index 05e1dd5e52..1257563bab 100644
--- a/office/gnucash/gnucash.SlackBuild
+++ b/office/gnucash/gnucash.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for gnucash
 
 # Copyright 2015  Trayan Denev, tdenev@gmail.com
-# This version Copyright 2018 Lenard Spencer <lspencer31@cfl.rr.com>
+# This version Copyright 2018 Lenard Spencer <lenardrspencer@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnucash
-VERSION=${VERSION:-3.8}
+VERSION=${VERSION:-3.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVERSION="${VERSION}b"
-
+PACKAGER=${PACKAGER:-"Just Another Slacker"}
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -71,7 +70,7 @@ if [ -e /usr/bin/gnucash ]; then
 fi
 
 if [ "$DBI" = "yes" ]; then
-  DBIARGS="-DWITH_SQL=ON -DGNC_DBD_DIR=/usr/lib${LIBDIRSUFFIX}/dbd/ "
+  DBIARGS="-DWITH_SQL=ON -DGNC_DBD_DIR=/usr/lib${LIBDIRSUFFIX}/dbd/"
   echo " building with SQL integration enabled"
   sleep 1
 else
@@ -79,7 +78,7 @@ else
 fi
 
 if [ "$OFX" = "yes" ]; then
-  OFXBANKING="DWITH_OFX=ON"
+  OFXBANKING="-DWITH_OFX=ON"
   echo " building with OFX enabled"
   sleep 1
 else
@@ -108,7 +107,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -117,6 +116,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 {} \;
 
+# New option to build with ninja:
+if [ "${NINJA:-no}" = "yes" ]; then
+  echo "building using Ninja:"
+  NINJABUILD="-GNinja"
+else
+  NINJABUILD=""
+fi
+
   mkdir -p build
 cd build
   cmake \
@@ -130,10 +137,16 @@ cd build
     $W_PYTHON \
     $OFXBANKING \
     $AQBANKING \
+    $NINJABUILD \
+    -DGNUCASH_BUILD_ID="$VERSION-`date -I` by $PACKAGER" \
     -DCMAKE_BUILD_TYPE=release ..
 
-make
-make -j1 install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
+if [ $NINJA = "yes" ]; then
+  DESTDIR="$PKG" ninja install
+else
+ make
+ make -j1 install DESTDIR=$PKG docdir=/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
diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info
index 964e8b4caa..c899627c28 100644
--- a/office/gnucash/gnucash.info
+++ b/office/gnucash/gnucash.info
@@ -1,8 +1,8 @@
 PRGNAM="gnucash"
-VERSION="3.8"
+VERSION="3.11"
 HOMEPAGE="http://www.gnucash.org/"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-3.8b.tar.bz2"
-MD5SUM="32f853781ad7aa2a032a482df102a77f"
+DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-3.11.tar.bz2"
+MD5SUM="391f07eb0934618154d9e9c7d717d8e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkit2gtk pygobject3-python3 gtest"
diff --git a/office/hamster/hamster.SlackBuild b/office/hamster/hamster.SlackBuild
index 4795941492..fb9acdfd23 100644
--- a/office/hamster/hamster.SlackBuild
+++ b/office/hamster/hamster.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for Hamster - The Gnome Time Tracker
 #
-# Copyright 2016 Marek Srejma (sam_web@yahoo.de)
+# Copyright 2016-2020 Marek Srejma (sam_web@yahoo.de)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hamster
-VERSION=${VERSION:-1.04}
+VERSION=${VERSION:-3.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCHIVE="hamster-time-tracker-$VERSION"
-
 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 $PRGNAM-$ARCHIVE
-tar xvf $CWD/$PRGNAM-$ARCHIVE.tar.gz || tar xvf $CWD/$ARCHIVE.tar.gz
-cd $PRGNAM-$ARCHIVE
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
@@ -83,7 +81,7 @@ DESTDIR=$PKG \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING MAINTAINERS NEWS README.textile TODO \
+  AUTHORS COPYING MAINTAINERS NEWS.md README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/office/hamster/hamster.info b/office/hamster/hamster.info
index 7003f8b396..6bd813e0e8 100644
--- a/office/hamster/hamster.info
+++ b/office/hamster/hamster.info
@@ -1,10 +1,10 @@
 PRGNAM="hamster"
-VERSION="1.04"
+VERSION="3.0.2"
 HOMEPAGE="http://projecthamster.org/"
-DOWNLOAD="https://github.com/projecthamster/hamster/archive/hamster-time-tracker-1.04.tar.gz"
-MD5SUM="148ffee0c26c5c4ddfa4ebc9a21fa860"
+DOWNLOAD="https://github.com/projecthamster/hamster/archive/v3.0.2/hamster-3.0.2.tar.gz"
+MD5SUM="1c229c304cc0aae85f02c72a4e27d66a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gnome-python2-gconf pyxdg"
+REQUIRES="pygobject3-python3 dbus-python3 pyxdg"
 MAINTAINER="Marek Srejma"
 EMAIL="sam_web@yahoo.de"
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/htmldoc/htmldoc.SlackBuild b/office/htmldoc/htmldoc.SlackBuild
index f88d47c057..4cd6246b80 100644
--- a/office/htmldoc/htmldoc.SlackBuild
+++ b/office/htmldoc/htmldoc.SlackBuild
@@ -29,9 +29,18 @@
 # Feb 01 2017: Alfredo
 # Update script for html-1.8.29, fix the problem with /usr/share/htmldoc/data
 # not being copied into the package
+#
+#
+# May 01 2020: organixpear
+# Update script for htmldoc-1.9.8
+# This was a needed update as htmldoc-1.8.29 was 3 years out of date
+# and the build would fail on recent versions (current) of Slackware.
+# gnutls support was also found to be working in htmldoc-1.9.8 so
+# support was added. Misc updates and cleanups to install commands.
+#
 
 PRGNAM=htmldoc
-VERSION=${VERSION:-1.8.29}
+VERSION=${VERSION:-1.9.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,7 +57,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="CHANGES.txt README.txt COMPILE.txt COPYING.txt htmldoc.readme"
+DOCFILES="CHANGES.md README.md COPYING"
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -70,7 +79,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION-source.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -113,22 +122,14 @@ make all
 # Copy some files who are not automatically installed (main binary, .desktop, icons, etc..)
 mkdir -p $PKG/usr/bin
 install -m 755 htmldoc/$PRGNAM $PKG/usr/bin
-mkdir -p $PKG/usr/man/man1
-cp -a doc/$PRGNAM.1 $PKG/usr/man/man1
 mkdir -p $PKG/usr/share/applications
 cp -a desktop/$PRGNAM.desktop $PKG/usr/share/applications
-mkdir -p $PKG/usr/share/mimelnk/application
-cp -a desktop/vnd.htmldoc-book.desktop $PKG/usr/share/mimelnk/application
 mkdir -p $PKG/usr/share/mime/packages
 cp -a desktop/htmldoc.xml $PKG/usr/share/mime/packages
-mkdir -p $PKG/usr/share/icons/hicolor/{16x16,24x24,32x32,48x48,64x64,96x96,128x128}/apps/
-cp -a desktop/htmldoc-16.png $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png
-cp -a desktop/htmldoc-24.png $PKG/usr/share/icons/hicolor/24x24/apps/$PRGNAM.png
+mkdir -p $PKG/usr/share/icons/hicolor/{16x16,24x24,32x32,48x48,64x64,96x96,128x128,256x256}/apps/
 cp -a desktop/htmldoc-32.png $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
-cp -a desktop/htmldoc-48.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
-cp -a desktop/htmldoc-64.png $PKG/usr/share/icons/hicolor/64x64/apps/$PRGNAM.png
-cp -a desktop/htmldoc-96.png $PKG/usr/share/icons/hicolor/96x96/apps/$PRGNAM.png
 cp -a desktop/htmldoc-128.png $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png
+cp -a desktop/htmldoc-256.png $PKG/usr/share/icons/hicolor/256x256/apps/$PRGNAM.png
 mkdir -p $PKG/usr/share/htmldoc/
 cp -a fonts  $PKG/usr/share/htmldoc/
 cp -a data  $PKG/usr/share/htmldoc/
@@ -137,7 +138,6 @@ cp -a data  $PKG/usr/share/htmldoc/
 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 . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 # Just in case ..
diff --git a/office/htmldoc/htmldoc.info b/office/htmldoc/htmldoc.info
index 5bdd183509..310daf33e4 100644
--- a/office/htmldoc/htmldoc.info
+++ b/office/htmldoc/htmldoc.info
@@ -1,8 +1,8 @@
 PRGNAM="htmldoc"
-VERSION="1.8.29"
+VERSION="1.9.8"
 HOMEPAGE="https://www.msweet.org/htmldoc/index.html"
-DOWNLOAD="http://www.mirrorservice.org/sites/distfiles.finkmirrors.net/md5/dd2a05e2608d4f34db13c17a6667bb5e/htmldoc-1.8.29-source.tar.bz2"
-MD5SUM="dd2a05e2608d4f34db13c17a6667bb5e"
+DOWNLOAD="https://github.com/michaelrsweet/htmldoc/releases/download/v1.9.8/htmldoc-1.9.8-source.tar.gz"
+MD5SUM="71c7d0dd3b4e01cfc9b9e932b8b58f01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
diff --git a/office/hunspell-de/hunspell-de.SlackBuild b/office/hunspell-de/hunspell-de.SlackBuild
index c0f2fb9646..50cc3a5bf2 100644
--- a/office/hunspell-de/hunspell-de.SlackBuild
+++ b/office/hunspell-de/hunspell-de.SlackBuild
@@ -58,7 +58,7 @@ cd hunspell
     for file in $PKGDIR/usr/share/hunspell/*; do
       ln -sv ../../hunspell/$(basename $file) .
     done
-  cd ..
+  cd -
 cd ..
 
 mkdir $PKG/install
diff --git a/office/impressive/impressive.SlackBuild b/office/impressive/impressive.SlackBuild
index 61651c7e5c..be8a20dcd3 100644
--- a/office/impressive/impressive.SlackBuild
+++ b/office/impressive/impressive.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for impressive
 
 # Copyright 2010 Binh Nguyen <binhvng@gmail.com>
-# Copyright 2015-2018 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2015-2018,2020 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=impressive
 SRCNAM=Impressive
-VERSION=${VERSION:-0.12.0}
+VERSION=${VERSION:-0.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/impressive/impressive.info b/office/impressive/impressive.info
index 98d7aa7fbb..f322d5a9b6 100644
--- a/office/impressive/impressive.info
+++ b/office/impressive/impressive.info
@@ -1,8 +1,8 @@
 PRGNAM="impressive"
-VERSION="0.12.0"
+VERSION="0.12.1"
 HOMEPAGE="http://impressive.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/impressive/files/Impressive/0.12.0/Impressive-0.12.0.tar.gz"
-MD5SUM="743bd446a3cb2712a09b7471529c5139"
+DOWNLOAD="https://sourceforge.net/projects/impressive/files/Impressive/0.12.1/Impressive-0.12.1.tar.gz"
+MD5SUM="05f997d27dd183d9da38439787cdb736"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pygame pilkit"
diff --git a/office/keepassxc/README b/office/keepassxc/README
index 5c7494d7b6..ab9f3501dd 100644
--- a/office/keepassxc/README
+++ b/office/keepassxc/README
@@ -20,6 +20,9 @@ running agent. This may be disabled by passing SSHAGENT=OFF to the script.
 Networking support, allowing website favicons to be downloaded, is enabled by
 default. This maybe disabled by passing NETWORKING=OFF to the script.
 
+To include documentation, rubygem-asciidoctor must be installed and DOCS=ON
+must be passed to the script.
+
 Support for database sharing and synchronisation using KeeShare will be
 disabled. It can be enabled by setting KEESHARE=ON, or a secure version can be
 enabled with KEESHARE_SECURE=ON, providing libraries/quazip-qt5 is installed.
diff --git a/office/keepassxc/keepassxc.SlackBuild b/office/keepassxc/keepassxc.SlackBuild
index 20ab755d1d..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.5.3}
+VERSION=${VERSION:-2.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,12 +74,14 @@ cd build
   export LDFLAGS="-ltermcap"
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release \
     -DWITH_TESTS=OFF \
     -DWITH_XC_BROWSER=${BROWSER:-ON} \
     -DWITH_XC_YUBIKEY=${YUBIKEY:-OFF} \
     -DWITH_XC_NETWORKING=${NETWORKING:-ON} \
     -DWITH_XC_AUTOTYPE=${AUTOTYPE:-ON} \
+    -DWITH_XC_DOCS=${DOCS:-OFF} \
     -DWITH_XC_SSHAGENT=${SSHAGENT:-ON} \
     -DWITH_XC_KEESHARE=${KEESHARE:-OFF} \
     -DWITH_XC_KEESHARE_SECURE=${KEESHARE_SECURE:-OFF} \
@@ -93,9 +95,10 @@ 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
+if [ "$DOCS" = "ON" ]; then
+  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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/office/keepassxc/keepassxc.info b/office/keepassxc/keepassxc.info
index 349f81bae3..1569fdc32c 100644
--- a/office/keepassxc/keepassxc.info
+++ b/office/keepassxc/keepassxc.info
@@ -1,8 +1,8 @@
 PRGNAM="keepassxc"
-VERSION="2.5.3"
+VERSION="2.6.4"
 HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
-DOWNLOAD="https://github.com/keepassxreboot/keepassxc/releases/download/2.5.3/keepassxc-2.5.3-src.tar.xz"
-MD5SUM="ac7ad8bec58366fe1e9f21ac7d7fe208"
+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/krop/krop.SlackBuild b/office/krop/krop.SlackBuild
index 9c49d8e7cd..44aaf0fd21 100644
--- a/office/krop/krop.SlackBuild
+++ b/office/krop/krop.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for krop
 
-# Copyright 2018, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2018-2020, 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=krop
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,8 +81,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/share/applications
 install -m 0644 -o root -g root krop.desktop $PKG/usr/share/applications/
 
-mkdir -p $PKG/usr/man/man1
-gzip -c9 krop.1 > $PKG/usr/man/man1/krop.1.gz
+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
 cp -a ChangeLog README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/office/krop/krop.info b/office/krop/krop.info
index 27b6f3f9de..766a235fbe 100644
--- a/office/krop/krop.info
+++ b/office/krop/krop.info
@@ -1,8 +1,8 @@
 PRGNAM="krop"
-VERSION="0.5.1"
+VERSION="0.6.0"
 HOMEPAGE="http://arminstraub.com/computer/krop"
-DOWNLOAD="https://github.com/arminstraub/krop/archive/v0.5.1/krop-0.5.1.tar.gz"
-MD5SUM="ce3043ce29462d89c69e37d08097ab73"
+DOWNLOAD="https://github.com/arminstraub/krop/archive/v0.6.0/krop-0.6.0.tar.gz"
+MD5SUM="8bf9e9d64a4f7b749980a14dc699f96a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-poppler-qt4 PyPDF2"
diff --git a/office/latexdiff/latexdiff.SlackBuild b/office/latexdiff/latexdiff.SlackBuild
index 61ffae61d2..cf7ca6c9ce 100644
--- a/office/latexdiff/latexdiff.SlackBuild
+++ b/office/latexdiff/latexdiff.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for latexdiff
 
-# Copyright 2018 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=latexdiff
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.3.1.1}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/office/latexdiff/latexdiff.info b/office/latexdiff/latexdiff.info
index eb10f1d567..7756e6662b 100644
--- a/office/latexdiff/latexdiff.info
+++ b/office/latexdiff/latexdiff.info
@@ -1,8 +1,8 @@
 PRGNAM="latexdiff"
-VERSION="1.3.0"
+VERSION="1.3.1.1"
 HOMEPAGE="https://www.ctan.org/tex-archive/support/latexdiff"
-DOWNLOAD="https://github.com/ftilmann/latexdiff/releases/download/1.3.0/latexdiff-1.3.0.tar.gz"
-MD5SUM="b8cdd944ad6c459c78a9ec75cfb0b3c2"
+DOWNLOAD="https://github.com/ftilmann/latexdiff/releases/download/1.3.1.1/latexdiff-1.3.1.1.tar.gz"
+MD5SUM="1f1b3f8ace259e24e0c3d8cad5f85dc6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/libreoffice-helppack/libreoffice-helppack.SlackBuild b/office/libreoffice-helppack/libreoffice-helppack.SlackBuild
index a63d864b86..d647b7ce5a 100644
--- a/office/libreoffice-helppack/libreoffice-helppack.SlackBuild
+++ b/office/libreoffice-helppack/libreoffice-helppack.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libreoffice-helppack
-VERSION=${VERSION:-"6.2.8"}
+VERSION=${VERSION:-"6.2.8.2"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/libreoffice-helppack/libreoffice-helppack.info b/office/libreoffice-helppack/libreoffice-helppack.info
index d2087a8417..fe86cacdb6 100644
--- a/office/libreoffice-helppack/libreoffice-helppack.info
+++ b/office/libreoffice-helppack/libreoffice-helppack.info
@@ -1,9 +1,9 @@
 PRGNAM="libreoffice-helppack"
-VERSION="6.2.8"
+VERSION="6.2.8.2"
 HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/stable/6.2.8/rpm/x86/LibreOffice_6.2.8_Linux_x86_rpm_helppack_en-US.tar.gz"
+DOWNLOAD="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86/LibreOffice_6.2.8.2_Linux_x86_rpm_helppack_en-US.tar.gz"
 MD5SUM="49d2053569e09f1069ba100a073110d9"
-DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/6.2.8/rpm/x86_64/LibreOffice_6.2.8_Linux_x86-64_rpm_helppack_en-US.tar.gz"
+DOWNLOAD_x86_64="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86_64/LibreOffice_6.2.8.2_Linux_x86-64_rpm_helppack_en-US.tar.gz"
 MD5SUM_x86_64="dd505c6bd07187996a18d09f90e6432c"
 REQUIRES="libreoffice"
 MAINTAINER="Willy Sudiarto Raharjo"
diff --git a/office/libreoffice-langpack/libreoffice-langpack.SlackBuild b/office/libreoffice-langpack/libreoffice-langpack.SlackBuild
index b7a6fccfde..eba42bbf82 100644
--- a/office/libreoffice-langpack/libreoffice-langpack.SlackBuild
+++ b/office/libreoffice-langpack/libreoffice-langpack.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libreoffice-langpack
-VERSION=${VERSION:-"6.2.8"}
+VERSION=${VERSION:-"6.2.8.2"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/libreoffice-langpack/libreoffice-langpack.info b/office/libreoffice-langpack/libreoffice-langpack.info
index 93148319d1..b7b91b6f57 100644
--- a/office/libreoffice-langpack/libreoffice-langpack.info
+++ b/office/libreoffice-langpack/libreoffice-langpack.info
@@ -1,9 +1,9 @@
 PRGNAM="libreoffice-langpack"
-VERSION="6.2.8"
+VERSION="6.2.8.2"
 HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/stable/6.2.8/rpm/x86/LibreOffice_6.2.8_Linux_x86_rpm_langpack_en-GB.tar.gz"
+DOWNLOAD="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86/LibreOffice_6.2.8.2_Linux_x86_rpm_langpack_en-GB.tar.gz"
 MD5SUM="6fb9c1631dbef66750babdeb3cfed2fe"
-DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/6.2.8/rpm/x86_64/LibreOffice_6.2.8_Linux_x86-64_rpm_langpack_en-GB.tar.gz"
+DOWNLOAD_x86_64="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86_64/LibreOffice_6.2.8.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz"
 MD5SUM_x86_64="82ce56931e08b4e77e237c0fd0bf66f4"
 REQUIRES="libreoffice"
 MAINTAINER="Willy Sudiarto Raharjo"
diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild
index bdfac642bc..0c1463eb07 100644
--- a/office/libreoffice/libreoffice.SlackBuild
+++ b/office/libreoffice/libreoffice.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libreoffice
-VERSION=${VERSION:-"6.2.8"}
+VERSION=${VERSION:-"6.2.8.2"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info
index e048811604..c0d1a7097a 100644
--- a/office/libreoffice/libreoffice.info
+++ b/office/libreoffice/libreoffice.info
@@ -1,9 +1,9 @@
 PRGNAM="libreoffice"
-VERSION="6.2.8"
+VERSION="6.2.8.2"
 HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/stable/6.2.8/rpm/x86/LibreOffice_6.2.8_Linux_x86_rpm.tar.gz"
+DOWNLOAD="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86/LibreOffice_6.2.8.2_Linux_x86_rpm.tar.gz"
 MD5SUM="501a1d2e0cd3c0a52619ccddb722567a"
-DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/6.2.8/rpm/x86_64/LibreOffice_6.2.8_Linux_x86-64_rpm.tar.gz"
+DOWNLOAD_x86_64="https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.8.2/rpm/x86_64/LibreOffice_6.2.8.2_Linux_x86-64_rpm.tar.gz"
 MD5SUM_x86_64="aa1935b21c06f4fd4abf864eb0d2c7a0"
 REQUIRES="jdk avahi"
 MAINTAINER="Willy Sudiarto Raharjo"
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/lowdown/slack-desc b/office/lowdown/slack-desc
index 94b9881419..d876040958 100644
--- a/office/lowdown/slack-desc
+++ b/office/lowdown/slack-desc
@@ -16,3 +16,4 @@ lowdown: at lowdown(3).
 lowdown:
 lowdown: Homepage: https://github.com/Symbian9/lowdown
 lowdown:
+lowdown:
diff --git a/office/lumina-calculator/lumina-calculator.SlackBuild b/office/lumina-calculator/lumina-calculator.SlackBuild
index 949ab395d9..30a0f36fb9 100644
--- a/office/lumina-calculator/lumina-calculator.SlackBuild
+++ b/office/lumina-calculator/lumina-calculator.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lumina-calculator
 
-# Copyright 2019 Chris Abela, Malta
+# Copyright 2019, 2020 Chris Abela, Malta
 # 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=lumina-calculator
-VERSION=${VERSION:-1.5.0_20190822}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.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/office/lumina-calculator/lumina-calculator.info b/office/lumina-calculator/lumina-calculator.info
index 93d9ba3da8..b3e42a4199 100644
--- a/office/lumina-calculator/lumina-calculator.info
+++ b/office/lumina-calculator/lumina-calculator.info
@@ -1,8 +1,8 @@
 PRGNAM="lumina-calculator"
-VERSION="1.5.0_20190822"
+VERSION="1.6.0"
 HOMEPAGE="https://github.com/lumina-desktop/lumina-calculator"
-DOWNLOAD="https://gitlab.com/chrisabela/downloads/raw/master/lumina-calculator-1.5.0_20190822.tar.gz"
-MD5SUM="048179c887d78c1ed907655a27a217fd"
+DOWNLOAD="https://github.com/lumina-desktop/lumina-calculator/archive/v1.6.0/lumina-calculator-1.6.0.tar.gz"
+MD5SUM="320996336e910e2626c5523111ed817f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/office/lumina-pdf/lumina-pdf.SlackBuild b/office/lumina-pdf/lumina-pdf.SlackBuild
index e15f0c2339..b4855dc338 100644
--- a/office/lumina-pdf/lumina-pdf.SlackBuild
+++ b/office/lumina-pdf/lumina-pdf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lumina-pdf
 
-# Copyright 2019 Chris Abela, Malta
+# Copyright 2019, 2020 Chris Abela, Malta
 # 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=lumina-pdf
-VERSION=${VERSION:-1.5.0_20190822}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,7 +62,7 @@ cd $TMP
 rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 patch -p0 <$CWD/lumina-pdf.patch
-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/office/lumina-pdf/lumina-pdf.info b/office/lumina-pdf/lumina-pdf.info
index 24a62a65c0..b1b7011550 100644
--- a/office/lumina-pdf/lumina-pdf.info
+++ b/office/lumina-pdf/lumina-pdf.info
@@ -1,8 +1,8 @@
 PRGNAM="lumina-pdf"
-VERSION="1.5.0_20190822"
+VERSION="1.6.0"
 HOMEPAGE="https://github.com/lumina-desktop/lumina-pdf/"
-DOWNLOAD="https://gitlab.com/chrisabela/downloads/raw/master/lumina-pdf-1.5.0_20190822.tar.gz"
-MD5SUM="e3b07bb0812f97973767e7c09f1df54c"
+DOWNLOAD="https://github.com/lumina-desktop/lumina-pdf/archive/v1.6.0/lumina-pdf-1.6.0.tar.gz"
+MD5SUM="725a2b37775b6fb36b8653e86b5442d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="poppler-qt5"
diff --git a/office/lumina-pdf/lumina-pdf.patch b/office/lumina-pdf/lumina-pdf.patch
index 6e78576c07..0e3fd5c5fa 100644
--- a/office/lumina-pdf/lumina-pdf.patch
+++ b/office/lumina-pdf/lumina-pdf.patch
@@ -1,23 +1,12 @@
-diff -Naur lumina-pdf/src-qt5/Renderer-poppler.cpp lumina-pdf-patched/src-qt5/Renderer-poppler.cpp
---- lumina-pdf/src-qt5/Renderer-poppler.cpp	2019-08-21 11:46:01.653515619 +0000
-+++ lumina-pdf-patched/src-qt5/Renderer-poppler.cpp	2019-08-23 10:54:36.334600721 +0000
-@@ -70,7 +70,7 @@
-     } // invalid password
-   }
+diff -Naur lumina-pdf-1.6.0/src-qt5/Renderer-poppler.cpp lumina-pdf-1.6.0-patched/src-qt5/Renderer-poppler.cpp
+--- lumina-pdf-1.6.0/src-qt5/Renderer-poppler.cpp	2020-02-04 20:56:36.000000000 +0100
++++ lumina-pdf-1.6.0-patched/src-qt5/Renderer-poppler.cpp	2020-05-18 13:34:31.211851748 +0200
+@@ -72,7 +72,7 @@
+   DOC->setRenderHint(Poppler::Document::Antialiasing);
+   DOC->setRenderHint(Poppler::Document::TextAntialiasing);
    // qDebug() << "Opening File:" << path;
 -  doctitle = DOC->title();
 +  // doctitle = DOC->title();
    if (doctitle.isEmpty()) {
      doctitle = path.section("/", -1);
    }
-diff -Naur lumina-pdf/src-qt5/drawablepage.h lumina-pdf-patched/src-qt5/drawablepage.h
---- lumina-pdf/src-qt5/drawablepage.h	2019-08-21 11:46:01.653515619 +0000
-+++ lumina-pdf-patched/src-qt5/drawablepage.h	2019-08-23 10:48:00.544733374 +0000
-@@ -4,6 +4,7 @@
- #include <QImage>
- #include <QSize>
- #include <poppler/qt5/poppler-qt5.h>
-+#include <memory>
- 
- namespace LuminaPDF {
- 
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 011478333c..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.4.3}
+VERSION=${VERSION:-2.3.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/lyx/lyx.info b/office/lyx/lyx.info
index 743d56e9d9..5bc29cbd91 100644
--- a/office/lyx/lyx.info
+++ b/office/lyx/lyx.info
@@ -1,8 +1,8 @@
 PRGNAM="lyx"
-VERSION="2.3.4.3"
+VERSION="2.3.6.1"
 HOMEPAGE="http://www.lyx.org"
-DOWNLOAD="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/lyx-2.3.4.3.tar.xz"
-MD5SUM="60616e3e0e6dd8b63fe1c13853c86330"
+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=""
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/mate-calc/slack-desc b/office/mate-calc/slack-desc
index f177ac4ddd..72bfd115c6 100644
--- a/office/mate-calc/slack-desc
+++ b/office/mate-calc/slack-desc
@@ -5,7 +5,7 @@
 # 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------------------------------------------------------|         
+         |-----handy-ruler------------------------------------------------------|
 mate-calc: mate-calc (calculator for the MATE desktop)
 mate-calc:
 mate-calc: mate-calc is a fork of gnome-calc, a calculator application for
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/mtp2-fonts/mtp2-fonts.SlackBuild b/office/mtp2-fonts/mtp2-fonts.SlackBuild
index b4429c26c0..dc76fa06fb 100644
--- a/office/mtp2-fonts/mtp2-fonts.SlackBuild
+++ b/office/mtp2-fonts/mtp2-fonts.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mtp2-fonts
 
-# Copyright 2017, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=mtp2-fonts
 VERSION=${VERSION:-2.1a}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -55,6 +55,11 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 rm -r texmf/dvips
+
+sed --in-place \
+  -e 's/^\\alloc@0\\count\\countdef\\insc@unt/\\newcount/' \
+  texmf/tex/latex/mtpro2/mtpro2.sty
+
 find . \
  \( -name "*.txt" -o -name "*.tex" -o -name "*.fd" -o -name "*.map" \
   -o -name "*.sty" -o -name "*.tpm" \) -exec sed -i 's/\r$//' {} \;
diff --git a/office/mtp2-fonts/mtp2-fonts.info b/office/mtp2-fonts/mtp2-fonts.info
index 64a73176cd..35257db40a 100644
--- a/office/mtp2-fonts/mtp2-fonts.info
+++ b/office/mtp2-fonts/mtp2-fonts.info
@@ -1,6 +1,6 @@
 PRGNAM="mtp2-fonts"
 VERSION="2.1a"
-HOMEPAGE="http://pctex.com/mtpro2.html"
+HOMEPAGE="https://pctex.com/mtpro2.html"
 DOWNLOAD="http://mirrors.ctan.org/fonts/mtp2lite.zip"
 MD5SUM="afd69b0d82ec8b32b7b012e5cfcd7d00"
 DOWNLOAD_x86_64=""
diff --git a/office/mtp2-fonts/slack-desc b/office/mtp2-fonts/slack-desc
index 58f93e53d5..6656d08ebf 100644
--- a/office/mtp2-fonts/slack-desc
+++ b/office/mtp2-fonts/slack-desc
@@ -16,4 +16,4 @@ mtp2-fonts: consists of 15 fonts and replaces the Computer Modern math fonts. Th
 mtp2-fonts: complete set consists of 68 fonts and provides also script, curly,
 mtp2-fonts: Fraktur, bold math, blackboard bold fonts, and AMS symbols.
 mtp2-fonts:
-mtp2-fonts: Homepage: http://pctex.com/mtpro2.html
+mtp2-fonts: Homepage: https://pctex.com/mtpro2.html
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 106e797816..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-2019, 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:-5.4.2}
+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 6cf78e42d3..6aba4bfbd6 100644
--- a/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info
+++ b/office/onlyoffice-desktopeditors/onlyoffice-desktopeditors.info
@@ -1,10 +1,10 @@
 PRGNAM="onlyoffice-desktopeditors"
-VERSION="5.4.2"
+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-5.4.2/onlyoffice-desktopeditors_amd64.deb"
-MD5SUM_x86_64="f30bd45bf836f13e2ae35c682b95568c"
+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 6a079f58ec..c9bd8189e7 100644
--- a/office/pandoc-bin/README
+++ b/office/pandoc-bin/README
@@ -1,36 +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
+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
 HTML formats
-    XHTML, HTML5, and HTML slide shows using Slidy, reveal.js, Slideous, S5, or DZSlides
+  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.
+  Microsoft Word docx, OpenOffice/LibreOffice ODT, OpenDocument XML,
+  Microsoft PowerPoint.
 Ebooks
-    EPUB version 2 or 3, FictionBook2
+  EPUB version 2 or 3, FictionBook2
 Documentation formats
-    DocBook version 4 or 5, TEI Simple, GNU TexInfo, roff man, roff ms, Haddock markup
+  DocBook version 4 or 5, TEI Simple, GNU TexInfo, roff man, roff ms,
+  Haddock markup
 Archival formats
-    JATS
+  JATS
 Page layout formats
-    InDesign ICML
+  InDesign ICML
 Outline formats
-    OPML
+  OPML
 TeX formats
-    LaTeX, ConTeXt, LaTeX Beamer slides
+  LaTeX, ConTeXt, LaTeX Beamer slides
 PDF
-    via pdflatex, xelatex, lualatex, pdfroff, wkhtml2pdf, prince, or weasyprint.
+  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.
+  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)
+  Jupyter notebook (ipynb)
 Custom formats
-    custom writers can be written in lua.
+  custom writers can be written in lua.
 
 NOTE:
 This slackbuild repackages the official binary from the Pandoc GitHub.
-There are no additional dependencies.
\ No newline at end of file
+There are no additional dependencies.
diff --git a/office/pandoc-bin/pandoc-bin.SlackBuild b/office/pandoc-bin/pandoc-bin.SlackBuild
index 94f0bcaea4..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.9.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 f9936b8d2a..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.9.2"
+VERSION="2.13"
 HOMEPAGE="https://github.com/jgm/pandoc"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/jgm/pandoc/releases/download/2.9.2/pandoc-2.9.2-linux-amd64.tar.gz"
-MD5SUM_x86_64="85ee68f2fec31eb6829dabce3b1d8a8f"
+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/pdf2djvu/pdf2djvu.SlackBuild b/office/pdf2djvu/pdf2djvu.SlackBuild
index b824453984..821cfa8983 100644
--- a/office/pdf2djvu/pdf2djvu.SlackBuild
+++ b/office/pdf2djvu/pdf2djvu.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pdf2djvu
-VERSION=${VERSION:-0.9.10}
+VERSION=${VERSION:-0.9.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/pdf2djvu/pdf2djvu.info b/office/pdf2djvu/pdf2djvu.info
index da282fd4ef..950ac20572 100644
--- a/office/pdf2djvu/pdf2djvu.info
+++ b/office/pdf2djvu/pdf2djvu.info
@@ -1,8 +1,8 @@
 PRGNAM="pdf2djvu"
-VERSION="0.9.10"
+VERSION="0.9.17.1"
 HOMEPAGE="https://jwilk.net/software/pdf2djvu"
-DOWNLOAD="https://github.com/jwilk/pdf2djvu/releases/download/0.9.10/pdf2djvu-0.9.10.tar.xz"
-MD5SUM="ffe447f9261e27353d101243788f863f"
+DOWNLOAD="https://github.com/jwilk/pdf2djvu/releases/download/0.9.17.1/pdf2djvu-0.9.17.1.tar.xz"
+MD5SUM="fd803adb96319b39e38392d6d5415142"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nose GraphicsMagick"
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/pdfjam/slack-desc b/office/pdfjam/slack-desc
deleted file mode 100644
index 8f35a106b2..0000000000
--- a/office/pdfjam/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------------------------------------------------------|
-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:
diff --git a/office/pdfstudio/README b/office/pdfstudio/README
index 23ae686cd2..f3e5937d08 100644
--- a/office/pdfstudio/README
+++ b/office/pdfstudio/README
@@ -23,7 +23,7 @@ Key features of PDF Studio:
  * Supports the new PDF 2.0 standards
  * Interactive Form Designer
  * OCR (Text Recognition)
- * Inline text content editing with reflow
+ * Content Editing (Text and Images)
  * Redact & Sanitize PDFs
  * Compare PDFs
  * Optimize PDFs
@@ -32,6 +32,7 @@ Key features of PDF Studio:
  * Batch Process Multiple PDFs
  * Tag PDFs for Accessibility (PDF/UA)
  * PDF/A Validation / Conversion
+ * Advanced Imposition & Printer
 
 By default PDF Studio uses the system-wide Java.
 
@@ -40,6 +41,3 @@ OWNJAVA=yes ./pdfstudio.SlackBuild
 a version of Java that comes packaged with PDF Studio will be installed
 under the PDF Studio installation directory, this Java will not be used
 by other programs.
-
-NOTE: The license of the sources don't permit free distribution, so sources
-must be coming from upstream project.
diff --git a/office/pdfstudio/pdfstudio.SlackBuild b/office/pdfstudio/pdfstudio.SlackBuild
index 4bbf929e60..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:-2019.2.1}
+VERSION=${VERSION:-2020.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 YEAR=${VERSION:0:4}
@@ -69,7 +69,6 @@ MimeType=application/pdf;" \
 > usr/share/applications/${PRGNAM}${YEAR}.desktop
 
 mkdir -p usr/doc/$PRGNAM-$VERSION
-cp $CWD/pdfstudio${YEAR}_userguide.pdf usr/doc/$PRGNAM-$VERSION/
 
 if [ "${OWNJAVA:-no}" = "yes" ]; then
   cd opt/pdfstudio${YEAR}/jre
diff --git a/office/pdfstudio/pdfstudio.info b/office/pdfstudio/pdfstudio.info
index 4c8531996a..c037064411 100644
--- a/office/pdfstudio/pdfstudio.info
+++ b/office/pdfstudio/pdfstudio.info
@@ -1,14 +1,10 @@
 PRGNAM="pdfstudio"
-VERSION="2019.2.1"
+VERSION="2020.4.0"
 HOMEPAGE="https://www.qoppa.com/pdfstudio/"
-DOWNLOAD="https://download.qoppa.com/pdfstudio/v2019/PDFStudio_v2019_2_1_linux.deb \
-          https://www.qoppa.com/files/pdfstudio/guide/pdfstudio2019_userguide.pdf"
-MD5SUM="436780c67c167e0fca61ceaf6810f772 \
-        00449a6878d69dfea660ff210ecfe119"
-DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudio/v2019/PDFStudio_v2019_2_1_linux64.deb \
-                 https://www.qoppa.com/files/pdfstudio/guide/pdfstudio2019_userguide.pdf"
-MD5SUM_x86_64="c390819d30b1c9ce86bd3c74bb274acf \
-               00449a6878d69dfea660ff210ecfe119"
-REQUIRES="jdk %README%"
+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/README b/office/pdfstudioviewer/README
index 97ff7b3bc4..250390b3ff 100644
--- a/office/pdfstudioviewer/README
+++ b/office/pdfstudioviewer/README
@@ -24,6 +24,3 @@ OWNJAVA=yes ./pdfstudioviewer.SlackBuild
 a version of Java that comes packaged with PDF Studio Viewer will be
 installed under the PDF Studio Viewer installation directory, this Java
 will not be used by other programs.
-
-NOTE: The license of the sources don't permit free distribution, so
-sources must be coming from upstream project.
diff --git a/office/pdfstudioviewer/pdfstudioviewer.SlackBuild b/office/pdfstudioviewer/pdfstudioviewer.SlackBuild
index 79f3631819..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:-2019.2.1}
+VERSION=${VERSION:-2020.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 YEAR=${VERSION:0:4}
@@ -69,7 +69,6 @@ MimeType=application/pdf;" \
 > usr/share/applications/${PRGNAM}${YEAR}.desktop
 
 mkdir -p usr/doc/$PRGNAM-$VERSION
-cp $CWD/pdfstudioviewer${YEAR}_userguide.pdf usr/doc/$PRGNAM-$VERSION/
 
 if [ "${OWNJAVA:-no}" = "yes" ]; then
   cd opt/pdfstudioviewer${YEAR}/jre
diff --git a/office/pdfstudioviewer/pdfstudioviewer.info b/office/pdfstudioviewer/pdfstudioviewer.info
index c289cbad63..2099167cae 100644
--- a/office/pdfstudioviewer/pdfstudioviewer.info
+++ b/office/pdfstudioviewer/pdfstudioviewer.info
@@ -1,14 +1,10 @@
 PRGNAM="pdfstudioviewer"
-VERSION="2019.2.1"
+VERSION="2020.4.0"
 HOMEPAGE="https://www.qoppa.com/pdfstudioviewer/"
-DOWNLOAD="https://download.qoppa.com/pdfstudioviewer/v2019/PDFStudioViewer_v2019_2_1_linux.deb \
-          https://www.qoppa.com/files/pdfstudioviewer/guide/pdfstudioviewer2019_userguide.pdf"
-MD5SUM="442a3ad85f67db0efb3bdc44f39b592d \
-        3db108d0e85311d6ed598a610f7de59e"
-DOWNLOAD_x86_64="https://download.qoppa.com/pdfstudioviewer/v2019/PDFStudioViewer_v2019_2_1_linux64.deb \
-                 https://www.qoppa.com/files/pdfstudioviewer/guide/pdfstudioviewer2019_userguide.pdf"
-MD5SUM_x86_64="3e063a0588bdda6b98c27ef80bf3ca0f \
-               3db108d0e85311d6ed598a610f7de59e"
+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/plover/README b/office/plover/README
new file mode 100644
index 0000000000..f54d2b900a
--- /dev/null
+++ b/office/plover/README
@@ -0,0 +1,10 @@
+Plover (rhymes with "lover") is a desktop application that allows
+anyone to use stenography to write on their computer, up to speeds of
+200WPM and beyond.
+
+Plover is part of the Open Steno Project. The Open Steno Project's
+goal is to provide everything you need to learn machine shorthand
+on your own, from free software, to cheap hardware, to learning
+resources.
+
+Plover is GPLv2+ as of version 3.1.0. See the license for details.
diff --git a/office/plover/doinst.sh b/office/plover/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/office/plover/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/plover/plover.SlackBuild b/office/plover/plover.SlackBuild
new file mode 100644
index 0000000000..b793a75144
--- /dev/null
+++ b/office/plover/plover.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Slackware build script for plover
+
+# Copyright 2020 Alan Aversa 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=plover
+VERSION=${VERSION:-4.0.0.dev8.66.g685bd33}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=${ARCH:-$(uname -m)}
+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
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cp $CWD/$PRGNAM-$VERSION-x86_64.AppImage $PRGNAM-$VERSION/$PRGNAM
+cd $PRGNAM-$VERSION
+chown -R root:root $PRGNAM
+chmod 755 $PRGNAM
+
+mkdir -p $PKG/usr/bin
+mv $PRGNAM $PKG/usr/bin/
+
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/usr/share/pixmaps
+cp $CWD/$PRGNAM.png $PKG/usr/share/pixmaps
+
+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/plover/plover.desktop b/office/plover/plover.desktop
new file mode 100644
index 0000000000..519ee5da65
--- /dev/null
+++ b/office/plover/plover.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Plover
+GenericName=Stenography
+Comment=Plover stenotype engine
+Icon=plover
+Exec=plover
+TryExec=Plover
+Terminal=false
+Type=Application
+Categories=Office;
diff --git a/office/plover/plover.info b/office/plover/plover.info
new file mode 100644
index 0000000000..9a671383de
--- /dev/null
+++ b/office/plover/plover.info
@@ -0,0 +1,10 @@
+PRGNAM="plover"
+VERSION="4.0.0.dev8.66.g685bd33"
+HOMEPAGE="https://www.openstenoproject.org/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/openstenoproject/plover/releases/download/weekly-v4.0.0.dev8%2B66.g685bd33/plover-4.0.0.dev8.66.g685bd33-x86_64.AppImage"
+MD5SUM_x86_64="27253471cec234350ecbcc8cee6071ed"
+REQUIRES=""
+MAINTAINER="Alan Aversa"
+EMAIL="alan.aveNOrsaSP@AMcox.net (remove NO and SPAM)"
diff --git a/office/plover/plover.png b/office/plover/plover.png
new file mode 100644
index 0000000000..dd301f1c3d
--- /dev/null
+++ b/office/plover/plover.png
diff --git a/office/plover/slack-desc b/office/plover/slack-desc
new file mode 100644
index 0000000000..de7d26b9be
--- /dev/null
+++ b/office/plover/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------------------------------------------------------|
+plover: plover (Open source stenotype engine)
+plover:
+plover: Plover (rhymes with "lover") is a desktop application that allows
+plover: anyone to use stenography to write on their computer, up to speeds of
+plover: 200WPM and beyond.
+plover:
+plover: Plover is part of the Open Steno Project. The Open Steno Project's
+plover: goal is to provide everything you need to learn machine shorthand on
+plover: your own, from free software, to cheap hardware, to learning
+plover: resources.
+plover:
diff --git a/office/pstoedit/README b/office/pstoedit/README
index fe5f854345..f0e737bccd 100644
--- a/office/pstoedit/README
+++ b/office/pstoedit/README
@@ -6,4 +6,8 @@ NOIXML, PCB, PCL, RIB, RPL, RTF, SK, SVG, SVM, SWF, TGIF, XAML, WMF and
 variants of these. Output is also possible to text in different formats 
 and Java or TK code.
 
+This version has some incompatibilities with ghostscript versions
+earlier than 9.50 (eg 9.26 as in Slackware 14.4). If you get errors try 
+using the option "-rdb". 
+
 libEMF, plotutils, and ming are optional dependencies.
diff --git a/office/pstoedit/pstoedit.SlackBuild b/office/pstoedit/pstoedit.SlackBuild
index 1448d71c5f..f708b464b4 100644
--- a/office/pstoedit/pstoedit.SlackBuild
+++ b/office/pstoedit/pstoedit.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pstoedit
-VERSION=${VERSION:-3.70}
+VERSION=${VERSION:-3.75}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,7 +70,7 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++14" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib$LIBDIRSUFFIX \
diff --git a/office/pstoedit/pstoedit.info b/office/pstoedit/pstoedit.info
index c55fece364..6a0347d4ef 100644
--- a/office/pstoedit/pstoedit.info
+++ b/office/pstoedit/pstoedit.info
@@ -1,8 +1,8 @@
 PRGNAM="pstoedit"
-VERSION="3.70"
+VERSION="3.75"
 HOMEPAGE="http://www.pstoedit.net/"
-DOWNLOAD="https://downloads.sourceforge.net/pstoedit/pstoedit-3.70.tar.gz"
-MD5SUM="d3ad4657b4944a8400f7ca76f78cb943"
+DOWNLOAD="https://downloads.sourceforge.net/pstoedit/pstoedit-3.75.tar.gz"
+MD5SUM="a1965d0fcc4e151a265907865078d2c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/qpdfview-qt5/qpdfview-qt5.SlackBuild b/office/qpdfview-qt5/qpdfview-qt5.SlackBuild
index 2811b721d9..9740486397 100644
--- a/office/qpdfview-qt5/qpdfview-qt5.SlackBuild
+++ b/office/qpdfview-qt5/qpdfview-qt5.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Slackware build script for qpdfview
 
-# Copyright 2017-2018 Donald Cooley South Haven, Indiana USA
+# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA
 # Copyright 2012 Mark Noman <smithmark347@gmail.com>
 # All rights reserved.
 #
@@ -25,8 +25,8 @@
 
 PRGNAM=qpdfview-qt5
 SRCNAM=qpdfview
-VERSION=${VERSION:-0.4.18beta1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.4.18}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/office/qpdfview-qt5/qpdfview-qt5.info b/office/qpdfview-qt5/qpdfview-qt5.info
index 7c8e6674b3..4d845835e3 100644
--- a/office/qpdfview-qt5/qpdfview-qt5.info
+++ b/office/qpdfview-qt5/qpdfview-qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qpdfview-qt5"
-VERSION="0.4.18beta1"
+VERSION="0.4.18"
 HOMEPAGE="https://launchpad.net/qpdfview"
-DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.18beta1/+download/qpdfview-0.4.18beta1.tar.gz"
-MD5SUM="d005a54a0366934a8ee1026bc4d1a17f"
+DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.18/+download/qpdfview-0.4.18.tar.gz"
+MD5SUM="4d63ee0095e939602f9bf4759ae57953"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="poppler-qt5"
diff --git a/office/qpdfview/README b/office/qpdfview/README
index f91362fb34..67bc482efa 100644
--- a/office/qpdfview/README
+++ b/office/qpdfview/README
@@ -1 +1 @@
-qpdfview is a tabbed document viewer supporting djvu, pdf, and ps.
\ No newline at end of file
+qpdfview is a tabbed document viewer supporting djvu, PDF, and ps.
diff --git a/office/qpdfview/qpdfview.SlackBuild b/office/qpdfview/qpdfview.SlackBuild
index 3e796da37d..2663e99a42 100644
--- a/office/qpdfview/qpdfview.SlackBuild
+++ b/office/qpdfview/qpdfview.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 # Slackware build script for qpdfview
 
-# Copyright 2017-2019 Donald Cooley South Haven, Indiana USA
-# Copyright 2012 Mark Noman <smithmark347@gmail.com>
+# Copyright 2017-2020 Donald Cooley, South Haven, Indiana USA
+# Copyright 2012 Mark Noman 
 # 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=qpdfview
-VERSION=${VERSION:-0.4.18beta1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.4.18}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/office/qpdfview/qpdfview.info b/office/qpdfview/qpdfview.info
index 45173894ce..300932311d 100644
--- a/office/qpdfview/qpdfview.info
+++ b/office/qpdfview/qpdfview.info
@@ -1,8 +1,8 @@
 PRGNAM="qpdfview"
-VERSION="0.4.18beta1"
+VERSION="0.4.18"
 HOMEPAGE="https://launchpad.net/qpdfview"
-DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.18beta1/+download/qpdfview-0.4.18beta1.tar.gz"
-MD5SUM="d005a54a0366934a8ee1026bc4d1a17f"
+DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.18/+download/qpdfview-0.4.18.tar.gz"
+MD5SUM="4d63ee0095e939602f9bf4759ae57953"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/qpdfview/slack-desc b/office/qpdfview/slack-desc
index d8ce7da639..b8218d51d7 100644
--- a/office/qpdfview/slack-desc
+++ b/office/qpdfview/slack-desc
@@ -8,12 +8,12 @@
         |-----handy-ruler------------------------------------------------------|
 qpdfview: qpdfview (tabbed document viewer)
 qpdfview:
-qpdfview: qpdfview is a tabbed document viewer supporting djvu, pdf, and ps.
+qpdfview: qpdfview is a tabbed document viewer supporting djvu, PDF, and ps.
 qpdfview:
 qpdfview: Current features include:
 qpdfview: Outline, properties, and thumbnail panes, scale, rotate, and fit,
 qpdfview: continuous and multiple-page layouts, fullscreen and presentation
-qpdfview: views, search for text and support for links and forms in pdf files,
+qpdfview: views, search for text and support for links and forms in PDF files,
 qpdfview: configurable toolbars and keyboard shortcuts, persistent per-file
 qpdfview: settings, rudimentary annotation and form support and more.
 qpdfview:
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/smoffice2016/smoffice2016.info b/office/smoffice2016/smoffice2016.info
index b15803289b..7f2c421189 100644
--- a/office/smoffice2016/smoffice2016.info
+++ b/office/smoffice2016/smoffice2016.info
@@ -6,5 +6,5 @@ MD5SUM="83369f5d044a81732e67ab37a87ca324"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
+MAINTAINER="Donald Cooley"
+EMAIL="chytraeu@sdf.org"
diff --git a/office/smoffice2018/smoffice2018.info b/office/smoffice2018/smoffice2018.info
index 1464f30ec7..7ff978e17a 100644
--- a/office/smoffice2018/smoffice2018.info
+++ b/office/smoffice2018/smoffice2018.info
@@ -6,5 +6,5 @@ MD5SUM="39b444fe84c6f83c2ca56f7647460604"
 DOWNLOAD_x86_64="https://www.softmaker.net/down/softmaker-office-2018-976-amd64.tgz"
 MD5SUM_x86_64="38f68ab6a54d19f733e86fecdd6b6fef"
 REQUIRES=""
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
+MAINTAINER="Donald Cooley"
+EMAIL="chytraeu@sdf.org"
diff --git a/office/smoffice2021/README b/office/smoffice2021/README
new file mode 100644
index 0000000000..87741fd538
--- /dev/null
+++ b/office/smoffice2021/README
@@ -0,0 +1,11 @@
+SoftMaker Office 2021 is an office suite, it includes
+
+ * TextMaker 2021, a word processor
+ * PlanMaker 2021, a spreadsheet program
+ * Presentations 2021, a presentation software
+
+The main feature of SoftMaker Office 2021 is the extremely high
+compatibility with the MS Office file formats.
+
+SoftMaker Office 2021 is a commercial program.  It is available in
+Standard and Pro editions, and also as a free 30 days trial.
diff --git a/office/smoffice2021/doinst.sh b/office/smoffice2021/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/office/smoffice2021/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/smoffice2021/planmaker-2021.desktop b/office/smoffice2021/planmaker-2021.desktop
new file mode 100644
index 0000000000..3ab0beba53
--- /dev/null
+++ b/office/smoffice2021/planmaker-2021.desktop
@@ -0,0 +1,83 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+InitialPreference=10
+GenericName=Spreadsheet
+GenericName[am]=ሠንጠረዥ አስሊ
+GenericName[ar]=جدول
+GenericName[az]=Hesab Cədvəli
+GenericName[bg]=Електронна таблица
+GenericName[bn]=স�প�রেডশিট
+GenericName[bs]=Spreadsheet
+GenericName[ca]=Full de càlcul
+GenericName[cs]=Tabulkový kalkulátor
+GenericName[da]=Regneark
+GenericName[de]=Tabellenkalkulation
+GenericName[dz]=ཤོག་�ྲམ�
+GenericName[el]=Λογιστικό φ�λλο
+GenericName[en_CA]=Spreadsheet
+GenericName[en_GB]=Spreadsheet
+GenericName[en_ZA]=Spreadsheet
+GenericName[es]=Hoja de cálculo
+GenericName[et]=Arvutustabel
+GenericName[eu]=Kalkulu-orria
+GenericName[fi]=Taulukkolaskenta
+GenericName[fil]=Spreadsheet
+GenericName[fr]=Tableur
+GenericName[ga]=Scarbhileog
+GenericName[gl]=Folla de cálculo
+GenericName[gu]=સ�પ�રેડશીટ
+GenericName[he]=גיליון עבודה
+GenericName[hr]=Prora�unska tablica
+GenericName[hu]=Táblázatkezelő
+GenericName[is]=Töflureiknir
+GenericName[it]=Foglio di calcolo
+GenericName[ja]=スプレッドシート
+GenericName[ka]=ელცხრილი
+GenericName[ko]=스프레드시트
+GenericName[ku]=Tabloya Hesêb
+GenericName[mk]=Табели
+GenericName[ms]=Hamparan
+GenericName[nb]=Regneark
+GenericName[ne]=स�प�रेडसिट
+GenericName[nl]=Rekenblad
+GenericName[nr]=Spredtjhiti
+GenericName[nso]=Letlakala la go ala tsebišo
+GenericName[oc]=Fuelha de calcul
+GenericName[pa]=ਸਾਰਣੀ
+GenericName[pl]=Arkusz kalkulacyjny
+GenericName[pt]=Folha de Cálculo
+GenericName[pt_BR]=Planilha Eletrônica
+GenericName[ru]=Электронна� таблица
+GenericName[rw]=Urupapurorusesuye
+GenericName[sk]=Tabuľka
+GenericName[sq]=Fleta elektronike
+GenericName[sr]=Табеле
+GenericName[sr@Latn]=Tabele
+GenericName[st]=Leqephe la ho ala boitsebiso
+GenericName[sv]=Kalkylark
+GenericName[th]=ตารางคำนวน
+GenericName[tl]=Spreadsheet
+GenericName[tr]=Hesap Çizelgesi
+GenericName[ts]=Xipredxiti
+GenericName[uk]=Електронні таблиці
+GenericName[vi]=Bảng tính
+GenericName[wa]=TÃ¥vleu
+GenericName[xh]=Icwecwe leeseli
+GenericName[zh_CN]=电�表格
+GenericName[zh_TW]=試算表
+GenericName[zu]=Ispredshit
+Comment=PlanMaker lets you create all kinds of spreadsheets -- from simple ones to the most complex ones. Includes a high-caliber charting module.
+Comment[de]=Mit PlanMaker können Sie alle Arten von Arbeitsblättern erstellen -- von ganz einfachen bis zu den komplexesten. Inklusive eines leistungsstarken Diagrammmoduls. 
+Comment[ru]=PlanMaker позвол�ет �оздавать в�е виды �лектронных таблиц, от про�тых до �ложных. Включает в �еб� мощный модуль дл� �о�тавлени� диаграмм.
+Terminal=false
+Categories=Application;Office;Spreadsheet;
+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.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;
+
+Version=1.0
+Name=PlanMaker 2021
+Icon=application-x-pml21
+TryExec=/usr/bin/planmaker21
+StartupWMClass=pm
+Exec=/usr/bin/planmaker21 %F
+Path=/opt/smoffice2021
diff --git a/office/smoffice2021/planmaker21 b/office/smoffice2021/planmaker21
new file mode 100644
index 0000000000..7786b613fb
--- /dev/null
+++ b/office/smoffice2021/planmaker21
@@ -0,0 +1,3 @@
+#!/bin/sh
+# A script to run PlanMaker.
+/opt/smoffice2021/planmaker "$@"
diff --git a/office/smoffice2021/presentations-2021.desktop b/office/smoffice2021/presentations-2021.desktop
new file mode 100644
index 0000000000..662f175431
--- /dev/null
+++ b/office/smoffice2021/presentations-2021.desktop
@@ -0,0 +1,82 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+InitialPreference=10
+GenericName=Presentation
+GenericName[am]=ትዕይንት
+GenericName[az]=Təqdimat
+GenericName[bg]=Презентаци�
+GenericName[bn]=প�রেজেন�টেশন
+GenericName[bs]=Prezentacija
+GenericName[ca]=Presentació
+GenericName[cs]=Prezentace
+GenericName[da]=Præsentation
+GenericName[de]=Präsentation
+GenericName[dz]=གསལ་སྟོན�
+GenericName[el]=Πα�ουσίαση
+GenericName[en_CA]=Presentation
+GenericName[en_GB]=Presentation
+GenericName[en_ZA]=Presentation
+GenericName[es]=Presentación
+GenericName[et]=Esitlus
+GenericName[eu]=Aurkezpena
+GenericName[fi]=Esitys
+GenericName[fil]=Pagtatanghal
+GenericName[fr]=Présentation
+GenericName[ga]=Toirbeathas
+GenericName[gl]=Presentación
+GenericName[gu]=રજૂઆત
+GenericName[he]=מצגות
+GenericName[hr]=Prezentacija
+GenericName[hu]=Bemutatókészítő
+GenericName[is]=Impress framsetning
+GenericName[it]=Presentazione
+GenericName[ja]=プレゼンテーション
+GenericName[ka]=პრეზენტ�ცი�
+GenericName[ko]=프리젠테�션
+GenericName[ku]=Pêşkêşî
+GenericName[mk]=Презентација
+GenericName[ms]=Persembahan
+GenericName[nb]=Presentasjon
+GenericName[ne]=प�रस�त�ति
+GenericName[nl]=Presentatie
+GenericName[nr]=Phrizentheyitjhini
+GenericName[nso]=Tlhagišo
+GenericName[oc]=Presentacion
+GenericName[pa]=ਪੇਸ਼ਕਾਰੀ
+GenericName[pl]=Prezentacja
+GenericName[pt]=Apresentação
+GenericName[pt_BR]=Apresentação
+GenericName[ru]=Презентаци�
+GenericName[rw]=Iyerekana
+GenericName[sk]=Prezentácia
+GenericName[sq]=Prezantime
+GenericName[sr]=Презентација
+GenericName[sr@Latn]=Prezentacija
+GenericName[st]=Nehelano
+GenericName[sv]=Presentation
+GenericName[th]=งานนำเสนอ
+GenericName[tl]=Pagtatanghal
+GenericName[tr]=Sunum
+GenericName[ts]=Nkombiso
+GenericName[uk]=Презентації
+GenericName[vi]=Trình diễn
+GenericName[wa]=Prezintåcion
+GenericName[xh]=Umboniso wenkcazelo
+GenericName[zh_CN]=演示文稿
+GenericName[zh_TW]=ç°¡å ±
+GenericName[zu]=Iprezenteyshin
+Comment=The Presentations software lets you design any kind of presentation - even including special effects, animations, and transitions.
+Comment[de]=Presentations lässt Sie beliebige Präsentationen gestalten - mit Effekten, Animationen und Transitionen. 
+Comment[ru]=Presentations позвол�ет �оздавать в�е виды презентаций и добавл�ть в них �пециальные �ффекты, анимацию и переходы.
+Terminal=false
+Categories=Application;Office;Presentation;
+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;
+
+Version=1.0
+Name=Presentations 2021
+Icon=application-x-prl21
+TryExec=/usr/bin/presentations21
+StartupWMClass=pr
+Exec=/usr/bin/presentations21 %F
+Path=/opt/smoffice2021
diff --git a/office/smoffice2021/presentations21 b/office/smoffice2021/presentations21
new file mode 100644
index 0000000000..b2b3ad7254
--- /dev/null
+++ b/office/smoffice2021/presentations21
@@ -0,0 +1,10 @@
+#!/bin/sh
+# A script to run Presentations.
+ext="${@##*.}"
+shopt -s nocasematch
+case "$ext" in
+    "prs" ) /opt/smoffice2021/presentations -S\""$@"\";;
+    "pps" ) /opt/smoffice2021/presentations -S\""$@"\";;
+    "ppsx" ) /opt/smoffice2021/presentations -S\""$@"\";;
+    * ) /opt/smoffice2021/presentations "$@";;
+esac
diff --git a/office/smoffice2021/slack-desc b/office/smoffice2021/slack-desc
new file mode 100644
index 0000000000..e0c63f48a0
--- /dev/null
+++ b/office/smoffice2021/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------------------------------------------------------|
+smoffice2021: smoffice2021 (office suite)
+smoffice2021:
+smoffice2021: SoftMaker Office 2021 includes
+smoffice2021:  * TextMaker 2021, a word processor
+smoffice2021:  * PlanMaker 2021, a spreadsheet program
+smoffice2021:  * Presentations 2021, a presentation software
+smoffice2021:
+smoffice2021: The main feature of SoftMaker Office 2021 is the extremely high
+smoffice2021: compatibility with the MS Office file formats.
+smoffice2021:
+smoffice2021: Home page: https://www.softmaker.com/en/softmaker-office-linux
diff --git a/office/smoffice2021/smoffice2021.SlackBuild b/office/smoffice2021/smoffice2021.SlackBuild
new file mode 100644
index 0000000000..86a7395e3f
--- /dev/null
+++ b/office/smoffice2021/smoffice2021.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware build script for smoffice2021
+
+# Based on the smoffice2018 SlackBuild by Alexander Verbovetsky
+# Based on the Arch Linux PKGBUILD.
+
+# Copyright 2020, Donald Cooley, South Haven, Indiana, 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=smoffice2021
+VERSION=${VERSION:-2021_1024}
+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
+
+# Abort build if architecture is not 64-bit.
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH is not supported."
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/opt/smoffice2021 $OUTPUT
+cd $TMP
+tar xvf $CWD/softmaker-office-${VERSION//_/-}-amd64.tgz
+tar xvf office2021.tar.lzma -C $PKG/opt/smoffice2021
+cd $PKG
+
+mkdir -p usr/bin
+install -m 0755 -o root -g root $CWD/planmaker21 usr/bin
+install -m 0755 -o root -g root $CWD/presentations21 usr/bin
+install -m 0755 -o root -g root $CWD/textmaker21 usr/bin
+
+for s in 16 24 32 48 64 128 256 512 1024; do
+  mkdir -p usr/share/icons/hicolor/${s}x${s}/apps
+  for a in pml prl tml; do
+    cp -a opt/smoffice2021/icons/${a}_${s}.png \
+      usr/share/icons/hicolor/${s}x${s}/apps/application-x-${a}21.png
+  done
+done
+for s in 16 24 32 48 64 128 256 512 1024; do
+  mkdir -p usr/share/icons/hicolor/${s}x${s}/mimetypes
+  for a in pmd pmd_mso pmd_oth prd prd_mso prd_oth tmd tmd_mso tmd_oth; do
+    cp -a opt/smoffice2021/icons/${a}_${s}.png \
+      usr/share/icons/hicolor/${s}x${s}/mimetypes/application-x-${a}.png
+  done
+done
+
+mkdir -p usr/share/applications
+cp -a $CWD/planmaker-2021.desktop usr/share/applications/
+cp -a $CWD/presentations-2021.desktop usr/share/applications/
+cp -a $CWD/textmaker-2021.desktop usr/share/applications/
+
+mkdir -p usr/share/mime/packages/
+cp -a opt/smoffice2021/mime/softmaker-office-2021.xml \
+  usr/share/mime/packages/
+
+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 usr/doc/$PRGNAM-$VERSION
+mv opt/smoffice2021/*.pdf opt/smoffice2021/mime/copyright \
+  usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p install
+cat $CWD/slack-desc > install/slack-desc
+cat $CWD/doinst.sh > install/doinst.sh
+
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/smoffice2021/smoffice2021.info b/office/smoffice2021/smoffice2021.info
new file mode 100644
index 0000000000..43812124a4
--- /dev/null
+++ b/office/smoffice2021/smoffice2021.info
@@ -0,0 +1,10 @@
+PRGNAM="smoffice2021"
+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-1024-amd64.tgz"
+MD5SUM_x86_64="4fd374951ac0a4671a91acdca475d90b"
+REQUIRES=""
+MAINTAINER="Donald Cooley"
+EMAIL="chytraeu@sdf.org"
diff --git a/office/smoffice2021/textmaker-2021.desktop b/office/smoffice2021/textmaker-2021.desktop
new file mode 100644
index 0000000000..5863f0cd04
--- /dev/null
+++ b/office/smoffice2021/textmaker-2021.desktop
@@ -0,0 +1,83 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+InitialPreference=10
+GenericName=Word Processor
+GenericName[am]=ጽ�� አቀናጅ
+GenericName[ar]=معالج نصوص
+GenericName[az]=Kəlmə İşlədici
+GenericName[bg]=Тек�тообработка
+GenericName[bn]=ওয়ার�ড প�রসেসর
+GenericName[bs]=Word Processor
+GenericName[ca]=Processador de textos
+GenericName[cs]=Textový procesor
+GenericName[da]=Tekstbehandler
+GenericName[de]=Textverarbeitung
+GenericName[dz]=ཡིག་སྦྱོར་པ�
+GenericName[el]=Επεξε�γαστής κειμένου
+GenericName[en_CA]=Word Processor
+GenericName[en_GB]=Word Processor
+GenericName[en_ZA]=Word Processor
+GenericName[es]=Procesador de textos
+GenericName[et]=Kirjutaja
+GenericName[eu]=Testu-prozesadorea
+GenericName[fi]=Tekstinkäsittely
+GenericName[fil]=Tagaproseso ng Salita
+GenericName[fr]=Traitement de texte
+GenericName[ga]=Próiseálaithe Focal
+GenericName[gl]=Procesador de textos
+GenericName[gu]=વર�ડ પ�રોસેસર
+GenericName[he]=מעבד תמלילי�
+GenericName[hr]=Obrada teksta
+GenericName[hu]=Szövegszerkesztő
+GenericName[is]=Ritvinnsla
+GenericName[it]=Word processor
+GenericName[ja]=ワープロ
+GenericName[ka]=ტექსტის რედ�ქტ�რი
+GenericName[ko]=워드 프로세서
+GenericName[ku]=Bernameya nivîsandinê
+GenericName[mk]=Проце�ор за тек�т
+GenericName[ms]=Pemproses Perkataan
+GenericName[nb]=Tekstbehandling
+GenericName[ne]=शब�द प�रशोधक
+GenericName[nl]=Tekstverwerker
+GenericName[nr]=Isenzi Mitlolo
+GenericName[nso]=Sehlami sa Lentšu
+GenericName[oc]=Tractament de tèxt
+GenericName[pa]=ਸ਼ਬਦਕਾਰ
+GenericName[pl]=Edytor tekstu
+GenericName[pt]=Processador de texto
+GenericName[pt_BR]=Editor de texto
+GenericName[ru]=Тек�товый проце��ор
+GenericName[sk]=Textový editor
+GenericName[sq]=Procesues teksti
+GenericName[sr]=Обрада тек�та
+GenericName[sr@Latn]=Obrada teksta
+GenericName[st]=Word Processor
+GenericName[sv]=Ordbehandlare
+GenericName[th]=พิมพ์งาน
+GenericName[tl]=Tagaproseso ng Salita
+GenericName[tr]=Kelime Ä°ÅŸlemci
+GenericName[ts]=Xitirhisi xa marito
+GenericName[uk]=Тек�товий проце�ор
+GenericName[vi]=Bộ xử lý từ
+GenericName[wa]=Aspougneu d' tecse
+GenericName[xh]=Inkqubo Yokuqhuba Amagama
+GenericName[zh_CN]=文字处�
+GenericName[zh_TW]=文書處�器
+GenericName[zu]=Umshini Ohlela Amagama
+Comment=The TextMaker word processor lets you work on any type of document.
+Comment[de]=Die Textverarbeitung TextMaker ermöglicht es Ihnen, beliebige Arten von Dokumenten zu erstellen und zu bearbeiten. 
+Comment[ru]=TextMaker позвол�ет работать �о в�еми видами тек�товых документов.
+Terminal=false
+Categories=Application;Office;WordProcessor;
+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;
+
+
+Version=1.0
+Name=TextMaker 2021
+Icon=application-x-tml21
+TryExec=/usr/bin/textmaker21
+StartupWMClass=tm
+Exec=/usr/bin/textmaker21 %F
+Path=/opt/smoffice2021
diff --git a/office/smoffice2021/textmaker21 b/office/smoffice2021/textmaker21
new file mode 100644
index 0000000000..ef526982fb
--- /dev/null
+++ b/office/smoffice2021/textmaker21
@@ -0,0 +1,3 @@
+#!/bin/sh
+# A script to run TextMaker.
+/opt/smoffice2021/textmaker "$@"
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/tellico/tellico.info b/office/tellico/tellico.info
index 3a7d9986e0..0e7fdd0310 100644
--- a/office/tellico/tellico.info
+++ b/office/tellico/tellico.info
@@ -1,7 +1,7 @@
 PRGNAM="tellico"
 VERSION="2.3.12"
-HOMEPAGE="http://tellico-project.org/"
-DOWNLOAD="http://tellico-project.org/files/tellico-2.3.12.tar.bz2"
+HOMEPAGE="https://tellico-project.org/"
+DOWNLOAD="https://tellico-project.org/files/tellico-2.3.12.tar.bz2"
 MD5SUM="607e94e0141aadf741aab7fa6db15a5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/office/texlive-docs/texlive-docs.SlackBuild b/office/texlive-docs/texlive-docs.SlackBuild
index b34eada5d2..cb60d47aa1 100644
--- a/office/texlive-docs/texlive-docs.SlackBuild
+++ b/office/texlive-docs/texlive-docs.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2009 - 2014  Robby Workman, Northport, AL, USA
-# Copyright 2016 - 2019  Johannes Schoepfer, Germany
+# Copyright 2016 - 2020  Johannes Schoepfer, Germany
 # 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=texlive-docs
-VERSION=${VERSION:-2019.190626}
+VERSION=${VERSION:-2020.200608}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,19 +36,21 @@ OUTPUT=${OUTPUT:-/tmp}
 
 ARCH=noarch
 
+TEXMFROOT=/usr/share
+
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG/usr/share $OUTPUT $PKG/usr/doc/texlive-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG/usr/share
+mkdir -p $TMP $PKG$TEXMFROOT $OUTPUT $PKG/usr/doc/texlive-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG$TEXMFROOT
 chown -R root:root $PKG
 chmod -R u+w,go-w,a+rX-st $PKG
 
 # No, we don't care about the pdf versions of the manual pages
-rm -rf $PKG/usr/share/texmf-dist/doc/man
+rm -rf $PKG$TEXMFROOT/texmf-dist/doc/man
 
 # Install index of provided tex packages to the docs
-mv $PKG/usr/share/texmf-dist/packages.docs.gz $PKG/usr/doc/texlive-$VERSION
+mv $PKG$TEXMFROOT/texmf-dist/packages.docs.gz $PKG/usr/doc/texlive-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/office/texlive-docs/texlive-docs.info b/office/texlive-docs/texlive-docs.info
index ae36d4ec1f..79bb330e80 100644
--- a/office/texlive-docs/texlive-docs.info
+++ b/office/texlive-docs/texlive-docs.info
@@ -1,10 +1,10 @@
 PRGNAM="texlive-docs"
-VERSION="2019.190626"
+VERSION="2020.200608"
 HOMEPAGE="https://tug.org/texlive/"
-DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/2019/texlive-docs-2019.190626.tar.xz"
-MD5SUM="bb48cec9ec541fda657541d7c45a06d4"
+DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-docs-2020.200608.tar.xz"
+MD5SUM="89c5212c1cae844188fca98f21acd938"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="texlive"
+REQUIRES=""
 MAINTAINER="Johannes Schoepfer"
 EMAIL="slackbuilds@schoepfer.info"
diff --git a/office/texlive-extra/texlive-extra.SlackBuild b/office/texlive-extra/texlive-extra.SlackBuild
index 4faa70f884..c2cd1d0c75 100644
--- a/office/texlive-extra/texlive-extra.SlackBuild
+++ b/office/texlive-extra/texlive-extra.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2009 - 2014  Robby Workman, Northport, AL, USA
-# Copyright 2016 - 2019  Johannes Schoepfer, Germany
+# Copyright 2016 - 2020  Johannes Schoepfer, Germany
 # 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=texlive-extra
-VERSION=${VERSION:-2019.190626}
+VERSION=${VERSION:-2020.200608}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -34,6 +34,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -42,27 +44,27 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-set -e
+TEXMFROOT=/usr/share
 
 rm -rf $PKG
-mkdir -p $TMP $PKG/usr/share $OUTPUT $PKG/usr/bin $PKG/usr/doc/texlive-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG/usr/share
+mkdir -p $TMP $PKG$TEXMFROOT $OUTPUT $PKG/usr/bin $PKG/usr/doc/texlive-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG$TEXMFROOT
 chown -R root:root $PKG
 chmod -R u+w,go-w,a+rX-st $PKG
 
 # Put symlinks/scripts from tlnet in place
-mv $PKG/usr/share/texmf-dist/linked_scripts/* $PKG/usr/bin
-rmdir $PKG/usr/share/texmf-dist/linked_scripts
+mv $PKG$TEXMFROOT/texmf-dist/linked_scripts/* $PKG/usr/bin
+rmdir $PKG$TEXMFROOT/texmf-dist/linked_scripts
 
 # Move biber binary to $PATH
 case $ARCH in
-	"x86_64") mv $PKG/usr/share/texmf-dist/bin/x86_64-linux/biber $PKG/usr/bin ;;
-	"i586") mv $PKG/usr/share/texmf-dist/bin/i386-linux/biber $PKG/usr/bin ;;
+	"x86_64") mv $PKG$TEXMFROOT/texmf-dist/bin/x86_64-linux/biber $PKG/usr/bin ;;
+	"i586") mv $PKG$TEXMFROOT/texmf-dist/bin/i386-linux/biber $PKG/usr/bin ;;
 esac
-rm -rf $PKG/usr/share/texmf-dist/bin
+rm -rf $PKG$TEXMFROOT/texmf-dist/bin
 
 # Install index of provided tex packages to the docs
-mv $PKG/usr/share/texmf-dist/packages.extra.gz $PKG/usr/doc/texlive-$VERSION
+mv $PKG$TEXMFROOT/texmf-dist/packages.extra.gz $PKG/usr/doc/texlive-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/office/texlive-extra/texlive-extra.info b/office/texlive-extra/texlive-extra.info
index 1e31bcf88e..5052c20d94 100644
--- a/office/texlive-extra/texlive-extra.info
+++ b/office/texlive-extra/texlive-extra.info
@@ -1,8 +1,8 @@
 PRGNAM="texlive-extra"
-VERSION="2019.190626"
+VERSION="2020.200608"
 HOMEPAGE="https://tug.org/texlive/"
-DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/2019/texlive-extra-2019.190626.tar.xz"
-MD5SUM="d75caaad02a5ec1ab5f398465eb759a1"
+DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-extra-2020.200608.tar.xz"
+MD5SUM="34a8f19207ba77c6f86891eb3450e912"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="texlive"
diff --git a/office/texlive/patches/texlive-20190410-source-upstream_fixes-1.patch b/office/texlive/patches/texlive-20190410-source-upstream_fixes-1.patch
deleted file mode 100644
index 8e29d492d9..0000000000
--- a/office/texlive/patches/texlive-20190410-source-upstream_fixes-1.patch
+++ /dev/null
@@ -1,4096 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2019-05-31
-Initial Package Version: 2019
-Upstream Status: Applied
-Origin: Upstream
-Description: Fixes from branch2019 up to svn r51236, and fixes
-from trunk for harfbuzz-2.5.0 changes (svn r51269, 51271).
-
-diff -Naur a/texk/dvipdfm-x/ChangeLog b/texk/dvipdfm-x/ChangeLog
---- a/texk/dvipdfm-x/ChangeLog	2019-04-07 02:42:55.000000000 +0100
-+++ b/texk/dvipdfm-x/ChangeLog	2019-05-31 22:00:04.006964029 +0100
-@@ -1,3 +1,47 @@
-+2019-05-08  Akira Kakuto  <kakuto@w32tex.org>
-+
-+	* dpxfile.c: Avoid buffer overflow.
-+
-+2019-05-08  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
-+
-+	* spc_pdfm.c: Transformation also applies to annotations
-+	created by pdf:ann.
-+
-+2019-05-07  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
-+
-+	* tt_cmap.c: Fix a bug that CFF charset data were not read.
-+	* unicode.c: Fix a bug that end-of-buffer calculation was
-+	wrong.
-+
-+2019-05-05  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
-+
-+	* pdfdoc.c: g option affects only annotations created by
-+	"pdf:bann/eann" and html "a link" specials.
-+	Report from Joseph Wright:
-+	https://tug.org/pipermail/tex-live/2019-May/043612.html
-+
-+2019-05-03  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
-+
-+	* specials.c: transformation applied to current point was not
-+	done properly.
-+
-+2019-05-03  Akira Kakuto  <kakuto@w32tex.org>
-+
-+	* dpxfile.c, mfileio.h, pdfximage.c: Support non-ascii file
-+	names in default code page of OS irrespective of values of a
-+	variable 'command_line_encoding' (Windows only).
-+
-+2019-05-03  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
-+
-+	* pdfobj.c, pdfobj.h: Add support for ASCIIHex and ASCII85
-+	decode filter. Support for decoding stream data with multiple
-+	filters applied. Remove unused function.
-+	* tt_cmap.c, tt_gsub.[ch]: Revise ToUnicode CMap creation for
-+	OpenType. Use GSUB for mapping unencoded glyphs to Unicode
-+	(XeTeX support), lowering priority of CJK compatibility
-+	ideographs.
-+	* configure.ac: Version 20190503.
-+
- 2019-04-07  Karl Berry  <karl@freefriends.org>
- 
- 	* TeX Live 2019.
-diff -Naur a/texk/dvipdfm-x/configure b/texk/dvipdfm-x/configure
---- a/texk/dvipdfm-x/configure	2019-02-24 22:07:11.000000000 +0000
-+++ b/texk/dvipdfm-x/configure	2019-05-31 22:00:04.007964030 +0100
-@@ -1,8 +1,8 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20190225.
-+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20190503.
- #
--# Report bugs to <tex-k@tug.org>.
-+# Report bugs to <dvipdfmx@tug.org>.
- #
- #
- # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-@@ -274,7 +274,7 @@
-     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-   else
--    $as_echo "$0: Please tell bug-autoconf@gnu.org and tex-k@tug.org
-+    $as_echo "$0: Please tell bug-autoconf@gnu.org and dvipdfmx@tug.org
- $0: about your system, including any error possibly output
- $0: before this message. Then install a modern shell, or
- $0: manually run the script under such a shell if you do
-@@ -590,9 +590,9 @@
- # Identity of this package.
- PACKAGE_NAME='dvipdfm-x (TeX Live)'
- PACKAGE_TARNAME='dvipdfm-x--tex-live-'
--PACKAGE_VERSION='20190225'
--PACKAGE_STRING='dvipdfm-x (TeX Live) 20190225'
--PACKAGE_BUGREPORT='tex-k@tug.org'
-+PACKAGE_VERSION='20190503'
-+PACKAGE_STRING='dvipdfm-x (TeX Live) 20190503'
-+PACKAGE_BUGREPORT='dvipdfmx@tug.org'
- PACKAGE_URL=''
- 
- ac_unique_file="agl.c"
-@@ -1350,7 +1350,7 @@
-   # Omit some internal or obsolete options to make the list less imposing.
-   # This message is too long to be a string in the A/UX 3.1 sh.
-   cat <<_ACEOF
--\`configure' configures dvipdfm-x (TeX Live) 20190225 to adapt to many kinds of systems.
-+\`configure' configures dvipdfm-x (TeX Live) 20190503 to adapt to many kinds of systems.
- 
- Usage: $0 [OPTION]... [VAR=VALUE]...
- 
-@@ -1421,7 +1421,7 @@
- 
- if test -n "$ac_init_help"; then
-   case $ac_init_help in
--     short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20190225:";;
-+     short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20190503:";;
-    esac
-   cat <<\_ACEOF
- 
-@@ -1488,7 +1488,7 @@
- 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 <tex-k@tug.org>.
-+Report bugs to <dvipdfmx@tug.org>.
- _ACEOF
- ac_status=$?
- fi
-@@ -1551,7 +1551,7 @@
- test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
--dvipdfm-x (TeX Live) configure 20190225
-+dvipdfm-x (TeX Live) configure 20190503
- generated by GNU Autoconf 2.69
- 
- Copyright (C) 2012 Free Software Foundation, Inc.
-@@ -1896,9 +1896,9 @@
- $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--( $as_echo "## ---------------------------- ##
--## Report this to tex-k@tug.org ##
--## ---------------------------- ##"
-+( $as_echo "## ------------------------------- ##
-+## Report this to dvipdfmx@tug.org ##
-+## ------------------------------- ##"
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
-@@ -2390,7 +2390,7 @@
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
--It was created by dvipdfm-x (TeX Live) $as_me 20190225, which was
-+It was created by dvipdfm-x (TeX Live) $as_me 20190503, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   $ $0 $@
-@@ -8077,7 +8077,7 @@
- 
- # Define the identity of the package.
-  PACKAGE='dvipdfm-x--tex-live-'
-- VERSION='20190225'
-+ VERSION='20190503'
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -14746,7 +14746,7 @@
- Report bugs to <bug-libtool@gnu.org>."
- 
- lt_cl_version="\
--dvipdfm-x (TeX Live) config.lt 20190225
-+dvipdfm-x (TeX Live) config.lt 20190503
- configured by $0, generated by GNU Autoconf 2.69.
- 
- Copyright (C) 2011 Free Software Foundation, Inc.
-@@ -16636,7 +16636,7 @@
- # report actual input values of CONFIG_FILES etc. instead of their
- # values after options handling.
- ac_log="
--This file was extended by dvipdfm-x (TeX Live) $as_me 20190225, which was
-+This file was extended by dvipdfm-x (TeX Live) $as_me 20190503, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-@@ -16700,13 +16700,13 @@
- Configuration commands:
- $config_commands
- 
--Report bugs to <tex-k@tug.org>."
-+Report bugs to <dvipdfmx@tug.org>."
- 
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
--dvipdfm-x (TeX Live) config.status 20190225
-+dvipdfm-x (TeX Live) config.status 20190503
- configured by $0, generated by GNU Autoconf 2.69,
-   with options \\"\$ac_cs_config\\"
- 
-diff -Naur a/texk/dvipdfm-x/configure.ac b/texk/dvipdfm-x/configure.ac
---- a/texk/dvipdfm-x/configure.ac	2019-02-24 22:07:11.000000000 +0000
-+++ b/texk/dvipdfm-x/configure.ac	2019-05-31 22:00:04.007964030 +0100
-@@ -7,7 +7,7 @@
- dnl   gives unlimited permission to copy and/or distribute it,
- dnl   with or without modifications, as long as this notice is preserved.
- dnl
--AC_INIT([dvipdfm-x (TeX Live)], [20190225], [tex-k@tug.org])
-+AC_INIT([dvipdfm-x (TeX Live)], [20190503], [dvipdfmx@tug.org])
- AC_PREREQ([2.65])
- AC_CONFIG_SRCDIR([agl.c])
- AC_CONFIG_AUX_DIR([../../build-aux])
-diff -Naur a/texk/dvipdfm-x/dpxfile.c b/texk/dvipdfm-x/dpxfile.c
---- a/texk/dvipdfm-x/dpxfile.c	2018-10-07 22:27:40.000000000 +0100
-+++ b/texk/dvipdfm-x/dpxfile.c	2019-05-31 22:00:04.007964030 +0100
-@@ -1,5 +1,5 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
--    Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata,
-+    Copyright (C) 2007-2019 by Jin-Hwan Cho and Shunsaku Hirata,
-     the dvipdfmx project team.
-     
-     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
-@@ -159,11 +159,17 @@
- static char  _tmpbuf[PATH_MAX+1];
- #endif /* MIKTEX */
- 
-+#if defined(WIN32)
-+extern int utf8name_failed;
-+#endif /* WIN32 */
-+
-+#define CMDBUFSIZ 1024
- static int exec_spawn (char *cmd)
- {
-   char **cmdv, **qv;
-   char *p, *pp;
--  char buf[1024];
-+  char buf[CMDBUFSIZ];
-+  int  charcnt;
-   int  i, ret = -1;
- #ifdef WIN32
-   wchar_t **cmdvw, **qvw;
-@@ -182,11 +188,12 @@
-       i++;
-     p++;
-   }
--  cmdv = xcalloc (i + 2, sizeof (char *));
-+  cmdv = xcalloc (i + 4, sizeof (char *));
-   p = cmd;
-   qv = cmdv;
-   while (*p) {
-     pp = buf;
-+    charcnt = 0;
-     if (*p == '"') {
-       p++;
-       while (*p != '"') {
-@@ -194,6 +201,10 @@
-           goto done;
-         }
-         *pp++ = *p++;
-+        charcnt++;
-+        if (charcnt > CMDBUFSIZ - 1) {
-+          ERROR("Too long a command line.");
-+        }
-       }
-       p++;
-     } else if (*p == '\'') {
-@@ -203,6 +214,10 @@
-           goto done;
-         }
-         *pp++ = *p++;
-+        charcnt++;
-+        if (charcnt > CMDBUFSIZ - 1) {
-+          ERROR("Too long a command line.");
-+        }
-       }
-       p++;
-     } else {
-@@ -214,10 +229,18 @@
-                  goto done;
-              }
-              *pp++ = *p++;
-+             charcnt++;
-+             if (charcnt > CMDBUFSIZ - 1) {
-+               ERROR("Too long a command line.");
-+             }
-           }
-           p++;
-         } else {
-           *pp++ = *p++;
-+          charcnt++;
-+          if (charcnt > CMDBUFSIZ - 1) {
-+            ERROR("Too long a command line.");
-+          }
-         }
-       }
-     }
-@@ -235,20 +258,39 @@
-       p++;
-     qv++;
-   }
-+  *qv = NULL;
-+
- #ifdef WIN32
- #if defined(MIKTEX)
-   ret = _spawnvp(_P_WAIT, *cmdv, (const char* const*)cmdv); 
- #else
--  cmdvw = xcalloc (i + 2, sizeof (wchar_t *));
--  qv = cmdv;
--  qvw = cmdvw;
--  while (*qv) {
--    *qvw = get_wstring_from_fsyscp(*qv, *qvw=NULL);
--    qv++;
--    qvw++;
-+  cmdvw = xcalloc (i + 4, sizeof (wchar_t *));
-+  if (utf8name_failed == 0) {
-+    qv = cmdv;
-+    qvw = cmdvw;
-+    while (*qv) {
-+      *qvw = get_wstring_from_fsyscp(*qv, *qvw=NULL);
-+      qv++;
-+      qvw++;
-+    }
-+    *qvw = NULL;
-+    ret = _wspawnvp (_P_WAIT, *cmdvw, (const wchar_t* const*) cmdvw);
-+  } else {
-+    int tmpcp;
-+    tmpcp = file_system_codepage;
-+    file_system_codepage = win32_codepage;
-+    qv = cmdv;
-+    qvw = cmdvw;
-+    while (*qv) {
-+      *qvw = get_wstring_from_fsyscp(*qv, *qvw=NULL);
-+      qv++;
-+      qvw++;
-+    }
-+    *qvw = NULL;
-+    file_system_codepage = tmpcp;
-+    utf8name_failed = 0;
-+    ret = _wspawnvp (_P_WAIT, *cmdvw, (const wchar_t* const*) cmdvw);
-   }
--  *qvw = NULL;
--  ret = _wspawnvp (_P_WAIT, *cmdvw, (const wchar_t* const*) cmdvw);
-   if (cmdvw) {
-     qvw = cmdvw;
-     while (*qvw) {
-@@ -1242,3 +1284,21 @@
- 
-   return  r;
- }
-+
-+#if defined(WIN32)
-+FILE *generic_fsyscp_fopen (const char *filename, const char *mode)
-+{
-+  FILE *f;
-+
-+  f = fsyscp_fopen (filename, mode);
-+
-+  if (f == NULL && file_system_codepage != win32_codepage) {
-+    int tmpcp = file_system_codepage;
-+    file_system_codepage = win32_codepage;
-+    f = fsyscp_fopen (filename, mode);
-+    file_system_codepage = tmpcp;
-+  }
-+
-+  return f;
-+}
-+#endif /* WIN32 */
-diff -Naur a/texk/dvipdfm-x/dvipdfmx.c b/texk/dvipdfm-x/dvipdfmx.c
---- a/texk/dvipdfm-x/dvipdfmx.c	2019-02-11 18:22:31.000000000 +0000
-+++ b/texk/dvipdfm-x/dvipdfmx.c	2019-05-31 22:00:04.007964030 +0100
-@@ -232,7 +232,7 @@
-   printf ("Papersize is specified by paper format (e.g., \"a4\")\n");
-   printf ("\tor by w<unit>,h<unit> (e.g., \"20cm,30cm\").\n");
-   printf ("\n");
--  printf ("Email bug reports to tex-k@tug.org.\n");
-+  printf ("Email bug reports to dvipdfmx@tug.org.\n");
- }
- 
- static void
-diff -Naur a/texk/dvipdfm-x/mfileio.h b/texk/dvipdfm-x/mfileio.h
---- a/texk/dvipdfm-x/mfileio.h	2016-01-11 03:57:04.000000000 +0000
-+++ b/texk/dvipdfm-x/mfileio.h	2019-05-31 22:00:04.008964031 +0100
-@@ -1,6 +1,6 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
--    Copyright (C) 2002-2016 by Jin-Hwan Cho and Shunsaku Hirata,
-+    Copyright (C) 2002-2019 by Jin-Hwan Cho and Shunsaku Hirata,
-     the dvipdfmx project team.
-     
-     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
-@@ -36,7 +36,8 @@
-    mfclose((file),__FUNCTION__,__LINE__)
- #else
- #if defined(WIN32)
--#define MFOPEN(name,mode) fsyscp_fopen((name),(mode))
-+extern FILE *generic_fsyscp_fopen(const char *fname, const char *mode);
-+#define MFOPEN(name,mode) generic_fsyscp_fopen((name),(mode))
- #else
- #define MFOPEN(name,mode) fopen((name),(mode))
- #endif
-diff -Naur a/texk/dvipdfm-x/pdfdoc.c b/texk/dvipdfm-x/pdfdoc.c
---- a/texk/dvipdfm-x/pdfdoc.c	2018-12-21 03:39:51.000000000 +0000
-+++ b/texk/dvipdfm-x/pdfdoc.c	2019-05-31 22:00:04.008964031 +0100
-@@ -1,6 +1,6 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
--    Copyright (C) 2008-2018 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata,
-+    Copyright (C) 2008-2019 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata,
-     the dvipdfmx project team.
-     
-     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
-@@ -1780,7 +1780,6 @@
-   pdf_doc  *p = &pdoc;
-   pdf_page *page;
-   pdf_obj  *rect_array;
--  double    annot_grow = p->opt.annot_grow;
-   double    xpos, ypos;
-   pdf_rect  annbox;
- 
-@@ -1812,10 +1811,10 @@
-   }
- 
-   rect_array = pdf_new_array();
--  pdf_add_array(rect_array, pdf_new_number(ROUND(annbox.llx - annot_grow, 0.001)));
--  pdf_add_array(rect_array, pdf_new_number(ROUND(annbox.lly - annot_grow, 0.001)));
--  pdf_add_array(rect_array, pdf_new_number(ROUND(annbox.urx + annot_grow, 0.001)));
--  pdf_add_array(rect_array, pdf_new_number(ROUND(annbox.ury + annot_grow, 0.001)));
-+  pdf_add_array(rect_array, pdf_new_number(ROUND(annbox.llx, 0.001)));
-+  pdf_add_array(rect_array, pdf_new_number(ROUND(annbox.lly, 0.001)));
-+  pdf_add_array(rect_array, pdf_new_number(ROUND(annbox.urx, 0.001)));
-+  pdf_add_array(rect_array, pdf_new_number(ROUND(annbox.ury, 0.001)));
-   pdf_add_dict (annot_dict, pdf_new_name("Rect"), rect_array);
- 
-   pdf_add_array(page->annots, pdf_ref_obj(annot_dict));
-@@ -2802,13 +2801,22 @@
- void
- pdf_doc_break_annot (void)
- {
-+  pdf_doc *p = &pdoc;
-+  double   g = p->opt.annot_grow;
-+
-   if (breaking_state.dirty) {
-     pdf_obj  *annot_dict;
-+    pdf_rect  rect;
- 
-     /* Copy dict */
-     annot_dict = pdf_new_dict();
-     pdf_merge_dict(annot_dict, breaking_state.annot_dict);
--    pdf_doc_add_annot(pdf_doc_current_page_number(), &(breaking_state.rect),
-+    rect = breaking_state.rect;
-+    rect.llx -= g;
-+    rect.lly -= g;
-+    rect.urx += g;
-+    rect.ury += g;
-+    pdf_doc_add_annot(pdf_doc_current_page_number(), &rect,
-                       annot_dict, !breaking_state.broken);
-     pdf_release_obj(annot_dict);
- 
-diff -Naur a/texk/dvipdfm-x/pdfobj.c b/texk/dvipdfm-x/pdfobj.c
---- a/texk/dvipdfm-x/pdfobj.c	2018-12-26 23:07:57.000000000 +0000
-+++ b/texk/dvipdfm-x/pdfobj.c	2019-05-31 22:00:04.008964031 +0100
-@@ -1,6 +1,6 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
--    Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata,
-+    Copyright (C) 2007-2019 by Jin-Hwan Cho and Shunsaku Hirata,
-     the dvipdfmx project team.
-     
-     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
-@@ -2223,48 +2223,9 @@
- 
- #if HAVE_ZLIB
- #define WBUF_SIZE 4096
--int
--pdf_add_stream_flate (pdf_obj *dst, const void *data, int len)
--{
--  z_stream z;
--  Bytef    wbuf[WBUF_SIZE];
--
--  z.zalloc = Z_NULL; z.zfree = Z_NULL; z.opaque = Z_NULL;
--
--  z.next_in  = (z_const Bytef *) data; z.avail_in  = len;
--  z.next_out = (Bytef *) wbuf; z.avail_out = WBUF_SIZE;
--
--  if (inflateInit(&z) != Z_OK) {
--    WARN("inflateInit() failed.");
--    return -1;
--  }
--
--  for (;;) {
--    int status;
--    status = inflate(&z, Z_NO_FLUSH);
--    if (status == Z_STREAM_END)
--      break;
--    else if (status != Z_OK) {
--      WARN("inflate() failed. Broken PDF file?");
--      inflateEnd(&z);
--      return -1;
--    }
--
--    if (z.avail_out == 0) {
--      pdf_add_stream(dst, wbuf, WBUF_SIZE);
--      z.next_out  = wbuf;
--      z.avail_out = WBUF_SIZE;
--    }
--  }
--
--  if (WBUF_SIZE - z.avail_out > 0)
--    pdf_add_stream(dst, wbuf, WBUF_SIZE - z.avail_out);
--
--  return (inflateEnd(&z) == Z_OK ? 0 : -1);
--}
- 
- static int
--get_decode_parms (struct decode_parms *parms, pdf_obj *dict)
-+filter_get_DecodeParms_FlateDecode (struct decode_parms *parms, pdf_obj *dict)
- {
-   pdf_obj *tmp;
- 
-@@ -2278,18 +2239,25 @@
-   parms->columns   = 1;
- 
-   tmp = pdf_deref_obj(pdf_lookup_dict(dict, "Predictor"));
--  if (tmp)
-+  if (tmp) {
-     parms->predictor = pdf_number_value(tmp);
-+    pdf_release_obj(tmp);
-+  }
-   tmp = pdf_deref_obj(pdf_lookup_dict(dict, "Colors"));
--  if (tmp)
-+  if (tmp) {
-     parms->colors = pdf_number_value(tmp);
-+    pdf_release_obj(tmp);
-+  }
-   tmp = pdf_deref_obj(pdf_lookup_dict(dict, "BitsPerComponent"));
--  if (tmp)
-+  if (tmp) {
-     parms->bits_per_component = pdf_number_value(tmp);
-+    pdf_release_obj(tmp);
-+  }
-   tmp = pdf_deref_obj(pdf_lookup_dict(dict, "Columns"));
--  if (tmp)
-+  if (tmp) {
-     parms->columns = pdf_number_value(tmp);
--
-+    pdf_release_obj(tmp);
-+  }
-   if (parms->bits_per_component != 1 &&
-       parms->bits_per_component != 2 &&
-       parms->bits_per_component != 4 &&
-@@ -2354,17 +2322,19 @@
-  * Especially, calling pdf_add_stream() for each 4 bytes append is highly
-  * inefficient.
-  */
--static int
--filter_decoded (pdf_obj *dst, const void *src, int srclen,
--                struct decode_parms *parms)
-+static pdf_obj *
-+filter_stream_decode_Predictor (const void *src, size_t srclen, struct decode_parms *parms)
- {
-+  pdf_obj             *dst;
-   const unsigned char *p = (const unsigned char *) src;
-   const unsigned char *endptr = p + srclen;
--  unsigned char *prev, *buf;
--  int bits_per_pixel  = parms->colors * parms->bits_per_component;
--  int bytes_per_pixel = (bits_per_pixel + 7) / 8;
--  int length = (parms->columns * bits_per_pixel + 7) / 8;
--  int i, error = 0;
-+  unsigned char       *prev, *buf;
-+  int                  bits_per_pixel  = parms->colors * parms->bits_per_component;
-+  int                  bytes_per_pixel = (bits_per_pixel + 7) / 8;
-+  int                  length = (parms->columns * bits_per_pixel + 7) / 8;
-+  int                  i, error = 0;
-+
-+  dst  = pdf_new_stream(0);
- 
-   prev = NEW(length, unsigned char);
-   buf  = NEW(length, unsigned char);
-@@ -2491,16 +2461,21 @@
-   RELEASE(prev);
-   RELEASE(buf);
- 
--  return error;
-+  if (error) {
-+    pdf_release_obj(dst);
-+    dst = NULL;
-+  }
-+
-+  return dst;
- }
- 
--static int
--pdf_add_stream_flate_filtered (pdf_obj *dst, const void *data, int len, struct decode_parms *parms)
-+static pdf_obj *
-+filter_stream_decode_FlateDecode (const void *data, size_t len, struct decode_parms *parms)
- {
--  pdf_obj *tmp;
--  z_stream z;
--  Bytef    wbuf[WBUF_SIZE];
--  int      error;
-+  pdf_obj  *dst;
-+  pdf_obj  *tmp;
-+  z_stream  z;
-+  Bytef     wbuf[WBUF_SIZE];
- 
-   z.zalloc = Z_NULL; z.zfree = Z_NULL; z.opaque = Z_NULL;
- 
-@@ -2509,7 +2484,7 @@
- 
-   if (inflateInit(&z) != Z_OK) {
-     WARN("inflateInit() failed.");
--    return -1;
-+    return NULL;
-   }
- 
-   tmp = pdf_new_stream(0);
-@@ -2521,7 +2496,8 @@
-     else if (status != Z_OK) {
-       WARN("inflate() failed. Broken PDF file?");
-       inflateEnd(&z);
--      return -1;
-+      pdf_release_obj(tmp);
-+      return NULL;
-     }
- 
-     if (z.avail_out == 0) {
-@@ -2534,79 +2510,310 @@
-   if (WBUF_SIZE - z.avail_out > 0)
-     pdf_add_stream(tmp, wbuf, WBUF_SIZE - z.avail_out);
- 
--  error = filter_decoded(dst, pdf_stream_dataptr(tmp), pdf_stream_length(tmp), parms);
-+  if (inflateEnd(&z) == Z_OK) {
-+    if (parms) { 
-+      dst = filter_stream_decode_Predictor(pdf_stream_dataptr(tmp), pdf_stream_length(tmp), parms);
-+    } else {
-+      dst = pdf_link_obj(tmp);
-+    }
-+  } else {
-+    dst = NULL;
-+  }
-   pdf_release_obj(tmp);
- 
--  return ((!error && inflateEnd(&z) == Z_OK) ? 0 : -1);
-+  return dst;
- }
- #endif
- 
--int
--pdf_concat_stream (pdf_obj *dst, pdf_obj *src)
-+static pdf_obj *
-+filter_stream_decode_ASCIIHexDecode (const void *data, size_t len)
-+{
-+  pdf_obj       *dst;
-+  int            eod, error;
-+  const char    *p = (const char *) data;
-+  const char    *endptr = p + len;
-+  unsigned char *buf, ch;
-+  size_t         pos, n;
-+
-+  buf = NEW((len+1)/2, unsigned char);
-+  skip_white(&p, endptr);
-+  ch = 0; n = 0; pos = 0; eod = 0; error = 0;
-+  while (p < endptr && !error && !eod) {
-+    char c1, val;
-+    c1 = p[0];
-+    if (c1 >= 'A' && c1 <= 'F') {
-+      val = c1 - 'A' + 10;
-+    } else if (c1 >= 'a' && c1 <= 'f') {
-+      val = c1 - 'a' + 10;
-+    } else if (c1 >= '0' && c1 <= '9') {
-+      val = c1 - '0';
-+    } else if (c1 == '>') {
-+      val = 0;
-+      eod = 1;
-+      if ((pos % 2) == 0)
-+        break;
-+    } else {
-+      error = -1;
-+      break;
-+    }
-+    if (pos % 2) {
-+      buf[n] = ch + val;
-+      n++;
-+      ch = 0;
-+    } else {
-+      ch = val << 4;
-+    }
-+    pos++; p++;
-+    skip_white(&p, endptr);
-+  }
-+  if (error || !eod) {
-+    WARN("Invalid ASCIIHex data seen: %s", error ? "Invalid character" : "No EOD marker");
-+    dst = NULL;
-+  } else {
-+    dst = pdf_new_stream(0);
-+    pdf_add_stream(dst, buf, n);
-+  }
-+  RELEASE(buf);
-+
-+  return dst;
-+}
-+
-+/* Percent sign is not start of comment here.
-+ * We need this for reading Ascii85 encoded data.
-+ */
-+#define is_space(c) ((c) == ' '  || (c) == '\t' || (c) == '\f' || \
-+		     (c) == '\r' || (c) == '\n' || (c) == '\0')
-+static void
-+skip_white_a85 (const char **p, const char *endptr)
-+{
-+  while (*p < endptr && (is_space(**p))) {
-+    (*p)++;
-+  } 
-+}
-+
-+static pdf_obj *
-+filter_stream_decode_ASCII85Decode (const void *data, size_t len)
- {
-+  pdf_obj       *dst;
-+  int            eod, error;
-+  const char    *p = (const char *) data;
-+  const char    *endptr = p + len;
-+  unsigned char *buf;
-+  size_t         n;
-+
-+  buf = NEW(((len+4)/5)*4, unsigned char);
-+  skip_white_a85(&p, endptr);
-+  n = 0; eod = 0; error = 0;
-+  while (p < endptr && !error && !eod) {
-+    char q[5] = {'u', 'u', 'u', 'u', 'u'};
-+    int  m;
-+    char ch;
-+
-+    ch = p[0];
-+    p++;
-+    skip_white_a85(&p, endptr);
-+    if (ch == 'z') {
-+      memset(buf+n, 0, 4);
-+      n += 4;
-+      continue;
-+    } else if (ch == '~') {
-+      if (p < endptr && p[0] == '>') {
-+        eod = 1;
-+        p++;
-+      } else {
-+        error = -1;
-+      }
-+      break;
-+    }
-+    q[0] = ch;
-+    for (m = 1; m < 5 && p < endptr; m++) {
-+      ch = p[0];
-+      p++;
-+      skip_white_a85(&p, endptr);
-+      if (ch == '~') {
-+        if (p < endptr && p[0] == '>') {
-+          eod = 1;
-+          p++;
-+        } else {
-+          error = -1;
-+        }
-+        break;
-+      } else if (ch < '!' || ch > 'u') {
-+        error = -1;
-+        break;
-+      } else {
-+        q[m] = ch;
-+      }
-+    }
-+    if (!error) {
-+      uint32_t val = 0;
-+      int      i;
-+      if (m <= 1) {
-+        error = -1;
-+        break;
-+      }
-+      val = 85*85*85*(q[0] - '!') + 85*85*(q[1] - '!')
-+              + 85*(q[2] - '!') + (q[3] - '!');
-+      /* Check overflow */
-+      if (val > UINT32_MAX / 85) {
-+        error = -1;
-+        break;
-+      } else {
-+        val = 85 * val;
-+        if (val > UINT32_MAX - (q[4] - '!')) {
-+          error = -1;
-+          break;
-+        }
-+        val += (q[4] - '!');
-+      }
-+      if (!error) {
-+        for (i = 3; i >= 0; i--) {
-+          buf[n + i] = val & 0xff;
-+          val /= 256;
-+        }
-+        n += m - 1;
-+      }
-+    }
-+  }
-+
-+  if (error) {
-+    WARN("Error in reading ASCII85 data.");
-+    dst = NULL;
-+  } else if (!eod) {
-+    WARN("Error in reading ASCII85 data: No EOD");
-+    dst = NULL;
-+  } else {
-+    dst = pdf_new_stream(0);
-+    pdf_add_stream(dst, buf, n);
-+  }
-+  RELEASE(buf);
-+
-+  return dst;
-+}
-+
-+static pdf_obj *
-+filter_stream_decode (const char *filter_name, pdf_obj *src, pdf_obj *parm)
-+{
-+  pdf_obj    *dec;
-   const char *stream_data;
--  int         stream_length;
--  pdf_obj    *stream_dict;
--  pdf_obj    *filter;
--  int         error = 0;
-+  size_t      stream_length;
- 
--  if (!PDF_OBJ_STREAMTYPE(dst) || !PDF_OBJ_STREAMTYPE(src))
--    ERROR("Invalid type.");
-+  if (!filter_name)
-+    return pdf_link_obj(src);
- 
-   stream_data   = pdf_stream_dataptr(src);
--  stream_length = pdf_stream_length (src);
--  stream_dict   = pdf_stream_dict   (src);
-+  stream_length = pdf_stream_length(src);
- 
--  filter = pdf_lookup_dict(stream_dict, "Filter");
--  if (!filter)
--    pdf_add_stream(dst, stream_data, stream_length);
-+  if (!strcmp(filter_name, "ASCIIHexDecode")) {
-+    dec = filter_stream_decode_ASCIIHexDecode(stream_data, stream_length);
-+  } else if (!strcmp(filter_name, "ASCII85Decode")) {
-+    dec = filter_stream_decode_ASCII85Decode(stream_data, stream_length);
- #if HAVE_ZLIB
--  else {
--    struct decode_parms parms;
--    int    have_parms = 0;
-+  } else if (!strcmp(filter_name, "FlateDecode")) {
-+    struct decode_parms decode_parm;
-+    if (parm)
-+      filter_get_DecodeParms_FlateDecode(&decode_parm, parm);
-+    dec = filter_stream_decode_FlateDecode(stream_data, stream_length, parm ? &decode_parm : NULL);
-+#endif /* HAVE_ZLIB */
-+  } else {
-+    WARN("DecodeFilter \"%s\" not supported.", filter_name);
-+    dec = NULL;
-+  }
- 
--    if (pdf_lookup_dict(stream_dict, "DecodeParms")) {
--      pdf_obj *tmp;
-+  return dec;
-+}
- 
--      /* Dictionary or array */
--      tmp = pdf_deref_obj(pdf_lookup_dict(stream_dict, "DecodeParms"));
--      if (PDF_OBJ_ARRAYTYPE(tmp)) {
--        if (pdf_array_length(tmp) > 1) {
--          WARN("Unexpected size for DecodeParms array.");
--          return -1;
--        }
--        tmp = pdf_deref_obj(pdf_get_array(tmp, 0));
--      }
--      if (!PDF_OBJ_DICTTYPE(tmp)) {
--        WARN("PDF dict expected for DecodeParms...");
--        return -1;
--      }
--      error = get_decode_parms(&parms, tmp);
--      if (error)
--        ERROR("Invalid value(s) in DecodeParms dictionary.");
--      have_parms = 1;
--    }
--    if (PDF_OBJ_ARRAYTYPE(filter)) {
--      if (pdf_array_length(filter) > 1) {
--        WARN("Multiple DecodeFilter not supported.");
-+int
-+pdf_concat_stream (pdf_obj *dst, pdf_obj *src)
-+{
-+  pdf_obj *filtered;
-+  pdf_obj *stream_dict;
-+  pdf_obj *filter, *parms;
-+  int      error = 0;
-+
-+  if (!PDF_OBJ_STREAMTYPE(dst) || !PDF_OBJ_STREAMTYPE(src)) {
-+    WARN("Passed invalid type in pdf_concat_stream().");
-+    return -1;
-+  }
-+
-+  stream_dict = pdf_stream_dict(src);
-+
-+  filter = pdf_lookup_dict(stream_dict, "Filter");
-+  if (!filter) {
-+    pdf_add_stream(dst, pdf_stream_dataptr(src), pdf_stream_length(src));
-+    return 0;
-+  }
-+  if (pdf_lookup_dict(stream_dict, "DecodeParms")) {
-+    /* Dictionary or array */
-+    parms = pdf_deref_obj(pdf_lookup_dict(stream_dict, "DecodeParms"));
-+    if (!parms) {
-+      WARN("Failed to deref DeocdeParms...");
-+      return -1;
-+    } else if (!PDF_OBJ_ARRAYTYPE(parms) && !PDF_OBJ_DICTTYPE(parms)) {
-+      WARN("PDF dict or array expected for DecodeParms...");
-+      pdf_release_obj(parms);
-+      return -1;
-+    }
-+  } else {
-+    parms = NULL;
-+  }
-+  if (PDF_OBJ_ARRAYTYPE(filter)) {
-+    int      i, num;
-+    pdf_obj *prev = NULL;
-+
-+    num = pdf_array_length(filter);
-+    if (parms) {
-+      if (!PDF_OBJ_ARRAYTYPE(parms) || pdf_array_length(parms) != num) {
-+        WARN("Invalid DecodeParam object found.");
-+        pdf_release_obj(parms);
-         return -1;
-       }
--      filter = pdf_get_array(filter, 0);
-     }
--    if (PDF_OBJ_NAMETYPE(filter)) {
--      char  *filter_name = pdf_name_value(filter);
--      if (filter_name && !strcmp(filter_name, "FlateDecode")) {
--        if (have_parms)
--          error = pdf_add_stream_flate_filtered(dst, stream_data, stream_length, &parms);
--        else
--          error = pdf_add_stream_flate(dst, stream_data, stream_length);
--      } else {
--        WARN("DecodeFilter \"%s\" not supported.", filter_name);
--        error = -1;
-+    if (num == 0) {
-+      filtered = pdf_link_obj(src);
-+    } else {
-+      filtered = NULL;
-+      prev = pdf_link_obj(src);
-+      for (i = 0; i < num && prev != NULL; i++) {
-+        pdf_obj *tmp1, *tmp2;
-+
-+        tmp1 = pdf_deref_obj(pdf_get_array(filter, i));
-+        if (parms) {
-+          tmp2 = pdf_deref_obj(pdf_get_array(parms, i));
-+        } else {
-+          tmp2 = NULL;
-+        }
-+        if (PDF_OBJ_NAMETYPE(tmp1)) {
-+          filtered = filter_stream_decode(pdf_name_value(tmp1), prev, tmp2);
-+        } else if (PDF_OBJ_NULLTYPE(tmp1)) {
-+          filtered = pdf_link_obj(prev);
-+        } else {
-+          WARN("Unexpected object found for /Filter...");
-+          filtered = NULL;
-+        }
-+        if (prev)
-+          pdf_release_obj(prev);
-+        if (tmp1)
-+          pdf_release_obj(tmp1);
-+        if (tmp2)
-+          pdf_release_obj(tmp2);
-+        prev = filtered;      
-       }
--    } else
--      ERROR("Broken PDF file?");
--#endif /* HAVE_ZLIB */
-+    }
-+  } else if (PDF_OBJ_NAMETYPE(filter)) {
-+    filtered = filter_stream_decode(pdf_name_value(filter), src, parms);
-+  } else {
-+    WARN("Invalid value for /Filter found.");
-+    filtered = NULL;
-+  }
-+  if (parms)
-+    pdf_release_obj(parms);
-+  if (filtered) {
-+    pdf_add_stream(dst, pdf_stream_dataptr(filtered), pdf_stream_length(filtered));
-+    pdf_release_obj(filtered);
-+    error = 0;
-+  } else {
-+    error = -1;
-   }
- 
-   return error;
-diff -Naur a/texk/dvipdfm-x/pdfobj.h b/texk/dvipdfm-x/pdfobj.h
---- a/texk/dvipdfm-x/pdfobj.h	2018-09-15 22:18:43.000000000 +0100
-+++ b/texk/dvipdfm-x/pdfobj.h	2019-05-31 22:00:04.008964031 +0100
-@@ -1,6 +1,6 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
--    Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata,
-+    Copyright (C) 2007-2019 by Jin-Hwan Cho and Shunsaku Hirata,
-     the dvipdfmx project team.
-     
-     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
-@@ -152,11 +152,6 @@
- extern void        pdf_add_stream        (pdf_obj *stream,
-                                           const void *stream_data_ptr,
-                                           int stream_data_len);
--#if HAVE_ZLIB
--extern int         pdf_add_stream_flate  (pdf_obj *stream,
--                                          const void *stream_data_ptr,
--                                          int stream_data_len);
--#endif
- extern int         pdf_concat_stream     (pdf_obj *dst, pdf_obj *src);
- extern pdf_obj    *pdf_stream_dict       (pdf_obj *stream);
- extern int         pdf_stream_length     (pdf_obj *stream);
-diff -Naur a/texk/dvipdfm-x/pdfximage.c b/texk/dvipdfm-x/pdfximage.c
---- a/texk/dvipdfm-x/pdfximage.c	2018-09-14 04:34:50.000000000 +0100
-+++ b/texk/dvipdfm-x/pdfximage.c	2019-05-31 22:00:04.008964031 +0100
-@@ -1,6 +1,6 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
--    Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata,
-+    Copyright (C) 2007-2019 by Jin-Hwan Cho and Shunsaku Hirata,
-     the dvipdfmx project team.
-     
-     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
-@@ -363,6 +363,10 @@
- #define dpx_fopen(n,m) (MFOPEN((n),(m)))
- #define dpx_fclose(f)  (MFCLOSE((f)))
- 
-+#if defined(WIN32)
-+int utf8name_failed = 0;
-+#endif /* WIN32 */
-+
- int
- pdf_ximage_findresource (const char *ident, load_options options)
- {
-@@ -394,8 +398,23 @@
-     strcpy(fullname, f);
-   } else {
-     /* try loading image */
-+#if defined(WIN32)
-+    utf8name_failed = 0;
-+#endif /* WIN32 */
-     fullname = dpx_find_file(ident, "_pic_", "");
-+#if defined(WIN32)
-+    if (!fullname && file_system_codepage != win32_codepage) {
-+      int tmpcp = file_system_codepage;
-+      utf8name_failed = 1;
-+      file_system_codepage = win32_codepage;
-+      fullname = dpx_find_file(ident, "_pic_", "");
-+      file_system_codepage = tmpcp;
-+    }
-+#endif /* WIN32 */
-     if (!fullname) {
-+#if defined(WIN32)
-+      utf8name_failed = 0;
-+#endif /* WIN32 */
-       WARN("Error locating image file \"%s\"", ident);
-       return  -1;
-     }
-diff -Naur a/texk/dvipdfm-x/README b/texk/dvipdfm-x/README
---- a/texk/dvipdfm-x/README	2015-07-06 17:13:08.000000000 +0100
-+++ b/texk/dvipdfm-x/README	2019-05-31 22:00:04.006964029 +0100
-@@ -1,9 +1,17 @@
- dvipdfmx and xdvipdfmx for TeX Live
- ===================================
- 
-+This package is released under the GNU GPL, version 2, or (at your
-+option) any later version.
-+
-+dvipdfmx is now maintained as part of TeX Live.
-+
-+Mailing list for bug reports and all discussion:
-+https://lists.tug.org/dvipdfmx; anyone can join the list, but it is not
-+necessary to join to post. Archives are public.
-+
- xdvipdfmx
- =========
--
- xdvipdfmx is an extended version of dvipdfmx, and is now incorporated in
- the same sources.
- 
-@@ -15,8 +23,6 @@
- redistributed under the terms of the GNU General Public License,
- version 2 or (at your option) any later version.
- 
--There is a hope to merge xdvipdfmx into dvipdfmx.
--
- Jonathan Kew mentions that in the past, XeTeX used a Mac-specific
- program xdv2pdf as the backend instead of xdvipdfmx.  xdv2pdf supported
- a couple of special effects that are not yet available through
-@@ -26,18 +32,8 @@
- if anyone is looking for some nontrivial but not-impossible job and
- happens across this file.
- 
--The dvipdfmx Project
--====================
--
--Copyright (C) 2002-2014 by Jin-Hwan Cho, Shunsaku Hirata, 
--Matthias Franz, and the dvipdfmx project team.  This package is released
--under the GNU GPL, version 2, or (at your option) any later version.
--
--dvipdfmx is now maintained as part of TeX Live.
--
- Contents
- --------
--
- 1. Introduction
- 
- 2. Installation
-diff -Naur a/texk/dvipdfm-x/spc_pdfm.c b/texk/dvipdfm-x/spc_pdfm.c
---- a/texk/dvipdfm-x/spc_pdfm.c	2019-03-30 03:42:07.000000000 +0000
-+++ b/texk/dvipdfm-x/spc_pdfm.c	2019-05-31 22:00:04.008964031 +0100
-@@ -597,6 +597,7 @@
-   return  dict;
- }
- 
-+#define SPC_PDFM_SUPPORT_ANNOT_TRANS 1
- static int
- spc_handler_pdfm_annot (struct spc_env *spe, struct spc_arg *args)
- {
-@@ -604,7 +605,6 @@
-   pdf_obj       *annot_dict;
-   pdf_rect       rect;
-   char          *ident = NULL;
--  pdf_coord      cp;
-   transform_info ti;
- 
-   skip_white(&args->curptr, args->endptr);
-@@ -642,19 +642,96 @@
-     return  -1;
-   }
- 
--  cp.x = spe->x_user; cp.y = spe->y_user;
--  pdf_dev_transform(&cp, NULL);
--  if (ti.flags & INFO_HAS_USER_BBOX) {
--    rect.llx = ti.bbox.llx + cp.x;
--    rect.lly = ti.bbox.lly + cp.y;
--    rect.urx = ti.bbox.urx + cp.x;
--    rect.ury = ti.bbox.ury + cp.y;
--  } else {
--    rect.llx = cp.x;
--    rect.lly = cp.y - spe->mag * ti.depth;
--    rect.urx = cp.x + spe->mag * ti.width;
--    rect.ury = cp.y + spe->mag * ti.height;
-+#ifdef SPC_PDFM_SUPPORT_ANNOT_TRANS
-+  {
-+    pdf_coord cp1, cp2, cp3, cp4;
-+    /* QuadPoints not working? */
-+#ifdef USE_QUADPOINTS
-+    pdf_obj  *qpoints;
-+#endif
-+    if (ti.flags & INFO_HAS_USER_BBOX) {
-+      cp1.x = spe->x_user + ti.bbox.llx;
-+      cp1.y = spe->y_user + ti.bbox.lly;
-+      cp2.x = spe->x_user + ti.bbox.urx;
-+      cp2.y = spe->y_user + ti.bbox.lly;
-+      cp3.x = spe->x_user + ti.bbox.urx;
-+      cp3.y = spe->y_user + ti.bbox.ury;
-+      cp4.x = spe->x_user + ti.bbox.llx;
-+      cp4.y = spe->y_user + ti.bbox.ury;
-+    } else {
-+      cp1.x = spe->x_user;
-+      cp1.y = spe->y_user - spe->mag * ti.depth;
-+      cp2.x = spe->x_user + spe->mag * ti.width;
-+      cp2.y = spe->y_user - spe->mag * ti.depth;
-+      cp3.x = spe->x_user + spe->mag * ti.width;
-+      cp3.y = spe->y_user + spe->mag * ti.height;
-+      cp4.x = spe->x_user;
-+      cp4.y = spe->y_user + spe->mag * ti.height;
-+    }
-+    pdf_dev_transform(&cp1, NULL);
-+    pdf_dev_transform(&cp2, NULL);
-+    pdf_dev_transform(&cp3, NULL);
-+    pdf_dev_transform(&cp4, NULL);
-+    rect.llx = cp1.x;
-+    if (cp2.x < rect.llx)
-+      rect.llx = cp2.x;
-+    if (cp3.x < rect.llx)
-+      rect.llx = cp3.x;
-+    if (cp4.x < rect.llx)
-+      rect.llx = cp4.x;
-+    rect.urx = cp1.x;
-+    if (cp2.x > rect.urx)
-+      rect.urx = cp2.x;
-+    if (cp3.x > rect.urx)
-+      rect.urx = cp3.x;
-+    if (cp4.x > rect.urx)
-+      rect.urx = cp4.x;
-+    rect.lly = cp1.y;
-+    if (cp2.y < rect.lly)
-+      rect.lly = cp2.y;
-+    if (cp3.y < rect.lly)
-+      rect.lly = cp3.y;
-+    if (cp4.y < rect.lly)
-+      rect.lly = cp4.y;
-+    rect.ury = cp1.y;
-+    if (cp2.y > rect.ury)
-+      rect.ury = cp2.y;
-+    if (cp3.y > rect.ury)
-+      rect.ury = cp3.y;
-+    if (cp4.y > rect.ury)
-+      rect.ury = cp4.y;
-+#ifdef USE_QUADPOINTS
-+    qpoints = pdf_new_array();
-+    pdf_add_array(qpoints, pdf_new_number(ROUND(cp1.x, 0.01)));
-+    pdf_add_array(qpoints, pdf_new_number(ROUND(cp1.y, 0.01)));
-+    pdf_add_array(qpoints, pdf_new_number(ROUND(cp2.x, 0.01)));
-+    pdf_add_array(qpoints, pdf_new_number(ROUND(cp2.y, 0.01)));
-+    pdf_add_array(qpoints, pdf_new_number(ROUND(cp3.x, 0.01)));
-+    pdf_add_array(qpoints, pdf_new_number(ROUND(cp3.y, 0.01)));
-+    pdf_add_array(qpoints, pdf_new_number(ROUND(cp4.x, 0.01)));
-+    pdf_add_array(qpoints, pdf_new_number(ROUND(cp4.y, 0.01)));
-+    pdf_add_dict(annot_dict, pdf_new_name("QuadPoints"), qpoints);
-+#endif    
-   }
-+#else
-+  {
-+    pdf_coord cp;
-+
-+    cp.x = spe->x_user; cp.y = spe->y_user;
-+    pdf_dev_transform(&cp, NULL);
-+    if (ti.flags & INFO_HAS_USER_BBOX) {
-+      rect.llx = ti.bbox.llx + cp.x;
-+      rect.lly = ti.bbox.lly + cp.y;
-+      rect.urx = ti.bbox.urx + cp.x;
-+      rect.ury = ti.bbox.ury + cp.y;
-+    } else {
-+      rect.llx = cp.x;
-+      rect.lly = cp.y - spe->mag * ti.depth;
-+      rect.urx = cp.x + spe->mag * ti.width;
-+      rect.ury = cp.y + spe->mag * ti.height;
-+    }
-+  }
-+#endif
- 
-   /* Order is important... */
-   if (ident)
-diff -Naur a/texk/dvipdfm-x/specials.c b/texk/dvipdfm-x/specials.c
---- a/texk/dvipdfm-x/specials.c	2019-03-29 22:13:05.000000000 +0000
-+++ b/texk/dvipdfm-x/specials.c	2019-05-31 22:00:04.008964031 +0100
-@@ -169,12 +169,12 @@
-   switch (k) {
-   /* xpos and ypos must be position in device space here. */
-   case  K_OBJ__XPOS:
--    cp.x = dvi_dev_xpos(); cp.y = 0.0;
-+    cp.x = dvi_dev_xpos(); cp.y = dvi_dev_ypos();
-     pdf_dev_transform(&cp, NULL);
-     value = pdf_new_number(ROUND(cp.x, .01));
-     break;
-   case  K_OBJ__YPOS:
--    cp.x = 0.0; cp.y = dvi_dev_ypos();
-+    cp.x = dvi_dev_xpos(); cp.y = dvi_dev_ypos();
-     pdf_dev_transform(&cp, NULL);
-     value = pdf_new_number(ROUND(cp.y, .01));
-     break;
-@@ -233,12 +233,12 @@
-   for (k = 0; _rkeys[k] && strcmp(key, _rkeys[k]); k++);
-   switch (k) {
-   case  K_OBJ__XPOS:
--    cp.x = dvi_dev_xpos(); cp.y = 0.0;
-+    cp.x = dvi_dev_xpos(); cp.y = dvi_dev_ypos();
-     pdf_dev_transform(&cp, NULL);
-     value = pdf_new_number(ROUND(cp.x, .01));
-     break;
-   case  K_OBJ__YPOS:
--    cp.x = 0.0; cp.y = dvi_dev_ypos();
-+    cp.x = dvi_dev_xpos(); cp.y = dvi_dev_ypos();
-     pdf_dev_transform(&cp, NULL);
-     value = pdf_new_number(ROUND(cp.y, .01));
-     break;
-diff -Naur a/texk/dvipdfm-x/tt_cmap.c b/texk/dvipdfm-x/tt_cmap.c
---- a/texk/dvipdfm-x/tt_cmap.c	2019-02-25 10:27:33.000000000 +0000
-+++ b/texk/dvipdfm-x/tt_cmap.c	2019-05-31 22:00:04.009964032 +0100
-@@ -1,6 +1,6 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
--    Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata,
-+    Copyright (C) 2002-2019 by Jin-Hwan Cho and Shunsaku Hirata,
-     the dvipdfmx project team.
-     
-     This program is free software; you can redistribute it and/or modify
-@@ -68,11 +68,12 @@
-   struct cmap0 *map;
-   int    i;
- 
--  if (len < 256)
--    ERROR("invalid cmap subtable");
-+  if (len < 256) {
-+    WARN("invalid format 0 TT cmap subtable");
-+    return NULL;
-+  }
- 
-   map = NEW(1, struct cmap0);
--
-   for (i = 0; i < 256; i++)
-     map->glyphIndexArray[i] = sfnt_get_byte(sfont);
- 
-@@ -114,14 +115,14 @@
-   struct cmap2 *map;
-   USHORT i, n;
- 
--  if (len < 512)
--    ERROR("invalid cmap subtable");
--    
--  map = NEW(1, struct cmap2);
-+  if (len < 512) {
-+    WARN("invalid fromt2 TT cmap subtable");
-+    return NULL;
-+  }
- 
-+  map = NEW(1, struct cmap2);
-   for (i = 0; i < 256; i++)
-     map->subHeaderKeys[i] = sfnt_get_ushort(sfont);
--
-   for (n = 0, i = 0; i < 256; i++) {
-     map->subHeaderKeys[i] /= 8;
-     if (n < map->subHeaderKeys[i])
-@@ -129,7 +130,13 @@
-   }
-   n += 1; /* the number of subHeaders is one plus the max of subHeaderKeys */
- 
--  map->subHeaders = NEW(n, struct SubHeader); 
-+  if (len < 512 +  n * 8 ) {
-+    WARN("invalid/truncated format2 TT cmap subtable");
-+    RELEASE(map);
-+    return NULL;
-+  }
-+
-+  map->subHeaders = NEW(n, struct SubHeader);
-   for (i = 0; i < n; i++) {
-     map->subHeaders[i].firstCode     = sfnt_get_ushort(sfont);
-     map->subHeaders[i].entryCount    = sfnt_get_ushort(sfont);
-@@ -222,8 +229,10 @@
-   struct cmap4 *map;
-   USHORT i, n, segCount;
- 
--  if (len < 8)
--    ERROR("invalid cmap subtable");
-+  if (len < 8) {
-+    WARN("invalid format 4 TT cmap subtable");
-+    return NULL;
-+  }
- 
-   map = NEW(1, struct cmap4);
- 
-@@ -288,19 +297,19 @@
-    * Last segment maps 0xffff to gid 0 (?)
-   */
-   i = segCount = map->segCountX2 / 2;
--  while (i-- > 0 &&  cc <= map->endCount[i]) {
-+  while (i-- > 0 && cc <= map->endCount[i]) {
-     if (cc >= map->startCount[i]) {
-       if (map->idRangeOffset[i] == 0) {
--	gid = (cc + map->idDelta[i]) & 0xffff;
-+        gid = (cc + map->idDelta[i]) & 0xffff;
-       } else if (cc == 0xffff && map->idRangeOffset[i] == 0xffff) {
--	/* this is for protection against some old broken fonts... */
--	gid = 0;
-+        /* this is for protection against some old broken fonts... */
-+        gid = 0;
-       } else {
--	j  = map->idRangeOffset[i] - (segCount - i) * 2;
--	j  = (cc - map->startCount[i]) + (j / 2);
--	gid = map->glyphIndexArray[j];
--	if (gid != 0)
--	  gid = (gid + map->idDelta[i]) & 0xffff;
-+        j = map->idRangeOffset[i] - (segCount - i) * 2;
-+        j = (cc - map->startCount[i]) + (j / 2);
-+        gid = map->glyphIndexArray[j];
-+        if (gid != 0)
-+          gid = (gid + map->idDelta[i]) & 0xffff;
-       }
-       break;
-     }
-@@ -323,14 +332,15 @@
-   struct cmap6 *map;
-   USHORT i;
-   
--  if (len < 4)
--    ERROR("invalid cmap subtable");
-+  if (len < 4) {
-+    WARN("invalid format 6 TT cmap subtable");
-+    return NULL;
-+  }
- 
-   map =  NEW(1, struct cmap6);
-   map->firstCode       = sfnt_get_ushort(sfont);
-   map->entryCount      = sfnt_get_ushort(sfont);
--  map->glyphIndexArray = NEW(map->entryCount, USHORT);
--  
-+  map->glyphIndexArray = NEW(map->entryCount, USHORT);  
-   for (i = 0; i < map->entryCount; i++)
-     map->glyphIndexArray[i] = sfnt_get_ushort(sfont);
- 
-@@ -390,13 +400,14 @@
-   struct cmap12 *map;
-   ULONG  i;
-   
--  if (len < 4)
--    ERROR("invalid cmap subtable");
-+  if (len < 4) {
-+    WARN("invalid format 12 TT cmap subtable");
-+    return NULL;
-+  }
- 
-   map =  NEW(1, struct cmap12);
-   map->nGroups = sfnt_get_ulong(sfont);
-   map->groups  = NEW(map->nGroups, struct charGroup);
--
-   for (i = 0; i < map->nGroups; i++) {
-     map->groups[i].startCharCode = sfnt_get_ulong(sfont);
-     map->groups[i].endCharCode   = sfnt_get_ulong(sfont);
-@@ -427,8 +438,8 @@
- 	 cccc <= map->groups[i].endCharCode) {
-     if (cccc >= map->groups[i].startCharCode) {
-       gid = (USHORT) ((cccc -
--		       map->groups[i].startCharCode +
--		       map->groups[i].startGlyphID) & 0xffff);
-+		                   map->groups[i].startCharCode +
-+		                   map->groups[i].startGlyphID) & 0xffff);
-       break;
-     }
-   }
-@@ -510,6 +521,7 @@
-     WARN("Unrecognized OpenType/TrueType cmap format.");
-     tt_cmap_release(cmap);
-     return NULL;
-+    break;
-   }
- 
-   if (!cmap->map) {
-@@ -526,24 +538,25 @@
- 
-   if (cmap) {
-     if (cmap->map) {
--      switch(cmap->format) {
-+      switch (cmap->format) {
-       case 0:
--	release_cmap0(cmap->map);
--	break;
-+        release_cmap0(cmap->map);
-+        break;
-       case 2:
--	release_cmap2(cmap->map);
--	break;
-+        release_cmap2(cmap->map);
-+        break;
-       case 4:
--	release_cmap4(cmap->map);
--	break;
-+        release_cmap4(cmap->map);
-+        break;
-       case 6:
--	release_cmap6(cmap->map);
--	break;
-+        release_cmap6(cmap->map);
-+        break;
-       case 12:
--	release_cmap12(cmap->map);
--	break;
-+        release_cmap12(cmap->map);
-+        break;
-       default:
--	ERROR("Unrecognized OpenType/TrueType cmap format.");
-+        WARN("Unrecognized OpenType/TrueType cmap format: %d", cmap->format);
-+        break;
-       }
-     }
-     RELEASE(cmap);
-@@ -582,129 +595,20 @@
-     gid = lookup_cmap12(cmap->map, (ULONG) cc);
-     break;
-   default:
--    ERROR("Unrecognized OpenType/TrueType cmap subtable format");
-+    WARN("Unrecognized OpenType/TrueType cmap subtable format: %d", cmap->format);
-     break;
-   }
- 
-   return gid;
- }
- 
--/* Sorry for placing this here.
-- * We need to rewrite TrueType font support code...
-- */
- 
--#define WBUF_SIZE 1024
--static unsigned char wbuf[WBUF_SIZE];
- 
- static unsigned char srange_min[2] = {0x00, 0x00};
- static unsigned char srange_max[2] = {0xff, 0xff};
- static unsigned char lrange_min[4] = {0x00, 0x00, 0x00, 0x00};
- static unsigned char lrange_max[4] = {0x7f, 0xff, 0xff, 0xff};
- 
--static void
--load_cmap4 (struct cmap4 *map,
--	    unsigned char *GIDToCIDMap,
--        otl_gsub *gsub_vert, otl_gsub *gsub_list,
--        CMap *cmap, CMap *tounicode_add)
--{
--  USHORT  c0, c1, gid, cid;
--  USHORT  j, d, segCount;
--  USHORT  ch;
--  int     i;
--
--  segCount = map->segCountX2 / 2;
--  for (i = segCount - 1; i >= 0 ; i--) {
--    c0 = map->startCount[i];
--    c1 = map->endCount[i];
--    d  = map->idRangeOffset[i] / 2 - (segCount - i);
--    for (j = 0; j <= c1 - c0; j++) {
--      ch = c0 + j;
--      if (map->idRangeOffset[i] == 0) {
--	gid = (ch + map->idDelta[i]) & 0xffff;
--      } else if (c0 == 0xffff && c1 == 0xffff &&
--                   map->idRangeOffset[i] == 0xffff) {
--	/* this is for protection against some old broken fonts... */
--	gid = 0;
--      } else {
--        gid = (map->glyphIndexArray[j+d] + map->idDelta[i]) & 0xffff;
--      }
--      if (gid != 0 && gid != 0xffff) {
--        if (gsub_list)
--          otl_gsub_apply_chain(gsub_list, &gid);
--        if (gsub_vert)
--          otl_gsub_apply(gsub_vert, &gid);
--	if (GIDToCIDMap) {
--	  cid = ((GIDToCIDMap[2*gid] << 8)|GIDToCIDMap[2*gid+1]);
--	  if (cid == 0)
--            WARN("GID %u does not have corresponding CID %u.", gid, cid);
--	} else {
--	  cid = gid;
--	}
--	wbuf[0] = 0;
--	wbuf[1] = 0;
--	wbuf[2] = (ch >> 8) & 0xff;
--	wbuf[3] =  ch & 0xff;
--	wbuf[4] = (cid >> 8) & 0xff;
--	wbuf[5] =  cid & 0xff;
--	CMap_add_cidchar(cmap, wbuf, 4, cid);
--	if (tounicode_add) {
--	  unsigned char *p = wbuf + 6;
--	  size_t   uc_len;
--	  uc_len = UC_UTF16BE_encode_char(ch, &p, wbuf + WBUF_SIZE -1 );
--	  CMap_add_bfchar(tounicode_add, wbuf+4, 2, wbuf+6, uc_len);
--	}
--      }
--    }
--  }
--
--  return;
--}
--
--static void
--load_cmap12 (struct cmap12 *map,
--	     unsigned char *GIDToCIDMap,
--         otl_gsub *gsub_vert, otl_gsub *gsub_list,
--         CMap *cmap, CMap *tounicode_add)
--{
--  ULONG   i, ch;  /* LONG ? */
--  USHORT  gid, cid;
--
--  for (i = 0; i < map->nGroups; i++) {
--    for (ch  = map->groups[i].startCharCode;
--	 ch <= map->groups[i].endCharCode;
--	 ch++) {
--      int  d = ch - map->groups[i].startCharCode;
--      gid = (USHORT) ((map->groups[i].startGlyphID + d) & 0xffff);
--      if (gsub_list)
--        otl_gsub_apply_chain(gsub_list, &gid);
--      if (gsub_vert)
--        otl_gsub_apply(gsub_vert, &gid);
--      if (GIDToCIDMap) {
--	cid = ((GIDToCIDMap[2*gid] << 8)|GIDToCIDMap[2*gid+1]);
--	if (cid == 0)
--	  WARN("GID %u does not have corresponding CID %u.", gid, cid);
--      } else {
--	cid = gid;
--      }
--      wbuf[0] = (ch >> 24) & 0xff;
--      wbuf[1] = (ch >> 16) & 0xff;
--      wbuf[2] = (ch >>  8) & 0xff;
--      wbuf[3] = ch & 0xff;
--      wbuf[4] = (cid >> 8) & 0xff;
--      wbuf[5] =  cid & 0xff;
--      CMap_add_cidchar(cmap, wbuf, 4, cid);
--      if (tounicode_add) {
--          unsigned char *p = wbuf + 6;
--          size_t   uc_len;
--          uc_len = UC_UTF16BE_encode_char(ch, &p, wbuf + WBUF_SIZE -1 );
--          CMap_add_bfchar(tounicode_add, wbuf+4, 2, wbuf+6, uc_len);
--      }
--    }
--  }
--
--  return;
--}
--
- /* OpenType CIDFont:
-  *
-  *  We don't use GID for them. OpenType cmap table is for
-@@ -717,78 +621,37 @@
- #include "cff_dict.h"
- #include "cff.h"
- 
--static int
--handle_CIDFont (sfnt *sfont,
--		unsigned char **GIDToCIDMap, CIDSysInfo *csi)
--{
--  cff_font *cffont;
--  int       offset, i;
--  card16    num_glyphs, gid;
--  cff_charsets  *charset;
--  unsigned char *map;
--  struct tt_maxp_table *maxp;
--
--  ASSERT(csi);
--
--  offset = sfnt_find_table_pos(sfont, "CFF ");
--  if (offset == 0) {
--    csi->registry = NULL;
--    csi->ordering = NULL;
--    *GIDToCIDMap  = NULL;
--    return 0;
--  }
--
--  maxp       = tt_read_maxp_table(sfont);
--  num_glyphs = (card16) maxp->numGlyphs;
--  RELEASE(maxp);
--  if (num_glyphs < 1)
--    ERROR("No glyph contained in this font...");
--
--  cffont = cff_open(sfont->stream, offset, 0);
--  if (!cffont)
--    ERROR("Could not open CFF font...");
--
--  
--  if (!(cffont->flag & FONTTYPE_CIDFONT)) {
--    cff_close(cffont);
--    csi->registry = NULL;
--    csi->ordering = NULL;
--    *GIDToCIDMap  = NULL;
--    return 0;
--  }
-+/* This should be moved to cff.c */
-+static void
-+create_GIDToCIDMap (uint16_t *GIDToCIDMap, uint16_t num_glyphs, cff_font *cffont)
-+{
-+  cff_charsets *charset;
-+  uint16_t      gid, i;
- 
--  if (!cff_dict_known(cffont->topdict, "ROS")) {
--    ERROR("No CIDSystemInfo???");
--  } else {
--    card16 reg, ord;
-+  ASSERT(GIDToCIDMap);
- 
--    reg = (card16) cff_dict_get(cffont->topdict, "ROS", 0);
--    ord = (card16) cff_dict_get(cffont->topdict, "ROS", 1);
-+  if (!cffont || !(cffont->flag & FONTTYPE_CIDFONT)) {
-+    for (gid = 0; gid < num_glyphs; gid++) {
-+      GIDToCIDMap[gid] = gid;
-+    }
- 
--    csi->registry = cff_get_string(cffont, reg);
--    csi->ordering = cff_get_string(cffont, ord);
--    csi->supplement = (int) cff_dict_get(cffont->topdict, "ROS", 2);
-+    return;
-   }
- 
--  cff_read_charsets(cffont);
--  charset = cffont->charsets;
--  if (!charset) {
--    ERROR("No CFF charset data???");
--  }
-+  memset(GIDToCIDMap, 0, num_glyphs*sizeof(uint16_t));
- 
--  map     = NEW(65536 * 2, unsigned char);
--  memset(map, 0, 65536 * 2);
-+  charset = cffont->charsets;
-+  if (!charset)
-+    return;
-   switch (charset->format) {
-   case 0:
-     {
-       s_SID   *cids; /* CID... */
--
-+      
-       cids = charset->data.glyphs;
--      for (gid = 1, i = 0;
--	         i < charset->num_entries; i++) {
--	      map[2*gid  ] = (cids[i] >> 8) & 0xff;
--	      map[2*gid+1] = cids[i] & 0xff;
--	      gid++;
-+      for (gid = 1, i = 0; i < charset->num_entries; i++) {
-+        GIDToCIDMap[gid] = cids[i];
-+        gid++;
-       }
-     }
-     break;
-@@ -798,16 +661,14 @@
-       card16      cid, count;
- 
-       ranges = charset->data.range1;
--      for (gid = 1, i = 0;
--	         i < charset->num_entries; i++) {
--	      cid   = ranges[i].first;
--	      count = ranges[i].n_left + 1; /* card8 */
--	      while (count-- > 0 &&
--	             gid <= num_glyphs) {
--	        map[2*gid    ] = (cid >> 8) & 0xff;
--	        map[2*gid + 1] = cid & 0xff;
--	        gid++; cid++;
--	      }
-+      for (gid = 1, i = 0; i < charset->num_entries; i++) {
-+        cid   = ranges[i].first;
-+        count = ranges[i].n_left + 1; /* card8 */
-+        while (count-- > 0 && gid <= num_glyphs) {
-+          GIDToCIDMap[gid] = cid;
-+          gid++;
-+          cid++;
-+        }
-       }
-     }
-     break;
-@@ -817,55 +678,52 @@
-       card16      cid, count;
- 
-       ranges = charset->data.range2;
--      if (charset->num_entries == 1 &&
--	        ranges[0].first == 1) {
--	      /* "Complete" CIDFont */
--	      RELEASE(map); map = NULL;
-+      if (charset->num_entries == 1 && ranges[0].first == 1) {
-+        /* "Complete" CIDFont */
-+        for (gid = 0; gid < num_glyphs; gid++) {
-+          GIDToCIDMap[gid] = gid;
-+        }
-       } else {
--	      /* Not trivial mapping */
--	      for (gid = 1, i = 0;
--	           i < charset->num_entries; i++) {
--	       cid   = ranges[i].first;
--	       count = ranges[i].n_left + 1;
--	       while (count-- > 0 &&
--		              gid <= num_glyphs) {
--	          map[2*gid] = (cid >> 8) & 0xff;
--	          map[2*gid+1] = cid & 0xff;
--	          gid++; cid++;
--	        }
--	      }
-+        /* Not trivial mapping */
-+        for (gid = 1, i = 0; i < charset->num_entries; i++) {
-+          cid   = ranges[i].first;
-+          count = ranges[i].n_left + 1;
-+          while (count-- > 0 && gid <= num_glyphs) {
-+            GIDToCIDMap[gid] = cid;
-+            gid++;
-+            cid++;
-+          }
-+        }
-       }
-     }
-     break;
-   default:
--    RELEASE(map); map = NULL;
--    ERROR("Unknown CFF charset format...: %d", charset->format);
-+    WARN("Unknown CFF charset format...: %d", charset->format);
-     break;
-   }
--  cff_close(cffont);
- 
--  *GIDToCIDMap = map;
--  return 1;
-+  return;
- }
- 
- static int is_PUA_or_presentation (unsigned int uni)
- {
-   /* Some of CJK Radicals Supplement and Kangxi Radicals
-    * are commonly double encoded, lower the priority.
-+   * CJK Compatibility Ideographs & Supplement added.
-    */
-   return  ((uni >= 0x2E80 && uni <= 0x2EF3) || (uni >= 0x2F00 && uni <= 0x2FD5) ||
-            (uni >= 0xE000 && uni <= 0xF8FF) || (uni >= 0xFB00 && uni <= 0xFB4F) ||
-+           (uni >= 0xF900 && uni <= 0xFAFF) || (uni >= 0x2F800 && uni <= 0x2FA1F) ||
-            (uni >= 0xF0000 && uni <= 0xFFFFD) || (uni >= 0x100000 && uni <= 0x10FFFD));
- }
- 
--static char*
--sfnt_get_glyphname(struct tt_post_table *post, cff_font *cffont, USHORT gid)
-+static char *
-+lookup_glyph_name (struct tt_post_table *post, cff_font *cffont, USHORT gid)
- {
--  char* name = NULL;
-+  char *name = NULL;
- 
-   if (post)
-     name = tt_get_glyphname(post, gid);
--
-   if (!name && cffont)
-     name = cff_get_glyphname(cffont, gid);
- 
-@@ -881,94 +739,82 @@
- #define is_used_char2(b,c) (((b)[(c)/8]) & (1 << (7-((c)%8))))
- #endif
- 
--static USHORT
--handle_subst_glyphs (CMap *cmap,
--                     CMap *cmap_add,
--                     const char *used_glyphs,
--                     sfnt *sfont,
--                     cff_font *cffont)
-+static int32_t
-+handle_subst_glyphs (CMap *cmap, CMap *cmap_add, char *used_chars)
- {
--  USHORT count;
--  USHORT i;
--  struct tt_post_table *post = NULL;
--
--  if (!cmap_add)
--    post = tt_read_post_table(sfont);
--
--  for (count = 0, i = 0; i < 8192; i++) {
--    int   j;
--    int32_t  len;
--    int  inbytesleft, outbytesleft;
--    const unsigned char *inbuf;
--    unsigned char *outbuf;
-+  int32_t count = 0;
-+  int32_t cid;
- 
--    if (used_glyphs[i] == 0)
-+  for (cid = 0; cid < 65536; cid++) {
-+    if (!is_used_char2(used_chars, cid))
-       continue;
-+    else {
-+      unsigned char        buf[256];
-+      int                  inbytesleft = 2, outbytesleft = 254;
-+      size_t               len;
-+      unsigned char       *outbuf = buf + 2;
-+      const unsigned char *inbuf  = buf;
-+
-+      buf[0] = (cid >> 8) & 0xff;
-+      buf[1] =  cid & 0xff;
-+      CMap_decode(cmap_add, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-+      if (inbytesleft == 0) {
-+        len = 254 - outbytesleft;
-+        CMap_add_bfchar(cmap, buf, 2, buf + 2, len);
-+        used_chars[cid / 8] &= ~(1 << (7 - (cid % 8)));         
-+        count++;
-+      }
-+    }
-+  }
- 
--    for (j = 0; j < 8; j++) {
--      USHORT gid = 8 * i + j;
-+  return count;
-+}
- 
--      if (!is_used_char2(used_glyphs, gid))
--        continue;
-+static int32_t
-+add_ToUnicode_via_glyph_name (CMap *cmap, char *used_chars, USHORT num_glyphs,
-+                              uint16_t *GIDToCIDMap,
-+                              sfnt *sfont, cff_font *cffont)
-+{
-+  int32_t               count = 0;
-+  USHORT                gid;
-+  struct tt_post_table *post = NULL;
- 
--      if (!cmap_add) {
--#define MAX_UNICODES	16
--        /* try to look up Unicode values from the glyph name... */
--        char* name;
--        int32_t unicodes[MAX_UNICODES];
--        int  unicode_count = -1;
--        name = sfnt_get_glyphname(post, cffont, gid);
--        if (name) {
--          unicode_count = agl_get_unicodes(name, unicodes, MAX_UNICODES);
--        }
-+  post = tt_read_post_table(sfont);
-+  if (!post && !cffont)
-+    return count;
-+
-+  for (gid = 0; gid < num_glyphs; gid++) {
-+    uint16_t cid = GIDToCIDMap[gid];
-+    if (is_used_char2(used_chars, cid)) {
-+#define MAX_UNICODES 32
-+      char   *name;
-+      int32_t unicodes[MAX_UNICODES];
-+      int     unicode_count = -1;
-+
-+      name = lookup_glyph_name(post, cffont, gid);
-+      if (name) {
-+        unicode_count = agl_get_unicodes(name, unicodes, MAX_UNICODES);
- #undef MAX_UNICODES
--        if (unicode_count == -1) {
--          if(dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) {
--            if (name)
--              MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name);
--            else
--              MESG("No Unicode mapping available: GID=%u\n", gid);
--          }
--        } else {
--          /* the Unicode characters go into wbuf[2] and following, in UTF16BE */
--          /* we rely on WBUF_SIZE being more than adequate for MAX_UNICODES  */
--          unsigned char* p = wbuf + 2;
--          int  k;
--          len = 0;
-+        RELEASE(name);
-+        if (unicode_count > 0) {
-+          unsigned char *buf;
-+          unsigned char *p, *endptr;
-+          int            k;
-+          size_t         len = 0;
-+
-+          buf    = NEW(unicode_count*4+2, unsigned char);
-+          p      = buf + 2;
-+          endptr = buf + (unicode_count * 4 + 2);
-           for (k = 0; k < unicode_count; ++k) {
--            len += UC_UTF16BE_encode_char(unicodes[k], &p, wbuf+WBUF_SIZE);
-+            len += UC_UTF16BE_encode_char(unicodes[k], &p, endptr);
-           }
--          wbuf[0] = (gid >> 8) & 0xff;
--          wbuf[1] =  gid & 0xff;
--          CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len);
--        }
--        RELEASE(name);
--      } else {
--        wbuf[0] = (gid >> 8) & 0xff;
--        wbuf[1] =  gid & 0xff;
--
--        inbuf        = wbuf;
--        inbytesleft  = 2;
--        outbuf       = wbuf + 2;
--        outbytesleft = WBUF_SIZE - 2;
--        CMap_decode(cmap_add, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
--
--        if (inbytesleft != 0) {
--          WARN("CMap conversion failed...");
--        } else {
--          len = WBUF_SIZE - 2 - outbytesleft;
--          CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len);
-+          buf[0] = (cid >> 8) & 0xff;
-+          buf[1] =  cid & 0xff;
-+          CMap_add_bfchar(cmap, buf, 2, buf + 2, len);
-+          used_chars[cid / 8] &= ~(1 << (7 - (cid % 8)));         
-           count++;
- 
--          if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) {
--            int _i;
--
--            MESG("otf_cmap>> Additional ToUnicode mapping: <%04X> <", gid);
--            for (_i = 0; _i < len; _i++) {
--              MESG("%02X", wbuf[2 + _i]);
--            }
--            MESG(">\n");
--          }
-+          RELEASE(buf);
-         }
-       }
-     }
-@@ -980,70 +826,11 @@
-   return count;
- }
- 
--static cff_font *
--prepare_CIDFont_from_sfnt(sfnt* sfont)
--{
--  cff_font *cffont;
--  unsigned  offset = 0;
--
--  if (sfont->type != SFNT_TYPE_POSTSCRIPT     ||
--      sfnt_read_table_directory(sfont, 0) < 0 ||
--      (offset = sfnt_find_table_pos(sfont, "CFF ")) == 0) {
--    return NULL;
--  }
--
--  cffont = cff_open(sfont->stream, offset, 0);
--  if (!cffont)
--    return NULL;
--
--  cff_read_charsets(cffont);
--  return cffont;
--}
--
--static USHORT
--add_to_cmap_if_used (CMap *cmap,
--                     cff_font *cffont,
--                     char *used_chars,
--                     USHORT gid,
--                     ULONG ch)
--{
--  USHORT count = 0;
--  USHORT cid = cffont ? cff_charsets_lookup_inverse(cffont, gid) : gid;
--  if (is_used_char2(used_chars, cid)) {
--    int len;
--    unsigned char *p = wbuf + 2;
--
--    count++;
--
--    wbuf[0] = (cid >> 8) & 0xff;
--    wbuf[1] = (cid & 0xff);
--    len = UC_UTF16BE_encode_char((int32_t) ch, &p, wbuf + WBUF_SIZE);
--    CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len);
--
--    /* Skip PUA characters and alphabetic presentation forms, allowing
--     * handle_subst_glyphs() as it might find better mapping. Fixes the
--     * mapping of ligatures encoded in PUA in fonts like Linux Libertine
--     * and old Adobe fonts.
--     */
--    if (!is_PUA_or_presentation(ch)) {
--      /* Avoid duplicate entry
--       * There are problem when two Unicode code is mapped to
--       * single glyph...
--       */
--      used_chars[cid / 8] &= ~(1 << (7 - (cid % 8)));
--    }
--  }
--
--  return count;
--}
--
--static USHORT
--create_ToUnicode_cmap4 (CMap *cmap,
--                        struct cmap4 *map,
--                        char *used_chars,
--                        cff_font *cffont)
-+static void
-+create_inverse_cmap4 (int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                      struct cmap4 *map)
- {
--  USHORT count = 0, segCount = map->segCountX2 / 2;
-+  USHORT segCount = map->segCountX2 / 2;
-   USHORT i, j;
- 
-   for (i = 0; i < segCount; i++) {
-@@ -1062,32 +849,33 @@
-       } else {
-         gid = (map->glyphIndexArray[j + d] + map->idDelta[i]) & 0xffff;
-       }
--
--      count += add_to_cmap_if_used(cmap, cffont, used_chars, gid, ch);
-+      if (is_PUA_or_presentation(ch)) {
-+        map_sub[gid] = ch;
-+      } else { 
-+        map_base[gid] = ch;
-+      }
-     }
-   }
--
--  return count;
- }
- 
--static USHORT
--create_ToUnicode_cmap12 (CMap *cmap,
--                         struct cmap12 *map,
--                         char *used_chars,
--                         cff_font *cffont)
-+static void
-+create_inverse_cmap12 (int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                       struct cmap12 *map)
- {
--  ULONG i, ch, count = 0;
-+  ULONG i, ch;
- 
-   for (i = 0; i < map->nGroups; i++) {
-     for (ch  = map->groups[i].startCharCode;
-          ch <= map->groups[i].endCharCode; ch++) {
-       int d = ch - map->groups[i].startCharCode;
-       USHORT gid = (USHORT) ((map->groups[i].startGlyphID + d) & 0xffff);
--      count += add_to_cmap_if_used(cmap, cffont, used_chars, gid, ch);
-+      if (is_PUA_or_presentation(ch)) {
-+        map_sub[gid] = ch;
-+      } else {
-+        map_base[gid] = ch;        
-+      }      
-     }
-   }
--
--  return count;
- }
- 
- /* NOTE: Reverse mapping code which had been placed here is removed since:
-@@ -1096,60 +884,163 @@
-  * Especially, the second one causes problems.
-  */  
- static pdf_obj *
--create_ToUnicode_cmap (tt_cmap *ttcmap,
-+create_ToUnicode_cmap (tt_cmap    *ttcmap,
-                        const char *cmap_name,
--                       CMap *cmap_add,
-+                       CMap       *cmap_add,
-                        const char *used_chars,
--                       sfnt *sfont)
-+                       sfnt       *sfont)
- {
--  pdf_obj  *stream = NULL;
--  CMap     *cmap;
--  USHORT    count = 0;
--  cff_font *cffont = prepare_CIDFont_from_sfnt(sfont);
--  char      is_cidfont = cffont && (cffont->flag & FONTTYPE_CIDFONT);
--
--  cmap = CMap_new();
--  CMap_set_name (cmap, cmap_name);
--  CMap_set_wmode(cmap, 0);
--  CMap_set_type (cmap, CMAP_TYPE_TO_UNICODE);
--  CMap_set_CIDSysInfo(cmap, &CSI_UNICODE);
--  CMap_add_codespacerange(cmap, srange_min, srange_max, 2);
-+  pdf_obj  *stream   = NULL;
-+  int32_t  *map_base = NULL, *map_sub = NULL;
-+  USHORT    gid, num_glyphs = 0;
- 
--  /* cmap_add here stores information about all unencoded glyphs which can be
--   * accessed only through OT Layout GSUB table.
--   */
--  {
--    char used_chars_copy[8192];
--    memcpy(used_chars_copy, used_chars, 8192);
-+  ASSERT(ttcmap);
- 
--    /* For create_ToUnicode_cmap{4,12}(), cffont is for GID -> CID lookup,
--     * so it is only needed for CID fonts. */
--    switch (ttcmap->format) {
--      case 4:
--        count = create_ToUnicode_cmap4(cmap, ttcmap->map, used_chars_copy,
--                                       is_cidfont ? cffont : NULL);
--        break;
--      case 12:
--        count = create_ToUnicode_cmap12(cmap, ttcmap->map, used_chars_copy,
--                                        is_cidfont ? cffont : NULL);
--        break;
-+  /* Get num_glyphs from maxp talbe */
-+  {
-+    struct tt_maxp_table *maxp;
-+    
-+    maxp = tt_read_maxp_table(sfont);
-+    if (maxp) {
-+      num_glyphs = maxp->numGlyphs;
-+      RELEASE(maxp);
-     }
-+  }
- 
--    /* For handle_subst_glyphs(), cffont is for GID -> glyph name lookup, so
--     * it is only needed for non-CID fonts. */
--    count += handle_subst_glyphs(cmap, cmap_add, used_chars_copy, sfont,
--                                 is_cidfont ? NULL : cffont);
-+  /* Initialize GID to Unicode mapping table */
-+  map_base = NEW(num_glyphs, int32_t);
-+  map_sub  = NEW(num_glyphs, int32_t);
-+  for (gid = 0; gid < num_glyphs; gid++) {
-+    map_base[gid] = -1;
-+    map_sub [gid] = -1;
-   }
- 
--  if (count < 1)
--    stream = NULL;
--  else {
--    stream = CMap_create_stream(cmap);
-+  /* Create "base" mapping from inverse mapping of OpenType cmap */
-+  switch (ttcmap->format) {
-+  case 4:
-+    create_inverse_cmap4(map_base, map_sub, num_glyphs, ttcmap->map);
-+    break;
-+  case 12:
-+    create_inverse_cmap12(map_base, map_sub, num_glyphs, ttcmap->map);
-+    break;
-   }
--  CMap_release(cmap);
- 
--  if (cffont)
--    cff_close(cffont);
-+  /* Now create ToUnicode CMap stream */
-+  {
-+    CMap     *cmap;
-+    int32_t   count;
-+    cff_font *cffont      = NULL;
-+    char      is_cidfont  = 0;
-+    uint16_t *GIDToCIDMap = NULL;
-+    char     *used_chars_copy = NULL;
-+  
-+    if (sfont->type == SFNT_TYPE_POSTSCRIPT) {
-+      ULONG offset;
-+      offset = sfnt_find_table_pos(sfont, "CFF ");
-+      cffont = cff_open(sfont->stream, offset, 0);
-+      cff_read_charsets(cffont);   
-+    }
-+    is_cidfont = cffont && (cffont->flag & FONTTYPE_CIDFONT);
-+
-+    /* GIT to CID mapping info. */
-+    GIDToCIDMap = NEW(num_glyphs, uint16_t);
-+    if (is_cidfont) {
-+      create_GIDToCIDMap(GIDToCIDMap, num_glyphs, cffont);
-+    } else {
-+      for (gid = 0; gid < num_glyphs; gid++) {
-+        GIDToCIDMap[gid] = gid;
-+      }
-+    }
-+    cmap = CMap_new();
-+    CMap_set_name (cmap, cmap_name);
-+    CMap_set_wmode(cmap, 0);
-+    CMap_set_type (cmap, CMAP_TYPE_TO_UNICODE);
-+    CMap_set_CIDSysInfo(cmap, &CSI_UNICODE);
-+    CMap_add_codespacerange(cmap, srange_min, srange_max, 2);
-+
-+    count = 0;
-+    used_chars_copy = NEW(8192, char);
-+    memcpy(used_chars_copy, used_chars, 8192);
-+    for (gid = 0; gid < num_glyphs; gid++) {
-+      uint16_t cid = GIDToCIDMap[gid];
-+      if (is_used_char2(used_chars_copy, cid)) {
-+        int32_t        ch;
-+        unsigned char  src[2], dst[4];
-+        unsigned char *p = dst, *endptr = dst + 4;
-+        size_t         len;
-+
-+        ch = map_base[gid];
-+        if (UC_is_valid(ch)) {
-+          src[0] = (cid >> 8) & 0xff;
-+          src[1] = cid & 0xff;
-+          len = UC_UTF16BE_encode_char(ch, &p, endptr);
-+          CMap_add_bfchar(cmap, src, 2, dst, len);
-+          used_chars_copy[cid / 8] &= ~(1 << (7 - (cid % 8)));
-+          count++;
-+        }
-+      }
-+    }
-+
-+    /* cmap_add here stores information about all unencoded glyphs which can be
-+     * accessed only through OT Layout GSUB table.
-+     * This is only availabel when encoding is "unicode".
-+     */
-+    if (cmap_add) {
-+      count += handle_subst_glyphs(cmap, cmap_add, used_chars_copy);
-+    } else {
-+      /* Else, try gathering information from GSUB tables */
-+      count += otl_gsub_add_ToUnicode(cmap, used_chars_copy,
-+                                      map_base, map_sub, num_glyphs,
-+                                      GIDToCIDMap, sfont);
-+    }
-+    /* Find Unicode mapping via PostScript glyph names... */
-+    count += add_ToUnicode_via_glyph_name(cmap, used_chars_copy, num_glyphs,
-+                                          GIDToCIDMap, sfont, is_cidfont ? NULL : cffont);    
-+    if (cffont)
-+      cff_close(cffont);
-+    
-+    /* Finaly, PUA and presentation forms... */
-+    for (gid = 0; gid < num_glyphs; gid++) {
-+      uint16_t cid = GIDToCIDMap[gid];
-+      if (is_used_char2(used_chars_copy, cid)) {
-+        int32_t        ch;
-+        unsigned char  src[2], dst[4];
-+        unsigned char *p = dst, *endptr = dst + 4;
-+        size_t         len;
-+
-+        ch = map_sub[gid];
-+        if (UC_is_valid(ch)) {
-+          src[0] = (cid >> 8) & 0xff;
-+          src[1] = cid & 0xff;
-+          len = UC_UTF16BE_encode_char(ch, &p, endptr);
-+          CMap_add_bfchar(cmap, src, 2, dst, len);
-+          used_chars_copy[cid / 8] &= ~(1 << (7 - (cid % 8)));
-+          count++;
-+        }
-+      }
-+    }
-+
-+    /* Check for missing mapping */
-+    if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) {
-+      for (gid = 0; gid < num_glyphs; gid++) {
-+        uint16_t cid = GIDToCIDMap[gid];
-+        if (is_used_char2(used_chars_copy, cid)) {
-+          WARN("Unable to find ToUnicode mapping for glyph CID=%u (GID=%u)", cid, gid);
-+        }
-+      }
-+    }
-+    RELEASE(GIDToCIDMap);
-+    RELEASE(used_chars_copy);
-+
-+    if (count < 1)
-+      stream = NULL;
-+    else {
-+      stream = CMap_create_stream(cmap);
-+    }
-+    CMap_release(cmap);  
-+  }
-+  RELEASE(map_base);
-+  RELEASE(map_sub);
- 
-   return stream;
- }
-@@ -1169,29 +1060,27 @@
- 
- pdf_obj *
- otf_create_ToUnicode_stream (const char *font_name,
--                             int ttc_index, /* 0 for non-TTC */
-+                             int         ttc_index, /* 0 for non-TTC */
-                              const char *basefont,
-                              const char *used_chars)
- {
--  pdf_obj    *cmap_ref = NULL;
--  int         res_id;
--  pdf_obj    *cmap_obj = NULL;
--  CMap       *cmap_add;
--  int         cmap_add_id;
--  tt_cmap    *ttcmap;
--  char       *cmap_name, *cmap_add_name;
--  FILE       *fp = NULL;
--  sfnt       *sfont;
--  ULONG       offset = 0;
--  int         i;
-+  pdf_obj  *cmap_ref = NULL; /* returned value */
-+  CMap     *cmap_add = NULL;
-+  char     *cmap_name;
-+  FILE     *fp       = NULL;
-+  sfnt     *sfont;
-+  ULONG     offset   = 0;
-+  tt_cmap  *ttcmap; 
-+  int       cmap_id, cmap_add_id;
-+  int       i;
- 
-   cmap_name = NEW(strlen(basefont)+strlen("-UTF16")+1, char);
-   sprintf(cmap_name, "%s-UTF16", basefont);
- 
--  res_id = pdf_findresource("CMap", cmap_name);
--  if (res_id >= 0) {
-+  cmap_id = pdf_findresource("CMap", cmap_name);
-+  if (cmap_id >= 0) {
-     RELEASE(cmap_name);
--    cmap_ref = pdf_get_resource_reference(res_id);
-+    cmap_ref = pdf_get_resource_reference(cmap_id);
-     return cmap_ref;
-   }
- 
-@@ -1212,7 +1101,10 @@
-   }
- 
-   if (!sfont) {
--    ERROR("Could not open OpenType/TrueType font file \"%s\"", font_name);
-+    WARN("Could not open OpenType/TrueType font file \"%s\"", font_name);
-+    RELEASE(cmap_name);
-+    DPXFCLOSE(fp);
-+    return NULL;    
-   }
- 
-   switch (sfont->type) {
-@@ -1222,7 +1114,11 @@
-   case SFNT_TYPE_TTC:
-     offset = ttc_read_offset(sfont, ttc_index);
-     if (offset == 0) {
--      ERROR("Invalid TTC index");
-+      WARN("Invalid TTC index for font: %s", font_name);
-+      sfnt_close(sfont);
-+      DPXFCLOSE(fp);
-+      RELEASE(cmap_name);
-+      return NULL;
-     }
-     break;
-   default:
-@@ -1231,111 +1127,180 @@
-   }
- 
-   if (sfnt_read_table_directory(sfont, offset) < 0) {
--    ERROR("Could not read OpenType/TrueType table directory.");
-+    WARN("Could not read OpenType/TrueType table directory: %s", font_name);
-+    sfnt_close(sfont);
-+    DPXFCLOSE(fp);
-+    RELEASE(cmap_name);
-+    return NULL;
-   }
- 
--  cmap_add_name = NEW(strlen(font_name)+strlen(",000-UCS32-Add")+1, char);
--  sprintf(cmap_add_name, "%s,%03d-UCS32-Add", font_name, ttc_index);
--  cmap_add_id = CMap_cache_find(cmap_add_name);
--  RELEASE(cmap_add_name);
--  if (cmap_add_id < 0) {
--    cmap_add = NULL;
--  } else {
--    cmap_add = CMap_cache_get(cmap_add_id);
-+  /* cmap_add is used for storing information on ToUnicode mapping for
-+   * unencoded glyphs which can be reached only through GSUB substitution.
-+   * This is available only when "unicode" is specified in the encoding
-+   * field of fontmap. We remember the inverse mapping via cmap_add in this
-+   * case.
-+   */
-+  {
-+    char *cmap_add_name;
-+
-+    cmap_add_name = NEW(strlen(font_name)+strlen(",000-UCS32-Add")+1, char);
-+    sprintf(cmap_add_name, "%s,%03d-UCS32-Add", font_name, ttc_index);
-+    cmap_add_id = CMap_cache_find(cmap_add_name);
-+    RELEASE(cmap_add_name);
-+    if (cmap_add_id < 0) {
-+      cmap_add = NULL;
-+    } else {
-+      cmap_add = CMap_cache_get(cmap_add_id);
-+    }
-   }
- 
--  CMap_set_silent(1); /* many warnings without this... */
-+  ttcmap = NULL;
-   for (i = 0; i < sizeof(cmap_plat_encs) / sizeof(cmap_plat_enc_rec); ++i) {
-     ttcmap = tt_cmap_read(sfont, cmap_plat_encs[i].platform, cmap_plat_encs[i].encoding);
-     if (!ttcmap)
-       continue;
- 
-     if (ttcmap->format == 4 || ttcmap->format == 12) {
--      cmap_obj = create_ToUnicode_cmap(ttcmap, cmap_name, cmap_add, used_chars, sfont);
-       break;
-+    } else {
-+      tt_cmap_release(ttcmap);
-+      ttcmap = NULL;
-     }
-   }
--#if defined(LIBDPX)
--  if (cmap_obj == NULL && dpx_conf.verbose_level > VERBOSE_LEVEL_MIN)
--#else
--  if (cmap_obj == NULL)
--#endif /* LIBDPX */
--    WARN("Unable to read OpenType/TrueType Unicode cmap table.");
--  tt_cmap_release(ttcmap);
--  CMap_set_silent(0);
--
--  if (cmap_obj) {
--    res_id   = pdf_defineresource("CMap", cmap_name,
--				                          cmap_obj, PDF_RES_FLUSH_IMMEDIATE);
--    cmap_ref = pdf_get_resource_reference(res_id);
--  } else {
--    cmap_ref = NULL;
-+  if (ttcmap) {
-+    pdf_obj  *cmap_obj;
-+
-+    CMap_set_silent(1); /* many warnings without this... */
-+    cmap_obj = create_ToUnicode_cmap(ttcmap, cmap_name, cmap_add, used_chars, sfont);
-+    CMap_set_silent(0);
-+    if (cmap_obj) {
-+      cmap_id = pdf_defineresource("CMap", cmap_name,
-+			    	                       cmap_obj, PDF_RES_FLUSH_IMMEDIATE);
-+      cmap_ref = pdf_get_resource_reference(cmap_id);
-+    }
-+    tt_cmap_release(ttcmap);
-   }
--  RELEASE(cmap_name);
- 
-+  /* Cleanup */
-+  RELEASE(cmap_name);
-   sfnt_close(sfont);
--  if (fp)
--    DPXFCLOSE(fp);
-+  DPXFCLOSE(fp);
-+
-+#ifndef LIBDPX
-+  if (!cmap_ref) {
-+    WARN("Creating ToUnicode CMap failed for \"%s\"", font_name);
-+  }
-+#endif
- 
-   return cmap_ref;
- }
- 
--static int
--load_base_CMap (const char *cmap_name, CMap *tounicode_add, int wmode,
--		CIDSysInfo *csi, unsigned char *GIDToCIDMap,
--    otl_gsub *gsub_vert, otl_gsub *gsub_list,
--		tt_cmap *ttcmap)
--{
--  int cmap_id;
- 
--  cmap_id = CMap_cache_find(cmap_name);
--  if (cmap_id < 0) {
--    CMap  *cmap;
-+/* Creating input CMaps from OT cmap table */
- 
--    cmap = CMap_new();
--    CMap_set_name (cmap, cmap_name);
--    CMap_set_type (cmap, CMAP_TYPE_CODE_TO_CID);
--    CMap_set_wmode(cmap, wmode);
--    CMap_add_codespacerange(cmap, lrange_min, lrange_max, 4);
-+static void
-+load_cmap4 (struct cmap4 *map, uint16_t *GIDToCIDMap, USHORT num_glyphs,
-+            otl_gsub *gsub_vert, otl_gsub *gsub_list,
-+            CMap *cmap, int32_t *map_base, int32_t *map_sub)
-+{
-+  USHORT        c0, c1, gid, cid;
-+  USHORT        j, d, segCount;
-+  USHORT        ch;
-+  int           i;
-+  unsigned char buf[4];
- 
--    if (csi) { /* CID */
--      CMap_set_CIDSysInfo(cmap, csi);
--    } else {
--      CMap_set_CIDSysInfo(cmap, &CSI_IDENTITY);
-+  segCount = map->segCountX2 / 2;
-+  for (i = segCount - 1; i >= 0 ; i--) {
-+    c0 = map->startCount[i];
-+    c1 = map->endCount[i];
-+    d  = map->idRangeOffset[i] / 2 - (segCount - i);
-+    for (j = 0; j <= c1 - c0; j++) {
-+      ch = c0 + j;
-+      if (map->idRangeOffset[i] == 0) {
-+        gid = (ch + map->idDelta[i]) & 0xffff;
-+      } else if (c0 == 0xffff && c1 == 0xffff && map->idRangeOffset[i] == 0xffff) {
-+        /* this is for protection against some old broken fonts... */
-+        gid = 0;
-+      } else {
-+        gid = (map->glyphIndexArray[j+d] + map->idDelta[i]) & 0xffff;
-+      }
-+      if (gid != 0 && gid != 0xffff) {
-+        /* Apply GSUB features */
-+        if (gsub_list)
-+          otl_gsub_apply_chain(gsub_list, &gid);
-+        if (gsub_vert)
-+          otl_gsub_apply(gsub_vert, &gid);
-+        cid = (gid < num_glyphs) ? GIDToCIDMap[gid] : 0;
-+        buf[0] = 0;
-+        buf[1] = 0;
-+        buf[2] = (ch >> 8) & 0xff;
-+        buf[3] =  ch & 0xff;
-+        CMap_add_cidchar(cmap, buf, 4, cid);
-+        /* For ToUnicode creation */
-+        if (map_base && map_sub) {
-+          if (is_PUA_or_presentation(ch)) {
-+            map_sub[gid] = ch;
-+          } else {
-+            map_base[gid] = ch;
-+          }
-+        }
-+      }
-     }
-+  }
- 
--    if (ttcmap->format == 12) {
--      load_cmap12(ttcmap->map, GIDToCIDMap, gsub_vert, gsub_list,
--                  cmap, tounicode_add);
--    } else if (ttcmap->format == 4) {
--      load_cmap4(ttcmap->map, GIDToCIDMap, gsub_vert, gsub_list,
--                 cmap, tounicode_add);
--    }
-+  return;
-+}
- 
--    cmap_id = CMap_cache_add(cmap);
-+static void
-+load_cmap12 (struct cmap12 *map, uint16_t *GIDToCIDMap, USHORT num_glyphs,
-+             otl_gsub *gsub_vert, otl_gsub *gsub_list,
-+             CMap *cmap, int32_t *map_base, int32_t *map_sub)
-+{
-+  ULONG         i, ch;
-+  USHORT        gid, cid;
-+  unsigned char buf[4];
-+
-+  for (i = 0; i < map->nGroups; i++) {
-+    for (ch  = map->groups[i].startCharCode;
-+         ch <= map->groups[i].endCharCode; ch++) {
-+      int  d = ch - map->groups[i].startCharCode;
-+      gid = (USHORT) ((map->groups[i].startGlyphID + d) & 0xffff);
-+      if (gsub_list)
-+        otl_gsub_apply_chain(gsub_list, &gid);
-+      if (gsub_vert)
-+        otl_gsub_apply(gsub_vert, &gid);
-+      cid = (gid < num_glyphs) ? GIDToCIDMap[gid] : 0;
-+      buf[0] = (ch >> 24) & 0xff;
-+      buf[1] = (ch >> 16) & 0xff;
-+      buf[2] = (ch >>  8) & 0xff;
-+      buf[3] = ch & 0xff;
-+      CMap_add_cidchar(cmap, buf, 4, cid);
-+      if (map_base && map_sub) {
-+        if (is_PUA_or_presentation(ch)) {
-+          map_sub[gid] = ch;
-+        } else {
-+          map_base[gid] = ch;
-+        }
-+      }
-+    }
-   }
- 
--  return cmap_id;
-+  return;
- }
- 
- int
- otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC font */
--		       const char *otl_tags, int wmode)
-+                       const char *otl_tags, int wmode)
- {
--  int    cmap_id = -1;
--  /* Additional ToUncidoe mappings required by OTL GSUB substitusion */
--  int    tounicode_add_id = -1;
--  CMap  *tounicode_add = NULL;
--  char  *tounicode_add_name = NULL;
--  int    is_cidfont = 0;
--  sfnt  *sfont;
--  ULONG  offset = 0;
--  char  *cmap_name = NULL;
--  FILE  *fp = NULL;
--  otl_gsub      *gsub_vert = NULL, *gsub_list = NULL;
--  tt_cmap       *ttcmap;
--  CIDSysInfo     csi = {NULL, NULL, 0};
--  unsigned char *GIDToCIDMap = NULL;
-+  int         cmap_id     = -1;
-+  char       *cmap_name   = NULL;
-+  sfnt       *sfont       = NULL;
-+  ULONG       offset      = 0;
-+  uint16_t    num_glyphs  = 0;
-+  FILE       *fp          = NULL;
-+  tt_cmap    *ttcmap      = NULL;
-+  CIDSysInfo  csi         = {NULL, NULL, 0};
-+  uint16_t   *GIDToCIDMap = NULL;
- 
-   if (!map_name)
-     return -1;
-@@ -1359,11 +1324,6 @@
-       sprintf(cmap_name, "%s,%03d-UCS4-H", map_name, ttc_index);
-     }
-   }
--  if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) {
--    MESG("\n");
--    MESG("otf_cmap>> Unicode charmap for font=\"%s\" layout=\"%s\"\n",
--	       map_name, (otl_tags ? otl_tags : "none"));
--  } 
-   cmap_id = CMap_cache_find(cmap_name);
-   if (cmap_id >= 0) {
-     RELEASE(cmap_name);
-@@ -1374,6 +1334,12 @@
-   }
- 
-   /* CMap not found */
-+  if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) {
-+    MESG("\n");
-+    MESG("otf_cmap>> Creating Unicode charmap for font=\"%s\" layout=\"%s\"\n",
-+	       map_name, (otl_tags ? otl_tags : "none"));
-+  } 
-+
-   fp = DPXFOPEN(map_name, DPX_RES_TYPE_TTFONT);
-   if (!fp) {
-     fp = DPXFOPEN(map_name, DPX_RES_TYPE_OTFONT);
-@@ -1390,13 +1356,20 @@
-   }
- 
-   if (!sfont) {
--    ERROR("Could not open OpenType/TrueType/dfont font file \"%s\"", map_name);
-+    WARN("Could not open OpenType/TrueType/dfont font file \"%s\"", map_name);
-+    RELEASE(cmap_name);
-+    DPXFCLOSE(fp);
-+    return -1;
-   }
-   switch (sfont->type) {
-   case SFNT_TYPE_TTC:
-     offset = ttc_read_offset(sfont, ttc_index);
-     if (offset == 0) {
--      ERROR("Invalid TTC index");
-+      WARN("Offset=0 returned for font=%s, TTC_index=%d", map_name, ttc_index);
-+      RELEASE(cmap_name);
-+      sfnt_close(sfont);
-+      DPXFCLOSE(fp);
-+      return -1;
-     }
-     break;
-   case SFNT_TYPE_TRUETYPE:
-@@ -1407,41 +1380,79 @@
-     offset = sfont->offset;
-     break;
-   default:
--    ERROR("Not a OpenType/TrueType/TTC font?: %s", map_name);
-+    WARN("Not a OpenType/TrueType/TTC font?: %s", map_name);
-+    RELEASE(cmap_name);
-+    sfnt_close(sfont);
-+    DPXFCLOSE(fp);    
-+    return -1;
-     break;
-   }
- 
--  if (sfnt_read_table_directory(sfont, offset) < 0)
--    ERROR("Could not read OpenType/TrueType table directory.");
-+  if (sfnt_read_table_directory(sfont, offset) < 0) {
-+    WARN("Could not read OpenType/TrueType table directory: %s", map_name);
-+    RELEASE(cmap_name);
-+    sfnt_close(sfont);
-+    DPXFCLOSE(fp);
-+    return -1;
-+  }
- 
-+  {    
-+    struct tt_maxp_table *maxp;
- 
--  if (otl_tags) {
--    /* tounicode_add here is later refered by otf_create_ToUnicode_stream()
--     * for finding additional CID to Unicode mapping entries required by
--     * OTL gsub substitution.
--     */
--    tounicode_add_name = NEW(strlen(map_name)+strlen(",000-UCS32-Add")+1, char);
--    sprintf(tounicode_add_name, "%s,%03d-UCS32-Add", map_name, ttc_index);
--    tounicode_add_id = CMap_cache_find(tounicode_add_name);
-- 	if (tounicode_add_id >= 0)
-- 	  tounicode_add = CMap_cache_get(tounicode_add_id);
-- 	else {
-- 	  tounicode_add = CMap_new();
-- 	  CMap_set_name (tounicode_add, tounicode_add_name);
-- 	  CMap_set_type (tounicode_add, CMAP_TYPE_TO_UNICODE);
-- 	  CMap_set_wmode(tounicode_add, 0);
-- 	  CMap_add_codespacerange(tounicode_add, srange_min, srange_max, 2);
-- 	  CMap_set_CIDSysInfo(tounicode_add, &CSI_UNICODE);
-- 	  CMap_add_bfchar(tounicode_add, srange_min, 2, srange_max, 2);
--      tounicode_add_id = CMap_cache_add(tounicode_add);
--    }
--    RELEASE(tounicode_add_name);
-+    maxp       = tt_read_maxp_table(sfont);
-+    num_glyphs = (card16) maxp->numGlyphs;
-+    RELEASE(maxp);
-   }
- 
-+  GIDToCIDMap = NEW(num_glyphs, uint16_t);
-+  memset(GIDToCIDMap, 0, num_glyphs*sizeof(uint16_t));
-   if (sfont->type == SFNT_TYPE_POSTSCRIPT) {
--    is_cidfont = handle_CIDFont(sfont, &GIDToCIDMap, &csi);
-+    cff_font             *cffont;
-+    card16                gid;
-+
-+    offset = sfnt_find_table_pos(sfont, "CFF ");    
-+    cffont = cff_open(sfont->stream, offset, 0);
-+    if (!cffont) {
-+      RELEASE(cmap_name);
-+      RELEASE(GIDToCIDMap);
-+      sfnt_close(sfont);
-+      DPXFCLOSE(fp);
-+      return -1; 
-+    }
-+    if (!(cffont->flag & FONTTYPE_CIDFONT)) {
-+      csi.registry   = strdup("Adobe");
-+      csi.ordering   = strdup("Identity");
-+      csi.supplement = 0;
-+      for (gid = 0; gid < num_glyphs; gid++) {
-+        GIDToCIDMap[gid] = gid;
-+      }
-+    } else {
-+      if (!cff_dict_known(cffont->topdict, "ROS")) {
-+        csi.registry   = strdup("Adobe");
-+        csi.ordering   = strdup("Identity");
-+        csi.supplement = 0;
-+      } else {
-+        card16 reg, ord;
-+
-+        reg = (card16) cff_dict_get(cffont->topdict, "ROS", 0);
-+        ord = (card16) cff_dict_get(cffont->topdict, "ROS", 1);
-+        csi.registry   = cff_get_string(cffont, reg);
-+        csi.ordering   = cff_get_string(cffont, ord);
-+        csi.supplement = (int) cff_dict_get(cffont->topdict, "ROS", 2);
-+      }
-+      cff_read_charsets(cffont);
-+      create_GIDToCIDMap(GIDToCIDMap, num_glyphs, cffont);
-+    }
-+    cff_close(cffont);
-   } else {
--    is_cidfont = 0;
-+    uint16_t gid;
-+
-+    csi.registry   = strdup("Adobe");
-+    csi.ordering   = strdup("Identity");
-+    csi.supplement = 0;
-+    for (gid = 0; gid < num_glyphs; gid++) {
-+      GIDToCIDMap[gid] = gid;
-+    }
-   }
- 
-   ttcmap = tt_cmap_read(sfont, 3, 10); /* Microsoft UCS4 */
-@@ -1449,63 +1460,122 @@
-     ttcmap = tt_cmap_read(sfont, 3, 1); /* Microsoft UCS2 */
-     if (!ttcmap) {
-       ttcmap = tt_cmap_read(sfont, 0, 3); /* Unicode 2.0 or later */
--#if defined(LIBDPX)
--      if (!ttcmap && dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) {
--#else
--      if (!ttcmap) {
--#endif /* LIBDPX */
--        ERROR("Unable to read OpenType/TrueType Unicode cmap table.");
--      }
-     }
-   }
--  if (wmode == 1) {
--    gsub_vert = otl_gsub_new();
--    if (otl_gsub_add_feat(gsub_vert, "*", "*", "vrt2", sfont) < 0) {
--      if (otl_gsub_add_feat(gsub_vert, "*", "*", "vert", sfont) < 0) {
--        WARN("GSUB feature vrt2/vert not found.");
--        otl_gsub_release(gsub_vert);
--        gsub_vert = NULL;
-+
-+  if (ttcmap) {
-+    CMap     *cmap      = NULL;
-+    int32_t  *map_base, *map_sub;
-+    otl_gsub *gsub_vert = NULL;
-+    otl_gsub *gsub_list = NULL;    
-+    uint32_t  gid;
-+  
-+    if (wmode == 1) {
-+      gsub_vert = otl_gsub_new();
-+      if (otl_gsub_add_feat(gsub_vert, "*", "*", "vrt2", sfont) < 0) {
-+        if (otl_gsub_add_feat(gsub_vert, "*", "*", "vert", sfont) < 0) {
-+          WARN("GSUB feature vrt2/vert not found.");
-+          otl_gsub_release(gsub_vert);
-+          gsub_vert = NULL;
-+        } else {
-+          otl_gsub_select(gsub_vert, "*", "*", "vert");
-+        }
-       } else {
--        otl_gsub_select(gsub_vert, "*", "*", "vert");
-+        otl_gsub_select(gsub_vert, "*", "*", "vrt2");
-       }
-     } else {
--      otl_gsub_select(gsub_vert, "*", "*", "vrt2");
-+      gsub_vert = NULL;
-     }
--  } else {
--    gsub_vert = NULL;
--  }
--  if (otl_tags) {
--    gsub_list = otl_gsub_new();
--    if (otl_gsub_add_feat_list(gsub_list, otl_tags, sfont) < 0) {
--      WARN("Readin GSUB feature table(s) failed for \"%s\"", otl_tags);
-+    if (otl_tags) {
-+      gsub_list = otl_gsub_new();
-+      if (otl_gsub_add_feat_list(gsub_list, otl_tags, sfont) < 0) {
-+        WARN("Reading GSUB feature table(s) failed for \"%s\"", otl_tags);
-+      } else {
-+        otl_gsub_set_chain(gsub_list, otl_tags);
-+      }
-     } else {
--      otl_gsub_set_chain(gsub_list, otl_tags);
-+      gsub_list = NULL;
-     }
--  } else {
--    gsub_list = NULL;
-+    cmap = CMap_new();
-+    CMap_set_name(cmap, cmap_name);
-+    CMap_set_type(cmap, CMAP_TYPE_CODE_TO_CID);
-+    CMap_set_wmode(cmap, wmode);
-+    CMap_add_codespacerange(cmap, lrange_min, lrange_max, 4);
-+    CMap_set_CIDSysInfo(cmap, &csi);
-+    map_base = NEW(num_glyphs, int32_t);
-+    map_sub  = NEW(num_glyphs, int32_t);
-+    for (gid = 0; gid < num_glyphs; gid++) {
-+      map_base[gid] = -1;
-+      map_sub[gid]  = -1;
-+    }
-+    switch (ttcmap->format) {
-+    case 12:
-+      load_cmap12(ttcmap->map, GIDToCIDMap, num_glyphs,
-+                  gsub_vert, gsub_list,
-+                  cmap, map_base, map_sub);
-+      break;
-+    case 4:
-+      load_cmap4(ttcmap->map, GIDToCIDMap, num_glyphs,
-+                 gsub_vert, gsub_list,
-+                 cmap, map_base, map_sub);
-+      break;
-+    }
-+    if (gsub_vert)
-+      otl_gsub_release(gsub_vert);
-+    if (gsub_list)
-+      otl_gsub_release(gsub_list);
-+    tt_cmap_release(ttcmap);
-+ 
-+    if (otl_tags) {
-+      CMap *tounicode = NULL;
-+      char *tounicode_name;
-+      int   tounicode_id;
-+
-+      tounicode_name = NEW(strlen(map_name)+strlen(",000-UCS32-Add")+1, char);
-+      sprintf(tounicode_name, "%s,%03d-UCS32-Add", map_name, ttc_index);
-+      tounicode_id = CMap_cache_find(tounicode_name);
-+      if (tounicode_id >= 0)
-+        tounicode = CMap_cache_get(tounicode_id);
-+      else {
-+        tounicode = CMap_new();
-+        CMap_set_name (tounicode, tounicode_name);
-+        CMap_set_type (tounicode, CMAP_TYPE_TO_UNICODE);
-+        CMap_set_wmode(tounicode, 0);
-+        CMap_add_codespacerange(tounicode, srange_min, srange_max, 2);
-+        CMap_set_CIDSysInfo(tounicode, &CSI_UNICODE);
-+        CMap_add_bfchar(tounicode, srange_min, 2, srange_max, 2);
-+        tounicode_id = CMap_cache_add(tounicode);
-+      }
-+      RELEASE(tounicode_name);
-+            
-+      for (gid = 0; gid < num_glyphs; gid++) {
-+        uint16_t      cid = GIDToCIDMap[gid];
-+        unsigned char src[2], dst[4];
-+        if (cid > 0) {
-+          int32_t ch = UC_is_valid(map_base[gid]) ? map_base[gid] : map_sub[gid];
-+          if (UC_is_valid(ch)) {
-+            unsigned char *p      = dst;
-+            unsigned char *endptr = dst + 4;
-+            size_t         len;
-+            src[0] = (cid >> 8) & 0xff;
-+            src[1] =  cid & 0xff;
-+            len = UC_UTF16BE_encode_char(ch, &p, endptr);
-+            if (len > 0) {
-+              CMap_add_bfchar(tounicode, src, 2, dst, len);
-+            }
-+          }
-+        }
-+      }
-+    }
-+    cmap_id = CMap_cache_add(cmap);
-   }
--  cmap_id = load_base_CMap(cmap_name, tounicode_add, wmode,
--                           (is_cidfont ? &csi : NULL), GIDToCIDMap,
--                           gsub_vert, gsub_list, ttcmap);
--  if (cmap_id < 0)
--    ERROR("Failed to read OpenType/TrueType cmap table.");
--  if (gsub_vert)
--    otl_gsub_release(gsub_vert);
--  gsub_vert = NULL;
--  if (gsub_list)
--    otl_gsub_release(gsub_list);
--  gsub_list = NULL;
- 
-   RELEASE(cmap_name);
--  if (GIDToCIDMap)
--    RELEASE(GIDToCIDMap);
--  if (is_cidfont) {
--    if (csi.registry)
--	    RELEASE(csi.registry);
--    if (csi.ordering)
--	    RELEASE(csi.ordering);
--  }
--  tt_cmap_release(ttcmap);
-+  RELEASE(GIDToCIDMap);
-+  if (csi.registry)
-+    RELEASE(csi.registry);
-+  if (csi.ordering)
-+    RELEASE(csi.ordering);
-   sfnt_close(sfont);
-   DPXFCLOSE(fp);
- 
-@@ -1515,14 +1585,11 @@
- int
- otf_try_load_GID_to_CID_map (const char *map_name, int ttc_index, int wmode)
- {
--  int            cmap_id = -1;
--  sfnt          *sfont;
--  ULONG          offset = 0;
--  char          *cmap_name = NULL;
--  FILE          *fp = NULL;
--  CIDSysInfo     csi = {NULL, NULL, 0};
--  int            is_cidfont = 0;
--  unsigned char *GIDToCIDMap = NULL;
-+  int         cmap_id     = -1;
-+  sfnt       *sfont       = NULL;
-+  ULONG       offset      = 0;
-+  char       *cmap_name   = NULL;
-+  FILE       *fp          = NULL;
- 
-   if (!map_name)
-     return -1;
-@@ -1559,13 +1626,20 @@
-   }
- 
-   if (!sfont) {
--    ERROR("Could not open OpenType/TrueType/dfont font file \"%s\"", map_name);
-+    WARN("Could not open OpenType/TrueType/dfont font file \"%s\"", map_name);
-+    RELEASE(cmap_name);
-+    DPXFCLOSE(fp);
-+    return -1;
-   }
-   switch (sfont->type) {
-   case SFNT_TYPE_TTC:
-     offset = ttc_read_offset(sfont, ttc_index);
-     if (offset == 0) {
--      ERROR("Invalid TTC index");
-+      WARN("Invalid TTC index for font \"%s\": %d", map_name, ttc_index);
-+      sfnt_close(sfont);
-+      DPXFCLOSE(fp);
-+      RELEASE(cmap_name);
-+      return -1;
-     }
-     break;
-   case SFNT_TYPE_TRUETYPE:
-@@ -1576,12 +1650,20 @@
-     offset = sfont->offset;
-     break;
-   default:
--    ERROR("Not a OpenType/TrueType/TTC font?: %s", map_name);
--    break;
-+    WARN("Not a OpenType/TrueType/TTC font?: %s", map_name);
-+    sfnt_close(sfont);
-+    DPXFCLOSE(fp);
-+    RELEASE(cmap_name);
-+    return -1;
-   }
- 
--  if (sfnt_read_table_directory(sfont, offset) < 0)
--    ERROR("Could not read OpenType/TrueType table directory.");
-+  if (sfnt_read_table_directory(sfont, offset) < 0) {
-+    WARN("Could not read OpenType/TrueType table directory: %s", map_name);
-+    sfnt_close(sfont);
-+    DPXFCLOSE(fp);
-+    RELEASE(cmap_name);
-+    return -1;
-+  }
-   if (sfont->type != SFNT_TYPE_POSTSCRIPT) {
-     RELEASE(cmap_name);
-     sfnt_close(sfont);
-@@ -1590,41 +1672,71 @@
-   }
- 
-   /* Read GID-to-CID mapping if CFF OpenType is found. */
--  is_cidfont = handle_CIDFont(sfont, &GIDToCIDMap, &csi);
--  if (is_cidfont) {
--    if (GIDToCIDMap) {
--      CMap     *cmap;
--      int32_t   gid;
--      const unsigned char csrange[4] = {0x00, 0x00, 0xff, 0xff};
-+  if (sfont->type == SFNT_TYPE_POSTSCRIPT) {
-+    cff_font             *cffont;
-+    struct tt_maxp_table *maxp;
-+    const unsigned char   csrange[4]  = {0x00, 0x00, 0xff, 0xff};
-+    uint16_t              num_glyphs  = 0;
-+
-+    maxp       = tt_read_maxp_table(sfont);
-+    num_glyphs = (card16) maxp->numGlyphs;
-+    RELEASE(maxp);
-+
-+    offset = sfnt_find_table_pos(sfont, "CFF ");    
-+    cffont = cff_open(sfont->stream, offset, 0);
-+    if (cffont && cffont->flag & FONTTYPE_CIDFONT) {
-+      CMap       *cmap;
-+      uint16_t    gid;
-+      uint16_t   *GIDToCIDMap = NULL;
-+      CIDSysInfo  csi         = {NULL, NULL, 0};
-+
-+      if (!cff_dict_known(cffont->topdict, "ROS")) {
-+        csi.registry   = strdup("Adobe");
-+        csi.ordering   = strdup("Identity");
-+        csi.supplement = 0;
-+      } else {
-+        card16 reg, ord;
- 
-+        reg = (card16) cff_dict_get(cffont->topdict, "ROS", 0);
-+        ord = (card16) cff_dict_get(cffont->topdict, "ROS", 1);
-+        csi.registry   = cff_get_string(cffont, reg);
-+        csi.ordering   = cff_get_string(cffont, ord);
-+        csi.supplement = (int) cff_dict_get(cffont->topdict, "ROS", 2);
-+      }
-+      cff_read_charsets(cffont);     
-+      GIDToCIDMap = NEW(num_glyphs, uint16_t);
-+      memset(GIDToCIDMap, 0, num_glyphs*sizeof(uint16_t));      
-+      create_GIDToCIDMap(GIDToCIDMap, num_glyphs, cffont);
-       cmap = CMap_new();
-       CMap_set_name (cmap, cmap_name);
-       CMap_set_type (cmap, CMAP_TYPE_CODE_TO_CID);
-       CMap_set_wmode(cmap, wmode);
-       CMap_add_codespacerange(cmap, &csrange[0], &csrange[2], 2);
-       CMap_set_CIDSysInfo(cmap, &csi);
--
--      for (gid = 0; gid < 65536; gid++) {
--        unsigned char src[2];
-+      for (gid = 0; gid < num_glyphs; gid++) {
-+        unsigned char src[2], dst[2];
-         src[0] = (gid >> 8) & 0xff;
-         src[1] = gid & 0xff;
--        CMap_add_bfchar(cmap, src, 2, &GIDToCIDMap[gid*2], 2);
-+        dst[0] = (GIDToCIDMap[gid] >> 8) & 0xff;
-+        dst[1] =  GIDToCIDMap[gid] & 0xff;
-+        CMap_add_bfchar(cmap, src, 2, dst, 2);
-       }
-       cmap_id = CMap_cache_add(cmap);
-       if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) {
-         MESG("\n");
-         MESG("otf_cmap>> Creating GID-to-CID mapping for font=\"%s\"\n", map_name);
-       }
-+      RELEASE(GIDToCIDMap);
-+      if (csi.registry)
-+        RELEASE(csi.registry);
-+      if (csi.ordering)
-+        RELEASE(csi.ordering);      
-     }
--    /* Identity mapping for null GIDToCIDMap */
-+    if (cffont)
-+      cff_close(cffont);
-   }
-+
-   RELEASE(cmap_name);
--  if (GIDToCIDMap)
--    RELEASE(GIDToCIDMap);
--  if (csi.registry)
--	  RELEASE(csi.registry);
--  if (csi.ordering)
--	  RELEASE(csi.ordering);
-   sfnt_close(sfont);
-   DPXFCLOSE(fp);
- 
-diff -Naur a/texk/dvipdfm-x/tt_gsub.c b/texk/dvipdfm-x/tt_gsub.c
---- a/texk/dvipdfm-x/tt_gsub.c	2018-12-21 03:39:51.000000000 +0000
-+++ b/texk/dvipdfm-x/tt_gsub.c	2019-05-31 22:00:04.009964032 +0100
-@@ -1,6 +1,6 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
--    Copyright (C) 2002-2018 by Jin-Hwan Cho and Shunsaku Hirata,
-+    Copyright (C) 2002-2019 by Jin-Hwan Cho and Shunsaku Hirata,
-     the dvipdfmx project team.
-     
-     This program is free software; you can redistribute it and/or modify
-@@ -977,10 +977,11 @@
- 
-       sfnt_seek_set(sfont, offset);
-       clt_read_feature_table(&feature_table, sfont);
-+#if 0
-       if (feature_table.FeatureParams != 0) {
-         ERROR("unrecognized FeatureParams");
-       }
--
-+#endif
-       /* Lookup table */
-       for (i = 0; i < feature_table.LookupListIndex.count; i++) {
-         struct clt_lookup_table lookup_table;
-@@ -1680,98 +1681,303 @@
-   return retval;
- }
- 
--#if  0
-+#if  1
-+#include "unicode.h"
-+
-+#ifndef is_used_char2
-+#define is_used_char2(b,c) (((b)[(c)/8]) & (1 << (7-((c)%8))))
-+#endif
-+
-+static int
-+add_glyph_if_valid (CMap *cmap, char *used_chars,
-+                    int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                    uint16_t *GIDToCIDMap, USHORT gid, USHORT gid_sub)
-+{
-+  int            count = 0;
-+  unsigned char  src[2], dst[4];
-+  unsigned char *p = dst, *endptr = dst + 4;
-+  size_t         len;
-+  uint16_t       cid_sub;
-+
-+  if (gid_sub >= num_glyphs || gid >= num_glyphs)
-+    return 0;
-+
-+  cid_sub = GIDToCIDMap[gid_sub];
-+  if (is_used_char2(used_chars, cid_sub)) {
-+    int32_t ch = map_base[gid];
-+    if (UC_is_valid(ch)) {
-+      src[0] = (cid_sub >> 8) & 0xff;
-+      src[1] = cid_sub & 0xff;
-+      len = UC_UTF16BE_encode_char(ch, &p, endptr);
-+      CMap_add_bfchar(cmap, src, 2, dst, len);
-+      used_chars[cid_sub / 8] &= ~(1 << (7 - (cid_sub % 8)));
-+      count = 1;
-+    } else {
-+      ch = map_sub[gid];
-+      if (UC_is_valid(ch)) {
-+        src[0] = (cid_sub >> 8) & 0xff;
-+        src[1] = cid_sub & 0xff;
-+        len = UC_UTF16BE_encode_char(ch, &p, endptr);
-+        CMap_add_bfchar(cmap, src, 2, dst, len);
-+        used_chars[cid_sub / 8] &= ~(1 << (7 - (cid_sub % 8)));
-+        count = 1;
-+      }
-+    }
-+  }
-+  return count;
-+}
-+
- static int
--otl_gsub_dump_single (struct otl_gsub_subtab *subtab)
-+add_ToUnicode_single (CMap *cmap, char *used_chars,
-+                      struct otl_gsub_subtab *subtab,
-+                      int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                      uint16_t *GIDToCIDMap)
- {
--  int  gid, idx;
-+  int     count = 0;
-+  USHORT  i, idx, gid;
-+  USHORT  gid_sub;
- 
-   ASSERT(subtab);
- 
-   if (subtab->SubstFormat == 1) {
-     struct otl_gsub_single1 *data;
-+    struct clt_coverage      *cov;
- 
-     data = (subtab->table).single1;
--    for (gid = 0; gid < 0x10000; gid++) {
--      idx  = clt_lookup_coverage(&data->coverage, gid);
--      if (idx >= 0) {
--        fprintf(stdout, "substitute \\%u by \\%u;\n",
--                (USHORT) gid, (USHORT) (gid + data->DeltaGlyphID));
-+    cov  = &data->coverage;
-+    switch (cov->format) {
-+    case 1: /* list */
-+      for (idx = 0; idx < cov->count; idx++) {
-+        gid = cov->list[idx];
-+        gid_sub = gid + data->DeltaGlyphID;
-+        count += add_glyph_if_valid(cmap, used_chars,
-+                                    map_base, map_sub, num_glyphs,
-+                                    GIDToCIDMap, gid, gid_sub);
-       }
-+      break;
-+    case 2: /* range */
-+      for (i = 0; i < cov->count; i++) {
-+        for (gid = cov->range[i].Start;
-+             gid <= cov->range[i].End && gid < num_glyphs; gid++) {
-+          idx = cov->range[i].StartCoverageIndex + gid - cov->range[i].Start;
-+          gid_sub = gid + data->DeltaGlyphID;
-+          count += add_glyph_if_valid(cmap, used_chars,
-+                                      map_base, map_sub, num_glyphs,
-+                                      GIDToCIDMap, gid, gid_sub);     
-+        }
-+      }
-+      break;
-     }
-   } else if (subtab->SubstFormat == 2) {
-     struct otl_gsub_single2 *data;
-+    struct clt_coverage      *cov;
- 
-     data = (subtab->table).single2;
--    for (gid = 0; gid < 0x10000; gid++) {
--      idx  = clt_lookup_coverage(&data->coverage, gid);
--      if (idx >= 0 &&
--          idx < data->GlyphCount) {
--        fprintf(stdout, "substitute \\%u by \\%u;\n",
--                (USHORT) gid, (data->Substitute)[idx]);
-+    cov  = &data->coverage;
-+    switch (cov->format) {
-+    case 1: /* list */
-+      for (idx = 0; idx < cov->count; idx++) {
-+        gid = cov->list[idx];
-+        if (idx >= 0 && idx < data->GlyphCount) {
-+          gid_sub = (data->Substitute)[idx];
-+          count += add_glyph_if_valid(cmap, used_chars,
-+                                      map_base, map_sub, num_glyphs,
-+                                      GIDToCIDMap, gid, gid_sub);
-+        }
-       }
-+      break;
-+    case 2: /* range */
-+      for (i = 0; i < cov->count; i++) {
-+        for (gid = cov->range[i].Start;
-+             gid <= cov->range[i].End && gid < num_glyphs; gid++) {
-+          idx = cov->range[i].StartCoverageIndex + gid - cov->range[i].Start;
-+          if (idx >= 0 && idx < data->GlyphCount) {
-+            gid_sub = (data->Substitute)[idx];
-+            count += add_glyph_if_valid(cmap, used_chars,
-+                                        map_base, map_sub, num_glyphs,
-+                                        GIDToCIDMap, gid, gid_sub);
-+          }
-+        }
-+      }
-+      break;
-     }
-   }
- 
--  return  0;
-+  return count;
- }
- 
--static int
--otl_gsub_dump_alternate (struct otl_gsub_subtab *subtab)
-+static int32_t  
-+add_alternate1_inverse_map (CMap *cmap, char *used_chars,
-+                            int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                            uint16_t *GIDToCIDMap, USHORT gid, int idx,
-+                            struct otl_gsub_alternate1 *data)
- {
--  int  gid, idx;
-+  int32_t count = 0;
-+
-+  if (idx >= 0 && idx < data->AlternateSetCount) {
-+    struct otl_gsub_altset *altset;
-+    USHORT i;
-+
-+    altset = &(data->AlternateSet[idx]);
-+    if (altset->GlyphCount == 0)
-+      return count;
-+    for (i = 0; i < altset->GlyphCount; i++) {
-+      USHORT gid_alt = altset->Alternate[i];
-+      count += add_glyph_if_valid(cmap, used_chars,
-+                                  map_base, map_sub, num_glyphs,
-+                                  GIDToCIDMap, gid, gid_alt);
-+    }
-+  }
-+  return count;
-+}
-+
-+static int32_t
-+add_ToUnicode_alternate (CMap *cmap, char *used_chars,
-+                         struct otl_gsub_subtab *subtab,
-+                         int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                         uint16_t *GIDToCIDMap)
-+{
-+  int32_t count = 0;
-+  USHORT  i, gid, idx;
- 
-   ASSERT(subtab);
- 
-   if (subtab->SubstFormat == 1) {
-     struct otl_gsub_alternate1 *data;
--
-+    struct clt_coverage        *cov;
-     data = subtab->table.alternate1;
--    for (gid = 0; gid < 0x10000; gid++) {
--      idx  = clt_lookup_coverage(&data->coverage, gid);
--      if (idx >= 0 && idx < data->AlternateSetCount) {
--        struct otl_gsub_altset *altset;
--        USHORT i;
--        altset = &(data->AlternateSet[idx]);
--        if (altset->GlyphCount == 0)
--          continue;
--        fprintf(stdout, "substitute \\%u from [", (USHORT) gid);
--        for (i = 0; i < altset->GlyphCount; i++) {
--          fprintf(stdout, " \\%u", altset->Alternate[i]);
-+    cov  = &data->coverage;
-+    switch (cov->format) {
-+    case 1: /* list */
-+      for (idx = 0; idx < cov->count; idx++) {
-+        gid = cov->list[idx];
-+        if (gid < num_glyphs) {
-+          count += add_alternate1_inverse_map(cmap, used_chars,
-+                                              map_base, map_sub, num_glyphs,
-+                                              GIDToCIDMap, gid, idx, data);
-+        }
-+      }
-+      break;
-+    case 2: /* range */
-+      for (i = 0; i < cov->count; i++) {
-+        for (gid = cov->range[i].Start;
-+             gid <= cov->range[i].End && gid < num_glyphs; gid++) {
-+          idx = cov->range[i].StartCoverageIndex + gid - cov->range[i].Start;
-+          count += add_alternate1_inverse_map(cmap, used_chars,
-+                                              map_base, map_sub, num_glyphs,
-+                                              GIDToCIDMap, gid, idx, data);
-         }
--        fprintf(stdout, " ];\n");
-       }
-+      break;
-     }
-   }
-+  return count;
-+}
- 
--  return  0;
-+static int32_t  
-+add_ligature1_inverse_map (CMap *cmap, char *used_chars,
-+                           int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                           uint16_t *GIDToCIDMap, USHORT gid_1, int idx,
-+                           struct otl_gsub_ligature1 *data)
-+{
-+  int32_t count = 0;
-+
-+  if (idx >= 0 && idx < data->LigSetCount) {
-+    struct otl_gsub_ligset *ligset;
-+    USHORT                  i, j;
-+
-+    ligset = &(data->LigatureSet[idx]); 
-+    for (j = 0; j < ligset->LigatureCount; j++) {
-+      USHORT gid_sub = ligset->Ligature[j].LigGlyph;
-+      if (gid_sub < num_glyphs) {
-+        uint16_t cid = GIDToCIDMap[gid_sub];
-+        if (is_used_char2(used_chars, cid)) {
-+          int32_t ch, *ucv;
-+          USHORT  comp_count = ligset->Ligature[j].CompCount;
-+          int     fail_count = 0;
-+
-+          ucv         = NEW(comp_count, int32_t);
-+          ch          = UC_is_valid(map_base[gid_1]) ? map_base[gid_1] : map_sub[gid_1];
-+          ucv[0]      = ch;
-+          fail_count += UC_is_valid(ch) ? 0 : 1; 
-+          for (i = 0; i < ligset->Ligature[j].CompCount - 1; i++) {
-+            USHORT gid = ligset->Ligature[j].Component[i];
-+            if (gid < num_glyphs) {
-+              ch          = UC_is_valid(map_base[gid]) ? map_base[gid] : map_sub[gid];
-+              ucv[i+1]    = ch;
-+              fail_count += UC_is_valid(ch) ? 0 : 1;
-+           } else {
-+              fail_count += 1;
-+            } 
-+          }
-+          if (fail_count == 0) {
-+            unsigned char  src[2], *dst;
-+            unsigned char *p, *endptr;
-+            size_t         len = 0;
-+
-+            src[0] = (cid >> 8) & 0xff;
-+            src[1] =  cid & 0xff;
-+            dst    = NEW(comp_count*4, unsigned char);
-+            p      = dst;
-+            endptr = dst + comp_count * 4;
-+            for (i = 0; i < comp_count; i++) {
-+              len += UC_UTF16BE_encode_char(ucv[i], &p, endptr);
-+            }
-+            CMap_add_bfchar(cmap, src, 2, dst, len);
-+            used_chars[cid / 8] &= ~(1 << (7 - (cid % 8)));
-+            count++;
-+            RELEASE(dst);
-+          }
-+          RELEASE(ucv);
-+        }
-+      }
-+    }
-+  }
-+
-+  return count;
- }
- 
--static int
--otl_gsub_dump_ligature (struct otl_gsub_subtab *subtab)
-+static int32_t
-+add_ToUnicode_ligature (CMap *cmap, char *used_chars,
-+                        struct otl_gsub_subtab *subtab,
-+                        int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                        uint16_t *GIDToCIDMap)
- {
--  int  gid, idx;
-+  int32_t count = 0;
-+  USHORT  i, idx, gid;
- 
-   ASSERT(subtab);
- 
-   if (subtab->SubstFormat == 1) {
-     struct otl_gsub_ligature1 *data;
-+    struct clt_coverage        *cov;
- 
-     data = subtab->table.ligature1;
--    for (gid = 0; gid < 0x10000; gid++) {
--      idx  = clt_lookup_coverage(&data->coverage, gid);
--      if (idx >= 0 && idx < data->LigSetCount) {
--        struct otl_gsub_ligset *ligset;
--        USHORT  i, j;
--        ligset = &(data->LigatureSet[idx]); 
--        for (j = 0; j < ligset->LigatureCount; j++) {
--          fprintf(stdout, "substitute \\%u", (USHORT) gid);
--          for (i = 0; i < ligset->Ligature[j].CompCount - 1; i++) {
--            fprintf(stdout, " \\%u", ligset->Ligature[j].Component[i]);
-+    cov  = &data->coverage;
-+    switch (cov->format) {
-+    case 1: /* list */
-+      for (idx = 0; idx < cov->count; idx++) {
-+        gid = cov->list[idx];
-+        if (gid < num_glyphs) {
-+          count += add_ligature1_inverse_map(cmap, used_chars,
-+                                             map_base, map_sub, num_glyphs,
-+                                             GIDToCIDMap, gid, idx, data);
-+        }
-+      }
-+      break;
-+    case 2: /* range */
-+      for (i = 0; i < cov->count; i++) {
-+        for (gid = cov->range[i].Start;
-+             gid <= cov->range[i].End && gid < num_glyphs; gid++) {
-+          idx = cov->range[i].StartCoverageIndex + gid - cov->range[i].Start;
-+          if (gid < num_glyphs) {
-+            count += add_ligature1_inverse_map(cmap, used_chars,
-+                                               map_base, map_sub, num_glyphs,
-+                                               GIDToCIDMap, gid, idx, data); 
-           }
--          fprintf(stdout, " by \\%u;\n", ligset->Ligature[j].LigGlyph);
-         }
-       }
-+      break;
-     }
-   }
- 
-@@ -1779,48 +1985,44 @@
- }
- 
- int
--otl_gsub_dump (otl_gsub *gsub_list,
--               const char *script, const char *language, const char *feature)
-+otl_gsub_add_ToUnicode (CMap *cmap, char *used_chars,
-+                        int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                        uint16_t *GIDToCIDMap, sfnt *sfont)
- {
--  int    error = -1;
-+  int       count = 0;
-+  otl_gsub *gsub_list;
-   struct otl_gsub_tab    *gsub;
-   struct otl_gsub_subtab *subtab;
--  int    sel, i, j;
--
--  if (!gsub_list)
--    return  -1;
-+  int       i, j;
- 
--  sel   = gsub_list->select;
--  error = otl_gsub_select(gsub_list, script, language, feature);
--  if (error < 0) {
--    ERROR("GSUB feature %s.%s.%s not found.", script, language, feature);
--  }
--
--  i = gsub_list->select;
--  if (i < 0 || i >= gsub_list->num_gsubs) {
--    ERROR("GSUB not selected...");
--    return -1;
--  }
--  gsub = &(gsub_list->gsubs[i]);
-+  gsub_list = otl_gsub_new();
-+  otl_gsub_add_feat(gsub_list, "*", "*", "*", sfont);
- 
--  for (j = 0;
--       !error &&
--       j < gsub->num_subtables; j++) {
--    subtab = &(gsub->subtables[j]);
--    switch ((int) subtab->LookupType){
--    case OTL_GSUB_TYPE_SINGLE:
--      error = otl_gsub_dump_single(subtab);
--      break;
--    case OTL_GSUB_TYPE_ALTERNATE:
--      error = otl_gsub_dump_alternate(subtab);
--      break;
--    case OTL_GSUB_TYPE_LIGATURE:
--      error = otl_gsub_dump_ligature(subtab);
--      break;
-+  for (i = 0; i < gsub_list->num_gsubs; i++) {
-+    gsub = &(gsub_list->gsubs[i]);
-+    for (j = 0; j < gsub->num_subtables; j++) {
-+      subtab = &(gsub->subtables[j]);
-+      switch ((int) subtab->LookupType){
-+      case OTL_GSUB_TYPE_SINGLE:
-+        count += add_ToUnicode_single(cmap, used_chars, subtab,
-+                                      map_base, map_sub, num_glyphs,
-+                                      GIDToCIDMap);
-+        break;
-+      case OTL_GSUB_TYPE_ALTERNATE:
-+        count += add_ToUnicode_alternate(cmap, used_chars, subtab,
-+                                         map_base, map_sub, num_glyphs,
-+                                         GIDToCIDMap);
-+        break;
-+      case OTL_GSUB_TYPE_LIGATURE:
-+        count += add_ToUnicode_ligature(cmap, used_chars, subtab,
-+                                        map_base, map_sub, num_glyphs,
-+                                        GIDToCIDMap);
-+        break;
-+      }
-     }
-   }
--  gsub_list->select = sel;
-+  otl_gsub_release(gsub_list);
- 
--  return  error;
-+  return count;
- }
- #endif
-diff -Naur a/texk/dvipdfm-x/tt_gsub.h b/texk/dvipdfm-x/tt_gsub.h
---- a/texk/dvipdfm-x/tt_gsub.h	2018-09-14 04:34:50.000000000 +0100
-+++ b/texk/dvipdfm-x/tt_gsub.h	2019-05-31 22:00:04.009964032 +0100
-@@ -1,6 +1,6 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
--    Copyright (C) 2002-2018 by Jin-Hwan Cho and Shunsaku Hirata,
-+    Copyright (C) 2002-2019 by Jin-Hwan Cho and Shunsaku Hirata,
-     the dvipdfmx project team.
-     
-     This program is free software; you can redistribute it and/or modify
-@@ -23,6 +23,7 @@
- 
- #include "sfnt.h"
- #include "otl_opt.h"
-+#include "cmap.h"
- 
- typedef struct otl_gsub otl_gsub;
- 
-@@ -59,11 +60,7 @@
- extern int  otl_gsub_set_chain   (otl_gsub *gsub_list, const char *otl_tags);
- extern int  otl_gsub_apply_chain (otl_gsub *gsub_list, USHORT *gid);
- 
--#if  0  
--extern int  otl_gsub_dump      (otl_gsub *gsub_list,
--                                const char *script,
--                                const char *language,
--                                const char *feature);
--#endif
--
-+extern int  otl_gsub_add_ToUnicode (CMap *cmap, char *used_chars,
-+                                    int32_t *map_base, int32_t *map_sub, USHORT num_glyphs,
-+                                    uint16_t *GIDToCIDMap, sfnt *sfont);
- #endif /* _TT_GSUB_H_ */
-diff -Naur a/texk/dvipdfm-x/unicode.c b/texk/dvipdfm-x/unicode.c
---- a/texk/dvipdfm-x/unicode.c	2016-01-06 10:13:28.000000000 +0000
-+++ b/texk/dvipdfm-x/unicode.c	2019-05-31 22:00:04.009964032 +0100
-@@ -1,6 +1,6 @@
- /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
--    Copyright (C) 2002-2016 by Jin-Hwan Cho and Shunsaku Hirata,
-+    Copyright (C) 2002-2019 by Jin-Hwan Cho and Shunsaku Hirata,
-     the dvipdfmx project team.
- 
-     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
-@@ -123,7 +123,7 @@
-   unsigned char *p = *pp;
- 
-   if (ucv >= 0 && ucv <= 0xFFFF) {
--    if (p + 2 >= endptr)
-+    if (p + 2 > endptr)
-       return 0;
-     p[0] = (ucv >> 8) & 0xff;
-     p[1] = ucv & 0xff;
-@@ -131,7 +131,7 @@
-   } else if (ucv >= 0x010000 && ucv <= 0x10FFFF) {
-     unsigned short high, low;
- 
--    if (p + 4 >= endptr)
-+    if (p + 4 > endptr)
-       return 0;
-     ucv  -= 0x00010000;
-     high = (ucv >> UC_SUR_SHIFT) + UC_SUR_HIGH_START;
-@@ -142,7 +142,7 @@
-     p[3] = (low & 0xff);
-     count = 4;
-   } else {
--    if (p + 2 >= endptr)
-+    if (p + 2 > endptr)
-       return 0;
-     p[0] = (UC_REPLACEMENT_CHAR >> 8) & 0xff;
-     p[1] = (UC_REPLACEMENT_CHAR & 0xff);
-@@ -207,25 +207,25 @@
-     return 0;
- 
-   if (ucv < 0x7f) {
--    if (p >= endptr - 1)
-+    if (p + 1 > endptr)
-       return 0;
-     p[0]  = (unsigned char) ucv;
-     count = 1;
-   } else if (ucv <= 0x7ff) {
--    if (p >= endptr -2)
-+    if (p + 2 > endptr)
-       return 0;
-     p[0] = (unsigned char) (0xc0 | (ucv >> 6));
-     p[1] = (unsigned char) (0x80 | (ucv & 0x3f));
-     count = 2;
-   } else if (ucv <= 0xffff) {
--    if (p >= endptr - 3)
-+    if (p + 3 > endptr)
-       return 0;
-     p[0] = (unsigned char) (0xe0 | (ucv >> 12));
-     p[1] = (unsigned char) (0x80 | ((ucv >> 6) & 0x3f));
-     p[2] = (unsigned char) (0x80 | (ucv & 0x3f));
-     count = 3;
-   } else if (ucv <= 0x1fffff) {
--    if (p >= endptr - 4)
-+    if (p + 4 > endptr)
-       return 0;
-     p[0] = (unsigned char) (0xf0 | (ucv >> 18));
-     p[1] = (unsigned char) (0x80 | ((ucv >> 12) & 0x3f));
-@@ -233,7 +233,7 @@
-     p[3] = (unsigned char) (0x80 | (ucv & 0x3f));
-     count = 4;
-   } else if (ucv <= 0x3ffffff) {
--    if (p >= endptr - 5)
-+    if (p + 5 > endptr)
-       return 0;
-     p[0] = (unsigned char) (0xf8 | (ucv >> 24));
-     p[1] = (unsigned char) (0x80 | ((ucv >> 18) & 0x3f));
-@@ -242,7 +242,7 @@
-     p[4] = (unsigned char) (0x80 | (ucv & 0x3f));
-     count = 5;
-   } else if (ucv <= 0x7fffffff) {
--     if (p >= endptr - 6)
-+     if (p + 6 > endptr)
-       return 0;
-     p[0] = (unsigned char) (0xfc | (ucv >> 30));
-     p[1] = (unsigned char) (0x80 | ((ucv >> 24) & 0x3f));
-diff -Naur a/texk/dvipsk/ChangeLog b/texk/dvipsk/ChangeLog
---- a/texk/dvipsk/ChangeLog	2019-04-07 02:42:55.000000000 +0100
-+++ b/texk/dvipsk/ChangeLog	2019-05-31 22:00:04.009964032 +0100
-@@ -1,3 +1,9 @@
-+2019-04-30  Karl Berry  <karl@tug.org>
-+
-+	* dosection.c (dosection): close PostScript string constant
-+	for long filenames. tex-k mail from Arnaud Blouin,
-+	24 Apr 2019 13:54:10.
-+
- 2019-04-07  Karl Berry  <karl@freefriends.org>
- 
- 	* TeX Live 2019.
-diff -Naur a/texk/dvipsk/dosection.c b/texk/dvipsk/dosection.c
---- a/texk/dvipsk/dosection.c	2019-03-30 01:50:10.000000000 +0000
-+++ b/texk/dvipsk/dosection.c	2019-05-31 22:00:04.009964032 +0100
-@@ -23,7 +23,7 @@
-    int np;
-    int k;
-    integer thispage = 0;
--   char buf[104];
-+   char buf[300]; /* really 253 */
- 
-    dopsfont(s);
- #ifdef HPS
-@@ -40,7 +40,9 @@
-    doubleout(mag);
-    numout((integer)DPI);
-    numout((integer)VDPI);
--   snprintf(buf, sizeof(buf), "(%.500s)", fulliname);
-+   /* possibly lines in eps files are supposed to be <= 255;
-+      not worth testing the limits merely to output a long file name. */
-+   snprintf(buf, sizeof(buf), "(%.250s)", fulliname);
-    cmdout(buf);
-    newline();
-    cmdout("@start");
-diff -Naur a/texk/web2c/ptexdir/ChangeLog b/texk/web2c/ptexdir/ChangeLog
---- a/texk/web2c/ptexdir/ChangeLog	2019-02-06 11:01:31.000000000 +0000
-+++ b/texk/web2c/ptexdir/ChangeLog	2019-05-31 22:00:04.010964033 +0100
-@@ -1,3 +1,11 @@
-+2019-05-06  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
-+
-+	* ptex-base.ch:
-+	Make appropriate comparison of U+0100 by \if in upTeX.
-+	https://github.com/texjporg/tex-jp-build/issues/68
-+	Re-eval kcatcode of Japanese character token in \if and \ifcat.
-+	https://github.com/texjporg/ptex-manual/issues/4
-+
- 2019-02-03  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
- 
- 	* ptex-base.ch: Ignore newline char after Japanese control
-diff -Naur a/texk/web2c/ptexdir/ptex-base.ch b/texk/web2c/ptexdir/ptex-base.ch
---- a/texk/web2c/ptexdir/ptex-base.ch	2019-02-06 11:00:54.000000000 +0000
-+++ b/texk/web2c/ptexdir/ptex-base.ch	2019-05-31 22:00:04.010964033 +0100
-@@ -59,6 +59,7 @@
- % (2017-09-07) HK  pTeX p3.7.2 More restrictions on direction change commands.
- % (2018-01-21) HK  Added \ptexversion primitive and co. pTeX p3.8.
- % (2018-04-14) HK  pTeX p3.8.1 Bug fix for discontinuous KINSOKU table.
-+% (2019-02-03) HK  pTeX p3.8.2 Change \inhibitglue, add \disinhibitglue.
- %
- 
- @x
-@@ -324,6 +325,13 @@
-   wterm(')');
- @z
- 
-+@x
-+@d max_halfword==@"FFFFFFF {largest allowable value in a |halfword|}
-+@y
-+@d max_halfword==@"FFFFFFF {largest allowable value in a |halfword|}
-+@d max_cjk_val=@"10000
-+@z
-+
- @x [8.111] l.2436 - pTeX: check hi/ho
-   (mem_top+sup_main_memory>=max_halfword) then bad:=14;
- @y
-@@ -2533,19 +2541,19 @@
-   end;
- @y
- if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
--  begin m:=cur_cmd; n:=cur_chr;
-+  begin n:=cur_chr; m:=kcat_code(kcatcodekey(n));
-   end
- else if (cur_cmd>active_char)or(cur_chr>255) then
--  begin m:=relax; n:=256;
-+  begin m:=relax; n:=max_cjk_val;
-   end
- else  begin m:=cur_cmd; n:=cur_chr;
-   end;
- get_x_token_or_active_char;
- if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
--  begin cur_cmd:=cur_cmd;
--  end {dummy}
-+  begin cur_cmd:=kcat_code(kcatcodekey(cur_chr));
-+  end
- else if (cur_cmd>active_char)or(cur_chr>255) then
--  begin cur_cmd:=relax; cur_chr:=256;
-+  begin cur_cmd:=relax; cur_chr:=max_cjk_val;
-   end;
- @z
- 
-diff -Naur a/texk/web2c/uptexdir/ChangeLog b/texk/web2c/uptexdir/ChangeLog
---- a/texk/web2c/uptexdir/ChangeLog	2019-02-23 01:59:36.000000000 +0000
-+++ b/texk/web2c/uptexdir/ChangeLog	2019-05-31 22:00:04.010964033 +0100
-@@ -1,3 +1,28 @@
-+2019-05-25  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
-+
-+	* uptex-m.ch:
-+	Correct upTeX_revision ".25", upTeX_version_string "-u1.25".
-+
-+2019-05-06  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
-+
-+	* uptex-m.ch, upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch,
-+	uptex_version.h: upTeX version u1.25.
-+	* kanji.c, kanji.h:
-+	Fix bug of kcatcode at Fullwidth ASCII variants and
-+	Halfwidth Katakana variants from Yusuke Terada san:
-+	https://github.com/texjporg/tex-jp-build/pull/79
-+	Set default internal encoding EUC/SJIS if a command name is
-+	with prefix of "p" or "ep", intending to be compatible with
-+	pTeX family (ptex, eptex, pbibtex, pdvitype, ppltotf, ptftopl)
-+	(experimental).
-+
-+2019-05-06  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
-+
-+	* uptex-m.ch:
-+	Make appropreate comparison of U+0100 by \if.
-+	https://github.com/texjporg/tex-jp-build/issues/68
-+	* tests/test_if.tex: Test case.
-+
- 2019-02-23  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
- 
- 	* uptex-m.ch, upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch,
-@@ -24,7 +49,7 @@
- 2018-09-16  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
- 
- 	* upbibtex.ch: Fix bug of substring$
--	from Takashi Sakai:
-+	from Takashi Sakai san:
- 	https://github.com/texjporg/tex-jp-build/issues/64
- 	https://github.com/texjporg/tex-jp-build/pull/66
- 
-diff -Naur a/texk/web2c/uptexdir/kanji.c b/texk/web2c/uptexdir/kanji.c
---- a/texk/web2c/uptexdir/kanji.c	2019-02-23 01:59:36.000000000 +0000
-+++ b/texk/web2c/uptexdir/kanji.c	2019-05-31 22:00:04.010964033 +0100
-@@ -444,7 +444,7 @@
-                || (LATIN_SMALL_LETTER_O_WITH_STROKE  <=c && c<=LATIN_SMALL_LETTER_Y_WITH_DIAERESIS  ) )
-             return 0x1FD;
-         }
--        if (block==0xa0) {
-+        if (block==0xa1) {
-             /* Fullwidth ASCII variants  except for U+FF01..FF0F, U+FF1A..FF20, U+FF3B..FF40, U+FF5B..FF5E */
-             if (  (FULLWIDTH_DIGIT_0  <=c && c<=FULLWIDTH_DIGIT_9  )
-                || (FULLWIDTH_CAPITAL_A<=c && c<=FULLWIDTH_CAPITAL_Z)
-@@ -485,8 +485,6 @@
- {
-     char *p;
- 
--    enable_UPTEX (true); /* enable */
--
-     init_kanji (file_str, internal_str);
- 
-     p = getenv ("PTEX_KANJI_ENC");
-@@ -504,3 +502,33 @@
-     }
- #endif
- }
-+
-+void init_default_kanji_select(void)
-+{
-+    char *base;
-+
-+    base = kpse_program_basename (argv[0]);
-+
-+    if (FILESTRNCASEEQ(base, "p", 1) || FILESTRNCASEEQ(base, "ep", 2)) {
-+
-+        enable_UPTEX (false); /* disable */
-+#if defined(WIN32)
-+/* pBibTeX is EUC only */
-+        if (FILESTRNCASEEQ(base, "pbibtex", 7)) {
-+            init_default_kanji(NULL, "euc");
-+        } else {
-+/* for pTeX, e-pTeX, pDVItype, pPLtoTF, and pTFtoPL */
-+            init_default_kanji(NULL, "sjis");
-+        }
-+#else
-+        init_default_kanji(NULL, "euc");
-+#endif
-+
-+    } else {
-+
-+/* for upTeX, e-upTeX, upBibTeX, upDVItype, upPLtoTF, and upTFtoPL */
-+        enable_UPTEX (true);  /* enable */
-+        init_default_kanji ("utf8", "uptex");
-+
-+    }
-+}
-diff -Naur a/texk/web2c/uptexdir/kanji.h b/texk/web2c/uptexdir/kanji.h
---- a/texk/web2c/uptexdir/kanji.h	2019-02-06 11:01:31.000000000 +0000
-+++ b/texk/web2c/uptexdir/kanji.h	2019-05-31 22:00:04.010964033 +0100
-@@ -38,8 +38,9 @@
- extern integer multilenbuffchar (integer c);
- 
- extern void init_default_kanji (const_string file_str, const_string internal_str);
-+extern void init_default_kanji_select (void);
- /* for upTeX, e-upTeX, upBibTeX, upDVItype, upPLtoTF, and upTFtoPL */
--#define initkanji() init_default_kanji("utf8", "uptex")
-+#define initkanji() init_default_kanji_select()
- /* for upDVItype */
- #define setpriorfileenc() set_prior_file_enc()
- 
-diff -Naur a/texk/web2c/uptexdir/tests/test_if.tex b/texk/web2c/uptexdir/tests/test_if.tex
---- a/texk/web2c/uptexdir/tests/test_if.tex	1970-01-01 01:00:00.000000000 +0100
-+++ b/texk/web2c/uptexdir/tests/test_if.tex	2019-05-31 22:00:04.010964033 +0100
-@@ -0,0 +1,29 @@
-+\kcatcode`�=18
-+\def\xA{�}\let\yA=�
-+\kcatcode`�=17
-+\def\xB{�}\let\yB=�
-+\kcatcode`�=16
-+
-+\message{\ifcat �\xA Y\else N\fi}
-+\message{\ifcat �\yA Y\else N\fi}
-+\message{\ifcat �\xB Y\else N\fi}
-+\message{\ifcat �\yB Y\else N\fi}
-+
-+\message{\if    �\xA Y\else N\fi}
-+\message{\if    �\yA Y\else N\fi}
-+\message{\if    �\xA Y\else N\fi}
-+\message{\if    �\yA Y\else N\fi}
-+
-+\ifx\ucs\undefined\else
-+  \kcatcode"100=16
-+  \message{upTeX}
-+  \def\xA{Ä€}% U+0100
-+  \def\xB{�}% U+0101
-+  \message{\if   \xA\relax Y\else N\fi}
-+  \message{\if   \xB\relax Y\else N\fi}
-+  \message{\ifcat\xA\relax Y\else N\fi}
-+  \message{\ifcat\xB\relax Y\else N\fi}
-+\fi
-+\end
-+
-+
-diff -Naur a/texk/web2c/uptexdir/upbibtex.ch b/texk/web2c/uptexdir/upbibtex.ch
---- a/texk/web2c/uptexdir/upbibtex.ch	2019-02-23 01:59:36.000000000 +0000
-+++ b/texk/web2c/uptexdir/upbibtex.ch	2019-05-31 22:00:04.010964033 +0100
-@@ -3,7 +3,7 @@
- @d banner=='This is pBibTeX, Version 0.99d-j0.33'
- @y
- @d my_name=='upbibtex'
--@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.24'
-+@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.25'
- @z
- 
- @x
-diff -Naur a/texk/web2c/uptexdir/updvitype.ch b/texk/web2c/uptexdir/updvitype.ch
---- a/texk/web2c/uptexdir/updvitype.ch	2019-02-23 01:59:36.000000000 +0000
-+++ b/texk/web2c/uptexdir/updvitype.ch	2019-05-31 22:00:04.010964033 +0100
-@@ -3,7 +3,7 @@
- @d banner=='This is pDVItype, Version 3.6-p0.4'
- @y
- @d my_name=='updvitype'
--@d banner=='This is upDVItype, Version 3.6-p0.4-u1.24'
-+@d banner=='This is upDVItype, Version 3.6-p0.4-u1.25'
- @z
- 
- @x procedure initialize
-diff -Naur a/texk/web2c/uptexdir/uppltotf.ch b/texk/web2c/uptexdir/uppltotf.ch
---- a/texk/web2c/uptexdir/uppltotf.ch	2019-02-23 01:59:36.000000000 +0000
-+++ b/texk/web2c/uptexdir/uppltotf.ch	2019-05-31 22:00:04.010964033 +0100
-@@ -3,7 +3,7 @@
- @d banner=='This is pPLtoTF, Version 3.6-p2.0'
- @y
- @d my_name=='uppltotf'
--@d banner=='This is upPLtoTF, Version 3.6-p2.0-u1.24'
-+@d banner=='This is upPLtoTF, Version 3.6-p2.0-u1.25'
- @z
- 
- @x
-diff -Naur a/texk/web2c/uptexdir/uptex-m.ch b/texk/web2c/uptexdir/uptex-m.ch
---- a/texk/web2c/uptexdir/uptex-m.ch	2019-02-23 01:59:36.000000000 +0000
-+++ b/texk/web2c/uptexdir/uptex-m.ch	2019-05-31 22:00:04.010964033 +0100
-@@ -1,4 +1,4 @@
--% This is a change file for upTeX u1.24
-+% This is a change file for upTeX u1.25
- % By Takuji Tanaka.
- %
- % (02/26/2007) TTK  upTeX u0.01
-@@ -39,6 +39,8 @@
- % (2018-01-21) HK   Added \uptexversion primitive and co.
- % (2018-02-24) TTK  upTeX u1.23
- % (2019-02-23) TTK  upTeX u1.24
-+% (2019-05-06) HK   Hironori Kitagawa fixed a bug in \if.
-+% (2019-05-06) TTK  upTeX u1.25
- 
- @x upTeX: banner
-   {printed when \pTeX\ starts}
-@@ -46,8 +48,8 @@
-   {printed when \pTeX\ starts}
- @#
- @d upTeX_version=1
--@d upTeX_revision==".24"
--@d upTeX_version_string=='-u1.24' {current u\pTeX\ version}
-+@d upTeX_revision==".25"
-+@d upTeX_version_string=='-u1.25' {current u\pTeX\ version}
- @#
- @d upTeX_banner=='This is upTeX, Version 3.14159265',pTeX_version_string,upTeX_version_string
- @d upTeX_banner_k==upTeX_banner
-@@ -142,6 +144,7 @@
- @d max_quarterword=255 {largest allowable value in a |quarterword|}
- @d min_halfword==-@"FFFFFFF {smallest allowable value in a |halfword|}
- @d max_halfword==@"FFFFFFF {largest allowable value in a |halfword|}
-+@d max_cjk_val=@"10000
- @y
- @d min_quarterword=0 {smallest allowable value in a |quarterword|}
- @d max_quarterword=@"FFFF {largest allowable value in a |quarterword|}
-@@ -699,16 +702,24 @@
- 
- @x
- if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
-+  begin n:=cur_chr; m:=kcat_code(kcatcodekey(n));
-+  end
- @y
- if (cur_cmd>=kanji)and(cur_cmd<=hangul) then
-+  begin m:=cur_cmd; n:=cur_chr;
-+  end
- @z
- 
- @x
- get_x_token_or_active_char;
- if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
-+  begin cur_cmd:=kcat_code(kcatcodekey(cur_chr));
-+  end
- @y
- get_x_token_or_active_char;
- if (cur_cmd>=kanji)and(cur_cmd<=hangul) then
-+  begin cur_cmd:=cur_cmd;
-+  end {dummy}
- @z
- 
- @x
-diff -Naur a/texk/web2c/uptexdir/uptex_version.h b/texk/web2c/uptexdir/uptex_version.h
---- a/texk/web2c/uptexdir/uptex_version.h	2019-02-23 01:59:36.000000000 +0000
-+++ b/texk/web2c/uptexdir/uptex_version.h	2019-05-31 22:00:04.010964033 +0100
-@@ -1 +1 @@
--#define UPTEX_VERSION "u1.24"
-+#define UPTEX_VERSION "u1.25"
-diff -Naur a/texk/web2c/uptexdir/uptftopl.ch b/texk/web2c/uptexdir/uptftopl.ch
---- a/texk/web2c/uptexdir/uptftopl.ch	2019-02-23 01:59:36.000000000 +0000
-+++ b/texk/web2c/uptexdir/uptftopl.ch	2019-05-31 22:00:04.010964033 +0100
-@@ -3,7 +3,7 @@
- @d banner=='This is pTFtoPL, Version 3.3-p2.0'
- @y
- @d my_name=='uptftopl'
--@d banner=='This is upTFtoPL, Version 3.3-p2.0-u1.24'
-+@d banner=='This is upTFtoPL, Version 3.3-p2.0-u1.25'
- @z
- 
- @x
-diff -Naur a/texk/web2c/xetexdir/ChangeLog b/texk/web2c/xetexdir/ChangeLog
---- a/texk/web2c/xetexdir/ChangeLog	2019-01-02 22:41:45.000000000 +0000
-+++ b/texk/web2c/xetexdir/ChangeLog	2019-05-31 22:02:30.345042172 +0100
-@@ -1,3 +1,8 @@
-+2019-05-30  Khaled Hosny  <dr.khaled.hosny@gmail.com>
-+
-+         * XeTeXLayoutInterface.cpp: Do not use hb-icu if HarfBuzz
-+         version is 2.5.0 or newer.
-+
- 2019-01-03  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
- 
- 	* NEWS, xetex_version.h, xetex.web: Sync with the upstream.
-diff -Naur a/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp b/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
---- a/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp	2017-03-12 08:47:36.000000000 +0000
-+++ b/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp	2019-05-31 22:05:06.636170781 +0100
-@@ -2,7 +2,7 @@
-  Part of the XeTeX typesetting system
-  Copyright (c) 1994-2008 by SIL International
-  Copyright (c) 2009-2012 by Jonathan Kew
-- Copyright (c) 2012-2015 by Khaled Hosny
-+ Copyright (c) 2012-2019 by Khaled Hosny
- 
-  SIL Author(s): Jonathan Kew
- 
-@@ -39,8 +39,11 @@
- 
- #include <graphite2/Font.h>
- #include <graphite2/Segment.h>
-+#include <hb.h>
- #include <hb-graphite2.h>
-+#if !HB_VERSION_ATLEAST(2,5,0)
- #include <hb-icu.h>
-+#endif
- #include <hb-ot.h>
- 
- #include "XeTeX_web.h"
-@@ -661,6 +664,7 @@
-     free(engine->shaper);
- }
- 
-+#if !HB_VERSION_ATLEAST(2,5,0)
- static unsigned int
- _decompose_compat(hb_unicode_funcs_t* ufuncs,
-                   hb_codepoint_t      u,
-@@ -677,8 +681,7 @@
-     hb_unicode_funcs_set_decompose_compatibility_func(ufuncs, _decompose_compat, NULL, NULL);
-     return ufuncs;
- }
--
--static hb_unicode_funcs_t* hbUnicodeFuncs = NULL;
-+#endif
- 
- int
- layoutChars(XeTeXLayoutEngine engine, uint16_t chars[], int32_t offset, int32_t count, int32_t max,
-@@ -699,11 +702,15 @@
- 
-     script = hb_ot_tag_to_script (engine->script);
- 
-+    hb_buffer_reset(engine->hbBuffer);
-+
-+#if !HB_VERSION_ATLEAST(2,5,0)
-+    static hb_unicode_funcs_t* hbUnicodeFuncs = NULL;
-     if (hbUnicodeFuncs == NULL)
-         hbUnicodeFuncs = _get_unicode_funcs();
--
--    hb_buffer_reset(engine->hbBuffer);
-     hb_buffer_set_unicode_funcs(engine->hbBuffer, hbUnicodeFuncs);
-+#endif
-+
-     hb_buffer_add_utf16(engine->hbBuffer, chars, max, offset, count);
-     hb_buffer_set_direction(engine->hbBuffer, direction);
-     hb_buffer_set_script(engine->hbBuffer, script);
diff --git a/office/texlive/prep/texmf_get.sh b/office/texlive/prep/texmf_get.sh
index e5494a26cd..c66a71b7f2 100644
--- a/office/texlive/prep/texmf_get.sh
+++ b/office/texlive/prep/texmf_get.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-# texmf_get.sh (c) 2016 - 2019 Johannes Schoepfer, Germany, slackbuilds[at]schoepfer[dot]info
+# texmf_get.sh
+#
+# Copyright 2016 - 2020  Johannes Schoepfer, Germany, slackbuilds@schoepfer.info
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +22,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#  V 15.0.3
+#  V 15.0.4
 #
 #  Prepare xz-compressed tarballs of texlive-texmf-trees based on texlive.tlpdb
 #  This script takes care of dependencies(as far as these are present in texlive.tlpdb)
@@ -31,51 +33,44 @@
 # -docs: -base documentation only, no manpages/GNU infofiles
 # -extra: remaining stuff and corresponding docs
 #
-#  texlive netarchive policy: Every package is included as dependency
+#  texlive netarchive policy: Every package is included as dependency 
 #  in exactly one collection. A package may have dependencies on other
 #  packages from any collection.
 
-# package source: http://mirror.ctan.org/systems/texlive/tlnet/archive/
-
 #set -e
-MAJORVERSION=2019
+MAJORVERSION=2020
 mirror="http://mirror.ctan.org/systems/texlive/tlnet/"
-TMP=$PWD/tmp
+TMP=${TMP:-$PWD/tmp}	
 
 # Globally excluded packages, which are/contain
 # -useless without tlmgr-installer
-# -non-linux
+# -non-linux, e.g. texworks
 # -covered by an external package, e.g. asymptote on SBo
 # -obsolete, e.g. omega
-# -java dependend packages
 # -binaries provided already by texlive.Slackbuild
-# -binaries provided already other system packages, e.g. texlive-scripts.ARCH
-# -only sources, or hyphen directives, e.g. metatype1, patch, ...
-# -only hyphen directives, e.g. hyphen-farsi ...
+# -binaries which texlive upstream recommends to build natively, e.g. dvisvgm on SBo
+# -only sources, e.g. metatype1, patch, ...
 
 global_exclude="
+  00texlive.config
+  00texlive.image
+  00texlive.installation
+  00texlive.installer
   aleph
   antomega
   asymptote
   bibtexu
   cslatex
   dviout.win32
-  hyphen-arabic
-  hyphen-farsi
   lambda
-  metatype1
   ocherokee
   oinuit
   omega
   omegaware
   otibet
-  patch
   texlive-common
   texlive-docindex
   texlive-msg-translations
-  texlive-scripts
-  texlive.infra
-  texliveonfly
   texosquery
   texworks
   tlcockpit
@@ -104,43 +99,45 @@ special_packages="
 #Todo: split type1 fonts, or keep subset of type1 fonts in base
 #  cm-super
 
-# keep precompiled binaries, list binary, not package name
+# keep precompiled binaries, list binary, not package name 
 keep_precompiled="
   biber
   "
 
 texmf_editions () {
-
+  
   # "excludes from -base", also dependencies are excluded
   PACKAGES="
     cm-super
     biber
     bib2gls
     knitting
-    pgfornament
-    pgfplots
     pst-cox
     pst-poker
     pst-vectorian
     pst-geo
     bclogo
-    $(grep ^"name .*biblatex" $db | cut -d' ' -f2 )
+    texplate
+    texliveonfly
+    kerkis
     " texmfget extra || exit 1
  
     # packages/collections and their dependencies for -base
   PACKAGES="
-    $(cat $corepackages)
+    $(grep ^"name hyphen-.*" $db | cut -d' ' -f2 )
+    $special_packages
     etoolbox
-    xcolor
     memoir
-    velthuis
-    wasy
     ptex
     platex
     revtex
-    uptex
-    uplatex
     ucs
+    uplatex
+    uptex
+    velthuis
+    wasy
+    xcolor
+    xypic
     collection-basic
     collection-latex
     collection-metapost
@@ -152,17 +149,23 @@ texmf_editions () {
     collection-langeuropean
     collection-langenglish
     collection-langfrench
+    collection-langgreek
     collection-langitalian
     collection-langpolish
     collection-langportuguese
     collection-langspanish
     collection-latexrecommended
-    $(collection_by_size fontsextra 70000 || exit 1)
-    $(collection_by_size publishers 10000 || exit 1)
+    $(collection_by_size fontsextra   70000 || exit 1)
+    $(collection_by_size latexextra    1000 || exit 1)
+    $(collection_by_size langchinese   5000 || exit 1)
+    $(collection_by_size langcjk       3000 || exit 1)
+    $(collection_by_size pictures    100000 || exit 1)
+    $(collection_by_size publishers   10000 || exit 1)
     " texmfget base
 
     # packages/collections and their dependencies for -extra
   PACKAGES="
+    $(grep ^"name .*biblatex" $db | cut -d' ' -f2 )
     amiri
     arabi
     arabi-add
@@ -177,12 +180,12 @@ texmf_editions () {
     beebe
     bhcexam
     bxtexlogo
-    churchslavonic
     collection-fontsextra
     collection-langchinese
     collection-langcjk
     collection-langjapanese
     collection-langkorean
+    collection-pictures
     collection-publishers
     collection-texworks
     collection-wintools
@@ -218,7 +221,7 @@ texmf_editions () {
     pdfwin
     pdfx
     powerdot-tuliplab
-    powerdot-FUBerlin
+    powerdot-fuberlin
     quran
     quran-de
     realhats
@@ -231,30 +234,28 @@ texmf_editions () {
     skaknew
     stellenbosch
     suanpan
+    texdoctk
     tudscr
     uantwerpendocs
-    ucs
     udesoftec
     universalis
     uowthesis
-    wasy2-ps
+    wasy-type1
     xduthesis
-    xetexko
+    xetexko 
     xq
     " texmfget extra || exit 1
-
-   # What's left, for base again
+ 
+   # What's left, for base again 
   PACKAGES="
     collection-fontsrecommended
     collection-xetex
     collection-langcyrillic
     collection-langarabic
     collection-langgerman
-    collection-langgreek
     collection-langother
     collection-humanities
     collection-mathscience
-    collection-pictures
     collection-pstricks
     collection-music
     collection-games
@@ -279,9 +280,9 @@ usage () {
   echo "-extra: remaining texfiles and docs"
   echo "[lint]: compare filename contents of all generated editions,"
   echo " to detect overlapping files"
-  echo
+  echo 
   echo "Only new/updated/missing tex packages are downloaded."
-  echo "The first run takes \"long\", tex packages(about 2500Mb)"
+  echo "The first run takes \"long\", tex packages(about 3Gb)"
   echo "need to be downloaded."
   echo "To check out a new version/release, delete"
   echo "$db"
@@ -294,7 +295,7 @@ usage () {
 }
 
 collection_by_size () {
-  # from collection $1, pull packages smaller $2 bytes
+  # from collection $1, pull packages smaller $2 bytes 
   start_n="$(grep -n ^"name collection-$1"$ $db | cut -d':' -f1)"
   # find end of package/collection
   for emptyline in $emptylines
@@ -306,7 +307,7 @@ collection_by_size () {
     fi
   done
   extrapackages="$(sed "${start_n},${end_n}!d" $db | grep ^"depend " | grep -v ^"depend collection" | sed "s/^depend//g" )"
-
+  
   # add if smaller than ...
   for checksize in $extrapackages
   do
@@ -333,53 +334,48 @@ package_meta () {
       fi
     done
     # Don't handle collections as dependency of other collections
-    sed "${start_n},${end_n}!d;/^depend collection/d" $db > $texmf/$1.meta
+    sed "${start_n},${end_n}!d;/^depend collection/d" $db > $texmf/$1.meta 
   fi
 }
 
 download () {
   # Download packages, if not already available. Not every packages has a corresponding .doc package.
-  # Try three times if package isn't present, with -t1 to get another mirror the second time
-  cd $texmf
-  if [ ! -s "${1}${flavour}.tar.xz" ]
-  then
-    for run in {1..10}
-    do
-      wget -q --show-progress -t1 -c ${mirror}archive/${1}${flavour}.tar.xz
-      [ -s "${1}${flavour}.tar.xz" ] && break
-    done
-  fi
-  # If no success by downloading, write error log
-  [ ! -s ${1}${flavour}.tar.xz ] && echo "Downloading ${1}${flavour}.tar.xz did not work, writing to $errorlog" && echo "$VERSION" >> $errorlog && echo "Error downloading ${1}${flavour}.tar.xz" >> $errorlog && exit 1
-
-  # check sha512, give three tries for downloading again(diffrent mirrors are used automatically)
+  # Try multiple times if package isn't present or checksum fails
+  
+  unset checksum_ok
   if [ "$flavour" = ".doc" ]
   then
     sha512="$(grep ^doccontainerchecksum $texmf/$1.meta | cut -d' ' -f2 )"
   else
     sha512="$(grep ^containerchecksum $texmf/$1.meta | cut -d' ' -f2 )"
   fi
-
-  for run in {1..10}
+  
+  cd $texmf
+ 
+  for run in {1..8}
   do
+    [ ! -s "${1}${flavour}.tar.xz" ] && \
+      wget -q --show-progress -t1 -c ${mirror}archive/${1}${flavour}.tar.xz
+    [ ! -s "${1}${flavour}.tar.xz" ] && continue
     if [ "$(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 )" != "$sha512" ]
     then
-      # Download (hopefully) newer file
+      echo "sha512sum of ${1}${flavour}.tar.xz doesn't match $texmf/$1.meta"
+      echo "deleting ${1}${flavour}.tar.xz"
       rm ${1}${flavour}.tar.xz
-      wget -q --show-progress -t1 -c ${mirror}archive/${1}${flavour}.tar.xz
     else
+      checksum_ok=yes
       break
     fi
   done
-  # check sha512 again, exit if it fails
-  if [ "$(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 )" != "$sha512" ]
+  
+  # If no success by downloading, write error log
+  if [ -z "$checksum_ok" ]
   then
-    echo "sha512sum $(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 ) of"
-    echo "${package}${flavour}.tar.xz doesn't match with $db"
-    # delete metafile on failure to get generated again on next run, where new $db may be in use
-    rm $texmf/$1.meta
-    echo "sha512sum $sha512"
-    echo "Delete ${db}* to be current again, and try again."
+    echo "Downloading ${1}${flavour}.tar.xz or sh512sum check was not successful,\\
+    writing to $errorlog" 
+    echo "Delete ${db}* and try again."
+    echo "$VERSION" >> $errorlog
+    echo "Error downloading ${1}${flavour}.tar.xz" >> $errorlog
     exit 1
   fi
 }
@@ -390,7 +386,7 @@ untar () {
   then
     while read package
     do
-      echo "untar $package"
+      echo "untar $package$flavour"
       # untar all packages, check for relocation, "relocate 1" -> untar in texmf-dist
       download $package || exit 1
       # untar package, relocate to texmf-dist if necessary, binary packages always need relocation
@@ -401,7 +397,9 @@ untar () {
       then
         tar xf ${package}${flavour}.tar.xz --exclude tlpkg -C $relocated || exit 1
       else
-        tar vxf ${package}${flavour}.tar.xz --exclude tlpkg -C $relocated | grep -E '\.sty$|\.bbx$|\.cls$' > $texmf/$package.deps
+        tar vxf ${package}${flavour}.tar.xz \
+	  --exclude tlpkg/tlpobj \
+	  -C $relocated | grep -E '\.sty$|\.bbx$|\.cls$' > $texmf/$package.deps
         if [ -n "$texmf/$package.deps" ]
         then
           unset provide
@@ -433,58 +431,87 @@ untar () {
       fi
 
       # Delete binaries, these are provided
-      # by texlive.Slackbuild, keep symlinks and scripts
-
+      # by the buildscript, keep symlinks and scripts
+      
       for arch in $platforms
       do
         if [ -d $texmf/texmf-dist/bin/$arch ]
         then
-          [ ! -d $texmf/texmf-dist/linked_scripts ] \
-            && mkdir $texmf/texmf-dist/linked_scripts
-          # rewrite link target to fit systemwide installation
+          [ ! -d $texmf/texmf-dist/linked_scripts ] && \
+            mkdir $texmf/texmf-dist/linked_scripts
+	  # remove the unfortunate "man" link
+	  [ -L "$texmf/texmf-dist/bin/$arch/man" ] && \
+	    rm $texmf/texmf-dist/bin/$arch/man 
           for link in $(find $texmf/texmf-dist/bin/$arch -type l)
           do
-            ln -sf $(readlink $link | sed "s/^..\/..\(.*\)/..\/share\1/" ) $link || exit 1
+	    link_valid_dest=$texmf/texmf-dist/linked_scripts/${link##*/}
+            # move symlink to linked_scripts
+            mv $link $link_valid_dest
+            # some links have to dangle, because target binaries are coming from the buildscript
+            # fix SELFAUTOPARENT in some scripts
+            if [ -e "$link_valid_dest" ]
+            then
+              sed -i "s/kpsewhich -var-value=SELFAUTOPARENT/kpsewhich -var-value=TEXMFROOT/g" \
+                $link_valid_dest || exit 1
+            fi
           done
-          # move symlinks to linked_scripts
-          find $texmf/texmf-dist/bin/$arch -type l -exec mv '{}' $texmf/texmf-dist/linked_scripts/ \;
-
+           
           # keep only binaries of special packages
           # remove xindy.mem(gzip compresses data) to prevent overwriting
           for bin in $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | \
-            grep -e "executable" -e "shared object" -e "gzip compressed data" | \
-            grep -e ELF -e "gzip compressed data" | cut -f 1 -d : )
+            grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : ) 
           do
             for binary in $keep_precompiled
             do
               if [ "$(echo $bin | rev | cut -d'/' -f1 | rev)" != "$binary" ]
               then
                 rm $bin
+                echo -n "$package:" >> $binary_removed.$edition
                 echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition
               fi
             done
           done
           # move scripts to linked-scripts
-          scripts="$(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | grep -wv ELF | cut -f 1 -d : )"
-          for script in $scripts
+          for script in \
+	    $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + |\
+	    grep -wv ELF | cut -f 1 -d : )
           do
+            echo "Moving script/bin $script to $texmf/texmf-dist/linked_scripts/"
             mv $script $texmf/texmf-dist/linked_scripts/
           done
         fi
       done
+     
+      for tlpkg_dir in $texmf/tlpkg $texmf/texmf-dist/tlpkg
+      do
+        if [ -d $tlpkg_dir ]
+        then
+          for bin in $(find $tlpkg_dir -type f -exec file '{}' + | \
+            grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : ) 
+          do
+            echo "Deleting binary $bin found in $tlpkg_dir"
+            rm $bin
+            echo -n "$package:" >> $binary_removed.$edition
+            echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition
+          done
+          [ -d $tlpkg_dir/TeXLive ] && \
+            mkdir -p $texmf/texmf-dist/scripts/texlive && \
+            mv $tlpkg_dir/TeXLive $texmf/texmf-dist/scripts/texlive
+        fi
+      done
 
       if [ "$flavour" = ".doc" ]
       then
-        size=$(grep ^doccontainersize $texmf/$package.meta | cut -d' ' -f2)
+        size=$(grep ^doccontainersize $texmf/$package.meta | cut -d' ' -f2) 
       else
         size=$(grep ^containersize $texmf/$package.meta | cut -d' ' -f2)
 	# add maps to updmap.cfg, don't add special_packages map files to -base
-	add_map=yes
+	add_map=yes 
 	if [ $edition = base ]
 	then
 	  for no_map in $special_packages
 	  do
-	    [ $no_map = $package ] && add_map=no && break
+	    [ $no_map = $package ] && add_map=no && break 
           done
 	fi
 	[ $add_map = yes ] && grep ^'execute ' $texmf/$package.meta | grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition
@@ -495,12 +522,18 @@ untar () {
       echo "$(xz -l --verbose ${package}${flavour}.tar.xz | grep "Uncompressed size" | \
         cut -d'(' -f2 | cut -d' ' -f1 ) byte, $package$flavour: $shortdesc" >> $output.meta.uncompressed
     done < $1
-
-    # copy packages index to texmf-dist, so included packages are known in later installation
+    
+    # add a path to updmap
+    if [ -s "$texmf/texmf-dist/linked_scripts/updmap" ]
+    then
+      sed -i '/unshift.*@INC.*/a unshift(@INC, "$TEXMFROOT/texmf-dist/scripts/texlive");' $texmf/texmf-dist/linked_scripts/updmap || exit 1
+    fi
+    
+    # copy packages index to texmf-dist, to have a list of included packages in the final installation
     # don't list binary packages, as the binaries itself are not contained, only the symlinks.
     cat $output.meta | grep -v '\-linux:'  >> $output.$edition.meta
     cat $output.meta.uncompressed | grep -v '\-linux:' >> $output.$edition.meta.uncompressed
-
+    
     # cleanup
     [ -f $output.meta ] && rm $output.meta
     [ -f $output.meta.uncompressed ] && rm $output.meta.uncompressed
@@ -508,27 +541,25 @@ untar () {
 }
 
 remove_cruft () {
-  # Remove m$-stuff, ConTeXt single-user-system stuff, source leftovers and pdf-versions of manpages
-  rm -rf texmf-dist/source
-  rm -rf texmf-dist/scripts/context/stubs/source/
-  find texmf-dist/ -type d -name 'win32'         -exec rm -rf {} +
-  find texmf-dist/ -type d -name 'win64'         -exec rm -rf {} +
-  find texmf-dist/ -type d -name 'mswin'         -exec rm -rf {} +
-  find texmf-dist/ -type d -name 'win'           -exec rm -rf {} +
-  find texmf-dist/ -type d -name 'setup'         -exec rm -rf {} +
-  find texmf-dist/ -type d -name 'install'       -exec rm -rf {} +
-  find texmf-dist/ -type f -name 'uninstall*.sh' -delete
-  find texmf-dist/ -type f -name '*.bat'         -delete
-  find texmf-dist/ -type f -name '*.bat.w95'     -delete
-  find texmf-dist/ -type f -name '*win32*'       -delete
-  find texmf-dist/ -type f -name 'winansi*'      -delete
-  find texmf-dist/ -type f -name '*man1.pdf'     -delete
-  find texmf-dist/ -type f -name '*man5.pdf'     -delete
-  # Remove zero-length files, as these appear e.g. in hyph-utf8 tex-package.
-  # find texmf-dist/ -type f -size 0c -delete
-  find texmf-dist/ -type f -empty -delete
-  # Remove empty directories recursively
-    find texmf-dist/ -type d -empty -delete
+  # Remove m$-stuff, ConTeXt single-user-system stuff, empty files/directories and pdf-manpages
+  rm -rf $texmf/texmf-dist/source
+  rm -rf $texmf/texmf-dist/scripts/context/stubs/source/
+  find $texmf/texmf-dist/ -type d -name 'win32'         -exec rm -rf {} +
+  find $texmf/texmf-dist/ -type d -name 'win64'         -exec rm -rf {} +
+  find $texmf/texmf-dist/ -type d -name 'mswin'         -exec rm -rf {} +
+  find $texmf/texmf-dist/ -type d -name 'win'           -exec rm -rf {} +
+  find $texmf/texmf-dist/ -type d -name 'setup'         -exec rm -rf {} +
+  find $texmf/texmf-dist/ -type d -name 'install'       -exec rm -rf {} +
+  find $texmf/texmf-dist/ -type f -name 'uninstall*.sh' -delete
+  find $texmf/texmf-dist/ -type f -name '*.bat'         -delete
+  find $texmf/texmf-dist/ -type f -name '*.bat.w95'     -delete
+  find $texmf/texmf-dist/ -type f -name '*.vbs'         -delete
+  find $texmf/texmf-dist/ -type f -name '*win32*'       -delete
+  find $texmf/texmf-dist/ -type f -name 'winansi*'      -delete
+  find $texmf/texmf-dist/ -type f -name '*man1.pdf'     -delete
+  find $texmf/texmf-dist/ -type f -name '*man5.pdf'     -delete
+  find $texmf/texmf-dist/ -type f -empty -delete
+  find $texmf/texmf-dist/ -type d -empty -delete
 }
 
 texmfget () {
@@ -538,12 +569,12 @@ texmfget () {
   # Remove outputfile if already present
   >$output
   >$output_doc
-
+  
   # Only do something if $collection wasn't already done before
   while [ -s $collections_tobedone ]
   do
     collection=$(tail -n1 $collections_tobedone)
-
+  
     # continue with next collection if collection was already done
     if [ -s "$collections_done" ]
     then
@@ -559,40 +590,51 @@ texmfget () {
         continue
       fi
     fi
-
+    
     package_meta $collection || exit 1
-
+ 
     # If $collection is a singel package(not a collection-), add it here
     if [ -n "$(head -n1 $texmf/$collection.meta | grep -v "name collection" )" ]
     then
-      addpackage=no
-      # if package contains docs, add to docpackages
+      unset addpackage 
+      # if package contains docs, add to docs-packages
       if [ -n "$(grep ^docfiles $texmf/$collection.meta)" ]
       then
         echo "$collection" >> $output_doc
         echo "$collection added to docs $1" >> $logfile
-        addpackage=yes
+        addpackage=yes 
       fi
-      if [ -n "$(grep ^runfiles $texmf/$collection.meta)" -o -n "$(grep ^binfiles $texmf/$collection.meta)" ]
+      # if package contains runfiles, binfiles or depend, add to edition
+      if [ \
+	   -n "$(grep ^runfiles $texmf/$collection.meta)" -o \
+           -n "$(grep ^binfiles $texmf/$collection.meta)" -o \
+           -n "$(grep ^depend $texmf/$collection.meta)" \
+	 ]
       then
         echo "$collection" >> $output
         echo "$collection added to -$1" >> $logfile
+        addpackage=yes 
+      fi
+      # if package contains only srcfiles, don't add to a edition
+      if [ -n "$(grep ^srcfiles $texmf/$collection.meta)" -a -z "$addpackage" ]
+      then
+        echo "$collection only contains srcfiles, added nowhere" >> $logfile
         addpackage=yes
       fi
-      # every package should be added to one dedicated edition, abort if that didn't work
-      if [ $addpackage = no ]
+      # abort if package seems broken
+      if [ -z "$addpackage" ]
       then
-        echo "$collection doesn't contain any docfiles/runfiles/binfiles"
+        echo "$collection doesn't contain any docfiles/runfiles/binfiles/depends or srcfiles"
         echo "Please exclude package/report to upstream mailinglist tex-live@tug.org, bye."
         exit 1
       fi
     fi
 
     # Don't handle collections as dependency of other collections, as this destroys control over what packages to be added
-    # add dependend packages, but no binary(ARCH) and no packages conataining a '.'. Packges with dot indicate binary/texlive-manager/windows packages
-
+    # add dependend packages, but no binary(ARCH) and no packages containing a '.'. Packges with dot indicate binary/texlive-manager/windows packages
+    
     grep ^"depend " $texmf/$collection.meta | cut -d' ' -f2- > $dependencies
-
+    
     if [ -s "$dependencies" ]
     then
       # check for .ARCH packages which may be binaries, scripts or links
@@ -600,7 +642,7 @@ texmfget () {
       for dependency in $(cat $dependencies)
       do
         echo $dependency | grep '\.ARCH'$ &>/dev/null
-        if [ $? = 0 ]
+        if [ $? = 0 ] 
         then
           for arch in $platforms
           do
@@ -643,7 +685,7 @@ texmfget () {
       cat $dependencies >> $collections_tobedone
       echo "----------------" >> $logfile
     fi
-
+    
     sed -i "/^${collection}$/d" $collections_tobedone
     echo "$collection" >> $collections_done
   done
@@ -659,9 +701,11 @@ texmfget () {
     # Cleanup tar-directory
     [ -d $texmf/texmf-dist ] && rm -rf $texmf/texmf-dist
     mkdir $texmf/texmf-dist
-
-    # Make tarball/checksum reproducible by setting mtime(clamp-mtime), owner, group and sort content
-    # --clamp-mtime --mtime doesn't work with tar 1.13, when makepkg creates the tarball:
+    
+    # Make tarball/checksum reproducible by setting mtime(clamp-mtime),
+    # owner, group and sort content.
+    # --clamp-mtime --mtime doesn't work with tar 1.13,
+    # when makepkg creates the tarball:
     # tar-1.13: time_t value 9223372036854775808 too large (max=68719476735)
     echo "Adding files to $( echo $tarball | rev | cut -d'/' -f1 | rev ) ..."
     case $edition in
@@ -689,7 +733,7 @@ texmfget () {
       then
         untar $output_doc || exit 1
         remove_cruft || exit 1
-      #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1
+        #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1
         tar rf $tarball --owner=0 --group=0 --sort=name texmf-dist || exit 1
         rm -rf texmf-dist
       fi
@@ -700,7 +744,7 @@ texmfget () {
 
 lint () {
 
-echo "Comparing content of all editions, this may take a while ..."
+echo "Comparing content of all editions, this may take a while ..." 
 cd $TMP
 # check if all editions of same VERSION are there, take -base as reference
 lint_version=$( ls texlive-base-*tar.xz | head -n1 | cut -d'.' -f2 || exit 1)
@@ -750,7 +794,6 @@ db=$TMP/texlive.tlpdb
 tmpfile=$TMP/tmpfile
 collections_done=$TMP/done
 collections_tobedone=$TMP/tobedone
-corepackages=$TMP/corepackages
 allcollections=$TMP/allcollections
 binary_removed=$TMP/binaries.removed
 manpages=$TMP/manpages
@@ -777,23 +820,24 @@ echo "Building $edition tarball ..."
 if [ ! -s ${db}.orig -o ! -s $db -o ! -s VERSION ]
 then
   echo $MAJORVERSION.$(date +%y%m%d) > VERSION
-  wget -q --show-progress -c -O ${db}.orig ${mirror}tlpkg/texlive.tlpdb 
+  #wget -q --show-progress -c -O ${db}.orig ${mirror}tlpkg/texlive.tlpdb 
+  wget -q --show-progress -c -O ${db}.orig.xz ${mirror}tlpkg/texlive.tlpdb.xz
+  unxz ${db}.orig.xz 
+   
   # remove most content from $db to be faster on later processing. 
   # keep dependencies/manpages/binfiles/shortdesc/sizes
   grep -E \
     '^\S|^ RELOC/doc/man|^ texmf-dist/doc/man/man|^ RELOC/doc/info/|^ texmf-dist/doc/info/|^ bin|^$' \
     ${db}.orig | grep -v ^longdesc > $db
   
-  # As $db might be renewed, remove the meta-files to be created again
+  # As $db might be renewed, remove the all package meta-files
+  # to make them be created again based on (new) $db
   rm -rf $texmf/*.meta
 fi
 
 # Get linenumbers of empty lines from $db
 emptylines="$(grep -n ^$ $db | cut -d':' -f1)"
 
-# Provide TLCore packages for -base, as these packages(and their dependencies) should be present in any case. 
-grep -B1 ^'category TLCore' $db | grep -v ^'category TLCore' |  grep -v ^-- | grep -v '\.' | cut -d' ' -f2 > $corepackages
-
 # Make a list of all collections
 grep ^"name collection-" $db | cut -d' ' -f2 > $allcollections
 
@@ -809,12 +853,7 @@ do
     global_exclude=${global_exclude/$exclude/}
   fi
 done
-# globally exclude from $corepackages
-for exclude in $global_exclude
-do
-  sed -i "/^${exclude}$/d" $corepackages
-done 
-  
+ 
 VERSION=$(cat $TMP/VERSION)
 tarball=$TMP/texlive-$edition-$VERSION.tar
 # set logfile
@@ -855,7 +894,6 @@ done < $allcollections
 
 # cleanup 
 rm $allcollections
-rm $corepackages
 rm $collections_done
 rm $collections_tobedone
 rm $output
@@ -940,7 +978,8 @@ do
     # put map files from splitted packages in -extra
     mkdir meta_tmp
     tar xf $texmf/${package}.tar.xz -C meta_tmp tlpkg/tlpobj/$package.tlpobj
-    grep ^'execute ' meta_tmp/tlpkg/tlpobj/$package.tlpobj | grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition
+    grep ^'execute ' meta_tmp/tlpkg/tlpobj/$package.tlpobj | \
+      grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition
     rm -rf meta_tmp
   fi
  
@@ -962,6 +1001,7 @@ done
 
 # cleanup
 rm $files_split.tmp
+
 # fix relocation in index for splitted packages
 sed -i \
   -e "s|^doc|texmf-dist\/doc|g" \
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index a29afb9ab1..f33177ed05 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -2,7 +2,7 @@
 
 # TeXLive build script for Slackware
 
-# Copyright 2009, 2017 - 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2017 - 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2009 - 2014  Robby Workman, Northport, AL, USA
 # Copyright 2016 - 2017  Johannes Schoepfer, Germany
 # All rights reserved.
@@ -26,11 +26,11 @@
 
 # URL: ftp://tug.org/historic/systems/texlive/
 # Testrelease: ftp://tug.org/texlive/Images/test/
-# Upstream stable fixes: svn://tug.org/texlive/branches/branch2019/Build/source
+# Upstream stable fixes: svn://tug.org/texlive/branches/branch2020/Build/source
 
 PRGNAM=texlive
-SOURCEVERSION=20190410
-VERSION=${VERSION:-2019.190626}
+SOURCEVERSION=20200327
+VERSION=${VERSION:-2020.200608}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -60,6 +60,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+TEXMFROOT=/usr/share
+
 # NOTE: Using the system version of poppler will require texlive to be
 # recompiled with pretty much every poppler update, as they almost always
 # bump the shared library version. But sometimes you do what you have
@@ -86,13 +88,10 @@ export LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH"
 
 # set TEXMFROOT and TEXMFLOCAL
 sed -i \
-  -e 's|^TEXMFROOT.*|TEXMFROOT = $SELFAUTODIR/share|' \
-  -e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local|' \
+  -e "s|^TEXMFROOT.*|TEXMFROOT = $TEXMFROOT|" \
+  -e "s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \
   texk/kpathsea/texmf.cnf
 
-# Upstream stable fixes
-patch -Np1 -i $CWD/patches/texlive-20190410-source-upstream_fixes-1.patch || exit 1
-
 # prevent compiling Xdvi with libXp
 sed -i 's|-lXp ||' texk/xdvik/configure
 
@@ -144,7 +143,7 @@ cd build
     --build=$ARCH-slackware-linux || exit 1
 
   make || exit 1
-  # make check || exit 1
+  #make check || exit 1
   make install-strip DESTDIR=$PKG || exit 1
 
 cd ..
@@ -153,24 +152,32 @@ cd ..
 rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
 
 # Remove all files which are covered by tlnet
-rm -rf $PKG/usr/share $PKG/usr/man $PKG/usr/info
+rm -rf $PKG$TEXMFROOT $PKG/usr/man $PKG/usr/info
 
 # install the tlnet stuff
-mkdir -p $PKG/usr/share
-tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG/usr/share || exit 1
+mkdir -p $PKG$TEXMFROOT
+tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG$TEXMFROOT || exit 1
 chown -R root:root $PKG
 chmod -R u+w,go-w,a+rX-st $PKG
 
 # use symlinks/scripts from tlnet
-mv $PKG/usr/share/texmf-dist/linked_scripts/* $PKG/usr/bin
-rmdir $PKG/usr/share/texmf-dist/linked_scripts
+for link in $PKG$TEXMFROOT/texmf-dist/linked_scripts/* ;do \
+  if [ -e "$link" ]; then
+    ln -sf $TEXMFROOT/texmf-dist/linked_scripts/bin/${link##*/} $PKG/usr/bin/${link##*/}
+  else
+    mv $link $PKG/usr/bin/${link##*/}
+  fi
+done
+mkdir -p $PKG$TEXMFROOT/texmf-dist/bin
+mv $PKG$TEXMFROOT/texmf-dist/linked_scripts/* $PKG$TEXMFROOT/texmf-dist/bin
+mv $PKG$TEXMFROOT/texmf-dist/bin $PKG$TEXMFROOT/texmf-dist/linked_scripts
 
 # set some paths
 sed -i \
-  -e 's|^TEXMFROOT.*|TEXMFROOT = $SELFAUTODIR/share|' \
-  -e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local|' \
-  -e 's|^OSFONTDIR.*|OSFONTDIR = ~/.fonts:/usr/share/fonts|' \
-  $PKG/usr/share/texmf-dist/web2c/texmf.cnf
+  -e "s|^TEXMFROOT.*|TEXMFROOT = $TEXMFROOT|" \
+  -e "s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \
+  -e "s|^OSFONTDIR.*|OSFONTDIR = ~/.fonts:/usr/share/fonts|" \
+  $PKG$TEXMFROOT/texmf-dist/web2c/texmf.cnf
 
 # disable obsolete aleph/lamed/cslatex/pdfcslatex
 sed -i \
@@ -178,15 +185,13 @@ sed -i \
   -e 's|^lamed|#! lamed|' \
   -e 's|^cslatex|#! cslatex|' \
   -e 's|^pdfcslatex|#! pdfcslatex|' \
-  $PKG/usr/share/texmf-dist/web2c/fmtutil.cnf
+  $PKG$TEXMFROOT/texmf-dist/web2c/fmtutil.cnf
 
-# make ConTeXt work, and remove unused settings
+# make ConTeXt work
 sed -i \
-  -e 's|selfautoparent:|/usr/share/|g' \
-  -e 's|\(TEXMFLOCAL[ ]*=[ ]*\)[^,]*|\1"/usr/share/texmf-local"|' \
-  -e '/selfautodir/d' \
-  -e '/texmflocal/d' \
-  $PKG/usr/share/texmf-dist/web2c/texmfcnf.lua
+  -e "s|selfautoparent:|$TEXMFROOT/|g" \
+  -e "s|\(TEXMFLOCAL[ ]*=[ ]*\)[^,]*|\1\"$TEXMFROOT/texmf-local\"|" \
+  $PKG$TEXMFROOT/texmf-dist/web2c/texmfcnf.lua
 
 # provide texlive fonts optionally for other system apps
 mkdir -p $PKG/etc/fonts/conf.avail
@@ -194,8 +199,8 @@ cat > $PKG/etc/fonts/conf.avail/09-texlive.conf << EOF
 <?xml version='1.0'?>
 <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
 <fontconfig>
-   <dir>/usr/share/texmf-dist/fonts/opentype</dir>
-   <dir>/usr/share/texmf-dist/fonts/truetype</dir>
+   <dir>$TEXMFROOT/texmf-dist/fonts/opentype</dir>
+   <dir>$TEXMFROOT/texmf-dist/fonts/truetype</dir>
 </fontconfig>
 EOF
 
@@ -203,42 +208,41 @@ EOF
 mkdir -p $PKG/usr/doc/texlive-$VERSION
 cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION
 # Install index of provided tex packages to the docs
-mv $PKG/usr/share/texmf-dist/packages.base.gz $PKG/usr/doc/texlive-$VERSION
+mv $PKG$TEXMFROOT/texmf-dist/packages.base.gz $PKG/usr/doc/texlive-$VERSION
 
-# Put a symlink to /usr/share/texmf-dist/doc in our Slackware docdir
-ln -s ../../share/texmf-dist/doc $PKG/usr/doc/texlive-$VERSION/doc
+# Put a symlink to $TEXMFROOT/texmf-dist/doc in our Slackware docdir
+ln -sf $TEXMFROOT/texmf-dist/doc $PKG/usr/doc/texlive-$VERSION/doc
 
 # We won't make tlmgr easily available; it's still there, but
 # we'll make it harder to void the warranty :-)
-rm -f $PKG/usr/bin/tlmgr
+rm $PKG/usr/bin/tlmgr
 cat $CWD/README.tlpkg > $PKG/usr/doc/texlive-$VERSION/README.tlpkg
 
 # Create some directories to make it clear that they're owned by this package
-mkdir -p $PKG/usr/share/{texmf-config,texmf-var,texmf-local}
+mkdir -p $PKG$TEXMFROOT/{texmf-config,texmf-var,texmf-local}
 
 # Use patch for tabu.sty from https://github.com/tabu-fixed/tabu to fix
 # breakage when compiling doxygen:
-( cd $PKG/usr/share/texmf-dist/tex/latex/tabu
+( cd $PKG$TEXMFROOT/texmf-dist/tex/latex/tabu
   cat $CWD/patches/tabu.sty.diff | patch -p1 --verbose || exit 1
   ) || exit 1
 
-# Add some perl modules, at least one of which is required by updmap
+# Add texlive perl modules
 mkdir -p $PKG/usr/share/perl5
-mv texk/tests/TeXLive $PKG/usr/share/perl5/
+mv $PKG$TEXMFROOT/texmf-dist/scripts/texlive/TeXLive $PKG/usr/share/perl5/
 
 # Move manual pages to the correct place
 mkdir $PKG/usr/man
-mv $PKG/usr/share/texmf-dist/doc/man/man1 $PKG/usr/man
-mv $PKG/usr/share/texmf-dist/doc/man/man5 $PKG/usr/man
-rmdir $PKG/usr/share/texmf-dist/doc/man
-mv $PKG/usr/share/texmf-dist/doc/info $PKG/usr
+mv $PKG$TEXMFROOT/texmf-dist/doc/man/man1 $PKG/usr/man
+mv $PKG$TEXMFROOT/texmf-dist/doc/man/man5 $PKG/usr/man
+rmdir $PKG$TEXMFROOT/texmf-dist/doc/man
 
 # Handle the 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
 
 # Handle the GNU info pages
-rm -f $PKG/usr/info/dir
+mv $PKG$TEXMFROOT/texmf-dist/doc/info $PKG/usr
 gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/install
diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info
index 6d337e6f80..af079541e7 100644
--- a/office/texlive/texlive.info
+++ b/office/texlive/texlive.info
@@ -1,10 +1,10 @@
 PRGNAM="texlive"
-VERSION="2019.190626"
+VERSION="2020.200608"
 HOMEPAGE="https://tug.org/texlive/"
-DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/2019/texlive-20190410-source.tar.xz \
-	http://slackware.schoepfer.info/slackbuilds/texlive/2019/texlive-base-2019.190626.tar.xz"
-MD5SUM="be4b20aa60861bc510bcbc5b228bcb51 \
-	0a6a69d6e921989287a8a24471150b28"
+DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-20200327-source.tar.xz \
+	http://slackware.schoepfer.info/slackbuilds/texlive/texlive-base-2020.200608.tar.xz"
+MD5SUM="02963bd8eae94b278407e86c9604e761 \
+	448c337b359fdfc44321cd7928176b74"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/texmacs/texmacs.SlackBuild b/office/texmacs/texmacs.SlackBuild
index f1ba66ccfa..f8991c36b1 100644
--- a/office/texmacs/texmacs.SlackBuild
+++ b/office/texmacs/texmacs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Texmacs
 
-# Copyright 2013-2018 Zhu Qun-Ying
+# Copyright 2013-2020 Zhu Qun-Ying
 # 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=texmacs
-VERSION=${VERSION:-1.99.12}
+VERSION=${VERSION:-1.99.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/texmacs/texmacs.info b/office/texmacs/texmacs.info
index 93cf974b38..34499bcafc 100644
--- a/office/texmacs/texmacs.info
+++ b/office/texmacs/texmacs.info
@@ -1,8 +1,8 @@
 PRGNAM="texmacs"
-VERSION="1.99.12"
+VERSION="1.99.17"
 HOMEPAGE="http://www.texmacs.org"
-DOWNLOAD="https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.99.12-src.tar.gz"
-MD5SUM="9c8169ff79afefc606564e530ec12ec9"
+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/texmaker/texmaker.SlackBuild b/office/texmaker/texmaker.SlackBuild
index 20bdda9aab..f2118f6a3c 100644
--- a/office/texmaker/texmaker.SlackBuild
+++ b/office/texmaker/texmaker.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for texmaker
 
-# Copyright 2013-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2013-2020 Larry Hajali <larryhaja[at]gmail[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=texmaker
-VERSION=${VERSION:-5.0.3}
+VERSION=${VERSION:-5.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/texmaker/texmaker.info b/office/texmaker/texmaker.info
index 8e1d8bda0e..2ef1173322 100644
--- a/office/texmaker/texmaker.info
+++ b/office/texmaker/texmaker.info
@@ -1,8 +1,8 @@
 PRGNAM="texmaker"
-VERSION="5.0.3"
-HOMEPAGE="http://www.xm1math.net/texmaker/index.html"
-DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-5.0.3.tar.bz2"
-MD5SUM="75beb11c4f5cfdd2a73dc5737cfcd61f"
+VERSION="5.0.4"
+HOMEPAGE="https://www.xm1math.net/texmaker/index.html"
+DOWNLOAD="https://www.xm1math.net/texmaker/texmaker-5.0.4.tar.bz2"
+MD5SUM="9e9676a300d0e5932c0172a1f732485c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/office/texstudio/texstudio.SlackBuild b/office/texstudio/texstudio.SlackBuild
index dce23faf56..2065adb090 100644
--- a/office/texstudio/texstudio.SlackBuild
+++ b/office/texstudio/texstudio.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for texstudio
 
-# Copyright 2013-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2013-2020 Larry Hajali <larryhaja[at]gmail[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=texstudio
-VERSION=${VERSION:-2.12.16}
+VERSION=${VERSION:-2.12.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/texstudio/texstudio.info b/office/texstudio/texstudio.info
index fd1e62cdf7..6d6f70dbc4 100644
--- a/office/texstudio/texstudio.info
+++ b/office/texstudio/texstudio.info
@@ -1,8 +1,8 @@
 PRGNAM="texstudio"
-VERSION="2.12.16"
+VERSION="2.12.22"
 HOMEPAGE="http://texstudio.sourceforge.net/"
-DOWNLOAD="https://github.com/texstudio-org/texstudio/archive/2.12.16/texstudio-2.12.16.tar.gz"
-MD5SUM="d72065905beb27e515ed94736b205c2b"
+DOWNLOAD="https://github.com/texstudio-org/texstudio/archive/2.12.22/texstudio-2.12.22.tar.gz"
+MD5SUM="7b586664a7490b411a5e0e9cc4e5ce87"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/timew/timew.SlackBuild b/office/timew/timew.SlackBuild
index a575e79fd8..94d61ca642 100644
--- a/office/timew/timew.SlackBuild
+++ b/office/timew/timew.SlackBuild
@@ -22,7 +22,7 @@
 
 #Set initial variables
 PRGNAM=timew
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/timew/timew.info b/office/timew/timew.info
index 109352a518..919edf0a31 100644
--- a/office/timew/timew.info
+++ b/office/timew/timew.info
@@ -1,8 +1,8 @@
 PRGNAM="timew"
-VERSION="1.2.0"
+VERSION="1.3.0"
 HOMEPAGE="https://timewarrior.net/"
-DOWNLOAD="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v1.2.0/timew-1.2.0.tar.gz"
-MD5SUM="ae87581da9089875967a84f3757b31b7"
+DOWNLOAD="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v1.3.0/timew-1.3.0.tar.gz"
+MD5SUM="06b08fb9f256818d95d6b9572333dfd9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/turtl/turtl.SlackBuild b/office/turtl/turtl.SlackBuild
index 6b98c0eccb..451bc91110 100644
--- a/office/turtl/turtl.SlackBuild
+++ b/office/turtl/turtl.SlackBuild
@@ -23,13 +23,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=turtl
-VERSION=${VERSION:-0.7.2.5}
+VERSION=${VERSION:-0.7.2.6}
+SUFFIX=-pre-sync-fix
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 case "$( uname -m )" in
-  x86_64) OS="linux64" ;;
-  i?86) OS="linux32" ;;
+  x86_64)
+    OS="linux64"
+    ARCH="x86_64"
+    ;;
+  i?86)
+    OS="linux32"
+    ARCH="i586"
+    ;;
 esac
 
 CWD=$(pwd)
@@ -44,7 +51,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION-$OS
-tar xvf $CWD/$PRGNAM-$VERSION-$OS.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION$SUFFIX-$OS.tar.bz2
 cd $PRGNAM-$OS
 HERE=$(dirname $(readlink -e ./install.sh))
 
diff --git a/office/turtl/turtl.info b/office/turtl/turtl.info
index ee8f6ae988..18041c6bd3 100644
--- a/office/turtl/turtl.info
+++ b/office/turtl/turtl.info
@@ -1,10 +1,10 @@
 PRGNAM="turtl"
-VERSION="0.7.2.5"
+VERSION="0.7.2.6"
 HOMEPAGE="https://turtlapp.com"
-DOWNLOAD="https://github.com/turtl/desktop/releases/download/v0.7.2.5/turtl-0.7.2.5-linux32.tar.bz2"
-MD5SUM="e85d853dccadcb5a8f6a5478cd038690"
-DOWNLOAD_x86_64="https://github.com/turtl/desktop/releases/download/v0.7.2.5/turtl-0.7.2.5-linux64.tar.bz2"
-MD5SUM_x86_64="771ac3060d5e6d13fcd1bb4644772999"
+DOWNLOAD="https://github.com/turtl/desktop/releases/download/v0.7.2.6-pre-sync-fix/turtl-0.7.2.6-pre-sync-fix-linux32.tar.bz2"
+MD5SUM="83f0727e4588dc6a59b5eb8b1c9b01e1"
+DOWNLOAD_x86_64="https://github.com/turtl/desktop/releases/download/v0.7.2.6-pre-sync-fix/turtl-0.7.2.6-pre-sync-fix-linux64.tar.bz2"
+MD5SUM_x86_64="f230de6e01bcdbe4ac38dfb0359a2b8a"
 REQUIRES=""
 MAINTAINER="Jeff Parent"
 EMAIL="jeff+SBo@sh0.xyz"
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/when/README b/office/when/README
new file mode 100644
index 0000000000..0cfa8e4ce7
--- /dev/null
+++ b/office/when/README
@@ -0,0 +1,13 @@
+When is an extremely simple personal calendar program, aimed at the Unix
+geek who wants something minimalistic. It can keep track of things you
+need to do on particular dates. There are a lot of calendar and
+"personal information manager" programs out there, so what reasons are
+there to use When?
+
+- It's a very short and simple program, so you can easily tinker with it
+  yourself.
+- It doesn't depend on any libraries, so it's easy to install. You
+  should be able to install it on any system where Perl is available,
+  even if you don't have privileges for installing libraries.
+- Its file format is a simple text file, which you can edit in your
+  favorite editor.
diff --git a/office/when/slack-desc b/office/when/slack-desc
new file mode 100644
index 0000000000..66936e9cd1
--- /dev/null
+++ b/office/when/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------------------------------------------------------|
+when: when (an extremely simple personal calendar program)
+when:
+when: When is an extremely simple personal calendar program, aimed at the
+when: Unix geek who wants something minimalistic. It can keep track of
+when: things you need to do on particular dates.
+when:
+when: Homepage: http://www.lightandmatter.com/when/when.html 
+when:
+when:
+when:
+when:
diff --git a/office/when/when.SlackBuild b/office/when/when.SlackBuild
new file mode 100644
index 0000000000..5e744b4b04
--- /dev/null
+++ b/office/when/when.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# Slackware build script for when
+
+# Copyright 2020 Ján Su�an, Stará Turá, Slovakia
+# 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.
+
+#  Modified by slackbuilds.org
+
+PRGNAM=when
+VERSION=${VERSION:-1.1.40}
+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 {} \;
+
+make install DESTDIR=$PKG MANDIR=/usr/man/man1
+install -m 755 $PRGNAM $PKG/usr/bin/
+
+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/office/when/when.info b/office/when/when.info
new file mode 100644
index 0000000000..4c116378af
--- /dev/null
+++ b/office/when/when.info
@@ -0,0 +1,10 @@
+PRGNAM="when"
+VERSION="1.1.40"
+HOMEPAGE="http://www.lightandmatter.com/when/when.html"
+DOWNLOAD="https://github.com/bcrowell/when/archive/1.1.40/when-1.1.40.tar.gz"
+MD5SUM="970b4ec6b81dc35d7bb59211b1d0c8a1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ján Su�an"
+EMAIL="jan@jansucan.com"
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 3f462bc54e..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/xlsx2csv/README b/office/xlsx2csv/README
new file mode 100644
index 0000000000..b74d5b813f
--- /dev/null
+++ b/office/xlsx2csv/README
@@ -0,0 +1,4 @@
+Converts xlsx files to csv format. Handles large XLSX files. Fast and
+easy to use.
+
+Python3 is an optional autodetected dependency
diff --git a/office/xlsx2csv/slack-desc b/office/xlsx2csv/slack-desc
new file mode 100644
index 0000000000..67694ec6f9
--- /dev/null
+++ b/office/xlsx2csv/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------------------------------------------------------|
+xlsx2csv: xlsx2csv (xlsx to csv converter)
+xlsx2csv:
+xlsx2csv: Converts xlsx files to csv format. Handles large XLSX files. Fast and
+xlsx2csv: easy to use.
+xlsx2csv:
+xlsx2csv:
+xlsx2csv:
+xlsx2csv:
+xlsx2csv:
+xlsx2csv: Homepage: https://github.com/dilshod/xlsx2csv
+xlsx2csv:
diff --git a/office/xlsx2csv/xlsx2csv.SlackBuild b/office/xlsx2csv/xlsx2csv.SlackBuild
new file mode 100644
index 0000000000..491b6b30c4
--- /dev/null
+++ b/office/xlsx2csv/xlsx2csv.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for xlsx2csv
+
+# Copyright 2020 Leonardo Citrolo, Italy
+# 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=xlsx2csv
+VERSION=${VERSION:-0.7.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 {} \;
+
+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
+
+make -C man
+mkdir -p $PKG/usr/man/man1
+cp -a man/$PRGNAM.1 $PKG/usr/man/man1
+
+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 COPYING LICENSE.txt 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/xlsx2csv/xlsx2csv.info b/office/xlsx2csv/xlsx2csv.info
new file mode 100644
index 0000000000..93bf25627d
--- /dev/null
+++ b/office/xlsx2csv/xlsx2csv.info
@@ -0,0 +1,10 @@
+PRGNAM="xlsx2csv"
+VERSION="0.7.4"
+HOMEPAGE="https://github.com/dilshod/xlsx2csv"
+DOWNLOAD="https://github.com/dilshod/xlsx2csv/archive/0.7.4/xlsx2csv-0.7.4.tar.gz"
+MD5SUM="c1fb8b22936bfb696158fba9bc0fae2e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Leo C."
+EMAIL="leoc@gmx.com"
diff --git a/office/xournal/xournal.SlackBuild b/office/xournal/xournal.SlackBuild
index 76d7d17b88..195f68fdee 100644
--- a/office/xournal/xournal.SlackBuild
+++ b/office/xournal/xournal.SlackBuild
@@ -5,8 +5,7 @@
 # Updated by Rob van Nues <sborg63@disroot.org>
 
 PRGNAM=xournal
-VERSION=${VERSION:-0.4.8}
-REL=${REL:-2016}
+VERSION=${VERSION:-0.4.8.2016}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,8 +42,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.$REL.tar.gz
-cd $PRGNAM-$VERSION.$REL
+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 \) \
diff --git a/office/xournal/xournal.info b/office/xournal/xournal.info
index e9002dcc7a..270db3bcc2 100644
--- a/office/xournal/xournal.info
+++ b/office/xournal/xournal.info
@@ -1,6 +1,6 @@
 PRGNAM="xournal"
-VERSION="0.4.8"
-HOMEPAGE="https://xournal.sourceforge.net/"
+VERSION="0.4.8.2016"
+HOMEPAGE="https://sourceforge.net/p/xournal/wiki/Home/"
 DOWNLOAD="https://downloads.sourceforge.net/xournal/xournal-0.4.8.2016.tar.gz"
 MD5SUM="a594f475d9b93fbca0aac43d47c2de22"
 DOWNLOAD_x86_64=""
diff --git a/office/xournalpp/README b/office/xournalpp/README
index 9458946a1e..4ce93bed43 100644
--- a/office/xournalpp/README
+++ b/office/xournalpp/README
@@ -1,6 +1,7 @@
-Xournal++ is a handwriting notetaking software with PDF annotation support. 
-Written in C++ with GTK3, supporting Linux (e.g. Ubuntu, Debian, Arch, Suse), 
-macOS and Windows 10. 
+Xournal++ is a handwriting notetaking software with PDF annotation
+support.  Written in C++ with GTK3, supporting Linux (e.g. Ubuntu,
+Debian, Arch, Suse), macOS and Windows 10.
+
 Supports pen input from devices such as Wacom Tablets. 
 
-texlive is an optional dependency.
\ No newline at end of file
+texlive is an optional dependency.
diff --git a/office/xournalpp/xournalpp.SlackBuild b/office/xournalpp/xournalpp.SlackBuild
index a0de111769..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.17}
+VERSION=${VERSION:-1.0.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/xournalpp/xournalpp.info b/office/xournalpp/xournalpp.info
index f297bceb5c..912713d561 100644
--- a/office/xournalpp/xournalpp.info
+++ b/office/xournalpp/xournalpp.info
@@ -1,8 +1,8 @@
 PRGNAM="xournalpp"
-VERSION="1.0.17"
+VERSION="1.0.20"
 HOMEPAGE="https://github.com/xournalpp/xournalpp"
-DOWNLOAD="https://github.com/xournalpp/xournalpp/archive/1.0.17/xournalpp-1.0.17.tar.gz"
-MD5SUM="964a3627991eb3a75080d7e708eba582"
+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 725bb74cc1..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.72.1}
+VERSION=${VERSION:-0.73.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/zim/zim.info b/office/zim/zim.info
index 2e03145398..1fc455a0c7 100644
--- a/office/zim/zim.info
+++ b/office/zim/zim.info
@@ -1,10 +1,10 @@
 PRGNAM="zim"
-VERSION="0.72.1"
+VERSION="0.73.5"
 HOMEPAGE="http://zim-wiki.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://zim-wiki.org/downloads/zim-0.72.1.tar.gz"
-MD5SUM_x86_64="39390f14447b06970411348d7e65b674"
+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 c3aa417578..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.02.1}
+VERSION=${VERSION:-2021.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/MoarVM/MoarVM.info b/perl/MoarVM/MoarVM.info
index 958142022a..d0f99d6a71 100644
--- a/perl/MoarVM/MoarVM.info
+++ b/perl/MoarVM/MoarVM.info
@@ -1,10 +1,10 @@
 PRGNAM="MoarVM"
-VERSION="2020.02.1"
+VERSION="2021.03"
 HOMEPAGE="https://moarvm.org/"
-DOWNLOAD="https://moarvm.org/releases/MoarVM-2020.02.1.tar.gz"
-MD5SUM="8ecbd6c374f7ff3534312e3fbb5aa1de"
+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 14423d4fc5..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.02.1}
+VERSION=${VERSION:-2021.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/nqp/nqp.info b/perl/nqp/nqp.info
index 541e7ac1d5..b4b8435c7f 100644
--- a/perl/nqp/nqp.info
+++ b/perl/nqp/nqp.info
@@ -1,10 +1,10 @@
 PRGNAM="nqp"
-VERSION="2020.02.1"
+VERSION="2021.03"
 HOMEPAGE="https://rakudo.org"
-DOWNLOAD="https://github.com/perl6/nqp/releases/download/2020.02.1/nqp-2020.02.1.tar.gz"
-MD5SUM="856c040867d125bb9ccd258dd059caba"
+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-B-COW/README b/perl/perl-B-COW/README
new file mode 100644
index 0000000000..1e37d61ab5
--- /dev/null
+++ b/perl/perl-B-COW/README
@@ -0,0 +1 @@
+This module provides additional B helpers to check COW status.
diff --git a/perl/perl-B-COW/perl-B-COW.SlackBuild b/perl/perl-B-COW/perl-B-COW.SlackBuild
new file mode 100644
index 0000000000..88ec685712
--- /dev/null
+++ b/perl/perl-B-COW/perl-B-COW.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for perl-Clone
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-B-COW
+VERSION=${VERSION:-0.004}
+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 \
+  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* \
+  $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-B-COW/perl-B-COW.info b/perl/perl-B-COW/perl-B-COW.info
new file mode 100644
index 0000000000..61a3cd794c
--- /dev/null
+++ b/perl/perl-B-COW/perl-B-COW.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-B-COW"
+VERSION="0.004"
+HOMEPAGE="https://metacpan.org/pod/B::COW"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz"
+MD5SUM="a1ef8623a06ce9f6358674d7e604de1e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-B-COW/slack-desc b/perl/perl-B-COW/slack-desc
new file mode 100644
index 0000000000..ad6670e0b4
--- /dev/null
+++ b/perl/perl-B-COW/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-B-COW: perl-B-COW (additional B helpers to check COW status)
+perl-B-COW:
+perl-B-COW: This module provides additional B helpers to check COW status
+perl-B-COW:
+perl-B-COW: Homepage: https://metacpan.org/pod/B::COW
+perl-B-COW:
+perl-B-COW:
+perl-B-COW:
+perl-B-COW:
+perl-B-COW:
+perl-B-COW:
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/README b/perl/perl-CPANPLUS-Dist-Slackware/README
index 81280dbde7..0081c812d5 100644
--- a/perl/perl-CPANPLUS-Dist-Slackware/README
+++ b/perl/perl-CPANPLUS-Dist-Slackware/README
@@ -3,11 +3,11 @@ compatible packages from Perl distributions.  You can either install the
 created packages using the API provided by CPANPLUS or manually with
 "installpkg".
 
-    $ cpanp
-    CPAN Terminal> i Some::Module --format=CPANPLUS::Dist::Slackware
+  $ cpanp
+  CPAN Terminal> i Some::Module --format=CPANPLUS::Dist::Slackware
 
-    $ cpan2dist --format CPANPLUS::Dist::Slackware Some::Module
-    $ sudo /sbin/installpkg /tmp/perl-Some-Module-1.0-i486-1_CPANPLUS.tgz
+  $ cpan2dist --format CPANPLUS::Dist::Slackware Some::Module
+  $ sudo /sbin/installpkg /tmp/perl-Some-Module-1.0-i486-1_CPANPLUS.tgz
 
 Please type "perldoc CPANPLUS::Dist::Slackware" after installation to
 see the module usage information.
diff --git a/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.SlackBuild b/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.SlackBuild
index 9f1b5fe4f7..c7c0c273ed 100644
--- a/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.SlackBuild
+++ b/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-CPANPLUS-Dist-Slackware
 
-# Copyright 2012-2018 Andreas Voegele <andreas@andreasvoegele.com>
+# Copyright 2012-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-CPANPLUS-Dist-Slackware
-VERSION=${VERSION:-1.027}
+VERSION=${VERSION:-1.029}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
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 702d9e7017..7ea4320a3f 100644
--- a/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info
+++ b/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-CPANPLUS-Dist-Slackware"
-VERSION="1.027"
+VERSION="1.029"
 HOMEPAGE="https://metacpan.org/pod/CPANPLUS::Dist::Slackware"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/V/VO/VOEGELAS/CPANPLUS-Dist-Slackware-1.027.tar.gz"
-MD5SUM="9b97f0202575db88f64e1162370ae380"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/V/VO/VOEGELAS/CPANPLUS-Dist-Slackware-1.029.tar.gz"
+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 ad80379581..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.9906}
+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 b945eddaee..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.9906"
+VERSION="0.9910"
 HOMEPAGE="https://metacpan.org/pod/CPANPLUS"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BI/BINGOS/CPANPLUS-0.9906.tar.gz"
-MD5SUM="058fdaa56b32f0cc1dd3dd134eb226d6"
+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-Class-Tiny/perl-Class-Tiny.SlackBuild b/perl/perl-Class-Tiny/perl-Class-Tiny.SlackBuild
index 1d714c568a..456db171bb 100644
--- a/perl/perl-Class-Tiny/perl-Class-Tiny.SlackBuild
+++ b/perl/perl-Class-Tiny/perl-Class-Tiny.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Class-Tiny
 
-# 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-Class-Tiny
-VERSION=${VERSION:-1.006}
+VERSION=${VERSION:-1.008}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Class-Tiny/perl-Class-Tiny.info b/perl/perl-Class-Tiny/perl-Class-Tiny.info
index 5af67cff77..146b5634fd 100644
--- a/perl/perl-Class-Tiny/perl-Class-Tiny.info
+++ b/perl/perl-Class-Tiny/perl-Class-Tiny.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Class-Tiny"
-VERSION="1.006"
-HOMEPAGE="https://metacpan.org/pod/release/DAGOLDEN/Class-Tiny-1.006/lib/Class/Tiny.pm"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz"
-MD5SUM="fa905646a85a1478b2db1fc9113cb6ac"
+VERSION="1.008"
+HOMEPAGE="https://metacpan.org/pod/release/DAGOLDEN/Class-Tiny-1.008/lib/Class/Tiny.pm"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.008.tar.gz"
+MD5SUM="e3ccfae5f64d443e7e1110be964d7202"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Clone/perl-Clone.SlackBuild b/perl/perl-Clone/perl-Clone.SlackBuild
index 980d8eafe7..d10301ecaa 100644
--- a/perl/perl-Clone/perl-Clone.SlackBuild
+++ b/perl/perl-Clone/perl-Clone.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Clone
 
-# Copyright 2018-2019 Jan F. Chadima <jfch@jagda.eu>
+# Copyright 2018-2020 Jan F. Chadima <jfch@jagda.eu>
 # 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=perl-Clone
-VERSION=${VERSION:-0.42}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.45}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
diff --git a/perl/perl-Clone/perl-Clone.info b/perl/perl-Clone/perl-Clone.info
index 862fbb2a0e..a006730108 100644
--- a/perl/perl-Clone/perl-Clone.info
+++ b/perl/perl-Clone/perl-Clone.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Clone"
-VERSION="0.42"
+VERSION="0.45"
 HOMEPAGE="https://metacpan.org/pod/Clone"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/G/GA/GARU/Clone-0.42.tar.gz"
-MD5SUM="1a305f399e1293f8f43b9ef07f6554ff"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz"
+MD5SUM="b101333499b638658f89e29458cd83c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="perl-B-COW"
 MAINTAINER="Jan F. Chadima"
 EMAIL="jfch@jagda.eu"
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-Cpanel-JSON-XS/perl-Cpanel-JSON-XS.SlackBuild b/perl/perl-Cpanel-JSON-XS/perl-Cpanel-JSON-XS.SlackBuild
index 9b2e492a2d..f0c55dd6b1 100644
--- a/perl/perl-Cpanel-JSON-XS/perl-Cpanel-JSON-XS.SlackBuild
+++ b/perl/perl-Cpanel-JSON-XS/perl-Cpanel-JSON-XS.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Cpanel-JSON-XS
 
-# Copyright 2018-2019 Donald Cooley South Haven, Indiana USA
+# Copyright 2018-2020 Donald Cooley South Haven, Indiana 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=perl-Cpanel-JSON-XS
-VERSION=${VERSION:-4.18}
+VERSION=${VERSION:-4.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Cpanel-JSON-XS/perl-Cpanel-JSON-XS.info b/perl/perl-Cpanel-JSON-XS/perl-Cpanel-JSON-XS.info
index d3e6e22ee3..5c04f65b64 100644
--- a/perl/perl-Cpanel-JSON-XS/perl-Cpanel-JSON-XS.info
+++ b/perl/perl-Cpanel-JSON-XS/perl-Cpanel-JSON-XS.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Cpanel-JSON-XS"
-VERSION="4.18"
+VERSION="4.19"
 HOMEPAGE="https://metacpan.org/release/Cpanel-JSON-XS"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.18.tar.gz"
-MD5SUM="a9c791dbdce96d41f235b4800987ef3f"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.19.tar.gz"
+MD5SUM="ffaae20b84cb22033907f99b99199575"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Crypt-Eksblowfish/perl-Crypt-Eksblowfish.info b/perl/perl-Crypt-Eksblowfish/perl-Crypt-Eksblowfish.info
index 495de8caaa..6e9536707b 100644
--- a/perl/perl-Crypt-Eksblowfish/perl-Crypt-Eksblowfish.info
+++ b/perl/perl-Crypt-Eksblowfish/perl-Crypt-Eksblowfish.info
@@ -1,5 +1,5 @@
 PRGNAM="perl-Crypt-Eksblowfish"
-VERSION="0.0009"
+VERSION="0.009"
 HOMEPAGE="https://metacpan.org/pod/Crypt::Eksblowfish::Bcrypt"
 DOWNLOAD="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz"
 MD5SUM="d2907b00cc500fc523bf86bb427d9bb8"
diff --git a/perl/perl-DBD-SQLite/perl-DBD-SQLite.SlackBuild b/perl/perl-DBD-SQLite/perl-DBD-SQLite.SlackBuild
index e7e9be808b..19ff8dcdb6 100644
--- a/perl/perl-DBD-SQLite/perl-DBD-SQLite.SlackBuild
+++ b/perl/perl-DBD-SQLite/perl-DBD-SQLite.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Thomas Morper <thomas@beingboiled.info>
 
 PRGNAM=perl-DBD-SQLite
-VERSION=${VERSION:-1.64}
+VERSION=${VERSION:-1.66}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-DBD-SQLite/perl-DBD-SQLite.info b/perl/perl-DBD-SQLite/perl-DBD-SQLite.info
index ddb686eaa0..8d6d38e064 100644
--- a/perl/perl-DBD-SQLite/perl-DBD-SQLite.info
+++ b/perl/perl-DBD-SQLite/perl-DBD-SQLite.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-DBD-SQLite"
-VERSION="1.64"
+VERSION="1.66"
 HOMEPAGE="https://metacpan.org/release/DBD-SQLite"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.64.tar.gz"
-MD5SUM="10796495b52927eb2e1df34c86924027"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.66.tar.gz"
+MD5SUM="38581209de5c981f0e79840c8937fa16"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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-Data-Dumper-Concise/perl-Data-Dumper-Concise.info b/perl/perl-Data-Dumper-Concise/perl-Data-Dumper-Concise.info
index 0a23bd2a01..cc15ccdbd2 100644
--- a/perl/perl-Data-Dumper-Concise/perl-Data-Dumper-Concise.info
+++ b/perl/perl-Data-Dumper-Concise/perl-Data-Dumper-Concise.info
@@ -1,6 +1,6 @@
 PRGNAM="perl-Data-Dumper-Concise"
 VERSION="2.023"
-HOMEPAGE="https://metacpan.org/pod/Data-Dumper-Concise"
+HOMEPAGE="https://metacpan.org/pod/Data::Dumper::Concise"
 DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz"
 MD5SUM="12aee80af6ffb8ad9db6f008620300ba"
 DOWNLOAD_x86_64=""
diff --git a/perl/perl-Data-IEEE754/README b/perl/perl-Data-IEEE754/README
new file mode 100644
index 0000000000..aaac7a8ea1
--- /dev/null
+++ b/perl/perl-Data-IEEE754/README
@@ -0,0 +1 @@
+Data::IEEE754 - Pack and unpack big-endian IEEE754 floats and doubles
diff --git a/perl/perl-Data-IEEE754/perl-Data-IEEE754.SlackBuild b/perl/perl-Data-IEEE754/perl-Data-IEEE754.SlackBuild
new file mode 100644
index 0000000000..539942978b
--- /dev/null
+++ b/perl/perl-Data-IEEE754/perl-Data-IEEE754.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-Data-IEEE754
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-Data-IEEE754
+VERSION=${VERSION:-0.02}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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 \
+  CONTRIBUTING* Changes INSTALL 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/perl/perl-Data-IEEE754/perl-Data-IEEE754.info b/perl/perl-Data-IEEE754/perl-Data-IEEE754.info
new file mode 100644
index 0000000000..638ff62c20
--- /dev/null
+++ b/perl/perl-Data-IEEE754/perl-Data-IEEE754.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Data-IEEE754"
+VERSION="0.02"
+HOMEPAGE="https://metacpan.org/pod/Data::IEEE754"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MA/MAXMIND/Data-IEEE754-0.02.tar.gz"
+MD5SUM="0fa222cef88477f7d644205e0ec67027"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Test-Bits"
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-Data-IEEE754/slack-desc b/perl/perl-Data-IEEE754/slack-desc
new file mode 100644
index 0000000000..e570e79b66
--- /dev/null
+++ b/perl/perl-Data-IEEE754/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-Data-IEEE754: perl-Data-IEEE754 (Support for IEEE754 floats)
+perl-Data-IEEE754:
+perl-Data-IEEE754: This module provides Perl availability to work with IEEE754 floats
+perl-Data-IEEE754: and doubles.
+perl-Data-IEEE754:
+perl-Data-IEEE754: Homepage: https://metacpan.org/pod/Data::IEEE754
+perl-Data-IEEE754:
+perl-Data-IEEE754:
+perl-Data-IEEE754:
+perl-Data-IEEE754:
+perl-Data-IEEE754:
diff --git a/perl/perl-Data-Validate-IP/perl-Data-Validate-IP.info b/perl/perl-Data-Validate-IP/perl-Data-Validate-IP.info
index 0bb8d3b231..d41984355d 100644
--- a/perl/perl-Data-Validate-IP/perl-Data-Validate-IP.info
+++ b/perl/perl-Data-Validate-IP/perl-Data-Validate-IP.info
@@ -1,6 +1,6 @@
 PRGNAM="perl-Data-Validate-IP"
 VERSION="0.27"
-HOMEPAGE="https://metacpan.org/pod/Data::Validate-IP"
+HOMEPAGE="https://metacpan.org/pod/Data::Validate::IP"
 DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz"
 MD5SUM="cb0bbf1b555cceb9dc9d4a1cae940868"
 DOWNLOAD_x86_64=""
diff --git a/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild b/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild
index 21a58e997e..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.81}
+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 2ebf5523c5..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.81"
+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.81.tar.gz"
-MD5SUM="a9ff96f05675ac4cb7f19c4b03a7363b"
+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-Devel-Declare/perl-Devel-Declare.SlackBuild b/perl/perl-Devel-Declare/perl-Devel-Declare.SlackBuild
index c1bb691891..103c904cac 100644
--- a/perl/perl-Devel-Declare/perl-Devel-Declare.SlackBuild
+++ b/perl/perl-Devel-Declare/perl-Devel-Declare.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Devel-Declare
 
-# Copyright 2018 Jan F. Chadima <jfch@jagda.eu>
+# Copyright 2018-2020 Jan F. Chadima <jfch@jagda.eu>
 # 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-Devel-Declare
-VERSION=${VERSION:-0.006019}
+VERSION=${VERSION:-0.006022}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Devel-Declare/perl-Devel-Declare.info b/perl/perl-Devel-Declare/perl-Devel-Declare.info
index 4ddcacb2a1..447326f56c 100644
--- a/perl/perl-Devel-Declare/perl-Devel-Declare.info
+++ b/perl/perl-Devel-Declare/perl-Devel-Declare.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Devel-Declare"
-VERSION="0.006019"
+VERSION="0.006022"
 HOMEPAGE="https://metacpan.org/pod/Devel::Declare"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz"
-MD5SUM="1897b6af1646fc3aabe2d3fdfd7c53f0"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Devel-Declare-0.006022.tar.gz"
+MD5SUM="664646c5872e233f640ca6bb8e84714d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-extutils-depends perl-B-Hooks-OP-Check perl-B-Hooks-EndOfScope perl-Sub-Name"
+REQUIRES="perl-extutils-depends perl-B-Hooks-OP-Check perl-B-Hooks-EndOfScope perl-Sub-Name perl-Test-Requires"
 MAINTAINER="Jan F. Chadima"
 EMAIL="jfch@jagda.eu"
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-Filesys-Df/README b/perl/perl-Filesys-Df/README
index 2d5b677dbc..159fea6c48 100644
--- a/perl/perl-Filesys-Df/README
+++ b/perl/perl-Filesys-Df/README
@@ -1,4 +1,5 @@
-Filesys::DF module provides a way to obtain filesystem disk space information.
+Filesys::DF module provides a way to obtain filesystem disk space
+information.
 
 df() requires a argument that represents the filesystem you want to
 query. The argument can be either a scalar directory/file name or a
@@ -7,5 +8,5 @@ can tailor the size of the values returned. The default block size is
 1024. This will cause the function to return the values in 1k blocks.
 If you want bytes, set the block size to 1.
 
-df() returns a reference to a hash. The keys available in the hash are as follows:
-{blocks} {bfree} {bavail} {used} {per}.
\ No newline at end of file
+df() returns a reference to a hash. The keys available in the hash are
+as follows: {blocks} {bfree} {bavail} {used} {per}.
diff --git a/perl/perl-GD/README b/perl/perl-GD/README
index cf64941daa..48c5d570a2 100644
--- a/perl/perl-GD/README
+++ b/perl/perl-GD/README
@@ -1,12 +1,12 @@
 perl-GD (perl bindings for GD image library)
 
 GD.pm is a Perl interface to Thomas Boutell's gd graphics library.
-GD allows you to create color drawings using a large number of graphics
-primitives, and emit the drawings as PNG files.
+GD allows you to create color drawings using a large number of
+graphics primitives, and emit the drawings as PNG files.
 
 The package includes the bdf2gdfont.pl utility, which converts X11 BDF
 fonts to the format used by GD.
 
-perl-GD can optionally be built with support for FastCGI. To do this,
-first install libraries/fcgi, then run perl-GD.SlackBuild with FASTCGI=yes
-set in the environment.
+perl-GD can optionally be built with support for FastCGI. To do
+this, first install libraries/fcgi, then run perl-GD.SlackBuild with
+FASTCGI=yes set in the environment.
diff --git a/perl/perl-GD/perl-GD.SlackBuild b/perl/perl-GD/perl-GD.SlackBuild
index fc9e4ab83c..73fbdd2222 100644
--- a/perl/perl-GD/perl-GD.SlackBuild
+++ b/perl/perl-GD/perl-GD.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200929 bkw: update for v2.73
 # 20191201 bkw: update for v2.71
 # 20180829 bkw: update for v2.69
 # 20180611 bkw: update for v2.68
@@ -14,7 +15,7 @@
 # - add FASTCGI option
 
 PRGNAM=perl-GD
-VERSION=${VERSION:-2.71}
+VERSION=${VERSION:-2.73}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-GD/perl-GD.info b/perl/perl-GD/perl-GD.info
index 6aaa0ba757..f4be1f232b 100644
--- a/perl/perl-GD/perl-GD.info
+++ b/perl/perl-GD/perl-GD.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-GD"
-VERSION="2.71"
+VERSION="2.73"
 HOMEPAGE="https://metacpan.org/pod/GD"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/GD-2.71.tar.gz"
-MD5SUM="1e2534e1d0db57d6aad438f15ca63253"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/GD-2.73.tar.gz"
+MD5SUM="c2bf1ca56d15e33d2432e4d8ba5aeadf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Glib-Object-Introspection/perl-Glib-Object-Introspection.SlackBuild b/perl/perl-Glib-Object-Introspection/perl-Glib-Object-Introspection.SlackBuild
index 6e53967ccf..298b3737eb 100644
--- a/perl/perl-Glib-Object-Introspection/perl-Glib-Object-Introspection.SlackBuild
+++ b/perl/perl-Glib-Object-Introspection/perl-Glib-Object-Introspection.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for perl-Glib-Object-Introspection.
 #
-# Copyright 2017-2019  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
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Glib-Object-Introspection
-VERSION=${VERSION:-0.048}
+VERSION=${VERSION:-0.049}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Glib-Object-Introspection/perl-Glib-Object-Introspection.info b/perl/perl-Glib-Object-Introspection/perl-Glib-Object-Introspection.info
index c3f833a844..cfd21558d3 100644
--- a/perl/perl-Glib-Object-Introspection/perl-Glib-Object-Introspection.info
+++ b/perl/perl-Glib-Object-Introspection/perl-Glib-Object-Introspection.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Glib-Object-Introspection"
-VERSION="0.048"
+VERSION="0.049"
 HOMEPAGE="https://metacpan.org/release/Glib-Object-Introspection"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.048.tar.gz"
-MD5SUM="0fd56ff2d2add1b61793cafd4470147d"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz"
+MD5SUM="0d8ab0bf9c4d0a72eb35c16a2ff10d42"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-glib"
diff --git a/perl/perl-GooCanvas2/README b/perl/perl-GooCanvas2/README
index e873e3e55d..67c1d87038 100644
--- a/perl/perl-GooCanvas2/README
+++ b/perl/perl-GooCanvas2/README
@@ -1,6 +1,9 @@
-GooCanvas2 - Perl binding for GooCanvas2 widget using Glib::Object::Introspection
+GooCanvas2 - Perl binding for GooCanvas2 widget using
+Glib::Object::Introspection
 
-GooCanvas2 is a new canvas widget for use with Gtk3 that uses the Cairo 2d library for drawing.
-This is a simple and basic implementation of this wonderful Canvas widget.
+GooCanvas2 is a new canvas widget for use with Gtk3 that uses
+the Cairo 2d library for drawing.  This is a simple and basic
+implementation of this wonderful Canvas widget.
 
-For more informations see https://wiki.gnome.org/action/show/Projects/GooCanvas
+For more information, see:
+https://wiki.gnome.org/action/show/Projects/GooCanvas
diff --git a/perl/perl-GooCanvas2/slack-desc b/perl/perl-GooCanvas2/slack-desc
index 508c965006..a29d49c4c5 100644
--- a/perl/perl-GooCanvas2/slack-desc
+++ b/perl/perl-GooCanvas2/slack-desc
@@ -14,6 +14,6 @@ perl-GooCanvas2: Cairo 2d library for drawing. This is a simple and basic
 perl-GooCanvas2: implementation of this wonderful Canvas widget.
 perl-GooCanvas2:
 perl-GooCanvas2: For more informations see :
-perl-GooCanvas2:	https://wiki.gnome.org/action/show/Projects/GooCanvas
+perl-GooCanvas2: https://wiki.gnome.org/action/show/Projects/GooCanvas
 perl-GooCanvas2:
 perl-GooCanvas2:
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-HTML-HTMLDoc/README b/perl/perl-HTML-HTMLDoc/README
new file mode 100644
index 0000000000..2a7cdc88fe
--- /dev/null
+++ b/perl/perl-HTML-HTMLDoc/README
@@ -0,0 +1,2 @@
+HTML::HTMLDoc - Perl interface to the htmldoc program for producing PDF Files
+from HTML content.
diff --git a/perl/perl-HTML-HTMLDoc/perl-HTML-HTMLDoc.SlackBuild b/perl/perl-HTML-HTMLDoc/perl-HTML-HTMLDoc.SlackBuild
new file mode 100644
index 0000000000..d014f1f60a
--- /dev/null
+++ b/perl/perl-HTML-HTMLDoc/perl-HTML-HTMLDoc.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-HTML-HTMLDoc
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-HTML-HTMLDoc
+VERSION=${VERSION:-0.16}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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* 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/perl/perl-HTML-HTMLDoc/perl-HTML-HTMLDoc.info b/perl/perl-HTML-HTMLDoc/perl-HTML-HTMLDoc.info
new file mode 100644
index 0000000000..53f0127ccd
--- /dev/null
+++ b/perl/perl-HTML-HTMLDoc/perl-HTML-HTMLDoc.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-HTML-HTMLDoc"
+VERSION="0.16"
+HOMEPAGE="https://metacpan.org/pod/HTML::HTMLDoc"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/E/EC/ECHERNOF/HTML-HTMLDoc-0.16.tar.gz"
+MD5SUM="80281f47dd0f37df0c97321323cda120"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Module-Build-Tiny htmldoc"
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-HTML-HTMLDoc/slack-desc b/perl/perl-HTML-HTMLDoc/slack-desc
new file mode 100644
index 0000000000..e4a8fb60be
--- /dev/null
+++ b/perl/perl-HTML-HTMLDoc/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-HTML-HTMLDoc: perl-HTML-HTMLDoc (HTML to PDF convertor)
+perl-HTML-HTMLDoc:
+perl-HTML-HTMLDoc: This module provides Perl interface to the htmldoc program for
+perl-HTML-HTMLDoc: producing PDF Files from HTML content.
+perl-HTML-HTMLDoc:
+perl-HTML-HTMLDoc: Homepage: https://metacpan.org/pod/HTML::HTMLDoc
+perl-HTML-HTMLDoc:
+perl-HTML-HTMLDoc:
+perl-HTML-HTMLDoc:
+perl-HTML-HTMLDoc:
+perl-HTML-HTMLDoc:
diff --git a/perl/perl-HTML-Tidy/perl-HTML-Tidy.info b/perl/perl-HTML-Tidy/perl-HTML-Tidy.info
index fbe9ae5514..356301bae7 100644
--- a/perl/perl-HTML-Tidy/perl-HTML-Tidy.info
+++ b/perl/perl-HTML-Tidy/perl-HTML-Tidy.info
@@ -1,6 +1,6 @@
 PRGNAM="perl-HTML-Tidy"
 VERSION="1.60"
-HOMEPAGE="https://metacpan.org/pod/HTML-Tidy"
+HOMEPAGE="https://metacpan.org/pod/HTML::Tidy"
 DOWNLOAD="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/HTML-Tidy-1.60.tar.gz"
 MD5SUM="03bafb9a0a2a23629cf9649abb2b72ab"
 DOWNLOAD_x86_64=""
diff --git a/perl/perl-HTML-Tidy/slack-desc b/perl/perl-HTML-Tidy/slack-desc
index 838c1863c3..5ca9fe8709 100644
--- a/perl/perl-HTML-Tidy/slack-desc
+++ b/perl/perl-HTML-Tidy/slack-desc
@@ -9,7 +9,7 @@
 perl-HTML-Tidy: perl-HTML-Tidy (HTML validation)
 perl-HTML-Tidy:
 perl-HTML-Tidy: This module provides HTML and XHTML validation.
-perl-HTML-Tidy: 
+perl-HTML-Tidy:
 perl-HTML-Tidy: Homepage: https://metacpan.org/pod/HTML-Tidy
 perl-HTML-Tidy:
 perl-HTML-Tidy:
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 d9e848b77b..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.067}
+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 74ecb495cc..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.067"
+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.067.tar.gz"
-MD5SUM="1d55e9f66ca442f4e0ae4d018e3067fc"
+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-IO-Tty/perl-IO-Tty.SlackBuild b/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild
index 2ce6b7978f..4d9e96abc8 100644
--- a/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild
+++ b/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild
@@ -2,10 +2,10 @@
 
 # Slackware build script for perl-IO-Tty
 
-# Written by ruario <sbo@ruari.com>
+# Written by ruario
 
 PRGNAM=perl-IO-Tty
-VERSION=${VERSION:-1.12}
+VERSION=${VERSION:-1.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,7 +73,7 @@ find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ChangeLog README \
+  ChangeLog README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/perl/perl-IO-Tty/perl-IO-Tty.info b/perl/perl-IO-Tty/perl-IO-Tty.info
index 5f5a823399..53bc5218a3 100644
--- a/perl/perl-IO-Tty/perl-IO-Tty.info
+++ b/perl/perl-IO-Tty/perl-IO-Tty.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-IO-Tty"
-VERSION="1.12"
+VERSION="1.14"
 HOMEPAGE="https://metacpan.org/pod/IO::Tty"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/T/TO/TODDR/IO-Tty-1.12.tar.gz"
-MD5SUM="11695a1a516b3bd1b90ce75ff0ce3e6d"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/T/TO/TODDR/IO-Tty-1.14.tar.gz"
+MD5SUM="70bcec4b1b19838ed209fb96a13f3e89"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-IPC-Run/perl-IPC-Run.info b/perl/perl-IPC-Run/perl-IPC-Run.info
index a0fc6cccaf..43ad2358cf 100644
--- a/perl/perl-IPC-Run/perl-IPC-Run.info
+++ b/perl/perl-IPC-Run/perl-IPC-Run.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Nishant Limbachia"
-EMAIL="nishant@mnspace.net"
\ No newline at end of file
+EMAIL="nishant@mnspace.net"
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-AllUtils/README b/perl/perl-List-AllUtils/README
new file mode 100644
index 0000000000..c6139ccb42
--- /dev/null
+++ b/perl/perl-List-AllUtils/README
@@ -0,0 +1,2 @@
+This module provides all List opoerations from List::Util, List::SomeUtils
+and List::UtilsBy
diff --git a/perl/perl-List-AllUtils/perl-List-AllUtils.SlackBuild b/perl/perl-List-AllUtils/perl-List-AllUtils.SlackBuild
new file mode 100644
index 0000000000..3522037597
--- /dev/null
+++ b/perl/perl-List-AllUtils/perl-List-AllUtils.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-List-AllUtils
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-List-AllUtils
+VERSION=${VERSION:-0.16}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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 \
+  CODE_OF_CONDUCT* CONTRIBUTING* 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/perl/perl-List-AllUtils/perl-List-AllUtils.info b/perl/perl-List-AllUtils/perl-List-AllUtils.info
new file mode 100644
index 0000000000..3bee864378
--- /dev/null
+++ b/perl/perl-List-AllUtils/perl-List-AllUtils.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-List-AllUtils"
+VERSION="0.16"
+HOMEPAGE="https://metacpan.org/pod/List::AllUtils"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-AllUtils-0.16.tar.gz"
+MD5SUM="508796a7ed76c5fe699ad9dc08538daf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Scalar-List-Utils perl-List-SomeUtils perl-List-UtilsBy"
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-List-AllUtils/slack-desc b/perl/perl-List-AllUtils/slack-desc
new file mode 100644
index 0000000000..9211c3e474
--- /dev/null
+++ b/perl/perl-List-AllUtils/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-List-AllUtils: perl-List-AllUtils (All List utilities)
+perl-List-AllUtils:
+perl-List-AllUtils: This module provides colection of List utilities from modules
+perl-List-AllUtils: List::Util, List::SomeUtils and List::UtilsBy
+perl-List-AllUtils:
+perl-List-AllUtils: Homepage: https://metacpan.org/pod/List-AllUtils
+perl-List-AllUtils:
+perl-List-AllUtils:
+perl-List-AllUtils:
+perl-List-AllUtils:
+perl-List-AllUtils:
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-List-SomeUtils/README b/perl/perl-List-SomeUtils/README
new file mode 100644
index 0000000000..74c02e9e6c
--- /dev/null
+++ b/perl/perl-List-SomeUtils/README
@@ -0,0 +1 @@
+This module provides List opoerations missing in List::Util.
diff --git a/perl/perl-List-SomeUtils/perl-List-SomeUtils.SlackBuild b/perl/perl-List-SomeUtils/perl-List-SomeUtils.SlackBuild
new file mode 100644
index 0000000000..7c8bfc7d0d
--- /dev/null
+++ b/perl/perl-List-SomeUtils/perl-List-SomeUtils.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-List-SomeUtils
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-List-SomeUtils
+VERSION=${VERSION:-0.58}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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 \
+  CODE_OF_CONDUCT* CONTRIBUTING* 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/perl/perl-List-SomeUtils/perl-List-SomeUtils.info b/perl/perl-List-SomeUtils/perl-List-SomeUtils.info
new file mode 100644
index 0000000000..27b8ca613a
--- /dev/null
+++ b/perl/perl-List-SomeUtils/perl-List-SomeUtils.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-List-SomeUtils"
+VERSION="0.58"
+HOMEPAGE="https://metacpan.org/pod/List::SomeUtils"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-0.58.tar.gz"
+MD5SUM="d35e2233abcd8712792e6a3548f41181"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Module-Implementation"
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-List-SomeUtils/slack-desc b/perl/perl-List-SomeUtils/slack-desc
new file mode 100644
index 0000000000..72f641c86d
--- /dev/null
+++ b/perl/perl-List-SomeUtils/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-List-SomeUtils: perl-List-SomeUtils (Missing methods from List::Util)
+perl-List-SomeUtils:
+perl-List-SomeUtils: This module provides utilities missing in List::Util
+perl-List-SomeUtils:
+perl-List-SomeUtils: Homepage: https://metacpan.org/pod/List::SomeUtils
+perl-List-SomeUtils:
+perl-List-SomeUtils:
+perl-List-SomeUtils:
+perl-List-SomeUtils:
+perl-List-SomeUtils:
+perl-List-SomeUtils:
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-MPC/README b/perl/perl-Math-MPC/README
index 6b50916553..6a42956c0c 100644
--- a/perl/perl-Math-MPC/README
+++ b/perl/perl-Math-MPC/README
@@ -4,5 +4,6 @@ perl-Math-MPC is a multiple precision complex number module utilising
 the MPC library. Basically, this module simply wraps the 'mpc'
 complex number functions provided by that library.
 
-For tests only, optional deps: perl-Math-Complex_C, perl-Math-Complex_C-L,
-perl-Math-Complex_C-Q, perl-Math-GMPf, perl-Test-Pod.
+For tests only, optional deps: perl-Math-Complex_C,
+perl-Math-Complex_C-L, perl-Math-Complex_C-Q, perl-Math-GMPf,
+perl-Test-Pod.
diff --git a/perl/perl-Math-MPC/perl-Math-MPC.SlackBuild b/perl/perl-Math-MPC/perl-Math-MPC.SlackBuild
index a7c47fea01..f003918b7c 100644
--- a/perl/perl-Math-MPC/perl-Math-MPC.SlackBuild
+++ b/perl/perl-Math-MPC/perl-Math-MPC.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Math-MPC
-VERSION=${VERSION:-1.08}
+VERSION=${VERSION:-1.09}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Math-MPC/perl-Math-MPC.info b/perl/perl-Math-MPC/perl-Math-MPC.info
index 6ffce9d75b..d20c41a494 100644
--- a/perl/perl-Math-MPC/perl-Math-MPC.info
+++ b/perl/perl-Math-MPC/perl-Math-MPC.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Math-MPC"
-VERSION="1.08"
+VERSION="1.09"
 HOMEPAGE="https://metacpan.org/pod/Math::MPC"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-MPC-1.08.tar.gz"
-MD5SUM="96d73685c1ce9f7c7774b3bed2ebe4f5"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-MPC-1.09.tar.gz"
+MD5SUM="f65e713a5ad16f44e5b621c26fd68419"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Math-MPFR"
diff --git a/perl/perl-Math-MPFR/perl-Math-MPFR.SlackBuild b/perl/perl-Math-MPFR/perl-Math-MPFR.SlackBuild
index 105d8938ec..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.13}
+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 bf9b434cd1..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.13"
+VERSION="4.16"
 HOMEPAGE="https://metacpan.org/pod/Math::MPFR"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-MPFR-4.13.tar.gz"
-MD5SUM="847831e00c00c761deb05a13b3eded93"
+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-MaxMind-DB-Common/README b/perl/perl-MaxMind-DB-Common/README
new file mode 100644
index 0000000000..6ebdacae57
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Common/README
@@ -0,0 +1,2 @@
+This module provides a shared code and metadata for MaxMind DB reader
+and writer.
diff --git a/perl/perl-MaxMind-DB-Common/perl-MaxMind-DB-Common.SlackBuild b/perl/perl-MaxMind-DB-Common/perl-MaxMind-DB-Common.SlackBuild
new file mode 100644
index 0000000000..b632e74f51
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Common/perl-MaxMind-DB-Common.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-MaxMind-DB-Common
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-MaxMind-DB-Common
+VERSION=${VERSION:-0.040001}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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* \
+  $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-MaxMind-DB-Common/perl-MaxMind-DB-Common.info b/perl/perl-MaxMind-DB-Common/perl-MaxMind-DB-Common.info
new file mode 100644
index 0000000000..efa835b702
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Common/perl-MaxMind-DB-Common.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-MaxMind-DB-Common"
+VERSION="0.040001"
+HOMEPAGE="https://metacpan.org/pod/MaxMind::DB::Common"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MA/MAXMIND/MaxMind-DB-Common-0.040001.tar.gz"
+MD5SUM="ccf2536306c7815b2aa1f60a57c1d4e5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Data-Dumper-Concise perl-DateTime perl-List-AllUtils perl-Math-BigInt perl-Moo perl-MooX-StrictConstructor perl-namespace-autoclean perl-Scalar-List-Utils perl-Sub-Quote"
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-MaxMind-DB-Common/slack-desc b/perl/perl-MaxMind-DB-Common/slack-desc
new file mode 100644
index 0000000000..7271d15ecd
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Common/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-MaxMind-DB-Common: perl-MaxMind-DB-Common (Common code/metadata for Reader & Writer)
+perl-MaxMind-DB-Common:
+perl-MaxMind-DB-Common: This module provides a common code and metadata for MaxMind DB
+perl-MaxMind-DB-Common: Reader and Writer.
+perl-MaxMind-DB-Common:
+perl-MaxMind-DB-Common: Homepage: https://metacpan.org/pod/MaxMind-DB-Common
+perl-MaxMind-DB-Common:
+perl-MaxMind-DB-Common:
+perl-MaxMind-DB-Common:
+perl-MaxMind-DB-Common:
+perl-MaxMind-DB-Common:
diff --git a/perl/perl-MaxMind-DB-Reader-XS/README b/perl/perl-MaxMind-DB-Reader-XS/README
new file mode 100644
index 0000000000..25552ffb6d
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Reader-XS/README
@@ -0,0 +1,2 @@
+This module provides searching in MaxMind DB mmdb files.
+This is fast XS implementation
diff --git a/perl/perl-MaxMind-DB-Reader-XS/perl-MaxMind-DB-Reader-XS.SlackBuild b/perl/perl-MaxMind-DB-Reader-XS/perl-MaxMind-DB-Reader-XS.SlackBuild
new file mode 100644
index 0000000000..a68e22a6c4
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Reader-XS/perl-MaxMind-DB-Reader-XS.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for perl-MaxMind-DB-Reader-XS
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-MaxMind-DB-Reader-XS
+VERSION=${VERSION:-1.000008}
+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 Build.PL \
+  --installdirs vendor \
+  --config installvendorman1dir=/usr/man/man1 \
+  --config installvendorman3dir=/usr/man/man3
+./Build
+./Build test
+./Build 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 \
+  CONTRIBUTING* 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/perl/perl-MaxMind-DB-Reader-XS/perl-MaxMind-DB-Reader-XS.info b/perl/perl-MaxMind-DB-Reader-XS/perl-MaxMind-DB-Reader-XS.info
new file mode 100644
index 0000000000..4ab5cbe9cd
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Reader-XS/perl-MaxMind-DB-Reader-XS.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-MaxMind-DB-Reader-XS"
+VERSION="1.000008"
+HOMEPAGE="https://metacpan.org/pod/MaxMind::DB::Reader::XS"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000008.tar.gz"
+MD5SUM="d4567d35e1b0868110f59f45c87fc641"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Math-Int64 perl-Math-Int128 perl-Moo perl-namespace-autoclean perl-MaxMind-DB-Reader libmaxminddb"
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-MaxMind-DB-Reader-XS/slack-desc b/perl/perl-MaxMind-DB-Reader-XS/slack-desc
new file mode 100644
index 0000000000..7aff2aa554
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Reader-XS/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-MaxMind-DB-Reader-XS: perl-MaxMind-DB-Reader-XS (XS implementation of MaxMind DB reader)
+perl-MaxMind-DB-Reader-XS:
+perl-MaxMind-DB-Reader-XS: This module provides searching in MaxMind DB mmdb files.
+perl-MaxMind-DB-Reader-XS: This is the fast XS implementation
+perl-MaxMind-DB-Reader-XS:
+perl-MaxMind-DB-Reader-XS: Homepage: https://metacpan.org/pod/MaxMind::DB::Reader::XS
+perl-MaxMind-DB-Reader-XS:
+perl-MaxMind-DB-Reader-XS:
+perl-MaxMind-DB-Reader-XS:
+perl-MaxMind-DB-Reader-XS:
+perl-MaxMind-DB-Reader-XS:
diff --git a/perl/perl-MaxMind-DB-Reader/README b/perl/perl-MaxMind-DB-Reader/README
new file mode 100644
index 0000000000..30745d71ed
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Reader/README
@@ -0,0 +1 @@
+This module provides searching in MaxMind DB mmdb files.
diff --git a/perl/perl-MaxMind-DB-Reader/perl-MaxMind-DB-Reader.SlackBuild b/perl/perl-MaxMind-DB-Reader/perl-MaxMind-DB-Reader.SlackBuild
new file mode 100644
index 0000000000..c1fd7f182e
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Reader/perl-MaxMind-DB-Reader.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-MaxMind-DB-Reader
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-MaxMind-DB-Reader
+VERSION=${VERSION:-1.000014}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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 \
+  CONTRIBUTING* 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/perl/perl-MaxMind-DB-Reader/perl-MaxMind-DB-Reader.info b/perl/perl-MaxMind-DB-Reader/perl-MaxMind-DB-Reader.info
new file mode 100644
index 0000000000..1b429b91b7
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Reader/perl-MaxMind-DB-Reader.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-MaxMind-DB-Reader"
+VERSION="1.000014"
+HOMEPAGE="https://metacpan.org/pod/MaxMind::DB::Reader"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000014.tar.gz"
+MD5SUM="cd5c259023f7b483cc1204398dcaa6b4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Data-IEEE754 perl-Data-Printer perl-Data-Validate-IP perl-DateTime perl-List-AllUtils perl-Math-BigInt perl-MaxMind-DB-Common perl-Module-Implementation perl-Moo perl-MooX-StrictConstructor perl-namespace-autoclean perl-Role-Tiny perl-Path-Class perl-Test-Number-Delta"
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-MaxMind-DB-Reader/slack-desc b/perl/perl-MaxMind-DB-Reader/slack-desc
new file mode 100644
index 0000000000..1bdadc3f5e
--- /dev/null
+++ b/perl/perl-MaxMind-DB-Reader/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-MaxMind-DB-Reader: perl-MaxMind-DB-Reader (MaxMind DB reader)
+perl-MaxMind-DB-Reader:
+perl-MaxMind-DB-Reader: This module provides searching in MaxMind DB mmdb files.
+perl-MaxMind-DB-Reader:
+perl-MaxMind-DB-Reader: Homepage: https://metacpan.org/pod/MaxMind-DB-Read
+perl-MaxMind-DB-Reader:
+perl-MaxMind-DB-Reader:
+perl-MaxMind-DB-Reader:
+perl-MaxMind-DB-Reader:
+perl-MaxMind-DB-Reader:
+perl-MaxMind-DB-Reader:
diff --git a/perl/perl-Modern-Perl/README b/perl/perl-Modern-Perl/README
new file mode 100644
index 0000000000..e1bd96c499
--- /dev/null
+++ b/perl/perl-Modern-Perl/README
@@ -0,0 +1,14 @@
+Modern::Perl - enable all of the features of Modern Perl with one import
+
+Modern Perl programs use several modules to enable additional features
+of Perl and of the CPAN. Instead of copying and pasting all of these
+use lines, instead write only one:
+
+        use Modern::Perl;
+
+This enables the strict and warnings pragmas, as well as all of the
+features available in Perl 5.10. It also enables C3 method resolution
+order as documented in perldoc mro and loads IO::File and IO::Handle
+so that you may call methods on filehandles. In the future, it may
+include additional core modules and pragmas (but is unlikely to
+include non-core features).
diff --git a/perl/perl-Modern-Perl/perl-Modern-Perl.SlackBuild b/perl/perl-Modern-Perl/perl-Modern-Perl.SlackBuild
new file mode 100644
index 0000000000..8d0a38a6cc
--- /dev/null
+++ b/perl/perl-Modern-Perl/perl-Modern-Perl.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for perl-Modern-Perl
+
+# Copyright 2020 Daniel Bowling <swaggboi@slackware.uk>
+# 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-Modern-Perl
+VERSION=${VERSION:-1.20200211}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRC_PRGNAM=Modern-Perl
+DOCS="README"
+
+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 $SRC_PRGNAM-$VERSION
+tar xvf $CWD/$SRC_PRGNAM-$VERSION.tar.gz
+cd $SRC_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 {} \;
+
+perl Makefile.PL INSTALLDIRS=perl
+make
+make test
+make install DESTDIR=$PKG
+
+mv $PKG/usr/share/man $PKG/usr/
+
+( 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
+)
+
+# Remove perllocal.pod and other special files that don't need to be installed
+( cd $PKG
+  # Remove 'special' files
+  find . -name perllocal.pod \
+    -o -name ".packlist" \
+    -o -name "*.bs" \
+    | xargs rm -f
+)
+
+# Remove empty directories
+find $PKG -depth -type d -empty -delete
+
+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
+
+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-Modern-Perl/perl-Modern-Perl.info b/perl/perl-Modern-Perl/perl-Modern-Perl.info
new file mode 100644
index 0000000000..d05584271f
--- /dev/null
+++ b/perl/perl-Modern-Perl/perl-Modern-Perl.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Modern-Perl"
+VERSION="1.20200211"
+HOMEPAGE="https://metacpan.org/pod/Modern::Perl"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20200211.tar.gz"
+MD5SUM="2c6f7648ced3cb3451d3c73eb4e1cb24"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Daniel Bowling"
+EMAIL="swaggboi@slackware.uk"
diff --git a/perl/perl-Modern-Perl/slack-desc b/perl/perl-Modern-Perl/slack-desc
new file mode 100644
index 0000000000..f9c63fe515
--- /dev/null
+++ b/perl/perl-Modern-Perl/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-Modern-Perl: perl-Modern-Perl (enable features of Modern Perl with one import)
+perl-Modern-Perl:
+perl-Modern-Perl:
+perl-Modern-Perl: Modern Perl programs use several modules to enable additional features
+perl-Modern-Perl: of Perl and of the CPAN. Instead of copying and pasting all of these
+perl-Modern-Perl: use lines, instead write only one:
+perl-Modern-Perl:         use Modern::Perl;
+perl-Modern-Perl:
+perl-Modern-Perl:
+perl-Modern-Perl:
+perl-Modern-Perl:
diff --git a/perl/perl-Module-Build/README b/perl/perl-Module-Build/README
index 13a3c1c7f4..e0340056f1 100644
--- a/perl/perl-Module-Build/README
+++ b/perl/perl-Module-Build/README
@@ -4,4 +4,7 @@ Module::Build is a system for building, testing, and installing Perl modules.
 
 It is meant to be an alternative to ExtUtils::MakeMaker.
 
-Optional dependency: perl-inc-latest.
+Optional dependencies:
+
+perl-inc-latest (experimental, see README)
+perl-Archive-Zip
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-Mojolicious-Plugin-I18N/README b/perl/perl-Mojolicious-Plugin-I18N/README
index b9d0a9c06b..fa8cc08c9b 100644
--- a/perl/perl-Mojolicious-Plugin-I18N/README
+++ b/perl/perl-Mojolicious-Plugin-I18N/README
@@ -1,4 +1,5 @@
-perl-Mojolicious-Plugin-I18N - Internationalization Plugin for Mojolicious
+perl-Mojolicious-Plugin-I18N - Internationalization Plugin for
+Mojolicious
 
-Mojolicious::Plugin::I18N is internationalization plugin for Mojolicious.
-It works with Mojolicious 4.0+.
+Mojolicious::Plugin::I18N is an internationalization plugin for
+Mojolicious.  It works with Mojolicious 4.0+.
diff --git a/perl/perl-Mojolicious-Plugin-I18N/perl-Mojolicious-Plugin-I18N.SlackBuild b/perl/perl-Mojolicious-Plugin-I18N/perl-Mojolicious-Plugin-I18N.SlackBuild
index 8e380df0df..8e380df0df 100755..100644
--- a/perl/perl-Mojolicious-Plugin-I18N/perl-Mojolicious-Plugin-I18N.SlackBuild
+++ b/perl/perl-Mojolicious-Plugin-I18N/perl-Mojolicious-Plugin-I18N.SlackBuild
diff --git a/perl/perl-Mojolicious-Plugin-I18N/perl-Mojolicious-Plugin-I18N.info b/perl/perl-Mojolicious-Plugin-I18N/perl-Mojolicious-Plugin-I18N.info
index fb83b7ee26..e90e1df8a9 100644
--- a/perl/perl-Mojolicious-Plugin-I18N/perl-Mojolicious-Plugin-I18N.info
+++ b/perl/perl-Mojolicious-Plugin-I18N/perl-Mojolicious-Plugin-I18N.info
@@ -8,5 +8,3 @@ MD5SUM_x86_64=""
 REQUIRES="perl-Mojolicious"
 MAINTAINER="Michel A. BEGUE"
 EMAIL="mab974@gmail.com"
-
-
diff --git a/perl/perl-Moo/perl-Moo.SlackBuild b/perl/perl-Moo/perl-Moo.SlackBuild
index 846e6b68c3..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-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-Moo
-VERSION=${VERSION:-2.003006}
+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 470a6e94ff..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.003006"
+VERSION="2.004004"
 HOMEPAGE="https://metacpan.org/pod/Moo"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-2.003006.tar.gz"
-MD5SUM="53af7e7849492a8e3994ee379d12e348"
+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-MooX-StrictConstructor/perl-MooX-StrictConstructor.SlackBuild b/perl/perl-MooX-StrictConstructor/perl-MooX-StrictConstructor.SlackBuild
index 16e3d43569..70d37449a2 100644
--- a/perl/perl-MooX-StrictConstructor/perl-MooX-StrictConstructor.SlackBuild
+++ b/perl/perl-MooX-StrictConstructor/perl-MooX-StrictConstructor.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-MooX-StrictConstructor
-VERSION=${VERSION:-0.010}
+VERSION=${VERSION:-0.011}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-MooX-StrictConstructor/perl-MooX-StrictConstructor.info b/perl/perl-MooX-StrictConstructor/perl-MooX-StrictConstructor.info
index 2924353a94..cca8636d42 100644
--- a/perl/perl-MooX-StrictConstructor/perl-MooX-StrictConstructor.info
+++ b/perl/perl-MooX-StrictConstructor/perl-MooX-StrictConstructor.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-MooX-StrictConstructor"
-VERSION="0.010"
+VERSION="0.011"
 HOMEPAGE="https://metacpan.org/pod/MooX::StrictConstructor"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz"
-MD5SUM="d4a71e6e874bf8dfb6cb1856f6a37b8f"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.011.tar.gz"
+MD5SUM="a1e81b0f2362b8f8d1d59c78f3f89455"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Class-Method-Modifiers perl-Moo"
diff --git a/perl/perl-Moose/perl-Moose.SlackBuild b/perl/perl-Moose/perl-Moose.SlackBuild
index 5bb3e77dd2..4ccd7813d9 100644
--- a/perl/perl-Moose/perl-Moose.SlackBuild
+++ b/perl/perl-Moose/perl-Moose.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Moose
-VERSION=${VERSION:-2.2011}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.2012}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
diff --git a/perl/perl-Moose/perl-Moose.info b/perl/perl-Moose/perl-Moose.info
index a332f1e15a..2bfa6ae527 100644
--- a/perl/perl-Moose/perl-Moose.info
+++ b/perl/perl-Moose/perl-Moose.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Moose"
-VERSION="2.2011"
+VERSION="2.2012"
 HOMEPAGE="https://metacpan.org/pod/Moose"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Moose-2.2011.tar.gz"
-MD5SUM="2816e852847a82a5c90cf70a8ab28cfc"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Moose-2.2012.tar.gz"
+MD5SUM="4aaf729a9c575aab2c0cbd127cd8edf1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Class-Load-XS perl-Data-OptList perl-Devel-GlobalDestruction perl-Devel-OverloadInfo perl-Devel-StackTrace perl-Dist-CheckConflicts perl-Eval-Closure perl-MRO-Compat perl-Module-Runtime perl-Module-Runtime-Conflicts perl-Package-DeprecationManager perl-Package-Stash perl-Package-Stash-XS perl-Params-Util perl-Sub-Exporter perl-Sub-Identify perl-Sub-Name perl-Try-Tiny perl-CPAN-Meta-Check perl-Test-CleanNamespaces perl-Class-Load-XS perl-Devel-StackTrace perl-Scalar-List-Utils"
diff --git a/perl/perl-MooseX-Types-Structured/perl-MooseX-Types-Structured.info b/perl/perl-MooseX-Types-Structured/perl-MooseX-Types-Structured.info
index d4258f717f..757a7add18 100644
--- a/perl/perl-MooseX-Types-Structured/perl-MooseX-Types-Structured.info
+++ b/perl/perl-MooseX-Types-Structured/perl-MooseX-Types-Structured.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/MooseX-Types-Structure
 MD5SUM="d29c7bdaf44a90b3871dc040157015c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Devel-PartialDump perl-MooseX-Types perl-Sub-Exporter perl-Test-Needs"
+REQUIRES="perl-Devel-PartialDump perl-MooseX-Types perl-Sub-Exporter perl-Test-Needs perl-DateTime"
 MAINTAINER="Jan F. Chadima"
 EMAIL="jfch@jagda.eu"
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-Mutex/README b/perl/perl-Mutex/README
new file mode 100644
index 0000000000..1e5f5aa2d4
--- /dev/null
+++ b/perl/perl-Mutex/README
@@ -0,0 +1 @@
+Mutex - Various locking implementations supporting processes and threads
diff --git a/perl/perl-Mutex/perl-Mutex.SlackBuild b/perl/perl-Mutex/perl-Mutex.SlackBuild
new file mode 100644
index 0000000000..eb5747cdc3
--- /dev/null
+++ b/perl/perl-Mutex/perl-Mutex.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-Mutex
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-Mutex
+VERSION=${VERSION:-1.005}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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* \
+  $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-Mutex/perl-Mutex.info b/perl/perl-Mutex/perl-Mutex.info
new file mode 100644
index 0000000000..c547d79335
--- /dev/null
+++ b/perl/perl-Mutex/perl-Mutex.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Mutex"
+VERSION="1.005"
+HOMEPAGE="https://metacpan.org/pod/Mutex"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MA/MARIOROY/Mutex-1.005.tar.gz"
+MD5SUM="7ba63ad06d66d7fc8f81b2938a446a15"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-Mutex/slack-desc b/perl/perl-Mutex/slack-desc
new file mode 100644
index 0000000000..81ac4a8f65
--- /dev/null
+++ b/perl/perl-Mutex/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-Mutex: perl-Mutex (Process synchronization primitives)
+perl-Mutex:
+perl-Mutex: This module provides various locking implementations supporting
+perl-Mutex: processes and threads.
+perl-Mutex:
+perl-Mutex: Homepage: https://metacpan.org/pod/Mutex
+perl-Mutex:
+perl-Mutex:
+perl-Mutex:
+perl-Mutex:
+perl-Mutex:
diff --git a/perl/perl-Net-ARP/perl-Net-ARP.SlackBuild b/perl/perl-Net-ARP/perl-Net-ARP.SlackBuild
index d4c8c01087..4c61b21576 100644
--- a/perl/perl-Net-ARP/perl-Net-ARP.SlackBuild
+++ b/perl/perl-Net-ARP/perl-Net-ARP.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Net-ARP
-VERSION=${VERSION:-1.0.9}
+VERSION=${VERSION:-1.0.11}
 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
+rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tgz
-cd $SRCNAM
+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/perl/perl-Net-ARP/perl-Net-ARP.info b/perl/perl-Net-ARP/perl-Net-ARP.info
index e37bbfc540..22deef7e5c 100644
--- a/perl/perl-Net-ARP/perl-Net-ARP.info
+++ b/perl/perl-Net-ARP/perl-Net-ARP.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Net-ARP"
-VERSION="1.0.9"
+VERSION="1.0.11"
 HOMEPAGE="https://metacpan.org/pod/Net::ARP"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/C/CR/CRAZYDJ/Net-ARP-1.0.9.tgz"
-MD5SUM="bb693890d93bc84831663edb1a5c5d45"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/C/CR/CRAZYDJ/Net-ARP-1.0.11.tgz"
+MD5SUM="7dc767a8c115efed5d2ead9c73244b8f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Net-Works/README b/perl/perl-Net-Works/README
new file mode 100644
index 0000000000..c2d1f5f0ee
--- /dev/null
+++ b/perl/perl-Net-Works/README
@@ -0,0 +1 @@
+Net::Works - Sane APIs for IP addresses and networks
diff --git a/perl/perl-Net-Works/perl-Net-Works.SlackBuild b/perl/perl-Net-Works/perl-Net-Works.SlackBuild
new file mode 100644
index 0000000000..712a886d1f
--- /dev/null
+++ b/perl/perl-Net-Works/perl-Net-Works.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-Net-Works
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-Net-Works
+VERSION=${VERSION:-0.22}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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 INSTALL 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/perl/perl-Net-Works/perl-Net-Works.info b/perl/perl-Net-Works/perl-Net-Works.info
new file mode 100644
index 0000000000..1dc32085b3
--- /dev/null
+++ b/perl/perl-Net-Works/perl-Net-Works.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Net-Works"
+VERSION="0.22"
+HOMEPAGE="https://metacpan.org/pod/Net::Works"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MA/MAXMIND/Net-Works-0.22.tar.gz"
+MD5SUM="92993638c98f04d82a4d75ed4b043b45"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-List-AllUtils perl-Math-Int128 perl-Moo perl-namespace-autoclean perl-Sub-Quote"
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-Net-Works/slack-desc b/perl/perl-Net-Works/slack-desc
new file mode 100644
index 0000000000..c8f27b1a02
--- /dev/null
+++ b/perl/perl-Net-Works/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-Net-Works: perl-Net-Works (Sane APIs for IP addresses and networks)
+perl-Net-Works:
+perl-Net-Works: This module is similar to NetAddr::IP module. It is designed for 
+perl-Net-Works: use in Maxmind products.
+perl-Net-Works:
+perl-Net-Works: Homepage: https://metacpan.org/pod/Net::Works
+perl-Net-Works:
+perl-Net-Works:
+perl-Net-Works:
+perl-Net-Works:
+perl-Net-Works:
diff --git a/perl/perl-Number-Convert-Roman/README b/perl/perl-Number-Convert-Roman/README
new file mode 100644
index 0000000000..4b9d330991
--- /dev/null
+++ b/perl/perl-Number-Convert-Roman/README
@@ -0,0 +1 @@
+Number::Convert::Roman is a Roman-Arabic numeral converter
diff --git a/perl/perl-Number-Convert-Roman/perl-Number-Convert-Roman.SlackBuild b/perl/perl-Number-Convert-Roman/perl-Number-Convert-Roman.SlackBuild
new file mode 100644
index 0000000000..1c30b37909
--- /dev/null
+++ b/perl/perl-Number-Convert-Roman/perl-Number-Convert-Roman.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-Number-Convert-Roman
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-Number-Convert-Roman
+VERSION=${VERSION:-0.01}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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-Number-Convert-Roman/perl-Number-Convert-Roman.info b/perl/perl-Number-Convert-Roman/perl-Number-Convert-Roman.info
new file mode 100644
index 0000000000..e31749cae2
--- /dev/null
+++ b/perl/perl-Number-Convert-Roman/perl-Number-Convert-Roman.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Number-Convert-Roman"
+VERSION="0.01"
+HOMEPAGE="https://metacpan.org/pod/Number::Convert::Roman"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SA/SANTOS/Number-Convert-Roman-0.01.tar.gz"
+MD5SUM="02e1c812a899c5436fbbc2d5453f1be3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-Number-Convert-Roman/slack-desc b/perl/perl-Number-Convert-Roman/slack-desc
new file mode 100644
index 0000000000..39d99cab87
--- /dev/null
+++ b/perl/perl-Number-Convert-Roman/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-Number-Convert-Roman: perl-Number-Convert-Roman (Roman-Arabic numeral converter)
+perl-Number-Convert-Roman:
+perl-Number-Convert-Roman: This module is useful for conversion between Roman and Arabic
+perl-Number-Convert-Roman: numbers.
+perl-Number-Convert-Roman:
+perl-Number-Convert-Roman: Homepage: https://metacpan.org/pod/Number::Convert::Roman
+perl-Number-Convert-Roman:
+perl-Number-Convert-Roman:
+perl-Number-Convert-Roman:
+perl-Number-Convert-Roman:
+perl-Number-Convert-Roman:
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-Parse-Method-Signatures/README b/perl/perl-Parse-Method-Signatures/README
index 4d1dab8c8a..8150aa32f3 100644
--- a/perl/perl-Parse-Method-Signatures/README
+++ b/perl/perl-Parse-Method-Signatures/README
@@ -1,4 +1,4 @@
 Parse::Method::Signatures is an extension of the Perl 5 object system.
 
-It is inspired by Perl6::Signature but streamlined to just support the subset
-deemed useful for TryCatch and MooseX::Method::Signatures.
+It is inspired by Perl6::Signature but streamlined to just support the
+subset deemed useful for TryCatch and MooseX::Method::Signatures.
diff --git a/perl/perl-Parse-Method-Signatures/perl-Parse-Method-Signatures.info b/perl/perl-Parse-Method-Signatures/perl-Parse-Method-Signatures.info
index ef9440dfd6..ef3cf548fa 100644
--- a/perl/perl-Parse-Method-Signatures/perl-Parse-Method-Signatures.info
+++ b/perl/perl-Parse-Method-Signatures/perl-Parse-Method-Signatures.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/Parse-Method-Signatur
 MD5SUM="5236c145815db7001841ed8efb305c9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Test-Differences  perl-MooseX-Traits perl-MooseX-Types perl-MooseX-Types-Structured perl-PPI"
+REQUIRES="perl-Test-Differences  perl-MooseX-Traits perl-MooseX-Types perl-MooseX-Types-Structured perl-PPI perl-aliased"
 MAINTAINER="Jan F. Chadima"
 EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild b/perl/perl-Path-Tiny/perl-Path-Tiny.SlackBuild
index 8081e781d7..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.112}
+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 468ba88942..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.112"
+VERSION="0.118"
 HOMEPAGE="https://metacpan.org/pod/Path::Tiny"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.112.tar.gz"
-MD5SUM="bf2a021d653d7252a39c0d31b41a7c6e"
+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-Scalar-List-Utils/perl-Scalar-List-Utils.SlackBuild b/perl/perl-Scalar-List-Utils/perl-Scalar-List-Utils.SlackBuild
index 39938cff4e..47535fead4 100644
--- a/perl/perl-Scalar-List-Utils/perl-Scalar-List-Utils.SlackBuild
+++ b/perl/perl-Scalar-List-Utils/perl-Scalar-List-Utils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Scalar-List-Utils
 
-# Copyright 2018-2019 Jan F. Chadima <jfch@jagda.eu>
+# Copyright 2018-2020 Jan F. Chadima <jfch@jagda.eu>
 # 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=perl-Scalar-List-Utils
-VERSION=${VERSION:-1.52}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.55}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
diff --git a/perl/perl-Scalar-List-Utils/perl-Scalar-List-Utils.info b/perl/perl-Scalar-List-Utils/perl-Scalar-List-Utils.info
index d68a20c5c3..74e06287b9 100644
--- a/perl/perl-Scalar-List-Utils/perl-Scalar-List-Utils.info
+++ b/perl/perl-Scalar-List-Utils/perl-Scalar-List-Utils.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Scalar-List-Utils"
-VERSION="1.52"
+VERSION="1.55"
 HOMEPAGE="https://metacpan.org/pod/Scalar::Util"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.52.tar.gz"
-MD5SUM="50807e3ab15cb88dddfc9e23a54948c1"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.55.tar.gz"
+MD5SUM="7988f5111e33ba47e175cf3e86b0d93f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Sidef/perl-Sidef.SlackBuild b/perl/perl-Sidef/perl-Sidef.SlackBuild
index f474e8dc0a..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.95}
+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 7f6e05031a..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.95"
+VERSION="3.98"
 HOMEPAGE="https://github.com/trizen/sidef"
-DOWNLOAD="https://github.com/trizen/sidef/archive/3.95/sidef-3.95.tar.gz"
-MD5SUM="e89b0753a37fd7412f66f5e3fbe511ef"
+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-String-Random/README b/perl/perl-String-Random/README
index c2b3693a6f..31e750c7ab 100644
--- a/perl/perl-String-Random/README
+++ b/perl/perl-String-Random/README
@@ -1 +1,2 @@
-String::Random - Perl module to generate random strings based on a pattern.
+String::Random - Perl module to generate random strings based on a
+pattern.
diff --git a/perl/perl-String-Random/perl-String-Random.info b/perl/perl-String-Random/perl-String-Random.info
index 65b5b5c619..2e78ccbf40 100644
--- a/perl/perl-String-Random/perl-String-Random.info
+++ b/perl/perl-String-Random/perl-String-Random.info
@@ -1,6 +1,6 @@
 PRGNAM="perl-String-Random"
 VERSION="0.30"
-HOMEPAGE="https://metacpan.org/pod/String-Random"
+HOMEPAGE="https://metacpan.org/pod/String::Random"
 DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/String-Random-0.30.tar.gz"
 MD5SUM="d54ea58b992d9a2a1966051a4816693f"
 DOWNLOAD_x86_64=""
diff --git a/perl/perl-String-Random/slack-desc b/perl/perl-String-Random/slack-desc
index 689c220588..590e14456c 100644
--- a/perl/perl-String-Random/slack-desc
+++ b/perl/perl-String-Random/slack-desc
@@ -5,7 +5,7 @@
 # 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------------------------------------------------------|
+                  |-----handy-ruler------------------------------------------------------|
 perl-String-Random: perl-String-Random (Random string generator)
 perl-String-Random:
 perl-String-Random: This module generates random strings based on a pattern
diff --git a/perl/perl-String-Scanf/perl-String-Scanf.info b/perl/perl-String-Scanf/perl-String-Scanf.info
index dc6dd257ba..86ca19a5ff 100644
--- a/perl/perl-String-Scanf/perl-String-Scanf.info
+++ b/perl/perl-String-Scanf/perl-String-Scanf.info
@@ -1,6 +1,6 @@
 PRGNAM="perl-String-Scanf"
 VERSION="2.1"
-HOMEPAGE="https://metacpan.org/release/String-Scanf"
+HOMEPAGE="https://metacpan.org/pod/String::Scanf"
 DOWNLOAD="https://cpan.metacpan.org/authors/id/J/JH/JHI/String-Scanf-2.1.tar.gz"
 MD5SUM="6fe49bcefcf7dcc58ad9fea207277552"
 DOWNLOAD_x86_64=""
diff --git a/perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild b/perl/perl-Template-Toolkit/perl-Template-Toolkit.SlackBuild
index 64bc587983..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.007}
+VERSION=${VERSION:-3.009}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,6 @@ perl Makefile.PL \
   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 \
diff --git a/perl/perl-Template-Toolkit/perl-Template-Toolkit.info b/perl/perl-Template-Toolkit/perl-Template-Toolkit.info
index b8594fc750..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.007"
+VERSION="3.009"
 HOMEPAGE="https://metacpan.org/release/Template-Toolkit"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.007.tar.gz"
-MD5SUM="b318a48f18e137ad2d90ab6a26274a9a"
+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-Bits/README b/perl/perl-Test-Bits/README
new file mode 100644
index 0000000000..50c9f5a116
--- /dev/null
+++ b/perl/perl-Test-Bits/README
@@ -0,0 +1 @@
+Test::Bits - Provides a bits_is() subroutine for testing binary data.
diff --git a/perl/perl-Test-Bits/perl-Test-Bits.SlackBuild b/perl/perl-Test-Bits/perl-Test-Bits.SlackBuild
new file mode 100644
index 0000000000..3a8a555896
--- /dev/null
+++ b/perl/perl-Test-Bits/perl-Test-Bits.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-Test-Bits
+
+# Copyright 2020 Jan F. Chadima <jfch@jagda.eu>
+# 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-Bits
+VERSION=${VERSION:-0.02}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+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 $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 \
+  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 INSTALL 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/perl/perl-Test-Bits/perl-Test-Bits.info b/perl/perl-Test-Bits/perl-Test-Bits.info
new file mode 100644
index 0000000000..f5f6d91f3f
--- /dev/null
+++ b/perl/perl-Test-Bits/perl-Test-Bits.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Test-Bits"
+VERSION="0.02"
+HOMEPAGE="https://metacpan.org/pod/Test::Bits"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Test-Bits-0.02.tar.gz"
+MD5SUM="146bf1eb3be34b0ea648548238a775da"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-List-AllUtils"
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-Test-Bits/slack-desc b/perl/perl-Test-Bits/slack-desc
new file mode 100644
index 0000000000..3d237789c4
--- /dev/null
+++ b/perl/perl-Test-Bits/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-Bits: perl-Test-Bits (Test single bits)
+perl-Test-Bits:
+perl-Test-Bits: This module provides Perl availability to test single bits.
+perl-Test-Bits:
+perl-Test-Bits: Homepage: https://metacpan.org/pod/Test::Bits
+perl-Test-Bits:
+perl-Test-Bits:
+perl-Test-Bits:
+perl-Test-Bits:
+perl-Test-Bits:
+perl-Test-Bits:
diff --git a/perl/perl-Test-HexDifferences/perl-Test-HexDifferences.info b/perl/perl-Test-HexDifferences/perl-Test-HexDifferences.info
index c9380ad22e..2f5adb54b0 100644
--- a/perl/perl-Test-HexDifferences/perl-Test-HexDifferences.info
+++ b/perl/perl-Test-HexDifferences/perl-Test-HexDifferences.info
@@ -1,6 +1,6 @@
 PRGNAM="perl-Test-HexDifferences"
 VERSION="1.001"
-HOMEPAGE="https://metacpan.org/pod/Test-HexDifferences"
+HOMEPAGE="https://metacpan.org/pod/Test::HexDifferences"
 DOWNLOAD="https://cpan.metacpan.org/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz"
 MD5SUM="f830711da833bc233adfd9fd94645dc6"
 DOWNLOAD_x86_64=""
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-Text-CharWidth/README b/perl/perl-Text-CharWidth/README
index 62938f0fc8..74ca1fc430 100644
--- a/perl/perl-Text-CharWidth/README
+++ b/perl/perl-Text-CharWidth/README
@@ -10,4 +10,4 @@ depends on the encoding used.
 
 Parameters are to be given in locale encoding, not always in UTF-8.
 
-This perl module is needed by Text::WrapI18N.
\ No newline at end of file
+This perl module is needed by Text::WrapI18N.
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-cgi-minimal/perl-cgi-minimal.SlackBuild b/perl/perl-cgi-minimal/perl-cgi-minimal.SlackBuild
index 2fc8047855..dbb92a3ab0 100644
--- a/perl/perl-cgi-minimal/perl-cgi-minimal.SlackBuild
+++ b/perl/perl-cgi-minimal/perl-cgi-minimal.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-cgi-minimal
 
-# Copyright 2016  Johannes Schoepfer, Germany
+# Copyright 2016 - 2020  Johannes Schoepfer, 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=perl-cgi-minimal
-VERSION=${VERSION:-1.29}
+VERSION=${VERSION:-1.30}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,7 +82,6 @@ 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 links in $(find $PKG/usr/man -type l ) ; do ln -sf $( readlink $links ).gz $links.gz;rm $links;done
 
@@ -93,8 +92,8 @@ mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a examples TODO README Makefile.PL GPL_License.txt MANIFEST META.yml \
-       Artistic_License.txt Changes $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a examples TODO README LICENSE MANIFEST META.yml Changes \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 cd $PKG
diff --git a/perl/perl-cgi-minimal/perl-cgi-minimal.info b/perl/perl-cgi-minimal/perl-cgi-minimal.info
index 7106a3eb83..0b60794e61 100644
--- a/perl/perl-cgi-minimal/perl-cgi-minimal.info
+++ b/perl/perl-cgi-minimal/perl-cgi-minimal.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-cgi-minimal"
-VERSION="1.29"
+VERSION="1.30"
 HOMEPAGE="https://metacpan.org/pod/distribution/CGI-Minimal/lib/CGI/Minimal.pod"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.29.tar.gz"
-MD5SUM="76c659dc5f32018d2158d2427d549f35"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.30.tar.gz"
+MD5SUM="2e14736d9e0f93117ee64b613e5304cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-common-sense/perl-common-sense.SlackBuild b/perl/perl-common-sense/perl-common-sense.SlackBuild
index f6dafa4c90..31169d050d 100644
--- a/perl/perl-common-sense/perl-common-sense.SlackBuild
+++ b/perl/perl-common-sense/perl-common-sense.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for perl-common-sense
 
 # Copyright 2013 Donald Cooley La Porte, IN USA
-# Copyright 2017 Donald Cooley South Haven, IN USA
+# Copyright 2017-2020 Donald Cooley South Haven, IN 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=perl-common-sense
-VERSION=${VERSION:-3.74}
+VERSION=${VERSION:-3.75}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-common-sense/perl-common-sense.info b/perl/perl-common-sense/perl-common-sense.info
index 3be1945924..8635907156 100644
--- a/perl/perl-common-sense/perl-common-sense.info
+++ b/perl/perl-common-sense/perl-common-sense.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-common-sense"
-VERSION="3.74"
+VERSION="3.75"
 HOMEPAGE="https://metacpan.org/pod/common::sense"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz"
-MD5SUM="35b273147200c4c95eef7816f83e572d"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/common-sense-3.75.tar.gz"
+MD5SUM="0929c6b03455ca988a9b4219aca15292"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/perl-file-slurper/slack-desc b/perl/perl-file-slurper/slack-desc
index f3aa6a6ee5..fdeca2acca 100644
--- a/perl/perl-file-slurper/slack-desc
+++ b/perl/perl-file-slurper/slack-desc
@@ -8,12 +8,12 @@
                  |-----handy-ruler------------------------------------------------------|
 perl-file-slurper: perl-file-slurper (perl module)
 perl-file-slurper:
-perl-file-slurper: 
+perl-file-slurper:
 perl-file-slurper: A simple, sane and efficient module to slurp a file
-perl-file-slurper: 
-perl-file-slurper: 
-perl-file-slurper: 
-perl-file-slurper: 
-perl-file-slurper: 
-perl-file-slurper: 
-perl-file-slurper: 
+perl-file-slurper:
+perl-file-slurper:
+perl-file-slurper:
+perl-file-slurper:
+perl-file-slurper:
+perl-file-slurper:
+perl-file-slurper:
diff --git a/perl/perl-glib/perl-glib.SlackBuild b/perl/perl-glib/perl-glib.SlackBuild
index d251c709d0..9a92c5ed8c 100644
--- a/perl/perl-glib/perl-glib.SlackBuild
+++ b/perl/perl-glib/perl-glib.SlackBuild
@@ -27,7 +27,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-glib
-VERSION=${VERSION:-1.3292}
+VERSION=${VERSION:-1.3293}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-glib/perl-glib.info b/perl/perl-glib/perl-glib.info
index fe803b02cc..b41b757d70 100644
--- a/perl/perl-glib/perl-glib.info
+++ b/perl/perl-glib/perl-glib.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-glib"
-VERSION="1.3292"
+VERSION="1.3293"
 HOMEPAGE="https://metacpan.org/pod/Glib"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Glib-1.3292.tar.gz"
-MD5SUM="9fcd0fbb16f35a6bef0827e83d68da04"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz"
+MD5SUM="7f7ce9844fdb30a7320d4881ccdeb3ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-extutils-depends perl-extutils-pkgconfig"
diff --git a/perl/perl-html-form/perl-html-form.SlackBuild b/perl/perl-html-form/perl-html-form.SlackBuild
index 47f647c66a..23ba33a251 100644
--- a/perl/perl-html-form/perl-html-form.SlackBuild
+++ b/perl/perl-html-form/perl-html-form.SlackBuild
@@ -2,10 +2,11 @@
 
 # Slackware build script for perl-html-form
 
-# Copyright 2012  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2020 Donald Cooley, South Haven, Indiana, USA
+# Copyright 2012  Binh Nguyen
 # All rights reserved.
 #
-# Adopted 2014 Glenn Becker <glenn.becker@gmail.com>
+# Adopted 2014 Glenn Becker
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -25,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-html-form
-VERSION=${VERSION:-6.03}
+VERSION=${VERSION:-6.07}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -93,7 +94,7 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changes README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes INSTALL LICENSE $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-html-form/perl-html-form.info b/perl/perl-html-form/perl-html-form.info
index 08b78f872c..79e9e18c1a 100644
--- a/perl/perl-html-form/perl-html-form.info
+++ b/perl/perl-html-form/perl-html-form.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-html-form"
-VERSION="6.03"
+VERSION="6.07"
 HOMEPAGE="https://metacpan.org/pod/HTML::Form"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTML-Form-6.03.tar.gz"
-MD5SUM="fa6c2680207ed4fef5ea2ef09c210614"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz"
+MD5SUM="71718750e6a2132b50eeca417a55e18e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-http-message"
 MAINTAINER="Donald Cooley"
-EMAIL="chytraeus@protonmail.com"
+EMAIL="chytraeu@sdf.org"
diff --git a/perl/perl-http-server-simple/perl-http-server-simple.SlackBuild b/perl/perl-http-server-simple/perl-http-server-simple.SlackBuild
index c808be6e08..8985f99e9c 100644
--- a/perl/perl-http-server-simple/perl-http-server-simple.SlackBuild
+++ b/perl/perl-http-server-simple/perl-http-server-simple.SlackBuild
@@ -2,10 +2,11 @@
 
 # Slackware build script for perl-http-server-simple
 
-# Copyright 2010-2011  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2020 Donald Cooley, South Haven, Indiana, USA
+# Copyright 2010-2011  Binh Nguyen
 # All rights reserved.
 #
-# Adopted 2014 Glenn Becker <glenn.becker@gmail.com>
+# Adopted 2014 Glenn Becker
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -25,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-http-server-simple
-VERSION=${VERSION:-0.51}
+VERSION=${VERSION:-0.52}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-http-server-simple/perl-http-server-simple.info b/perl/perl-http-server-simple/perl-http-server-simple.info
index a99c9a949e..5a90f029f7 100644
--- a/perl/perl-http-server-simple/perl-http-server-simple.info
+++ b/perl/perl-http-server-simple/perl-http-server-simple.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-http-server-simple"
-VERSION="0.51"
+VERSION="0.52"
 HOMEPAGE="https://metacpan.org/pod/HTTP::Server::Simple"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BP/BPS/HTTP-Server-Simple-0.51.tar.gz"
-MD5SUM="ef736daddc7a32a29207fa4ed5f5d62e"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz"
+MD5SUM="1e23935491d9a2a8b0ba636462255656"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-CGI"
 MAINTAINER="Donald Cooley"
-EMAIL="chytraeus@protonmail.com"
+EMAIL="chytraeu@sdf.org"
diff --git a/perl/perl-namespace-autoclean/perl-namespace-autoclean.SlackBuild b/perl/perl-namespace-autoclean/perl-namespace-autoclean.SlackBuild
index dcc1a48657..8e0ffde7c3 100644
--- a/perl/perl-namespace-autoclean/perl-namespace-autoclean.SlackBuild
+++ b/perl/perl-namespace-autoclean/perl-namespace-autoclean.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-namespace-autoclean
-VERSION=${VERSION:-0.28}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.29}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
diff --git a/perl/perl-namespace-autoclean/perl-namespace-autoclean.info b/perl/perl-namespace-autoclean/perl-namespace-autoclean.info
index 61745b2583..f5fb522359 100644
--- a/perl/perl-namespace-autoclean/perl-namespace-autoclean.info
+++ b/perl/perl-namespace-autoclean/perl-namespace-autoclean.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-namespace-autoclean"
-VERSION="0.28"
+VERSION="0.29"
 HOMEPAGE="https://metacpan.org/pod/namespace::autoclean"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/namespace-autoclean-0.28.tar.gz"
-MD5SUM="9746a73c34f294d663c583f857b8648f"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/namespace-autoclean-0.29.tar.gz"
+MD5SUM="39b38c776cd1f0ee03cc70781a2f2798"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-B-Hooks-EndOfScope perl-Sub-Identify perl-namespace-clean perl-Sub-Name"
+REQUIRES="perl-B-Hooks-EndOfScope perl-Sub-Identify perl-namespace-clean perl-Sub-Name perl-Test-Needs"
 MAINTAINER="Jan F. Chadima"
 EMAIL="jfch@jagda.eu"
diff --git a/perl/perl-parallel-forkmanager/perl-parallel-forkmanager.info b/perl/perl-parallel-forkmanager/perl-parallel-forkmanager.info
index f124b5591b..a2db904822 100644
--- a/perl/perl-parallel-forkmanager/perl-parallel-forkmanager.info
+++ b/perl/perl-parallel-forkmanager/perl-parallel-forkmanager.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/dluxhu/perl-parallel-forkmanager/archive/v2.02/perl
 MD5SUM="351a3f044ddb0761eeef490c61ac0dd1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Moo"
+REQUIRES="perl-Moo perl-test-warn"
 MAINTAINER="Jeremy Hansen"
 EMAIL="jebrhansen+SBo@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 d4b5149f82..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.02.1}
+VERSION=${VERSION:-2021.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/rakudo/rakudo.info b/perl/rakudo/rakudo.info
index a84fa83c7f..5830a8a4d9 100644
--- a/perl/rakudo/rakudo.info
+++ b/perl/rakudo/rakudo.info
@@ -1,10 +1,10 @@
 PRGNAM="rakudo"
-VERSION="2020.02.1"
+VERSION="2021.03"
 HOMEPAGE="https://rakudo.org/"
-DOWNLOAD="https://github.com/rakudo/rakudo/releases/download/2020.02.1/rakudo-2020.02.1.tar.gz"
-MD5SUM="49da46f14d286172f50a6b173c4863eb"
+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 7f3e767cb9..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.3}
+VERSION=${VERSION:-0.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/zef/zef.info b/perl/zef/zef.info
index d7418d0768..1588a46f6d 100644
--- a/perl/zef/zef.info
+++ b/perl/zef/zef.info
@@ -1,10 +1,10 @@
 PRGNAM="zef"
-VERSION="0.8.3"
+VERSION="0.9.4"
 HOMEPAGE="https://github.com/ugexe/zef"
-DOWNLOAD="https://github.com/ugexe/zef/archive/v0.8.3/zef-0.8.3.tar.gz"
-MD5SUM="64e5fbb98339f48f1b5bd0ea8a624952"
+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
new file mode 100644
index 0000000000..6793e1369a
--- /dev/null
+++ b/python/BeautifulSoup4/BeautifulSoup4.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Slackware build script for BeautifulSoup4
+
+# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2020-2021 Isaac Yu <isaacyu1@isaacyu1.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=BeautifulSoup4
+VERSION=${VERSION:-4.9.3}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+SRCNAM=beautifulsoup4
+
+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 {} \;
+
+# 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)
+# 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
+  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 {} \;
+
+  # Build for Python 3 
+  sed -i "s/-rfI/-rf/" convert-py3k
+  sh convert-py3k
+  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.md COPYING.txt NEWS.txt TODO.txt 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/python/BeautifulSoup4/BeautifulSoup4.info b/python/BeautifulSoup4/BeautifulSoup4.info
new file mode 100644
index 0000000000..124eda5d4b
--- /dev/null
+++ b/python/BeautifulSoup4/BeautifulSoup4.info
@@ -0,0 +1,10 @@
+PRGNAM="BeautifulSoup4"
+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.3.tar.gz"
+MD5SUM="57fd468ae3eb055f6871106e8f7813e2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python-soupsieve"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/BeautifulSoup4/README b/python/BeautifulSoup4/README
new file mode 100644
index 0000000000..9e5e23a850
--- /dev/null
+++ b/python/BeautifulSoup4/README
@@ -0,0 +1,6 @@
+Beautiful Soup is a Python HTML/XML parser designed for quick
+turnaround projects like screen-scraping. It commonly saves
+programmers hours or days of work.
+
+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
new file mode 100644
index 0000000000..fda61011b6
--- /dev/null
+++ b/python/BeautifulSoup4/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------------------------------------------------------|
+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:
+BeautifulSoup4: Homepage: http://www.crummy.com/software/BeautifulSoup/
+BeautifulSoup4:
+BeautifulSoup4:
+BeautifulSoup4:
+BeautifulSoup4:
+BeautifulSoup4:
diff --git a/python/DVR-Scan/README b/python/DVR-Scan/README
index 6bbf670559..6666974693 100644
--- a/python/DVR-Scan/README
+++ b/python/DVR-Scan/README
@@ -12,4 +12,4 @@ For users wanting finer control over the output video encoding
 method, the default timecode format (HH:MM:SS.nnnn) is compatible
 with most popular video tools, so in most cases the motion events
 DVR-Scan finds can be simply copied and pasted into another tool
-of your choice (e.g. ffmpeg, avconv or the mkvtoolnix suite).
\ No newline at end of file
+of your choice (e.g. ffmpeg, avconv or the mkvtoolnix suite).
diff --git a/python/DVR-Scan/slack-desc b/python/DVR-Scan/slack-desc
index 391caf61f5..300fc51dab 100644
--- a/python/DVR-Scan/slack-desc
+++ b/python/DVR-Scan/slack-desc
@@ -5,7 +5,7 @@
 # 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------------------------------------------------------|
+        |-----handy-ruler------------------------------------------------------|
 DVR-Scan: DVR-Scan (Motion Events Detector)
 DVR-Scan:
 DVR-Scan: a cross-platform command-line (CLI) application that automatically
diff --git a/python/Flask-Babel/README b/python/Flask-Babel/README
index 9978b4568f..006178a0af 100644
--- a/python/Flask-Babel/README
+++ b/python/Flask-Babel/README
@@ -1,4 +1,4 @@
 Flask-Babel is an extension to Flask that adds i18n and l10n support
 to any Flask application with the help of babel, pytz and speaklater.
 It has builtin support for date formatting with timezone support as
-well as a very simple and friendly interface to gettext translations.
\ No newline at end of file
+well as a very simple and friendly interface to gettext translations.
diff --git a/python/Flask-HTMLmin/README b/python/Flask-HTMLmin/README
index b7f8322f6c..8818e16d48 100644
--- a/python/Flask-HTMLmin/README
+++ b/python/Flask-HTMLmin/README
@@ -2,4 +2,4 @@ Flask-HTMLmin
 
 Minimize rendered templates html
 
-minimize your flask rendered html
\ No newline at end of file
+minimize your flask rendered html
diff --git a/python/Flask-HTMLmin/slack-desc b/python/Flask-HTMLmin/slack-desc
index 5197eb9bdd..1911239a1a 100644
--- a/python/Flask-HTMLmin/slack-desc
+++ b/python/Flask-HTMLmin/slack-desc
@@ -16,4 +16,4 @@ Flask-HTMLmin:
 Flask-HTMLmin:
 Flask-HTMLmin:
 Flask-HTMLmin:
-Flask-HTMLmin:
\ No newline at end of file
+Flask-HTMLmin:
diff --git a/python/Flask-WTF/slack-desc b/python/Flask-WTF/slack-desc
index 8a186cc252..5263deac5a 100644
--- a/python/Flask-WTF/slack-desc
+++ b/python/Flask-WTF/slack-desc
@@ -16,4 +16,4 @@ Flask-WTF:
 Flask-WTF:
 Flask-WTF:
 Flask-WTF:
-Flask-WTF:
\ No newline at end of file
+Flask-WTF:
diff --git a/python/PyAudio/PyAudio.SlackBuild b/python/PyAudio/PyAudio.SlackBuild
index d7452373a4..e99a32eae4 100644
--- a/python/PyAudio/PyAudio.SlackBuild
+++ b/python/PyAudio/PyAudio.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Giuseppe Scalzi <giuseppe[at]osgate[dot]org>
 
 PRGNAM=PyAudio
-VERSION=${VERSION:-0.2.4}
+VERSION=${VERSION:-0.2.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/`echo $PRGNAM-$VERSION | tr "[:upper:]" "[:lower:]"`.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+#tar xvf $CWD/`echo $PRGNAM-$VERSION | tr "[:upper:]" "[:lower:]"`.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -53,6 +54,8 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 python setup.py install --root=$PKG
+#add python3 support
+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/PyAudio/PyAudio.info b/python/PyAudio/PyAudio.info
index 58adbcc1e5..f39ab2e820 100644
--- a/python/PyAudio/PyAudio.info
+++ b/python/PyAudio/PyAudio.info
@@ -1,10 +1,10 @@
 PRGNAM="PyAudio"
-VERSION="0.2.4"
+VERSION="0.2.11"
 HOMEPAGE="http://people.csail.mit.edu/hubert/pyaudio/"
-DOWNLOAD="http://people.csail.mit.edu/hubert/pyaudio/packages/pyaudio-0.2.4.tar.gz"
-MD5SUM="623809778f3d70254a25492bae63b575"
+DOWNLOAD="https://files.pythonhosted.org/packages/ab/42/b4f04721c5c5bfc196ce156b3c768998ef8c0ae3654ed29ea5020c749a6b/PyAudio-0.2.11.tar.gz"
+MD5SUM="7e4c88139284033f67b4336c74eda3b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="portaudio"
+REQUIRES="portaudio python3"
 MAINTAINER="Giuseppe Scalzi"
 EMAIL="giuseppe@osgate.org"
diff --git a/python/PyGreSQL/PyGreSQL.SlackBuild b/python/PyGreSQL/PyGreSQL.SlackBuild
index 2ccd164bcb..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.1.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 1c500ae1de..622e51a294 100644
--- a/python/PyGreSQL/PyGreSQL.info
+++ b/python/PyGreSQL/PyGreSQL.info
@@ -1,8 +1,8 @@
 PRGNAM="PyGreSQL"
-VERSION="5.1"
+VERSION="5.2.2"
 HOMEPAGE="http://www.pygresql.org"
-DOWNLOAD="https://github.com/PyGreSQL/PyGreSQL/archive/5.1.1/PyGreSQL-5.1.1.tar.gz"
-MD5SUM="7a173aff0055ee5ec9a522a22325e91f"
+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/PyXB/PyXB.SlackBuild b/python/PyXB/PyXB.SlackBuild
index 52b6a2bd37..4f30d33ba7 100644
--- a/python/PyXB/PyXB.SlackBuild
+++ b/python/PyXB/PyXB.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for PyXB
 
-# Copyright 2015 Per Dalén <per.dalen[at]gmail[dot]com>
+# Copyright 2015 Per Dalén <per.dalen[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/python/PyXB/README b/python/PyXB/README
index 869e756d7d..da9f63f1ab 100644
--- a/python/PyXB/README
+++ b/python/PyXB/README
@@ -1,5 +1,5 @@
-PyXB ("pixbee") is a pure Python package that generates Python source code
-for classes that correspond to data structures defined by XMLSchema.
-The generated classes support bi-directional conversion between XML documents
-and Python objects. In concept it is similar to JAXB for Java and CodeSynthesis
-XSD for C++.
+PyXB ("pixbee") is a pure Python package that generates Python
+source code for classes that correspond to data structures defined
+by XMLSchema.  The generated classes support bi-directional conversion
+between XML documents and Python objects. In concept it is similar to
+JAXB for Java and CodeSynthesis XSD for C++.
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 64c7cda0a4..0db6100174 100644
--- a/python/Pygments/Pygments.info
+++ b/python/Pygments/Pygments.info
@@ -1,8 +1,8 @@
 PRGNAM="Pygments"
-VERSION="2.5.2"
-HOMEPAGE="http://pygments.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-2.5.2.tar.gz"
-MD5SUM="465a35559863089d959d783a69f79b9f"
+VERSION="2.8.1"
+HOMEPAGE="https://pygments.org/"
+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/WTForms/README b/python/WTForms/README
index 278697b27f..3bba913889 100644
--- a/python/WTForms/README
+++ b/python/WTForms/README
@@ -1,2 +1,4 @@
-WTForms is a flexible forms validation and rendering library for python web
-development.
+WTForms is a flexible forms validation and rendering library for 
+python web development.
+
+python3 is autodetected at build time.
diff --git a/python/WTForms/WTForms.SlackBuild b/python/WTForms/WTForms.SlackBuild
index 680886f173..61895c199d 100644
--- a/python/WTForms/WTForms.SlackBuild
+++ b/python/WTForms/WTForms.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for WTForms
 
-# Copyright 2017 Nikos Giotis <nikos.giotis@gmail.com>
+# Copyright 2017-2020 Nikos Giotis <nikos.giotis@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=WTForms
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,11 +71,16 @@ find -L . \
 
 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 CHANGES.rst LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.rst LICENSE.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/python/WTForms/WTForms.info b/python/WTForms/WTForms.info
index 39a738175c..05d4c90faf 100644
--- a/python/WTForms/WTForms.info
+++ b/python/WTForms/WTForms.info
@@ -1,8 +1,8 @@
 PRGNAM="WTForms"
-VERSION="2.1"
+VERSION="2.3.1"
 HOMEPAGE="http://wtforms.simplecodes.com/"
-DOWNLOAD="https://pypi.python.org/packages/bf/91/2e553b86c55e9cf2f33265de50e052441fb753af46f5f20477fe9c61280e/WTForms-2.1.zip"
-MD5SUM="6938a541fafd1a1ae2f6b9b88588eef2"
+DOWNLOAD="https://files.pythonhosted.org/packages/68/7a/4ce1636e03a25585f3e1436179232a66c25e53ef17f01b4384d16ace6d61/WTForms-2.3.1.tar.gz"
+MD5SUM="bff06943e59671581af07f80d14bda5f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="babel"
diff --git a/python/Yapps2/README b/python/Yapps2/README
new file mode 100644
index 0000000000..89819232f2
--- /dev/null
+++ b/python/Yapps2/README
@@ -0,0 +1 @@
+Yet Another Python Parser System
diff --git a/python/Yapps2/Yapps2.SlackBuild b/python/Yapps2/Yapps2.SlackBuild
new file mode 100644
index 0000000000..38fb76733e
--- /dev/null
+++ b/python/Yapps2/Yapps2.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# Slackware build script for Yapps2
+
+# 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=Yapps2
+VERSION=${VERSION:-2.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}
+
+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
+
+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 PKG-INFO Yapps2.egg-info/SOURCES.txt Yapps2.egg-info/dependency_links.txt Yapps2.egg-info/entry_points.txt Yapps2.egg-info/top_level.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/python/Yapps2/Yapps2.info b/python/Yapps2/Yapps2.info
new file mode 100644
index 0000000000..728d186320
--- /dev/null
+++ b/python/Yapps2/Yapps2.info
@@ -0,0 +1,10 @@
+PRGNAM="Yapps2"
+VERSION="2.2.0"
+HOMEPAGE="https://pypi.org/project/Yapps2/"
+DOWNLOAD="https://files.pythonhosted.org/packages/7f/5d/f8b7dec89104f27d14b11711baf057194670ab220ebb8262f9bc1a450380/Yapps2-2.2.0.tar.gz"
+MD5SUM="900c08edf5f794e259f7469f493bc065"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/python/Yapps2/slack-desc b/python/Yapps2/slack-desc
new file mode 100644
index 0000000000..5740572045
--- /dev/null
+++ b/python/Yapps2/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------------------------------------------------------|
+Yapps2: Yapps2 (Yet Another Python Parser System)
+Yapps2:
+Yapps2: A Python module to parse
+Yapps2:
+Yapps2:
+Yapps2:
+Yapps2:
+Yapps2:
+Yapps2:
+Yapps2:
+Yapps2:
diff --git a/python/alabaster/alabaster.SlackBuild b/python/alabaster/alabaster.SlackBuild
index 14609215fc..51dc51a7a3 100644
--- a/python/alabaster/alabaster.SlackBuild
+++ b/python/alabaster/alabaster.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=alabaster
-VERSION=${VERSION:-0.7.10}
+VERSION=${VERSION:-0.7.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,7 +71,7 @@ find -L . \
 
 python setup.py install --root=$PKG
 
-if $(python3 -c 'import sys' 2>/dev/null); then
+if python3 -c 'import sys' 2>/dev/null; then
     python3 setup.py install --root=$PKG
 fi
 
diff --git a/python/alabaster/alabaster.info b/python/alabaster/alabaster.info
index fdede9d4bc..5541c21aef 100644
--- a/python/alabaster/alabaster.info
+++ b/python/alabaster/alabaster.info
@@ -1,8 +1,8 @@
 PRGNAM="alabaster"
-VERSION="0.7.10"
+VERSION="0.7.12"
 HOMEPAGE="https://alabaster.readthedocs.io/"
-DOWNLOAD="https://pypi.python.org/packages/d0/a5/e3a9ad3ee86aceeff71908ae562580643b955ea1b1d4f08ed6f7e8396bd7/alabaster-0.7.10.tar.gz"
-MD5SUM="7934dccf38801faa105f6e7b4784f493"
+DOWNLOAD="https://files.pythonhosted.org/packages/cc/b4/ed8dcb0d67d5cfb7f83c4d5463a7614cb1d078ad7ae890c9143edebbf072/alabaster-0.7.12.tar.gz"
+MD5SUM="3591827fde96d1dd23970fb05410ed04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/asttokens/README b/python/asttokens/README
index 73c840a6ff..409a44dc4e 100644
--- a/python/asttokens/README
+++ b/python/asttokens/README
@@ -1,12 +1,12 @@
-this module annotates Python abstact syntax trees (ASTs) with the positions
-of tokens and text in the source code that generated them
+this module annotates Python abstact syntax trees (ASTs) with the
+positions of tokens and text in the source code that generated them
 
-It makes it possible for tools that work with logical AST nodes to find the
-particular text that resulted in those nodes, for example for automated
-refactoring or highlighting.
+It makes it possible for tools that work with logical AST nodes to find
+the particular text that resulted in those nodes, for example for
+automated refactoring or highlighting.
 
 It works with Python2 and Python3 and can annotate both trees built by
 ast, and those built by astroid.
 
-This (source) is downloaded from pypi.org/projects/asttokens as the github
-site may not have a complete sourcecode zip.
+This (source) is downloaded from pypi.org/projects/asttokens as the
+github site may not have a complete sourcecode zip.
diff --git a/python/asttokens/asttokens.SlackBuild b/python/asttokens/asttokens.SlackBuild
index b6fc4691a6..77f17e5f4b 100644
--- a/python/asttokens/asttokens.SlackBuild
+++ b/python/asttokens/asttokens.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for asttokens
 
 # Written by Tim Dickson dickson.tim@googlemail.com
-# Copyright (c) 2019 Tim Dickson, Scotland
+# Copyright (c) 2019/2020 Tim Dickson, Scotland
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 # so use pypi.org/project/asttokens download source tar.gz instead.
 
 PRGNAM=asttokens
-VERSION=${VERSION:-2.0.3}
+VERSION=${VERSION:-2.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/asttokens/asttokens.info b/python/asttokens/asttokens.info
index 596b2e6e4f..c41a00872e 100644
--- a/python/asttokens/asttokens.info
+++ b/python/asttokens/asttokens.info
@@ -1,8 +1,8 @@
 PRGNAM="asttokens"
-VERSION="2.0.3"
+VERSION="2.0.4"
 HOMEPAGE="https://github.com/gristlabs/asttokens"
-DOWNLOAD="https://files.pythonhosted.org/packages/bd/37/1f5ef752e221e5cf25e0c5ecdfd11327717d790a5dc4a2ca18ed1c645435/asttokens-2.0.3.tar.gz"
-MD5SUM="8a9211d70cb5630207b74c1e40b2134d"
+DOWNLOAD="https://files.pythonhosted.org/packages/1d/d2/cf56e804cd7b4e8b92813e943a815f96b0d2545c967927356783b6860a2e/asttokens-2.0.4.tar.gz"
+MD5SUM="3e90edd0656e9d86daf7a7909e583a3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
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/async_generator/slack-desc b/python/async_generator/slack-desc
new file mode 100644
index 0000000000..6392c33396
--- /dev/null
+++ b/python/async_generator/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------------------------------------------------------|
+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 153b1103b2..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.3}
+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 fd9953c8d5..db8204f141 100644
--- a/python/bleach/bleach.info
+++ b/python/bleach/bleach.info
@@ -1,10 +1,10 @@
 PRGNAM="bleach"
-VERSION="3.1.3"
+VERSION="3.3.0"
 HOMEPAGE="https://github.com/mozilla/bleach"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/b/bleach/bleach-3.1.3.tar.gz"
-MD5SUM="5aac028146ac356c626feafd1f1539a4"
+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 python3-six six"
+REQUIRES="python-webencodings packaging python3-packaging"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/captcha/README b/python/captcha/README
new file mode 100644
index 0000000000..6ec7825e92
--- /dev/null
+++ b/python/captcha/README
@@ -0,0 +1,3 @@
+A captcha library that generates audio and image CAPTCHAs.
+
+Optional dependency: python3 (automatically detected)
diff --git a/python/captcha/captcha.SlackBuild b/python/captcha/captcha.SlackBuild
new file mode 100644
index 0000000000..41863869df
--- /dev/null
+++ b/python/captcha/captcha.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for captcha
+
+# Copyright 2020 Nikos Giotis <nikos.giotis@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=captcha
+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 $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 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/captcha/captcha.info b/python/captcha/captcha.info
new file mode 100644
index 0000000000..a4ce6aebff
--- /dev/null
+++ b/python/captcha/captcha.info
@@ -0,0 +1,10 @@
+PRGNAM="captcha"
+VERSION="0.3"
+HOMEPAGE="http://wtforms.simplecodes.com/"
+DOWNLOAD="https://files.pythonhosted.org/packages/83/c6/c808f4970010b16a8656ead0b4b80268ef2765e3fc25509cf162447c3e2e/captcha-0.3.tar.gz"
+MD5SUM="31543642970510d92c34ecf2c74f3ee9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Nikos Giotis"
+EMAIL="nikos.giotis@gmail.com"
diff --git a/python/captcha/slack-desc b/python/captcha/slack-desc
new file mode 100644
index 0000000000..3d41dd20af
--- /dev/null
+++ b/python/captcha/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------------------------------------------------------|
+captcha: captcha (A captcha python library)
+captcha:
+captcha: A captcha library that generates audio and image CAPTCHAs.
+captcha:
+captcha: https://github.com/lepture/captcha
+captcha:
+captcha:
+captcha:
+captcha:
+captcha:
+captcha:
diff --git a/python/cheetah3/README b/python/cheetah3/README
new file mode 100644
index 0000000000..89f26c4e38
--- /dev/null
+++ b/python/cheetah3/README
@@ -0,0 +1,9 @@
+Cheetah3 is a free and open source template engine and code-
+generation tool written in Python. Cheetah can be used unto itself,
+or incorporated with other technologies and stacks regardless of
+whether they’re written in Python or not.
+
+At its core, Cheetah is a domain-specific language for markup 
+generation and templating which allows for full integration with 
+existing Python code but also offers extensions to traditional 
+Python syntax to allow for easier text-generation.
diff --git a/python/cheetah3/cheetah3.SlackBuild b/python/cheetah3/cheetah3.SlackBuild
new file mode 100644
index 0000000000..045e0e4826
--- /dev/null
+++ b/python/cheetah3/cheetah3.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for python-cheetah3
+
+# Copyright 2020 Henry Pfeil (hpfeil@psnarf.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="cheetah3"
+VERSION=${VERSION:-3.2.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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+/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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ LICENSE TODO README.rst ANNOUNCE.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/cheetah3/cheetah3.info b/python/cheetah3/cheetah3.info
new file mode 100644
index 0000000000..87dbcbd122
--- /dev/null
+++ b/python/cheetah3/cheetah3.info
@@ -0,0 +1,10 @@
+PRGNAM="cheetah3"
+VERSION="3.2.6"
+HOMEPAGE="https://www.cheetahtemplate.org/"
+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"
+MAINTAINER="Henry Pfeil"
+EMAIL="hpfeil@psnarf.org"
diff --git a/python/cheetah3/slack-desc b/python/cheetah3/slack-desc
new file mode 100644
index 0000000000..f37d35ce21
--- /dev/null
+++ b/python/cheetah3/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------------------------------------------------------|
+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,
+cheetah3: or incorporated with other technologies and stacks regardless of
+cheetah3: whether they’re written in Python or not.
+cheetah3:
+cheetah3: Homepage: http://www.cheetahtemplate.org/
+cheetah3:
+cheetah3:
+cheetah3:
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/contextlib2/README b/python/contextlib2/README
new file mode 100644
index 0000000000..290f12e994
--- /dev/null
+++ b/python/contextlib2/README
@@ -0,0 +1,15 @@
+contextlib2 is a backport of the standard library’s contextlib module to
+earlier Python versions.
+
+It also serves as a real world proving ground for possible future
+enhancements to the standard library version.
+
+Development
+
+contextlib2 has no runtime dependencies, but requires unittest2 for
+testing on Python 2.x, as well as setuptools and wheel to generate
+universal wheel archives.
+
+Local testing is just a matter of running python test_contextlib2.py.
+
+Python3 is an optional dependency.
diff --git a/python/contextlib2/contextlib2.SlackBuild b/python/contextlib2/contextlib2.SlackBuild
new file mode 100644
index 0000000000..1980b0d9f8
--- /dev/null
+++ b/python/contextlib2/contextlib2.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for contextlib2
+
+# 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=contextlib2
+VERSION=${VERSION:-0.6.0.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 $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 {} \;
+
+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/python/contextlib2/contextlib2.info b/python/contextlib2/contextlib2.info
new file mode 100644
index 0000000000..d19a47613e
--- /dev/null
+++ b/python/contextlib2/contextlib2.info
@@ -0,0 +1,10 @@
+PRGNAM="contextlib2"
+VERSION="0.6.0.post1"
+HOMEPAGE="https://pypi.org/project/contextlib2/"
+DOWNLOAD="https://files.pythonhosted.org/packages/02/54/669207eb72e3d8ae8b38aa1f0703ee87a0e9f88f30d3c0a47bebdb6de242/contextlib2-0.6.0.post1.tar.gz"
+MD5SUM="d634281c2e61e575d8a68b9c56f8303a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alan Aversa"
+EMAIL="alan_avNOersa@lSPAMavabit.com"
diff --git a/python/contextlib2/slack-desc b/python/contextlib2/slack-desc
new file mode 100644
index 0000000000..9e729149c6
--- /dev/null
+++ b/python/contextlib2/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------------------------------------------------------|
+contextlib2: contextlib2 (Updated utilities for context management)
+contextlib2:
+contextlib2: This module provides backports of features in the latest version of
+contextlib2: the standard library’s contextlib module to earlier Python versions.
+contextlib2: It also serves as a real world proving ground for potential future
+contextlib2: enhancements to that module.
+contextlib2:
+contextlib2: Like contextlib, this module provides utilities for common tasks
+contextlib2: involving the with statement.
+contextlib2:
+contextlib2: https://contextlib2.readthedocs.io
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/django-sass/README b/python/django-sass/README
new file mode 100644
index 0000000000..389d7a7bc3
--- /dev/null
+++ b/python/django-sass/README
@@ -0,0 +1,2 @@
+The absolute simplest way to use Sass with Django. Pure Python, minimal
+dependencies, and no special configuration required!
diff --git a/python/django-sass/django-sass.SlackBuild b/python/django-sass/django-sass.SlackBuild
new file mode 100644
index 0000000000..ec1bb9a0b1
--- /dev/null
+++ b/python/django-sass/django-sass.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# SlackBuild build script for django-sass
+
+# 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=django-sass
+SRCPKG=${SRCPKG-django-sass}
+VERSION=${VERSION:-1.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 {} \;
+
+# 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/django-sass/django-sass.info b/python/django-sass/django-sass.info
new file mode 100644
index 0000000000..dfd300e921
--- /dev/null
+++ b/python/django-sass/django-sass.info
@@ -0,0 +1,10 @@
+PRGNAM="django-sass"
+VERSION="1.0.0"
+HOMEPAGE="https://pypi.org/project/django-sass/"
+DOWNLOAD="https://files.pythonhosted.org/packages/34/9a/6f7c32dcf62cbbd62c0a02f165c062b60932a33dc62b0ddb773f83d90585/django-sass-1.0.0.tar.gz"
+MD5SUM="6c2f01c0581b0a6e640a3a6d3380d353"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-django libsass"
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/django-sass/slack-desc b/python/django-sass/slack-desc
new file mode 100644
index 0000000000..6346e92542
--- /dev/null
+++ b/python/django-sass/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------------------------------------------------------|
+django-sass: django-sass (simplest way to use Sass with Django)
+django-sass:
+django-sass: The absolute simplest way to use Sass with Django. Pure Python,
+django-sass: minimal dependencies, and no special configuration required.
+django-sass:
+django-sass: Python-3.+ Only !
+django-sass:
+django-sass: Homepage: https://pypi.org/project/django-sass/
+django-sass:
+django-sass:
+django-sass:
diff --git a/python/esptool/README b/python/esptool/README
index dc213ef57f..f85b25c7f0 100644
--- a/python/esptool/README
+++ b/python/esptool/README
@@ -1,5 +1,5 @@
-A Python-based, open source, platform independent, utility to communicate
-with the ROM bootloader in Espressif ESP8266 & ESP32 chips.
+A Python-based, open source, platform independent, utility to
+communicate with the ROM bootloader in Espressif ESP8266 & ESP32 chips.
 
 esptool.py was started by Fredrik Ahlberg (@themadinventor) as an
 unofficial community project. It is now also supported by Espressif.
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/et_xmlfile/README b/python/et_xmlfile/README
new file mode 100644
index 0000000000..e1ed39ab38
--- /dev/null
+++ b/python/et_xmlfile/README
@@ -0,0 +1,3 @@
+et_xmlfile is a low memory library for creating large XML files.
+
+This SlackBuild builds the python2 and python3 modules.
diff --git a/python/et_xmlfile/et_xmlfile.SlackBuild b/python/et_xmlfile/et_xmlfile.SlackBuild
new file mode 100644
index 0000000000..ce9000972a
--- /dev/null
+++ b/python/et_xmlfile/et_xmlfile.SlackBuild
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Slackware build script for et_xmlfile
+
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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=et_xmlfile
+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
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$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/$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 and Python 3 support
+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 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/et_xmlfile/et_xmlfile.info b/python/et_xmlfile/et_xmlfile.info
new file mode 100644
index 0000000000..1211f171af
--- /dev/null
+++ b/python/et_xmlfile/et_xmlfile.info
@@ -0,0 +1,10 @@
+PRGNAM="et_xmlfile"
+VERSION="1.0.1"
+HOMEPAGE="https://et-xmlfile.readthedocs.io/en/latest/"
+DOWNLOAD="https://pypi.python.org/packages/source/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz"
+MD5SUM="f47940fd9d556375420b2e276476cfaf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="lxml"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/et_xmlfile/slack-desc b/python/et_xmlfile/slack-desc
new file mode 100644
index 0000000000..d0f9146a03
--- /dev/null
+++ b/python/et_xmlfile/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------------------------------------------------------|
+et_xmlfile: et_xmlfile (python library to create large XML files)
+et_xmlfile:
+et_xmlfile: et_xmlfile is a low memory library for creating large XML files.
+et_xmlfile:
+et_xmlfile:
+et_xmlfile:
+et_xmlfile:
+et_xmlfile:
+et_xmlfile:
+et_xmlfile:
+et_xmlfile:
diff --git a/python/fixtures/README b/python/fixtures/README
index f2be43458a..a4e946ede3 100644
--- a/python/fixtures/README
+++ b/python/fixtures/README
@@ -1,11 +1,12 @@
 Fixtures, reusable state for writing clean tests and more.
 
-Fixtures defines a Python contract for reusable state / support logic,
-primarily for unit testing. Helper and adaption logic is included to make
-it easy to write your own fixtures using the fixtures contract. Glue code
-is provided that makes using fixtures that meet the Fixtures contract in
-unittest compatible test cases easy and straight forward.
+Fixtures defines a Python contract for reusable state / support
+logic, primarily for unit testing. Helper and adaption logic is
+included to make it easy to write your own fixtures using the fixtures
+contract. Glue code is provided that makes using fixtures that meet
+the Fixtures contract in unittest compatible test cases easy and
+straight forward.
 
-Note:
-There is a cyclic dependency between testtools package and fixtures package.
-Since these are python libraries, one has to just install both of them.
+Note: There is a cyclic dependency between the testtools package and
+the fixtures package.  Since these are python libraries, one has to
+just install both of them.
diff --git a/python/fixtures/slack-desc b/python/fixtures/slack-desc
index 05fa24ae8d..83e14e549c 100644
--- a/python/fixtures/slack-desc
+++ b/python/fixtures/slack-desc
@@ -16,4 +16,4 @@ fixtures: that meet the Fixtures contract in unittest compatible test cases
 fixtures: easy and straight forward.
 fixtures:
 fixtures: https://launchpad.net/python-fixtures
-fixtures:
\ No newline at end of file
+fixtures:
diff --git a/python/google-images-download/README b/python/google-images-download/README
new file mode 100644
index 0000000000..5c1af96538
--- /dev/null
+++ b/python/google-images-download/README
@@ -0,0 +1,18 @@
+Summary
+
+This is a command line python program to search keywords/key-phrases on
+Google Images and optionally download images to your computer. You can
+also invoke this script from another python file.
+
+This is a small and ready-to-run program. No dependencies are required
+to be installed if you would only want to download up to 100 images per
+keyword. If you would want more than 100 images per keyword, then you
+would need to install Selenium library along with chromedriver. Detailed
+instructions in the troubleshooting section.
+
+Compatibility
+
+This program is compatible with both the versions of python - 2.x and
+3.x (recommended). It is a download-and-run program with no changes to
+the file. You will just have to specify parameters through the command
+line.
diff --git a/python/google-images-download/google-images-download.SlackBuild b/python/google-images-download/google-images-download.SlackBuild
new file mode 100644
index 0000000000..4dbade8ed5
--- /dev/null
+++ b/python/google-images-download/google-images-download.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for google-images-download
+
+# 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=google-images-download
+VERSION=${VERSION:-620e7f5}
+FULLHASH=${FULLHASH:-620e7f54ea29631e5e7d8a2b82a16a40932bf42a}
+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
+mv $PRGNAM-$FULLHASH $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 {} \;
+
+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/python/google-images-download/google-images-download.info b/python/google-images-download/google-images-download.info
new file mode 100644
index 0000000000..36573cc86d
--- /dev/null
+++ b/python/google-images-download/google-images-download.info
@@ -0,0 +1,10 @@
+PRGNAM="google-images-download"
+VERSION="620e7f5"
+HOMEPAGE="https://github.com/hardikvasa/google-images-download"
+DOWNLOAD="https://github.com/Joeclinton1/google-images-download/archive/620e7f5/google-images-download-620e7f5.zip"
+MD5SUM="caaf076f33f1de7efa394927ced8259b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alan Aversa"
+EMAIL="alan.aveNOrsaSP@AMcox.net (remove NO and SPAM)"
diff --git a/python/google-images-download/slack-desc b/python/google-images-download/slack-desc
new file mode 100644
index 0000000000..c900f5d136
--- /dev/null
+++ b/python/google-images-download/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------------------------------------------------------|
+google-images-download: google-images-download (Python script for Google Images downloading)
+google-images-download:
+google-images-download: This program lets you download tons of images from Google.
+google-images-download:
+google-images-download: Homepage: https://github.com/hardikvasa/google-images-download
+google-images-download:
+google-images-download: Documentation: https://google-images-download.readthedocs.io
+google-images-download:
+google-images-download:
+google-images-download:
+google-images-download:
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/html2text/html2text.info b/python/html2text/html2text.info
index 4b8ae30bf8..b7ae302e54 100644
--- a/python/html2text/html2text.info
+++ b/python/html2text/html2text.info
@@ -1,8 +1,8 @@
 PRGNAM="html2text"
 VERSION="2020.1.16"
 HOMEPAGE="https://github.com/Alir3z4/html2text"
-DOWNLOAD="https://pypi.python.org/packages/source/h/html2text/html2text-2020.1.16.tar.gz"
-MD5SUM="c77b580c94d1a9e0145f23cc4472993d"
+DOWNLOAD="https://github.com/Alir3z4/html2text/archive/2020.1.16/html2text-2020.1.16.tar.gz"
+MD5SUM="1581148a70b6963216c2a3deaa3c3870"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/htmlmin/README b/python/htmlmin/README
index 30551b5ab6..84193411a9 100644
--- a/python/htmlmin/README
+++ b/python/htmlmin/README
@@ -1 +1 @@
-A configurable HTML Minifier with safety features.
\ No newline at end of file
+A configurable HTML Minifier with safety features.
diff --git a/python/htmlmin/slack-desc b/python/htmlmin/slack-desc
index 5c26c6b90c..255b5c9d2b 100644
--- a/python/htmlmin/slack-desc
+++ b/python/htmlmin/slack-desc
@@ -16,4 +16,4 @@ htmlmin:
 htmlmin:
 htmlmin:
 htmlmin:
-htmlmin:
\ No newline at end of file
+htmlmin:
diff --git a/python/imagesize/imagesize.SlackBuild b/python/imagesize/imagesize.SlackBuild
index 4b9a50d00f..57002d5bb6 100644
--- a/python/imagesize/imagesize.SlackBuild
+++ b/python/imagesize/imagesize.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for imagesize
 
-# Copyright 2017,2018 Nikos Giotis <nikos.giotis@gmail.com>, Athens, GR
+# Copyright 2017-2020 Nikos Giotis <nikos.giotis@gmail.com>, Athens, GR
 # 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=imagesize
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -71,7 +71,7 @@ find -L . \
 
 python setup.py install --root=$PKG
 
-if $(python3 -c 'import sys' 2>/dev/null); then
+if python3 -c 'import sys' 2>/dev/null; then
     python3 setup.py install --root=$PKG
 fi
 
diff --git a/python/imagesize/imagesize.info b/python/imagesize/imagesize.info
index 94712cc75e..0b67e6b779 100644
--- a/python/imagesize/imagesize.info
+++ b/python/imagesize/imagesize.info
@@ -1,8 +1,8 @@
 PRGNAM="imagesize"
-VERSION="0.7.1"
+VERSION="1.2.0"
 HOMEPAGE="https://github.com/shibukawa/imagesize_py"
-DOWNLOAD="https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/imagesize-0.7.1.tar.gz"
-MD5SUM="976148283286a6ba5f69b0f81aef8052"
+DOWNLOAD="https://files.pythonhosted.org/packages/e4/9f/0452b459c8ba97e07c3cd2bd243783936a992006cf4cd1353c314a927028/imagesize-1.2.0.tar.gz"
+MD5SUM="3a1e124594183778a8f87e4bcdb6dca9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/README b/python/internetarchive/README
new file mode 100644
index 0000000000..78612e6aa9
--- /dev/null
+++ b/python/internetarchive/README
@@ -0,0 +1,17 @@
+A Python and Command-Line Interface to Archive.org
+
+This package installs a command-line tool named ia for using Archive.org
+from the command-line. It also installs the internetarchive Python
+module for programatic access to archive.org. Please report all bugs and
+issues on Github.
+
+Documentation
+
+Documentation is available at
+https://archive.org/services/docs/api/internetarchive.
+
+Contributing
+
+All contributions are welcome and appreciated. Please see
+https://archive.org/services/docs/api/internetarchive/contributing.html
+for more details.
diff --git a/python/internetarchive/internetarchive.SlackBuild b/python/internetarchive/internetarchive.SlackBuild
new file mode 100644
index 0000000000..d6d19e913b
--- /dev/null
+++ b/python/internetarchive/internetarchive.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for internetarchive
+
+# 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=internetarchive
+VERSION=${VERSION:-2.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 {} \;
+
+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/python/internetarchive/internetarchive.info b/python/internetarchive/internetarchive.info
new file mode 100644
index 0000000000..4571deb719
--- /dev/null
+++ b/python/internetarchive/internetarchive.info
@@ -0,0 +1,10 @@
+PRGNAM="internetarchive"
+VERSION="2.0.1"
+HOMEPAGE="https://github.com/jjjake/internetarchive"
+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"
+MAINTAINER="Alan Aversa"
+EMAIL="alan_avNOersa@lSPAMavabit.com"
diff --git a/python/internetarchive/slack-desc b/python/internetarchive/slack-desc
new file mode 100644
index 0000000000..9423c88d9a
--- /dev/null
+++ b/python/internetarchive/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------------------------------------------------------|
+internetarchive: internetarchive (Python and command-Line interface to Archive.org)
+internetarchive:
+internetarchive: This package installs a command-line tool named ia for using
+internetarchive: Archive.org from the command-line. It also installs the
+internetarchive: internetarchive Python module for programatic access to archive.org.
+internetarchive:
+internetarchive: Please report all bugs and issues on Github:
+internetarchive: https://github.com/jjjake/internetarchive/issues
+internetarchive:
+internetarchive: Documentation is available at
+internetarchive: https://archive.org/services/docs/api/internetarchive
diff --git a/python/jaraco-packaging/README b/python/jaraco-packaging/README
new file mode 100644
index 0000000000..c2ce83bc3c
--- /dev/null
+++ b/python/jaraco-packaging/README
@@ -0,0 +1,11 @@
+Tools for packaging(dependency_tree).
+
+A distutils command for reporting the dependency tree as resolved by
+setuptools.  Use after installing a package.
+
+A distutils command for reporting the attributes of a distribution,
+such as the version or author name.
+
+Attributes may be specified as comma-separated or space-separated
+keys.  Results are printed using subprocess.list2cmdline so may be
+parsed using shlex.split.  By default, name and version are printed.
diff --git a/python/jaraco-packaging/jaraco-packaging.SlackBuild b/python/jaraco-packaging/jaraco-packaging.SlackBuild
new file mode 100644
index 0000000000..99cca02dc7
--- /dev/null
+++ b/python/jaraco-packaging/jaraco-packaging.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# SlackBuild build script for jaraco.packaging
+
+# 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=jaraco-packaging
+SRCPKG=${SRCPKG-jaraco.packaging}
+VERSION=${VERSION:-8.1.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.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 setup.py install --root=$PKG
+
+# 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 CHANGES.rst 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/jaraco-packaging/jaraco-packaging.info b/python/jaraco-packaging/jaraco-packaging.info
new file mode 100644
index 0000000000..26ff55d0c3
--- /dev/null
+++ b/python/jaraco-packaging/jaraco-packaging.info
@@ -0,0 +1,10 @@
+PRGNAM="jaraco-packaging"
+VERSION="8.1.0"
+HOMEPAGE="https://pypi.org/project/jaraco.packaging/"
+DOWNLOAD="https://files.pythonhosted.org/packages/4f/4a/26b1b91079e189ec4e8bb151a0f500607265e9b2e6e1fc0b3e8105dee95e/jaraco.packaging-8.1.0.tar.gz"
+MD5SUM="e255f3d73c0eb676826b8a35256852c5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/jaraco-packaging/slack-desc b/python/jaraco-packaging/slack-desc
new file mode 100644
index 0000000000..a699997f9a
--- /dev/null
+++ b/python/jaraco-packaging/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------------------------------------------------------|
+jaraco-packaging: jaraco-packaging (Tools for packaging)
+jaraco-packaging:
+jaraco-packaging: A distutils command for reporting the dependency tree as resolved by
+jaraco-packaging: setuptools. Use after installing a package.
+jaraco-packaging:
+jaraco-packaging: A distutils command for reporting the attributes of a distribution,
+jaraco-packaging: such as the version or author name.
+jaraco-packaging:
+jaraco-packaging:
+jaraco-packaging: Homepage: https://pypi.org/project/jaraco-packaging/
+jaraco-packaging:
diff --git a/python/jdcal/README b/python/jdcal/README
new file mode 100644
index 0000000000..440d7d135e
--- /dev/null
+++ b/python/jdcal/README
@@ -0,0 +1,4 @@
+jdcal contains functions for converting between Julian dates and 
+calendar dates.
+
+This SlackBuild builds the python2 and python3 modules.
diff --git a/python/jdcal/jdcal.SlackBuild b/python/jdcal/jdcal.SlackBuild
new file mode 100644
index 0000000000..51c3c19afc
--- /dev/null
+++ b/python/jdcal/jdcal.SlackBuild
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Slackware build script for jdcal
+
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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=jdcal
+VERSION=${VERSION:-1.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
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$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/$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 and Python 3 support
+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 CHANGELOG.txt LICENSE.txt 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/jdcal/jdcal.info b/python/jdcal/jdcal.info
new file mode 100644
index 0000000000..a8596ac69e
--- /dev/null
+++ b/python/jdcal/jdcal.info
@@ -0,0 +1,10 @@
+PRGNAM="jdcal"
+VERSION="1.4.1"
+HOMEPAGE="https://github.com/phn/jdcal"
+DOWNLOAD="https://github.com/phn/jdcal/archive/v1.4.1/jdcal-1.4.1.tar.gz"
+MD5SUM="de6b2f33d60a9e9174b67d7883713357"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="lxml"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/jdcal/slack-desc b/python/jdcal/slack-desc
new file mode 100644
index 0000000000..e015cc3062
--- /dev/null
+++ b/python/jdcal/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------------------------------------------------------|
+jdcal: jdcal (python module to convert dates)
+jdcal:
+jdcal: jdcal contains functions for converting between Julian dates and
+jdcal: calendar dates.
+jdcal:
+jdcal:
+jdcal:
+jdcal:
+jdcal:
+jdcal:
+jdcal:
diff --git a/python/jmespath/jmespath.SlackBuild b/python/jmespath/jmespath.SlackBuild
index 435cbadb22..fbf9a82777 100644
--- a/python/jmespath/jmespath.SlackBuild
+++ b/python/jmespath/jmespath.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jmespath
 
-# Copyright 2014-2017  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=jmespath
-VERSION=${VERSION:-0.9.3}
+VERSION=${VERSION:-0.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,6 +71,11 @@ find -L . \
 
 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
 
diff --git a/python/jmespath/jmespath.info b/python/jmespath/jmespath.info
index 53611f1ee6..e3b179d02e 100644
--- a/python/jmespath/jmespath.info
+++ b/python/jmespath/jmespath.info
@@ -1,8 +1,8 @@
 PRGNAM="jmespath"
-VERSION="0.9.3"
+VERSION="0.10.0"
 HOMEPAGE="https://github.com/boto/jmespath"
-DOWNLOAD="https://pypi.python.org/packages/e5/21/795b7549397735e911b032f255cff5fb0de58f96da794274660bca4f58ef/jmespath-0.9.3.tar.gz"
-MD5SUM="37a906c06de62bed25ec5cf99cee04a6"
+DOWNLOAD="https://files.pythonhosted.org/packages/3c/56/3f325b1eef9791759784aa5046a8f6a1aff8f7c898a2e34506771d3b99d8/jmespath-0.10.0.tar.gz"
+MD5SUM="65bdcb5fa5bcf1cc710ffa508e78e408"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/josepy/josepy.SlackBuild b/python/josepy/josepy.SlackBuild
index 52f86f6ac6..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.3.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 23c7ac3960..cc054803a0 100644
--- a/python/josepy/josepy.info
+++ b/python/josepy/josepy.info
@@ -1,8 +1,8 @@
 PRGNAM="josepy"
-VERSION="1.3.0"
+VERSION="1.8.0"
 HOMEPAGE="https://github.com/certbot/josepy"
-DOWNLOAD="https://files.pythonhosted.org/packages/92/4a/145b0c6d0984698ccb4debc0161e3f74d8db645ddd9573cacc2abbc22d55/josepy-1.3.0.tar.gz"
-MD5SUM="2da6c65dcdfc2e214bbd76387f836e6b"
+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/jsonpatch/README b/python/jsonpatch/README
new file mode 100644
index 0000000000..3abd7d36b2
--- /dev/null
+++ b/python/jsonpatch/README
@@ -0,0 +1,21 @@
+Applying JSON Patches in Python
+
+Library to apply JSON Patches according to RFC 6902
+
+See source code for examples
+
+    Website: https://github.com/stefankoegl/python-json-patch
+    Repository: https://github.com/stefankoegl/python-json-patch.git
+    Documentation: https://python-json-patch.readthedocs.org/
+    PyPI: https://pypi.python.org/pypi/jsonpatch
+    Travis CI: https://travis-ci.org/stefankoegl/python-json-patch
+    Coveralls: https://coveralls.io/r/stefankoegl/python-json-patch
+
+Running external tests
+
+To run external tests (such as those from
+https://github.com/json-patch/json-patch-tests) use ext_test.py
+
+./ext_tests.py ../json-patch-tests/tests.json
+
+Optional: python3
diff --git a/python/jsonpatch/jsonpatch.SlackBuild b/python/jsonpatch/jsonpatch.SlackBuild
new file mode 100644
index 0000000000..afb6202b0d
--- /dev/null
+++ b/python/jsonpatch/jsonpatch.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for jsonpatch
+
+# 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=jsonpatch
+VERSION=${VERSION:-1.25}
+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 {} \;
+
+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/python/jsonpatch/jsonpatch.info b/python/jsonpatch/jsonpatch.info
new file mode 100644
index 0000000000..834c362519
--- /dev/null
+++ b/python/jsonpatch/jsonpatch.info
@@ -0,0 +1,10 @@
+PRGNAM="jsonpatch"
+VERSION="1.25"
+HOMEPAGE="https://pypi.org/project/jsonpatch/"
+DOWNLOAD="https://files.pythonhosted.org/packages/70/9f/6f0bfbb4cc1401ce994d336bcb4ed2aa924f395e7fd1926511c04a52eee1/jsonpatch-1.25.tar.gz"
+MD5SUM="fcc546892414bef2f7f89f0e2a618a9e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jsonpointer"
+MAINTAINER="Alan Aversa"
+EMAIL="alan_avNOersa@lSPAMavabit.com"
diff --git a/python/jsonpatch/slack-desc b/python/jsonpatch/slack-desc
new file mode 100644
index 0000000000..6c46b4f613
--- /dev/null
+++ b/python/jsonpatch/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------------------------------------------------------|
+jsonpatch: jsonpatch (Library to apply JSON Patches according to RFC 6902)
+jsonpatch:
+jsonpatch: https://pypi.org/project/jsonpatch/
+jsonpatch:
+jsonpatch:
+jsonpatch:
+jsonpatch:
+jsonpatch:
+jsonpatch:
+jsonpatch:
+jsonpatch:
diff --git a/python/jsonpointer/README b/python/jsonpointer/README
new file mode 100644
index 0000000000..a760164082
--- /dev/null
+++ b/python/jsonpointer/README
@@ -0,0 +1,5 @@
+Applying JSON Patches in Python
+
+Library to apply JSON Patches according to RFC 6902
+
+python3 is an optional dependency.
diff --git a/python/jsonpointer/jsonpointer.SlackBuild b/python/jsonpointer/jsonpointer.SlackBuild
new file mode 100644
index 0000000000..e43f886778
--- /dev/null
+++ b/python/jsonpointer/jsonpointer.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for jsonpointer
+
+# 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=jsonpointer
+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 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 $(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/python/jsonpointer/jsonpointer.info b/python/jsonpointer/jsonpointer.info
new file mode 100644
index 0000000000..af53a5b77c
--- /dev/null
+++ b/python/jsonpointer/jsonpointer.info
@@ -0,0 +1,10 @@
+PRGNAM="jsonpointer"
+VERSION="2.0"
+HOMEPAGE="https://pypi.org/project/jsonpointer/"
+DOWNLOAD="https://files.pythonhosted.org/packages/52/e7/246d9ef2366d430f0ce7bdc494ea2df8b49d7a2a41ba51f5655f68cfe85f/jsonpointer-2.0.tar.gz"
+MD5SUM="741b98d0e693b08b5e44e0a9da5a7bb7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alan Aversa"
+EMAIL="alan_avNOersa@lSPAMavabit.com"
diff --git a/python/jsonpointer/slack-desc b/python/jsonpointer/slack-desc
new file mode 100644
index 0000000000..2ff1fd75b3
--- /dev/null
+++ b/python/jsonpointer/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------------------------------------------------------|
+jsonpointer: jsonpointer (Library to resolve JSON Pointers according to RFC 6901)
+jsonpointer:
+jsonpointer: https://pypi.org/project/jsonpointer/
+jsonpointer:
+jsonpointer:
+jsonpointer:
+jsonpointer:
+jsonpointer:
+jsonpointer:
+jsonpointer:
+jsonpointer:
diff --git a/python/linecache2/README b/python/linecache2/README
index 19971a53ec..de2028b8bc 100644
--- a/python/linecache2/README
+++ b/python/linecache2/README
@@ -1 +1 @@
-A backport of linecache to older supported Pythons.
\ No newline at end of file
+A backport of linecache to older supported Pythons.
diff --git a/python/linecache2/slack-desc b/python/linecache2/slack-desc
index a3153e8c79..841e46cc47 100644
--- a/python/linecache2/slack-desc
+++ b/python/linecache2/slack-desc
@@ -16,4 +16,4 @@ linecache2:
 linecache2:
 linecache2:
 linecache2:
-linecache2:
\ No newline at end of file
+linecache2:
diff --git a/python/lockfile/README b/python/lockfile/README
index 118cb27957..c62d336e61 100644
--- a/python/lockfile/README
+++ b/python/lockfile/README
@@ -10,4 +10,4 @@ This package is version 0.8 due to some API breakage in 0.9+
 To build for Python 3:
 
     # PYTHON=python3 ./lockfile.SlackBuild
-    
\ No newline at end of file
+    
diff --git a/python/mypy/README b/python/mypy/README
index 623a5bf24d..fc2ac581d9 100644
--- a/python/mypy/README
+++ b/python/mypy/README
@@ -1,9 +1,11 @@
-Mypy is an optional static type checker for Python. You can add type hints
-(PEP 484) to your Python programs, and use mypy to type check them
-statically. Find bugs in your programs without even running them!
+Mypy is an optional static type checker for Python. You can add type
+hints (PEP 484) to your Python programs, and use mypy to type check
+them statically. Find bugs in your programs without even running them!
 
 You can mix dynamic and static typing in your programs. You can always
 fall back to dynamic typing when static typing is not convenient, such
 as for legacy code.
-This (source) is downloaded from pypi.org/projects/mypy as the mypi github
-site does not have a complete sourcecode zip.
+This (source) is downloaded from pypi.org/projects/mypy as the mypi
+github site does not have a complete sourcecode zip.
+
+This requires typing-extensions created with python3 present.
diff --git a/python/mypy/mypy.SlackBuild b/python/mypy/mypy.SlackBuild
index 9645f7494e..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.770}
+VERSION=${VERSION:-0.812}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/mypy/mypy.info b/python/mypy/mypy.info
index cf6f2f5ae1..685f64fc5f 100644
--- a/python/mypy/mypy.info
+++ b/python/mypy/mypy.info
@@ -1,10 +1,10 @@
 PRGNAM="mypy"
-VERSION="0.770"
+VERSION="0.812"
 HOMEPAGE="https://github.com/python/mypy"
-DOWNLOAD="https://files.pythonhosted.org/packages/88/a2/3d82acde5ccff66d38c1ab2b1657a17029ce88db3ea54cde500e188f9637/mypy-0.770.tar.gz"
-MD5SUM="54d69434af352a32b6c012d9812e37ae"
+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"
+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/obspy/README b/python/obspy/README
deleted file mode 100644
index c434cb018b..0000000000
--- a/python/obspy/README
+++ /dev/null
@@ -1,6 +0,0 @@
-ObsPy is an open-source project dedicated to provide a Python
-framework for processing seismological data. It provides parsers
-for common file formats, clients to access data centers and
-seismological signal processing routines which allow the manipulation
-of seismological time series. The goal of the ObsPy project is to
-facilitate rapid application development for seismology.
diff --git a/python/obspy/obspy.SlackBuild b/python/obspy/obspy.SlackBuild
deleted file mode 100644
index 2699bf640e..0000000000
--- a/python/obspy/obspy.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ObsPy
-
-# Copyright (c) 2016 Cristiano Urban, Gonars, Italy
-# 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=obspy
-VERSION=${VERSION:-1.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 {} \;
-
-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 CHANGELOG.txt MANIFEST.in 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/python/obspy/obspy.info b/python/obspy/obspy.info
deleted file mode 100644
index 46131183fd..0000000000
--- a/python/obspy/obspy.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="obspy"
-VERSION="1.1.1"
-HOMEPAGE="https://github.com/obspy/obspy/wiki"
-DOWNLOAD="https://github.com/obspy/obspy/archive/1.1.1/obspy-1.1.1.tar.gz"
-MD5SUM="ae7b75055a1de926f80d4818a60a127c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="decorator numpy python-future python-requests scipy matplotlib lxml SQLAlchemy basemap suds-jurko"
-MAINTAINER="Cristiano Urban"
-EMAIL="cristiano.urban.slack@gmail.com"
diff --git a/python/obspy/slack-desc b/python/obspy/slack-desc
deleted file mode 100644
index 93bdc73b4d..0000000000
--- a/python/obspy/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------------------------------------------------------|
-obspy: obspy (A Python Framework for Seismology)
-obspy:
-obspy: ObsPy is an open-source project dedicated to provide a Python
-obspy: framework for processing seismological data. It provides parsers
-obspy: for common file formats, clients to access data centers and
-obspy: seismological signal processing routines which allow the manipulation
-obspy: of seismological time series. The goal of the ObsPy project is to
-obspy: facilitate rapid application development for seismology.
-obspy:
-obspy: Homepage: https://github.com/obspy/obspy/wiki
-obspy:
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/passlib/passlib.SlackBuild b/python/passlib/passlib.SlackBuild
index fe1bb43d16..28b678a916 100644
--- a/python/passlib/passlib.SlackBuild
+++ b/python/passlib/passlib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for passlib
 
-# Copyright 2015-2017 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2015-2017, 2020 Brenton Earl <brent@exitstatusone.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=passlib
-VERSION=${VERSION:-1.7.1}
+VERSION=${VERSION:-1.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/passlib/passlib.info b/python/passlib/passlib.info
index 7a29745c99..efc16c599e 100644
--- a/python/passlib/passlib.info
+++ b/python/passlib/passlib.info
@@ -1,8 +1,8 @@
 PRGNAM="passlib"
-VERSION="1.7.1"
-HOMEPAGE="https://bitbucket.org/ecollins/passlib"
-DOWNLOAD="https://pypi.python.org/packages/25/4b/6fbfc66aabb3017cd8c3bd97b37f769d7503ead2899bf76e570eb91270de/passlib-1.7.1.tar.gz"
-MD5SUM="254869dae3fd9f09f0746a3cb29a0b15"
+VERSION="1.7.2"
+HOMEPAGE="https://pypi.org/project/passlib/"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/passlib/passlib-1.7.2.tar.gz"
+MD5SUM="b908529cfd4c33057c244324c692eae7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/passlib/slack-desc b/python/passlib/slack-desc
index 14578b94a8..1377a74acc 100644
--- a/python/passlib/slack-desc
+++ b/python/passlib/slack-desc
@@ -15,5 +15,5 @@ passlib: hashes. It's designed to be useful for a wide range of tasks, from
 passlib: verifying a hash found in /etc/shadow, to providing full-strength
 passlib: password hashing for multi-user applications.
 passlib:
-passlib: Home page: https://bitbucket.org/ecollins/passlib
+passlib: Home page: https://pypi.org/project/passlib/
 passlib:
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
new file mode 100644
index 0000000000..77244e0eee
--- /dev/null
+++ b/python/pathtools3/README
@@ -0,0 +1 @@
+Pattern matching and various utilities for file systems paths.
diff --git a/python/pathtools3/pathtools3.SlackBuild b/python/pathtools3/pathtools3.SlackBuild
new file mode 100644
index 0000000000..eeb0de4460
--- /dev/null
+++ b/python/pathtools3/pathtools3.SlackBuild
@@ -0,0 +1,71 @@
+#!/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=pathtools3
+SRCPKG=${SRCPKG-pathtools3}
+VERSION=${VERSION:-0.2.1}
+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 {} \;
+
+python3 setup.py install --root=$PKG
+
+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/pathtools3/pathtools3.info b/python/pathtools3/pathtools3.info
new file mode 100644
index 0000000000..28e6c93414
--- /dev/null
+++ b/python/pathtools3/pathtools3.info
@@ -0,0 +1,10 @@
+PRGNAM="pathtools3"
+VERSION="0.2.1"
+HOMEPAGE="https://pypi.org/project/pathtools3/"
+DOWNLOAD="https://files.pythonhosted.org/packages/38/19/b8e751fe76e98a04bdd34dd912230c24dd43f9908258f55e8c1062f2cd37/pathtools3-0.2.1.tar.gz"
+MD5SUM="08bb008161e305909740076c5c422159"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/pathtools3/slack-desc b/python/pathtools3/slack-desc
new file mode 100644
index 0000000000..297dccf6eb
--- /dev/null
+++ b/python/pathtools3/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------------------------------------------------------|
+pathtools3: pathtools3 (File system general utilities)
+pathtools3:
+pathtools3: Pattern matching and various utilities for file systems paths.
+pathtools3:
+pathtools3: Works on Python 2.7 and 3.4+. If you want to use an old version of
+pathtools3: Python, use pathtools < 0.1.2. https://pypi.org/project/pathtools/
+pathtools3:
+pathtools3:
+pathtools3:
+pathtools3: Homepage: https://pypi.org/project/pathtools3/
+pathtools3:
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/pyasn1/README b/python/pyasn1/README
index e8c7885ff0..f3b5a03b3e 100644
--- a/python/pyasn1/README
+++ b/python/pyasn1/README
@@ -1 +1,5 @@
 pyasn1 implements ASN.1 types and codecs (BER, CER, DER) in Python.
+
+OPTIONAL DEPENDENCY:
+
+python3
diff --git a/python/pybind11/pybind11.SlackBuild b/python/pybind11/pybind11.SlackBuild
index 8a3563d0f6..093db9bc54 100644
--- a/python/pybind11/pybind11.SlackBuild
+++ b/python/pybind11/pybind11.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pybind11
 
-# 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
@@ -24,8 +24,8 @@
 
 
 PRGNAM=pybind11
-VERSION=${VERSION:-2.4.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.5.0}
+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/pybind11/pybind11.info b/python/pybind11/pybind11.info
index 78e7ab8209..8c833cf141 100644
--- a/python/pybind11/pybind11.info
+++ b/python/pybind11/pybind11.info
@@ -1,8 +1,8 @@
 PRGNAM="pybind11"
-VERSION="2.4.3"
+VERSION="2.5.0"
 HOMEPAGE="https://github.com/pybind/pybind11"
-DOWNLOAD="https://github.com/pybind/pybind11/archive/v2.4.3/pybind11-2.4.3.tar.gz"
-MD5SUM="62254c40f89925bb894be421fe4cdef2"
+DOWNLOAD="https://github.com/pybind/pybind11/archive/v2.5.0/pybind11-2.5.0.tar.gz"
+MD5SUM="1ad2c611378fb440e8550a7eb6b31b89"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
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/pycdio/pycdio.SlackBuild b/python/pycdio/pycdio.SlackBuild
index f4ae588e90..db71760cc6 100644
--- a/python/pycdio/pycdio.SlackBuild
+++ b/python/pycdio/pycdio.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for pycdio
 
 # Copyright 2015 Dugan Chen Canada
+# Copyright 2020, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pycdio
-VERSION=${VERSION:-0.20}
+VERSION=${VERSION:-0.21}
 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 +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"
@@ -75,7 +76,8 @@ 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 example/ ChangeLog COPYING README.txt THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a example/ AUTHORS ChangeLog NEWS README.txt THANKS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/pycdio/pycdio.info b/python/pycdio/pycdio.info
index 17606112b3..cfc97984f5 100644
--- a/python/pycdio/pycdio.info
+++ b/python/pycdio/pycdio.info
@@ -1,10 +1,10 @@
 PRGNAM="pycdio"
-VERSION="0.20"
-HOMEPAGE="http://www.gnu.org/software/libcdio/"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/libcdio/pycdio-0.20.tar.gz"
-MD5SUM="3f075574f661f49f4ede89aff9ff0cda"
+VERSION="0.21"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+DOWNLOAD="https://pypi.io/packages/source/p/pycdio/pycdio-0.21.tar.gz"
+MD5SUM="82b703cb93db88002da67aae34cd5f77"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dugan Chen"
-EMAIL="theodogster [at] gmail [dot] com"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/python/pycdio/slack-desc b/python/pycdio/slack-desc
index 798e1e8ba0..5b180f9a54 100644
--- a/python/pycdio/slack-desc
+++ b/python/pycdio/slack-desc
@@ -11,7 +11,7 @@ pycdio:
 pycdio: pycdio is a Python interface to libcdio, the CD input and control
 pycdio: library.
 pycdio:
-pycdio:
+pycdio: Homepage: https://www.gnu.org/software/libcdio/
 pycdio:
 pycdio:
 pycdio:
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 bed31a8967..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.7}
+VERSION=${VERSION:-3.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pycryptodomex/pycryptodomex.info b/python/pycryptodomex/pycryptodomex.info
index abb35b463a..405c0cc46b 100644
--- a/python/pycryptodomex/pycryptodomex.info
+++ b/python/pycryptodomex/pycryptodomex.info
@@ -1,8 +1,8 @@
 PRGNAM="pycryptodomex"
-VERSION="3.9.7"
+VERSION="3.10.1"
 HOMEPAGE="https://github.com/Legrandin/pycryptodome"
-DOWNLOAD="https://github.com/Legrandin/pycryptodome/archive/v3.9.7x/pycryptodome-3.9.7x.tar.gz"
-MD5SUM="92889888a82e8467829f88afe1ae8549"
+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/pyperclip/README b/python/pyperclip/README
index 18b74d81c6..e4e985e3b7 100644
--- a/python/pyperclip/README
+++ b/python/pyperclip/README
@@ -1,6 +1,7 @@
 Pyperclip is a cross-platform Python module for copy and paste clipboard
-functions. It works with Python 2 and 3.  It currently only handles
-plain text.
+functions. It currently only handles plain text.
+
+Python 3 is a hard dependency.  This script does not support Python 2.
 
 For example usage see /usr/doc/pyperclip-$VERSION/README.md
 
diff --git a/python/pyperclip/pyperclip.SlackBuild b/python/pyperclip/pyperclip.SlackBuild
index 7e1f0ee474..057abb22e1 100644
--- a/python/pyperclip/pyperclip.SlackBuild
+++ b/python/pyperclip/pyperclip.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyperclip
 
-# Copyright 2015-2016, 2018 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2015-2016, 2018, 2020 Brenton Earl <brent@exitstatusone.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=pyperclip
-VERSION=${VERSION:-1.6.4}
-SRCVERSION=${SRCVERSION:-16b1f5b7ece36a08adc5ddec1ef6b1b0aa9de77f}
+VERSION=${VERSION:-1.7.0}
+SRCVERSION=${SRCVERSION:-943372e295764e18ea2069e1c0615ad286089bda}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,12 +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
-
-# Python 3 support
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
+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/pyperclip/pyperclip.info b/python/pyperclip/pyperclip.info
index 131061dea0..1f33b23813 100644
--- a/python/pyperclip/pyperclip.info
+++ b/python/pyperclip/pyperclip.info
@@ -1,10 +1,10 @@
 PRGNAM="pyperclip"
-VERSION="1.6.4"
+VERSION="1.7.0"
 HOMEPAGE="https://github.com/asweigart/pyperclip"
-DOWNLOAD="https://github.com/asweigart/pyperclip/archive/16b1f5b/pyperclip-16b1f5b7ece36a08adc5ddec1ef6b1b0aa9de77f.tar.gz"
-MD5SUM="387c4c59688ee6f49992e8476282b9d4"
+DOWNLOAD="https://github.com/asweigart/pyperclip/archive/943372e/pyperclip-943372e295764e18ea2069e1c0615ad286089bda.tar.gz"
+MD5SUM="7a177f7271d626b339ccae91b8d08db0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Brenton Earl"
 EMAIL="brent@exitstatusone.com"
diff --git a/python/pyperclip/slack-desc b/python/pyperclip/slack-desc
index 67f2cd5e6c..2b35e62152 100644
--- a/python/pyperclip/slack-desc
+++ b/python/pyperclip/slack-desc
@@ -9,7 +9,7 @@
 pyperclip: pyperclip (Python copy and paste clipboard functions)
 pyperclip:
 pyperclip: Pyperclip is a cross-platform Python module for copy and paste
-pyperclip: clipboard functions. It works with Python 2 and 3.
+pyperclip: clipboard functions.
 pyperclip:
 pyperclip: Home page:  https://github.com/asweigart/pyperclip
 pyperclip:
diff --git a/python/pysass/README b/python/pysass/README
new file mode 100644
index 0000000000..938829cca2
--- /dev/null
+++ b/python/pysass/README
@@ -0,0 +1,5 @@
+Sass CLI Python: A wrapper to libsass-python with watchdog capability.
+
+Add -w and --watch flags to pysassc command.
+Watch included directories and source directory recursively.
+Only watch *.scss files.  Throttling.
diff --git a/python/pysass/pysass.SlackBuild b/python/pysass/pysass.SlackBuild
new file mode 100644
index 0000000000..34af5b0c37
--- /dev/null
+++ b/python/pysass/pysass.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# SlackBuild build script for pysass
+
+# 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=pysass
+SRCPKG=${SRCPKG-pysass}
+VERSION=${VERSION:-0.1.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.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 {} \;
+
+# 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/pysass/pysass.info b/python/pysass/pysass.info
new file mode 100644
index 0000000000..5b0807e02d
--- /dev/null
+++ b/python/pysass/pysass.info
@@ -0,0 +1,10 @@
+PRGNAM="pysass"
+VERSION="0.1.0"
+HOMEPAGE="https://pypi.org/project/pysass/"
+DOWNLOAD="https://files.pythonhosted.org/packages/bc/9c/b1661c74c79949fa5dce5c67d79339a2d2b4457d76ebc2d487cd5b417a96/pysass-0.1.0.tar.gz"
+MD5SUM="b54e9064102cbe40a1f75f8b7ffa9d4f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 watchdog BeautifulSoup4"
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/pysass/slack-desc b/python/pysass/slack-desc
new file mode 100644
index 0000000000..f4f209e4d1
--- /dev/null
+++ b/python/pysass/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------------------------------------------------------|
+pysass: pysass (add watch capability)
+pysass:
+pysass: A simple wrapper on libsass-python pysassc to add watch capability
+pysass: using watchdog.
+pysass:
+pysass: Add -w and --watch flags to pysassc command.
+pysass: Watch included directories and source directory recursively.
+pysass: Only watch *.scss files.  Throttling.
+pysass:
+pysass: Homepage: https://pypi.org/project/pysass/
+pysass:
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/pytables/README b/python/pytables/README
deleted file mode 100644
index 4790b2fb90..0000000000
--- a/python/pytables/README
+++ /dev/null
@@ -1,17 +0,0 @@
-PyTables is a package for managing hierarchical datasets
-and designed to efficiently and easily cope with extremely
-large amounts of data. It optimizes memory and disk resources
-so that data takes much less space than other solutions such
-as relational or object oriented databases.
- 
-PyTables has been designed to fulfill the next requirements:
- 1. Allow to structure your data in a hierarchical way.
- 2. Easy to use. It implements the NaturalNaming scheme for
-    allowing convenient access to the data.
- 3. All the cells in datasets can be multidimensional entities.
- 4. Most of the I/O operations speed should be only limited by
-    the underlying I/O subsystem.
- 5. Enable the end user to save large datasets in a efficient
-    way, i.e. each single byte of data on disk has to be
-    represented by one byte plus a small fraction when loaded
-    in memory.
diff --git a/python/pytables/pytables.SlackBuild b/python/pytables/pytables.SlackBuild
deleted file mode 100644
index 08f02e5c9b..0000000000
--- a/python/pytables/pytables.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pytables
-
-# Copyright 2007-2015 LukenShiro, Italy
-# 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=pytables
-VERSION=${VERSION:-3.2.0}
-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/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-SRC_PRGNAM=tables
-DOCFILES="ANNOUNCE.txt LICENSE.txt LICENSES/ PKG-INFO README.rst \
-          RELEASE_NOTES.txt THANKS doc/html doc/scripts"
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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 $SRC_PRGNAM-$VERSION
-tar xvf $CWD/$SRC_PRGNAM-$VERSION.tar.gz
-cd $SRC_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 compilation with Cython 0.21
-# https://github.com/PyTables/PyTables/issues/386
-sed -i "s|Cython.Compiler.Main import|Cython.Compiler import|g" setup.py
-
-python setup.py build install --prefix=/usr --root=$PKG
-
-# Copy examples, contrib, and bench files
-mkdir -p $PKG/usr/share/$PRGNAM/
-cp -a examples contrib bench $PKG/usr/share/$PRGNAM/
-
-# Copy documentation files
-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
-
-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/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/pytables/pytables.info b/python/pytables/pytables.info
deleted file mode 100644
index cdfbface7d..0000000000
--- a/python/pytables/pytables.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pytables"
-VERSION="3.2.0"
-HOMEPAGE="http://www.pytables.org"
-DOWNLOAD="http://downloads.sourceforge.net/pytables/tables-3.2.0.tar.gz"
-MD5SUM="339a2225ee814a6899cb14e7ba28c081"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="hdf5 numexpr"
-MAINTAINER="LukenShiro"
-EMAIL="lukenshiro@ngi.it"
diff --git a/python/pytables/slack-desc b/python/pytables/slack-desc
deleted file mode 100644
index 1eb3e8f8ce..0000000000
--- a/python/pytables/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------------------------------------------------------|
-pytables: pytables (Hierarchical datasets in Python)
-pytables:
-pytables: PyTables is a package for managing hierarchical datasets and
-pytables: designed to efficiently and easily cope with extremely large amounts
-pytables: of data. It optimizes memory and disk resources so that data takes
-pytables: much less space than other solutions such as relational or object
-pytables: oriented databases.
-pytables:
-pytables: Homepage: http://www.pytables.org/moin
-pytables:
-pytables:
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-bitstring/README b/python/python-bitstring/README
new file mode 100644
index 0000000000..2a773c575a
--- /dev/null
+++ b/python/python-bitstring/README
@@ -0,0 +1,8 @@
+bitstring is a pure Python module designed to help make the creation
+and analysis of binary data as simple and natural as possible.
+
+Bitstrings can be constructed from integers (big and little endian),
+hex, octal, binary, strings or files. They can be sliced, joined,
+reversed, inserted into, overwritten, etc. with simple functions or
+slice notation.  They can also be read from, searched and replaced,
+and navigated in, similar to a file or stream.
diff --git a/python/python-bitstring/python-bitstring.SlackBuild b/python/python-bitstring/python-bitstring.SlackBuild
new file mode 100644
index 0000000000..d5e201085a
--- /dev/null
+++ b/python/python-bitstring/python-bitstring.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for python-bitstring
+
+# Copyright 2020 nomnombtc <nomnombtc@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=python-bitstring
+SRCNAM=bitstring
+VERSION=${VERSION:-3.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 $SRCNAM-$SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$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 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 \
+  LICENSE README.rst release_notes.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/python/python-bitstring/python-bitstring.info b/python/python-bitstring/python-bitstring.info
new file mode 100644
index 0000000000..20e4ff93a6
--- /dev/null
+++ b/python/python-bitstring/python-bitstring.info
@@ -0,0 +1,10 @@
+PRGNAM="python-bitstring"
+VERSION="3.1.7"
+HOMEPAGE="https://github.com/scott-griffiths/bitstring"
+DOWNLOAD="https://github.com/scott-griffiths/bitstring/archive/bitstring-3.1.7/bitstring-3.1.7.tar.gz"
+MD5SUM="e7f5e81fa732dc0effa88ba949f443df"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="nomnombtc"
+EMAIL="nomnombtc@arcor.de"
diff --git a/python/python-bitstring/slack-desc b/python/python-bitstring/slack-desc
new file mode 100644
index 0000000000..c62514d385
--- /dev/null
+++ b/python/python-bitstring/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-bitstring: python-bitstring (binary data analysis library)
+python-bitstring:
+python-bitstring: bitstring is a pure Python module designed to help make the creation
+python-bitstring: and analysis of binary data as simple and natural as possible.
+python-bitstring:
+python-bitstring: Bitstrings can be constructed from integers (big and little endian),
+python-bitstring: hex, octal, binary, strings or files. They can be sliced, joined,
+python-bitstring: reversed, inserted into, overwritten, etc. with simple functions or
+python-bitstring: slice notation. They can also be read from, searched and replaced,
+python-bitstring: and navigated in, similar to a file or stream.
+python-bitstring:
diff --git a/python/python-branca/python-branca.SlackBuild b/python/python-branca/python-branca.SlackBuild
index 74df22deb6..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.0}
+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 28d1691c06..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.0"
+VERSION="0.4.2"
 HOMEPAGE="https://github.com/python-visualization/branca"
-DOWNLOAD="https://github.com/python-visualization/branca/archive/v0.4.0/branca-0.4.0.tar.gz"
-MD5SUM="a154f35c4ae9afa3817ed1e2994172cc"
+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-configargparse/python-configargparse.SlackBuild b/python/python-configargparse/python-configargparse.SlackBuild
index 504ade27f9..3ec4d1c6ce 100644
--- a/python/python-configargparse/python-configargparse.SlackBuild
+++ b/python/python-configargparse/python-configargparse.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python-configargparse
 SRCNAM=ConfigArgParse
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-configargparse/python-configargparse.info b/python/python-configargparse/python-configargparse.info
index c6ca2e3e86..3995aa6a7b 100644
--- a/python/python-configargparse/python-configargparse.info
+++ b/python/python-configargparse/python-configargparse.info
@@ -1,8 +1,8 @@
 PRGNAM="python-configargparse"
-VERSION="1.1"
+VERSION="1.2.3"
 HOMEPAGE="https://github.com/bw2/ConfigArgParse"
-DOWNLOAD="https://github.com/bw2/ConfigArgParse/archive/1.1/ConfigArgParse-1.1.tar.gz"
-MD5SUM="2e687c22e3785d0b05fe1136dd41d914"
+DOWNLOAD="https://github.com/bw2/ConfigArgParse/archive/1.2.3/ConfigArgParse-1.2.3.tar.gz"
+MD5SUM="9cff4302550cbf8458372b7fb219e76c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-djvulibre/python-djvulibre.SlackBuild b/python/python-djvulibre/python-djvulibre.SlackBuild
index 0121e2bdd2..0b236b1abd 100644
--- a/python/python-djvulibre/python-djvulibre.SlackBuild
+++ b/python/python-djvulibre/python-djvulibre.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=python-djvulibre
-VERSION=${VERSION:-0.8}
+VERSION=${VERSION:-0.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-djvulibre/python-djvulibre.info b/python/python-djvulibre/python-djvulibre.info
index 69f404b1e4..93c20f528c 100644
--- a/python/python-djvulibre/python-djvulibre.info
+++ b/python/python-djvulibre/python-djvulibre.info
@@ -1,8 +1,8 @@
 PRGNAM="python-djvulibre"
-VERSION="0.8"
+VERSION="0.8.5"
 HOMEPAGE="http://jwilk.net/software/python-djvulibre"
-DOWNLOAD="https://github.com/jwilk/python-djvulibre/archive/0.8/python-djvulibre-0.8.tar.gz"
-MD5SUM="cdfe2b62d426d6c3aa0b7156e40b0a62"
+DOWNLOAD="https://github.com/jwilk/python-djvulibre/archive/0.8.5/python-djvulibre-0.8.5.tar.gz"
+MD5SUM="98cbb3ecb34e9df1cb0514a259e580cf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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 2cbbd74e85..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.5.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 5c0448d98a..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.5.0"
+VERSION="2.0.0"
 HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-1.5.0.tar.gz"
-MD5SUM="1ec9bfc71c20e8618eac4a267aee2ad1"
+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 733270722b..313ca7b09c 100644
--- a/python/python-jsonrpclib/python-jsonrpclib.SlackBuild
+++ b/python/python-jsonrpclib/python-jsonrpclib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-jsonrpclib
 
-# Copyright 2016-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-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=python-jsonrpclib
 SRCNAM=jsonrpclib
-VERSION=${VERSION:-0.4.0}
+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 1895beeccb..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.0"
+VERSION="0.4.2"
 HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
-DOWNLOAD="https://github.com/tcalmant/jsonrpclib/archive/v0.4.0/jsonrpclib-0.4.0.tar.gz"
-MD5SUM="c1c2e175e5fb167a6c36057f1fdfa246"
+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-libnacl/python-libnacl.SlackBuild b/python/python-libnacl/python-libnacl.SlackBuild
index 4a25e52da0..02c83f6dc4 100644
--- a/python/python-libnacl/python-libnacl.SlackBuild
+++ b/python/python-libnacl/python-libnacl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-libnacl
 
-# Copyright 2014-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2020 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-libnacl
 SRCNAM=libnacl
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-libnacl/python-libnacl.info b/python/python-libnacl/python-libnacl.info
index 770bb4ca1d..52daa44094 100644
--- a/python/python-libnacl/python-libnacl.info
+++ b/python/python-libnacl/python-libnacl.info
@@ -1,8 +1,8 @@
 PRGNAM="python-libnacl"
-VERSION="1.6.1"
+VERSION="1.7.1"
 HOMEPAGE="https://libnacl.readthedocs.org/en/latest/"
-DOWNLOAD="https://pypi.io/packages/source/l/libnacl/libnacl-1.6.1.tar.gz"
-MD5SUM="a1ec5b08f85b5fe7491b30d8890bd84b"
+DOWNLOAD="https://pypi.io/packages/source/l/libnacl/libnacl-1.7.1.tar.gz"
+MD5SUM="2bfba5658837a330fe962f0b9464998b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libsodium"
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-magick/python-magick.SlackBuild b/python/python-magick/python-magick.SlackBuild
index ed3e235b23..95a2a15018 100644
--- a/python/python-magick/python-magick.SlackBuild
+++ b/python/python-magick/python-magick.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for python-magick
-# Copyright Matteo Bernardini <ponce@slackbuilds.org>, 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
@@ -23,13 +24,13 @@
 
 PRGNAM=python-magick
 SRCNAM=PythonMagick
-VERSION=${VERSION:-0.9.12}
+VERSION=${VERSION:-0.9.19}
 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 +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"
@@ -66,11 +67,13 @@ 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 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 {} \;
 
+CPPFLAGS="`python-config --includes`" \
+PYTHON_LIB="`python-config --libs`" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/python/python-magick/python-magick.info b/python/python-magick/python-magick.info
index 84215d949c..3fbfafb990 100644
--- a/python/python-magick/python-magick.info
+++ b/python/python-magick/python-magick.info
@@ -1,8 +1,8 @@
 PRGNAM="python-magick"
-VERSION="0.9.12"
+VERSION="0.9.19"
 HOMEPAGE="http://www.imagemagick.org"
-DOWNLOAD="http://www.imagemagick.org/download/python/releases/PythonMagick-0.9.12.tar.xz"
-MD5SUM="5fd807d1468c2d9b798a1e7de2040ba2"
+DOWNLOAD="http://www.imagemagick.org/download/python/PythonMagick-0.9.19.tar.gz"
+MD5SUM="8d2d4dca31cc81a0f1fa0b26eb6673bd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-mimeparse/slack-desc b/python/python-mimeparse/slack-desc
index 91ea749768..dcbeb8589e 100644
--- a/python/python-mimeparse/slack-desc
+++ b/python/python-mimeparse/slack-desc
@@ -16,4 +16,4 @@ python-mimeparse: https://tools.ietf.org/html/rfc7231#section-5.3.2
 python-mimeparse:
 python-mimeparse: Homepage: https://github.com/dbtsai/python-mimeparse
 python-mimeparse:
-python-mimeparse:
\ No newline at end of file
+python-mimeparse:
diff --git a/python/python-mysql-replication/README b/python/python-mysql-replication/README
new file mode 100644
index 0000000000..dc319c748f
--- /dev/null
+++ b/python/python-mysql-replication/README
@@ -0,0 +1,4 @@
+Pure Python Implementation of MySQL replication protocol build on top of
+PyMYSQL.
+
+This will automatically build for Python 3 if it's available.
diff --git a/python/python-mysql-replication/python-mysql-replication.SlackBuild b/python/python-mysql-replication/python-mysql-replication.SlackBuild
new file mode 100644
index 0000000000..50cbf366c3
--- /dev/null
+++ b/python/python-mysql-replication/python-mysql-replication.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for python-mysql-replication
+
+# Copyright 2019-2021 Andrew Clemons, Wellington New Zealand
+# 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-mysql-replication
+SRCNAM=mysql-replication
+VERSION=${VERSION:-0.23}
+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 $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 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
+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-mysql-replication/python-mysql-replication.info b/python/python-mysql-replication/python-mysql-replication.info
new file mode 100644
index 0000000000..72a42becd8
--- /dev/null
+++ b/python/python-mysql-replication/python-mysql-replication.info
@@ -0,0 +1,10 @@
+PRGNAM="python-mysql-replication"
+VERSION="0.23"
+HOMEPAGE="https://github.com/noplay/python-mysql-replication"
+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"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/python/python-mysql-replication/slack-desc b/python/python-mysql-replication/slack-desc
new file mode 100644
index 0000000000..b12e5eee24
--- /dev/null
+++ b/python/python-mysql-replication/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-mysql-replication: python-mysql-replication (python impl of MySQL replication protocol)
+python-mysql-replication:
+python-mysql-replication: python-mysql-replication is pure Python Implementation of MySQL
+python-mysql-replication: replication protocol build on top of PyMYSQL. This allow you to
+python-mysql-replication: receive event like insert, update, delete with their datas and raw
+python-mysql-replication: SQL queries.
+python-mysql-replication:
+python-mysql-replication: Homepage: https://github.com/noplay/python-mysql-replication
+python-mysql-replication:
+python-mysql-replication:
+python-mysql-replication:
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-netaddr/python-netaddr.SlackBuild b/python/python-netaddr/python-netaddr.SlackBuild
index 19bf92cf63..3a731f229b 100644
--- a/python/python-netaddr/python-netaddr.SlackBuild
+++ b/python/python-netaddr/python-netaddr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-netaddr
 
-# Copyright 2013-2017 Christoph Willing,  Brisbane Australia
+# Copyright 2013-2020 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-netaddr
 SRC_PRGNAM=netaddr
-VERSION=${VERSION:-0.7.19}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,13 +84,12 @@ find -L . \
  -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
-PYTHONPATH="build/lib" sphinx-build -b html docs/source docs/html
 
 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/html \
+cp -a docs/* \
   AUTHORS CHANGELOG COPYRIGHT LICENSE README* REFERENCES \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/python/python-netaddr/python-netaddr.info b/python/python-netaddr/python-netaddr.info
index 8435997df2..6b79606305 100644
--- a/python/python-netaddr/python-netaddr.info
+++ b/python/python-netaddr/python-netaddr.info
@@ -1,10 +1,10 @@
 PRGNAM="python-netaddr"
-VERSION="0.7.19"
+VERSION="0.8.0"
 HOMEPAGE="https://pypi.python.org/pypi/netaddr"
-DOWNLOAD="https://pypi.python.org/packages/0c/13/7cbb180b52201c07c796243eeff4c256b053656da5cfe3916c3f5b57b3a0/netaddr-0.7.19.tar.gz"
-MD5SUM="51019ef59c93f3979bcb37d3b8527e07"
+DOWNLOAD="https://files.pythonhosted.org/packages/c3/3b/fe5bda7a3e927d9008c897cf1a0858a9ba9924a6b4750ec1824c9e617587/netaddr-0.8.0.tar.gz"
+MD5SUM="34cad578473b66ad77bc3b2a7613ed4a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Sphinx Pygments MarkupSafe"
+REQUIRES=""
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/python/python-parsedatetime/python-parsedatetime.SlackBuild b/python/python-parsedatetime/python-parsedatetime.SlackBuild
index 281f6eacc3..47e05d073d 100644
--- a/python/python-parsedatetime/python-parsedatetime.SlackBuild
+++ b/python/python-parsedatetime/python-parsedatetime.SlackBuild
@@ -24,8 +24,8 @@
 
 PRGNAM=python-parsedatetime
 DIRNAM=parsedatetime
-VERSION=${VERSION:-2.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/python/python-parsedatetime/python-parsedatetime.info b/python/python-parsedatetime/python-parsedatetime.info
index 47124b76e7..f4826bbaa0 100644
--- a/python/python-parsedatetime/python-parsedatetime.info
+++ b/python/python-parsedatetime/python-parsedatetime.info
@@ -1,8 +1,8 @@
 PRGNAM="python-parsedatetime"
-VERSION="2.5"
+VERSION="2.6"
 HOMEPAGE="https://github.com/bear/parsedatetime"
-DOWNLOAD="https://github.com/bear/parsedatetime/archive/v2.5/parsedatetime-2.5.tar.gz"
-MD5SUM="4291ff72535851319553ea49b4ff5e93"
+DOWNLOAD="https://github.com/bear/parsedatetime/archive/v2.6/parsedatetime-2.6.tar.gz"
+MD5SUM="4d9af6a4427c383910bbc34a5d44f151"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-future"
diff --git a/python/python-precis-i18n/python-precis-i18n.SlackBuild b/python/python-precis-i18n/python-precis-i18n.SlackBuild
index 03ef76200e..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 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.1}
+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 885254d456..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.1"
+VERSION="1.0.3"
 HOMEPAGE="https://pypi.org/project/precis-i18n/"
-DOWNLOAD="https://files.pythonhosted.org/packages/b6/ed/c6e68eefdf7ace7a4bc16eadb9bb3ea57f912bfc437f8d3054ef69239880/precis_i18n-1.0.1.tar.gz"
-MD5SUM="8e702da3beca6271acdf91e2243c9422"
+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 599003ceaf..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.23.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 d3a71699cc..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.23.0"
+VERSION="2.25.0"
 HOMEPAGE="https://requests.kennethreitz.org/en/master/"
-DOWNLOAD="https://github.com/kennethreitz/requests/archive/v2.23.0/requests-2.23.0.tar.gz"
-MD5SUM="e5cb667d82a05a203a6c884477be8b07"
+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/python/python-socks/python-socks.SlackBuild b/python/python-socks/python-socks.SlackBuild
new file mode 100644
index 0000000000..556c855495
--- /dev/null
+++ b/python/python-socks/python-socks.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# 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
+# 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-socks
+VERSION=${VERSION:-1.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
+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 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
+
+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-soupsieve/README b/python/python-soupsieve/README
new file mode 100644
index 0000000000..d20543c236
--- /dev/null
+++ b/python/python-soupsieve/README
@@ -0,0 +1,7 @@
+Soup Sieve is a CSS selector library designed to be used with
+Beautiful Soup 4. It aims to provide selecting, matching, and
+filtering using modern CSS selectors.
+
+Soup Sieve 1.9.6 is the last supported version for Python 2. Newer
+versions (i.e. The python3-soupsieve SlackBuild) have dropped
+Python 2 support.
diff --git a/python/python-soupsieve/python-soupsieve.SlackBuild b/python/python-soupsieve/python-soupsieve.SlackBuild
new file mode 100644
index 0000000000..3d1972f4c3
--- /dev/null
+++ b/python/python-soupsieve/python-soupsieve.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for python-soupsieve
+
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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=python-soupsieve
+VERSION=${VERSION:-1.9.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=soupsieve
+
+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 {} \;
+
+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 *.md docs/ requirements/ $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-soupsieve/python-soupsieve.info b/python/python-soupsieve/python-soupsieve.info
new file mode 100644
index 0000000000..e397f6dd65
--- /dev/null
+++ b/python/python-soupsieve/python-soupsieve.info
@@ -0,0 +1,10 @@
+PRGNAM="python-soupsieve"
+VERSION="1.9.6"
+HOMEPAGE="https://github.com/facelessuser/soupsieve"
+DOWNLOAD="https://github.com/facelessuser/soupsieve/archive/1.9.6/soupsieve-1.9.6.tar.gz"
+MD5SUM="f3f762cca45c44ee96e1553dc0c8521d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="functools-lru-cache"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/python-soupsieve/slack-desc b/python/python-soupsieve/slack-desc
new file mode 100644
index 0000000000..163319d4d7
--- /dev/null
+++ b/python/python-soupsieve/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-soupsieve: python-soupsieve (A CSS selector implementation for BeautifulSoup)
+python-soupsieve:
+python-soupsieve: Soup Sieve is a CSS selector library designed to be used with
+python-soupsieve: Beautiful Soup 4. It aims to provide selecting, matching, and
+python-soupsieve: filtering using modern CSS selectors.
+python-soupsieve:
+python-soupsieve:
+python-soupsieve:
+python-soupsieve:
+python-soupsieve:
+python-soupsieve:
diff --git a/python/python-toml/README b/python/python-toml/README
new file mode 100644
index 0000000000..294b18a0a3
--- /dev/null
+++ b/python/python-toml/README
@@ -0,0 +1 @@
+python-toml is a Python library for parsing and creating TOML.
diff --git a/python/python-toml/python-toml.SlackBuild b/python/python-toml/python-toml.SlackBuild
new file mode 100644
index 0000000000..d5299c954f
--- /dev/null
+++ b/python/python-toml/python-toml.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for python-toml
+
+# Copyright 2020 Markus Rinne Finland
+# 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-toml
+SRCNAM=toml
+VERSION=${VERSION:-0.10.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 {} \;
+
+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 \
+  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/python-toml/python-toml.info b/python/python-toml/python-toml.info
new file mode 100644
index 0000000000..cab051c025
--- /dev/null
+++ b/python/python-toml/python-toml.info
@@ -0,0 +1,10 @@
+PRGNAM="python-toml"
+VERSION="0.10.2"
+HOMEPAGE="https://github.com/uiri/toml"
+DOWNLOAD="https://files.pythonhosted.org/packages/be/ba/1f744cdc819428fc6b5084ec34d9b30660f6f9daaf70eead706e3203ec3c/toml-0.10.2.tar.gz"
+MD5SUM="59bce5d8d67e858735ec3f399ec90253"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Markus Rinne"
+EMAIL="markus.ka.rinne@gmail.com"
diff --git a/python/python-toml/slack-desc b/python/python-toml/slack-desc
new file mode 100644
index 0000000000..033fe3be0c
--- /dev/null
+++ b/python/python-toml/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-toml: python-toml (A Python library for parsing and creating TOML)
+python-toml:
+python-toml: python-toml is a Python library for parsing and creating TOML.
+python-toml:
+python-toml:
+python-toml:
+python-toml:
+python-toml:
+python-toml:
+python-toml:
+python-toml:
diff --git a/python/python-unicodedata2/python-unicodedata2.SlackBuild b/python/python-unicodedata2/python-unicodedata2.SlackBuild
index b5b92b2d79..1bdae44d88 100644
--- a/python/python-unicodedata2/python-unicodedata2.SlackBuild
+++ b/python/python-unicodedata2/python-unicodedata2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-unicodedata2
 
-# 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,8 @@
 
 PRGNAM=python-unicodedata2
 SRCNAM=unicodedata2
-VERSION=${VERSION:-12.1.0}
+VERSION=${VERSION:-13.0.0_2}
+SRCVERSION=$(echo "$VERSION" | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,9 +61,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-$SRCVERSION
+tar xvf $CWD/$SRCNAM-$SRCVERSION.tar.gz
+cd $SRCNAM-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/python/python-unicodedata2/python-unicodedata2.info b/python/python-unicodedata2/python-unicodedata2.info
index c58de6d386..2a213e217a 100644
--- a/python/python-unicodedata2/python-unicodedata2.info
+++ b/python/python-unicodedata2/python-unicodedata2.info
@@ -1,8 +1,8 @@
 PRGNAM="python-unicodedata2"
-VERSION="12.1.0"
+VERSION="13.0.0_2"
 HOMEPAGE="https://pypi.python.org/pypi/unicodedata2"
-DOWNLOAD="https://github.com/mikekap/unicodedata2/archive/12.1.0/unicodedata2-12.1.0.tar.gz"
-MD5SUM="c3e814b54690b818c416570aa103c47c"
+DOWNLOAD="https://github.com/mikekap/unicodedata2/archive/13.0.0-2/unicodedata2-13.0.0-2.tar.gz"
+MD5SUM="c9a43ce01811fecb3505fccae7fff428"
 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/python-zipp/python-zipp.info b/python/python-zipp/python-zipp.info
index 706c13af00..f4cd1ec0ee 100644
--- a/python/python-zipp/python-zipp.info
+++ b/python/python-zipp/python-zipp.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/source/z/zipp/zipp-2.2.0.tar.g
 MD5SUM="44b208fd6240d13ad46d6e9f3ed703c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/python2-sip/README b/python/python2-sip/README
index 8580dd29b5..10c01de44b 100644
--- a/python/python2-sip/README
+++ b/python/python2-sip/README
@@ -12,4 +12,4 @@ tell your application the binary name and/or include path:
 /usr/bin/python2-sip
 /usr/include/python2.7/python2-sip/
 
-To use the module in your python2 projects, it is named python2_sip.
+To use the module in your python2 projects, it is named PyQt5.sip.
diff --git a/python/python2-sip/python2-sip.SlackBuild b/python/python2-sip/python2-sip.SlackBuild
index 0e31375c23..5ffe8425f3 100644
--- a/python/python2-sip/python2-sip.SlackBuild
+++ b/python/python2-sip/python2-sip.SlackBuild
@@ -32,8 +32,8 @@
 
 PRGNAM=python2-sip
 SRCNAM=sip
-VERSION=${VERSION:-4.19.6}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-4.19.20}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -85,7 +85,7 @@ python configure.py \
   -b "/usr/bin" \
   -d "$PYTHONLIB" \
   -e "/usr/include/python$PYTHONVER" \
-  --sip-module="python2_sip" \
+  --sip-module "PyQt5.sip" \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS"
 
@@ -99,10 +99,9 @@ mkdir -p $PKG/usr/include/python$PYTHONVER/python2-sip
 mv $PKG/usr/include/python$PYTHONVER/sip.h \
   $PKG/usr/include/python$PYTHONVER/python2-sip/sip.h \
 
-for oldf in sipdistutils.py sip.pyi sipconfig.py
-do
+for oldf in sipdistutils.py sipconfig.py; do
   mv $PKG/usr/lib$LIBDIRSUFFIX/python$PYTHONVER/site-packages/$oldf \
-  $PKG/usr/lib$LIBDIRSUFFIX/python$PYTHONVER/site-packages/python2_$oldf
+  $PKG/usr/lib$LIBDIRSUFFIX/python$PYTHONVER/site-packages/PyQt5_$oldf
 done
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/python2-sip/python2-sip.info b/python/python2-sip/python2-sip.info
index 87d87f01df..7ec2b796d2 100644
--- a/python/python2-sip/python2-sip.info
+++ b/python/python2-sip/python2-sip.info
@@ -1,8 +1,8 @@
 PRGNAM="python2-sip"
-VERSION="4.19.6"
-HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro/"
-DOWNLOAD="https://downloads.sourceforge.net/project/pyqt/sip/sip-4.19.6/sip-4.19.6.tar.gz"
-MD5SUM="6be5cb2c43915ed450a9f74ec110dada"
+VERSION="4.19.20"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro/"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/sip-4.19.20.tar.gz"
+MD5SUM="b91e29300cbee7b8e3b1f4412eac615c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python3-Cython/python3-Cython.SlackBuild b/python/python3-Cython/python3-Cython.SlackBuild
index 4c73220185..173569230e 100644
--- a/python/python3-Cython/python3-Cython.SlackBuild
+++ b/python/python3-Cython/python3-Cython.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python3-Cython
 
-# Copyright 2016-2019 Christoph Willing  Brisbane, Australia
+# Copyright 2016-2020 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-Cython
 SRCNAM=Cython
-VERSION=${VERSION:-0.29.6}
+VERSION=${VERSION:-0.29.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-Cython/python3-Cython.info b/python/python3-Cython/python3-Cython.info
index 8b56f1391e..9fb6e094c1 100644
--- a/python/python3-Cython/python3-Cython.info
+++ b/python/python3-Cython/python3-Cython.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-Cython"
-VERSION="0.29.6"
+VERSION="0.29.17"
 HOMEPAGE="https://cython.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/36/da/fcb979fc8cb486a67a013d6aefefbb95a3e19e67e49dff8a35e014046c5e/Cython-0.29.6.tar.gz"
-MD5SUM="8a9441e85ac8085e3d947082db4e7993"
+DOWNLOAD="https://files.pythonhosted.org/packages/99/36/a3dc962cc6d08749aa4b9d85af08b6e354d09c5468a3e0edc610f44c856b/Cython-0.29.17.tar.gz"
+MD5SUM="0936311ccd09f1164ab2f46ca5cd8c3b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python3-Flask-httpauth/README b/python/python3-Flask-httpauth/README
new file mode 100644
index 0000000000..d51a8bd98e
--- /dev/null
+++ b/python/python3-Flask-httpauth/README
@@ -0,0 +1,2 @@
+Simple extension that provides Basic and Digest HTTP authentication
+for Flask routes.
diff --git a/python/python3-Flask-httpauth/python3-Flask-httpauth.SlackBuild b/python/python3-Flask-httpauth/python3-Flask-httpauth.SlackBuild
new file mode 100644
index 0000000000..cf72df25a3
--- /dev/null
+++ b/python/python3-Flask-httpauth/python3-Flask-httpauth.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for python3-Flask-httpauth
+
+# Copyright 2019 MDrights <psychi2009@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=python3-Flask-httpauth
+PROGNAM=Flask-HTTPAuth
+VERSION=${VERSION:-3.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}
+
+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 $PROGNAM-$VERSION
+tar xvf $CWD/$PROGNAM-$VERSION.tar.gz
+cd $PROGNAM-$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 PKG-INFO docs/*.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/python3-Flask-httpauth/python3-Flask-httpauth.info b/python/python3-Flask-httpauth/python3-Flask-httpauth.info
new file mode 100644
index 0000000000..25fdb3ae08
--- /dev/null
+++ b/python/python3-Flask-httpauth/python3-Flask-httpauth.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-Flask-httpauth"
+VERSION="3.3.0"
+HOMEPAGE="https://github.com/miguelgrinberg/flask-httpauth/"
+DOWNLOAD="https://files.pythonhosted.org/packages/e0/95/798367396accd78a9cc7976345da7c7eed48b8e3666307839ea9e7e82890/Flask-HTTPAuth-3.3.0.tar.gz"
+MD5SUM="0ec5abc78e2fbb4cc624011c9f60d2ee"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-Flask"
+MAINTAINER="MDrights"
+EMAIL="psychi2009@gmail.com"
diff --git a/python/python3-Flask-httpauth/slack-desc b/python/python3-Flask-httpauth/slack-desc
new file mode 100644
index 0000000000..b4077e6978
--- /dev/null
+++ b/python/python3-Flask-httpauth/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-Flask-httpauth: python3-Flask-httpauth (Extension for Python3-Flask)
+python3-Flask-httpauth:
+python3-Flask-httpauth: Simple extension that provides Basic and Digest HTTP
+python3-Flask-httpauth: authentication for Flask routes.
+python3-Flask-httpauth:
+python3-Flask-httpauth: Homepage:
+python3-Flask-httpauth: https://github.com/miguelgrinberg/flask-httpauth/
+python3-Flask-httpauth:
+python3-Flask-httpauth:
+python3-Flask-httpauth:
+python3-Flask-httpauth:
diff --git a/python/python3-aiohttp-socks/python3-aiohttp-socks.SlackBuild b/python/python3-aiohttp-socks/python3-aiohttp-socks.SlackBuild
index 93ac18e0de..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.6}
+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 2be50361f4..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.6"
+VERSION="0.6.0"
 HOMEPAGE="https://github.com/romis2012/aiohttp-socks/"
-DOWNLOAD="https://github.com/romis2012/aiohttp-socks/archive/0.3.6/aiohttp-socks-0.3.6.tar.gz"
-MD5SUM="e31d0b8ff2587b364ea624cddf9b8192"
+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/python/python3-aiorpcX-legacy/python3-aiorpcX-legacy.SlackBuild b/python/python3-aiorpcX-legacy/python3-aiorpcX-legacy.SlackBuild
new file mode 100644
index 0000000000..cbaef9452d
--- /dev/null
+++ b/python/python3-aiorpcX-legacy/python3-aiorpcX-legacy.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# 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
+# 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-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 ;;
+    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 {} \;
+
+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 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
+
+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 4499d15f32..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.3.3}
+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 e4b3d4b2b3..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.3.3"
-HOMEPAGE="https://bitbucket.org/logilab/astroid"
-DOWNLOAD="https://files.pythonhosted.org/packages/40/df/70dfe3eed7352dd3f5c7cc74518ceed78230b2ca9d7d60dbabd81d5390ba/astroid-2.3.3.tar.gz"
-MD5SUM="5f3d73d82d1753b59bb49a6bc6046dee"
+VERSION="2.5.3"
+HOMEPAGE="https://github.com/PyCQA/astroid"
+DOWNLOAD="https://files.pythonhosted.org/packages/43/2d/f10df6489391a534db45e809d78d1427828c72b851824cf4aa5b7539648d/astroid-2.5.3.tar.gz"
+MD5SUM="f10e7c2a8f4100ba4ab1451c0ada6dd2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pytest-runner 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.SlackBuild b/python/python3-certifi/python3-certifi.SlackBuild
deleted file mode 100644
index 15d16d51cc..0000000000
--- a/python/python3-certifi/python3-certifi.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-certifi
-
-# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
-# Based on python-certifi by Dimitris Zlatanidis
-# 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-certifi
-VERSION=${VERSION:-2019.6.16}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=certifi
-
-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 {} \;
-
-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/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-certifi/slack-desc b/python/python3-certifi/slack-desc
deleted file mode 100644
index cc79fa4126..0000000000
--- a/python/python3-certifi/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-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:
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 ffe6202dec..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.12.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 4ba205191e..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.12.0"
+VERSION="7.22.0"
 HOMEPAGE="http://ipython.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipython/ipython-7.12.0.tar.gz"
-MD5SUM="60511039f7fe08d29320b9749893f02c"
+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 b15a109959..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:-4.3.21}
+VERSION=${VERSION:-5.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,14 +74,13 @@ 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  PKG-INFO README.rst \
+  PKG-INFO README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/python/python3-isort/python3-isort.info b/python/python3-isort/python3-isort.info
index 8fc9bf4026..8d98fd1ef0 100644
--- a/python/python3-isort/python3-isort.info
+++ b/python/python3-isort/python3-isort.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-isort"
-VERSION="4.3.21"
-HOMEPAGE="https://github.com/timothycrosley/isort"
-DOWNLOAD="https://files.pythonhosted.org/packages/43/00/8705e8d0c05ba22f042634f791a61f4c678c32175763dcf2ca2a133f4739/isort-4.3.21.tar.gz"
-MD5SUM="05d66f2eb7ce2c2d702e86bac24bf9e4"
+VERSION="5.8.0"
+HOMEPAGE="https://timothycrosley.github.io/isort/"
+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.SlackBuild b/python/python3-jupyter-ipykernel/python3-jupyter-ipykernel.SlackBuild
deleted file mode 100644
index 3085cda137..0000000000
--- a/python/python3-jupyter-ipykernel/python3-jupyter-ipykernel.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-jupyter-ipykernel
-
-# Copyright 2017-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=python3-jupyter-ipykernel
-VERSION=${VERSION:-5.1.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=ipykernel
-
-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 "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 \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CONTRIBUTING.md COPYING.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 y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
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 acb763ccc9..0000000000
--- a/python/python3-jupyter-ipykernel/python3-jupyter-ipykernel.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-jupyter-ipykernel"
-VERSION="5.1.4"
-HOMEPAGE="https://jupyter.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-5.1.4.tar.gz"
-MD5SUM="d5b46b1f8a8b73c996a3a738a4c83c61"
-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 fbd011123d..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.5}
+VERSION=${VERSION:-5.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,7 +76,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 CHANGES.rst README.rst docs/ LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.rst README.rst docs/ requirements/ LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/python3-multidict/python3-multidict.info b/python/python3-multidict/python3-multidict.info
index 0013f3085d..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.5"
+VERSION="5.1.0"
 HOMEPAGE="https://multidict.readthedocs.io/en/stable/"
-DOWNLOAD="https://github.com/aio-libs/multidict/archive/v4.7.5/multidict-4.7.5.tar.gz"
-MD5SUM="6ab3fdadc9617a944646033e884b92a0"
+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.SlackBuild b/python/python3-obspy/python3-obspy.SlackBuild
index c1bf7385cb..c0de78ffdb 100644
--- a/python/python3-obspy/python3-obspy.SlackBuild
+++ b/python/python3-obspy/python3-obspy.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-obspy
 SRCNAM=obspy
-VERSION=${VERSION:-1.1.1}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-obspy/python3-obspy.info b/python/python3-obspy/python3-obspy.info
index 9f564529a5..677b80e92e 100644
--- a/python/python3-obspy/python3-obspy.info
+++ b/python/python3-obspy/python3-obspy.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-obspy"
-VERSION="1.1.1"
+VERSION="1.2.2"
 HOMEPAGE="https://github.com/obspy/obspy/wiki"
-DOWNLOAD="https://github.com/obspy/obspy/archive/1.1.1/obspy-1.1.1.tar.gz"
-MD5SUM="ae7b75055a1de926f80d4818a60a127c"
+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 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/README b/python/python3-openpyxl/README
new file mode 100644
index 0000000000..a01b1cb919
--- /dev/null
+++ b/python/python3-openpyxl/README
@@ -0,0 +1,7 @@
+openpyxl is a Python library to read/write Excel 2010 
+xlsx/xlsm/xltx/xltm files.
+
+Optional dependencies:
+python3-defusedxml guards against various XML vulnerabilities.
+python3-pandas reads Pandas DataFrames.
+python3-pillow reads images.
diff --git a/python/python3-openpyxl/python3-openpyxl.SlackBuild b/python/python3-openpyxl/python3-openpyxl.SlackBuild
new file mode 100644
index 0000000000..f4eab85eb7
--- /dev/null
+++ b/python/python3-openpyxl/python3-openpyxl.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Slackware build script for python3-openpyxl
+
+# Copyright 2020-2021 Isaac Yu <isaacyu1@isaacyu1.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-openpyxl
+VERSION=${VERSION:-3.0.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=openpyxl
+
+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
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+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 build
+python3 setup.py install --skip-build --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 *.rst *.txt doc/*.rst doc/*.txt doc/charts/*.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/python3-openpyxl/python3-openpyxl.info b/python/python3-openpyxl/python3-openpyxl.info
new file mode 100644
index 0000000000..fece003fcc
--- /dev/null
+++ b/python/python3-openpyxl/python3-openpyxl.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-openpyxl"
+VERSION="3.0.7"
+HOMEPAGE="https://openpyxl.readthedocs.org/"
+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="et_xmlfile"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/python3-openpyxl/slack-desc b/python/python3-openpyxl/slack-desc
new file mode 100644
index 0000000000..da89caf538
--- /dev/null
+++ b/python/python3-openpyxl/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-openpyxl: python3-openpyxl (Python library to read/write Excel 2010 files)
+python3-openpyxl:
+python3-openpyxl: openpyxl is a Python library to read/write Excel 2010
+python3-openpyxl: xlsx/xlsm/xltx/xltm files.
+python3-openpyxl:
+python3-openpyxl:
+python3-openpyxl:
+python3-openpyxl:
+python3-openpyxl:
+python3-openpyxl:
+python3-openpyxl:
diff --git a/python/python3-packaging/python3-packaging.SlackBuild b/python/python3-packaging/python3-packaging.SlackBuild
index 7d99f23aed..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.1}
+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 266950d03f..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.1"
-HOMEPAGE="https://github.com/pypa/python3-packaging"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/packaging/packaging-20.1.tar.gz"
-MD5SUM="a02ce566f10c701b4c42e39a4ce59c93"
+VERSION="20.9"
+HOMEPAGE="https://pypi.python.org/pypi/packaging"
+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-pandas/python3-pandas.SlackBuild b/python/python3-pandas/python3-pandas.SlackBuild
index 443a4e5c80..6bb2399d2a 100644
--- a/python/python3-pandas/python3-pandas.SlackBuild
+++ b/python/python3-pandas/python3-pandas.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-pandas
 SRCNAM=pandas
-VERSION=${VERSION:-0.25.3}
+VERSION=${VERSION:-1.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-pandas/python3-pandas.info b/python/python3-pandas/python3-pandas.info
index cc2c4ef491..439c958789 100644
--- a/python/python3-pandas/python3-pandas.info
+++ b/python/python3-pandas/python3-pandas.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-pandas"
-VERSION="0.25.3"
+VERSION="1.0.5"
 HOMEPAGE="https://pandas.pydata.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pandas/pandas-0.25.3.tar.gz"
-MD5SUM="c70bbdfed7f1b9807a738f85fcdd9767"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pandas/pandas-1.0.5.tar.gz"
+MD5SUM="5183db713194e6fbc96c45f30a0d1311"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="numpy3 python3-dateutil pytz"
+REQUIRES="numpy3 python3-Cython python3-dateutil pytz"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
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 adc11b466e..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.4.4}
+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 5a6238dade..87e73424ee 100644
--- a/python/python3-pylint/python3-pylint.info
+++ b/python/python3-pylint/python3-pylint.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-pylint"
-VERSION="2.4.4"
+VERSION="2.7.4"
 HOMEPAGE="https://www.pylint.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/93/eb/851ab1d1ca6b37babd326dfa517b432963c54eda26c730353306aa0cdf4d/pylint-2.4.4.tar.gz"
-MD5SUM="6c1fd3345b63bd0160612882381579a7"
+DOWNLOAD="https://files.pythonhosted.org/packages/2d/5b/491cf9e85288c29759a6535e6009938c2141b137b27a0653e435dcbad6a2/pylint-2.7.4.tar.gz"
+MD5SUM="448218b9b424be9b3012dd60ee14ad94"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-astroid python3-isort python3-mccabe"
+REQUIRES="python-toml python3-astroid python3-isort python3-mccabe"
 MAINTAINER="Markus Rinne"
 EMAIL="markus.ka.rinne@gmail.com"
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 65bdb476cc..e1058b9a1a 100644
--- a/python/python3-pyrsistent/python3-pyrsistent.SlackBuild
+++ b/python/python3-pyrsistent/python3-pyrsistent.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python3-pyrsistent
 
-# 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=python3-pyrsistent
-VERSION=${VERSION:-0.15.7}
+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 765d40123b..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.15.7"
+VERSION="0.17.3"
 HOMEPAGE="https://github.com/tobgu/pyrsistent/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pyrsistent/pyrsistent-0.15.7.tar.gz"
-MD5SUM="da9486d00ef5b213f40d5cf3c5bca82d"
+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-rsa/README b/python/python3-rsa/README
new file mode 100644
index 0000000000..3507fb1355
--- /dev/null
+++ b/python/python3-rsa/README
@@ -0,0 +1,3 @@
+Python-RSA is a pure-Python RSA implementation.
+It supports encryption and decryption, signing and verifying signatures,
+and key generation according to PKCS#1 version 1.5.
diff --git a/python/python3-rsa/python3-rsa.SlackBuild b/python/python3-rsa/python3-rsa.SlackBuild
new file mode 100644
index 0000000000..149f33f998
--- /dev/null
+++ b/python/python3-rsa/python3-rsa.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python3-rsa
+
+# Copyright 2020  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=python3-rsa
+SRCNAM=rsa
+VERSION=${VERSION:-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 $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
+
+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.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/python3-rsa/python3-rsa.info b/python/python3-rsa/python3-rsa.info
new file mode 100644
index 0000000000..c4c3b72723
--- /dev/null
+++ b/python/python3-rsa/python3-rsa.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-rsa"
+VERSION="4.6"
+HOMEPAGE="https://stuvel.eu/software/rsa/"
+DOWNLOAD="https://files.pythonhosted.org/packages/a2/d5/04b8a9719149583fec76efdff2e7a81c6e3cc34909ee818d3fbf115edc2e/rsa-4.6.tar.gz"
+MD5SUM="bbf1c954865319bd542600ab07f92aca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pyasn1 python3"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python3-rsa/slack-desc b/python/python3-rsa/slack-desc
new file mode 100644
index 0000000000..dffa3239e7
--- /dev/null
+++ b/python/python3-rsa/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-rsa: python3-rsa (pure-Python RSA implementation)
+python3-rsa:
+python3-rsa: It supports encryption and decryption, signing and verifying
+python3-rsa: signatures, and key generation according to PKCS#1 version 1.5.
+python3-rsa: It can be used as a Python library as well as on the commandline.
+python3-rsa: The code was mostly written by Sybren A. Stüvel
+python3-rsa:
+python3-rsa: Homepage: https://stuvel.eu/software/rsa/
+python3-rsa:
+python3-rsa:
+python3-rsa:
diff --git a/python/python3-seaborn/python3-seaborn.SlackBuild b/python/python3-seaborn/python3-seaborn.SlackBuild
index b25f8e34fd..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.0}
-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 c8b161a35b..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.0"
+VERSION="0.11.1"
 HOMEPAGE="https://seaborn.pydata.org/"
-DOWNLOAD="https://github.com/mwaskom/seaborn/archive/v0.10.0/seaborn-0.10.0.tar.gz"
-MD5SUM="605c25770cd0a4a4146c1788966725e7" 
+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-setuptools_autover/python3-setuptools_autover.SlackBuild b/python/python3-setuptools_autover/python3-setuptools_autover.SlackBuild
index f6373028dc..50c28989b8 100644
--- a/python/python3-setuptools_autover/python3-setuptools_autover.SlackBuild
+++ b/python/python3-setuptools_autover/python3-setuptools_autover.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-setuptools_autover
 SRCNAM=setuptools_autover
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-setuptools_autover/python3-setuptools_autover.info b/python/python3-setuptools_autover/python3-setuptools_autover.info
index 20aafae326..7c953608f7 100644
--- a/python/python3-setuptools_autover/python3-setuptools_autover.info
+++ b/python/python3-setuptools_autover/python3-setuptools_autover.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-setuptools_autover"
-VERSION="1.0"
-HOMEPAGE="https://github.com/jannero/setuptools_autover"
-DOWNLOAD="https://files.pythonhosted.org/packages/8f/8b/aa1e4f1cf3aaaeace4b64d288b0d9d995a362da8d36e7e8087dd181c1995/setuptools_autover-1.0.tar.gz"
-MD5SUM="575139b658694e4900d5544d60ccc266"
+VERSION="1.0.2"
+HOMEPAGE="https://github.com/janneronkko/setuptools_autover"
+DOWNLOAD="https://files.pythonhosted.org/packages/38/ae/8068d02dec35641347b94d870a097449d428ad2701e602eb477f50bf4ee8/setuptools_autover-1.0.2.tar.gz"
+MD5SUM="78331434ac8a4d2ca3d7ae281e7ede3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python3-sip/python3-sip.SlackBuild b/python/python3-sip/python3-sip.SlackBuild
index 0e1098d936..349461061f 100644
--- a/python/python3-sip/python3-sip.SlackBuild
+++ b/python/python3-sip/python3-sip.SlackBuild
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Now maintained by Dave Woodfall (2020-04-24 14:13:15 +0100)
+#
 # Copyright 2008  Aleksandar Samardzic <asamardzic@gmail.com>
 # Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2016 Marcel Saegebarth <marc@mos6581.de>
@@ -30,8 +32,8 @@
 
 PRGNAM=python3-sip
 SRCNAM=sip
-VERSION=${VERSION:-4.19.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.19.20}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -82,7 +84,8 @@ find -L . \
 python3 configure.py \
   -b "/usr/bin" \
   -d "$PYTHONLIB" \
-  -e "/usr/include/python$PYTHONVER" \
+  -e $(pkg-config --cflags-only-I python3 | sed -e 's/^-I//') \
+  --sip-module "PyQt5.sip" \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS"
 
diff --git a/python/python3-sip/python3-sip.info b/python/python3-sip/python3-sip.info
index 3e2b89c4ed..f5aa9cd8c1 100644
--- a/python/python3-sip/python3-sip.info
+++ b/python/python3-sip/python3-sip.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-sip"
-VERSION="4.19.6"
+VERSION="4.19.20"
 HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro/"
-DOWNLOAD="https://downloads.sourceforge.net/project/pyqt/sip/sip-4.19.6/sip-4.19.6.tar.gz"
-MD5SUM="6be5cb2c43915ed450a9f74ec110dada"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/sip-4.19.20.tar.gz"
+MD5SUM="b91e29300cbee7b8e3b1f4412eac615c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/python/python3-soupsieve/README b/python/python3-soupsieve/README
new file mode 100644
index 0000000000..907b6b44af
--- /dev/null
+++ b/python/python3-soupsieve/README
@@ -0,0 +1,6 @@
+Soup Sieve is a CSS selector library designed to be used with 
+Beautiful Soup 4. It aims to provide selecting, matching, and 
+filtering using modern CSS selectors.
+
+Soup Sieve >= 2.0.0 has dropped Python 2 support. The
+python-soupsieve SlackBuild is available at version 1.9.6.
diff --git a/python/python3-soupsieve/python3-soupsieve.SlackBuild b/python/python3-soupsieve/python3-soupsieve.SlackBuild
new file mode 100644
index 0000000000..24b96b6159
--- /dev/null
+++ b/python/python3-soupsieve/python3-soupsieve.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for python3-soupsieve
+
+# Copyright 2020-2021 Isaac Yu <isaacyu1@isaacyu1.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-soupsieve
+VERSION=${VERSION:-2.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=soupsieve
+
+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 {} \;
+
+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 *.md docs/ requirements/ $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/python3-soupsieve/python3-soupsieve.info b/python/python3-soupsieve/python3-soupsieve.info
new file mode 100644
index 0000000000..45c27a2317
--- /dev/null
+++ b/python/python3-soupsieve/python3-soupsieve.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-soupsieve"
+VERSION="2.2.1"
+HOMEPAGE="https://github.com/facelessuser/soupsieve"
+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"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/python/python3-soupsieve/slack-desc b/python/python3-soupsieve/slack-desc
new file mode 100644
index 0000000000..15b607f144
--- /dev/null
+++ b/python/python3-soupsieve/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-soupsieve: python3-soupsieve (A CSS selector implementation for BeautifulSoup)
+python3-soupsieve:
+python3-soupsieve: Soup Sieve is a CSS selector library designed to be used with
+python3-soupsieve: Beautiful Soup 4. It aims to provide selecting, matching, and
+python3-soupsieve: filtering using modern CSS selectors.
+python3-soupsieve:
+python3-soupsieve:
+python3-soupsieve:
+python3-soupsieve:
+python3-soupsieve:
+python3-soupsieve:
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-statsmodels/slack-desc b/python/python3-statsmodels/slack-desc
index c1e3e4bea8..104d066aef 100644
--- a/python/python3-statsmodels/slack-desc
+++ b/python/python3-statsmodels/slack-desc
@@ -12,7 +12,7 @@ python3-statsmodels:
 python3-statsmodels: Statsmodels is a Python package that provides a complement
 python3-statsmodels: to scipy for statistical computations including descriptive
 python3-statsmodels: statistics and estimation and inference for statistical models.
-python3-statsmodels:  
+python3-statsmodels:
 python3-statsmodels:
 python3-statsmodels:
 python3-statsmodels:
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 22babf349b..a18f778006 100644
--- a/python/python3-tornado/python3-tornado.SlackBuild
+++ b/python/python3-tornado/python3-tornado.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python3-tornado
 
-# Copyright 2017-2019 Benjamin Trigona-Harany
+# Copyright 2017-2020 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=python3-tornado
-VERSION=${VERSION:-6.0.3}
+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 cf219ba49a..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.3"
+VERSION="6.1.0"
 HOMEPAGE="http://www.tornadoweb.org"
-DOWNLOAD="https://github.com/tornadoweb/tornado/archive/v6.0.3/tornado-6.0.3.tar.gz"
-MD5SUM="28fe1d74c871f55accdd93cd6e184699"
+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/python3-uth/python3-uth.SlackBuild b/python/python3-uth/python3-uth.SlackBuild
index ca6d1a24e5..02b80245e1 100644
--- a/python/python3-uth/python3-uth.SlackBuild
+++ b/python/python3-uth/python3-uth.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-uth
 SRCNAM=uth
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-uth/python3-uth.info b/python/python3-uth/python3-uth.info
index c9fd939302..cdd3fafb58 100644
--- a/python/python3-uth/python3-uth.info
+++ b/python/python3-uth/python3-uth.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-uth"
-VERSION="1.1.0"
-HOMEPAGE="https://github.com/jannero/uth"
-DOWNLOAD="https://files.pythonhosted.org/packages/c9/c5/5b790f2ebda07a0dccc115c349d284564cfdaa66318b49eeab3cb12df4da/uth-1.1.0.tar.gz"
-MD5SUM="86b53c1913383fde67f7f43ef5797512"
+VERSION="1.1.1"
+HOMEPAGE="https://github.com/janneronkko/uth"
+DOWNLOAD="https://files.pythonhosted.org/packages/df/f7/1ac0b2ee17699ad2efa12747ece1c9838b83901d2641d3dd2f8d9282f9b8/uth-1.1.1.tar.gz"
+MD5SUM="3b3085aa0443bc151993f2a2d3eb9cd6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-setuptools_autover"
diff --git a/python/python3-wcwidth/python3-wcwidth.SlackBuild b/python/python3-wcwidth/python3-wcwidth.SlackBuild
index d5796f64d1..5040af4b41 100644
--- a/python/python3-wcwidth/python3-wcwidth.SlackBuild
+++ b/python/python3-wcwidth/python3-wcwidth.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3-wcwidth
-VERSION=${VERSION:-0.1.8}
+VERSION=${VERSION:-0.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,7 +79,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  README.rst LICENSE.txt \
+  README.rst LICENSE \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/python/python3-wcwidth/python3-wcwidth.info b/python/python3-wcwidth/python3-wcwidth.info
index ea7d7c28ce..72cf296f0f 100644
--- a/python/python3-wcwidth/python3-wcwidth.info
+++ b/python/python3-wcwidth/python3-wcwidth.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-wcwidth"
-VERSION="0.1.8"
+VERSION="0.2.5"
 HOMEPAGE="https://github.com/jquast/wcwidth"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/w/wcwidth/wcwidth-0.1.8.tar.gz"
-MD5SUM="dc6677d099e6f49c0f6fbc310de261e9"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/w/wcwidth/wcwidth-0.2.5.tar.gz"
+MD5SUM="a07a75f99d316e14838ac760c831ea37"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/python3-wrapt/python3-wrapt.SlackBuild b/python/python3-wrapt/python3-wrapt.SlackBuild
index 8e0348e8e2..b85539c871 100644
--- a/python/python3-wrapt/python3-wrapt.SlackBuild
+++ b/python/python3-wrapt/python3-wrapt.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python3-wrapt
 SRCNAM=wrapt
-VERSION=${VERSION:-1.11.2}
+VERSION=${VERSION:-1.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python3-wrapt/python3-wrapt.info b/python/python3-wrapt/python3-wrapt.info
index 9283eec0b1..50d7574c28 100644
--- a/python/python3-wrapt/python3-wrapt.info
+++ b/python/python3-wrapt/python3-wrapt.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-wrapt"
-VERSION="1.11.2"
+VERSION="1.12.1"
 HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-DOWNLOAD="https://files.pythonhosted.org/packages/23/84/323c2415280bc4fc880ac5050dddfb3c8062c2552b34c2e512eb4aa68f79/wrapt-1.11.2.tar.gz"
-MD5SUM="cc15c001b129f81eb2f79b15eb99ffe5"
+DOWNLOAD="https://files.pythonhosted.org/packages/82/f7/e43cefbe88c5fd371f4cf0cf5eb3feccd07515af9fd6cf7dbf1d1793a797/wrapt-1.12.1.tar.gz"
+MD5SUM="6d56ed0de4336462a73350341462f45e"
 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/repoze.lru/README b/python/repoze.lru/README
index d5fc979cf4..a5034412d5 100644
--- a/python/repoze.lru/README
+++ b/python/repoze.lru/README
@@ -1 +1 @@
-A tiny LRU cache implementation and decorator.
\ No newline at end of file
+A tiny LRU cache implementation and decorator.
diff --git a/python/rst-linker/README b/python/rst-linker/README
new file mode 100644
index 0000000000..40c7a018b4
--- /dev/null
+++ b/python/rst-linker/README
@@ -0,0 +1,2 @@
+rst.linker provides a routine for adding links and performing other
+custom replacements to reStructuredText files as a Sphinx extension.
diff --git a/python/rst-linker/rst-linker.SlackBuild b/python/rst-linker/rst-linker.SlackBuild
new file mode 100644
index 0000000000..d8f904d9cb
--- /dev/null
+++ b/python/rst-linker/rst-linker.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# SlackBuild build script for rst-linker
+
+# 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=rst-linker
+SRCPKG=${SRCPKG-rst.linker}
+VERSION=${VERSION:-2.0.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.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 setup.py install --root=$PKG
+
+# 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
+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/rst-linker/rst-linker.info b/python/rst-linker/rst-linker.info
new file mode 100644
index 0000000000..8406130c54
--- /dev/null
+++ b/python/rst-linker/rst-linker.info
@@ -0,0 +1,10 @@
+PRGNAM="rst-linker"
+VERSION="2.0.0"
+HOMEPAGE="https://pypi.org/project/rst.linker/"
+DOWNLOAD="https://files.pythonhosted.org/packages/21/9d/d19ce4e31c06cf92f402929efe1403e6a8f9541c7e6496a213f632e351de/rst.linker-2.0.0.tar.gz"
+MD5SUM="15d25a2b72e618f792614f7e1ba7dd67"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/rst-linker/slack-desc b/python/rst-linker/slack-desc
new file mode 100644
index 0000000000..590ca9d174
--- /dev/null
+++ b/python/rst-linker/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------------------------------------------------------|
+rst-linker: rst-linker (provides a routine for adding links and performing other)
+rst-linker:
+rst-linker: rst-linker provides a routine for adding links and performing other
+rst-linker: custom replacements to reStructuredText files as a Sphinx extension.
+rst-linker:
+rst-linker:
+rst-linker:
+rst-linker: Homepage: https://pypi.org/project/rst.linker/
+rst-linker:
+rst-linker:
+rst-linker:
diff --git a/python/rst/README b/python/rst/README
new file mode 100644
index 0000000000..2b12274e81
--- /dev/null
+++ b/python/rst/README
@@ -0,0 +1,2 @@
+rst is a python module to create reStructuredText documents through
+code.
diff --git a/python/rst/rst.SlackBuild b/python/rst/rst.SlackBuild
new file mode 100644
index 0000000000..db90ab1e7e
--- /dev/null
+++ b/python/rst/rst.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# SlackBuild build script for rst
+
+# 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=rst
+SRCPKG=${SRCPKG-rst}
+VERSION=${VERSION:-0.1}
+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 setup.py install --root=$PKG
+
+# 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
+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/rst/rst.info b/python/rst/rst.info
new file mode 100644
index 0000000000..b34a02dab0
--- /dev/null
+++ b/python/rst/rst.info
@@ -0,0 +1,10 @@
+PRGNAM="rst"
+VERSION="0.1"
+HOMEPAGE="https://pypi.org/project/rst/"
+DOWNLOAD="https://files.pythonhosted.org/packages/e8/44/4c38af10df87d85e7c2e04bcd45f48feefe48dc375fcbfbbfe202b5a8f56/rst-0.1.tar.gz"
+MD5SUM="779a84e4c5f55a89b85917c07a4e3568"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/rst/slack-desc b/python/rst/slack-desc
new file mode 100644
index 0000000000..75f2c8959d
--- /dev/null
+++ b/python/rst/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------------------------------------------------------|
+rst: rst (python module to create reStructuredText documents through code)
+rst:
+rst: Homepage: https://pypi.org/project/rst/
+rst:
+rst:
+rst:
+rst:
+rst:
+rst:
+rst:
+rst:
diff --git a/python/ruffus/ruffus.SlackBuild b/python/ruffus/ruffus.SlackBuild
index e237bbf541..c826a7e687 100644
--- a/python/ruffus/ruffus.SlackBuild
+++ b/python/ruffus/ruffus.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ruffus
-VERSION=${VERSION:-2.8.3}
+VERSION=${VERSION:-2.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/ruffus/ruffus.info b/python/ruffus/ruffus.info
index afb01e2389..51687a0ade 100644
--- a/python/ruffus/ruffus.info
+++ b/python/ruffus/ruffus.info
@@ -1,8 +1,8 @@
 PRGNAM="ruffus"
-VERSION="2.8.3"
+VERSION="2.8.4"
 HOMEPAGE="http://www.ruffus.org.uk"
-DOWNLOAD="https://files.pythonhosted.org/packages/a1/73/cc66b80cfd495d6ce1e26292776d8f6bb67281bde4f47826b6cb20aa9c87/ruffus-2.8.3.tar.gz"
-MD5SUM="4fece047fb945e4b6a96bec7d9fad450"
+DOWNLOAD="https://pypi.python.org/packages/source/r/ruffus/ruffus-2.8.4.tar.gz"
+MD5SUM="ba9c019ad3f7216c6f3269e6577adb61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/s3transfer/README b/python/s3transfer/README
index b684f98472..ddb6c15db8 100644
--- a/python/s3transfer/README
+++ b/python/s3transfer/README
@@ -1 +1,5 @@
 S3transfer is a Python library for managing Amazon S3 transfers.
+
+Note: Dependency futures it does not work on Python 3,
+and Python 3 users do not need it as the concurrent.futures package
+is available in the standard library.
diff --git a/python/s3transfer/s3transfer.SlackBuild b/python/s3transfer/s3transfer.SlackBuild
index cf0405fdc2..695d9dbfcf 100644
--- a/python/s3transfer/s3transfer.SlackBuild
+++ b/python/s3transfer/s3transfer.SlackBuild
@@ -71,6 +71,11 @@ find -L . \
 
 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
 
diff --git a/python/schema/README b/python/schema/README
new file mode 100644
index 0000000000..fdf11b8492
--- /dev/null
+++ b/python/schema/README
@@ -0,0 +1,8 @@
+Schema validation just got Pythonic 
+
+schema is a library for validating Python data structures, such as those
+obtained from config-files, forms, external services or command-line
+parsing, converted from JSON/YAML (or something else) to Python
+data-types.
+
+python3 is an optional dependency.
diff --git a/python/schema/schema.SlackBuild b/python/schema/schema.SlackBuild
new file mode 100644
index 0000000000..57f4025a45
--- /dev/null
+++ b/python/schema/schema.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for schema
+
+# 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=schema
+VERSION=${VERSION:-0.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
+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 {} \;
+
+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/python/schema/schema.info b/python/schema/schema.info
new file mode 100644
index 0000000000..b3f07deb1c
--- /dev/null
+++ b/python/schema/schema.info
@@ -0,0 +1,10 @@
+PRGNAM="schema"
+VERSION="0.7.2"
+HOMEPAGE="https://pypi.org/project/schema/"
+DOWNLOAD="https://files.pythonhosted.org/packages/0d/de/84afc54d41aea9787c6d8814391a2d296a8240eef5b59d11704a82d82064/schema-0.7.2.tar.gz"
+MD5SUM="e9b98f979dbda29c3f7bc63e09b20878"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="contextlib2"
+MAINTAINER="Alan Aversa"
+EMAIL="alan_avNOersa@lSPAMavabit.com"
diff --git a/python/schema/slack-desc b/python/schema/slack-desc
new file mode 100644
index 0000000000..437674e2c2
--- /dev/null
+++ b/python/schema/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------------------------------------------------------|
+schema: schema (Python data structures validation)
+schema:
+schema: schema is a library for validating Python data structures, such as
+schema: those obtained from config-files, forms, external services or
+schema: command-line parsing, converted from JSON/YAML (or something else) to
+schema: Python data-types.
+schema:
+schema: https://pypi.org/project/schema/
+schema:
+schema:
+schema:
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/speaklater/README b/python/speaklater/README
index f81ca63b07..c59bdb5667 100644
--- a/python/speaklater/README
+++ b/python/speaklater/README
@@ -1,3 +1,3 @@
 A module that provides lazy strings for translations. Basically you
 get an object that appears to be a string but changes the value every
-time the value is evaluated based on a callable you provide.
\ No newline at end of file
+time the value is evaluated based on a callable you provide.
diff --git a/python/sphinx-rtd-theme/README b/python/sphinx-rtd-theme/README
new file mode 100644
index 0000000000..6612eac0f6
--- /dev/null
+++ b/python/sphinx-rtd-theme/README
@@ -0,0 +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.
+
+To read more and see a working demo head over to readthedocs.org.
diff --git a/python/sphinx-rtd-theme/slack-desc b/python/sphinx-rtd-theme/slack-desc
new file mode 100644
index 0000000000..b8e2b0cd25
--- /dev/null
+++ b/python/sphinx-rtd-theme/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------------------------------------------------------|
+sphinx-rtd-theme: sphinx-rtd-theme (decorator for caching properties in classes)
+sphinx-rtd-theme:
+sphinx-rtd-theme: The sphinx_rtd_theme is a sphinx theme designed to look modern and be
+sphinx-rtd-theme: mobile-friendly.
+sphinx-rtd-theme:
+sphinx-rtd-theme:
+sphinx-rtd-theme: Homepage: https://pypi.org/project/sphinx-rtd-theme
+sphinx-rtd-theme:
+sphinx-rtd-theme:
+sphinx-rtd-theme:
+sphinx-rtd-theme:
diff --git a/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild b/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild
new file mode 100644
index 0000000000..080603232f
--- /dev/null
+++ b/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# SlackBuild build script for sphinx_rtd_theme
+
+# 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=sphinx-rtd-theme
+VERSION=${VERSION:-0.4.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=$( printf $PRGNAM | tr - _ )
+
+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 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/sphinx-rtd-theme/sphinx-rtd-theme.info b/python/sphinx-rtd-theme/sphinx-rtd-theme.info
new file mode 100644
index 0000000000..5814934777
--- /dev/null
+++ b/python/sphinx-rtd-theme/sphinx-rtd-theme.info
@@ -0,0 +1,10 @@
+PRGNAM="sphinx-rtd-theme"
+VERSION="0.4.3"
+HOMEPAGE="https://pypi.org/project/sphinx-rtd-theme"
+DOWNLOAD="https://files.pythonhosted.org/packages/ed/73/7e550d6e4cf9f78a0e0b60b9d93dba295389c3d271c034bf2ea3463a79f9/sphinx_rtd_theme-0.4.3.tar.gz"
+MD5SUM="6c50f30bc39046f497d336039a0c13fa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+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-devhelp/sphinxcontrib-devhelp.SlackBuild b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild
index 8ea318ccf6..5c78441342 100644
--- a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild
+++ b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sphinxcontrib-devhelp
 
-# 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=sphinxcontrib-devhelp
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info
index fa6fc11b5d..ebba055f29 100644
--- a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info
+++ b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info
@@ -1,8 +1,8 @@
 PRGNAM="sphinxcontrib-devhelp"
-VERSION="1.0.1"
+VERSION="1.0.2"
 HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-devhelp"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.tar.gz"
-MD5SUM="ecb33259e2e8300493d210140af7d957"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.tar.gz"
+MD5SUM="94069c5cdb5079c445f5477fa6107016"
 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-plantuml/sphinxcontrib-plantuml.SlackBuild b/python/sphinxcontrib-plantuml/sphinxcontrib-plantuml.SlackBuild
index b925604841..74a5783554 100644
--- a/python/sphinxcontrib-plantuml/sphinxcontrib-plantuml.SlackBuild
+++ b/python/sphinxcontrib-plantuml/sphinxcontrib-plantuml.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sphinxcontrib-plantuml
 
-# Copyright 2017-2019 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=sphinxcontrib-plantuml
-VERSION=${VERSION:-0.17.1}
+VERSION=${VERSION:-0.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/sphinxcontrib-plantuml/sphinxcontrib-plantuml.info b/python/sphinxcontrib-plantuml/sphinxcontrib-plantuml.info
index c21ef7aff3..9466e4ac77 100644
--- a/python/sphinxcontrib-plantuml/sphinxcontrib-plantuml.info
+++ b/python/sphinxcontrib-plantuml/sphinxcontrib-plantuml.info
@@ -1,8 +1,8 @@
 PRGNAM="sphinxcontrib-plantuml"
-VERSION="0.17.1"
+VERSION="0.18"
 HOMEPAGE="https://pypi.python.org/pypi/sphinxcontrib-plantuml"
-DOWNLOAD="https://files.pythonhosted.org/packages/2e/ed/6248d8efecbf9d7cfb0dca66034df866d72b4f6fa33629091857e0d302a6/sphinxcontrib-plantuml-0.17.1.tar.gz"
-MD5SUM="e6ea1a059214cfec295cf3b81ae8ce99"
+DOWNLOAD="https://files.pythonhosted.org/packages/2b/92/dcd66c09dc400400f9e98aff880cd53306c3d8c545863f6e1170e0531ba8/sphinxcontrib-plantuml-0.18.tar.gz"
+MD5SUM="0bb861d5aac0114ac5a2ac4abc280e4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Sphinx"
diff --git a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild
index d090f37157..3d21f4cf41 100644
--- a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild
+++ b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sphinxcontrib-qthelp
 
-# 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=sphinxcontrib-qthelp
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info
index 87c6146a2c..7732fe5623 100644
--- a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info
+++ b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info
@@ -1,8 +1,8 @@
 PRGNAM="sphinxcontrib-qthelp"
-VERSION="1.0.2"
+VERSION="1.0.3"
 HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-qthelp"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.tar.gz"
-MD5SUM="3532d4643d0b1cc3806e43f59495c030"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.tar.gz"
+MD5SUM="93216721f3e154cce12d1e9c3307b415"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild
index 2d0911b3a0..6cff32ed72 100644
--- a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild
+++ b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sphinxcontrib-serializinghtml
 
-# 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=sphinxcontrib-serializinghtml
-VERSION=${VERSION:-1.1.1}
+VERSION=${VERSION:-1.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info
index a7d8752603..4ae51762a2 100644
--- a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info
+++ b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info
@@ -1,8 +1,8 @@
 PRGNAM="sphinxcontrib-serializinghtml"
-VERSION="1.1.1"
+VERSION="1.1.4"
 HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.1.tar.gz"
-MD5SUM="88cf0203327624d06667349967c52192"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.tar.gz"
+MD5SUM="518ff437dcb05a74ed32ba19c892ce05"
 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 f8abeb90c7..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.0}
+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 2f9c7a9109..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.0"
+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.0.tar.gz"
-MD5SUM="89495aae5ca26c4096e4846083ab3782"
+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/testscenarios/slack-desc b/python/testscenarios/slack-desc
index d9c39d706f..0790ecfa3d 100644
--- a/python/testscenarios/slack-desc
+++ b/python/testscenarios/slack-desc
@@ -16,4 +16,4 @@ testscenarios: code itself, allowing easy testing in different situations).
 testscenarios:
 testscenarios: https://launchpad.net/testscenarios
 testscenarios:
-testscenarios:
\ No newline at end of file
+testscenarios:
diff --git a/python/tgext.routes/README b/python/tgext.routes/README
index fd5c3688aa..e67a13791e 100644
--- a/python/tgext.routes/README
+++ b/python/tgext.routes/README
@@ -1,2 +1,2 @@
-tgext.routes provides a simple way to integrate routes based dispatch into
-TurboGears2 applications.
\ No newline at end of file
+tgext.routes provides a simple way to integrate routes based dispatch
+into TurboGears2 applications.
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/traceback2/README b/python/traceback2/README
index fd3759393b..d0147c2d40 100644
--- a/python/traceback2/README
+++ b/python/traceback2/README
@@ -1 +1 @@
-A backport of traceback to older supported Pythons.
\ No newline at end of file
+A backport of traceback to older supported Pythons.
diff --git a/python/traceback2/slack-desc b/python/traceback2/slack-desc
index a9258168d0..ed5360b835 100644
--- a/python/traceback2/slack-desc
+++ b/python/traceback2/slack-desc
@@ -16,4 +16,4 @@ traceback2:
 traceback2:
 traceback2:
 traceback2:
-traceback2:
\ No newline at end of file
+traceback2:
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
new file mode 100644
index 0000000000..7c11c211d7
--- /dev/null
+++ b/python/typing-extensions/README
@@ -0,0 +1,20 @@
+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.
+
+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.
+
+Optional:
+
+python3
diff --git a/python/typing-extensions/slack-desc b/python/typing-extensions/slack-desc
new file mode 100644
index 0000000000..1f497e6ac3
--- /dev/null
+++ b/python/typing-extensions/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------------------------------------------------------|
+typing-extensions: typing-extensions (Backported and Experimental Type Hints for Python)
+typing-extensions:
+typing-extensions: The typing module was added to the standard library in Python 3.5 on
+typing-extensions: a provisional basis and will no longer be provisional in Python 3.7.
+typing-extensions: However, this means users of Python 3.5 - 3.6 who are unable to
+typing-extensions: upgrade willnot be able to take advantage of new types added to the
+typing-extensions: typing module, such as typing.Text or typing.Coroutine.
+typing-extensions:
+typing-extensions:
+typing-extensions:  Homepage: https://pypi.org/project/typing-extensions/
+typing-extensions:
diff --git a/python/typing-extensions/typing-extensions.SlackBuild b/python/typing-extensions/typing-extensions.SlackBuild
new file mode 100644
index 0000000000..b10423fe6f
--- /dev/null
+++ b/python/typing-extensions/typing-extensions.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# SlackBuild build script for typing-extensions
+
+# 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=typing-extensions
+PKGNAM=typing_extensions
+VERSION=${VERSION:-3.7.4.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PKGNAM | 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}
+
+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 {} \;
+
+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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PKGNAM.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/typing-extensions/typing-extensions.info b/python/typing-extensions/typing-extensions.info
new file mode 100644
index 0000000000..eaa8077ee4
--- /dev/null
+++ b/python/typing-extensions/typing-extensions.info
@@ -0,0 +1,10 @@
+PRGNAM="typing-extensions"
+VERSION="3.7.4.1"
+HOMEPAGE="https://pypi.org/project/typing-extensions/"
+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=""
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
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/README b/python/vine/README
new file mode 100644
index 0000000000..4b83089577
--- /dev/null
+++ b/python/vine/README
@@ -0,0 +1 @@
+A Python module promise, async, future.
diff --git a/python/vine/slack-desc b/python/vine/slack-desc
new file mode 100644
index 0000000000..a637e83b08
--- /dev/null
+++ b/python/vine/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------------------------------------------------------|
+vine: vine (promise, async, future)
+vine:
+vine: Homepage: https://pypi.org/project/vine/
+vine:
+vine:
+vine:
+vine:
+vine:
+vine:
+vine:
+vine:
diff --git a/python/vine/vine.SlackBuild b/python/vine/vine.SlackBuild
new file mode 100644
index 0000000000..07bfd8d1d8
--- /dev/null
+++ b/python/vine/vine.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# SlackBuild build script for vine
+
+# 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=vine
+VERSION=${VERSION:-5.0.0}
+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}
+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 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/vine/vine.info b/python/vine/vine.info
new file mode 100644
index 0000000000..c6e553284b
--- /dev/null
+++ b/python/vine/vine.info
@@ -0,0 +1,10 @@
+PRGNAM="vine"
+VERSION="5.0.0"
+HOMEPAGE="https://pypi.org/project/vine/"
+DOWNLOAD="https://files.pythonhosted.org/packages/66/b2/8954108816865edf2b1e0d24f3c2c11dfd7232f795bcf1e4164fb8ee5e15/vine-5.0.0.tar.gz"
+MD5SUM="2fc3270a999cdc9341ba173360d62367"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/watchdog/README b/python/watchdog/README
new file mode 100644
index 0000000000..c91bfe7cd6
--- /dev/null
+++ b/python/watchdog/README
@@ -0,0 +1 @@
+Python API and shell utilities to monitor file system events.
diff --git a/python/watchdog/slack-desc b/python/watchdog/slack-desc
new file mode 100644
index 0000000000..1b93fae280
--- /dev/null
+++ b/python/watchdog/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------------------------------------------------------|
+watchdog: watchdog (Filesystem events monitoring)
+watchdog:
+watchdog: Python API and shell utilities to monitor file system events.
+watchdog:
+watchdog: Works on Python 2.7 and 3.4+. If you want to use an old version of
+watchdog: Python, you should stick with watchdog < 0.10.0.
+watchdog:
+watchdog:
+watchdog:
+watchdog: Homepage: https://pypi.org/project/watchdog/
+watchdog:
diff --git a/python/watchdog/watchdog.SlackBuild b/python/watchdog/watchdog.SlackBuild
new file mode 100644
index 0000000000..df2bf18380
--- /dev/null
+++ b/python/watchdog/watchdog.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# SlackBuild build script for watchdog
+
+# 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=watchdog
+SRCPKG=${SRCPKG-watchdog}
+VERSION=${VERSION:-0.10.4}
+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
+
+# 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/watchdog/watchdog.info b/python/watchdog/watchdog.info
new file mode 100644
index 0000000000..4bf2b5701b
--- /dev/null
+++ b/python/watchdog/watchdog.info
@@ -0,0 +1,10 @@
+PRGNAM="watchdog"
+VERSION="0.10.4"
+HOMEPAGE="https://pypi.org/project/watchdog/"
+DOWNLOAD="https://files.pythonhosted.org/packages/6f/10/500580a0987363a0d9e1f3dd5cb1bba94a47e19266c6ce9dfb6cdd455758/watchdog-0.10.4.tar.gz"
+MD5SUM="d8fba5e25277520b65ca55952ae1341b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+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/werkzeug/werkzeug.SlackBuild b/python/werkzeug/werkzeug.SlackBuild
index 26eb146bae..622bc4e4a0 100644
--- a/python/werkzeug/werkzeug.SlackBuild
+++ b/python/werkzeug/werkzeug.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=werkzeug
 SRCNAM=Werkzeug
-VERSION=${VERSION:-0.16.1}
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/werkzeug/werkzeug.info b/python/werkzeug/werkzeug.info
index adddd26e08..8533846a94 100644
--- a/python/werkzeug/werkzeug.info
+++ b/python/werkzeug/werkzeug.info
@@ -1,8 +1,8 @@
 PRGNAM="werkzeug"
-VERSION="0.16.1"
+VERSION="1.0.1"
 HOMEPAGE="https://palletsprojects.com/p/werkzeug/"
-DOWNLOAD="https://files.pythonhosted.org/packages/c3/1d/1c0761d9365d166dc9d882a48c437111d22b0df564d6d5768045d9a51fd0/Werkzeug-0.16.1.tar.gz"
-MD5SUM="bfa03955bdc885e8612493b5d2122e15"
+DOWNLOAD="https://files.pythonhosted.org/packages/10/27/a33329150147594eff0ea4c33c2036c0eadd933141055be0ff911f7f8d04/Werkzeug-1.0.1.tar.gz"
+MD5SUM="5d499cfdd30de5d9c946994783772efd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/workbook/README b/python/workbook/README
new file mode 100644
index 0000000000..75b54cc21b
--- /dev/null
+++ b/python/workbook/README
@@ -0,0 +1 @@
+A Python app that creates xls reports, or tables, from simple lists.
diff --git a/python/workbook/slack-desc b/python/workbook/slack-desc
new file mode 100644
index 0000000000..a24104e63a
--- /dev/null
+++ b/python/workbook/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------------------------------------------------------|
+workbook: workbook (App that creates xls reports, or tables, from simple lists)
+workbook:
+workbook: Homepage: https://pypi.org/project/workbook
+workbook:
+workbook:
+workbook:
+workbook:
+workbook:
+workbook:
+workbook:
+workbook:
diff --git a/python/workbook/workbook.SlackBuild b/python/workbook/workbook.SlackBuild
new file mode 100644
index 0000000000..0249391988
--- /dev/null
+++ b/python/workbook/workbook.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# SlackBuild build script for workbook
+
+# 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=workbook
+VERSION=${VERSION:-1.1}
+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}
+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 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/workbook/workbook.info b/python/workbook/workbook.info
new file mode 100644
index 0000000000..388bd33ffe
--- /dev/null
+++ b/python/workbook/workbook.info
@@ -0,0 +1,10 @@
+PRGNAM="workbook"
+VERSION="1.1"
+HOMEPAGE="https://pypi.org/project/workbook"
+DOWNLOAD="https://files.pythonhosted.org/packages/52/bd/ec0d6ac60fe1eb06e36012892bd59b62740e9d4eaca1d0d2a38da159beb3/workbook-1.1.tar.gz"
+MD5SUM="0853f1ea05529ccc7ccf83e8e033dd43"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/xlutils/README b/python/xlutils/README
new file mode 100644
index 0000000000..2759416d02
--- /dev/null
+++ b/python/xlutils/README
@@ -0,0 +1,46 @@
+A Python package provides a collection of utilities for working with Excel
+files. Since these utilities may require either or both of the xlrd and xlwt
+packages, they are collected together here, separate from either package.
+
+Currently available are:
+
+xlutils.copy
+    Tools for copying xlrd.Book objects to xlwt.Workbook objects.
+xlutils.display
+		Utility functions for displaying information about xlrd-related objects in
+		a user-friendly and safe fashion.
+xlutils.filter
+		A mini framework for splitting and filtering Excel files into new Excel
+		files.
+xlutils.margins
+    Tools for finding how much of an Excel file contains useful data.
+xlutils.save
+    Tools for serializing xlrd.Book objects back to Excel files.
+xlutils.styles
+    Tools for working with formatting information expressed in styles.
+
+Installation
+
+Do the following in your virtualenv:
+
+pip install xlutils
+
+Documentation
+
+The latest documentation can also be found at:
+http://xlutils.readthedocs.org/en/latest/
+
+Problems?
+
+Try the following in this order:
+
+    Read the source
+    Ask a question on http://groups.google.com/group/python-excel/
+
+Licensing
+
+Copyright (c) 2008-2015 Simplistix Ltd. See docs/license.txt for details.
+
+Optional
+
+Python3 support is detected automatically.
diff --git a/python/xlutils/slack-desc b/python/xlutils/slack-desc
new file mode 100644
index 0000000000..0c98fbf16c
--- /dev/null
+++ b/python/xlutils/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------------------------------------------------------|
+xlutils: xlutils (utilities for working with Excel files)
+xlutils:
+xlutils: Homepage: https://pypi.org/project/xlutils
+xlutils:
+xlutils:
+xlutils:
+xlutils:
+xlutils:
+xlutils:
+xlutils:
+xlutils:
diff --git a/python/xlutils/xlutils.SlackBuild b/python/xlutils/xlutils.SlackBuild
new file mode 100644
index 0000000000..9573ebd806
--- /dev/null
+++ b/python/xlutils/xlutils.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# SlackBuild build script for xlutils
+
+# 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.
+
+# Modified by slackbuilds.org
+
+PRGNAM=xlutils
+VERSION=${VERSION:-2.0.0}
+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}
+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 {} \;
+
+ # 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 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/xlutils/xlutils.info b/python/xlutils/xlutils.info
new file mode 100644
index 0000000000..656b0c46ac
--- /dev/null
+++ b/python/xlutils/xlutils.info
@@ -0,0 +1,10 @@
+PRGNAM="xlutils"
+VERSION="2.0.0"
+HOMEPAGE="https://pypi.org/project/xlutils"
+DOWNLOAD="https://files.pythonhosted.org/packages/93/fe/af6d73e4bc7b0ce359d34bebb2e8d4d129763acfecd66a3a7efc587e54c9/xlutils-2.0.0.tar.gz"
+MD5SUM="7a6a339ddaacabce244341582ee61353"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Prof. HORSTMANN"
+EMAIL="wmh@eipg.fr"
diff --git a/python/zeep/README b/python/zeep/README
index 83cccd6b88..f36726af8d 100644
--- a/python/zeep/README
+++ b/python/zeep/README
@@ -2,11 +2,11 @@ A fast and modern Python SOAP client
 
 Highlights:
 
-Compatible with Python 2.7, 3.3, 3.4, 3.5, 3.6, 3.7 and PyPy
-Build on top of lxml and requests
+- Compatible with Python 2.7, 3.3, 3.4, 3.5, 3.6, 3.7 and PyPy
+- Built on top of lxml and requests
 - Support for Soap 1.1, Soap 1.2 and HTTP bindings
 - Support for WS-Addressing headers
 - Support for WSSE (UserNameToken / x.509 signing)
 - Support for tornado async transport via gen.coroutine (Python 2.7+)
 - Support for asyncio via aiohttp (Python 3.5+)
-- Experimental support for XOP messages
\ No newline at end of file
+- Experimental support for XOP messages
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 997022a945..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:-20200224}
+VERSION=${VERSION:-20210405}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,7 +51,7 @@ find -L . \
 PREFIX=$PKG/usr bash ./install.sh
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CONDUCT.md README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CODE_OF_CONDUCT.md README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/ruby/ruby-build/ruby-build.info b/ruby/ruby-build/ruby-build.info
index a5a6aa399f..66fb159c0a 100644
--- a/ruby/ruby-build/ruby-build.info
+++ b/ruby/ruby-build/ruby-build.info
@@ -1,8 +1,8 @@
 PRGNAM="ruby-build"
-VERSION="20200224"
+VERSION="20210405"
 HOMEPAGE="https://github.com/rbenv/ruby-build"
-DOWNLOAD="https://github.com/rbenv/ruby-build/archive/v20200224/ruby-build-20200224.tar.gz"
-MD5SUM="d20a7fd2d063d6526117ce1798d7bb3f"
+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/ruby-native-package-installer/ruby-native-package-installer.SlackBuild b/ruby/ruby-native-package-installer/ruby-native-package-installer.SlackBuild
index 382f2f8ea0..0af78f64df 100644
--- a/ruby/ruby-native-package-installer/ruby-native-package-installer.SlackBuild
+++ b/ruby/ruby-native-package-installer/ruby-native-package-installer.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ruby-native-package-installer
 
-# 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=ruby-native-package-installer
-VERSION=${VERSION:-1.0.6}
+VERSION=${VERSION:-1.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/ruby-native-package-installer/ruby-native-package-installer.info b/ruby/ruby-native-package-installer/ruby-native-package-installer.info
index 876de0a2af..633d612848 100644
--- a/ruby/ruby-native-package-installer/ruby-native-package-installer.info
+++ b/ruby/ruby-native-package-installer/ruby-native-package-installer.info
@@ -1,8 +1,8 @@
 PRGNAM="ruby-native-package-installer"
-VERSION="1.0.6"
+VERSION="1.0.9"
 HOMEPAGE="https://rubygems.org/gems/native-package-installer/"
-DOWNLOAD="https://rubygems.org/downloads/native-package-installer-1.0.6.gem"
-MD5SUM="d181b7f2520a9119d72e2c28fac04085"
+DOWNLOAD="https://rubygems.org/downloads/native-package-installer-1.0.9.gem"
+MD5SUM="e31f13f221831458ed5c05f7b12111de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ruby/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild b/ruby/rubygem-asciidoctor/rubygem-asciidoctor.SlackBuild
index 0d5a8fa7b0..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 2017 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:-1.5.6.1}
+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 97ec285487..261b61eab1 100644
--- a/ruby/rubygem-asciidoctor/rubygem-asciidoctor.info
+++ b/ruby/rubygem-asciidoctor/rubygem-asciidoctor.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygem-asciidoctor"
-VERSION="1.5.6.1"
+VERSION="2.0.12"
 HOMEPAGE="https://asciidoctor.org"
-DOWNLOAD="https://rubygems.org/downloads/asciidoctor-1.5.6.1.gem"
-MD5SUM="635b2a8ff04dd5b5f534d915c1303d2c"
+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 77142e3463..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 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.0}
+VERSION=${VERSION:-2.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -106,7 +106,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 tar -x -O --file=$CWD/$SRCNAM-$VERSION.gem data.tar.gz \
   | tar -xz -C $PKG/usr/doc/$PRGNAM-$VERSION --file=- \
-  CHANGELOG.md LICENSE.MIT README.YARD.md README.md
+  LICENSE.MIT README.YARD.md
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/ruby/rubygem-ast/rubygem-ast.info b/ruby/rubygem-ast/rubygem-ast.info
index 8047fc3696..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.0"
+VERSION="2.4.2"
 HOMEPAGE="https://github.com/whitequark/ast"
-DOWNLOAD="https://rubygems.org/downloads/ast-2.4.0.gem"
-MD5SUM="32de813722684ea1dad7fefc676d0838"
+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 1822b4ca08..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-2019  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
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rubygem-mime-types-data
-VERSION=${VERSION:-3.2019.0904}
+VERSION=${VERSION:-3.2020.0425}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
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 440f4b6be5..bced4512b3 100644
--- a/ruby/rubygem-mime-types-data/rubygem-mime-types-data.info
+++ b/ruby/rubygem-mime-types-data/rubygem-mime-types-data.info
@@ -1,10 +1,10 @@
 PRGNAM="rubygem-mime-types-data"
-VERSION="3.2019.0904"
+VERSION="3.2020.0425"
 HOMEPAGE="https://github.com/mime-types/mime-types-data/"
-DOWNLOAD="https://rubygems.org/downloads/mime-types-data-3.2019.0904.gem"
-MD5SUM="e4a08a2fa91253d66fe2ca486be8b8fc"
+DOWNLOAD="https://rubygems.org/downloads/mime-types-data-3.2020.0425.gem"
+MD5SUM="a88a5ae4a12153f248e33e3f8867e61e"
 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-mini_mime/slack-desc b/ruby/rubygem-mini_mime/slack-desc
index 0bda4f0b87..9ead0a9e92 100644
--- a/ruby/rubygem-mini_mime/slack-desc
+++ b/ruby/rubygem-mini_mime/slack-desc
@@ -8,7 +8,7 @@
                  |-----handy-ruler------------------------------------------------------|
 rubygem-mini_mime: rubygem-mini_mime (A lightweight mime type lookup toy)
 rubygem-mini_mime:
-rubygem-mini_mime: 
+rubygem-mini_mime:
 rubygem-mini_mime: https://github.com/discourse/mini_mime
 rubygem-mini_mime:
 rubygem-mini_mime:
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-parallel/rubygem-parallel.SlackBuild b/ruby/rubygem-parallel/rubygem-parallel.SlackBuild
index 446ce96a05..2b506b99cf 100644
--- a/ruby/rubygem-parallel/rubygem-parallel.SlackBuild
+++ b/ruby/rubygem-parallel/rubygem-parallel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rubygem-parallel
 
-# Copyright 2018-2019 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-parallel
-VERSION=${VERSION:-1.19.1}
+VERSION=${VERSION:-1.19.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/rubygem-parallel/rubygem-parallel.info b/ruby/rubygem-parallel/rubygem-parallel.info
index 929dcc73ea..b786498e0e 100644
--- a/ruby/rubygem-parallel/rubygem-parallel.info
+++ b/ruby/rubygem-parallel/rubygem-parallel.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygem-parallel"
-VERSION="1.19.1"
+VERSION="1.19.2"
 HOMEPAGE="https://github.com/grosser/parallel"
-DOWNLOAD="https://rubygems.org/downloads/parallel-1.19.1.gem"
-MD5SUM="ff0c8f17b5157648104052a2fa1304f3"
+DOWNLOAD="https://rubygems.org/downloads/parallel-1.19.2.gem"
+MD5SUM="5b1f8858726eb4e70ade82bc69eef944"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ruby/rubygem-parser/rubygem-parser.SlackBuild b/ruby/rubygem-parser/rubygem-parser.SlackBuild
index 82464be867..9094c227af 100644
--- a/ruby/rubygem-parser/rubygem-parser.SlackBuild
+++ b/ruby/rubygem-parser/rubygem-parser.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rubygem-parser
-VERSION=${VERSION:-2.7.0.2}
+VERSION=${VERSION:-2.7.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -104,9 +104,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
-tar -x -O --file=$CWD/$SRCNAM-$VERSION.gem data.tar.gz \
-  | tar -xz -C $PKG/usr/doc/$PRGNAM-$VERSION --file=- \
-  CHANGELOG.md CONTRIBUTING.md LICENSE.txt README.md
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/ruby/rubygem-parser/rubygem-parser.info b/ruby/rubygem-parser/rubygem-parser.info
index 69390348cb..e7249ffccc 100644
--- a/ruby/rubygem-parser/rubygem-parser.info
+++ b/ruby/rubygem-parser/rubygem-parser.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygem-parser"
-VERSION="2.7.0.2"
+VERSION="2.7.2.0"
 HOMEPAGE="https://github.com/whitequark/parser"
-DOWNLOAD="https://rubygems.org/downloads/parser-2.7.0.2.gem"
-MD5SUM="f48fa8d982e79b0813194d8d61fccbbf"
+DOWNLOAD="https://rubygems.org/downloads/parser-2.7.2.0.gem"
+MD5SUM="fbf1640132d6b96166eddcf70e36b722"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-ast"
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 4a24e845bd..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-2019 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.14}
+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 6754ad62c1..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.14"
+VERSION="0.1.17"
 HOMEPAGE="https://github.com/ericqweinstein/ruumba"
-DOWNLOAD="https://rubygems.org/downloads/ruumba-0.1.14.gem"
-MD5SUM="936191c77dfee365119acf73753fd931"
+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 e837bdcf71..1bce43a99f 100644
--- a/ruby/sequel/sequel.SlackBuild
+++ b/ruby/sequel/sequel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sequel
 
-# Copyright 2013-2018 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.30.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 ce66e1dd46..09911d119f 100644
--- a/ruby/sequel/sequel.info
+++ b/ruby/sequel/sequel.info
@@ -1,10 +1,10 @@
 PRGNAM="sequel"
-VERSION="5.30.0"
+VERSION="5.42.0"
 HOMEPAGE="http://sequel.jeremyevans.net/"
-DOWNLOAD="https://rubygems.org/downloads/sequel-5.30.0.gem"
-MD5SUM="72abf148718a69c9cf623c5f8c074dbb"
+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 8530510954..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:-3.2.4}
+VERSION=${VERSION:-4.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,10 +84,8 @@ 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 -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog COPYING README.md $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
diff --git a/system/CPU-X/CPU-X.info b/system/CPU-X/CPU-X.info
index 8a160e9c04..c38afb294d 100644
--- a/system/CPU-X/CPU-X.info
+++ b/system/CPU-X/CPU-X.info
@@ -1,8 +1,8 @@
 PRGNAM="CPU-X"
-VERSION="3.2.4"
+VERSION="4.2.0"
 HOMEPAGE="https://x0rg.github.io/CPU-X/"
-DOWNLOAD="https://github.com/X0rg/CPU-X/archive/v3.2.4/CPU-X-3.2.4.tar.gz"
-MD5SUM="1f6f8f4efedd04d6197db0b62f724e62"
+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 e298395571..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.
\ No newline at end of file
+Open Source software designed for GNU/Linux and FreeBSD.
diff --git a/system/CPU-X/doinst.sh b/system/CPU-X/doinst.sh
index a5749a8f36..401d987795 100644
--- a/system/CPU-X/doinst.sh
+++ b/system/CPU-X/doinst.sh
@@ -7,4 +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/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
new file mode 100644
index 0000000000..90175e9ce6
--- /dev/null
+++ b/system/Iosevka-slab/Iosevka-slab.SlackBuild
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# Slackware build script for Iosevka-slab
+
+# Copyright 2020-2021 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=Iosevka-slab
+VERSION=${VERSION:-5.1.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
+unzip -o $CWD/ttc-iosevka-slab-$VERSION.zip -d $TMP/$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/share/fonts/TTF
+cp -a *.ttc $PKG/usr/share/fonts/TTF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+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/Iosevka-slab/Iosevka-slab.info b/system/Iosevka-slab/Iosevka-slab.info
new file mode 100644
index 0000000000..1d011a5459
--- /dev/null
+++ b/system/Iosevka-slab/Iosevka-slab.info
@@ -0,0 +1,10 @@
+PRGNAM="Iosevka-slab"
+VERSION="5.1.1"
+HOMEPAGE="https://typeof.net/Iosevka/"
+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=""
+MAINTAINER="Eugene M."
+EMAIL="damagedone@gmx.com"
diff --git a/system/Iosevka-slab/LICENSE b/system/Iosevka-slab/LICENSE
new file mode 100644
index 0000000000..d952d62c06
--- /dev/null
+++ b/system/Iosevka-slab/LICENSE
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/Iosevka-slab/README b/system/Iosevka-slab/README
new file mode 100644
index 0000000000..ccf6ccfb46
--- /dev/null
+++ b/system/Iosevka-slab/README
@@ -0,0 +1,3 @@
+Iosevka is an open-source, sans-serif, monospace quasi‑proportional
+typeface family, designed for writing code, using in terminals,
+and preparing technical documents.
diff --git a/system/Iosevka-slab/doinst.sh b/system/Iosevka-slab/doinst.sh
new file mode 100644
index 0000000000..f0ffee7710
--- /dev/null
+++ b/system/Iosevka-slab/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
+  )
+
+  [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
+fi
diff --git a/system/Iosevka-slab/slack-desc b/system/Iosevka-slab/slack-desc
new file mode 100644
index 0000000000..03734d2dd2
--- /dev/null
+++ b/system/Iosevka-slab/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------------------------------------------------------|
+Iosevka-slab: Iosevka-slab (Slender monospace slab-serif typeface)
+Iosevka-slab:
+Iosevka-slab: Iosevka is a monospace typeface inspired by Pragmata Pro, M+, and
+Iosevka-slab: DIN Mono. It is designed to have a narrow shape to be space
+Iosevka-slab: efficient and compatible to CJK characters.
+Iosevka-slab:
+Iosevka-slab: Homepage: https://typeof.net/Iosevka/
+Iosevka-slab:
+Iosevka-slab:
+Iosevka-slab:
+Iosevka-slab:
diff --git a/system/Iosevka/Iosevka.SlackBuild b/system/Iosevka/Iosevka.SlackBuild
index c791211400..fcd4d2aca7 100644
--- a/system/Iosevka/Iosevka.SlackBuild
+++ b/system/Iosevka/Iosevka.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Iosevka
 
-# Copyright 2015-2019 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:-2.3.3}
+VERSION=${VERSION:-5.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,13 +40,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/01-iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/02-iosevka-term-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/03-iosevka-type-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/04-iosevka-cc-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/05-iosevka-slab-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
-cd $PRGNAM-$VERSION/ttf
+unzip -o $CWD/ttc-iosevka-$VERSION.zip -d $TMP/$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 \
@@ -55,7 +50,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/fonts/TTF
-cp -a *.ttf $PKG/usr/share/fonts/TTF
+cp -a *.ttc $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
diff --git a/system/Iosevka/Iosevka.info b/system/Iosevka/Iosevka.info
index 5a30c879a0..13e3da213a 100644
--- a/system/Iosevka/Iosevka.info
+++ b/system/Iosevka/Iosevka.info
@@ -1,16 +1,8 @@
 PRGNAM="Iosevka"
-VERSION="2.3.3"
+VERSION="5.1.1"
 HOMEPAGE="https://typeof.net/Iosevka/"
-DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v2.3.3/01-iosevka-2.3.3.zip \
-          https://github.com/be5invis/Iosevka/releases/download/v2.3.3/02-iosevka-term-2.3.3.zip \
-          https://github.com/be5invis/Iosevka/releases/download/v2.3.3/03-iosevka-type-2.3.3.zip \
-          https://github.com/be5invis/Iosevka/releases/download/v2.3.3/04-iosevka-cc-2.3.3.zip \
-          https://github.com/be5invis/Iosevka/releases/download/v2.3.3/05-iosevka-slab-2.3.3.zip"
-MD5SUM="d05451d88596d711bf4bb1fa9b17fc41 \
-        e10873b36f1e8ea1fabfb67c52751342 \
-        d06b4a4d4e5d14a553c041bc26191582 \
-        20b220837781508c1c7e54174efacfc8 \
-        2122ec0ad1dde2edd7003b6d08d07782"
+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/README b/system/Iosevka/README
index cf9f1b1825..ccf6ccfb46 100644
--- a/system/Iosevka/README
+++ b/system/Iosevka/README
@@ -1,7 +1,3 @@
-Iosevka is a slender monospace, sans-serif and slab-serif typeface
-inspired by Pragmata Pro, M+ and PF DIN Mono, designed to be the
-ideal font for programming.
-
-- Four styles: Regular, Italic, Bold, and Bold Italic;
-- Extended language support for most Latin-based Western, Central and
-  Northern European languages, as well as Greek and Cyrillic.
+Iosevka is an open-source, sans-serif, monospace quasi‑proportional
+typeface family, designed for writing code, using in terminals,
+and preparing technical documents.
diff --git a/system/Iosevka/doinst.sh b/system/Iosevka/doinst.sh
index 883c47ac0a..f0ffee7710 100644
--- a/system/Iosevka/doinst.sh
+++ b/system/Iosevka/doinst.sh
@@ -1,10 +1,10 @@
 # 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 .
   )
-fi
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
+
+  [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
 fi
diff --git a/system/Iosevka/slack-desc b/system/Iosevka/slack-desc
index d2113d77a5..540e5c73cf 100644
--- a/system/Iosevka/slack-desc
+++ b/system/Iosevka/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-Iosevka: Iosevka (Open source monospace coding font)
+Iosevka: Iosevka (Slender monospace sans-serif typeface)
 Iosevka:
 Iosevka: Iosevka is a monospace typeface inspired by Pragmata Pro, M+, and
 Iosevka: DIN Mono. It is designed to have a narrow shape to be space
 Iosevka: efficient and compatible to CJK characters.
 Iosevka:
-Iosevka:
 Iosevka: Homepage: https://typeof.net/Iosevka/
 Iosevka:
 Iosevka:
 Iosevka:
+Iosevka:
diff --git a/system/JetBrainsMono/JetBrainsMono.SlackBuild b/system/JetBrainsMono/JetBrainsMono.SlackBuild
index 217a765ab5..fc74eb4097 100644
--- a/system/JetBrainsMono/JetBrainsMono.SlackBuild
+++ b/system/JetBrainsMono/JetBrainsMono.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=JetBrainsMono
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-2.001}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,10 +46,11 @@ unzip $CWD/$PRGNAM-$VERSION.zip
 chown -R root:root .
 
 mkdir -p $PKG/usr/share/fonts/TTF
-cp -a *.ttf $PKG/usr/share/fonts/TTF
+cp -a ttf/*.ttf ttf/"No ligatures"/*.ttf ttf/Variable/*\.ttf $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/README $CWD/LICENSE-2.0.txt $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/.
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/.
+cp $CWD/README $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/.
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/JetBrainsMono/JetBrainsMono.info b/system/JetBrainsMono/JetBrainsMono.info
index a2e53a8652..febfb8453c 100644
--- a/system/JetBrainsMono/JetBrainsMono.info
+++ b/system/JetBrainsMono/JetBrainsMono.info
@@ -1,8 +1,8 @@
 PRGNAM="JetBrainsMono"
-VERSION="1.0.0"
+VERSION="2.001"
 HOMEPAGE="https://www.jetbrains.com/lp/mono/"
-DOWNLOAD="https://download.jetbrains.com/fonts/JetBrainsMono-1.0.0.zip"
-MD5SUM="1083f3f5315a564fb59d571da5c3b624"
+DOWNLOAD="https://download.jetbrains.com/fonts/JetBrainsMono-2.001.zip"
+MD5SUM="62f02985bfef43a27dbdd17641fec210"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/JetBrainsMono/LICENSE-2.0.txt b/system/JetBrainsMono/LICENSE-2.0.txt
deleted file mode 100644
index d645695673..0000000000
--- a/system/JetBrainsMono/LICENSE-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/system/JetBrainsMono/README b/system/JetBrainsMono/README
index a4f52edf29..c8b05b84d9 100644
--- a/system/JetBrainsMono/README
+++ b/system/JetBrainsMono/README
@@ -3,11 +3,13 @@ JetBrainsMono (a typeface for developers)
 JetBrains Mono's typeface forms are simple and free from unnecessary
 details. Rendered in small sizes, the text looks crisper.
 
-JetBrains Mono italic uses a 9° angle; this maintains the optimal
-contrast to minimize distraction and eye strain.
+JetBrains Mono italic uses a 9 degree angle; this maintains the
+optimal contrast to minimize distraction and eye strain.
 
 138 code-specific ligatures to reduce noise by merging symbols and
 removing details so the eyes are processing less.
 
 A radical cut at the end of strokes fits the pixel grid better and
 gives the typeface a stricter and more 'tech' personality.
+
+https://www.jetbrains.com/lp/mono/
diff --git a/system/JetBrainsMono/slack-desc b/system/JetBrainsMono/slack-desc
index dd8b06a341..192fa9d8bb 100644
--- a/system/JetBrainsMono/slack-desc
+++ b/system/JetBrainsMono/slack-desc
@@ -10,8 +10,8 @@ JetBrainsMono: JetBrainsMono (a typeface for developers)
 JetBrainsMono:
 JetBrainsMono: JetBrains Mono's typeface forms are simple and free from unnecessary
 JetBrainsMono: details. Rendered in small sizes, the text looks crisper. JetBrains
-JetBrainsMono: Mono italic uses a 9° angle; this maintains the optimal contrast to
-JetBrainsMono: minimize distraction and eye strain.
+JetBrainsMono: Mono italic uses a 9 degree angle; this maintains the optimal
+JetBrainsMono: contrast to minimize distraction and eye strain.
 JetBrainsMono: 138 code-specific ligatures. To reduce noise by merging symbols and
 JetBrainsMono: removing details so the eyes are processing less.
 JetBrainsMono: A radical cut at the end of strokes fits the pixel grid better and
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/README b/system/Solaar/README
index 9c6b8509f9..cb67a12858 100644
--- a/system/Solaar/README
+++ b/system/Solaar/README
@@ -21,3 +21,6 @@ usermod -a -G plugdev <username>
 After installation, you must physically remove the Unifying Receiver and
 re-insert it for the device node permissions to take effect for the
 first time.
+
+NOTE: As of 1.0.2 Solaar has moved to python3, so all of its
+dependencies must be built with python3 support.
diff --git a/system/Solaar/Solaar.SlackBuild b/system/Solaar/Solaar.SlackBuild
index 360cf018f8..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.1}
+VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,7 +59,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
 
 mkdir -p $PKG/etc/udev/rules.d
 cp -a rules.d/42-logitech-unify-permissions.rules $PKG/etc/udev/rules.d
diff --git a/system/Solaar/Solaar.info b/system/Solaar/Solaar.info
index dc37e41ca4..b42550bf28 100644
--- a/system/Solaar/Solaar.info
+++ b/system/Solaar/Solaar.info
@@ -1,10 +1,10 @@
 PRGNAM="Solaar"
-VERSION="1.0.1"
+VERSION="1.0.4"
 HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-DOWNLOAD="https://github.com/pwr-Solaar/Solaar/archive/1.0.1/Solaar-1.0.1.tar.gz"
-MD5SUM="1464f68e000b2f93897ccc5736bfb61a"
+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="pyudev"
+REQUIRES="pyudev pygobject3-python3"
 MAINTAINER="Erich Ritz"
 EMAIL="erich.public@protonmail.com"
diff --git a/system/ZoneMinder/ZoneMinder.info b/system/ZoneMinder/ZoneMinder.info
index a9356391b8..5e2c800c75 100644
--- a/system/ZoneMinder/ZoneMinder.info
+++ b/system/ZoneMinder/ZoneMinder.info
@@ -1,7 +1,7 @@
 PRGNAM="ZoneMinder"
 VERSION="1.32.2"
 HOMEPAGE="https://www.ZoneMinder.com"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ZoneMinder-1.32.2.tar.gz \
+DOWNLOAD="https://slackware.uk/~urchlay/src/ZoneMinder-1.32.2.tar.gz \
           http://www.andywilcock.com/code/cambozola/cambozola-0.936.tar.gz \
           https://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip"
 MD5SUM="fc986fcb7601d3fe463a2970ead67cf7 \
diff --git a/system/ack/ack.SlackBuild b/system/ack/ack.SlackBuild
index 18c3287a38..7d14084397 100644
--- a/system/ack/ack.SlackBuild
+++ b/system/ack/ack.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ack
-VERSION=${VERSION:-3.3.1}
+VERSION=${VERSION:-3.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/ack/ack.info b/system/ack/ack.info
index aaaf9172e1..887de2ab3d 100644
--- a/system/ack/ack.info
+++ b/system/ack/ack.info
@@ -1,8 +1,8 @@
 PRGNAM="ack"
-VERSION="3.3.1"
+VERSION="3.4.0"
 HOMEPAGE="https://beyondgrep.com"
-DOWNLOAD="https://beyondgrep.com/ack-v3.3.1"
-MD5SUM="5791e8910a0a56d65ef93bdee7a14e92"
+DOWNLOAD="https://beyondgrep.com/ack-v3.4.0"
+MD5SUM="f8537c7a1a89749f0130627cb7de1515"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/acpitool/acpitool.SlackBuild b/system/acpitool/acpitool.SlackBuild
index 2158cdd3a9..9f1d0e1865 100644
--- a/system/acpitool/acpitool.SlackBuild
+++ b/system/acpitool/acpitool.SlackBuild
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 # Copyright 2007 by ktabic (rdc@ktabic.co.uk)
+# Copyright 2020 Ricardo J. Barberis <ricardo.barberis@gmail.com>
+
 #   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
diff --git a/system/acpitool/acpitool.info b/system/acpitool/acpitool.info
index dc3b540b34..6b9e652e62 100644
--- a/system/acpitool/acpitool.info
+++ b/system/acpitool/acpitool.info
@@ -6,5 +6,5 @@ MD5SUM="9e4ec55201be0be71ffbc56d38b42b57"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Rodney Cobb"
-EMAIL="rdc@ktabic.co.uk"
+MAINTAINER="Ricardo J. Barberis"
+EMAIL="ricardo.barberis@gmail.com"
diff --git a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild
index 0070550cdc..01520ef778 100644
--- a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild
+++ b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (c) 2012 Daniel LEVAI
+# Copyright (c) 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -22,23 +23,10 @@
 # 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.
-#
-# Currently maintained by Dugan Chen.
 
 PRGNAM=adobe-source-sans-pro-font
-
-# The version in the tarball
-SRCVERSION=${VERSION:-1.065R-it}
-
-# The version in the package
-VERSION=${VERSION:-2.010.ro.1.065.it}
-
-# The version in the untarred source directory
-SRC_VERSION=2.010R-ro-1.065R-it
-
-SRC=${SRCVERSION}.tar.gz
-SRCDIR=source-sans-pro-${SRC_VERSION}
-
+SRCNAM=source-sans-pro
+VERSION=${VERSION:-3.006R}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,9 +42,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${SRCDIR}
-tar xvf $CWD/$SRC || tar xvf $CWD/$SRCDIR.tar.gz
-cd $SRCDIR
+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 \
@@ -64,11 +52,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 {} \;
 
-mkdir -p $PKG/usr/share/fonts/OTF/
-cp OTF/*.otf $PKG/usr/share/fonts/OTF/
+mkdir -p $PKG/usr/share/fonts/OTF
+cp OTF/*.otf VAR/*.otf $PKG/usr/share/fonts/OTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt ReadMe.html SourceSansProReadMe.html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.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/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info
index f8916d79a3..f7cdb2b4ca 100644
--- a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info
+++ b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info
@@ -1,8 +1,8 @@
 PRGNAM="adobe-source-sans-pro-font"
-VERSION="2.010.ro.1.065.it"
+VERSION="3.006R"
 HOMEPAGE="http://adobe-fonts.github.io/source-sans-pro"
-DOWNLOAD="https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz"
-MD5SUM="5dfa6f327cdd4cb363f8887493696a4c"
+DOWNLOAD="https://github.com/adobe-fonts/source-sans-pro/archive/3.006R/source-sans-pro-3.006R.tar.gz"
+MD5SUM="7e8b5f1898287eb5242645abfdeb527b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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 9129308ac3..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="http://urchlay.naptime.net/~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/aha/aha.SlackBuild b/system/aha/aha.SlackBuild
index 3650feb9c5..360d780e10 100644
--- a/system/aha/aha.SlackBuild
+++ b/system/aha/aha.SlackBuild
@@ -7,13 +7,14 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/
 # for details.
 
+# 20200927 bkw: update for 0.5.1
 # 20181201 bkw: update for 0.5
 # 20170328 bkw: update for 0.4.10.6, use 'make install' instead of manually
 # 20170301 bkw: update for 0.4.10.5, use long-form github URL
 # 20170122 bkw: update for 0.4.10.3
 
 PRGNAM=aha
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/aha/aha.info b/system/aha/aha.info
index de779cecc8..ad321b92ed 100644
--- a/system/aha/aha.info
+++ b/system/aha/aha.info
@@ -1,8 +1,8 @@
 PRGNAM="aha"
-VERSION="0.5"
+VERSION="0.5.1"
 HOMEPAGE="https://github.com/theZiz/aha"
-DOWNLOAD="https://github.com/theZiz/aha/archive/0.5/aha-0.5.tar.gz"
-MD5SUM="bac3269f6ec0218a62e4379ed9253c8a"
+DOWNLOAD="https://github.com/theZiz/aha/archive/0.5.1/aha-0.5.1.tar.gz"
+MD5SUM="ec74d076dd6c5e3a9a8b5e2cb1e2a48d"
 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 3f39249119..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,14 +112,10 @@ 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"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
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 38df6cae55..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.6}
+VERSION=${VERSION:-2.9.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/ansible/ansible.info b/system/ansible/ansible.info
index 8f0f967071..bd7b3a06ee 100644
--- a/system/ansible/ansible.info
+++ b/system/ansible/ansible.info
@@ -1,8 +1,8 @@
 PRGNAM="ansible"
-VERSION="2.9.6"
+VERSION="2.9.20"
 HOMEPAGE="https://www.ansible.com"
-DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.9.6.tar.gz"
-MD5SUM="a871463bcd809363a5857f4690525a93"
+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/apache-tomcat/apache-tomcat.SlackBuild b/system/apache-tomcat/apache-tomcat.SlackBuild
index 541033b591..28eec47580 100644
--- a/system/apache-tomcat/apache-tomcat.SlackBuild
+++ b/system/apache-tomcat/apache-tomcat.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=apache-tomcat
-VERSION=${VERSION:-7.0.67}
+VERSION=${VERSION:-7.0.103}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -66,7 +66,7 @@ find -L . \
 mkdir -p $PKG/etc/tomcat $PKG/usr/share/{tomcat,java} \
   $PKG/var/{run,lib,log,tmp,spool}/tomcat
 
- # required, otherwise, permissions on /var/tmp will be 
+ # required, otherwise, permissions on /var/tmp will be
  # (re)set to 755 when package is installed.
  #
 chmod 1777 $PKG/var/tmp
diff --git a/system/apache-tomcat/apache-tomcat.info b/system/apache-tomcat/apache-tomcat.info
index 3de9bf59f8..2750dfb566 100644
--- a/system/apache-tomcat/apache-tomcat.info
+++ b/system/apache-tomcat/apache-tomcat.info
@@ -1,8 +1,8 @@
 PRGNAM="apache-tomcat"
-VERSION="7.0.67"
-HOMEPAGE="http://tomcat.apache.org/"
-DOWNLOAD="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.67/bin/apache-tomcat-7.0.67.tar.gz"
-MD5SUM="55a5ef91b4bd9082ad5faf91d3372ae2"
+VERSION="7.0.103"
+HOMEPAGE="https://tomcat.apache.org/"
+DOWNLOAD="https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.tar.gz"
+MD5SUM="8dd9df51900023107e0c24f4ed105b01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk commons-daemon"
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/archivemount/README b/system/archivemount/README
index 51d606e0fe..c3cec52a31 100644
--- a/system/archivemount/README
+++ b/system/archivemount/README
@@ -1,9 +1,10 @@
 archivemount (mounts an archive for access as a file system)
 
-archivemount is a FUSE based file system. Its purpose is to mount an
-archive on a mount point where it can be read from or written to as
-with any other file system. This makes accessing the contents of the
-archive, which may be compressed, transparent to other programs, without
-decompressing them.
+archivemount is a FUSE based file system. Its purpose is to mount
+an archive on a mount point where it can be read from or written to
+as with any other file system. This makes accessing the contents of
+the archive, which may be compressed, transparent to other programs,
+without decompressing them.
 
-Supported archive formats: tar, pax, cpio, iso9660 (CD-ROM) images, zip, shar.
+Supported archive formats: tar, pax, cpio, iso9660 (CD-ROM) images,
+zip, shar. Other archive types such as rar and 7z may also work.
diff --git a/system/archivemount/archivemount.SlackBuild b/system/archivemount/archivemount.SlackBuild
index 5c2a6bee93..4b2001ae1d 100644
--- a/system/archivemount/archivemount.SlackBuild
+++ b/system/archivemount/archivemount.SlackBuild
@@ -6,8 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200923 bkw: Update for v0.9.1. Thanks to Alexander Verbovetsky
+# for pointing out the real homepage and new version of archivemount.
+# Also, reflowed the README, all the lines are <= 72 characters now.
+
 PRGNAM=archivemount
-VERSION=${VERSION:-0.8.7}
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,13 +44,11 @@ fi
 
 set -e
 
-TARBALL="${PRGNAM}_${VERSION}.orig.tar.gz"
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$TARBALL
+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 \
diff --git a/system/archivemount/archivemount.info b/system/archivemount/archivemount.info
index e41242dba7..0a2296ff0b 100644
--- a/system/archivemount/archivemount.info
+++ b/system/archivemount/archivemount.info
@@ -1,8 +1,8 @@
 PRGNAM="archivemount"
-VERSION="0.8.7"
-HOMEPAGE="https://packages.debian.org/sid/utils/archivemount"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/a/archivemount/archivemount_0.8.7.orig.tar.gz"
-MD5SUM="7fee322a4b1d960e19a64870ca78924b"
+VERSION="0.9.1"
+HOMEPAGE="https://www.cybernoia.de/software/archivemount.html"
+DOWNLOAD="https://www.cybernoia.de/software/archivemount/archivemount-0.9.1.tar.gz"
+MD5SUM="954c096230ab1e1f7153555c0221b37d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/archivemount/slack-desc b/system/archivemount/slack-desc
index 1b5ba3eb2d..c87b440dae 100644
--- a/system/archivemount/slack-desc
+++ b/system/archivemount/slack-desc
@@ -15,5 +15,5 @@ archivemount: the archive, which may be compressed, transparent to other program
 archivemount: without decompressing them.
 archivemount:
 archivemount: Supported archive formats: tar, pax, cpio, iso9660 (CD-ROM) images,
-archivemount: zip, shar.
+archivemount: zip, shar.  Other archive types such as rar and 7z may also work.
 archivemount:
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/autojump/README b/system/autojump/README
index 3d2ad6a249..3e949333ec 100644
--- a/system/autojump/README
+++ b/system/autojump/README
@@ -5,3 +5,35 @@ becomes usable. Autojump will listen and rank your 'cd' commands by
 frequency. Once your database is reasonably complete, you can "jump"
 to a commonly "cd"ed directory.  It supports the bash, zsh, and
 tcsh shells.
+
+Additional Installation Steps
+------------------------------
+
+Add the following to your .bashrc to enable autojump for your
+account:
+
+[[ -s /etc/profile.d/autojump.sh ]] && source /etc/profile.d/autojump.sh
+
+You must open a new shell for autojump to become active.  You may
+also need to log in and out of your desktop environment.
+
+The default shell in Slackware is Bash. Further steps may be
+required for other shell environments.
+
+Example Usage
+--------------
+
+$ cd /tmp
+$ cd /home
+$ cd /var
+$ cd /var/log
+$ j tmp
+$ j log
+$ jo /home
+$ j -s
+
+The "j" command drops you back into each directory.  The "jo"
+command will launch a file manager for the home directory if
+you are using a graphical environment.  Adding "-s" to the "j"
+command will list your autojump database.  See the man page
+for further details.
diff --git a/system/autojump/autojump.SlackBuild b/system/autojump/autojump.SlackBuild
index 94d4f6746c..ba2c4d9d93 100644
--- a/system/autojump/autojump.SlackBuild
+++ b/system/autojump/autojump.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for autojump
 
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
-# Copyright 2015-2018 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2015-2018, 2020 Brenton Earl <brent@exitstatusone.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=autojump
-VERSION=${VERSION:-22.5.1}
+VERSION=${VERSION:-22.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,7 +55,7 @@ sed -i "s/'share', 'man'/'man'/" install.py
 
 # Post install message may confuse users, removed
 # Details listed in included README
-sed -i '213,215d' install.py
+sed -i '229,232d' install.py
 
 # Adjust path for bash file source
 sed -i "s:/usr/local/:/usr/:g" bin/$PRGNAM.sh
diff --git a/system/autojump/autojump.info b/system/autojump/autojump.info
index fc62a2a7d5..dcaf89b49a 100644
--- a/system/autojump/autojump.info
+++ b/system/autojump/autojump.info
@@ -1,8 +1,8 @@
 PRGNAM="autojump"
-VERSION="22.5.1"
+VERSION="22.5.3"
 HOMEPAGE="https://github.com/wting/autojump"
-DOWNLOAD="https://github.com/wting/autojump/archive/release-v22.5.1.tar.gz"
-MD5SUM="eaa7344925ae9a03a19cf9b9a3cdb4b4"
+DOWNLOAD="https://github.com/wting/autojump/archive/release-v22.5.3.tar.gz"
+MD5SUM="29f1a7df736814c747645703bf00ce48"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/autoslackpkg/README b/system/autoslackpkg/README
index 52718e2507..b99aa806f8 100644
--- a/system/autoslackpkg/README
+++ b/system/autoslackpkg/README
@@ -1,11 +1,11 @@
-autoslackpkg automates the use of slackpkg. The script expects to be run as
-the root user. It also expects specific modifications to blacklist,
+autoslackpkg automates the use of slackpkg. The script expects to be run
+as the root user. It also expects specific modifications to blacklist,
 mkinitrd.conf, efi.conf & lilo.conf.
 
-The script maintains multiple kernels and manages EFI & LILO setups
-(not GRUB yet). The default boot kernel is changed to the most recent kernel.
-In the unlikely event the most recent kernel is not functioning properly the
-system can be rebooted with the previous kernel.
+The script maintains multiple kernels and manages EFI & LILO setups (not
+GRUB yet). The default boot kernel is changed to the most recent kernel.
+In the unlikely event the most recent kernel is not functioning properly
+the system can be rebooted with the previous kernel.
 
 The script has a config file /etc/slackpkg/autoslackpkg.conf that sets
 default variables. These variables can be changed based on unique system
@@ -15,21 +15,25 @@ The script requires options and arguments. To see usage help
 run (autoslackpkg) without options or arguments. Usage help also is
 displayed if there is a script option or argument error.
 
-When run with the -h option and a valid argument (autoslackpkg -h overview |
-blacklist | elilo | lilo | mkinitrd) the script provides help.
+When run with the -h option and a valid argument (autoslackpkg -h
+overview | blacklist | elilo | lilo | mkinitrd) the script provides
+help.
 
-When run with the -m option and a valid argument (autoslackpkg -m dialog |
-batch) the script runs in either dialog mode or batch mode. Dialog mode
-is a hands-on, interactive mode. Batch mode runs without user input.
+When run with the -m option and a valid argument (autoslackpkg -m dialog
+| batch) the script runs in either dialog mode or batch mode. Dialog
+mode is a hands-on, interactive mode. Batch mode runs without user
+input.
 
 When run with the -s option (autoslackpkg -s update | install-new |
-upgrade-all | clean-system | install-kernel | remove-kernel | new-config)
-the script only runs a specific section of the overall script.
-
-The script runs in 2 Phases. If not installing a new kernel then autoslackpkg
-runs both Phase 1 & Phase 2 in succession. If a new kernel is installed then
-only Phase 1 is run & reboot is required. After reboot, rerun autoslackpkg
-then Phase 1 is skipped & only Phase 2 is run.
+upgrade-all | clean-system | install-kernel | remove-kernel |
+new-config) the script only runs a specific section of the overall
+script.
+
+The script runs in 2 Phases. If not installing a new kernel then
+autoslackpkg runs both Phase 1 & Phase 2 in succession. If a new kernel
+is installed then only Phase 1 is run & reboot is required. After
+reboot, rerun autoslackpkg then Phase 1 is skipped & only Phase 2 is
+run.
 
 Phase 1 includes:
 
diff --git a/system/autoslackpkg/autoslackpkg.SlackBuild b/system/autoslackpkg/autoslackpkg.SlackBuild
index cfa78322ee..e1b22b7102 100644
--- a/system/autoslackpkg/autoslackpkg.SlackBuild
+++ b/system/autoslackpkg/autoslackpkg.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=autoslackpkg
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,7 @@ cp -a \
 
 mkdir -p $PKG/usr/libexec/$PRGNAM
 cp -a \
-  libexec/* \
+  libexec/$PRGNAM/* \
   $PKG/usr/libexec/$PRGNAM/
 
 mkdir -p $PKG/install
diff --git a/system/autoslackpkg/autoslackpkg.info b/system/autoslackpkg/autoslackpkg.info
index 41a50203f7..1539f227e6 100644
--- a/system/autoslackpkg/autoslackpkg.info
+++ b/system/autoslackpkg/autoslackpkg.info
@@ -1,8 +1,8 @@
 PRGNAM="autoslackpkg"
-VERSION="1.0"
-HOMEPAGE="https://www.go4it2day.com/news/autoslackpkg-1.0.html"
-DOWNLOAD="https://www.go4it2day.com/downloads/autoslackpkg/1.0/autoslackpkg-1.0.tar.gz"
-MD5SUM="886df689f95c75b091e3bf4abc015a83"
+VERSION="1.1"
+HOMEPAGE="https://www.go4it2day.com/news/autoslackpkg-1.1.html"
+DOWNLOAD="https://www.go4it2day.com/downloads/autoslackpkg/1.1/autoslackpkg-1.1.tar.gz"
+MD5SUM="02c46c7abf1d532fbba82abb7b73b71c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/autoslackpkg/slack-desc b/system/autoslackpkg/slack-desc
index f2c635f3e7..12e6cf2207 100644
--- a/system/autoslackpkg/slack-desc
+++ b/system/autoslackpkg/slack-desc
@@ -10,8 +10,7 @@ autoslackpkg: autoslackpkg (automates the use of slackpkg)
 autoslackpkg:
 autoslackpkg: To see autoslackpkg usage run:  autoslackpkg
 autoslackpkg:
-autoslackpkg: Home: https://www.go4it2day.com/news/autoslackpkg-1.0.html
-autoslackpkg:
+autoslackpkg: Home: https://www.go4it2day.com/news/autoslackpkg-1.1.html
 autoslackpkg:
 autoslackpkg:
 autoslackpkg:
diff --git a/system/avfs/avfs.SlackBuild b/system/avfs/avfs.SlackBuild
index 52ba030a2d..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.1}
+VERSION=${VERSION:-1.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/avfs/avfs.info b/system/avfs/avfs.info
index ea312d68cf..8313618311 100644
--- a/system/avfs/avfs.info
+++ b/system/avfs/avfs.info
@@ -1,8 +1,8 @@
 PRGNAM="avfs"
-VERSION="1.1.1"
+VERSION="1.1.4"
 HOMEPAGE="http://avf.sourceforge.net"
-DOWNLOAD="http://sourceforge.net/projects/avf/files/avfs/1.1.1/avfs-1.1.1.tar.bz2"
-MD5SUM="ca10d1abc657ca72a68a43dd76dda6ef"
+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/bacula-client/bacula-client.SlackBuild b/system/bacula-client/bacula-client.SlackBuild
index f2e5727f0e..c481a020db 100644
--- a/system/bacula-client/bacula-client.SlackBuild
+++ b/system/bacula-client/bacula-client.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Bacula Client
 
-# Copyright 2010, 2012, 2013, 2018  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2012, 2013, 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=bacula-client
-VERSION=${VERSION:-9.0.6}
+VERSION=${VERSION:-9.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/bacula-client/bacula-client.info b/system/bacula-client/bacula-client.info
index c819e6ad41..506b822dd6 100644
--- a/system/bacula-client/bacula-client.info
+++ b/system/bacula-client/bacula-client.info
@@ -1,8 +1,8 @@
 PRGNAM="bacula-client"
-VERSION="9.0.6"
+VERSION="9.6.3"
 HOMEPAGE="http://www.bacula.org"
-DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.0.6.tar.gz"
-MD5SUM="9168e398808c42bf290515f60892f643"
+DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.3.tar.gz"
+MD5SUM="6d64bc27de773ee0e0ca1d836cbe4008"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/bacula/README.SLACKWARE b/system/bacula/README.SLACKWARE
index eaf57eba47..6429187729 100644
--- a/system/bacula/README.SLACKWARE
+++ b/system/bacula/README.SLACKWARE
@@ -17,8 +17,8 @@ Remember to give executable permission to /etc/rc.d/rc.local_shutdown:
 
   chmod 0755 /etc/rc.d/rc.local_shutdown
 
-Upgrading from 5.2.13 to 9.0.6
-------------------------------
+Upgrading from 5.2.13/9.0.6 to 9.6.3
+------------------------------------
 
 Before installing the new package, make sure to:
 
diff --git a/system/bacula/bacula.SlackBuild b/system/bacula/bacula.SlackBuild
index a7e1856c7d..30b0059daa 100644
--- a/system/bacula/bacula.SlackBuild
+++ b/system/bacula/bacula.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Bacula
 
-# Copyright 2010, 2012, 2013, 2018  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2012, 2013, 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=bacula
-VERSION=${VERSION:-9.0.6}
+VERSION=${VERSION:-9.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/bacula/bacula.info b/system/bacula/bacula.info
index 4721c04f6d..8ecb0e383d 100644
--- a/system/bacula/bacula.info
+++ b/system/bacula/bacula.info
@@ -1,8 +1,8 @@
 PRGNAM="bacula"
-VERSION="9.0.6"
+VERSION="9.6.3"
 HOMEPAGE="http://www.bacula.org"
-DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.0.6.tar.gz"
-MD5SUM="9168e398808c42bf290515f60892f643"
+DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.3.tar.gz"
+MD5SUM="6d64bc27de773ee0e0ca1d836cbe4008"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/beebem/README b/system/beebem/README
new file mode 100644
index 0000000000..4235aeacc2
--- /dev/null
+++ b/system/beebem/README
@@ -0,0 +1,7 @@
+beebem (BeebEm is a popular Acorn BBC Micro and Master 128 emulator)
+
+This version of BeebEm for UNIX is an SDL port of the Windows version
+of BeebEm. To get the menu system for changing settings, loading and
+running disc images and so-on, press F12 when the emulater is running.
+It's not as polished as the windows version, especially keyboard
+mapping is limited to querty, but its better than nothing. enjoy! :-)
diff --git a/system/beebem/beebem.SlackBuild b/system/beebem/beebem.SlackBuild
new file mode 100644
index 0000000000..7a2d3c3c1e
--- /dev/null
+++ b/system/beebem/beebem.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# Slackware build script for beebem
+
+# Copyright 2020 Tim Dickson Scotland
+# 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=beebem
+VERSION=${VERSION:-0.0.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
+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
+patch -p0 <${CWD}/${PRGNAM}-${VERSION}_64bit.patch
+patch -p0 <${CWD}/${PRGNAM}-${VERSION}-keys.patch
+patch -p0 <${CWD}/${PRGNAM}-${VERSION}_menu_crash.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 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 \
+  --disable-welcome-message \
+  --disable-static \
+  --enable-econet \
+  --build=$ARCH-slackware-linux
+
+make
+#make install does not honour DESTDIR for anything but the binary, so we
+#do a manual install.
+#lets create an icon for the .desktop file
+convert data/resources/icon.bmp -transparent magenta -resize 64 data/resources/beebem.png
+WKDIR=$PKG/usr/share/$PRGNAM
+mkdir -p $PKG/usr/bin $WKDIR/config $WKFIR/resources $WKDIR/media $WKDIR/roms $WKDIR/phroms
+mkdir -p $WKDIR/state/ $PKG/usr/doc/${PRGNAM}-${VERSION} $WKDIR/src
+mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/applications
+cp -a data/resources/${PRGNAM}.png $PKG/usr/share/pixmaps/
+cp $CWD/${PRGNAM}.desktop $PKG/usr/share/applications/
+cp -ar src/$PRGNAM $PKG/usr/bin/$PRGNAM
+for i in config media phroms resources roms state; do
+  cp -ar data/$i $WKDIR/
+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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/${PRGNAM}-${VERSION}/COPYING
+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/beebem/beebem.desktop b/system/beebem/beebem.desktop
new file mode 100644
index 0000000000..bcb002059b
--- /dev/null
+++ b/system/beebem/beebem.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=beebem
+GenericName=emulator
+Comment=bbc microcomputer emulator. When running press F12 to activate menu
+Categories=System;Emulator;
+Exec=beebem %F
+Icon=beebem
+
diff --git a/system/beebem/beebem.info b/system/beebem/beebem.info
new file mode 100644
index 0000000000..e75a5b9736
--- /dev/null
+++ b/system/beebem/beebem.info
@@ -0,0 +1,16 @@
+PRGNAM="beebem"
+VERSION="0.0.13"
+HOMEPAGE="http://beebem-unix.bbcmicro.com/index.html"
+DOWNLOAD="http://beebem-unix.bbcmicro.com/download/beebem-0.0.13.tar.gz \
+	  http://beebem-unix.bbcmicro.com/download/beebem-0.0.13_64bit.patch \
+	  http://beebem-unix.bbcmicro.com/download/beebem-0.0.13-keys.patch \
+	  http://beebem-unix.bbcmicro.com/download/beebem-0.0.13_menu_crash.patch"
+MD5SUM="44e6edc5c3e5fca9a84e2cddc4bf4858 \
+	fb4b26c4b0189dbf0407816314a42ec6 \
+	05d373f8c295039b62f9b48cc4dad9fa \
+	32de835139acabb7b919c18a9ebad830"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
diff --git a/system/beebem/doinst.sh b/system/beebem/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/system/beebem/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/system/beebem/slack-desc b/system/beebem/slack-desc
new file mode 100644
index 0000000000..d89bff9124
--- /dev/null
+++ b/system/beebem/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------------------------------------------------------|
+beebem: beebem (popular Acorn BBC Micro and Master 128 emulator)
+beebem:
+beebem: This version of BeebEm for UNIX is an SDL port of the Windows version
+beebem: of BeebEm
+beebem:
+beebem: Homepage http://beebem-unix.bbcmicro.com/index.html
+beebem:
+beebem:
+beebem:
+beebem:
+beebem:
diff --git a/system/bindfs/README b/system/bindfs/README
index bb05846c4c..42d162bd3e 100644
--- a/system/bindfs/README
+++ b/system/bindfs/README
@@ -1,3 +1,3 @@
-bindfs is a FUSE filesystem for mounting a directory to another location,
-similarly to mount --bind. The permissions inside the mountpoint can be
-altered using various rules.
+bindfs is a FUSE filesystem for mounting a directory to another
+location, similarly to mount --bind. The permissions inside the
+mountpoint can be altered using various rules.
diff --git a/system/bindfs/bindfs.SlackBuild b/system/bindfs/bindfs.SlackBuild
index 9e4b1a24ed..390476cdfd 100644
--- a/system/bindfs/bindfs.SlackBuild
+++ b/system/bindfs/bindfs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bindfs
 
-# Copyright 2013-2019 Kent Fritz Mountain View, CA, USA
+# Copyright 2013-2020 Kent Fritz Mountain View, CA, 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=bindfs
-VERSION=${VERSION:-1.13.10}
+VERSION=${VERSION:-1.14.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/bindfs/bindfs.info b/system/bindfs/bindfs.info
index 6da2fe7080..e37c36f5ad 100644
--- a/system/bindfs/bindfs.info
+++ b/system/bindfs/bindfs.info
@@ -1,8 +1,8 @@
 PRGNAM="bindfs"
-VERSION="1.13.10"
+VERSION="1.14.7"
 HOMEPAGE="https://bindfs.org"
-DOWNLOAD="https://bindfs.org/downloads/bindfs-1.13.10.tar.gz"
-MD5SUM="2a9e47a97d0e54f2fa6c24751993fc58"
+DOWNLOAD="https://bindfs.org/downloads/bindfs-1.14.7.tar.gz"
+MD5SUM="047ca696707077c05d2d995fbd9aec7d"
 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/bitmapfont2ttf/README b/system/bitmapfont2ttf/README
new file mode 100644
index 0000000000..1c9b9a50e0
--- /dev/null
+++ b/system/bitmapfont2ttf/README
@@ -0,0 +1,17 @@
+bitmapfont2ttf (convert bitmap BDF fonts to vector TTF)
+
+bitmapfont2ttf is a fontforge Python script which autotraces the glyphs
+in a bitmap font and converts it to a vector (outline) TrueType font.
+The resulting font retains its "pixelated" look when scaled up to any
+size.
+
+bitmapfont2ttf is a bit picky about the BDF fonts it will accept as
+input.  This build includes a patch that allows it to work with fonts
+produced by psf2bdf (from psftools). The patch is applied by default,
+but you can export PRISTINE=yes in the environment if you really don't
+want it.
+
+If you're trying to convert a PCF font, use pcf2bdf to turn it into a
+BDF first.
+
+If you're looking for exact-autotrace, it's included in this build.
diff --git a/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild b/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild
new file mode 100644
index 0000000000..683b4abfce
--- /dev/null
+++ b/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for bitmapfont2ttf
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# The source tarball contains code from 3 git repositories:
+# https://github.com/dse/bitmapfont2ttf
+# https://github.com/dse/exact-autotrace
+# https://github.com/wernsey/bitmap.git
+# ...plus some minor fixes by me to get exact-autotrace to compile.
+
+PRGNAM=bitmapfont2ttf
+VERSION=${VERSION:-20200215_03529d2}
+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 {} \+
+
+# 20200621 bkw: the fonts produced by some tools (notably psf2bdf)
+# are missing the PIXEL_SIZE property. Patched code derives it from the
+# ascent and descent properties, if necessary. This isn't always correct,
+# but for the 670 fonts in /usr/share/fonts/misc (converted to BDF),
+# it's correct for 654 (98%) of them.
+if [ "${PRISTINE:-no}" != "yes" ]; then
+  patch -p1 < $CWD/derive_pixel_size.diff
+  PATCHDESC=" This package includes a patch for fonts without PIXEL_SIZE."
+fi
+
+make -C exact-autotrace CFLAGS="$SLKCFLAGS"
+strip exact-autotrace/bin/exact-autotrace-c
+mkdir -p $PKG/usr/bin
+install -m0755 exact-autotrace/bin/* bin/$PRGNAM $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md exact-autotrace/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+sed "16s/$/$PATCHDESC/" $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/bitmapfont2ttf/bitmapfont2ttf.info b/system/bitmapfont2ttf/bitmapfont2ttf.info
new file mode 100644
index 0000000000..a245e0f4b4
--- /dev/null
+++ b/system/bitmapfont2ttf/bitmapfont2ttf.info
@@ -0,0 +1,10 @@
+PRGNAM="bitmapfont2ttf"
+VERSION="20200215_03529d2"
+HOMEPAGE="https://github.com/dse/bitmapfont2ttf"
+DOWNLOAD="https://slackware.uk/~urchlay/src/bitmapfont2ttf-20200215_03529d2.tar.xz"
+MD5SUM="5f4ab36a5d56c79e28ce38841f063bdc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/bitmapfont2ttf/derive_pixel_size.diff b/system/bitmapfont2ttf/derive_pixel_size.diff
new file mode 100644
index 0000000000..60afe3242c
--- /dev/null
+++ b/system/bitmapfont2ttf/derive_pixel_size.diff
@@ -0,0 +1,13 @@
+diff -Naur bitmapfont2ttf-20200215_03529d2/bin/bitmapfont2ttf bitmapfont2ttf-20200215_03529d2.patched/bin/bitmapfont2ttf
+--- bitmapfont2ttf-20200215_03529d2/bin/bitmapfont2ttf	2020-06-08 17:30:53.000000000 -0400
++++ bitmapfont2ttf-20200215_03529d2.patched/bin/bitmapfont2ttf	2020-06-21 04:06:26.622171278 -0400
+@@ -122,6 +122,9 @@
+                 continue
+             (cmd, args) = (args[0].upper(), args[1:])
+             if cmd == 'ENDPROPERTIES':
++                if self.pixelSize == None:
++                  self.pixelSize = int(self.ascent + self.descent)
++                  sys.stderr.write('*** missing PIXEL_SIZE property, derived from FONT_ASCENT + FONT_DESCENT: %d\n' % self.pixelSize);
+                 return
+             if cmd == 'PIXEL_SIZE' and len(args) >= 1:
+                 self.pixelSize = float(args[0])
diff --git a/system/bitmapfont2ttf/slack-desc b/system/bitmapfont2ttf/slack-desc
new file mode 100644
index 0000000000..dd948af0b8
--- /dev/null
+++ b/system/bitmapfont2ttf/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------------------------------------------------------|
+bitmapfont2ttf: bitmapfont2ttf (convert bitmap BDF fonts to vector TTF)
+bitmapfont2ttf:
+bitmapfont2ttf: bitmapfont2ttf is a fontforge Python script which autotraces the
+bitmapfont2ttf: glyphs in a bitmap font and converts it to a vector (outline)
+bitmapfont2ttf: TrueType font. The resulting font retains its "pixelated" look
+bitmapfont2ttf: when scaled up to any size.
+bitmapfont2ttf:
+bitmapfont2ttf:
+bitmapfont2ttf:
+bitmapfont2ttf:
+bitmapfont2ttf:
diff --git a/system/bleachbit/bleachbit.SlackBuild b/system/bleachbit/bleachbit.SlackBuild
index 3bd65c539e..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:-3.2.0}
+VERSION=${VERSION:-4.2.0}
 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.bz2
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -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 MANIFEST* COPYING PKG-INFO README* 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 955ee25faf..b2b644d918 100644
--- a/system/bleachbit/bleachbit.info
+++ b/system/bleachbit/bleachbit.info
@@ -1,10 +1,10 @@
 PRGNAM="bleachbit"
-VERSION="3.2.0"
+VERSION="4.2.0"
 HOMEPAGE="https://www.bleachbit.org/"
-DOWNLOAD="https://download.bleachbit.org/bleachbit-3.2.0.tar.bz2"
-MD5SUM="5148e43294199d1493291fd1f5081a40"
+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=""
+REQUIRES="pygobject3-python3"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/system/blktrace/blktrace.info b/system/blktrace/blktrace.info
index b85ff5617f..bfa19c5b18 100644
--- a/system/blktrace/blktrace.info
+++ b/system/blktrace/blktrace.info
@@ -1,7 +1,7 @@
 PRGNAM="blktrace"
 VERSION="1.2.0"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-DOWNLOAD="http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.gz"
+HOMEPAGE="https://brick.kernel.dk/snaps/"
+DOWNLOAD="https://brick.kernel.dk/snaps/blktrace-1.2.0.tar.gz"
 MD5SUM="05abb873b4de96c5e7b2deba80695bf1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/borgbackup/borgbackup.SlackBuild b/system/borgbackup/borgbackup.SlackBuild
index 93a2e84d8d..e7b71cf172 100644
--- a/system/borgbackup/borgbackup.SlackBuild
+++ b/system/borgbackup/borgbackup.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for borgbackup
 
-# Copyright 2019 Andrzej Telszewski, Szczecin
+# Copyright 2020 Andrzej Telszewski, Szczecin
 # 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=borgbackup
-VERSION=${VERSION:-1.1.10}
+VERSION=${VERSION:-1.1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/borgbackup/borgbackup.info b/system/borgbackup/borgbackup.info
index 5a963a72fb..57a140bdfd 100644
--- a/system/borgbackup/borgbackup.info
+++ b/system/borgbackup/borgbackup.info
@@ -1,8 +1,8 @@
 PRGNAM="borgbackup"
-VERSION="1.1.10"
+VERSION="1.1.13"
 HOMEPAGE="https://borgbackup.readthedocs.io/"
-DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.10/borgbackup-1.1.10.tar.gz"
-MD5SUM="0a27e660ace162e41ea1d80e4b700808"
+DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.13/borgbackup-1.1.13.tar.gz"
+MD5SUM="a82d2bdf61bfaeebb90ac8ab1347657a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libb2 lz4 msgpack-python python3 setuptools-scm zstd"
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 9f1dba424e..b6f317e277 100644
--- a/system/btrbk/btrbk.SlackBuild
+++ b/system/btrbk/btrbk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for btrbk
 
-# Copyright 2019 Alan Aversa
+# Copyright 2020 Alan Aversa
 # 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=btrbk
-VERSION=${VERSION:-0.29.0}
+VERSION=${VERSION:-0.31.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/btrbk/btrbk.info b/system/btrbk/btrbk.info
index d8fcbb28f2..e7725f2fe6 100644
--- a/system/btrbk/btrbk.info
+++ b/system/btrbk/btrbk.info
@@ -1,10 +1,10 @@
 PRGNAM="btrbk"
-VERSION="0.29.0"
+VERSION="0.31.0"
 HOMEPAGE="https://digint.ch/btrbk/"
-DOWNLOAD="https://digint.ch/download/btrbk/releases/btrbk-0.29.0.tar.xz"
-MD5SUM="4cd4bef295557a5cc6cc913a37d894a8"
+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/ccd2cue/README b/system/ccd2cue/README
new file mode 100644
index 0000000000..fa0b35ab09
--- /dev/null
+++ b/system/ccd2cue/README
@@ -0,0 +1,5 @@
+ccd2cue (convert proprietary CloneCD images to bin/cue)
+
+GNU ccd2cue is a CCD sheet to CUE sheet converter. It supports the full
+extent of CUE sheet format expressiveness, including mixed-mode discs
+and CD-Text meta-data.
diff --git a/system/ccd2cue/ccd2cue.SlackBuild b/system/ccd2cue/ccd2cue.SlackBuild
new file mode 100644
index 0000000000..743c380b2b
--- /dev/null
+++ b/system/ccd2cue/ccd2cue.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for ccd2cue
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=ccd2cue
+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 /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 \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# Skip Makefile*, INSTALL, and long political rants.
+cp -a THANKS A[NU]* [B-HN-SUVXYZ]* $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/ccd2cue/ccd2cue.info b/system/ccd2cue/ccd2cue.info
new file mode 100644
index 0000000000..02c096e670
--- /dev/null
+++ b/system/ccd2cue/ccd2cue.info
@@ -0,0 +1,10 @@
+PRGNAM="ccd2cue"
+VERSION="0.5"
+HOMEPAGE="https://www.gnu.org/software/ccd2cue/"
+DOWNLOAD="http://ftpmirror.gnu.org/ccd2cue/ccd2cue-0.5.tar.gz"
+MD5SUM="565eb34e3ab5331ee5aab2fe215118aa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/ccd2cue/slack-desc b/system/ccd2cue/slack-desc
new file mode 100644
index 0000000000..c0973a04e7
--- /dev/null
+++ b/system/ccd2cue/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------------------------------------------------------|
+ccd2cue: ccd2cue (convert proprietary CloneCD images to bin/cue)
+ccd2cue:
+ccd2cue: GNU ccd2cue is a CCD sheet to CUE sheet converter. It supports the
+ccd2cue: full extent of CUE sheet format expressiveness, including mixed-mode
+ccd2cue: discs and CD-Text meta-data.
+ccd2cue:
+ccd2cue:
+ccd2cue:
+ccd2cue:
+ccd2cue:
+ccd2cue:
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/README b/system/chronograf/README
index 37c8860d14..fbaadf0fc4 100644
--- a/system/chronograf/README
+++ b/system/chronograf/README
@@ -8,8 +8,9 @@ visualizations of your data.
 
 Groupname and Username
 
-You must have the "chronograf" group and user to run this script, for 
+You must have the "chronograf" group and user to run this script, for
 example:
 
   groupadd -g 350 chronograf
-  useradd -u 350 -s /bin/false -d /var/lib/chronograf -g chronograf chronograf
+  useradd -u 350 -s /bin/false -d /var/lib/chronograf \
+    -g chronograf chronograf
diff --git a/system/chronograf/chronograf.SlackBuild b/system/chronograf/chronograf.SlackBuild
index 35bf3002ee..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.0}
+VERSION=${VERSION:-1.8.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/chronograf/chronograf.info b/system/chronograf/chronograf.info
index c03ac8e4bd..b8e6183cd4 100644
--- a/system/chronograf/chronograf.info
+++ b/system/chronograf/chronograf.info
@@ -1,10 +1,10 @@
 PRGNAM="chronograf"
-VERSION="1.8.0"
+VERSION="1.8.10"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.0_linux_i386.tar.gz"
-MD5SUM="5eca18780c5b8706898795bc75f387f0"
-DOWNLOAD_x86_64="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.0_linux_amd64.tar.gz"
-MD5SUM_x86_64="29a29acc205692381e52d8ee756f5c7f"
+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/chronograf/slack-desc b/system/chronograf/slack-desc
index 6879cbbdbb..3cee9ce4c5 100644
--- a/system/chronograf/slack-desc
+++ b/system/chronograf/slack-desc
@@ -8,7 +8,7 @@
           |-----handy-ruler------------------------------------------------------|
 chronograf: chronograf (An Open-Source User Interface for InfluxData)
 chronograf:
-chronograf: Chronograf is the user interface component of InfluxData's TICK
+chronograf: Chronograf is the user interface component of InfluxData’s TICK
 chronograf: stack. It makes the monitoring and alerting for your infrastructure
 chronograf: easy to setup and maintain. It is simple to use and includes
 chronograf: templates and libraries to allow you to rapidly build dashboards
diff --git a/system/ciopfs/README b/system/ciopfs/README
index 8288557370..2c70999a57 100644
--- a/system/ciopfs/README
+++ b/system/ciopfs/README
@@ -1,3 +1,7 @@
-ciopfs is a case-insensitive FUSE filesystem. It is useful for getting
-around issues where, say, a game is ported from Linux to Windows but
-the mods for that game still expect a case-insenitive filesystem.
+ciopfs (case insensitive on purpose filesystem)
+
+ciopfs is a stackable or overlay linux userspace file system (implemented
+with FUSE) which mounts a normal directory on a regular file sytem in
+case insensitive fashion. It's useful for getting around issues where,
+say, a game is ported from Linux to Windows but the mods for that game
+still expect a case-insenitive filesystem.
diff --git a/system/ciopfs/ciopfs.SlackBuild b/system/ciopfs/ciopfs.SlackBuild
index 27b116836c..6658402742 100644
--- a/system/ciopfs/ciopfs.SlackBuild
+++ b/system/ciopfs/ciopfs.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for ciopfs
 
 # Copyright 2015 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +23,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200413 bkw:
+# - take over maintenance
+# - i486 => i586
+# - include "links -dump" of web page as ciopfs.txt
+
 PRGNAM=ciopfs
 VERSION=${VERSION:-0.4}
 BUILD=${BUILD:-1}
@@ -29,7 +35,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
@@ -40,8 +46,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,28 +69,23 @@ 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" \
-make
-install -Dm755 ciopfs $PKG/bin/ciopfs
-mkdir -p $PKG/sbin
-( cd $PKG/sbin
-ln -s ../bin/ciopfs mount.ciopfs
-)
+  make
 
-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 -s -Dm755 ciopfs $PKG/bin/ciopfs
+mkdir -p $PKG/sbin
+ln -s ../bin/ciopfs $PKG/sbin/mount.ciopfs
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# 20200413 bkw: Upstream includes no documentation. Text file made from
+# upstream's web site.
+cat $CWD/$PRGNAM.txt > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.txt
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/system/ciopfs/ciopfs.info b/system/ciopfs/ciopfs.info
index 1b7880ed43..64b2a2ee75 100644
--- a/system/ciopfs/ciopfs.info
+++ b/system/ciopfs/ciopfs.info
@@ -6,5 +6,5 @@ MD5SUM="1798fc043034f292efd887c05fc4ea1e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/ciopfs/ciopfs.txt b/system/ciopfs/ciopfs.txt
new file mode 100644
index 0000000000..2d5981faa0
--- /dev/null
+++ b/system/ciopfs/ciopfs.txt
@@ -0,0 +1,138 @@
+                ciopfs - case insensitive on purpose filesystem
+
+ciopfs is a stackable or overlay linux userspace file system (implemented with
+FUSE) which mounts a normal directory on a regular file system in case
+insensitive fashion.
+
+The commands below should illustrate it’s function:
+
+mkdir -p ~/tmp/ciopfs/{.data,case-insensitive}
+ciopfs ~/tmp/ciopfs/.data ~/tmp/ciopfs/case-insensitive
+cd ~/tmp/ciopfs
+mkdir -p case-insensitive/DeMo/SubFolder
+echo demo >> case-insensitive/DEMO/subFolder/MyFile
+
+At this point your file system should look like this:
+
+case-insensitive
+`-- DeMo
+    `-- SubFolder
+        `-- MyFile
+.data
+`-- demo
+    `-- subfolder
+        `-- myfile
+
+To avoid any conflicts you should not manipulate the data directory directly,
+any change should be done over the mount point. All filenames in the data
+directory which aren’t all lower case are ignored.
+
+If you want to mount the file system automatically at boot time add a line like
+the one below to your /etc/fstab.
+
+/ciopfs/data    /ciopfs/mnt     ciopfs  allow_other,default_permissions,use_ino,attr_timeout=0  0       0
+
+Note that ciopfs is primarily designed for single user mode. It was originally
+developed to mount the wine program folder and provide faster case insensitive
+file access. If you want to give multiple users write access to the same file
+system, then you have to mount it as root. However, in order to avoid security
+problems ciopfs will force fuse into single threaded mode and thus hurt
+performance.
+
+News
+
+  * ciopfs-0.4 released (18.06.2011)
+       * Bugfix in symlink creation
+       * Better errno handling
+  * ciopfs-0.3 released (25.09.2010)
+       * Security improvements: ciopfs forces single threaded mode if the file
+         system is mounted by root and accessible for others
+       * ASCII mode should now work (an off by one error which caused a segfault
+         was fixed)
+       * Various bug fixes
+  * ciopfs-0.2 released (30.06.2008)
+       * Unicode support based on glib
+       * Better error handling in out of memory situations
+       * Various code cleanups
+  * ciopfs-0.1 released (24.05.2008)
+
+How it works
+
+ciopfs works by translating every path element to lower case before further
+operations take place. On file or directory creation the original file name is
+stored in an extended attribute which is later returned upon request.
+
+This is illustrated below:
+
+getfattr -dR .data
+# file: .data/demo
+user.filename="DeMo"
+
+# file: .data/demo/subfolder
+user.filename="SubFolder"
+
+# file: .data/demo/subfolder/myfile
+user.filename="MyFile"
+
+Runtime Requirements
+
+If you want the file system to preserve case information you have to make sure
+that the underlying file system supports extended attributes (for example for
+ext{2,3} you need a kernel with CONFIG_EXT{2,3}_FS_XATTR enabled). You probably
+also want to mount the underlying filesystem with the user_xattr option which
+allows non root users to create extended attributes.
+
+Build Requirements
+
+In order to compile ciopfs you will need the fuse development files, libattr and
+if you plan to use Unicode characters within file names you will either need
+glib which is the default or alternatively libicu.
+
+If you want to use neither of those the file system will fall back to libc’s
+tolower(3) function which is only defined for [a-zA-Z]. Hence, it will only work
+case insensitively for ASCII file names.
+
+For ease of use the following 3 Makefile targets are supported:
+
+  * unicode-glib (default)
+  * unicode-icu
+  * ascii
+
+Running one of those followed by sudo make install should do everything that is
+needed.
+
+Alternatively, you can also use one of the distribution provided binary
+packages.
+
+POSIX Compliance
+
+ciopfs passes all test of a slightly patched POSIX file system test suite when
+mounted as root user with the following options:
+
+allow_other,use_ino,attr_timeout=0,entry_timeout=0
+
+and $fs set to "ciopfs" in the test suite configuration file. This was last
+tested with pjd-fstest-20090130-RC.tgz and ext3 as the underlying file system.
+
+Stability and Speed
+
+ciopfs just passes every requested operation to the underlying file system, so
+in theory it shouldn’t have a negative impact on stability. However, if you find
+a bug then send me an email with the instruction to reproduce it.
+
+As far as speed is of concern, I didn’t really benchmark or optimize it so far.
+There is the usual overhead associated with user / kernel space context
+switches. Furthermore, ciopfs in it’s current implementation uses libc’s
+malloc/free quite extensively, maybe this could be a bottleneck.
+
+Development
+
+You can always fetch the current code base from the git repository located at
+Github or Sourcehut.
+
+If you have comments, suggestions, ideas, a bug report, a patch or something
+else related to ciopfs then don’t hesitate to write me an email.
+
+License
+
+ciopfs is licensed under the GNU GPL v2.
diff --git a/system/ciopfs/slack-desc b/system/ciopfs/slack-desc
index 71fd50e058..dc82790fcd 100644
--- a/system/ciopfs/slack-desc
+++ b/system/ciopfs/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-ciopfs: ciopfs (case insensitive FUSE filesystem)
+ciopfs: ciopfs (case insensitive on purpose filesystem)
 ciopfs:
 ciopfs: ciopfs is a stackable or overlay linux userspace file system
 ciopfs: (implemented with fuse) which mounts a normal directory on a regular
diff --git a/system/ck4up/README b/system/ck4up/README
index eb376336b6..67e65fe544 100644
--- a/system/ck4up/README
+++ b/system/ck4up/README
@@ -1,6 +1,6 @@
 ck4up is a small command-line utility, writen in ruby, primarily
 intended for CRUX ports maintainers to watch http and ftp sites for
-updates, but may also be useful for others. 
+updates, but may also be useful for others.
 
 ck4up scans through a configuration file, fetches the listed URLs
 from the web, computes the md5sum of the page, and compares the
diff --git a/system/ck4up/ck4up.info b/system/ck4up/ck4up.info
index 735564a00b..9b8acb0f1c 100644
--- a/system/ck4up/ck4up.info
+++ b/system/ck4up/ck4up.info
@@ -2,7 +2,7 @@ PRGNAM="ck4up"
 VERSION="1.4"
 HOMEPAGE="http://jue.li/crux/ck4up"
 DOWNLOAD="http://jue.li/crux/ck4up/ck4up-1.4.tar.gz"
-MD5SUM="922d0c9ace75203047d98ab6c54a3a91"
+MD5SUM="181c8342e16a20bd6ebce0a6dd23b894"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ck4up/slack-desc b/system/ck4up/slack-desc
index 08f7a66d53..36cedd873b 100644
--- a/system/ck4up/slack-desc
+++ b/system/ck4up/slack-desc
@@ -10,7 +10,7 @@ ck4up: ck4up (Check for Updates, a utility to monitor web pages for updates)
 ck4up:
 ck4up: ck4up is a small command-line utility, writen in ruby,
 ck4up: primarily intended for CRUX ports maintainers to watch http
-ck4up: and ftp sites for updates, but may also be useful for others. 
+ck4up: and ftp sites for updates, but may also be useful for others.
 ck4up:
 ck4up: Homepage: http://jue.li/crux/ck4up/
 ck4up:
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index 4afa1f6198..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.102.2}
+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 2075b7c30e..3e4a74944f 100644
--- a/system/clamav/clamav.info
+++ b/system/clamav/clamav.info
@@ -1,8 +1,8 @@
 PRGNAM="clamav"
-VERSION="0.102.2"
+VERSION="0.103.2"
 HOMEPAGE="https://www.clamav.net/"
-DOWNLOAD="https://www.clamav.net/downloads/production/clamav-0.102.2.tar.gz"
-MD5SUM="ecf5dd2c5c43aeed1c4b458b2e689847"
+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/clamtk/README b/system/clamtk/README
index 4b3b119fe4..2cf603fcfa 100644
--- a/system/clamtk/README
+++ b/system/clamtk/README
@@ -1,4 +1,5 @@
-ClamTk is a frontend for ClamAV using Gtk2-perl. It is intended to be
-an easy to use, light-weight, on-demand scanner for Linux systems.
+ClamTk is a frontend for ClamAV (Clam antivirus) using Gtk3-perl. It is
+intended to be an easy to use, light-weight, on-demand scanner for Linux
+systems.
 
 If you are using XFCE you may wish to install thunar-sendto-clamtk.
diff --git a/system/clamtk/clamtk.SlackBuild b/system/clamtk/clamtk.SlackBuild
index dc74dad70b..17e5d69ac1 100644
--- a/system/clamtk/clamtk.SlackBuild
+++ b/system/clamtk/clamtk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for clamtk
 
-# Copyright 2012-2018 Petar Petrov slackalaxy@gmail.com
+# Copyright 2012-2020 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 # https://aur.archlinux.org/packages/clamtk/
 
 PRGNAM=clamtk
-VERSION=${VERSION:-5.26}
+VERSION=${VERSION:-6.05}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,16 +75,15 @@ find -L . \
 # Change the menu category to System and make sure the menu entry
 # shows in other desktops than GNOME.
 sed -i "s:Categories=GTK;GNOME;Utility;:Categories=System;:" $PRGNAM.desktop
-sed -i "s:OnlyShowIn=GNOME;:#OnlyShowIn=GNOME;:" $PRGNAM.desktop
 
 install -D -m755 $PRGNAM $PKG/usr/bin/$PRGNAM
 
 for i in lib/* ; do
-install -D -m644 $i $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/ClamTk/`basename $i`
+  install -D -m644 $i $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/ClamTk/`basename $i`
 done
 
 for i in po/*.mo ; do
-install -D -m644 $i $PKG/usr/share/locale/`basename $i .mo`/LC_MESSAGES/$PRGNAM.mo
+  install -D -m644 $i $PKG/usr/share/locale/`basename $i .mo`/LC_MESSAGES/$PRGNAM.mo
 done
 
 install -D -m644 $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
@@ -97,7 +96,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 CHANGES DISCLAIMER LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES credits.md DISCLAIMER 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/system/clamtk/clamtk.info b/system/clamtk/clamtk.info
index f092cd482c..a0a07e72d8 100644
--- a/system/clamtk/clamtk.info
+++ b/system/clamtk/clamtk.info
@@ -1,10 +1,10 @@
 PRGNAM="clamtk"
-VERSION="5.26"
+VERSION="6.05"
 HOMEPAGE="https://dave-theunsub.github.io/clamtk/"
-DOWNLOAD="https://bitbucket.org/davem_/clamtk/downloads/clamtk-5.26.tar.xz"
-MD5SUM="d77266a12b5cb40887b44e01adabbe27"
+DOWNLOAD="https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.05.tar.xz"
+MD5SUM="71896ca2ecabddf9938523a1f0e357ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libwww-perl perl-http-message perl-JSON perl-LWP-Protocol-https perl-Text-CSV perl-Time-Piece perl-gtk2 clamav zenity"
+REQUIRES="libwww-perl perl-http-message perl-JSON perl-LWP-Protocol-https perl-Text-CSV perl-Gtk3 clamav zenity"
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
diff --git a/system/clamtk/slack-desc b/system/clamtk/slack-desc
index 41c3b077e3..d5204a3883 100644
--- a/system/clamtk/slack-desc
+++ b/system/clamtk/slack-desc
@@ -8,7 +8,7 @@
       |-----handy-ruler------------------------------------------------------|
 clamtk: clamtk (A frontend for ClamAV)
 clamtk:
-clamtk: ClamTk is a frontend for ClamAV using Gtk2-perl.
+clamtk: ClamTk is a frontend for ClamAV using perl-Gtk3.
 clamtk: It is intended to be an easy to use, light-weight,
 clamtk: on-demand scanner for Linux systems.
 clamtk:
diff --git a/system/cluster-glue/README b/system/cluster-glue/README
index b9e1a6c915..0f255839f9 100644
--- a/system/cluster-glue/README
+++ b/system/cluster-glue/README
@@ -2,8 +2,8 @@ cluster-glue (Reusable Cluster Components)
 
 Additional cluster tools to play with e.g. some STONITH scripts.
 
-You might also want to install corosync, pacemaker, resource-agents, crmsh,
-fence-agents and eventually cluster-glue.
+You might also want to install cluster-glue, heartbeat, resource-agents,
+fence-agents.
 
 You must have a haclient group and hacluster user to run this script.
 
diff --git a/system/cluster-glue/cluster-glue.SlackBuild b/system/cluster-glue/cluster-glue.SlackBuild
index 0b36765a43..1ae6d7be73 100644
--- a/system/cluster-glue/cluster-glue.SlackBuild
+++ b/system/cluster-glue/cluster-glue.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cluster-glue
-VERSION=${VERSION:-20180409_43b22d1}
-COMMIT=${COMMIT:-43b22d15db165b27743519da2c431a9f5d8062a6}
+VERSION=${VERSION:-20161102_afaeeb}
+COMMIT=${COMMIT:-afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/cluster-glue/cluster-glue.info b/system/cluster-glue/cluster-glue.info
index 5116c9026c..8c61443bd0 100644
--- a/system/cluster-glue/cluster-glue.info
+++ b/system/cluster-glue/cluster-glue.info
@@ -1,8 +1,8 @@
 PRGNAM="cluster-glue"
-VERSION="20180409_43b22d1"
+VERSION="20161102_afaeeb"
 HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-DOWNLOAD="https://github.com/ClusterLabs/cluster-glue/archive/43b22d1/cluster-glue-43b22d15db165b27743519da2c431a9f5d8062a6.tar.gz"
-MD5SUM="d27f0580e690ed5425ad8e5135073c3e"
+DOWNLOAD="https://github.com/ClusterLabs/cluster-glue/archive/afaeeb/cluster-glue-afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76.tar.gz"
+MD5SUM="50c799bb708921e9b44b1df161574fba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cluster-glue/slack-desc b/system/cluster-glue/slack-desc
index 62e9d250e8..1a57233cd3 100644
--- a/system/cluster-glue/slack-desc
+++ b/system/cluster-glue/slack-desc
@@ -10,8 +10,8 @@ cluster-glue: cluster-glue (Reusable Cluster Components)
 cluster-glue:
 cluster-glue: Additional cluster tools to play with e.g. some STONITH scripts.
 cluster-glue:
-cluster-glue: You might also want to install corosync, pacemaker, resource-agents,
-cluster-glue: crmsh, fence-agents and eventually cluster-glue.
+cluster-glue: You might also want to install cluster-glue, heartbeat,
+cluster-glue: resource-agents, fence-agents.
 cluster-glue:
 cluster-glue:
 cluster-glue:
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 4ae2a48b55..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-2019 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.4}
-GITHASH=${GITHASH:-e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e}
+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 f715ffc485..4d93b7af95 100644
--- a/system/containerd/containerd.info
+++ b/system/containerd/containerd.info
@@ -1,10 +1,10 @@
 PRGNAM="containerd"
-VERSION="1.2.4"
+VERSION="1.4.3"
 HOMEPAGE="https://containerd.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/containerd/containerd/archive/v1.2.4/containerd-1.2.4.tar.gz"
-MD5SUM_x86_64="cd57e0c63d0b81d51cdc7f20101bfcfb"
+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/corosync/corosync.SlackBuild b/system/corosync/corosync.SlackBuild
index 7295b62883..bd5d435b25 100644
--- a/system/corosync/corosync.SlackBuild
+++ b/system/corosync/corosync.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for corosync
 
-# Copyright 2018 Pierre-Philipp Braun, Russia
+# Copyright 2018  Pierre-Philipp Braun, Russia
+# Copyright 2020  Mario Preksavec, Zagreb, Croatia
 # 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=corosync
-VERSION=${VERSION:-2.4.4}
+VERSION=${VERSION:-2.4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/corosync/corosync.info b/system/corosync/corosync.info
index 84ec3fa09e..99fea50ff9 100644
--- a/system/corosync/corosync.info
+++ b/system/corosync/corosync.info
@@ -1,10 +1,10 @@
 PRGNAM="corosync"
-VERSION="2.4.4"
+VERSION="2.4.5"
 HOMEPAGE="http://corosync.github.io/corosync/"
-DOWNLOAD="http://build.clusterlabs.org/corosync/releases/corosync-2.4.4.tar.gz"
-MD5SUM="69db29ff4bc035936946be44fc8be5cd"
+DOWNLOAD="http://build.clusterlabs.org/corosync/releases/corosync-2.4.5.tar.gz"
+MD5SUM="e36a056b893c313c4ec1fe0d7e6cdebd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libqb"
-MAINTAINER="Pierre-Philipp Braun"
-EMAIL="pbraun@nethence.com"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
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/cpuid2cpuflags/cpuid2cpuflags.SlackBuild b/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild
index bab761ce93..68f01eac11 100644
--- a/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild
+++ b/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for cpuid2cpuflags.
 #
-# Copyright 2017-2019  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
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cpuid2cpuflags
-VERSION=${VERSION:-8.0}
+VERSION=${VERSION:-11.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,7 +56,7 @@ fi
 
 set -e
 
-SRCVER="8"
+SRCVER="11"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/system/cpuid2cpuflags/cpuid2cpuflags.info b/system/cpuid2cpuflags/cpuid2cpuflags.info
index d156a35b47..0e9efd6ba2 100644
--- a/system/cpuid2cpuflags/cpuid2cpuflags.info
+++ b/system/cpuid2cpuflags/cpuid2cpuflags.info
@@ -1,8 +1,8 @@
 PRGNAM="cpuid2cpuflags"
-VERSION="8.0"
+VERSION="11.0"
 HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-DOWNLOAD="https://github.com/mgorny/cpuid2cpuflags/releases/download/v8/cpuid2cpuflags-8.tar.bz2"
-MD5SUM="ec89818b94f3c38d3ad4edddd1bc8531"
+DOWNLOAD="https://github.com/mgorny/cpuid2cpuflags/releases/download/v11/cpuid2cpuflags-11.tar.bz2"
+MD5SUM="c54deede1aee5d41decd5fd5969ff2d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/crc32_simple/README b/system/crc32_simple/README
new file mode 100644
index 0000000000..fa12639621
--- /dev/null
+++ b/system/crc32_simple/README
@@ -0,0 +1,6 @@
+crc32_simple (calculate crc32 checksum of files)
+
+Simple public domain implementation of the standard CRC32 checksum.
+Outputs the checksum for each file given as a command line argument.
+Invalid file names and files that cause errors are silently skipped.
+The program reads from stdin if it is called with no arguments.
diff --git a/system/crc32_simple/crc32_simple.1 b/system/crc32_simple/crc32_simple.1
new file mode 100644
index 0000000000..d5d119a2f6
--- /dev/null
+++ b/system/crc32_simple/crc32_simple.1
@@ -0,0 +1,61 @@
+.\" Man page generated from reStructuredText.
+.
+.TH CRC32_SIMPLE 1 "2020-05-05" "20120911" "SlackBuilds.org"
+.SH NAME
+crc32_simple \- calculate standard crc32 checksum
+.
+.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 crc32_simple(1) man page. Convert with:
+.
+.\" rst2man.py crc32_simple.rst > crc32_simple.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.\" converting from pod:
+.
+.\" s/B<\([^>]*\)>/**\1**/g
+.
+.\" s/I<\([^>]*\)>/*\1*/g
+.
+.SH SYNOPSIS
+.sp
+crc32_simple [filenames]
+.SH DESCRIPTION
+.sp
+Simple public domain implementation of the standard CRC32 checksum.
+Outputs the checksum for each file given as a command line argument.
+Invalid file names and files that cause errors are silently skipped.
+The program reads from stdin if it is called with no arguments.
+.SH AUTHORS
+.sp
+crc32_simple was written by Björn Samuelsson.
+.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/system/crc32_simple/crc32_simple.SlackBuild b/system/crc32_simple/crc32_simple.SlackBuild
new file mode 100644
index 0000000000..759078b08d
--- /dev/null
+++ b/system/crc32_simple/crc32_simple.SlackBuild
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# Slackware build script for crc32_simple
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Why doesn't Slackware already have some tool that can do crc32?
+# There are TCL and PHP modules, the kernel includes its own crc32 algo,
+# but nothing you can run directly from the command line.
+
+# VERSION is from the timestamp on the source file.
+
+PRGNAM=crc32_simple
+VERSION=${VERSION:-20120911}
+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
+
+# Look ma, no source directory!
+mkdir -p $PKG/usr/bin
+gcc -Wall $SLKCFLAGS -Wl,-s -o $PKG/usr/bin/$PRGNAM $CWD/$PRGNAM.c
+ln -s $PRGNAM $PKG/usr/bin/crc32
+
+# It's probably overkill, but I wrote a man page for this...
+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/crc32.1.gz
+
+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/system/crc32_simple/crc32_simple.info b/system/crc32_simple/crc32_simple.info
new file mode 100644
index 0000000000..ee890f6530
--- /dev/null
+++ b/system/crc32_simple/crc32_simple.info
@@ -0,0 +1,10 @@
+PRGNAM="crc32_simple"
+VERSION="20120911"
+HOMEPAGE="http://home.thep.lu.se/~bjorn/crc/"
+DOWNLOAD="http://home.thep.lu.se/~bjorn/crc/crc32_simple.c"
+MD5SUM="da200e9ec1cb4f9e72ed6bd87cb43017"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/crc32_simple/crc32_simple.rst b/system/crc32_simple/crc32_simple.rst
new file mode 100644
index 0000000000..d8842c4e29
--- /dev/null
+++ b/system/crc32_simple/crc32_simple.rst
@@ -0,0 +1,44 @@
+.. RST source for crc32_simple(1) man page. Convert with:
+..   rst2man.py crc32_simple.rst > crc32_simple.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20120911
+.. |date| date::
+
+.. converting from pod:
+.. s/B<\([^>]*\)>/**\1**/g
+.. s/I<\([^>]*\)>/*\1*/g
+
+============
+crc32_simple
+============
+
+---------------------------------
+calculate standard crc32 checksum
+---------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+crc32_simple [filenames]
+
+DESCRIPTION
+===========
+
+Simple public domain implementation of the standard CRC32 checksum.
+Outputs the checksum for each file given as a command line argument.
+Invalid file names and files that cause errors are silently skipped.
+The program reads from stdin if it is called with no arguments.
+
+AUTHORS
+=======
+
+crc32_simple was written by Björn Samuelsson.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
diff --git a/system/crc32_simple/slack-desc b/system/crc32_simple/slack-desc
new file mode 100644
index 0000000000..c642cbd537
--- /dev/null
+++ b/system/crc32_simple/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------------------------------------------------------|
+crc32_simple: crc32_simple (calculate crc32 checksum of files)
+crc32_simple:
+crc32_simple: Simple public domain implementation of the standard CRC32 checksum.
+crc32_simple: Outputs the checksum for each file given as a command line argument.
+crc32_simple: Invalid file names and files that cause errors are silently skipped.
+crc32_simple: The program reads from stdin if it is called with no arguments.
+crc32_simple:
+crc32_simple:
+crc32_simple:
+crc32_simple:
+crc32_simple:
diff --git a/system/dash/dash.SlackBuild b/system/dash/dash.SlackBuild
index dfb7bdf565..e0d4ada3e3 100644
--- a/system/dash/dash.SlackBuild
+++ b/system/dash/dash.SlackBuild
@@ -3,10 +3,10 @@
 # Slackware build script for dash
 
 # Written by Vincent Batts, http://hashbangbash.com/
-# Copyright 2017-2018 Donald Cooley South Haven, Indiana USA
+# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA
 
 PRGNAM=dash
-VERSION=${VERSION:-0.5.10.2}
+VERSION=${VERSION:-0.5.11.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/dash/dash.info b/system/dash/dash.info
index 93724d2bb5..8404d7fbad 100644
--- a/system/dash/dash.info
+++ b/system/dash/dash.info
@@ -1,8 +1,8 @@
 PRGNAM="dash"
-VERSION="0.5.10.2"
+VERSION="0.5.11.2"
 HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.2.tar.gz"
-MD5SUM="8f485f126c05d0ab800e85abfe1987aa"
+DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz"
+MD5SUM="b9b71c72e40fdc4db9b4ffb81fc3bebc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libedit"
diff --git a/system/davfs2/davfs2.SlackBuild b/system/davfs2/davfs2.SlackBuild
index e5df20b2b4..b49822ae5a 100644
--- a/system/davfs2/davfs2.SlackBuild
+++ b/system/davfs2/davfs2.SlackBuild
@@ -5,7 +5,7 @@
 # Copyright (c) 2008, Justin H Haynes <justin@justinhaynes.com>
 # Copyright (c) 2012  Chris Abela, Malta
 # Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# Copyright 2014, 2016  Chris Abela, Malta
+# Copyright 2014, 2016, 2020  Chris Abela, Malta
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -22,7 +22,7 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=davfs2
-VERSION=${VERSION:-1.5.4}
+VERSION=${VERSION:-1.5.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/davfs2/davfs2.info b/system/davfs2/davfs2.info
index 9cdfc478f0..7a0a62c2d0 100644
--- a/system/davfs2/davfs2.info
+++ b/system/davfs2/davfs2.info
@@ -1,8 +1,8 @@
 PRGNAM="davfs2"
-VERSION="1.5.4"
+VERSION="1.5.6"
 HOMEPAGE="http://savannah.nongnu.org/projects/davfs2"
-DOWNLOAD="http://ftp.cc.uoc.gr/mirrors/nongnu.org/davfs2/davfs2-1.5.4.tar.gz"
-MD5SUM="c9f0b557275b7ec88fec751bf22f30cf"
+DOWNLOAD="http://ftp.cc.uoc.gr/mirrors/nongnu.org/davfs2/davfs2-1.5.6.tar.gz"
+MD5SUM="eb9948097dc08664cbc19ad06eeacd97"
 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 f3dfc9e20a..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.2}
+VERSION=${VERSION:-2.20.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/dget/dget.info b/system/dget/dget.info
index 466f34513b..f2c54ec3b9 100644
--- a/system/dget/dget.info
+++ b/system/dget/dget.info
@@ -1,10 +1,10 @@
 PRGNAM="dget"
-VERSION="2.20.2"
+VERSION="2.20.5"
 HOMEPAGE="https://goo.gl/mr1Uz3"
-DOWNLOAD="https://snapshot.debian.org/archive/debian/20200223T210712Z/pool/main/d/devscripts/devscripts_2.20.2_i386.deb"
-MD5SUM="7055c1c78f1426d1bb05384cff9f0a3d"
-DOWNLOAD_x86_64="https://snapshot.debian.org/archive/debian/20200223T210712Z/pool/main/d/devscripts/devscripts_2.20.2_amd64.deb"
-MD5SUM_x86_64="a60aa38b0e84a12bce5325b98b21fa83"
+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/direvent/README b/system/direvent/README
new file mode 100644
index 0000000000..63d8e873e1
--- /dev/null
+++ b/system/direvent/README
@@ -0,0 +1,11 @@
+GNU Direvent monitors events in the file system directories. For each
+event that occurs in a set of pre-configured directories, the program
+calls an external program associated with it, supplying it with the
+information about the event and the location within the file system
+where it occured.
+
+Interfaces for tracking changes to file systems are highly
+system-specific. Direvent aims to provide a uniform and
+system-independent command-level interface. It is known to work with
+all modern Linux kernels and BSD systems (FreeBSD, NetBSD, OpenBSD,
+Darwin).
diff --git a/system/direvent/direvent.SlackBuild b/system/direvent/direvent.SlackBuild
new file mode 100644
index 0000000000..a0e7c0c952
--- /dev/null
+++ b/system/direvent/direvent.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for direvent
+
+# 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=direvent
+VERSION=${VERSION:-5.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 \
+  --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
+
+rm -f $PKG/usr/share/info/dir
+mv $PKG/usr/share/info $PKG/usr/
+gzip -9 $PKG/usr/info/*.info*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS ChangeLog COPYING doc NEWS README THANKS \
+  $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/direvent/direvent.info b/system/direvent/direvent.info
new file mode 100644
index 0000000000..6a0dbba331
--- /dev/null
+++ b/system/direvent/direvent.info
@@ -0,0 +1,10 @@
+PRGNAM="direvent"
+VERSION="5.2"
+HOMEPAGE="https://www.gnu.org.ua/software/direvent/direvent.html"
+DOWNLOAD="http://ftp.gnu.org/gnu/direvent/direvent-5.2.tar.gz"
+MD5SUM="3af3340ba9fce2cbd6580c19817fe811"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jeff Parent"
+EMAIL="jeff+SBo@sh0.xyz"
diff --git a/system/direvent/slack-desc b/system/direvent/slack-desc
new file mode 100644
index 0000000000..70e47ff935
--- /dev/null
+++ b/system/direvent/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------------------------------------------------------|
+direvent: direvent (Directory event monitoring daemon)
+direvent:
+direvent: GNU Direvent monitors events in the file system directories. For each
+direvent: event that occurs in a set of pre-configured directories, the program
+direvent: calls an external program associated with it, supplying it with the
+direvent: information about the event and the location within the file system
+direvent: where it occured.
+direvent:
+direvent:
+direvent:
+direvent:
diff --git a/system/dlm/dlm.SlackBuild b/system/dlm/dlm.SlackBuild
index 1c5638ea33..ccebfec1f9 100644
--- a/system/dlm/dlm.SlackBuild
+++ b/system/dlm/dlm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for dlm
 
-# Copyright 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 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=dlm
-VERSION=${VERSION:-4.0.8}
+VERSION=${VERSION:-4.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/dlm/dlm.info b/system/dlm/dlm.info
index f128b8592b..7343b4d19a 100644
--- a/system/dlm/dlm.info
+++ b/system/dlm/dlm.info
@@ -1,8 +1,8 @@
 PRGNAM="dlm"
-VERSION="4.0.8"
+VERSION="4.0.9"
 HOMEPAGE="https://pagure.io/dlm"
-DOWNLOAD="https://pagure.io/dlm/archive/dlm-4.0.8/dlm-dlm-4.0.8.tar.gz"
-MD5SUM="61e63252f2e0b72207497daf83a69719"
+DOWNLOAD="https://pagure.io/dlm/archive/dlm-4.0.9/dlm-dlm-4.0.9.tar.gz"
+MD5SUM="4c57a941a15547859cd38fd55f66388e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pacemaker"
diff --git a/system/dlm/patches/Check-sscanf-return-value.patch b/system/dlm/patches/Check-sscanf-return-value.patch
deleted file mode 100644
index 719e294fca..0000000000
--- a/system/dlm/patches/Check-sscanf-return-value.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
-Date: Wed, 25 Apr 2018 23:13:29 +0200
-Subject: Check sscanf return value
-
----
- dlm_tool/main.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/dlm_tool/main.c b/dlm_tool/main.c
-index 042caa9..1900236 100644
---- a/dlm_tool/main.c
-+++ b/dlm_tool/main.c
-@@ -692,6 +692,11 @@ static void print_lkb(char *line, struct rinfo *ri)
- 		    (unsigned long long *)&lkb.timestamp,
- 		    (unsigned long long *)&lkb.time_bast);
- 
-+	if (rv != 17) {
-+		fprintf(stderr, "print_lkb error rv %d line \"%s\"\n", rv, line);
-+		return;
-+	}
-+
- 	ri->lkb_count++;
- 
- 	if (lkb.status == DLM_LKSTS_GRANTED) {
diff --git a/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch b/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch
index 7f32d838d2..d4e9f5bd89 100644
--- a/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch
+++ b/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch
@@ -9,12 +9,10 @@ Subject: Use CPPFLAGS from the environment
  libdlm/Makefile       | 4 ++--
  4 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
-index 75c5750..47af929 100644
 --- a/dlm_controld/Makefile
 +++ b/dlm_controld/Makefile
-@@ -58,10 +58,10 @@ endif
- all: $(LIB_TARGET) $(BIN_TARGET)
+@@ -62,10 +62,10 @@
+ all: $(LIB_TARGET) $(BIN_TARGET) $(LIB_PC)
  
  $(BIN_TARGET): $(BIN_SOURCE)
 -	$(CC) $(BIN_SOURCE) $(BIN_CFLAGS) $(BIN_LDFLAGS) -o $@ -L.
@@ -26,11 +24,9 @@ index 75c5750..47af929 100644
  	ln -sf $(LIB_TARGET) $(LIB_SO)
  	ln -sf $(LIB_TARGET) $(LIB_SMAJOR)
  
-diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile
-index 80d7725..a9b3be0 100644
 --- a/dlm_tool/Makefile
 +++ b/dlm_tool/Makefile
-@@ -27,7 +27,7 @@ LDFLAGS += -lpthread -ldlm -ldlmcontrol
+@@ -27,7 +27,7 @@
  all: $(BIN_TARGET)
  
  $(BIN_TARGET): $(BIN_SOURCE)
@@ -39,11 +35,9 @@ index 80d7725..a9b3be0 100644
  
  clean:
  	rm -f *.o *.so *.so.* $(BIN_TARGET)
-diff --git a/fence/Makefile b/fence/Makefile
-index b927879..d4a3c09 100644
 --- a/fence/Makefile
 +++ b/fence/Makefile
-@@ -28,7 +28,7 @@ LDFLAGS += -ldl
+@@ -28,7 +28,7 @@
  all: $(BIN_TARGET)
  
  $(BIN_TARGET): $(BIN_SOURCE)
@@ -52,11 +46,9 @@ index b927879..d4a3c09 100644
  
  clean:
  	rm -f *.o *.so *.so.* $(BIN_TARGET)
-diff --git a/libdlm/Makefile b/libdlm/Makefile
-index ab32761..21addf8 100644
 --- a/libdlm/Makefile
 +++ b/libdlm/Makefile
-@@ -90,10 +90,10 @@ LLT_LDFLAGS += $(LDFLAGS)
+@@ -90,10 +90,10 @@
  all: $(LIB_TARGET) $(LLT_TARGET) $(LIB_PC) $(LLT_PC)
  
  $(LIB_O): $(SOURCE) 
diff --git a/system/dlm/patches/series b/system/dlm/patches/series
index 3b61b57b9b..17ef4f6ee0 100644
--- a/system/dlm/patches/series
+++ b/system/dlm/patches/series
@@ -2,4 +2,3 @@ Debian-path-for-the-config-file.patch
 Enable-systemctl-help-dlm-to-show-relevant-man-pages.patch
 Use-CPPFLAGS-from-the-environment.patch
 Don-t-link-dlm_stonith-against-libxml2.patch
-Check-sscanf-return-value.patch
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 b661560b73..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-2019 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:-20181207_2cfbf9b}
-GITHASH=${GITHASH:-2cfbf9b1f98162a55829a21cc603c76072a75382}
+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 d15326c460..6329993d4c 100644
--- a/system/docker-proxy/docker-proxy.info
+++ b/system/docker-proxy/docker-proxy.info
@@ -1,10 +1,10 @@
 PRGNAM="docker-proxy"
-VERSION="20181207_2cfbf9b"
-HOMEPAGE="https://github.com/docker/libnetwork"
+VERSION="20201215_fa125a3"
+HOMEPAGE="https://github.com/moby/libnetwork"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/docker/libnetwork/archive/2cfbf9b/libnetwork-2cfbf9b1f98162a55829a21cc603c76072a75382.tar.gz"
-MD5SUM_x86_64="d09e629940b04e24a2f91b535c073f83"
+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-proxy/slack-desc b/system/docker-proxy/slack-desc
index 17cd924cb6..b51cd858b9 100644
--- a/system/docker-proxy/slack-desc
+++ b/system/docker-proxy/slack-desc
@@ -11,7 +11,7 @@ docker-proxy:
 docker-proxy: docker-proxy enables a service consumer to communicate with the
 docker-proxy: service providing container.
 docker-proxy:
-docker-proxy: Homepage: https://github.com/docker/libnetwork
+docker-proxy: Homepage: https://github.com/moby/libnetwork
 docker-proxy:
 docker-proxy:
 docker-proxy:
diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild
index e3d9f77d49..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-2019 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:-18.09.2}
-GITHASH=${GITHASH:-6247962}
+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 $(readlink -f bundles/latest/dynbinary-daemon/dockerd) \
-    $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 111ee681c6..caf6c4c8b8 100644
--- a/system/docker/docker.info
+++ b/system/docker/docker.info
@@ -1,10 +1,10 @@
 PRGNAM="docker"
-VERSION="18.09.2"
-HOMEPAGE="https://www.docker.com/products/docker-engine"
+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/v18.09.2/docker-ce-18.09.2.tar.gz"
-MD5SUM_x86_64="8a67b2ebca0d3dbc0a268183b0990bd5"
+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/docker/slack-desc b/system/docker/slack-desc
index 896dd91d1c..f6794fc5af 100644
--- a/system/docker/slack-desc
+++ b/system/docker/slack-desc
@@ -14,6 +14,6 @@ docker: container that a developer builds and tests on a laptop can run at
 docker: scale, in production, on VMs, bare metal, OpenStack clusters, public
 docker: clouds and more.
 docker:
-docker: Homepage: https://www.docker.com/products/docker-engine
+docker: Homepage: https://www.docker.com/products/container-runtime
 docker:
 docker:
diff --git a/system/dosbox-dev/dosbox-dev.SlackBuild b/system/dosbox-dev/dosbox-dev.SlackBuild
index 31705c3855..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:-4313}
-VERSION=${VERSION:-0.74.3.r4313}
+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 1db1d6c323..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.74.3.r4313"
+VERSION="0.75_pre4441"
 HOMEPAGE="http://dosbox.sourceforge.net"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.74.3.r4313.tar.xz"
-MD5SUM="7f10ce58652176539ce8d177a3151d68"
+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.SlackBuild b/system/dosbox-x/dosbox-x.SlackBuild
index 8e79ff359d..5a04069ac3 100644
--- a/system/dosbox-x/dosbox-x.SlackBuild
+++ b/system/dosbox-x/dosbox-x.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dosbox-x
-VERSION=${VERSION:-0.83.0}
+VERSION=${VERSION:-0.83.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/dosbox-x/dosbox-x.info b/system/dosbox-x/dosbox-x.info
index e2993272ae..0b95690601 100644
--- a/system/dosbox-x/dosbox-x.info
+++ b/system/dosbox-x/dosbox-x.info
@@ -1,8 +1,8 @@
 PRGNAM="dosbox-x"
-VERSION="0.83.0"
+VERSION="0.83.2"
 HOMEPAGE="http://dosbox-x.com/"
-DOWNLOAD="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.0.tar.gz"
-MD5SUM="9643b18550f15283ab4679222ec251c4"
+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=""
 REQUIRES="SDL2"
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/dse-typewriter-font/README b/system/dse-typewriter-font/README
new file mode 100644
index 0000000000..7a8d65d7a2
--- /dev/null
+++ b/system/dse-typewriter-font/README
@@ -0,0 +1,17 @@
+dse-typewriter-font (typewriter-style TrueType font)
+
+dse-typewriter-font is a coding font inspired by early 20th-century
+typewriters, with good Unicode coverage.
+
+This font is not the result of any scans or traces of samples, specimens,
+or other output from an actual typewriter. It's more like an amalgamation
+of old-school typewriter fonts with features semi-arbitrarily picked
+from each one, as well as a few not in use on actual typewriters.
+
+Features and Characteristics:
+
+* Relatively low ex-height.
+* Coding-friendly distinctive characters: li1| Oo0 `'"
+* Elite scale typeface (12 characters per inch at 12-point font size).
+* Perfectly useful as a traditional typewriter face for other purposes, if you
+  don’t mind the zero (0) having a dot in the middle.
diff --git a/system/dse-typewriter-font/doinst.sh b/system/dse-typewriter-font/doinst.sh
new file mode 100644
index 0000000000..c4c0e67fec
--- /dev/null
+++ b/system/dse-typewriter-font/doinst.sh
@@ -0,0 +1,8 @@
+if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
+  )
+fi
+
+[ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
diff --git a/system/dse-typewriter-font/dse-typewriter-font.SlackBuild b/system/dse-typewriter-font/dse-typewriter-font.SlackBuild
new file mode 100644
index 0000000000..857bfbcc46
--- /dev/null
+++ b/system/dse-typewriter-font/dse-typewriter-font.SlackBuild
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Slackware build script for dse-typewriter-font
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=dse-typewriter-font
+VERSION=${VERSION:-20200507_1795eb8}
+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.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+# upstream permissions are bad
+find -L . -type d -exec chmod 755 {} \+
+find -L . -type f -exec chmod 644 {} \+
+
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -a ttf/*.ttf $PKG/usr/share/fonts/TTF
+
+# don't include the HTML docs: they're just a copy of the homepage, except
+# they don't actually work right when installed locally.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.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/dse-typewriter-font/dse-typewriter-font.info b/system/dse-typewriter-font/dse-typewriter-font.info
new file mode 100644
index 0000000000..7e30ee6d05
--- /dev/null
+++ b/system/dse-typewriter-font/dse-typewriter-font.info
@@ -0,0 +1,10 @@
+PRGNAM="dse-typewriter-font"
+VERSION="20200507_1795eb8"
+HOMEPAGE="https://webonastick.com/fonts/dse-typewriter/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/dse-typewriter-font-20200507_1795eb8.tar.xz"
+MD5SUM="fc138176cffc5e8acb8937132a16d4c6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/dse-typewriter-font/git2tarxz.sh b/system/dse-typewriter-font/git2tarxz.sh
new file mode 100644
index 0000000000..e4d12c1807
--- /dev/null
+++ b/system/dse-typewriter-font/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=dse-typewriter-font
+GITUSER=dse
+CLONE_URL=https://github.com/$GITUSER/$PRGNAM.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=${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/system/dse-typewriter-font/slack-desc b/system/dse-typewriter-font/slack-desc
new file mode 100644
index 0000000000..d1ad44a2c3
--- /dev/null
+++ b/system/dse-typewriter-font/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------------------------------------------------------|
+dse-typewriter-font: dse-typewriter-font (typewriter-style TrueType font)
+dse-typewriter-font:
+dse-typewriter-font: dse-typewriter-font is a coding font inspired by early 20th-century
+dse-typewriter-font: typewriters, with good Unicode coverage.
+dse-typewriter-font:
+dse-typewriter-font: This font is not the result of any scans or traces of samples,
+dse-typewriter-font: specimens, or other output from an actual typewriter. It's more
+dse-typewriter-font: like an amalgamation of old-school typewriter fonts with features
+dse-typewriter-font: semi-arbitrarily picked from each one, as well as a few not in use
+dse-typewriter-font: on actual typewriters.
+dse-typewriter-font:
diff --git a/system/dtrx/dtrx.SlackBuild b/system/dtrx/dtrx.SlackBuild
index 1d9ff74427..66ac134d48 100644
--- a/system/dtrx/dtrx.SlackBuild
+++ b/system/dtrx/dtrx.SlackBuild
@@ -2,10 +2,11 @@
 
 # Slackware build script for dtrx
 
-# Petr Kletecka petr@kle.cz <2013>
+# Petr Kletecka petr@kle.cz <2020>
 
 PRGNAM=dtrx
 VERSION=${VERSION:-7.1}
+ARCHIVE=${ARCHIVE:-671ccf7d1b7ea90a6e6e6cc44234ef14874d59bf}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -22,8 +23,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xf $CWD/${PRGNAM}-${VERSION}.tar.gz
-cd $PRGNAM-$VERSION
+unzip -o $CWD/$PRGNAM-$ARCHIVE.zip
+cd $PRGNAM-$ARCHIVE
 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/dtrx/dtrx.info b/system/dtrx/dtrx.info
index fde1387e1e..411479487b 100644
--- a/system/dtrx/dtrx.info
+++ b/system/dtrx/dtrx.info
@@ -1,8 +1,8 @@
 PRGNAM="dtrx"
 VERSION="7.1"
-HOMEPAGE="https://brettcsmith.org/2007/dtrx/"
-DOWNLOAD="https://brettcsmith.org/2007/dtrx/dtrx-7.1.tar.gz"
-MD5SUM="4be207724b75aea3e9f93374298b2174"
+HOMEPAGE="https://github.com/brettcs/dtrx"
+DOWNLOAD="https://github.com/brettcs/dtrx/archive/671ccf7d1b7ea90a6e6e6cc44234ef14874d59bf/dtrx-671ccf7d1b7ea90a6e6e6cc44234ef14874d59bf.zip"
+MD5SUM="80a5abf4324824e3bcaf70d03db37bdb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/duply/duply.SlackBuild b/system/duply/duply.SlackBuild
index 1cfe4be321..ade04d8aa5 100644
--- a/system/duply/duply.SlackBuild
+++ b/system/duply/duply.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=duply
-VERSION=${VERSION:-2.2}
+VERSION=${VERSION:-2.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/duply/duply.info b/system/duply/duply.info
index b78b1b2e19..0f07fc2b44 100644
--- a/system/duply/duply.info
+++ b/system/duply/duply.info
@@ -1,10 +1,10 @@
 PRGNAM="duply"
-VERSION="2.2"
+VERSION="2.2.2"
 HOMEPAGE="https://duply.net"
-DOWNLOAD="https://phoenixnap.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/duply_2.2.tgz"
-MD5SUM="1ea50f06e51f389c1f4075c2dbaecbc5"
+DOWNLOAD="https://cfhcable.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/duply_2.2.2.tgz"
+MD5SUM="22a8a0d1471d373a7989e698408274b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="duplicity"
 MAINTAINER="Jeff Parent"
-EMAIL="jeff@sh0.xyz"
+EMAIL="jeff+SBo@sh0.xyz"
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/entr/entr.SlackBuild b/system/entr/entr.SlackBuild
index 671ea40e31..275bbf4d1f 100644
--- a/system/entr/entr.SlackBuild
+++ b/system/entr/entr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for entr
 
-# Copyright 2014-2016 Kent Fritz, Mountain View, CA
+# Copyright 2014-2020 Kent Fritz, Mountain View, CA
 # 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=entr
-VERSION=${VERSION:-3.6}
+VERSION=${VERSION:-4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,11 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-DIRNAME=`tar tf $CWD/$PRGNAM-$VERSION.tar.gz | head -1 | cut -d/ -f1`
-[ "${DIRNAME}" = "" -o "$DIRNAME" = "/" ] && exit 1
-rm -rf $DIRNAME
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $DIRNAME
+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/entr/entr.info b/system/entr/entr.info
index f1b145b004..e789b0c1fd 100644
--- a/system/entr/entr.info
+++ b/system/entr/entr.info
@@ -1,8 +1,8 @@
 PRGNAM="entr"
-VERSION="3.6"
+VERSION="4.6"
 HOMEPAGE="http://entrproject.org"
-DOWNLOAD="http://entrproject.org/code/entr-3.6.tar.gz"
-MD5SUM="072eed7153296a8fae6ebdedefed9fd4"
+DOWNLOAD="http://entrproject.org/code/entr-4.6.tar.gz"
+MD5SUM="e91417c7096bb94cbe8a8d2976223cb8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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 b/system/epson-inkjet-printer-escpr2/README
index 85e7504fe4..ac28a3caac 100644
--- a/system/epson-inkjet-printer-escpr2/README
+++ b/system/epson-inkjet-printer-escpr2/README
@@ -5,3 +5,4 @@ If your printer is not listed, try the escpr package instead.
 See README.models for supported printer models.
 
 don't forget to restart cups after installing/updating this driver
+You will have to print a page in order to get an acurate ink status.
diff --git a/system/epson-inkjet-printer-escpr2/README.models b/system/epson-inkjet-printer-escpr2/README.models
index 74bceb947d..13f4944464 100644
--- a/system/epson-inkjet-printer-escpr2/README.models
+++ b/system/epson-inkjet-printer-escpr2/README.models
@@ -1,29 +1,36 @@
-EC-4020 Series, EC-4030 Series, EC-4040 Series, EP-50V Series,
-EP-879A Series, EP-880A Series, EP-881A Series, EP-882A Series,
-EP-982A3 Series, ET-15000 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-5800 Series, ET-5850 Series,
-ET-5880 Series, ET-8700 Series, ET-M1140 Series, ET-M1170 Series,
-ET-M1180 Series, ET-M2140 Series, ET-M2170 Series, ET-M3140 Series,
-ET-M3170 Series, ET-M3180 Series, EW-M630T Series, EW-M670FT Series,
-EW-M752T Series, L14150 Series, L15150 Series, L15160 Series,
-L6160 Series, L6170 Series, L6190 Series, M1140 Series, M1170 Series,
-M1180 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-M680F Series, PX-M7070FX, PX-M7080FX, PX-M7090FX, PX-M7110F,
-PX-M7110FP, PX-M780F Series, PX-M781F Series, PX-M880FX, PX-M884F,
-PX-M885F, PX-M886FL, PX-S270T Series, PX-S380, PX-S381L,
-PX-S5010 Series, PX-S5080 Series, PX-S7070X, PX-S7090X, PX-S7110,
-PX-S7110P, PX-S880X, PX-S884, PX-S885, ST-3000 Series,
-ST-4000 Series, ST-M1000 Series, ST-M3000 Series, WF-2860 Series,
-WF-3720 Series, WF-3730 Series, WF-4720 Series, WF-4730 Series,
-WF-4740 Series, WF-7210 Series, WF-7710 Series, WF-7720 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
+EC-4020 Series, EC-4030 Series, EC-4040 Series, EC-C7000 Series
+EP-50V Series, EP-879A Series, EP-880A Series, EP-881A Series
+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-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/doinst.sh b/system/epson-inkjet-printer-escpr2/doinst.sh
new file mode 100644
index 0000000000..9cf806b007
--- /dev/null
+++ b/system/epson-inkjet-printer-escpr2/doinst.sh
@@ -0,0 +1,6 @@
+echo
+echo "********************* NOTICE **********************"
+echo "Cups needs restarting for new drivers to be usable:"
+echo "/etc/rc.d/rc.cups restart"
+echo "***************************************************"
+echo
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 2b62543970..2fcc1e0c7e 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
@@ -25,8 +25,12 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#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.10}
+VERSION=${VERSION:-1.1.29}
 EXTRABIT=1lsb3.2
 TARNAM=$PRGNAM-$VERSION-$EXTRABIT.tar.gz
 BUILD=${BUILD:-1}
@@ -108,6 +112,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/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
index 36bc3aaffa..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.10"
+VERSION="1.1.29"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/"
-DOWNLOAD="https://download3.ebz.epson.net/dsc/f/03/00/10/85/32/3116071d74e340fcefabe151725c926f01469a91/epson-inkjet-printer-escpr2-1.1.10-1lsb3.2.src.rpm"
-MD5SUM="65a7131479490766bb984b690e8635ca"
+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/epson-inkjet-printer-escpr2/fixrm b/system/epson-inkjet-printer-escpr2/fixrm
new file mode 100644
index 0000000000..e1c5c21315
--- /dev/null
+++ b/system/epson-inkjet-printer-escpr2/fixrm
@@ -0,0 +1,30 @@
+#!/bin/sh
+#fixrm is a little script to limit the items on each line so the line
+#is less than 72 characters. it is used by the maintainer when creating
+#the README.models file for this package, and for the epson-inkjet-printer-escpr2
+#slackbuild. It takes the list posted on a single long first line, and spreads
+#them over as many lines as needed.
+#
+#paste the list from the epson website into an empty README.models and run this
+#script in the same directory
+
+FNAME="README.models"
+MAXLEN=${MAXLEN:-72}
+#make sure MAXLEN is a integer bigger than 39
+MAXLEN=`echo $MAXLEN|awk '($1<40) {print "40"} (int($1)>39) {print int($1) }'`
+if [ -e $FNAME ]&&[ `cat $FNAME|head -n1|awk '{print length($0)}'` -gt $MAXLEN ]; then
+  #only do something if the file exists, and thefirst line is longer than  it
+  #should be.
+  TMPFILE=rmtmp
+  mv README.models $TMPFILE
+  cat $TMPFILE|awk -v mlen="$MAXLEN" -F', ' 'BEGIN{curline="";mlen=mlen-2}
+{ for (i=1;i<=NF; i++)
+ { { n=0; l=length(curline)+length($i) }
+   if (i==1) {curline=$i; n=1}
+   if (l<mlen && i>1) { curline=curline ", " $i; n=1}
+   if (n==0) {print curline; curline=$i }
+ }
+ if (length(curline)>0) {print curline; curline=""}
+}'>README.models
+  rm $TMPFILE
+fi
diff --git a/system/epson-printer-utility/LICENCE.html b/system/epson-printer-utility/LICENCE.html
new file mode 100644
index 0000000000..9db25aedc9
--- /dev/null
+++ b/system/epson-printer-utility/LICENCE.html
@@ -0,0 +1,98 @@
+<html><head>

+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

+</head>

+<body>

+<font size="2">

+<font size="3"><b>SEIKO EPSON CORPORATION</b></font><br>

+<font size="3"><b>SOFTWARE LICENSE AGREEMENT FOR LINUX</b></font><br>

+<br>

+IMPORTANT! READ THIS SOFTWARE LICENSE AGREEMENT CAREFULLY.  The computer

+ software product, fontware, typefaces and/or data, including any 

+accompanying explanatory written materials (the "Software") should only 

+be installed or used by the Licensee ("you") on the condition you agree 

+with SEIKO EPSON CORPORATION ("EPSON") to the terms and conditions set 

+forth in this Agreement.  By installing or using the Software, you are 

+representing to agree all the terms and conditions set forth in this 

+Agreement.  You should read this Agreement carefully before installing 

+or using the Software.  If you do not agree with the terms and 

+conditions of this Agreement, you are not permitted to install or use 

+the Software.<br>

+<br>

+

+<hr>

+

+<font size="4"><b>[Inkjet Printer]</b></font><br>

+<font size="4"><b>1.ESC/P</b></font>

+<ul>

+<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html" target="_blank">License agreement for Epson Inkjet Printer Driver for Linux</a></li>

+</ul>

+

+<font size="4"><b>2.ESC/P-R</b></font>

+<ul>

+<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li>

+</ul>

+

+<font size="4"><b>3.PIPS(Photo Image Print System)</b></font>

+<ul>

+<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li>

+<li><a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">GNU Lesser General Public License</a></li>

+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>

+</ul>

+

+<hr>

+

+<font size="4"><b>[Laser Printer]</b></font><br>

+<font size="4"><b>1.Postscript Printer Description (PPD) file for EPSON Printer

+</b></font>

+<ul>

+<li>Please read the license at the top of the EPSON PPD file carefully.</li>

+</ul>

+

+<font size="4"><b>2.GS-LPD (Ghostscript Laser Printer Driver for Linux)

+</b></font>

+<ul>

+<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li>

+</ul>

+

+<font size="4"><b>3.Laser Printer Filter for Linux</b></font>

+<ul>

+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>

+<li><a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">MIT License</a></li>

+</ul>

+

+<font size="4"><b>4.Photo Image Print System Plus for Linux</b></font>

+<ul>

+<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li>

+<li><a href="http://www.gnu.org/licenses/fdl.html" target="_blank">GNU Free Documentation License</a></li>

+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>

+</ul>

+

+<hr>

+

+<font size="4"><b>[Scanner]</b></font><br>

+<font size="4"><b>1.Image Scan! for Linux</b></font>

+<ul>

+<li><a href="http://www.gnu.org/licenses/gpl-2.0.html" target="_blank">GNU General Public License</a></li>

+<li><a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">GNU Lesser General Public License</a></li>

+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>

+<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html#softlicense" target="_blank">SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT</a></li>

+</ul>

+

+<font size="4"><b>2.Image Scan v3</b></font>

+<ul>

+<li><a href="http://www.gnu.org/licenses/gpl-3.0.html" target="_blank">GNU General Public License</a></li>

+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>

+<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html#softlicense" target="_blank">SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT</a></li>

+</ul>

+

+

+<br>

+<br>

+EPSON EULA EN 11/05/2012

+<br>

+<br>

+</font>

+

+

+

+</body></html>
\ No newline at end of file
diff --git a/system/epson-printer-utility/README b/system/epson-printer-utility/README
new file mode 100644
index 0000000000..d5771efb20
--- /dev/null
+++ b/system/epson-printer-utility/README
@@ -0,0 +1,6 @@
+This is a printer utility for most Epson inkjet printers.
+It offers printer monitoring of error, ink levels, and utilities
+to check nozzles and clean print heads.
+
+See README.models for supported printer models.
+
diff --git a/system/epson-printer-utility/README.models b/system/epson-printer-utility/README.models
new file mode 100644
index 0000000000..0cc3c61591
--- /dev/null
+++ b/system/epson-printer-utility/README.models
@@ -0,0 +1,208 @@
+, Artisan 1430, Artisan 50, Artisan 630, Artisan 700, Artisan 710
+Artisan 720, Artisan 730, Artisan 800, Artisan 810, Artisan 830
+Artisan 837, E-150, E-200, E-300, E-330, E-330S, E-340, E-350
+E-360 Series, E-370 Series, 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-4020 Series, EC-4030 Series, EC-4040 Series
+EC-C110 Series, EC-C7000 Series, EP-10VA Series, EP-302, EP-306 Series
+EP-30VA Series, EP-4004, EP-50V Series, EP-702A, EP-703A, EP-704A
+EP-705A Series, EP-706A Series, EP-707A Series, EP-708A 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-879A Series
+EP-880A Series, EP-881A Series, EP-882A 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-982A3 Series, EP-M552T Series
+EP-M570T Series, ET-1110 Series, ET-14000 Series, ET-15000 Series
+ET-16150 Series, ET-16600 Series, ET-16650 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-3700 Series, ET-3710 Series, ET-3750 Series
+ET-3760 Series, ET-4500 Series, ET-4550 Series, ET-4700 Series
+ET-4750 Series, ET-4760 Series, ET-5800 Series, ET-5850 Series
+ET-5880 Series, ET-7700 Series, ET-7750 Series, ET-8700 Series
+ET-M1100 Series, ET-M1120 Series, ET-M1140 Series, ET-M1170 Series
+ET-M1180 Series, ET-M2120 Series, ET-M2140 Series, ET-M2170 Series
+ET-M3140 Series, ET-M3170 Series, ET-M3180 Series, EW-052A Series
+EW-452A Series, EW-M5071FT Series, EW-M5610FT Series, EW-M571T Series
+EW-M630T Series, EW-M660FT Series, EW-M670FT Series, EW-M752T Series
+EW-M770T Series, EW-M970A3T Series, K100, K200, K300, L110 Series
+L1110 Series, L11160 Series, L120 Series, L130 Series, L1300 Series
+L132 Series, L14150 Series, L1455 Series, L15150 Series, L15160 Series
+L1800 Series, L210 Series, L220 Series, L222 Series, L300 Series
+L3050 Series, L3060 Series, L3070 Series, L310 Series, L3100 Series
+L3110 Series, L312 Series, L3150 Series, L3160 Series, L350 Series
+L355 Series, L360 Series, L362 Series, L364 Series, L365 Series
+L366 Series, L375 Series, L380 Series, L382 Series, L386 Series
+L395 Series, L396 Series, L405 Series, L4150 Series, L4160 Series
+L455 Series, L456 Series, L475 Series, L486 Series, L495 Series
+L5190 Series, L550 Series, L555 Series, L565 Series, L566 Series
+L575 Series, L605 Series, L6160 Series, L6170 Series, L6190 Series
+L655 Series, L6550 Series, L6570 Series, L6580 Series, L7160 Series
+L7180 Series, L800, L805 Series, L810 Series, L850 Series, LX-10000F
+LX-10000FK, LX-10050KF, LX-10050MF, LX-6050MF, LX-7000F, LX-7550MF
+M100 Series, M105 Series, M1100 Series, M1120 Series, M1140 Series
+M1170 Series, M1180 Series, M15140 Series, M200 Series, M205 Series
+M2110 Series, M2120 Series, M2140 Series, M2170 Series, M3140 Series
+M3170 Series, M3180 Series, ME 10, ME 200, ME 32, ME 320, ME 33, ME 330
+ME 340, ME OFFICE 520, ME OFFICE 530, ME OFFICE 560W, ME OFFICE 570
+ME OFFICE 620F, ME OFFICE 82WD, ME OFFICE 85ND, ME OFFICE 900WD
+ME OFFICE 940FW, ME OFFICE 960FWD, ME Office 510, ME Office 600F
+ME Office 650FN, ME Office 700FW, ME-10 Series, ME-100 Series
+ME-301 Series, ME-303 Series, ME-400 Series, NX130 TX130, NX230 TX230
+NX430 TX435, PF-70 Series, PF-71 Series, PF-81 Series, PM-400 Series
+PM-520 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-045A Series, PX-046A Series, PX-047A Series
+PX-048A Series, PX-105 Series, PX-1200, PX-1600F, PX-1700F, PX-203
+PX-204, PX-205 Series, PX-402A, PX-403A, 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-K100, PX-K150 Series
+PX-M160T Series, PX-M270FT Series, PX-M270T Series, PX-M270UT Series
+PX-M350F, PX-M380F, PX-M381FL, PX-M5040F, PX-M5041F, PX-M5080F Series
+PX-M5081F Series, PX-M650A, PX-M650F, PX-M6711FT Series
+PX-M6712FT Series, PX-M680F Series, PX-M7050 Series, PX-M7050FP
+PX-M7050FX, PX-M7070FX, PX-M7080FX, PX-M7090FX, PX-M7110F, PX-M7110FP
+PX-M740F, PX-M741F, PX-M780F Series, PX-M781F Series, PX-M791FT Series
+PX-M840F, PX-M840FX, PX-M860F, PX-M880FX, PX-M884F, PX-M885F, PX-M886FL
+PX-S05 Series, PX-S06 Series, PX-S160T Series, PX-S170T Series
+PX-S170UT Series, PX-S270T Series, PX-S350, PX-S380, PX-S381L
+PX-S5010 Series, PX-S5040, PX-S5080 Series, PX-S7050 Series, PX-S7050PS
+PX-S7070X, PX-S7090X, PX-S7110, PX-S7110P, PX-S740, PX-S840, PX-S860
+PX-S880X, PX-S884, PX-S885, 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, ST-3000 Series
+ST-4000 Series, ST-C8000 Series, ST-M1000 Series, ST-M3000 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 N10 N11, Epson Stylus NX110, Epson Stylus NX125 NX127
+Epson Stylus NX130, 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 B42WD, 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 P50
+Epson Stylus Photo PX650, Epson Stylus Photo PX660
+Epson Stylus Photo PX700W, Epson Stylus Photo PX710W
+Epson Stylus Photo PX720WD, Epson Stylus Photo PX730
+Epson Stylus Photo PX800FW, Epson Stylus Photo PX810FW
+Epson Stylus Photo PX820FWD, Epson Stylus Photo PX830
+Epson Stylus Photo R1900, Epson Stylus Photo R2000
+Epson Stylus Photo R240, Epson Stylus Photo R250
+Epson Stylus Photo R260, Epson Stylus Photo R265
+Epson Stylus Photo R270, Epson Stylus Photo R2880
+Epson Stylus Photo R3000, Epson Stylus Photo R340
+Epson Stylus Photo R350, Epson Stylus Photo R360
+Epson Stylus Photo R380, Epson Stylus Photo R390
+Epson Stylus Photo RX520, Epson Stylus Photo RX530
+Epson Stylus Photo RX560, Epson Stylus Photo RX580
+Epson Stylus Photo RX585, Epson Stylus Photo RX590
+Epson Stylus Photo RX595, Epson Stylus Photo RX610
+Epson Stylus Photo RX640, Epson Stylus Photo RX650
+Epson Stylus Photo RX680, Epson Stylus Photo RX685
+Epson Stylus Photo RX690, Epson Stylus Photo T50
+Epson Stylus Photo T60, Epson Stylus Photo TX650
+Epson Stylus Photo TX700W, Epson Stylus Photo TX710W
+Epson Stylus Photo TX720WD, Epson Stylus Photo TX730
+Epson Stylus Photo TX800FW, Epson Stylus Photo TX810FW
+Epson Stylus S21, Epson Stylus S22, Epson Stylus SX110
+Epson Stylus SX125, Epson Stylus SX130, Epson Stylus SX200
+Epson Stylus SX210, Epson Stylus SX215, Epson Stylus SX218
+Epson Stylus SX230, Epson Stylus SX235, Epson Stylus SX400
+Epson Stylus SX410, Epson Stylus SX420W, Epson Stylus SX430
+Epson Stylus SX440, Epson Stylus SX510W, Epson Stylus SX525WD
+Epson Stylus SX535WD, Epson Stylus SX600FW, Epson Stylus SX610FW
+Epson Stylus SX620FW, Epson Stylus T21, Epson Stylus T22
+Epson Stylus T24, Epson Stylus T25, Epson Stylus T27
+Epson Stylus TX110, Epson Stylus TX111, Epson Stylus TX112 
+Epson Stylus TX115, Epson Stylus TX117, Epson Stylus TX120
+Epson Stylus TX121, Epson Stylus TX125, Epson Stylus TX130
+Epson Stylus TX200, Epson Stylus TX210, Epson Stylus TX213
+Epson Stylus TX219, Epson Stylus TX220, Epson Stylus TX230
+Epson Stylus TX235, Epson Stylus TX400, Epson Stylus TX410
+Epson Stylus TX420W, Epson Stylus TX430, Epson Stylus TX550W
+Epson Stylus TX560WD, T12 T22 N11, T13 T22E, TX120 NX120, TX133 TX135
+TX220 NX220, TX320 WorkForce320, TX420 NX420, WF-100 Series
+WF-110 Series, WF-2010 Series, WF-2510 Series, WF-2520 Series
+WF-2530 Series, WF-2540 Series, WF-2630 Series, WF-2650 Series
+WF-2660 Series, WF-2750 Series, WF-2760 Series, WF-2810 Series
+WF-2830 Series, WF-2850 Series, WF-2860 Series, WF-3010 Series
+WF-3520 Series, WF-3530 Series, WF-3540 Series, WF-3620 Series
+WF-3640 Series, WF-3720 Series, WF-3730 Series, WF-3820 Series
+WF-4630 Series, WF-4640 Series, WF-4720 Series, WF-4730 Series
+WF-4740 Series, WF-4820 Series, WF-4830 Series, WF-5110 Series
+WF-5190 Series, WF-5620 Series, WF-5690 Series, WF-6090 Series
+WF-6530 Series, WF-6590 Series, WF-7010 Series, WF-7011 Series
+WF-7012 Series, WF-7015 Series, WF-7018 Series, WF-7110 Series
+WF-7210 Series, WF-7510 Series, WF-7511 Series, WF-7515 Series
+WF-7520 Series, WF-7521 Series, WF-7525 Series, WF-7610 Series
+WF-7620 Series, WF-7710 Series, WF-7720 Series, WF-7820 Series
+WF-7830 Series, WF-7840 Series, WF-8010 Series, WF-8090 Series
+WF-8510 Series, WF-8590 Series, WF-C17590 Series, WF-C20590 Series
+WF-C20600 Series, WF-C20750 Series, WF-C21000 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-M1030 Series, WF-M1560 Series, WF-M20590 Series
+WF-M5190 Series, WF-M5298 Series, WF-M5299 Series, WF-M5690 Series
+WF-M5799 Series, WF-R4640 Series, WF-R5190 Series, WF-R5690 Series
+WF-R8590 Series, WP-4010 Series, WP-4011 Series, WP-4015 Series
+WP-4020 Series, WP-4022 Series, WP-4023 Series, WP-4025 Series
+WP-4090 Series, WP-4091 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 60
+WorkForce 600, WorkForce 610, WorkForce 620, WorkForce 630
+WorkForce 645, WorkForce 840, WorkForce 845, WorkForce T42WD
+XP-100 Series, XP-102 103 Series, XP-15000 Series, 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-5100 Series
+XP-520 Series, XP-530 Series, XP-540 Series, XP-55 Series
+XP-600 Series, XP-6000 Series, XP-610 Series, XP-6100 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-8500 Series, XP-860 Series
+XP-8600 Series, XP-950 Series, XP-960 Series, XP-970 Series
diff --git a/system/epson-printer-utility/doinst.sh b/system/epson-printer-utility/doinst.sh
new file mode 100644
index 0000000000..e41ff8a5fe
--- /dev/null
+++ b/system/epson-printer-utility/doinst.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+#fix rc file on install, and register .desktop file
+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.ecbd.new
+
+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
+
+if [ -x /usr/bin/kbuildsycoca4 ]; then
+  /usr/bin/kbuildsycoca4 >/dev/null 2>&1
+fi
+
+echo
+echo "********************* NOTICE *********************************"
+echo "ecbd needs to be running for the printer monitor to be usable:"
+echo "/etc/rc.d/rc.ecbd restart"
+echo "**************************************************************"
+echo
diff --git a/system/epson-printer-utility/epson-printer-utility.SlackBuild b/system/epson-printer-utility/epson-printer-utility.SlackBuild
new file mode 100644
index 0000000000..c9e1b2bfce
--- /dev/null
+++ b/system/epson-printer-utility/epson-printer-utility.SlackBuild
@@ -0,0 +1,248 @@
+#!/bin/sh
+
+# Slackware build script for epson-printer-utility
+
+# Copyright 2020 Tim Dickson
+# 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.
+
+#thanks to B.Watson for support on this build. :-)
+
+PRGNAM=epson-printer-utility
+VERSION=${VERSION:-1.1.1}
+EXTRABIT=1lsb3.2
+TARNAM=$PRGNAM-$VERSION.tar.gz
+BUILD=${BUILD:-3}
+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)
+#lets get the source tarball from the rpm and clean up the bits we don't need
+rpm2tgz $PRGNAM-$VERSION-$EXTRABIT.src.rpm
+tar -xzf $PRGNAM-$VERSION-$EXTRABIT.src.tgz
+cp $PRGNAM-$VERSION-$EXTRABIT/$PRGNAM-$VERSION.tar.gz ./
+cp $PRGNAM-$VERSION-$EXTRABIT/epson-backend-$VERSION.tar.gz ./
+rm $PRGNAM-$VERSION-$EXTRABIT.src.tgz
+rm -r $PRGNAM-$VERSION-$EXTRABIT
+
+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/$TARNAM
+#we remove the tarnam as the original is an rpm
+#this keeps things tidy.
+rm $CWD/$TARNAM
+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 {} \;
+
+echo "patch configure.ac"
+sed -i 's_/opt/lsb/bin/lsbc++_/usr/bin/c++_g' configure.ac
+sed -i '/^AM_INIT_AUTOMAKE/a AM_PROG_AR()' configure.ac
+#fix typo in path of udev stuff
+sed -i 's_/ect_/etc_g' configure.ac
+#fix source code. We shouldn't have to do this, but hey ho!....
+mv EPSCommonLib/epsmp/linux/XAsyncSocket.cpp EPSCommonLib/epsmp/linux/XAsyncSocket.c
+#patch png files to remove incorrect sRGB profile in all of them.
+mogrify -strip PrinterUtility/Images/*.png
+#patch the Resources.qrc file to include missing png's
+sed -i 'sZInklow.png</file>ZInklow.png</file>\n        <file>Images/Inklow_.png</file>\n        <file>Images/printer_status_OLD.png</file>\n        <file>Images/printer_status_error_laser.png</file>\n        <file>Images/printer_status_warning_laser.png</file>\n        <file>Images/warning.png</file>Zg' PrinterUtility/Resources.qrc
+#we need to regenerate qrc_Resources.cpp (which would have been generated by qmake)
+#as the one shipped has all the png's with iCCP invalid sRGB profiles.
+#echo "create new qrc_resources.cpp file using our patched Resources.qrc file"
+cd PrinterUtility
+rm -f qrc_Resources.cpp
+rcc -o qrc_Resources.cpp Resources.qrc
+cd ..
+#echo "now we have a resources file with fixed pngs embeded in it"
+#lets run qmake :-) - or lets not. it looks like a bunch of stuff is missing.!
+#the list of stuff reported missing by qmake was sent to linux-printer@epson.jp 28/09/2020
+#with a request for them to include the missing source code. hopefully they will supply
+#the missing code, so we can update this script and remove some of the patches.
+
+#keep next few lines incase we can actually use it in the future.
+#cd PrinterUtility
+#qmake PrinterUtility.pro
+#cd ..
+
+echo "running aclocal"
+aclocal
+echo "running autoreconf"
+autoreconf --install --force
+
+#we still have to fix the Makefile.am files that autoreconf didn't sort out
+#fix hardcoded /opt/lsb stuff
+sed -i 's_/opt/lsb_/usr_g' EPSCommonLib/Makefile.am
+#patch qtlibs reference in wrong place
+sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt/include/QtCore_g" EPSCommonLib/Makefile.am
+sed -i 's_/opt/lsb_/usr_g' PrinterUtility/Makefile.am
+sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt/include/QtCore_g" PrinterUtility/Makefile.am
+sed -i "s_/usr/include/QtGui_/usr/lib${LIBDIRSUFFIX}/qt/include/QtGui_g" PrinterUtility/Makefile.am
+sed -i "s_include/QtNetwork_lib${LIBDIRSUFFIX}/qt/include/QtNetwork_g" PrinterUtility/Makefile.am
+echo "running configure"
+
+CC=/usr/bin/c++ \
+CXX=/usr/bin/c++ \
+CFLAGS="$SLKCFLAGS -fpermissive" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --datarootdir=/usr/share \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+echo "more patching of source files"
+#add missing header for sleep
+sed -i "1 i #include <unistd.h>" PrinterUtility/EPUMainController.cpp
+sed -i "1 i #include <unistd.h>" PrinterUtility/EPUPrinterListDialog.cpp
+#we need to patch the moc files so they work with qt 4.8.7 that ships with slackware 14.2
+#when the source is complete and we can run qmake, that should fix this.
+for i in `ls PrinterUtility/moc_*.cpp`; do
+  sed -i 's/59/63/g' $i
+done
+#patch hardcoded path in Main.cpp so it can find language files
+sed -i "s_/opt/epson_/usr/share/epson_g" PrinterUtility/Main.cpp
+echo "running make"
+make
+
+echo "running make install"
+make install DESTDIR=$PKG
+#as make install doesn't do much we do it manually
+mkdir -p $PKG/usr/bin
+cp -a PrinterUtility/epson-printer-utility $PKG/usr/bin/
+#udev rule to allow set permissions so any user can monitor the printer.
+mkdir -p $PKG/etc/udev/rules.d
+cp -a support-tool/79-udev-epson.rules $PKG/etc/udev/rules.d/
+mkdir -p $PKG/usr/share/epson-printer-utility/resource/Languages
+mv $PKG/usr/resource/Languages/*.qm $PKG/usr/share/epson-printer-utility/resource/Languages/
+rm -r $PKG/usr/resource
+mkdir -p $PKG/usr/share/pixmaps
+cp PrinterUtility/Images/AppIcon.png $PKG/usr/share/pixmaps/epson-printer-utility.png
+#+-----------------------------------------------------------+
+#| we now have to process the communication daemon           |
+#+-----------------------------------------------------------+
+cd $TMP
+rm -rf epson-backend-$VERSION
+tar -xzf $CWD/epson-backend-$VERSION.tar.gz
+#we remove the tarnam as the original is an rpm
+#this keeps things tidy.
+rm $CWD/epson-backend-$VERSION.tar.gz
+cd epson-backend-$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 {} \;
+
+echo "running aclocal"
+aclocal
+echo "running autoreconf"
+autoreconf --install --force
+
+echo "running configure"
+
+CC=/usr/bin/gcc \
+CXX=/usr/bin/c++ \
+CFLAGS="$SLKCFLAGS -Wno-unused-but-set-variable -Wno-unused-function -Wno-implicit-function-declaration -Wno-pointer-sign -Wno-unused-variable" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+echo "patching source for backend daemon. epmnt.c"
+sed -i "1 i #include <stdlib.h>\n#include <string.h>" daemon/epmnt.c
+echo "running make"
+make
+echo "running make install"
+make install DESTDIR=$PKG
+
+#now lets tidy everything up. after all, we are not debian :-)
+#there are three important program files, /usr/bin/epson-printer-utility
+#/usr/lib/epson-backend/ecbd the communication daemon, and 
+#/usr/lib64/cups/backend/ecblp  the cups backend
+#we will trash the contents of /usr/lib64/epson-backend  for now, it looks like it is just debian daemon stuff.
+#we need to create our own rc.ecbd file to start/stop/restart the backend
+#this should be added into rc.local to make it active at startup
+rm -r $PKG/usr/lib64/epson-backend
+mkdir -p $PKG/etc/rc.d
+cp $CWD/rc.ecbd $PKG/etc/rc.d/rc.ecbd.new
+#the utility won't work without the daemon, so reduce steps admin has to do to get
+#things working on a clean install.
+chmod +x $PKG/etc/rc.d/rc.ecbd.new
+
+mkdir -p $PKG/usr/share/applications
+cp $CWD/epson-printer-utility.desktop $PKG/usr/share/applications
+
+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 NEWS README 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
+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/epson-printer-utility/epson-printer-utility.desktop b/system/epson-printer-utility/epson-printer-utility.desktop
new file mode 100644
index 0000000000..08e9588c8f
--- /dev/null
+++ b/system/epson-printer-utility/epson-printer-utility.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Epson Printer Utility
+Comment=monitor ink levels, print nozzle check pattern
+Exec=epson-printer-utility
+Terminal=false
+Type=Application
+Icon=epson-printer-utility
+Categories=System;Printing;
diff --git a/system/epson-printer-utility/epson-printer-utility.info b/system/epson-printer-utility/epson-printer-utility.info
new file mode 100644
index 0000000000..04281e9828
--- /dev/null
+++ b/system/epson-printer-utility/epson-printer-utility.info
@@ -0,0 +1,10 @@
+PRGNAM="epson-printer-utility"
+VERSION="1.1.1"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-printer-utility-1.1.1-1lsb3.2.src.rpm"
+MD5SUM="4285b0585dd559d53f2c233fb96b4a00"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
diff --git a/system/epson-printer-utility/fixrm b/system/epson-printer-utility/fixrm
new file mode 100644
index 0000000000..e1c5c21315
--- /dev/null
+++ b/system/epson-printer-utility/fixrm
@@ -0,0 +1,30 @@
+#!/bin/sh
+#fixrm is a little script to limit the items on each line so the line
+#is less than 72 characters. it is used by the maintainer when creating
+#the README.models file for this package, and for the epson-inkjet-printer-escpr2
+#slackbuild. It takes the list posted on a single long first line, and spreads
+#them over as many lines as needed.
+#
+#paste the list from the epson website into an empty README.models and run this
+#script in the same directory
+
+FNAME="README.models"
+MAXLEN=${MAXLEN:-72}
+#make sure MAXLEN is a integer bigger than 39
+MAXLEN=`echo $MAXLEN|awk '($1<40) {print "40"} (int($1)>39) {print int($1) }'`
+if [ -e $FNAME ]&&[ `cat $FNAME|head -n1|awk '{print length($0)}'` -gt $MAXLEN ]; then
+  #only do something if the file exists, and thefirst line is longer than  it
+  #should be.
+  TMPFILE=rmtmp
+  mv README.models $TMPFILE
+  cat $TMPFILE|awk -v mlen="$MAXLEN" -F', ' 'BEGIN{curline="";mlen=mlen-2}
+{ for (i=1;i<=NF; i++)
+ { { n=0; l=length(curline)+length($i) }
+   if (i==1) {curline=$i; n=1}
+   if (l<mlen && i>1) { curline=curline ", " $i; n=1}
+   if (n==0) {print curline; curline=$i }
+ }
+ if (length(curline)>0) {print curline; curline=""}
+}'>README.models
+  rm $TMPFILE
+fi
diff --git a/system/epson-printer-utility/rc.ecbd b/system/epson-printer-utility/rc.ecbd
new file mode 100644
index 0000000000..c534fab9aa
--- /dev/null
+++ b/system/epson-printer-utility/rc.ecbd
@@ -0,0 +1,33 @@
+#!/bin/sh
+#script to start/stop etc epson communication backend daemon ecbd
+
+if [ ! -x /usr/lib/epson-backend/ecbd ]; then
+  echo "/usr/lib/epson-backend/ecbd not executable"
+  exit 1
+fi
+PIDFILE=/var/run/ecbd.pid
+OPT=${1:-start}
+case "$OPT" in
+'start')
+  if [ `ps -A|grep ecbd|grep -v "rc.ecbd"|wc -l` -gt 0 ]||[ -e $PIDFILE ]; then
+    echo "ecbd is already running"
+  else
+    /usr/lib/epson-backend/ecbd -p $PIDFILE &
+  fi
+  ;;
+'stop')
+  if [ -e /var/run/ecbd.pid ]; then
+    kill `cat $PIDFILE`
+  fi
+  rm -f $PIDFILE
+  ;;
+'restart')
+  if [ -e $PIDFILE ]; then
+    kill `cat $PIDFILE`
+  fi
+  rm -f $PIDFILE
+  /usr/lib/epson-backend/ecbd -p $PIDFILE &
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/system/epson-printer-utility/slack-desc b/system/epson-printer-utility/slack-desc
new file mode 100644
index 0000000000..2f670ddfa2
--- /dev/null
+++ b/system/epson-printer-utility/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------------------------------------------------------|
+epson-printer-utility: epson-printer-utility (epson printer monitor and tools)
+epson-printer-utility:
+epson-printer-utility: This is a printer utility for most Epson inkjet printers.
+epson-printer-utility: It offers printer monitoring of error, ink levels, and utilities
+epson-printer-utility: to check nozzles and clean print heads.
+epson-printer-utility:
+epson-printer-utility:
+epson-printer-utility:
+epson-printer-utility:
+epson-printer-utility:
+epson-printer-utility:
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/etsh/etsh.info b/system/etsh/etsh.info
index 59707edc21..dad0393dcb 100644
--- a/system/etsh/etsh.info
+++ b/system/etsh/etsh.info
@@ -3,7 +3,7 @@ VERSION="5.4.0"
 HOMEPAGE="https://etsh.nl/"
 DOWNLOAD="https://etsh.nl/src/etsh_5.4.0/etsh-5.4.0.tar.gz \
           https://etsh.nl/v6scripts/v6scripts-20180109.tar.gz \
-          http://urchlay.naptime.net/~urchlay/src/looptest-20180115.tar.xz"
+          https://slackware.uk/~urchlay/src/looptest-20180115.tar.xz"
 MD5SUM="e004699ce8842fdfc4536e54dbb1ea04 \
         5fee60c842f1ab7274c5a53447de2b63 \
         1c7ef73a9515d340354bbb19e5ebed91"
diff --git a/system/exa/exa.SlackBuild b/system/exa/exa.SlackBuild
index 986a3c2b47..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}
 
@@ -119,7 +119,7 @@ mkdir vendor
       sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -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 9ac5f81812..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.0.0}
+VERSION=${VERSION:-2.8.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,24 +59,15 @@ fi
 # BUILD_SHARED=yes to this script
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
-
-if [ "$BUILD_STATIC" = "no" ]; then
-	LIBS_CONF="--disable-static"
-fi
-
-if [ "$BUILD_SHARED" = "yes" ]; then
-	LIBS_CONF="--enable-shared $LIBS_CONF"
-fi
+[ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
+[ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
 
 # By default, all binaries are linked against the static versions of the skarnet.org libraries
 # Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries
 # Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be
 # linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script
 LINK_SHARED=${LINK_SHARED:-no}
-
-if [ "$LINK_SHARED" = "yes" ]; then
-		LIBS_CONF="--disable-allstatic $LIBS_CONF"
-fi
+[ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
 
 set -e
 
diff --git a/system/execline/execline.info b/system/execline/execline.info
index 95df22837a..4325cd74e9 100644
--- a/system/execline/execline.info
+++ b/system/execline/execline.info
@@ -1,8 +1,8 @@
 PRGNAM="execline"
-VERSION="2.6.0.0"
+VERSION="2.8.0.1"
 HOMEPAGE="https://skarnet.org/software/execline/"
-DOWNLOAD="https://skarnet.org/software/execline/execline-2.6.0.0.tar.gz"
-MD5SUM="5b359440600cba9a31c4e7efba87d4ca"
+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 164a80c65c..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="http://urchlay.naptime.net/~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/fasd/slack-desc b/system/fasd/slack-desc
index c74a9dd152..284105f567 100644
--- a/system/fasd/slack-desc
+++ b/system/fasd/slack-desc
@@ -16,4 +16,4 @@ fasd: quickly reference them in the command line.
 fasd:
 fasd: The name fasd comes from the default suggested aliases f(files),
 fasd: a(files/directories), s(show/search/select), d(directories).
-fasd:
\ No newline at end of file
+fasd:
diff --git a/system/fcron/fcron.SlackBuild b/system/fcron/fcron.SlackBuild
index 2744dff620..835f21f70f 100644
--- a/system/fcron/fcron.SlackBuild
+++ b/system/fcron/fcron.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=fcron
 VERSION=${VERSION:-3.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 # Select fcron's default user/group
@@ -94,6 +94,7 @@ find -L . \
   --with-boot-install=no \
   --with-cflags="$SLKCFLAGS" \
   --with-docdir=/usr/doc \
+  --without-pam \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --localstatedir=/var \
   --mandir=/usr/man \
diff --git a/system/fd/fd.SlackBuild b/system/fd/fd.SlackBuild
index b1200f70a1..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:-7.5.0}
+VERSION=${VERSION:-8.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -119,7 +119,7 @@ mkdir vendor
       sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
diff --git a/system/fd/fd.info b/system/fd/fd.info
index bbf656f899..bb79177da2 100644
--- a/system/fd/fd.info
+++ b/system/fd/fd.info
@@ -1,124 +1,128 @@
 PRGNAM="fd"
-VERSION="7.5.0"
+VERSION="8.2.1"
 HOMEPAGE="https://github.com/sharkdp/fd"
-DOWNLOAD="https://github.com/sharkdp/fd/archive/v7.5.0/fd-7.5.0.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.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/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/bstr/bstr-0.2.12.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/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.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.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/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/filetime/filetime-0.2.8.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/fs_extra/fs_extra-1.1.0.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.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/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-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ignore/ignore-0.4.12.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/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.68.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.6.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/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/num_cpus/num_cpus-1.12.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/regex-syntax/regex-syntax-0.6.17.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/remove_dir_all/remove_dir_all-0.5.2.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.1.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/vec_map/vec_map-0.8.1.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/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.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/winapi-build/winapi-build-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/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/winapi/winapi-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate"
-MD5SUM="049737c422e4840ef29da15dac1bb7a6 \
-        abc51f82118d86e83165ba87e2521e96 \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate"
+MD5SUM="be6243e578e2313578bb0cf1e713b5e9 \
+        93850f8bf39e61dcf80ce49b5e0943d7 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
         f44e8d1d2e61974b268852797530ea41 \
+        6f628b386c5dfe62ffa9b017d8ed7c38 \
         142cb4b9a653e56e56311f0c883b8582 \
-        7c6515c4b7f4c7723a3c6d1f07acc261 \
+        c6443ec8d007c729ba5482008d0c864d \
         6799c26a7eacaf8e58d3e45c6c5add89 \
-        33229041d7f94f7187634d017a75654f \
-        9b688de84c233898a6e2492174b3ea26 \
+        0df9d76acda993ef38665e5e254f500c \
+        b3ebb5d4433417e998d982d46334a6f4 \
         882dbbc613a93f64c3709b0a2bd0d6dc \
-        135f6d6306e50606f0475ada50c33ce2 \
-        e9d5377e649441c6984e17b9679f2773 \
-        ff67cf2eb9668167782b8012d3b48e7b \
-        6c739a6c270468297135cd4bfeadbdd1 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        bc79e0eb364df515a33755ac9a581cfd \
+        9e1f73325eeb9647ee68eeaa4bff975c \
+        ed8fbdb220a7435e83c34d46151182f0 \
         06fc5cd841a576b0bc969fb13ba22b4c \
-        704bb3b90e401df7415d10cb98cca8d2 \
-        b0fd8ad50f5e64c71f0daf8af79ca952 \
-        8b98db48d2cecf5843b75e2f668c58fa \
+        3681f813c502d911e9eea940dddd26a5 \
+        c1922365b80dcdf50342e7640eea27ce \
+        d2c45f1ab11c072f28d2087f0af9870f \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        11bdaeb718e5577104b0697c89cf9311 \
         27260b46db6b9ac40318143d70a80ba3 \
-        976eacc1e28ff6a04a08e7f4a2a5466a \
-        b9b9083c321e04d293fc37b9695a8e49 \
-        361bd9fd6988aa4ac291c63336fb29c3 \
-        0660ce0a6392befc1260773d234d3522 \
+        704babd757a22f163230a36fa5474890 \
+        1b94f32581a557963eecb29761e9c0eb \
+        553b325a602b701eb7eaef228e69d0f2 \
+        3f94dd669aafea2fcd7c8c63236029c4 \
+        88b4e3e28ea8527c2b0e7124d6d5766f \
         85dae509b4cda41fa820b3ad3b302479 \
         9f10bcc7b3ab24a0cdbaa0addc65b88d \
-        9d033cc2daa6924420a4a89e6705773f \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        12eab0b5d25a0244e1082c24d3b6c57d \
-        61e508ca2eee543023c5e1ba777e5ede \
-        540b5e6ca7ac76694986b4ed898589c8 \
-        b5cf10e268e8a3bee2de8a734104245e \
-        124ec4f35274a0e9c1a4ef3dc0958643 \
-        c45800f4dfb888a928c772b081065214 \
-        09931e9b99240bb850c9e9c9ccb22668 \
+        3845eb009d59a1e90a749e50fadfd2d3 \
+        f50d2e280b4a3491fffda43b90982544 \
+        f3373fd861a0066fa446a8ab3dabc749 \
+        fa3630e5867493e09296155763e4f4a0 \
+        d0daed97b20f4a6b23c8d4e2ac7b77a8 \
+        c36d452e37c73b1e99f40bae18cddfdb \
         9e99a37f8c37bb953732ef46ac2b12a1 \
         8cab41822d03dfa674870315308fa392 \
         35ddcd36701a1a6711cc3aec85909f41 \
         c8d655d206cbe48b84a22544d6fc6d15 \
-        8dc2aa474c2cba342120ade9e98de066 \
-        04031b2ff0f95e8fb3c09d2d1d3b3b77 \
-        8ea9f47964ca4c580f250027ceb4cefd \
-        526f5ebac8d794185afbc71959c5c968 \
+        3cc3a4bd5861ca93d7c0d19129334703 \
+        870008bba2e68db4988c31e511fbd9c4 \
+        13373372c7ce2e894925d846625a7987 \
+        40d1ab8fd9b6e5e376b0839a9132abe1 \
+        0538d1da369f3e3f0412aa4d735c1b61 \
         2d8d8b377d144f5e32b4f65a69eb0b24 \
         781d4ccf5d04c98fa02af207a9639249 \
         918b2d65f7489e154483e3d6e54118a0 \
-        adf9d2250c2a622c6274514e38d1f559 \
+        73d602cc41e3e431bf4fabd129ae1616 \
         a8de006fe0c7e373c560dd51599287a8 \
         a5dd75e77c7324f5c1d2d372c990d0a7 \
-        0f65fd26370e1fd67c8e8812cabea574 \
-        0eedbc32447f40b3045d6de3910b5415 \
-        0d6976e8a1a1e69abc8ba8f6966cddb8 \
-        689203efc084fc0f1d1f74f5d354ae75 \
+        4272c279b06b88f8b0ffce7109348e27 \
+        d4c929fc9daf131daef04ee7eaa91fd4 \
+        333b4ba3f64c35b6f89b521e8d64548b \
+        8b01b016a9b6deebc1b43f296057efb5 \
         1092a4a24e80f8856efc71af51a06114 \
-        c900e7dbce808ff8ced375077b17a163 \
+        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
         db96b50050277bf05a3c68534bbb9586 \
-        050f25d04677ff1a36ebdec55ea9df23 \
+        b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
-        b44489eb4799c4fabac3fceb48de54f7 \
-        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/fence-agents/README b/system/fence-agents/README
index e60449bac2..6ae20b9e8d 100644
--- a/system/fence-agents/README
+++ b/system/fence-agents/README
@@ -5,5 +5,5 @@ computers from destroying data on shared storage. Their aim is to isolate
 a corrupted computer, using one of three methods: Power / Network /
 Configuration.
 
-You might also want to install corosync, pacemaker, resource-agents, crmsh,
-fence-agents and eventually cluster-glue.
+You might also want to install cluster-glue, heartbeat, resource-agents,
+fence-agents.
diff --git a/system/fence-agents/fence-agents.SlackBuild b/system/fence-agents/fence-agents.SlackBuild
index 61d4f715a0..13cc51c804 100644
--- a/system/fence-agents/fence-agents.SlackBuild
+++ b/system/fence-agents/fence-agents.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fence-agents
-VERSION=${VERSION:-4.2.1}
+VERSION=${VERSION:-4.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/fence-agents/fence-agents.info b/system/fence-agents/fence-agents.info
index 59ac045edf..6c46e6d631 100644
--- a/system/fence-agents/fence-agents.info
+++ b/system/fence-agents/fence-agents.info
@@ -1,10 +1,10 @@
 PRGNAM="fence-agents"
-VERSION="4.2.1"
+VERSION="4.5.2"
 HOMEPAGE="https://github.com/ClusterLabs/fence-agents"
-DOWNLOAD="https://github.com/ClusterLabs/fence-agents/archive/v4.2.1/fence-agents-4.2.1.tar.gz"
-MD5SUM="2c7ad8aaf1a47154a6e6d53b40c15721"
+DOWNLOAD="https://github.com/ClusterLabs/fence-agents/archive/v4.5.2/fence-agents-4.5.2.tar.gz"
+MD5SUM="eb8c96a87c529b0c30a7524ea86433e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="corosync pacemaker pexpect python-requests"
+REQUIRES="pexpect ptyprocess python-requests"
 MAINTAINER="Pierre-Philipp Braun"
 EMAIL="pbraun@nethence.com"
diff --git a/system/fence-agents/slack-desc b/system/fence-agents/slack-desc
index fe6dca19bc..826d0e1000 100644
--- a/system/fence-agents/slack-desc
+++ b/system/fence-agents/slack-desc
@@ -13,7 +13,7 @@ fence-agents: prevent computers from destroying data on shared storage. Their
 fence-agents: aim is to isolate a corrupted computer, using one of three methods:
 fence-agents: Power / Network / Configuration.
 fence-agents:
-fence-agents: You might also want to install corosync, pacemaker, resource-agents,
-fence-agents: crmsh, fence-agents and eventually cluster-glue.
+fence-agents: You might also want to install cluster-glue, heartbeat,
+fence-agents: resource-agents, fence-agents.
 fence-agents:
 fence-agents:
diff --git a/system/filerunner/README b/system/filerunner/README
new file mode 100644
index 0000000000..13cd824d28
--- /dev/null
+++ b/system/filerunner/README
@@ -0,0 +1,12 @@
+filerunner (two-pane graphical file manager)
+
+FileRunner is a very configurable two-pane file manager for Unix and
+Windows systems. It is simple and efficient and has a built-in FTP/SFTP
+client.
+
+FileRunner's config files can be found in ~/.config/.fr.
+
+Note: the FileRunner executable is normally called /usr/bin/fr. I've
+renamed it to /usr/bin/filerunner, since there's already a system/fr
+package that installs a /usr/bin/fr. If system/fr is not installed,
+you'll get a /usr/bin/fr symlink to filerunner.
diff --git a/system/filerunner/doinst.sh b/system/filerunner/doinst.sh
new file mode 100644
index 0000000000..f05aaf46fc
--- /dev/null
+++ b/system/filerunner/doinst.sh
@@ -0,0 +1,14 @@
+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
+
+# If there's no fr link, take over:
+if [ ! -r usr/bin/fr ]; then
+  ( cd usr/bin ; ln -sf filerunner fr )
+fi
diff --git a/system/filerunner/filerunner.SlackBuild b/system/filerunner/filerunner.SlackBuild
new file mode 100644
index 0000000000..365286bdc0
--- /dev/null
+++ b/system/filerunner/filerunner.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Slackware build script for filerunner
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Upstream's official RPM release claims to be noarch, but it's a dirty
+# lie: it includes libinotify1.4.1.so binaries[*] for various arches. So
+# does the source, but we're not trusting binaries that were probably
+# built on Red Hat. The source for the prebuilt binaries is included,
+# so this script compiles it instead.
+
+# [*] It breaks FHS and Slackware standards by installing arch-dependent
+#     files (shared libs) in /usr/share, too. But I'm going to leave it
+#     that way.
+
+PRGNAM=filerunner
+VERSION=${VERSION:-20.05.02.17}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=fr
+
+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
+
+# called twice, make it a func
+fixperms() {
+  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 {} \+
+}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $PRGNAM
+fixperms
+
+# DO NOT use precompiled binaries!
+rm -rf packages/inotify/*
+
+# Use tcl's idea of our architecture, since that's what fr will use
+# to locate the inotify tcl extension.
+TCLARCH="$( echo 'puts $::tcl_platform(machine)' | tclsh )"
+mkdir -p packages/inotify/$TCLARCH
+
+# Compile the library that prevents this from being a noarch package:
+cd Makefiles
+LIBNAM=tcl-inotify
+LIBVER="$( echo $LIBNAM-*.tar.gz | sed 's,.*-\([0-9.]*\)\.tar.gz,\1,' )"
+tar xvf $LIBNAM-$LIBVER.tar.gz
+fixperms
+
+cd $LIBNAM-$LIBVER
+./configure && make
+
+# Install it where fr INSTALL script expects to find it.
+install -s libinotify$LIBVER.so \
+           $TMP/$PRGNAM/packages/inotify/$TCLARCH
+
+# Now we can install the main package.
+cd -
+DESTDIR=$PKG \
+DOCS=/usr/doc/$PRGNAM-$VERSION \
+  ./INSTALL -nogui
+
+# Make this symlink so fr won't try to do it at runtime (and fail, if
+# not running as root).
+( cd $PKG/usr/share/$PRGNAM/packages/inotify
+  ln -s $TCLARCH/libinotify$LIBVER.so . )
+
+# We have a slight conflict with system/fr, so:
+mv $PKG/usr/bin/$SRCNAM $PKG/usr/bin/$PRGNAM
+sed -i "/^Exec/s|$SRCNAM|$PRGNAM|" $PKG/usr/share/applications/$PRGNAM.desktop
+
+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/filerunner/filerunner.info b/system/filerunner/filerunner.info
new file mode 100644
index 0000000000..1304749807
--- /dev/null
+++ b/system/filerunner/filerunner.info
@@ -0,0 +1,10 @@
+PRGNAM="filerunner"
+VERSION="20.05.02.17"
+HOMEPAGE="https://sourceforge.net/projects/filerunner/"
+DOWNLOAD="https://downloads.sourceforge.net/project/filerunner/release-20.05.02.17/fr-20.05.02.17.tar.gz"
+MD5SUM="a8787d750f729c8487e44e16075aa671"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/filerunner/slack-desc b/system/filerunner/slack-desc
new file mode 100644
index 0000000000..c40867c9a6
--- /dev/null
+++ b/system/filerunner/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------------------------------------------------------|
+filerunner: filerunner (two-pane graphical file manager)
+filerunner:
+filerunner: FileRunner is a very configurable two-pane file manager for Unix
+filerunner: and Windows systems. It is simple and efficient and has a built-in
+filerunner: FTP/SFTP client.
+filerunner:
+filerunner:
+filerunner:
+filerunner:
+filerunner:
+filerunner:
diff --git a/system/fio/fio.SlackBuild b/system/fio/fio.SlackBuild
index 73ae4e24e9..3e923213c6 100644
--- a/system/fio/fio.SlackBuild
+++ b/system/fio/fio.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for fio
 
 # Copyright 2012 Binh Nguyen <binhvng@gmail.com>
-# Copyright 2015-2019 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2015-2020 Brenton Earl <brent@exitstatusone.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=fio
-VERSION=${VERSION:-3.14}
+VERSION=${VERSION:-3.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/fio/fio.info b/system/fio/fio.info
index 680434500f..9fec576b28 100644
--- a/system/fio/fio.info
+++ b/system/fio/fio.info
@@ -1,8 +1,8 @@
 PRGNAM="fio"
-VERSION="3.14"
+VERSION="3.23"
 HOMEPAGE="http://git.kernel.dk/cgit/fio/"
-DOWNLOAD="http://brick.kernel.dk/snaps/fio-3.14.tar.gz"
-MD5SUM="54eabdbcaac1d0d1edcd8a3bb6c927fc"
+DOWNLOAD="http://brick.kernel.dk/snaps/fio-3.23.tar.gz"
+MD5SUM="497f8bad953723a8c4c46f2a58a13b24"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/firejail/firejail.SlackBuild b/system/firejail/firejail.SlackBuild
index cb49054357..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.62}
+VERSION=${VERSION:-0.9.64.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -88,6 +88,8 @@ 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
 
+sed -i "s|whitelist /usr/share/doc|#whitelist /usr/share/doc|" $PKG/etc/firejail/firefox.profile
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/system/firejail/firejail.info b/system/firejail/firejail.info
index 1897fcce3c..a13f37b3ae 100644
--- a/system/firejail/firejail.info
+++ b/system/firejail/firejail.info
@@ -1,8 +1,8 @@
 PRGNAM="firejail"
-VERSION="0.9.62"
+VERSION="0.9.64.4"
 HOMEPAGE="https://firejail.wordpress.com/"
-DOWNLOAD="https://sourceforge.net/projects/firejail/files/firejail/firejail-0.9.62.tar.xz"
-MD5SUM="649383326b936044fea9031416e56767"
+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/fish/README b/system/fish/README
index 2f0a1f4067..00f5c35adf 100644
--- a/system/fish/README
+++ b/system/fish/README
@@ -10,9 +10,7 @@ from the y/bsdgames package.  In a stock installation with default PATH
 ordering, /usr/bin should be checked before /usr/games, so it shouldn't
 be an issue, but we thought it was worth noting just in case.
 
-Optional packages (also found at slackbuilds.org):
-  sphinx
-  libedit
+Optional packages (also found at slackbuilds.org): sphinx libedit
 
 NOTES:
 
@@ -32,3 +30,7 @@ SlackBuild or typically (as normal user or root):
  $ fish
  $ source /etc/profile.d/man-db.sh
  $ fish_update_completions
+
+If you are upgrading from version 3.0.0 or before, please also review
+the release notes for 3.1.1, 3.1.0 and 3.1b1 at
+https://fishshell.com/release_notes.html.
diff --git a/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild
index 5e098fed36..909ee515e2 100644
--- a/system/fish/fish.SlackBuild
+++ b/system/fish/fish.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fish
-VERSION=${VERSION:-3.1.0}
+VERSION=${VERSION:-3.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/fish/fish.info b/system/fish/fish.info
index 80c1720b99..b70ec030e0 100644
--- a/system/fish/fish.info
+++ b/system/fish/fish.info
@@ -1,10 +1,10 @@
 PRGNAM="fish"
-VERSION="3.1.0"
+VERSION="3.1.2"
 HOMEPAGE="https://fishshell.com/"
-DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.1.0/fish-3.1.0.tar.gz"
-MD5SUM="8c9995a5a6d07ce05a1413ca24e16691"
+DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.1.2/fish-3.1.2.tar.gz"
+MD5SUM="2e9f12a250dccb9ab0529ae6f77710a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="man-db"
 MAINTAINER="Donald Cooley"
-EMAIL="chytraeus@protonmail.com"
+EMAIL="chytraeu@sdf.org"
diff --git a/system/fs-uae-arcade/fs-uae-arcade.SlackBuild b/system/fs-uae-arcade/fs-uae-arcade.SlackBuild
deleted file mode 100644
index d8cb3185af..0000000000
--- a/system/fs-uae-arcade/fs-uae-arcade.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# SlackBuild script for "fs-uae-arcade".
-
-# Copyright 2013-2015 Marcel Saegebarth <marc@mos6581.de>
-# 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=fs-uae-arcade
-VERSION=${VERSION:-2.6.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/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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 build
-make
-make install prefix=/usr DESTDIR=$PKG
-
-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/system/fs-uae-arcade/fs-uae-arcade.info b/system/fs-uae-arcade/fs-uae-arcade.info
deleted file mode 100644
index 579c0a448e..0000000000
--- a/system/fs-uae-arcade/fs-uae-arcade.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fs-uae-arcade"
-VERSION="2.6.2"
-HOMEPAGE="https://fs-uae.net/"
-DOWNLOAD="https://fs-uae.net/stable/2.6.2/fs-uae-arcade-2.6.2.tar.gz"
-MD5SUM="2b99bbcb32245a36c4b73cb1d56e1d2f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 python3-lhafile fs-uae"
-MAINTAINER="CRTS"
-EMAIL="crts@gmx.net"
diff --git a/system/fs-uae-launcher/fs-uae-launcher.SlackBuild b/system/fs-uae-launcher/fs-uae-launcher.SlackBuild
deleted file mode 100644
index 7cf795a364..0000000000
--- a/system/fs-uae-launcher/fs-uae-launcher.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# SlackBuild script for "fs-uae-launcher".
-
-# Copyright 2013-2015 Marcel Saegebarth <marc@mos6581.de>
-# 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=fs-uae-launcher
-VERSION=${VERSION:-2.6.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/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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 build
-make
-make install prefix=/usr DESTDIR=$PKG
-
-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/system/fs-uae-launcher/fs-uae-launcher.info b/system/fs-uae-launcher/fs-uae-launcher.info
deleted file mode 100644
index 0d9f2bdf03..0000000000
--- a/system/fs-uae-launcher/fs-uae-launcher.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fs-uae-launcher"
-VERSION="2.6.2"
-HOMEPAGE="https://fs-uae.net/"
-DOWNLOAD="https://fs-uae.net/stable/2.6.2/fs-uae-launcher-2.6.2.tar.gz"
-MD5SUM="bde923259083a97c5ea677f4f61cb660"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 python3-lhafile fs-uae"
-MAINTAINER="CRTS"
-EMAIL="crts@gmx.net"
diff --git a/system/fs-uae/README b/system/fs-uae/README
deleted file mode 100644
index c84fe274c5..0000000000
--- a/system/fs-uae/README
+++ /dev/null
@@ -1,4 +0,0 @@
-FS-UAE focuses on emulating Amiga games using the accurate emulation code
-from WinUAE. It also has features to emulate a high-end Amiga with expansions.
-
-Note: Since version 2.3.x the FS-UAE Launcher is a separate package.
diff --git a/system/fs-uae/fs-uae.SlackBuild b/system/fs-uae/fs-uae.SlackBuild
deleted file mode 100644
index e1383204ba..0000000000
--- a/system/fs-uae/fs-uae.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# SlackBuild script for "fs-uae".
-
-# Copyright 2012-2016 Marcel Saegebarth <marc@mos6581.de>
-# 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=fs-uae
-VERSION=${VERSION:-2.8.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 {} \;
-
-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
-
-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/fs-uae/fs-uae.info b/system/fs-uae/fs-uae.info
deleted file mode 100644
index 9ac5da8180..0000000000
--- a/system/fs-uae/fs-uae.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fs-uae"
-VERSION="2.8.1"
-HOMEPAGE="https://fs-uae.net/"
-DOWNLOAD="https://fs-uae.net/stable/2.8.1/fs-uae-2.8.1.tar.gz"
-MD5SUM="6dd3a6edc9c08780db8b7d6002440929"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2 OpenAL libmpeg2"
-MAINTAINER="CRTS"
-EMAIL="crts@gmx.net"
diff --git a/system/ft2demos/README b/system/ft2demos/README
new file mode 100644
index 0000000000..048f6be971
--- /dev/null
+++ b/system/ft2demos/README
@@ -0,0 +1,26 @@
+ft2demos (freetype demos and tools)
+
+Set of demo programs and tools for freetype. Can be useful for testing
+and debugging problems with fonts (or with freetype itself). Includes
+these tools:
+
+ftbench  - benchmark some common FreeType paths
+ftchkwd  - test fixed font width
+ftdiff   - compare font hinting modes
+ftdump   - simple font dumper
+ftgamma  - screen gamma calibration helper
+ftgrid   - simple glyph grid viewer
+ftlint   - simple font tester
+ftmemchk - simple memory tester (tests FreeType's memory allocator)
+ftmulti  - multiple masters font viewer
+ftpatchk - tests whether patented hinting is necessary
+ftstring - string viewer (displays text in specified font)
+fttimer  - simple performance timer
+ftvalid  - font layout table validator
+ftview   - simple glyph viewer
+ttdebug  - a TrueType bytecode debugger
+
+Most of the commands have man pages. Also most of the commands show
+usage info if you run them with --help (or with no arguments).
+
+This package is known as "freetype2-demos" on Arch and Debian systems.
diff --git a/system/ft2demos/ft2demos.SlackBuild b/system/ft2demos/ft2demos.SlackBuild
new file mode 100644
index 0000000000..6f4c2805c9
--- /dev/null
+++ b/system/ft2demos/ft2demos.SlackBuild
@@ -0,0 +1,158 @@
+#!/bin/sh
+
+# Slackware build script for ft2demos
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# This thing requires first building (but not installing) freetype2,
+# hence all the downloads.
+
+# This script is heavily based on Pat Volkerding's freetype.SlackBuild:
+# https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/
+# ...and Arch Linux's freetype2-demos PKGBUILD:
+# https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/freetype2
+
+# Note to self: keep VERSION in sync with Pat's patches/freetype.
+
+PRGNAM=ft2demos
+VERSION=${VERSION:-2.6.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+LIBNAM=freetype
+
+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-build
+mkdir -p $PRGNAM-build
+cd $PRGNAM-build
+tar xvf $CWD/$LIBNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+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 process wants this symlink.
+ln -s $LIBNAM-$VERSION ${LIBNAM}2
+
+### First, build FreeType, since ft2demos needs the whole source tree.
+cd $LIBNAM-$VERSION
+
+# Apply Pat's patches
+zcat $CWD/freetype.illadvisederror.diff.gz | patch -p1
+zcat $CWD/freetype.CVE-2017-8287.diff.gz | patch -p1
+
+# Enable the validators needed by the ftvalid command. Part 1 of a
+# DIRTY_HACK to make ftvalid work.
+sed -i '/^# *AUX_MODULES.*valid/s|^# *||' modules.cfg
+
+# Use Pat's build command (but no make install!)
+CFLAGS="$SLKCFLAGS" \
+  make setup \
+  CFG="--prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} --build=$ARCH-slackware-linux"
+make
+
+### Now, build ft2demos. These will end up dynamically linked to the
+#   system libfreetype.so after package installation, *except* for
+#   ftvalid, which won't work with Slackware's libfreetype.so, so it
+#   gets statically linked with the libfreetype.a we just built. See
+#   DIRTY_HACK, parts 1 and 2.
+cd $TMP/$PRGNAM-build/$PRGNAM-$VERSION
+
+# Build the extra executables
+sed -i '/^  *# *EXES/s|# *||' Makefile
+
+# Don't try to build ftvalid yet. If we do, the resulting binary is
+# useless, complains that none of its validation methods are compiled in,
+# and suggests rebuilding FreeType.
+sed -i '/EXES *+= *ftvalid/d' Makefile
+
+# Don't include RPATH in binaries (borrowed from Arch)
+sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+
+# Don't have to specify CFLAGS here, it'll pick them up from the freetype
+# build we just did.
+make
+
+# DIRTY_HACK, part 2. Get the link command libtool generated for ftvalid,
+# and replace freetype.so with freetype.a (the static lib). This is me
+# working around libtool's "helpful" automation. Die, libtool!
+echo "=== Prepare for dirty hack, put on your goggles now"
+make EXES=ftvalid | tee make.out
+
+echo "=== ftvalid.build.cmd:"
+grep '^libtool: link:' make.out | \
+  cut -d: -f3- | \
+  sed 's|/usr/lib[^/]*/libfreetype.so||' | \
+  sed 's|\([^ *]\.libs/libfreetype.\)so|\1a|' | \
+  tee ftvalid.build.cmd
+
+# Now run the abomination we've created. If it fails, don't let set -e
+# kill the whole script (we'll just make a package without ftvalid).
+sh ./ftvalid.build.cmd || echo "!!! Attempt to build ftvalid failed"
+
+# The semi-static ftvalid is big, but still under 1MB. Also, if you
+# run ldd on it, you'll see libfreetype.so is required... this is because
+# of a circular dependency with harfbuzz. It doesn't seem to cause a
+# problem for ftvalid.
+echo "=== Stand down from dirty hack alert, you may now remove your goggles"
+
+# There is no 'make install', this bit was borrowed from Arch.
+mkdir -p $PKG/usr/bin
+for i in bin/{f,t}t*; do
+  libtool --mode=install install $i $PKG/usr/bin
+done
+strip $PKG/usr/bin/*
+
+# For whatever reason, the Arch and Debian packages don't install the
+# man pages.
+mkdir -p $PKG/usr/man/man1
+for i in src/*.1; do
+  gzip -9c < $i > $PKG/usr/man/man1/$( basename $i).gz
+done
+
+# The README is build instructions, don't bother. Instead, include our
+# own README which at least lists the tools and their short descriptions.
+# The ChangeLog goes back to 2000, don't need the whole damn thing.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+head -n1000 ChangeLog > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
+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/ft2demos/ft2demos.info b/system/ft2demos/ft2demos.info
new file mode 100644
index 0000000000..50c3bc2ea5
--- /dev/null
+++ b/system/ft2demos/ft2demos.info
@@ -0,0 +1,16 @@
+PRGNAM="ft2demos"
+VERSION="2.6.3"
+HOMEPAGE="http://www.freetype.org"
+DOWNLOAD="https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-2.6.3.tar.bz2 \
+          https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype-2.6.3.tar.xz \
+          https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.CVE-2017-8287.diff.gz \
+          https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.illadvisederror.diff.gz"
+MD5SUM="f7c6102f29834a80456264fe4edd81d1 \
+        c806890db47d8ad8887253a926377e33 \
+        eea2e24cf46314d716d0668f5fdbbf08 \
+        419295091bb684f531c3ba9614fea3a0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/ft2demos/slack-desc b/system/ft2demos/slack-desc
new file mode 100644
index 0000000000..22f4cbc5e3
--- /dev/null
+++ b/system/ft2demos/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------------------------------------------------------|
+ft2demos: ft2demos (freetype demos and tools)
+ft2demos:
+ft2demos: Set of demo programs and tools for freetype. Can be useful for testing
+ft2demos: and debugging problems with fonts (or with freetype itself). Includes
+ft2demos: these tools:
+ft2demos:
+ft2demos: ftbench ftchkwd  ftdiff   ftdump  ftgamma ftgrid  ftlint  ftmemchk
+ft2demos: ftmulti ftpatchk ftstring fttimer ftvalid ftview  ttdebug
+ft2demos:
+ft2demos:
+ft2demos:
diff --git a/system/fuse-overlayfs/fuse-overlayfs.info b/system/fuse-overlayfs/fuse-overlayfs.info
index 1279c832a3..025aa493f2 100644
--- a/system/fuse-overlayfs/fuse-overlayfs.info
+++ b/system/fuse-overlayfs/fuse-overlayfs.info
@@ -2,7 +2,7 @@ PRGNAM="fuse-overlayfs"
 VERSION="0.6.5"
 HOMEPAGE="https://github.com/containers/fuse-overlayfs"
 DOWNLOAD="https://github.com/containers/fuse-overlayfs/archive/v0.6.5/fuse-overlayfs-0.6.5.tar.gz"
-MD5SUM="b51db9df094de8d4b477e6fc84007a97"
+MD5SUM="11b6906ae03fd83d32d20d7151e00470"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fuse3"
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/fwupd/README b/system/fwupd/README
index cb483338da..07e8586ed7 100644
--- a/system/fwupd/README
+++ b/system/fwupd/README
@@ -7,4 +7,4 @@ Options (all default to false):
   ENABLE_UEFI: true|false - requires pygobject3-python3 python3-pillow
                                      py3cairo
 
-  https://github.com/fwupd/fwupd/blob/1.2.10/meson_options.txt
+  https://github.com/fwupd/fwupd/blob/1.2.13/meson_options.txt
diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild
index 8493264dc1..b7d8384306 100644
--- a/system/fwupd/fwupd.SlackBuild
+++ b/system/fwupd/fwupd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fwupd
 
-# 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,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fwupd
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.2.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info
index 9ca69fcdeb..97d10dab24 100644
--- a/system/fwupd/fwupd.info
+++ b/system/fwupd/fwupd.info
@@ -1,8 +1,8 @@
 PRGNAM="fwupd"
-VERSION="1.2.10"
+VERSION="1.2.13"
 HOMEPAGE="https://www.fwupd.org"
-DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.2.10/fwupd-1.2.10.tar.gz"
-MD5SUM="ad3765dc9409fa1d9b46dc712fd041e4"
+DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.2.13/fwupd-1.2.13.tar.gz"
+MD5SUM="e205c79b43f343c56b340593f4d00c9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libxmlb libgusb efivar json-glib gcab"
diff --git a/system/fzf/fzf.SlackBuild b/system/fzf/fzf.SlackBuild
index 067753fef9..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.21.0}
+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 12e4dc1e68..5f1c696425 100644
--- a/system/fzf/fzf.info
+++ b/system/fzf/fzf.info
@@ -1,30 +1,34 @@
 PRGNAM="fzf"
-VERSION="0.21.0"
+VERSION="0.27.0"
 HOMEPAGE="https://github.com/junegunn/fzf"
-DOWNLOAD="https://github.com/junegunn/fzf/archive/0.21.0/fzf-0.21.0.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="38745c31da4b2a46a7984c6f1015e130 \
+          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 beb17fa5c7..85ea602913 100644
--- a/system/gnu-unifont/gnu-unifont.SlackBuild
+++ b/system/gnu-unifont/gnu-unifont.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2010 crocket (crockabiscuit@gmail.com)
 # Copyright 2013-2015 LukenShiro, Italy
-# Copyright 2019 Tomasz Bywalec
+# Copyright 2019-2020 Tomasz Bywalec
 # 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=gnu-unifont
-VERSION=${VERSION:-12.1.04}
+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 f061ce6e3f..fbcf5b0e78 100644
--- a/system/gnu-unifont/gnu-unifont.info
+++ b/system/gnu-unifont/gnu-unifont.info
@@ -1,8 +1,8 @@
 PRGNAM="gnu-unifont"
-VERSION="12.1.04"
+VERSION="13.0.06"
 HOMEPAGE="http://unifoundry.com/unifont/index.html"
-DOWNLOAD="http://unifoundry.com/pub/unifont/unifont-12.1.04/unifont-12.1.04.tar.gz"
-MD5SUM="b227ac14cefc5c437d66572b0d139d7b"
+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/goaccess/README b/system/goaccess/README
index 563151d147..a21acc4c4a 100644
--- a/system/goaccess/README
+++ b/system/goaccess/README
@@ -1,28 +1,29 @@
-Goaccess is an open source real-time Apache log analyzer and
+Goaccess is an open source real-time Apache log analyser and
 interactive viewer that runs in a terminal in *nix systems.
 It provides fast and valuable HTTP statistics for system
-administrators that require a visual server report on the fly.
+administrators that require a visual server report on the
+fly.
 
 Optional:
 
-GeoIP:
-
-Goaccess now supports two types of GeoIP - legacy and mmdb.
+Goaccess supports two types of GeoIP - legacy and mmdb.
 
 If you want to add GeoIP support, pass either option to the
 slackbuild:
 
 GEOIP=legacy ./goaccess.SlackBuild
-GEOIP=mmdb ./goaccess.SlackBuild
+(Requires GeoIP)
 
-At the moment, mmdb is not on slackbuilds.org.
+GEOIP=mmdb ./goaccess.SlackBuild
+(Requires libmaxminddb)
 
 TokyoCabinet:
 
-Goaccess supports Tokyo Cabinet and Tokyo Cabinet's on-disk B+ Tree
-database.
+Goaccess supports Tokyo Cabinet and Tokyo Cabinet's on-disk
+B+ Tree database.
 
 The options are:
 
 TCB=memhash ./goaccess.SlackBuild
 TCB=btree ./goaccess.SlackBuild
+(Both require tokyocabinet)
diff --git a/system/goaccess/goaccess.SlackBuild b/system/goaccess/goaccess.SlackBuild
index 58d71e0b97..2e83305eba 100644
--- a/system/goaccess/goaccess.SlackBuild
+++ b/system/goaccess/goaccess.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for goaccess
 
-# Copyright David Woodfall <dave@slackbuilds.org>
+# Copyright Dave Woodfall <dave@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=goaccess
-VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,13 +54,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ -n "$GEOIP" ]; then
-    geoip="--enable-geoip=$GEOIP"
-fi
-
-if [ -n "$TCB" ]; then
-    tcb="--enable-tcb=$TCB"
-fi
+geoip="--enable-geoip=${GEOIP:-no}"
+tcb="--enable-tcb=${TCB:-no}"
 
 set -e
 
@@ -103,10 +98,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
 
-mv $PKG/etc/goaccess.conf $PKG/etc/goaccess.conf.new
+install -D -m644 config/goaccess.conf $PKG/etc/goaccess.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS 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/system/goaccess/goaccess.info b/system/goaccess/goaccess.info
index dd15d67ac4..c655ce38ef 100644
--- a/system/goaccess/goaccess.info
+++ b/system/goaccess/goaccess.info
@@ -1,10 +1,10 @@
 PRGNAM="goaccess"
-VERSION="1.2"
+VERSION="1.3"
 HOMEPAGE="http://goaccess.prosoftcorp.com"
-DOWNLOAD="http://tar.goaccess.io/goaccess-1.2.tar.gz"
-MD5SUM="00f41cf1fb72cfc459984c0fb087333d"
+DOWNLOAD="http://tar.goaccess.io/goaccess-1.3.tar.gz"
+MD5SUM="5209c5d4e9e04b5b3e7f13134c5e146c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="Dave Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/guake/doinst.sh b/system/guake/doinst.sh
index c9b09eac64..5c97dbdc86 100644
--- a/system/guake/doinst.sh
+++ b/system/guake/doinst.sh
@@ -1,13 +1,3 @@
-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
-}
-
-    schema_install guake.schemas
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -20,6 +10,6 @@ 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
+      /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
   fi
 fi
diff --git a/system/guake/guake-3.7.0-fix-paths.patch b/system/guake/guake-3.7.0-fix-paths.patch
new file mode 100644
index 0000000000..0cd91ef062
--- /dev/null
+++ b/system/guake/guake-3.7.0-fix-paths.patch
@@ -0,0 +1,22 @@
+--- guake/paths.py.orig	2020-02-10 16:10:10.000000000 -0500
++++ guake/paths.py	2020-06-08 20:32:03.423403158 -0400
+@@ -55,8 +55,8 @@
+ 
+ 
+ def get_default_locale_dir():
+-    d = os.path.join(get_data_files_dir(), "po")
+-    log.debug("Using guake image directory: %s", d)
++    d = '/usr/share/locale'
++    log.debug("Using guake locale directory: %s", d)
+     return d
+ 
+ 
+@@ -73,7 +73,7 @@
+ 
+ 
+ def get_default_schema_dir():
+-    d = get_default_data_dir()
++    d = '/usr/share/glib-2.0/schemas'
+     log.debug("Using guake scheme directory: %s", d)
+     return d
+ 
diff --git a/system/guake/guake.SlackBuild b/system/guake/guake.SlackBuild
index 0bf0b55b94..3e9db65f3c 100644
--- a/system/guake/guake.SlackBuild
+++ b/system/guake/guake.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for guake
 
 # Copyright 2017-2018 Donald Cooley South Haven, IN USA
+# Copyright (C) 2020 Logan Rathbone <poprocks@gmail.com> Province of Ontario, Canada
 # 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=guake
-VERSION=${VERSION:-0.8.14}
+VERSION=${VERSION:-3.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,20 +41,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
@@ -69,35 +56,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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-schemas-install \
-  --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
+# fix some of the broken paths
+patch -p0 < $CWD/guake-3.7.0-fix-paths.patch
 
-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 generate-desktop generate-mo compile-glib-schemas-dev
+make DESTDIR="$PKG" PREFIX='/usr' install-schemas install-locale
+python3 setup.py install --root "$PKG" --prefix="/usr" --optimize=1
 
-find $PKG -name perllocal.pod \
-  -o -name ".packlist" \
-  -o -name "*.bs" \
-  | xargs rm -f
+# don't ship duplicate .mo and .po files
+rm -rf $PKG/usr/share/guake/po
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README.rst ChangeLog \
+  COPYING NEWS.rst README.rst \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/guake/guake.info b/system/guake/guake.info
index 4318250bec..4bc7673e19 100644
--- a/system/guake/guake.info
+++ b/system/guake/guake.info
@@ -1,10 +1,10 @@
 PRGNAM="guake"
-VERSION="0.8.14"
+VERSION="3.7.0"
 HOMEPAGE="http://guake.org"
-DOWNLOAD="https://github.com/Guake/guake/archive/0.8.14/guake-0.8.14.tar.gz"
-MD5SUM="a0155a28c4417d3c6200afbdebe2c306"
+DOWNLOAD="https://files.pythonhosted.org/packages/f1/20/32c2c8fe2ec4d5c38dbdd2b2ee60a382a529d0409c7a9960b2453e50d0d7/guake-3.7.0.tar.gz"
+MD5SUM="7934c9c214e25cbc706cd9a8e806becd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyxdg python-keybinder gnome-python2-gconf gnome-common"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES="libwnck3 vte3 python3 py3cairo dbus-python3 pygobject3-python3 pbr"
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"
diff --git a/system/heartbeat/README b/system/heartbeat/README
new file mode 100644
index 0000000000..742f8f2af6
--- /dev/null
+++ b/system/heartbeat/README
@@ -0,0 +1,13 @@
+Linux-HA heartbeat
+
+Heartbeat is a daemon that provides cluster infrastructure (communication and
+membership) services to its clients. This allows clients to know about the
+presence (or disappearance!) of peer processes on other machines and to easily
+exchange messages with them.
+
+Heartbeat still comes with an integrated primitive resource
+manager, which basically is just a shell script.  This is also
+referred to as "v1 style" or "haresources style" configuration.
+
+You might also want to install cluster-glue, heartbeat, resource-agents,
+fence-agents.
diff --git a/system/heartbeat/doinst.sh b/system/heartbeat/doinst.sh
new file mode 100644
index 0000000000..bdba1fdb05
--- /dev/null
+++ b/system/heartbeat/doinst.sh
@@ -0,0 +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 cop
+y
+    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/ha.d/authkeys.new
+config etc/ha.d/ha.cf.new
+config etc/ha.d/haresources.new
+preserve_perms etc/init.d/heartbeat.new
diff --git a/system/heartbeat/heartbeat.SlackBuild b/system/heartbeat/heartbeat.SlackBuild
new file mode 100644
index 0000000000..1d481aeec7
--- /dev/null
+++ b/system/heartbeat/heartbeat.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+# Slackware build script for heartbeat
+
+# Copyright 2018 Pierre-Philipp Braun, 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=heartbeat
+VERSION=${VERSION:-20200423}
+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 {} \;
+
+./bootstrap
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-dependency-tracking \
+  --build=$ARCH-slackware-linux \
+  --disable-rpath
+
+make
+make install DESTDIR=$PKG
+mv $PKG/etc/rc.d/init.d/heartbeat $PKG/etc/rc.d/init.d/heartbeat.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
+
+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
+
+#/etc/init.d/heartbeat script is already deployed by make install
+
+#/etc/ha.d/ folder is already created by make install, adding sample configs
+cat doc/authkeys > $PKG/etc/ha.d/authkeys.new
+cat doc/ha.cf > $PKG/etc/ha.d/ha.cf.new
+cat doc/haresources > $PKG/etc/ha.d/haresources.new
+chmod 600 $PKG/etc/ha.d/authkeys.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README \
+  $PKG/usr/doc/$PRGNAM-$VERSION/README.heartbeat
+doc=`find doc/ -type f | grep -vE '.([[:digit:]]|in|am|am.orig)$'`
+cp -a \
+  $doc \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+unset 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/system/heartbeat/heartbeat.info b/system/heartbeat/heartbeat.info
new file mode 100644
index 0000000000..a4160d6635
--- /dev/null
+++ b/system/heartbeat/heartbeat.info
@@ -0,0 +1,10 @@
+PRGNAM="heartbeat"
+VERSION="20200423"
+HOMEPAGE="https://github.com/pbraun9/heartbeat"
+DOWNLOAD="https://github.com/pbraun9/heartbeat/archive/20200423/heartbeat-20200423.tar.gz"
+MD5SUM="740fab2aea67f98e4c411af35dccec0b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="cluster-glue resource-agents"
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
diff --git a/system/heartbeat/slack-desc b/system/heartbeat/slack-desc
new file mode 100644
index 0000000000..9649a4fb6d
--- /dev/null
+++ b/system/heartbeat/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------------------------------------------------------|
+heartbeat: heartbeat (Linux-HA heartbeat)
+heartbeat:
+heartbeat: Old school cluster infrastructure for GNU/Linux
+heartbeat: Allows you to avoid Corosync and even Pacemaker
+heartbeat:
+heartbeat: No CRMSH nor PCS required
+heartbeat:
+heartbeat: You might also want to install cluster-glue, heartbeat,
+heartbeat: resource-agents, fence-agents.
+heartbeat:
+heartbeat:
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/hwloc/hwloc.SlackBuild b/system/hwloc/hwloc.SlackBuild
index 78c7ab75d2..b211bc01cf 100644
--- a/system/hwloc/hwloc.SlackBuild
+++ b/system/hwloc/hwloc.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Wainamoinen <wainamoinen@gmail.com>
 
 PRGNAM=hwloc
-VERSION=${VERSION:-1.11.0}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --disable-debug
+  --disable-debug \
+  --enable-netloc
 
 make
 make install DESTDIR=$PKG
diff --git a/system/hwloc/hwloc.info b/system/hwloc/hwloc.info
index 721c066639..59ce0ab8e4 100644
--- a/system/hwloc/hwloc.info
+++ b/system/hwloc/hwloc.info
@@ -1,8 +1,8 @@
 PRGNAM="hwloc"
-VERSION="1.11.0"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
-DOWNLOAD="http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.0.tar.bz2"
-MD5SUM="27988d3e904cce5d5d0a8793a727d17b"
+VERSION="2.2.0"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+DOWNLOAD="https://download.open-mpi.org/release/hwloc/v2.2/hwloc-2.2.0.tar.bz2"
+MD5SUM="5247ba4c1c63623c9285425552df5d92"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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 4a3734703d..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="http://urchlay.naptime.net/~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/README b/system/intel-microcode/README
index 549d53c700..5fde6323b9 100644
--- a/system/intel-microcode/README
+++ b/system/intel-microcode/README
@@ -43,3 +43,20 @@ NOTES:
    To include these special microcodes files, run the script like that:
 
    $ INCLUDE_UCODE_WITH_CAVEATS=yes ./intel-microcode.SlackBuild
+
+5. I updated the package and my microcode has been reverted to
+   the older revision. What is wrong? What should I do?
+
+   As noted by Ed on Slackbuilds-users mailing list:
+   https://lists.slackbuilds.org/pipermail/slackbuilds-users/2020-April/024262.html
+
+   Intel has removed microcode updates for some older CPUs.
+   The updates are no longer present in the tarball officially
+   released by Intel.
+
+   If you find yourself in this situation, you can either stick
+   to the older version of the package that works for you or you can
+   let me know and I might include that particular microcode in
+   the package. In the latter case, you'll need to provide me with
+   the details on the exact microcode file in question, specifically
+   by providing the exact file name, for example `06-0b-04`.
diff --git a/system/intel-microcode/intel-microcode.SlackBuild b/system/intel-microcode/intel-microcode.SlackBuild
index aa114b9225..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 2019 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:-20190618}
+VERSION=${VERSION:-20210216}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
@@ -62,6 +62,7 @@ fi
 
 # The "list" file is not always present in the upstream tarball.
 # For consistency, let's ensure it's never present in the package.
+
 rm -rf $PKG/lib/firmware/intel-ucode/list
 
 mkdir -p $PKG/boot
@@ -70,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 e75e87c7c7..9d177df889 100644
--- a/system/intel-microcode/intel-microcode.info
+++ b/system/intel-microcode/intel-microcode.info
@@ -1,10 +1,10 @@
 PRGNAM="intel-microcode"
-VERSION="20190618"
+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-20190618/Intel-Linux-Processor-Microcode-Data-Files-microcode-20190618.tar.gz"
-MD5SUM="76a236e836ccb6658996ae9c1a7c1b2c"
+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/README b/system/intelmas/README
index c3075ac504..2b3a4f8d60 100644
--- a/system/intelmas/README
+++ b/system/intelmas/README
@@ -8,6 +8,6 @@ The intelmas unifies functionality of several Intel programs including
 the isdct (Intel SSD Data Center Tool), which was previously available
 on SBo. The intelmas is a drop-in replacement for the isdct.
 
-The sg kernel module is required by isdct.  To have this module loaded
-on boot, please uncomment the corresponding line in
+To work with SATA drives intelmas requires the sg kernel module. To have
+this module loaded on boot, please uncomment the corresponding line in
 /etc/rc.d/rc.modules.local
diff --git a/system/intelmas/intelmas.SlackBuild b/system/intelmas/intelmas.SlackBuild
index 3cd7ff438e..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.0.5}
+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 bca088fc70..3fe80dd80c 100644
--- a/system/intelmas/intelmas.info
+++ b/system/intelmas/intelmas.info
@@ -1,8 +1,8 @@
 PRGNAM="intelmas"
-VERSION="1.0.5"
-HOMEPAGE="https://downloadcenter.intel.com/download/29337"
-DOWNLOAD="https://downloadmirror.intel.com/29337/eng/Intel%C2%AE_MAS_CLI_Tool_1.0.5_Linux.zip"
-MD5SUM="6233fbfabd8d95635c3f02cc39431d66"
+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 f478f9e568..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/29337
+intelmas: Homepage: https://downloadcenter.intel.com/download/30379
 intelmas:
 intelmas:
 intelmas:
diff --git a/system/irqbalance/irqbalance.SlackBuild b/system/irqbalance/irqbalance.SlackBuild
index 6fe6dbe65b..5f12fdc5b9 100644
--- a/system/irqbalance/irqbalance.SlackBuild
+++ b/system/irqbalance/irqbalance.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2006 by Yalla-One <yallaone@gmail.com>
 # Copyright 2013-2015 by LukenShiro, Italy
-# Copyright 2019 Logan Rathbone <poprocks@gmail.com>
+# Copyright 2019-2020 Logan Rathbone <poprocks@gmail.com>
 #
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=irqbalance
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/irqbalance/irqbalance.info b/system/irqbalance/irqbalance.info
index 33009dff69..57a0f96647 100644
--- a/system/irqbalance/irqbalance.info
+++ b/system/irqbalance/irqbalance.info
@@ -1,8 +1,8 @@
 PRGNAM="irqbalance"
-VERSION="1.6.0"
+VERSION="1.7.0"
 HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.6.0/irqbalance-1.6.0.tar.gz"
-MD5SUM="1d0d77b998f562ef8dfe4238b3d53490"
+DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.7.0/irqbalance-1.7.0.tar.gz"
+MD5SUM="621117212f6e7ed33d70a25e917e3e0d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/isextract/README b/system/isextract/README
new file mode 100644
index 0000000000..81d4c5fbe3
--- /dev/null
+++ b/system/isextract/README
@@ -0,0 +1,10 @@
+isextract (extract v3 InstallShield files)
+
+isextract is a command line tool to extract the *.z InstallShield v3
+packages many old windows games were distributed as.
+
+The files isextract supports are identified by the file command as
+"InstallShield Z archive Data", and begin with a hex signature of 13 5d
+65 8c 3a 01 02.
+
+See also: unshield, for other types of InstallShield files.
diff --git a/system/isextract/fix_output_formatting.diff b/system/isextract/fix_output_formatting.diff
new file mode 100644
index 0000000000..d48b491bb8
--- /dev/null
+++ b/system/isextract/fix_output_formatting.diff
@@ -0,0 +1,12 @@
+diff -Naur isextract-20141107_5adb0af/src/isextract.cpp isextract-20141107_5adb0af.patched/src/isextract.cpp
+--- isextract-20141107_5adb0af/src/isextract.cpp	2020-04-29 12:52:20.000000000 -0400
++++ isextract-20141107_5adb0af.patched/src/isextract.cpp	2020-04-29 13:28:40.715911070 -0400
+@@ -212,7 +212,7 @@
+         csize = it->second.compressed_size;
+         
+         
+-        std::cout << fname << " " << csize << " " << ctime(&time) << "\n";
++        std::cout << fname << " " << csize << " " << ctime(&time);
+         
+         it++;
+     }
diff --git a/system/isextract/git2tarxz.sh b/system/isextract/git2tarxz.sh
new file mode 100644
index 0000000000..02b50e68cd
--- /dev/null
+++ b/system/isextract/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=isextract
+CLONE_URL=https://github.com/OmniBlade/isextract.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=${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/system/isextract/isextract.1 b/system/isextract/isextract.1
new file mode 100644
index 0000000000..318ac7fabd
--- /dev/null
+++ b/system/isextract/isextract.1
@@ -0,0 +1,97 @@
+.\" Man page generated from reStructuredText.
+.
+.TH ISEXTRACT 1 "2020-04-29" "20141107_5adb0af" "SlackBuilds.org"
+.SH NAME
+isextract \- Extract InstallShield v3 archives
+.
+.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 isextract(1) man page. Convert with:
+.
+.\" rst2man.py isextract.rst > isextract.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.\" converting from pod:
+.
+.\" s/B<\([^>]*\)>/**\1**/g
+.
+.\" s/I<\([^>]*\)>/*\1*/g
+.
+.SH SYNOPSIS
+.sp
+isextract [\fIl|x\fP] file.z
+.SH DESCRIPTION
+.sp
+isextract is a command line tool to extract the .z InstallShield v3
+packages many old windows games were distributed as.
+.sp
+The files isextract supports normally have a \fB\&.z\fP extension, and can be
+idenfified by the file command:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ file data.z
+data.z: InstallShield Z archive Data
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+\&...or by the hex signature at the start of the file:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ head \-c6 data.z | xxd
+00000000: 135d 658c 3a01                           .]e.:.
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SH OPTIONS
+.sp
+\fBl\fP       List contents of archive.
+.sp
+\fBx\fP       Extract archive to current directory.
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/PRGNAM\-20141107_5adb0af/LICENSE for license information.
+.SH AUTHORS
+.sp
+isextract was written by OmniBlade.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+unshield(1), cabextract(1)
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/isextract/isextract.SlackBuild b/system/isextract/isextract.SlackBuild
new file mode 100644
index 0000000000..a4bc4c2c58
--- /dev/null
+++ b/system/isextract/isextract.SlackBuild
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# Slackware build script for isextract
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=isextract
+VERSION=${VERSION:-20141107_5adb0af}
+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 {} \+
+
+# get rid of "double-spaced" output in l command
+patch -p1 < $CWD/fix_output_formatting.diff
+
+make OPTFLAGS="$SLKCFLAGS"
+mkdir -p $PKG/usr/bin
+install -s -m0755 build/$PRGNAM $PKG/usr/bin
+
+# man page written 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 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/system/isextract/isextract.info b/system/isextract/isextract.info
new file mode 100644
index 0000000000..933dd14ac5
--- /dev/null
+++ b/system/isextract/isextract.info
@@ -0,0 +1,10 @@
+PRGNAM="isextract"
+VERSION="20141107_5adb0af"
+HOMEPAGE="https://github.com/OmniBlade/isextract"
+DOWNLOAD="https://slackware.uk/~urchlay/src/isextract-20141107_5adb0af.tar.xz"
+MD5SUM="2950724969069bfc9b304530e4bc1604"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/isextract/isextract.rst b/system/isextract/isextract.rst
new file mode 100644
index 0000000000..aaa4622681
--- /dev/null
+++ b/system/isextract/isextract.rst
@@ -0,0 +1,74 @@
+.. RST source for isextract(1) man page. Convert with:
+..   rst2man.py isextract.rst > isextract.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20141107_5adb0af
+.. |date| date::
+
+.. converting from pod:
+.. s/B<\([^>]*\)>/**\1**/g
+.. s/I<\([^>]*\)>/*\1*/g
+
+=========
+isextract
+=========
+
+---------------------------------
+Extract InstallShield v3 archives
+---------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+isextract [*l|x*] file.z
+
+DESCRIPTION
+===========
+
+isextract is a command line tool to extract the .z InstallShield v3
+packages many old windows games were distributed as.
+
+The files isextract supports normally have a **.z** extension, and can be
+idenfified by the file command:
+
+::
+
+  $ file data.z
+  data.z: InstallShield Z archive Data
+
+...or by the hex signature at the start of the file:
+
+::
+
+  $ head -c6 data.z | xxd
+  00000000: 135d 658c 3a01                           .]e.:.
+
+OPTIONS
+=======
+
+**l**       List contents of archive.
+
+**x**       Extract archive to current directory.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/PRGNAM-|version|/LICENSE for license information.
+
+AUTHORS
+=======
+
+isextract was written by OmniBlade.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+unshield(1), cabextract(1)
diff --git a/system/isextract/slack-desc b/system/isextract/slack-desc
new file mode 100644
index 0000000000..a5b892c58e
--- /dev/null
+++ b/system/isextract/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------------------------------------------------------|
+isextract: isextract (extract v3 InstallShield files)
+isextract:
+isextract: isextract is a command line tool to extract the *.z InstallShield
+isextract: v3 packages many old windows games were distributed as.
+isextract:
+isextract: The files isextract supports are identified by the file command as
+isextract: "InstallShield Z archive Data", and begin with a hex signature of
+isextract: 13 5d 65 8c 3a 01 02.
+isextract:
+isextract:
+isextract:
diff --git a/system/jdupes/jdupes.SlackBuild b/system/jdupes/jdupes.SlackBuild
index f75edaf9d8..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.14.0}
+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 7756a60a72..2193d76102 100644
--- a/system/jdupes/jdupes.info
+++ b/system/jdupes/jdupes.info
@@ -1,8 +1,8 @@
 PRGNAM="jdupes"
-VERSION="1.14.0"
+VERSION="1.19.2"
 HOMEPAGE="https://github.com/jbruchon/jdupes"
-DOWNLOAD="https://github.com/jbruchon/jdupes/archive/v1.14.0/jdupes-1.14.0.tar.gz"
-MD5SUM="9b4905699deb8354ef3e80c46bf615cf"
+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/john/README b/system/john/README
index 574ffb08b1..543e12c8e7 100644
--- a/system/john/README
+++ b/system/john/README
@@ -1,7 +1,8 @@
-John the Ripper is a fast password cracker.  Its primary purpose is to detect 
-weak passwords.  Besides several crypt(3) password hash types most commonly 
-found on various Unix flavors, supported out of the box are Kerberos AFS and 
-Windows NT/2000/XP/2003 LM hashes, plus several more with contributed patches.
+John the Ripper is a fast password cracker.  Its primary purpose is to
+detect weak passwords.  Besides several crypt(3) password hash types
+most commonly found on various Unix flavors, supported out of the box
+are Kerberos AFS and Windows NT/2000/XP/2003 LM hashes, plus several
+more with contributed patches.
 
-For more information, consult the project's homepage and/or the documentation 
-installed in /usr/doc/john-1.8.0
+For more information, consult the project's homepage and/or the
+documentation installed in /usr/doc/john-1.8.0
diff --git a/system/john/john.SlackBuild b/system/john/john.SlackBuild
index 1a61781796..cfe21faaee 100644
--- a/system/john/john.SlackBuild
+++ b/system/john/john.SlackBuild
@@ -14,8 +14,8 @@
 #               slow hashes.
 
 PRGNAM=john
-VERSION=${VERSION:-1.8.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.9.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -44,6 +44,8 @@ if [ "$ARCH" = "i486" ]; then
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   if grep -q ^flags.*avx /proc/cpuinfo; then
+    TARGET=linux-x86-64-avx2
+  elif grep -q ^flags.*avx /proc/cpuinfo; then
     TARGET=linux-x86-64-avx
   else
     TARGET=linux-x86-64
@@ -61,9 +63,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 
-# Soft-link in tarball causes x bit to be set below; nuke it
-rm -f $PRGNAM-$VERSION/README
-
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/john/john.info b/system/john/john.info
index 9fb3c8e148..20697b1107 100644
--- a/system/john/john.info
+++ b/system/john/john.info
@@ -1,8 +1,8 @@
 PRGNAM="john"
-VERSION="1.8.0"
-HOMEPAGE="http://www.openwall.com/john/"
-DOWNLOAD="http://www.openwall.com/john/j/john-1.8.0.tar.xz"
-MD5SUM="a4086df68f51778782777e60407f1869"
+VERSION="1.9.0"
+HOMEPAGE="https://www.openwall.com/john/"
+DOWNLOAD="https://www.openwall.com/john/k/john-1.9.0.tar.xz"
+MD5SUM="494b5e6d672ff100fb9fb54c4fb6ed3e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/jsawk/jsawk.SlackBuild b/system/jsawk/jsawk.SlackBuild
index f691dd7458..3a139be516 100644
--- a/system/jsawk/jsawk.SlackBuild
+++ b/system/jsawk/jsawk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jsawk
 
-# Copyright 2013,2016,2018-2019 Andrew Clemons, Wellington, New Zealand
+# Copyright 2013,2016,2018-2020 Andrew Clemons, Wellington, New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=jsawk
 VERSION=${VERSION:-1.4}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -47,8 +47,8 @@ cp $CWD/jsawk $PKG/usr/bin
 chmod 0755 $PKG/usr/bin/jsawk
 chown root:root $PKG/usr/bin/jsawk
 
-if command -v js60 > /dev/null 2>&1 ; then
-  sed -i '/JSBIN=/s/-js/-js60/' $PKG/usr/bin/jsawk
+if command -v js78 > /dev/null 2>&1 ; then
+  sed -i '/JSBIN=/s/-js/-js78/' $PKG/usr/bin/jsawk
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/kapacitor/kapacitor.SlackBuild b/system/kapacitor/kapacitor.SlackBuild
index df552ae4c0..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.4}
+VERSION=${VERSION:-1.5.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/kapacitor/kapacitor.info b/system/kapacitor/kapacitor.info
index f4066db074..cb6885d7db 100644
--- a/system/kapacitor/kapacitor.info
+++ b/system/kapacitor/kapacitor.info
@@ -1,10 +1,10 @@
 PRGNAM="kapacitor"
-VERSION="1.5.4"
+VERSION="1.5.9"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.4_linux_i386.tar.gz"
-MD5SUM="80b471ed11731a4a6f4b6509e0e11406"
-DOWNLOAD_x86_64="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.4_linux_amd64.tar.gz"
-MD5SUM_x86_64="023da677aa6906f5833ab368e111181f"
+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 68650871d7..945fa19147 100644
--- a/system/kbfs/kbfs.SlackBuild
+++ b/system/kbfs/kbfs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kbfs
 
-# Copyright 2017-2019 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
@@ -24,8 +24,8 @@
 
 PRGNAM=kbfs
 SRCNAM=keybase
-VERSION=${VERSION:-5.3.0_20200310205642}
-COMMITVER=4f2689009b
+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 058bce7cab..dfce4bbd30 100644
--- a/system/kbfs/kbfs.info
+++ b/system/kbfs/kbfs.info
@@ -1,10 +1,10 @@
 PRGNAM="kbfs"
-VERSION="5.3.0_20200310205642"
+VERSION="5.6.1_20210125164223"
 HOMEPAGE="https://github.com/keybase/kbfs"
-DOWNLOAD="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.3.0-20200310205642.4f2689009b_i386.deb"
-MD5SUM="95968a9ad38e466753bfe9ba8bd4f3c0"
-DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.3.0-20200310205642.4f2689009b_amd64.deb"
-MD5SUM_x86_64="70b44b5038616cdd47888b5e495c4d61"
+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/man/xkegs.1 b/system/kegs/man/xkegs.1
new file mode 100644
index 0000000000..eb14f217e6
--- /dev/null
+++ b/system/kegs/man/xkegs.1
@@ -0,0 +1,175 @@
+.TH KEGS "1" "January 2011" "SlackBuilds.org" "User Commands"
+.SH NAME
+xkegs \- Apple IIgs emulator
+.SH SYNOPSIS
+.B xkegs
+[\fI-options\fR]
+.SH DESCRIPTION
+KEGS (Kent's Emulated GS)
+is an Apple IIgs emulator for Mac OS X, Linux, and Win32. The Apple
+IIgs was the most powerful computer in the Apple II line. It first was
+sold in 1986. An Apple IIgs has the capability to run almost all Apple
+II, Apple IIe, and Apple IIc programs.
+.PP
+xkegs is the KEGS binary, compiled for Linux and X\-Window support.
+.PP
+This manual page only documents the command\-line options and key mappings.
+For the full documentation, see /usr/doc/kegs\-@VERSION@/README.kegs.txt
+(and the other files in the same directory).
+.PP
+\fINote:\fR There is no way to specify disk or ROM images on the command line.
+Use the configuration menu (F4) from within the emulator to select images.
+.SH OPTIONS
+.TP
+\fB\-skip\fR \fI[num]\fR
+KEGS will "skip" that many screen redraws between refreshes.
+\-skip 0 will do 60 frames per second, \-skip 1 will do 30 fps,
+\-skip 5 will do 10 fps.
+.TP
+\fB\-audio\fR \fI[0/1]\fR
+Forces audio [off/on].  By default, audio is on unless
+the X display is a remote machine or shared memory is off.
+This switch can override the default.  \-audio 0 causes KEGS to
+not fork the background audio process, but Ensoniq emulation
+is still 100% accurate, just the sound is not sent to the
+workstation speaker.
+.TP
+\fB\-arate\fR \fI[num]\fR
+Forces audio sample rate to \fI[num]\fR.  44100 and 48000 are
+usual, you can try 22050 to reduce KEGS's overhead.  On a reasonably
+fast machine (>250MHz or so), you shouldn't need to mess with this.
+.TP
+\fB\-dhr140\fR
+Will use the old Double\-hires color algorithm that results in
+exactly 140 colors across the screen, as opposed to the blending
+being done by default.
+.TP
+\fB\-15\fR
+KEGS will only look for a 15\-bit X\-Window display.
+.TP
+\fB\-16\fR
+KEGS will only look for a 16\-bit X\-Window display (not tested, probably
+ will get red colors wrong).
+.TP
+\fB\-24\fR
+KEGS will only look for a 24\-bit X\-Window display.
+.TP
+\fB\-display\fR \fI[xdisplay]\fR
+Same as setting the environment variable DISPLAY.
+Sends X display to \fI[xdisplay]\fR
+.TP
+\fB\-noshm\fR
+KEGS will not try to used shared memory for the X graphics display.
+This will make KEGS much slower on graphics\-intensive tasks,
+by as much as a factor of 10!  By default, \-noshm causes an
+effective \-skip of 3 which is 15 fps.  You can override this
+default by specifying a \-skip explicitly.
+.SH KEY BINDINGS
+.TP
+\fBF1\fR
+Alias of Command
+.TP
+\fBF2\fR
+Alias of Option
+.TP
+\fBF3\fR
+Alias of ESC for OS/2 compatibility.
+.TP
+\fBF4\fR
+Configuration Panel
+.TP
+\fBF6\fR
+Toggle through the 4 speeds:
+Unlimited, 1MHz, 2.8MHz, 8.0MHz
+.TP
+\fBShift\-F6\fR
+Enter KEGS debugger (can also be done by center\-clicking the mouse on
+the xkegs window).
+.br
+The debugger is X\-based, and runs in a separate window.
+.TP
+\fBF7\fR
+Toggle fast_disk_emul on/off
+.TP
+\fBF8\fR
+Toggle pointer hiding on/off.
+.TP
+\fBF9\fR
+Invert the sense of the joystick.
+.TP
+\fBShift\-F9\fR
+Swap x and y joystick/paddle axes.
+.TP
+\fBF10\fR
+Attempt to change the a2vid_palette (only useful on 256\-color displays)
+.TP
+\fBF11\fR
+Full screen mode (only on Mac OS X).
+.TP
+\fBF12\fR
+Alias of Pause/Break which is treated as Reset
+.TP
+\fBF2\fR, \fBAlt_R\fR, \fBMeta_r\fR, \fBMenu\fR, \fBPrint\fR, \fBMode_switch\fR, \fBOption\fR
+Option key
+.TP
+\fBF1\fR, \fBAlt_L\fR, \fBMeta_L\fR, \fBCancel\fR, \fBScroll_lock\fR, \fBCommand\fR
+Command key
+.TP
+\fBNum_Lock\fR
+Keypad "Clear".
+.TP
+\fBF12\fR, \fBPause\fR, \fBBreak\fR
+Reset
+.TP
+\fBHome\fR
+Alias for "=" on the keypad
+.SH FILES
+.TP
+\fB~/.config.kegs\fR
+The KEGS configuration file. This can be directly edited if
+necessary, but normally is changed by using the configuration
+menu (F4) from within KEGS. To return to the default configuration,
+you may remove this file.
+.TP
+\fB/usr/share/kegs/rom03\fR (or \fB/usr/share/kegs/rom01\fR)
+The Apple IIgs BIOS ROM image. If KEGS can't find this ROM, it
+will start up with a black display, full of white @ characters.
+Press F4 for the config menu and use the UI to select the correct
+ROM image file.
+.PP
+For reference, the ROM image details are:
+.PP
+\fBrom03\fR: size 262144 bytes, md5sum ba89edf2729a28a17cd9e0f7a0ac9a39
+.br
+\fBrom01\fR: size 131072 bytes, md5sum 20a0334c447cb069a040ae5be1d938df
+.PP
+Other versions of the IIgs ROMs may exist (this author isn't aware of any),
+but these two images are known to work.
+.TP
+\fB/usr/bin/xkegs\fR
+Wrapper script. xkegs will fail to run if it can't find its config file,
+so this script creates one in the user's home directory if necessary,
+then runs the real xkegs binary.
+.TP
+\fB/usr/libexec/xkegs\fR
+Actual xkegs binary. Shouldn't be run directly (use the wrapper instead).
+.TP
+\fB/usr/share/kegs/config.kegs.default\fR
+Copied to \fB~/.config.kegs\fR by the wrapper script, if \fB~/.config.kegs\fR
+doesn't already exist. Can be used to set system\-wide defaults (such as the
+path to the ROM image).
+.SH SEE ALSO
+to_pro(1)
+.br
+partls(1)
+.br
+Full KEGS docs in /usr/doc/kegs\-@VERSION@/*.txt
+.br
+KEGS homepage at http://kegs.sourceforge.net/
+.SH AUTHORS
+KEGS is by Kent Dickey <kadickey at princeton dot edu>.
+.PP
+This manual page was written by B. Watson for the SlackBuilds.org project (but
+may be used by anyone for any reason).
+.PP
+Wrapper script also by B. Watson.
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.1 b/system/kegs/xkegs.1
deleted file mode 100644
index 907a6095cd..0000000000
--- a/system/kegs/xkegs.1
+++ /dev/null
@@ -1,176 +0,0 @@
-.TH KEGS "1" "January 2011" "SlackBuilds.org" "User Commands"
-.SH NAME
-xkegs \- Apple IIgs emulator
-.SH SYNOPSIS
-.B xkegs
-[\fI-options\fR]
-.SH DESCRIPTION
-KEGS (Kent's Emulated GS)
-is an Apple IIgs emulator for Mac OS X, Linux, and Win32. The Apple
-IIgs was the most powerful computer in the Apple II line. It first was
-sold in 1986. An Apple IIgs has the capability to run almost all Apple
-II, Apple IIe, and Apple IIc programs.
-.PP
-xkegs is the KEGS binary, compiled for Linux and X\-Window support.
-.PP
-This manual page only documents the command\-line options and key mappings.
-For the full documentation, see /usr/doc/kegs\-@VERSION@/README.kegs.txt
-(and the other files in the same directory).
-.PP
-\fINote:\fR There is no way to specify disk or ROM images on the command line.
-Use the configuration menu (F4) from within the emulator to select images.
-.SH OPTIONS
-.TP
-\fB\-skip\fR \fI[num]\fR
-KEGS will "skip" that many screen redraws between refreshes.
-\-skip 0 will do 60 frames per second, \-skip 1 will do 30 fps,
-\-skip 5 will do 10 fps.
-.TP
-\fB\-audio\fR \fI[0/1]\fR
-Forces audio [off/on].  By default, audio is on unless
-the X display is a remote machine or shared memory is off.
-This switch can override the default.  \-audio 0 causes KEGS to
-not fork the background audio process, but Ensoniq emulation
-is still 100% accurate, just the sound is not sent to the
-workstation speaker.
-.TP
-\fB\-arate\fR \fI[num]\fR
-Forces audio sample rate to \fI[num]\fR.  44100 and 48000 are
-usual, you can try 22050 to reduce KEGS's overhead.  On a reasonably
-fast machine (>250MHz or so), you shouldn't need to mess with this.
-.TP
-\fB\-dhr140\fR
-Will use the old Double\-hires color algorithm that results in
-exactly 140 colors across the screen, as opposed to the blending
-being done by default.
-.TP
-\fB\-15\fR
-KEGS will only look for a 15\-bit X\-Window display.
-.TP
-\fB\-16\fR
-KEGS will only look for a 16\-bit X\-Window display (not tested, probably
- will get red colors wrong).
-.TP
-\fB\-24\fR
-KEGS will only look for a 24\-bit X\-Window display.
-.TP
-\fB\-display\fR \fI[xdisplay]\fR
-Same as setting the environment variable DISPLAY.
-Sends X display to \fI[xdisplay]\fR
-.TP
-\fB\-noshm\fR
-KEGS will not try to used shared memory for the X graphics display.
-This will make KEGS much slower on graphics\-intensive tasks,
-by as much as a factor of 10!  By default, \-noshm causes an
-effective \-skip of 3 which is 15 fps.  You can override this
-default by specifying a \-skip explicitly.
-.SH KEY BINDINGS
-.TP
-\fBF1\fR
-Alias of Command
-.TP
-\fBF2\fR
-Alias of Option
-.TP
-\fBF3\fR
-Alias of ESC for OS/2 compatibility.
-.TP
-\fBF4\fR
-Configuration Panel
-.TP
-\fBF6\fR
-Toggle through the 4 speeds:
-Unlimited, 1MHz, 2.8MHz, 8.0MHz
-.TP
-\fBShift\-F6\fR
-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.
-.TP
-\fBF7\fR
-Toggle fast_disk_emul on/off
-.TP
-\fBF8\fR
-Toggle pointer hiding on/off.
-.TP
-\fBF9\fR
-Invert the sense of the joystick.
-.TP
-\fBShift\-F9\fR
-Swap x and y joystick/paddle axes.
-.TP
-\fBF10\fR
-Attempt to change the a2vid_palette (only useful on 256\-color displays)
-.TP
-\fBF11\fR
-Full screen mode (only on Mac OS X).
-.TP
-\fBF12\fR
-Alias of Pause/Break which is treated as Reset
-.TP
-\fBF2\fR, \fBAlt_R\fR, \fBMeta_r\fR, \fBMenu\fR, \fBPrint\fR, \fBMode_switch\fR, \fBOption\fR
-Option key
-.TP
-\fBF1\fR, \fBAlt_L\fR, \fBMeta_L\fR, \fBCancel\fR, \fBScroll_lock\fR, \fBCommand\fR
-Command key
-.TP
-\fBNum_Lock\fR
-Keypad "Clear".
-.TP
-\fBF12\fR, \fBPause\fR, \fBBreak\fR
-Reset
-.TP
-\fBHome\fR
-Alias for "=" on the keypad
-.SH FILES
-.TP
-\fB~/.config.kegs\fR
-The KEGS configuration file. This can be directly edited if
-necessary, but normally is changed by using the configuration
-menu (F4) from within KEGS. To return to the default configuration,
-you may remove this file.
-.TP
-\fB/usr/share/kegs/rom03\fR (or \fB/usr/share/kegs/rom01\fR)
-The Apple IIgs BIOS ROM image. If KEGS can't find this ROM, it
-will start up with a black display, full of white @ characters.
-Press F4 for the config menu and use the UI to select the correct
-ROM image file.
-.PP
-For reference, the ROM image details are:
-.PP
-\fBrom03\fR: size 262144 bytes, md5sum ba89edf2729a28a17cd9e0f7a0ac9a39
-.br
-\fBrom01\fR: size 131072 bytes, md5sum 20a0334c447cb069a040ae5be1d938df
-.PP
-Other versions of the IIgs ROMs may exist (this author isn't aware of any),
-but these two images are known to work.
-.TP
-\fB/usr/bin/xkegs\fR
-Wrapper script. xkegs will fail to run if it can't find its config file,
-so this script creates one in the user's home directory if necessary,
-then runs the real xkegs binary.
-.TP
-\fB/usr/libexec/xkegs\fR
-Actual xkegs binary. Shouldn't be run directly (use the wrapper instead).
-.TP
-\fB/usr/share/kegs/config.kegs.default\fR
-Copied to \fB~/.config.kegs\fR by the wrapper script, if \fB~/.config.kegs\fR
-doesn't already exist. Can be used to set system\-wide defaults (such as the
-path to the ROM image).
-.SH SEE ALSO
-to_pro(1)
-.br
-partls(1)
-.br
-Full KEGS docs in /usr/doc/kegs\-@VERSION@/*.txt
-.br
-KEGS homepage at http://kegs.sourceforge.net/
-.SH AUTHORS
-KEGS is by Kent Dickey <kadickey at princeton dot edu>.
-.PP
-This manual page was written by B. Watson for the SlackBuilds.org project (but
-may be used by anyone for any reason).
-.PP
-Wrapper script also by B. Watson.
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/kexec-tools/kexec-tools.SlackBuild b/system/kexec-tools/kexec-tools.SlackBuild
index 6ad22a783c..26d151c93c 100644
--- a/system/kexec-tools/kexec-tools.SlackBuild
+++ b/system/kexec-tools/kexec-tools.SlackBuild
@@ -4,7 +4,7 @@
 # Written by powtrix (@gmail.com)
 
 PRGNAM=kexec-tools
-VERSION=${VERSION:-2.0.19}
+VERSION=${VERSION:-2.0.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/kexec-tools/kexec-tools.info b/system/kexec-tools/kexec-tools.info
index bb3224a7ee..f985835884 100644
--- a/system/kexec-tools/kexec-tools.info
+++ b/system/kexec-tools/kexec-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="kexec-tools"
-VERSION="2.0.19"
+VERSION="2.0.20"
 HOMEPAGE="http://horms.net/projects/kexec/"
-DOWNLOAD="https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.19.tar.xz"
-MD5SUM="d399dc099fac5f384b429f09d79b2608"
+DOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.20.tar.xz"
+MD5SUM="3b3ee68064648b1b9e86ad93b1c50644"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/keybase/keybase.SlackBuild b/system/keybase/keybase.SlackBuild
index 46cca09ad4..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.3.0}
+VERSION=${VERSION:-5.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/keybase/keybase.info b/system/keybase/keybase.info
index 8eca25e063..367a1a72bb 100644
--- a/system/keybase/keybase.info
+++ b/system/keybase/keybase.info
@@ -1,8 +1,8 @@
 PRGNAM="keybase"
-VERSION="5.3.0"
+VERSION="5.6.1"
 HOMEPAGE="https://github.com/keybase/client"
-DOWNLOAD="https://github.com/keybase/client/archive/v5.3.0/client-5.3.0.tar.gz"
-MD5SUM="40ad44c760eead79f9fc5f92bdbdcd9d"
+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 e51808927b..7d85b220aa 100644
--- a/system/kitchen-sync/kitchen-sync.SlackBuild
+++ b/system/kitchen-sync/kitchen-sync.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kitchen-sync
 
-# Copyright 2016-2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2016-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=kitchen-sync
 SRCNAM=$(echo "$PRGNAM" | tr '-' '_')
-VERSION=${VERSION:-1.17}
+VERSION=${VERSION:-2.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,7 +59,9 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
+
 zcat $CWD/0001-Restore-compatibility-with-1.0-servers.patch.gz | patch -p1
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/kitchen-sync/kitchen-sync.info b/system/kitchen-sync/kitchen-sync.info
index 046adb0f24..0ef6843485 100644
--- a/system/kitchen-sync/kitchen-sync.info
+++ b/system/kitchen-sync/kitchen-sync.info
@@ -1,8 +1,8 @@
 PRGNAM="kitchen-sync"
-VERSION="1.17"
+VERSION="2.10"
 HOMEPAGE="https://github.com/willbryant/kitchen_sync"
-DOWNLOAD="https://github.com/willbryant/kitchen_sync/archive/v1.17/kitchen_sync-1.17.tar.gz"
-MD5SUM="54290cca72b0d0b8e53381e38296c060"
+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/laptop-mode-tools/laptop-mode-tools.SlackBuild b/system/laptop-mode-tools/laptop-mode-tools.SlackBuild
index 76298625c4..61cc194757 100644
--- a/system/laptop-mode-tools/laptop-mode-tools.SlackBuild
+++ b/system/laptop-mode-tools/laptop-mode-tools.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=laptop-mode-tools
-VERSION=${VERSION:-1.73.1}
+VERSION=${VERSION:-1.74}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/laptop-mode-tools/laptop-mode-tools.info b/system/laptop-mode-tools/laptop-mode-tools.info
index a379872047..dc4da417af 100644
--- a/system/laptop-mode-tools/laptop-mode-tools.info
+++ b/system/laptop-mode-tools/laptop-mode-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="laptop-mode-tools"
-VERSION="1.73.1"
+VERSION="1.74"
 HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools"
-DOWNLOAD="https://github.com/rickysarraf/laptop-mode-tools/archive/1.73.1/laptop-mode-tools-1.73.1.tar.gz"
-MD5SUM="2dea7fa865b816b6c810e1a1eac9fda3"
+DOWNLOAD="https://github.com/rickysarraf/laptop-mode-tools/archive/1.74/laptop-mode-tools-1.74.tar.gz"
+MD5SUM="990f7aa20adffd2d3482ad57385399a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-PyQt5"
diff --git a/system/lbench/lbench.info b/system/lbench/lbench.info
index 99b4b5abdf..39c6d2d16d 100644
--- a/system/lbench/lbench.info
+++ b/system/lbench/lbench.info
@@ -1,7 +1,7 @@
 PRGNAM="lbench"
 VERSION="3.7"
 HOMEPAGE="http://kornelix.net/lbench/lbench.html"
-DOWNLOAD="http://kornelix.net/downloads/tarballs/lbench-3.7.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lbench-3.7.tar.gz"
 MD5SUM="ba1cf6181d3748489ebe68b3c98d3565"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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 7d30298307..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.3.0}
+VERSION=${VERSION:-1.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -97,7 +97,7 @@ cd ..
 
 # We include default options for Apache
 mkdir -p $PKG/etc/letsencrypt/
-cp $PKG/usr/lib${LIBDIRSUFFIX}/python$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')/site-packages/certbot_apache/_internal/options-ssl-apache.conf \
+cp $PKG/usr/lib${LIBDIRSUFFIX}/python$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \
    $PKG/etc/letsencrypt/options-ssl-apache.conf
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/system/letsencrypt/letsencrypt.info b/system/letsencrypt/letsencrypt.info
index 78fadf936f..f4d2655a90 100644
--- a/system/letsencrypt/letsencrypt.info
+++ b/system/letsencrypt/letsencrypt.info
@@ -1,10 +1,10 @@
 PRGNAM="letsencrypt"
-VERSION="1.3.0"
+VERSION="1.14.0"
 HOMEPAGE="https://letsencrypt.org/"
-DOWNLOAD="https://github.com/certbot/certbot/archive/v1.3.0/certbot-1.3.0.tar.gz"
-MD5SUM="deeaf6b77ff6bb4318acd1da4fc9974a"
+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/libtrash/README b/system/libtrash/README
new file mode 100644
index 0000000000..6de79c168a
--- /dev/null
+++ b/system/libtrash/README
@@ -0,0 +1,6 @@
+libtrash is a shared library which, when preloaded, implements a 
+trash can under GNU/Linux.
+
+For instance, with libtrash, Midnight Commander will move files 
+to the trash directory:
+LD_PRELOAD=/usr/lib/libtrash.so.3.6 mc
diff --git a/system/libtrash/libtrash.SlackBuild b/system/libtrash/libtrash.SlackBuild
new file mode 100644
index 0000000000..f3d824421a
--- /dev/null
+++ b/system/libtrash/libtrash.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for libtrash
+#
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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=libtrash
+VERSION=${VERSION:-3.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.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 {} \;
+
+# Inspired by the following Arch Linux AUR script: 
+# https://aur.archlinux.org/packages/libtrash/
+sed -i -e s/ldconfig// ./src/Makefile
+sed -i -e s/python/python2/ ./src/Makefile
+
+make
+install -d $PKG/usr/lib $PKG/etc
+make install INSTLIBDIR=$PKG/usr/lib SYSCONFFILE=$PKG/etc/libtrash.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 COPYING README.md TODO config.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/libtrash/libtrash.info b/system/libtrash/libtrash.info
new file mode 100644
index 0000000000..706271dcea
--- /dev/null
+++ b/system/libtrash/libtrash.info
@@ -0,0 +1,10 @@
+PRGNAM="libtrash"
+VERSION="3.6"
+HOMEPAGE="http://pages.stern.nyu.edu/~marriaga/software/libtrash/"
+DOWNLOAD="http://pages.stern.nyu.edu/~marriaga/software/libtrash/libtrash-3.6.tgz"
+MD5SUM="15cbe6d792e20057b13f46394c7c122a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/system/libtrash/slack-desc b/system/libtrash/slack-desc
new file mode 100644
index 0000000000..e72af9f6bc
--- /dev/null
+++ b/system/libtrash/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------------------------------------------------------|
+libtrash: libtrash (trash can for GNU/Linux)
+libtrash:
+libtrash: libtrash is a shared library which, when preloaded, implements a
+libtrash: trash can under GNU/Linux.
+libtrash:
+libtrash:
+libtrash:
+libtrash:
+libtrash:
+libtrash:
+libtrash:
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 c8f866b21e..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.1}
+VERSION=${VERSION:-0.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lnav/lnav.info b/system/lnav/lnav.info
index 77b60342ba..799593cbbf 100644
--- a/system/lnav/lnav.info
+++ b/system/lnav/lnav.info
@@ -1,8 +1,8 @@
 PRGNAM="lnav"
-VERSION="0.8.1"
+VERSION="0.9.0"
 HOMEPAGE="http://lnav.org"
-DOWNLOAD="https://github.com/tstack/lnav/releases/download/v0.8.1/lnav-0.8.1.tar.gz"
-MD5SUM="b60499eee0662887040a98c21aa444b3"
+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 e51478a53b..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.3}
+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 165cce7382..8adcf7d5ad 100644
--- a/system/logwatch/logwatch.info
+++ b/system/logwatch/logwatch.info
@@ -1,8 +1,8 @@
 PRGNAM="logwatch"
-VERSION="7.5.3"
-HOMEPAGE="http://www.logwatch.org"
-DOWNLOAD="https://downloads.sourceforge.net/project/logwatch/logwatch-7.5.3/logwatch-7.5.3.tar.gz"
-MD5SUM="8bcf3edc5a4687c8aad1b9c01e2be54b"
+VERSION="7.5.5"
+HOMEPAGE="http://logwatch.sourceforge.net"
+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 31f9e194c8..9a57d890d4 100644
--- a/system/loksh/loksh.SlackBuild
+++ b/system/loksh/loksh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for loksh
 
-# 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=loksh
-VERSION=${VERSION:-6.6}
+VERSION=${VERSION:-6.8.1}
 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.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,23 +69,39 @@ 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"
+if [ "${DEBUG:=0}" != 0 ]; then
+  NDEBUG=false
+  RELEASE=debug
+  SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')"
+else
+  NDEBUG=true
+  RELEASE=plain
+fi
 
-make install \
-  PREFIX=/usr \
-  BIN_NAME=$PRGNAM \
-  BIN_DIR=/bin \
-  MAN_DIR=/usr/man \
-  DOC_DIR=/usr/doc/$PRGNAM-$VERSION \
-  DESTDIR=$PKG
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+meson \
+  --prefix=/ \
+  --bindir=bin \
+  --libdir=usr/lib${LIBDIRSUFFIX} \
+  --mandir=usr/man \
+  --datadir=usr \
+  -Dstrip=$NDEBUG \
+  -Db_ndebug=$NDEBUG \
+  -Dbuildtype=$RELEASE \
+  build
+
+"${NINJA:=ninja}" -C build
+DESTDIR=$PKG "$NINJA" -C build install
+
+mv -- $PKG/bin/ksh $PKG/bin/$PRGNAM
+mv -- $PKG/usr/man/man1/ksh.1 $PKG/usr/man/man1/$PRGNAM.1
+mv -- $PKG/usr/man/man1/sh.1 $PKG/usr/man/man1/$PRGNAM-sh.1
+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 7c68610ff4..eb380c2afa 100644
--- a/system/loksh/loksh.info
+++ b/system/loksh/loksh.info
@@ -1,10 +1,10 @@
 PRGNAM="loksh"
-VERSION="6.6"
+VERSION="6.8.1"
 HOMEPAGE="https://github.com/dimkr/loksh"
-DOWNLOAD="https://github.com/dimkr/loksh/archive/6.6/loksh-6.6.tar.gz"
-MD5SUM="06b00072a7b41075f78c8d5ebfd5c1ef"
+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=""
+REQUIRES="meson"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
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/lxsession/lxsession.SlackBuild b/system/lxsession/lxsession.SlackBuild
index 528a864097..6d6b21d1be 100644
--- a/system/lxsession/lxsession.SlackBuild
+++ b/system/lxsession/lxsession.SlackBuild
@@ -57,6 +57,8 @@
 #             * update.
 # 0.5.4-1:    11/mar/2019 by Matteo Bernardini <ponce@slackbuilds.org>
 #             * update.
+# 0.5.5-1:    25/aug/2020 by Matteo Bernardini <ponce@slackbuilds.org>
+#             * update.
 #
 # Run 'sh lxsession.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -65,7 +67,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxsession
-VERSION=${VERSION:-0.5.4}
+VERSION=${VERSION:-0.5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lxsession/lxsession.info b/system/lxsession/lxsession.info
index dcb0fa36b1..89022b9b15 100644
--- a/system/lxsession/lxsession.info
+++ b/system/lxsession/lxsession.info
@@ -1,8 +1,8 @@
 PRGNAM="lxsession"
-VERSION="0.5.4"
+VERSION="0.5.5"
 HOMEPAGE="https://wiki.lxde.org/en/LXSession"
-DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.4.tar.xz"
-MD5SUM="e255aaf3c2a8e49812e3477fb3f099b0"
+DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.5.tar.xz"
+MD5SUM="e8380acef215ee7c99c067a2241c2c7b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libunique vala"
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 480ce79145..ca54fe860a 100644
--- a/system/lynis/lynis.SlackBuild
+++ b/system/lynis/lynis.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lynis
 
-# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-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=lynis
-VERSION=${VERSION:-2.7.5}
+VERSION=${VERSION:-3.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lynis/lynis.info b/system/lynis/lynis.info
index cbe145eed1..a6d8d16660 100644
--- a/system/lynis/lynis.info
+++ b/system/lynis/lynis.info
@@ -1,8 +1,8 @@
 PRGNAM="lynis"
-VERSION="2.7.5"
+VERSION="3.0.3"
 HOMEPAGE="https://cisofy.com/"
-DOWNLOAD="https://downloads.cisofy.com/lynis/lynis-2.7.5.tar.gz"
-MD5SUM="fb527b6976e70a6bcd57036c9cddc242"
+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/makeself/makeself.SlackBuild b/system/makeself/makeself.SlackBuild
index 4c06c83042..0c812684bd 100644
--- a/system/makeself/makeself.SlackBuild
+++ b/system/makeself/makeself.SlackBuild
@@ -2,9 +2,11 @@
 
 # Slackware build script for makeself
 
-# Copyright 2013, Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv
+# Copyright 2020, Erik Falor <ewfalor@gmail.com>, Utah, USA
 # All rights reserved.
 #
+# Originally maintained by Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -23,8 +25,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=makeself
-VERSION=${VERSION:-2.2.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.4.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -62,7 +64,7 @@ cp makeself.sh $PKG/usr/bin
 cat makeself.1 |gzip -9 > $PKG/usr/man/man1/makeself.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README.md makeself.lsm update-readme $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md makeself.lsm $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/makeself/makeself.info b/system/makeself/makeself.info
index c99409f8ff..a1573f2778 100644
--- a/system/makeself/makeself.info
+++ b/system/makeself/makeself.info
@@ -1,10 +1,10 @@
 PRGNAM="makeself"
-VERSION="2.2.0"
+VERSION="2.4.2"
 HOMEPAGE="https://github.com/megastep/makeself"
-DOWNLOAD="https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz"
-MD5SUM="8075530b2ad0a2fbd4bffa80a96eb2ea"
+DOWNLOAD="https://github.com/megastep/makeself/archive/release-2.4.2.tar.gz"
+MD5SUM="7f81a68ee6a8db39ca099e93e7bbc5ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andrew Tkalia"
-EMAIL="anddt@yandex.ru"
+MAINTAINER="Erik Falor"
+EMAIL="ewfalor@gmail.com"
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/maxcso/maxcso.SlackBuild b/system/maxcso/maxcso.SlackBuild
index f8607544be..8a20490bc6 100644
--- a/system/maxcso/maxcso.SlackBuild
+++ b/system/maxcso/maxcso.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for maxcso
 
-# 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=maxcso
-VERSION=${VERSION:-1.11.0}
+VERSION=${VERSION:-1.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/maxcso/maxcso.info b/system/maxcso/maxcso.info
index 79da8f7509..6093cfae01 100644
--- a/system/maxcso/maxcso.info
+++ b/system/maxcso/maxcso.info
@@ -1,8 +1,8 @@
 PRGNAM="maxcso"
-VERSION="1.11.0"
+VERSION="1.12.0"
 HOMEPAGE="https://github.com/unknownbrackets/maxcso"
-DOWNLOAD="https://github.com/unknownbrackets/maxcso/archive/v1.11.0/maxcso-1.11.0.tar.gz"
-MD5SUM="b09915b38cbd746229fd293438957752"
+DOWNLOAD="https://github.com/unknownbrackets/maxcso/archive/v1.12.0/maxcso-1.12.0.tar.gz"
+MD5SUM="4ad33bcbc7659046564d3700241364ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libuv lz4"
diff --git a/system/md5deep/md5deep.SlackBuild b/system/md5deep/md5deep.SlackBuild
index 9f4760f7a0..b049d8efab 100644
--- a/system/md5deep/md5deep.SlackBuild
+++ b/system/md5deep/md5deep.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for md5deep
 
 # Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2015-2016 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
@@ -26,7 +26,7 @@
 PRGNAM=md5deep
 SRCNAM=hashdeep
 VERSION=${VERSION:-4.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,9 +62,13 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-release-$VERSION
-tar xvf $CWD/$SRCNAM-release-$VERSION.tar.gz || tar xvf $CWD/release-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-release-$VERSION.tar.gz
 cd $SRCNAM-release-$VERSION
 chown -R root:root .
+
+# Remove loop
+rm -rf tests/testfiles/symlinktest/
+
 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/system/md5deep/md5deep.info b/system/md5deep/md5deep.info
index 655b55c6ac..eaed42214d 100644
--- a/system/md5deep/md5deep.info
+++ b/system/md5deep/md5deep.info
@@ -1,7 +1,7 @@
 PRGNAM="md5deep"
 VERSION="4.4"
 HOMEPAGE="https://github.com/jessek/hashdeep/"
-DOWNLOAD="https://github.com/jessek/hashdeep/archive/release-4.4.tar.gz"
+DOWNLOAD="https://github.com/jessek/hashdeep/archive/release-4.4/hashdeep-release-4.4.tar.gz"
 MD5SUM="9ccfd5ba3e3d9cffddeb118cacad0c27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/mdf2iso/README b/system/mdf2iso/README
index fbf02c4879..2d11da7387 100644
--- a/system/mdf2iso/README
+++ b/system/mdf2iso/README
@@ -1,2 +1,2 @@
 mdf2iso is a very simple utility to convert an Alcohol 120% mdf image
-to an iso, toc / dat or cue / bin image.
\ No newline at end of file
+to an iso, toc / dat or cue / bin image.
diff --git a/system/megacli/README b/system/megacli/README
new file mode 100644
index 0000000000..2ed8a57153
--- /dev/null
+++ b/system/megacli/README
@@ -0,0 +1,6 @@
+megacli (LSI hardware RAID management utility)
+
+MegaCLI is an LSI command line interface utility to the MegaRAID
+controller family.  It is used as a diagnostic utility to obtain
+information, event logs and interact with the RAID controller and
+attached peripherals.
diff --git a/system/megacli/megacli.SlackBuild b/system/megacli/megacli.SlackBuild
new file mode 100644
index 0000000000..2c0850425c
--- /dev/null
+++ b/system/megacli/megacli.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Slackware build script for MegaCLI
+
+# Copyright 2020 Ebben Aries <e@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=megacli
+ZIPNAM=MegaCLI
+RPMNAM=MegaCli
+VERSION=${VERSION:-8.07.14}
+ZIPVER="$(echo $VERSION | sed -e 's/\./\-/g')"
+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
+unzip -d $PRGNAM-$VERSION $CWD/${ZIPVER}_$ZIPNAM.zip
+cd $PRGNAM-$VERSION/Linux
+
+rpm2cpio < ${RPMNAM}-${VERSION}-${BUILD}.noarch.rpm | cpio -imdv
+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 {} \;
+
+cp -ap opt $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/bin
+ln -s /opt/MegaRAID/$RPMNAM/$RPMNAM$LIBDIRSUFFIX $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/system/megacli/megacli.info b/system/megacli/megacli.info
new file mode 100644
index 0000000000..e9d3f740db
--- /dev/null
+++ b/system/megacli/megacli.info
@@ -0,0 +1,10 @@
+PRGNAM="megacli"
+VERSION="8.07.14"
+HOMEPAGE="http://www.broadcom.com"
+DOWNLOAD="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/8-07-14_MegaCLI.zip"
+MD5SUM="bf53eeb0e8ccc09c34f52d7035940c62"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="e@dscp.org"
diff --git a/system/megacli/slack-desc b/system/megacli/slack-desc
new file mode 100644
index 0000000000..a0bf177d66
--- /dev/null
+++ b/system/megacli/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------------------------------------------------------|
+megacli: megacli (LSI hardware RAID management utility)
+megacli:
+megacli: MegaCLI is an LSI command line interface utility to the MegaRAID
+megacli: controller family.  It is used as a diagnostic utility to obtain
+megacli: information, event logs and interact with the RAID controller and
+megacli: attached peripherals.
+megacli:
+megacli: Home-Page: http://www.broadcom.com
+megacli:
+megacli:
+megacli:
diff --git a/system/memtester/README b/system/memtester/README
new file mode 100644
index 0000000000..df134f1b2e
--- /dev/null
+++ b/system/memtester/README
@@ -0,0 +1,23 @@
+memtester (memory test utility)
+
+memtester is a userspace utility for testing the memory subsystem for
+faults. Unlike memtest86, it runs as a process on a running Linux system,
+meaning it can't test all of memory the way memtest86 is able to... but
+you don't have to reboot to use it.
+
+Note that, by definition, memtester counts as a denial-of-service
+(resource exhaustion) attack against the local machine. Be cautious
+about using it, and definitely *read its man page* before use.
+
+memtester has traditionally been run as root, so that it can lock the
+memory it's testing to prevent swapping and remapping. However, it's
+possible to use capabilities to allow it to run correctly as a normal
+user. Use something like:
+
+# chown root:console /usr/bin/memtester
+# chmod 0750 /usr/bin/memtester
+# setcap cap_ipc_lock=ep /usr/bin/memtester
+
+This allows anyone in the "console" group to run memtester. You could
+also create a memtester group and use it in the chown command above,
+if you'd rather have more fine-grained control.
diff --git a/system/memtester/memtester.SlackBuild b/system/memtester/memtester.SlackBuild
new file mode 100644
index 0000000000..9b17fd3fea
--- /dev/null
+++ b/system/memtester/memtester.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Slackware build script for memtester
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# The _1 is the debian patchlevel.
+
+PRGNAM=memtester
+VERSION=${VERSION:-4.5.0_1}
+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/usr $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.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 {} \+
+
+# These patches don't do much, but they're worth having.
+for i in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$i
+done
+
+# After applying the debian patches, CC doesn't get a default value (?)
+make CC=${CC:-gcc} CFLAGS="$SLKCFLAGS"
+make install INSTALLPATH=$PKG/usr
+
+# Binary already stripped, manpage already gzipped.
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUGS CHANGELOG 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/system/memtester/memtester.info b/system/memtester/memtester.info
new file mode 100644
index 0000000000..083ffb958c
--- /dev/null
+++ b/system/memtester/memtester.info
@@ -0,0 +1,12 @@
+PRGNAM="memtester"
+VERSION="4.5.0_1"
+HOMEPAGE="http://pyropus.ca/software/memtester/"
+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=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/memtester/slack-desc b/system/memtester/slack-desc
new file mode 100644
index 0000000000..d68f3dccba
--- /dev/null
+++ b/system/memtester/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------------------------------------------------------|
+memtester: memtester (memory test utility)
+memtester:
+memtester: memtester is a userspace utility for testing the memory subsystem
+memtester: for faults. Unlike memtest86, it runs as a process on a running
+memtester: Linux system, meaning it can't test all of memory the way memtest86
+memtester: is able to... but you don't have to reboot to use it.
+memtester:
+memtester:
+memtester:
+memtester:
+memtester:
diff --git a/system/mksh/README b/system/mksh/README
index e741b2c12e..7907a1cfd9 100644
--- a/system/mksh/README
+++ b/system/mksh/README
@@ -5,3 +5,6 @@ Pass STATIC=yes to the script to create a static build.
 
 Pass DIET=yes to the script in order to use dietlibc (this
 requires the optional dependency dietlibc)
+
+Pass MUSL=yes to the script in order to use musl (this
+requires the optional dependency musl)
diff --git a/system/mksh/mksh.SlackBuild b/system/mksh/mksh.SlackBuild
index f519ed2e86..9559c2d945 100644
--- a/system/mksh/mksh.SlackBuild
+++ b/system/mksh/mksh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mksh
 
-# Copyright (c) 2011-2019  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:-R57}
+VERSION=${VERSION:-R59c}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,6 +66,9 @@ rm -rf $PRGNAM
 tar xf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM
 
+CC="gcc"
+SLKCFLAGS="${SLKCFLAGS} -Wall"
+
 if [ "$STATIC" = "yes" ]; then
   LDFLAGS="${LDFLAGS} -static"
   CPPFLAGS="${CPPFLAGS} -DMKSH_NOPWNAM"
@@ -73,9 +76,10 @@ fi
 
 if [ "$DIET" = "yes" ]; then
   CC="diet -Os gcc"
-  SLKCFLAGS="${SLKCFLAGS} -Wall"
-else
-  CC="gcc"
+fi
+
+if [ "$MUSL" = "yes" ]; then
+  CC="musl-gcc"
 fi
 
 chown -R root:root .
@@ -92,12 +96,15 @@ LDFLAGS=$LDFLAGS \
 CPPFLAGS=$CPPFLAGS \
 CFLAGS=$SLKCFLAGS \
 CC=$CC \
-  sh ../Build.sh -r -c lto
+  sh ../Build.sh -r
+./test.sh
 
 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 0ef916bddd..e9eacb68f9 100644
--- a/system/mksh/mksh.info
+++ b/system/mksh/mksh.info
@@ -1,8 +1,8 @@
 PRGNAM="mksh"
-VERSION="R57"
+VERSION="R59c"
 HOMEPAGE="http://mirbsd.de/mksh"
-DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R57.tgz"
-MD5SUM="4d2686535252ea6a57bdec531498239a"
+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/mkslack/ChangeLog.txt b/system/mkslack/ChangeLog.txt
deleted file mode 100644
index 365b4d14d9..0000000000
--- a/system/mkslack/ChangeLog.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-Mon 01 Aug 2016 20:22:51 BST
-Version 5.1
-Do not rename python and perl packages.
-Sat 30 Jul 2016 03:27:00 BST
-Version 5.0
-Fix documentation
-Thu 28 Jul 2016 02:25:54 BST
-Version 4.9
-Updated templates for i586
-Mon 04 May 2015 05:48:43 BST
-Version 4.8
-Remove some debugging code
-Sat 11 Apr 2015 23:18:49 BST
-Version 4.7
-Add autotools as the first option.
-Wed 24 Dec 2014 09:32:31 GMT
-Update various build templates and revised documentation line.
-Mon 07 Apr 2014 10:12:35 BST
-Add waf template.
-+--------------------------+
-Tue 31 Dec 2013 03:02:59 GMT
-Info file: Remove APPROVED. Add REQUIRES.
-+--------------------------+
-Mon 30 Dec 2013 11:22:07 GMT
-Bugfix for missing manpage lines in autotools template.
-+--------------------------+
-Fri 22 Nov 2013 08:49:14 GMT
-Updated SlackBuild templates
-+--------------------------+
-Sun 30 Oct 2011 00:25:05 BST
-Added --infodir to autotools template
-+--------------------------+
-Tue 25 Oct 2011 19:25:35 BST
-Version 4.0
-Minor edit of mkslack.conf
-Added a chmod +x of SlackBuild
-+--------------------------+
-Sun 24 Apr 2011 17:30:38 BST
-Version 4.0
-Hmm where did 3.9 go?
-Fixed a problem with repeating additions to doinst.sh
-Removed annoying ... from slack-desc
-+--------------------------+
-Tue 08 Feb 2011 22:29:23 GMT
-Version 3.8
-Added support to auto-add year into slackbuilds.
-+--------------------------+
-Sun Jan 16 18:55:57 GMT 2011
-Version 3.7
-Added ruby support.
-+--------------------------+
-Tue 09 Nov 2010 12:07:36 PM GMT
-Version 3.6
-Bugfix for docmuentation
-+--------------------------+
-Tue 21 Sep 2010 18:45:16 BST
-Version 3.5
-Added 'doc' as an option for documentation
-+--------------------------+
-Mon 20 Sep 2010 08:28:24 BSTTue 07 Sep 2010 15:24:53 BST
-Version 3.4
-Changed .desktop and mimetype grep to case-insensitive.
-Added stock doinst.sh to templates for convenience.
-+--------------------------+
-Version 3.3 finalised
-+--------------------------+
-Thu 12 Aug 2010 06:35:28 BST
-Version 3.3rc8
-Small code improvements
-+--------------------------+
-Sat 31 Jul 2010 20:59:50 BST
-Version 3.3rc6
-Small bugfix for $PKG with python/perl packages.
-+--------------------------+
-Thu 01 Jul 2010 03:14:02 BST
-Version 3.3rc5
-Small bugfix.
-+--------------------------+
-Wed 30 Jun 2010 19:39:47 BST
-Version 3.3rc4
-Small bugfix.
-+--------------------------+
-Wed 30 Jun 2010 17:28:31 BST
-Version 3.3rc3
-Cleaned up message for usr/share/man pages found.
-+--------------------------+
-Wed 30 Jun 2010 09:54:37 BST
-Version 3.3rc2
-Reverted back to not needing an underscore for TAG.
-+--------------------------+
-Wed 30 Jun 2010 09:07:19 BST
-Version 3.3rc1
-Incorporated slakmagik's nice, new code.
--r is now -b (for build)
-A new -V for version check.
-With -b you get the choice of having a failed build fixed and
-rebuilt. Mostly for manpage/info errors. A new config option
-ERRORACTION to do this, which can be PROMPT, AUTO or EXIT.
-Now config file errors are reported back.
-Now TAG _must_ have a preceding underscore, which keeps it in
-line with slackbuilds.
-+--------------------------+
-Sun 27 Jun 2010 16:28:32 BST
-Version 3.1
-Fixed ARCH bug.
-Now puts appname into first line of slack-desc.
-+--------------------------+
-Wed 23 Jun 2010 23:59:14 BST
-Version 3.0
-Adjusted docs.
-+--------------------------+
-Tue 22 Jun 2010 19:47:26 BST
-Version 2.9
-Code improvements.
-+--------------------------+
-Tue 22 Jun 2010 19:47:05 BST
-Version 2.8
-???
-+--------------------------+
-Tue 22 Jun 2010 17:48:34 BST
-Version 2.7
-Adjusted docs.
-+--------------------------+
-Tue 22 Jun 2010 09:30:00 BST
-Version 2.6
-Upgraded to new perl template.
-+--------------------------+
-Mon 21 Jun 2010 01:12:41 BST
-Version 2.6
-Fixed python support.
-+--------------------------+
-Sun 20 Jun 2010 02:35:23 BST
-Version 2.5
-Improved backups. Added KEEPBACKUPS option to conf.
-+--------------------------+
-Sun 20 Jun 2010 01:20:39 BST
-Version 2.4
-Fixed slack-desc.
-+--------------------------+
-Sun 20 Jun 2010 00:44:02 BST
-Version 2.3
-Code improvements.
-+--------------------------+
-Sun 20 Jun 2010 00:12:41 BST
-Version 2.2
-Improved support for perl modules.
-+--------------------------+
-Fri 18 Jun 2010 01:07:52 BST
-Version 2.1
-Added some support for ./autogen.sh or autoreconf in configure
-is missing. YMMV on this.
-+--------------------------+
-Thu 17 Jun 2010 22:29:57 BST
-Version 2.0
-Added function to check for latest version.
-+--------------------------+
-Sun 13 Jun 2010 21:51:29 BST
-Version 1.9
-Fixed tag error
-+--------------------------+
-Sun 13 Jun 2010 19:20:55 BST
-Version 1.8
-Various code improvements
-+--------------------------+
-Sun 13 Jun 2010 10:24:38 BST
-Version 1.7
-Fixed _tag bug in package name.
-+--------------------------+
-Thu 10 Jun 2010 21:48:12 BST
-Version 1.6
-Updated for all templates on slackbuilds.org
-It _should_ detect the correct template to use.
-YMMV ;-)
-+--------------------------+
-Mon 31 May 2010 01:52:00 BST
-Version 1.5
-Minor bugfix.
-+--------------------------+
-Sat 29 May 2010 12:35:08 BST
-Version 1.4
-Updated SlackBuild template to the latest on slackbuilds.org
-+--------------------------+
diff --git a/system/mkslack/README b/system/mkslack/README
index 2899a7efdf..02924bf5f3 100644
--- a/system/mkslack/README
+++ b/system/mkslack/README
@@ -1,70 +1,12 @@
-mkslack - a SlackBuild generator script
+NAME
+       mkslack - a SlackBuild generator
 
-This slackbuild generator uses templates stored in
-/usr/share/mkslack/templates and a config file
-/etc/mkslack/mkslack.conf which you must edit for name, email, tag and
-a few options.
+SYNOPSIS
+       mkslack [options] archive
 
+DESCRIPTION
+       mkslack generates SlackBuild scripts and supporting
+       files using the standard SBo templates found at
+       https://slackbuilds.org/templates/
 
-Idea for use:
-
-The initial slackbuild and info file are built by this script, and
-when a test build/install is done and working, the files should be
-tweaked by hand. Especially don't forget to fill in the rest of the
-details in the .info. One thing to point out is that mkslack will
-overwrite these files if run again unless you set KEEPBACKUPS="YES"
-in the conf (default).
-
-This is only a starter kit! You ARE expected to edit the created
-files by hand afterwards to remove unnecesary parts and add extra
-options!
-
-
-Syntax:
-
-mkslack [options] archive
-
-Options:
--h --help               Usage.
--b --build              Run SlackBuild after creation. Got root?
--i --install            Install the package after running.
--l --list               Pipe archive contents to /usr/bin/most and exit.
--v --version            Version of mkslack.
--V --ckver              Check for new version.
-
-With no option set, mkslack will generate the SlackBuild and other
-files, print out a small message, and then quit.
-
-
-Config options:
-
-NAME, EMAIL as they should appear in .SlackBuild and .info TAG should
-be your custom tag and defaults to _SBo KEEPBACKUPS="YES|NO" up to 5
-backups of .SlackBuild and other files are kept. The higher the
-number, the older they are.  ERRORACTION="PROMPT|AUTO|EXIT" what to
-do on build errors. Using AUTO or answering 'y' to the prompt will
-have the slackbuild adjusted for man and info pages and then rebuilt.
-Waf scripts don't exit on a '1' return code so it scans the end of
-the to see if there is an unrecognised configure option (the most
-frequent error with waf).
-
-
-CLI Options:
-
-The documents list in top level of source tree can be adjusted by
-command:
-DOCS="SomeFile" mkslack archive
-This will add 'SomeFile' to the list. You can also edit the DOCS list
-in this script. Any that it doesn't find will be removed from the
-list.
-
-Build can be specified by:
-BUILD=2 mkslack archive
-Otherwise it defaults to 1.
-
-ARCH can be specified by:
-ARCH=xxx mkslack archive
-It defaults to whatever is set in the system, or what the SlackBuild
-finds or sets.
-
-TAG can also be specified.
+       See mkslack(1) for comprehensive option descriptions.
diff --git a/system/mkslack/mkslack.SlackBuild b/system/mkslack/mkslack.SlackBuild
index 1a76a876f4..7ca562007c 100644
--- a/system/mkslack/mkslack.SlackBuild
+++ b/system/mkslack/mkslack.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for mkslack
 
-# Copyright 2010 David Woodfall <dave@slackbuilds.org>,
-# Modifications copyright slakmagik <slakmagik@gmail.com>
+# Copyright 2010-20 Dave Woodfall <dave@slackbuilds.org>,
+#                   slakmagik <slakmagik@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=mkslack
-VERSION=${VERSION:-5.2}
+VERSION=${VERSION:-5.3.5}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -38,12 +38,12 @@ README=$PKG/usr/doc/$PRGNAM-$VERSION/README
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG/usr/bin $PKG/usr/share/mkslack/templates $PKG/etc/mkslack \
-  $PKG/usr/man/man1 $OUTPUT
+mkdir -p $TMP $OUTPUT $PKG/usr/share/mkslack/{templates,tools}
+
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $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 \
@@ -51,30 +51,34 @@ 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 -e "s/@VERSION@/$VERSION/g" mkslack.1
 gzip mkslack.1
-install -m 644 mkslack.1.gz $PKG/usr/man/man1
-install -m 755 mkslack $PKG/usr/bin
-install -m 644 template* $PKG/usr/share/mkslack/templates
-install -m 644 *SlackBuild $PKG/usr/share/mkslack/templates
-install -m 644 mkslack.conf.new $PKG/etc/mkslack
+install -m 644 -D mkslack.1.gz $PKG/usr/man/man1/mkslack.1.gz
+install -m 755 -D mkslack $PKG/usr/bin/mkslack
+install -m 644 -D mkslack.conf.new $PKG/etc/mkslack/mkslack.conf.new
+install -m 644 templates/* $PKG/usr/share/mkslack/templates
+install -m 644 tools/* $PKG/usr/share/mkslack/tools
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a original-templates $PKG/usr/doc/$PRGNAM-$VERSION
+
 # generate the README from some introductory text and a dump of the manual
 cat << EOF > $README
 mkslack - a SlackBuild generator script
-Copyright 2010 David Woodfall, modification by slakmagik
+
+Copyright 2010-2020 Dave Woodfall and slakmagik.
 mkslack is licensed under a "one-clause BSD/Slackware" license.
 See the script for the full text.
-Homepage: http://tty1.uk/slackbuilds/noversion/mkslack/
+
+Homepage: http://tty1.uk/slackbuilds/noversion/mkslack
 EOF
-man ./mkslack.1.gz | col -b | expand | cat -s | sed '
+man ./mkslack.1.gz | col -b | expand | fmt -72 | cat -s | sed "
     1d
     s/\([^[:space:]]\)[[:space:]][[:space:]]*/\1 /g
     /^$/N;/MKSLACK(1)$/D
-    ' >> $README
+    " >> $README
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/ChangeLog.txt > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog.txt
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/mkslack/mkslack.info b/system/mkslack/mkslack.info
index a204e9218d..58059ed4dc 100644
--- a/system/mkslack/mkslack.info
+++ b/system/mkslack/mkslack.info
@@ -1,10 +1,10 @@
 PRGNAM="mkslack"
-VERSION="5.2"
-HOMEPAGE="http://tty1.uk/slackbuilds/noversion/mkslack"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/mkslack-5.2.tar.gz"
-MD5SUM="1866d9b32bee61a5bdfca52230e2a6f0"
+VERSION="5.3.5"
+HOMEPAGE="http://tty1.uk/slackbuilds/mkslack"
+DOWNLOAD="http://git.tty1.uk/cgit.cgi/mkslack/snapshot/mkslack-5.3.5.tar.gz"
+MD5SUM="d7debd4ffae89f31a407f0e80e73468b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@slackbuilds.org"
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@tty1.uk"
diff --git a/system/mkslack/slack-desc b/system/mkslack/slack-desc
index b02ac1b0af..6d4735561d 100644
--- a/system/mkslack/slack-desc
+++ b/system/mkslack/slack-desc
@@ -1,19 +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
+# 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------------------------------------------------------|
 mkslack: mkslack (a SlackBuild generation system)
 mkslack:
-mkslack: mkslack uses templates to generate slackbuilds and .info files.
-mkslack: It fills in various things like PRGNAM, VERSION etc and inspects the
-mkslack: archive for man, info and documentation. It checks md5sum of archive
-mkslack: and writes it into the .info file.
+mkslack: mkslack generates SlackBuild scripts and supporting files using the
+mkslack: standard SBo templates found at https://slackbuilds.org/templates/
+mkslack:
+mkslack: See mkslack(1) for comprehensive option descriptions.
+mkslack:
+mkslack: http://tty1.uk/slackbuilds/mkslack
+mkslack:
 mkslack:
-mkslack: The config file /etc/mkslack/mkslack.conf should be customised with
-mkslack: your name, email etc. before use.
 mkslack:
-mkslack: http://tty1.uk/slackbuilds/noversion/mkslack
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/README b/system/monitorix/README
index 06df82f402..b8041bdce9 100644
--- a/system/monitorix/README
+++ b/system/monitorix/README
@@ -1,15 +1,17 @@
-Monitorix is a free, open source, lightweight system monitoring tool designed
-to monitor as many services and system resources as possible. It has been
-created to be used under production Linux/UNIX servers, but due to its
-simplicity and small size can be used on embedded devices as well.
+Monitorix is a free, open source, lightweight system monitoring tool
+designed to monitor as many services and system resources as possible.
+It has been created to be used under production Linux/UNIX servers, but
+due to its simplicity and small size can be used on embedded devices as
+well.
 
-It consists mainly of two programs: a collector, called monitorix, which is a
-Perl daemon that is started automatically like any other system service, and a
-CGI script called monitorix.cgi. Since 3.0 version Monitorix includes its own
-HTTP server built in, so you aren't forced to install a third-party web server
-to use it.
+It consists mainly of two programs: a collector, called monitorix, which
+is a Perl daemon that is started automatically like any other system
+service, and a CGI script called monitorix.cgi. Since 3.0 version
+Monitorix includes its own HTTP server built in, so you aren't forced to
+install a third-party web server to use it.
 
 Note:
 
-There are several runtime dependencies (like pflogsumm) I'm unable to test for
-all services. Keep an eye on /var/log/monitorix which will tell you.
+There are several runtime dependencies (like pflogsumm) I'm unable to
+test for all services. Keep an eye on /var/log/monitorix which will tell
+you.
diff --git a/system/monitorix/monitorix.SlackBuild b/system/monitorix/monitorix.SlackBuild
index f88c43d69c..102e27dda1 100644
--- a/system/monitorix/monitorix.SlackBuild
+++ b/system/monitorix/monitorix.SlackBuild
@@ -4,6 +4,7 @@
 
 # Copyright 2014-2016 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
+# 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
@@ -25,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monitorix
-VERSION=${VERSION:-3.9.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 16261c85e5..2067f2a6a4 100644
--- a/system/monitorix/monitorix.info
+++ b/system/monitorix/monitorix.info
@@ -1,10 +1,10 @@
 PRGNAM="monitorix"
-VERSION="3.9.0"
+VERSION="3.13.1"
 HOMEPAGE="https://www.monitorix.org/"
-DOWNLOAD="https://www.monitorix.org/old-versions/monitorix-3.9.0.tar.gz"
-MD5SUM="181bf2b83b92e89aa6317dd473a987e3"
+DOWNLOAD="https://www.monitorix.org/monitorix-3.13.1.tar.gz"
+MD5SUM="ca2b15fb137efded82c5a2bfd189573f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-http-server-simple perl-config-general rrdtool"
+REQUIRES="perl-lwp-useragent-cached perl-http-server-simple perl-config-general rrdtool"
 MAINTAINER="Emmanuel N. Millan"
 EMAIL="emmanueln@gmail.com"
diff --git a/system/motion/motion.SlackBuild b/system/motion/motion.SlackBuild
index d0e0493159..bae4bc7990 100644
--- a/system/motion/motion.SlackBuild
+++ b/system/motion/motion.SlackBuild
@@ -2,9 +2,10 @@
 
 # Slackware build script for motion.
 #
-# Copyright 2013 Sebastian Arcus: sbo {at} open-t {dot} co {dot} uk
+# Copyright 2013-2020 Sebastian Arcus: s.arcus {at} open-t [dot] co [dot] uk
 # Copyright 2009-2010 Pierre Cazenave <pwcazenave> {at} gmail [dot] com
 # Copyright 2007 Martin Lefebvre <dadexter@sekurity.com>
+# With contributions from JB: afrotrap {at} gmail [dot] com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=motion
-VERSION=${VERSION:-4.2.2}
+VERSION=${VERSION:-4.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,7 +74,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 {} \;
 
-autoreconf
+autoreconf -fiv
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -99,7 +100,7 @@ mv $PKG/etc/motion/motion-dist.conf $PKG/etc/motion/motion-dist.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/motion/* $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/$PRGNAM/examples $PKG/usr/doc/$PRGNAM-$VERSION/
+#mv $PKG/usr/share/$PRGNAM/examples $PKG/usr/doc/$PRGNAM-$VERSION/
 rm -rf $PKG/usr/share # We moved the docs from there
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/motion/motion.info b/system/motion/motion.info
index 93be03f4c3..b077342cc9 100644
--- a/system/motion/motion.info
+++ b/system/motion/motion.info
@@ -1,10 +1,10 @@
 PRGNAM="motion"
-VERSION="4.2.2"
+VERSION="4.3.1"
 HOMEPAGE="https://motion-project.github.io"
-DOWNLOAD="https://github.com/Motion-Project/motion/archive/release-4.2.2/motion-release-4.2.2.tar.gz"
-MD5SUM="6986e44b6bf294a2d4f07f85595275e0"
+DOWNLOAD="https://github.com/Motion-Project/motion/archive/release-4.3.1/motion-release-4.3.1.tar.gz"
+MD5SUM="2d49f8af48f9deff4ea9204b05cc327c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmicrohttpd"
 MAINTAINER="Sebastian Arcus"
-EMAIL="s.arcus <at> open-t {dot} co {dot} uk"
+EMAIL="s.arcus <at> open-t [dot] co [dot] uk"
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/ncdu/ncdu.SlackBuild b/system/ncdu/ncdu.SlackBuild
index 0dd77d2107..82ad23caed 100644
--- a/system/ncdu/ncdu.SlackBuild
+++ b/system/ncdu/ncdu.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for ncdu
 #
-# Copyright 2009-2018  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2020  Erik W. Hanson, Minneapolis, MN, 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=ncdu
-VERSION=${VERSION:-1.13}
+VERSION=${VERSION:-1.15.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/ncdu/ncdu.info b/system/ncdu/ncdu.info
index efd54bd974..63f5b81f3a 100644
--- a/system/ncdu/ncdu.info
+++ b/system/ncdu/ncdu.info
@@ -1,8 +1,8 @@
 PRGNAM="ncdu"
-VERSION="1.13"
+VERSION="1.15.1"
 HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-DOWNLOAD="https://dev.yorhel.nl/download/ncdu-1.13.tar.gz"
-MD5SUM="67239592ac41f42290f52ab89ff198be"
+DOWNLOAD="https://dev.yorhel.nl/download/ncdu-1.15.1.tar.gz"
+MD5SUM="af25aa8462a6f29c8a0c4d3d83d186e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild
index f63d162b78..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.20.0}
+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 7392c445f4..95ea1f6c42 100644
--- a/system/netdata/netdata.info
+++ b/system/netdata/netdata.info
@@ -1,8 +1,8 @@
 PRGNAM="netdata"
-VERSION="1.20.0"
+VERSION="1.29.3"
 HOMEPAGE="https://github.com/netdata/netdata"
-DOWNLOAD="https://github.com/netdata/netdata/archive/v1.20.0/netdata-1.20.0.tar.gz"
-MD5SUM="43959e65b4fcddc45e4199cfa3c87784"
+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/noto-emoji/noto-emoji.SlackBuild b/system/noto-emoji/noto-emoji.SlackBuild
index 0a282408ec..ed43f6653b 100644
--- a/system/noto-emoji/noto-emoji.SlackBuild
+++ b/system/noto-emoji/noto-emoji.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for noto-emoji
 
-# 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,11 +23,11 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=noto-emoji
-VERSION=${VERSION:-20191119}
+VERSION=${VERSION:-20200916}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVERSION=${SRCVERSION:-2019-11-19-unicode12}
+SRCVERSION=${SRCVERSION:-2020-09-16-unicode13_1}
 
 ARCH=noarch
 
diff --git a/system/noto-emoji/noto-emoji.info b/system/noto-emoji/noto-emoji.info
index 72868fcb29..bf317e605a 100644
--- a/system/noto-emoji/noto-emoji.info
+++ b/system/noto-emoji/noto-emoji.info
@@ -1,9 +1,9 @@
 PRGNAM="noto-emoji"
-VERSION="20191119"
+VERSION="20200916"
 HOMEPAGE="https://www.google.com/get/noto/help/emoji/"
-DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2019-11-19-unicode12/noto-emoji-2019-11-19-unicode12.tar.gz \
+DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2020-09-16-unicode13_1/noto-emoji-2020-09-16-unicode13_1.tar.gz \
           https://gist.githubusercontent.com/hexchain/47f550472e79d0805060/raw/d9ecd5a5fcb901bcfb75115f4b602f6c1d3020c1/51-noto-color-emoji.conf.xml"
-MD5SUM="8e449a8d1bfbca27332aba7c68a4c55f \
+MD5SUM="c32147c255b366c28a2c4d702e2cfda2 \
         e2d9cf0460fa0315a8da5d8dedacf702"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/numactl/numactl.SlackBuild b/system/numactl/numactl.SlackBuild
index 22f15f4e06..c859de402a 100644
--- a/system/numactl/numactl.SlackBuild
+++ b/system/numactl/numactl.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Wainamoinen <wainamoinen@gmail.com>
 
 PRGNAM=numactl
-VERSION=${VERSION:-2.0.12}
+VERSION=${VERSION:-2.0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/numactl/numactl.info b/system/numactl/numactl.info
index 960453e496..1cda19b3ff 100644
--- a/system/numactl/numactl.info
+++ b/system/numactl/numactl.info
@@ -1,8 +1,8 @@
 PRGNAM="numactl"
-VERSION="2.0.12"
+VERSION="2.0.13"
 HOMEPAGE="https://github.com/numactl/numactl"
-DOWNLOAD="https://github.com/numactl/numactl/releases/download/v2.0.12/numactl-2.0.12.tar.gz"
-MD5SUM="2ba9777d78bfd7d408a387e53bc33ebc"
+DOWNLOAD="https://github.com/numactl/numactl/releases/download/v2.0.13/numactl-2.0.13.tar.gz"
+MD5SUM="9a9a94bfebf6c9c67defeedc9795e568"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index 4e5f22ceed..9f87edbdff 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -1,36 +1,67 @@
 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 a part
-of the nvidia-kernel package at SlackBuilds.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:
+Installing the 32-bit compatibility libraries is available:
+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.
 
-Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
-nvidia-settings.  Please refer to the Nvidia documentation and man pages
-for details and usage.
+Several useful utilities are included: nvidia-xsettings, nvidia-smi,
+and nvidia-settings.  Please refer to the Nvidia documentation and
+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:
--------------8<---------------
-# Create missing nvidia device nodes after reboot
-/usr/bin/nvidia-modprobe -c 0 -u
-------------->8---------------
+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 for nvidia-persistenced to work):
+
+    # Create missing nvidia device nodes after reboot
+    if [ -x /usr/bin/nvidia-modprobe ]; then
+      /usr/bin/nvidia-modprobe -c 0 -u
+    fi
 
 Notes:
-1.  You still need to blacklist the opensource nouveau driver. This is
-    easily done by installing xf86-video-nouveau-blacklist-noarch-1.txz
-    in extra/xf86-video-nouveau-blacklist on the distibution DVD.
-2.  If nvidia-driver is already installed, there may be extraneous
-    "unable to find installed file..." messages on the console and log.
-    This is benign and due to the nvidia installer not being very smart.
-3.  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, simply
-    reinstall the orginal Mesa and xorg-server packages.
+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).
+
+3.  As of version 450.xx, Nvidia no longer includes libGL.la in their
+    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 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/README.nvidia-persistenced b/system/nvidia-driver/README.nvidia-persistenced
new file mode 100644
index 0000000000..5dd841ff87
--- /dev/null
+++ b/system/nvidia-driver/README.nvidia-persistenced
@@ -0,0 +1,33 @@
+The NVIDIA Persistence Daemon is a userspace daemon on Linux to support
+persistence of driver state across Cuda job runs.  The daemon targets
+all current Tesla, Quadro and GRID GPUs.  For further information, see
+
+https://docs.nvidia.com/deploy/driver-persistence/index.html
+
+The driver now includes rc.nvidia-persistenced as an option.
+While it can be run as root, it is more secure to run it as an
+unpriveleged user, so we run it as user nvidia.
+
+To install it, Pass PERSISTENCED=yes to the script.  It will create the
+user and group nvidia, and install rc.nvidia-persistenced to /etc/rc.d.
+
+To activate the daemon, add the following to /etc/rc.d/local:
+
+# Start the nvidia-persistenced daemon:
+if  [ -x /etc/rc.d/rc.nvidia-persistenced ]; then
+    /etc/rc.d/rc.nvidia-persistenced start
+fi
+
+and then 'chmod +x /etc/rc.d/rc.nvidia-persistenced' to make it
+executable.
+
+Add the following to /etc/rc.d/rc.local_shutdown:
+
+# Stop the nvidia-persistenced daemon:
+if  [ -x /etc/rc.d/rc.nvidia-persistenced ]; then
+    /etc/rc.d/rc.nvidia-persistenced stop
+fi
+
+NOTE: This may not work on all systems.  If you encounter problems
+with it, just 'chmod -x /etc/rc.d/rc.persistenced' and it will no
+longer load.  YMMV.
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
deleted file mode 100644
index a0c7bd16d3..0000000000
--- a/system/nvidia-driver/changelog.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-1.0     20-MAR-2011 New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-1.1     10-APR-2011 updated to new version, testing 13.37rc4.6692
-1.2     27-MAY-2011 new version, allow multilib option, minor edits
-1.2.1   20-JUN-2011 minor edits, thanks to Robby and Roberto
-1.5     01-JUL-2011 new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
-1.6     27-AUG-2011 version bump, minor edits
-1.7     21-OCT-2011 version bump
-1.8     24-MAR-2012 version bump, fix to nvidia-switch thanks to Phill W.
-1.9     02-AUG-2012 version bmp, fixes, updates, nvidia-switch for install/uninstall only
-2.0     21-AUG-2012 new version (important security fix), missing vdpau-nvidia, dropped *.h
-2.1     25-AUG-2012 new version -Long Lived Branch, fixed symlinks (per Das email)
-2.2     22-NOV-2012 new version -Long Lived Branch. Updates: libs, apps
-2.3     15-FEB-2013 new version -Long Lived Branch.
-2.4     19-MAY-2013 new version -Long Lived Branch.
-2.6     20-OCT-2013 new version -Long Lived Branch, add new lib, fix nvidia-switch --remove
-3.0     13-NOV-2013 new version (LLB), update libs
-3.1     12-APR-2014 new version (LLB), update libs
-3.2a	12-JUL-2014 new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm
-3.3     20-NOV-2014 new version (LLB), update libs, fix nvidia-switch
-3.4     11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES
-4.0     07-FEB-2015 new long lived branch, version update, bug fixes
-4.1     27-APR-2015 version update LLB, fix $VERSION usage
-4.2     28-JUL-2015 version update LLB, bug fixes, clean-ups.
-4.3     05-SEP-2015 version update LLB
-4.4     13-DEC-2015 version update, X.Org 1.18 support
-4.5     12-MAR-2016 version update LLB, symlink fixes, drop nvidia-installer, get ready for 14.2
-4.5a    26-MAR-2016 fixed broken symlinks
-4.6     24-APR-2016 version update LLB, fix symlinks, added to version if multilib
-4.7	31-APR-2016 version update LLB, added nvidia-installer, updated libs/symlinks
-5.0	20-FEB-2017 version update LLB, security fixes, updated libs/symlinks, nvidia-switch
-5.1     01-APR-2017 fix nvidia-switch lib names to prevent bad ldconfig symlinks on reboot
-5.2	02-JUN-2017 version update LLB, refactor/debug scripts, use nvidia-installer
-5.3	13-OCT-2017 version update LLB, bug fixes, update copyright
-5.4     18-FEB-2018 version update LLB, updates, bug fix (thanks Leo)
-5.5	25-MAR-2018 version update LLB
-5.6     23-APR-2018 version update LLB, update symlinks, fix changelog formatting
-5.7     28-MAY-2018 version update LLB
-5.8     30-JUL-2018 version update LLB
-5.9	06-SEP-2018 version update LLB
-6.0	09-N0V-2018 version update LLB, 32-bit CPU support dropped, x86_64 COMPAT32 available.
-6.1	22-Dec-2018 version update LLB, fix libglx symlink
-6.2	04-FEB-2019 beta version update LLB (build fixes kernel 4.4.168+), minor fixes/corrections
-6.3	26-FEB-2019 version update LLB
-6.4	20-APR-2019 version update LLB
-6.5     14-MAY-2019 version update LLB
-6.6     10-AUG-2019 version update LLB, drop non-glvnd libs. This script will NOT work on current
-6.7     11-SEP-2019 version update LLB, fix for pre-Turing GPUs (This script will NOT work on current).
-7.0     28-Sep-2019 version update LLB, add temp glvnd switch for 15.0, remove nvidia-switch
-7.1	15-Dec-2019 version update LLB, fix libs
-7.2     12-Feb-2020 version update LLB
-7.3     24-Mar-2020 version update LLB, fixes nvidia-switch; doinst; update patch (thanks Daniel B.)
diff --git a/system/nvidia-driver/doinst.sh b/system/nvidia-driver/doinst.sh
index 8ee62f049e..392c12adb9 100644
--- a/system/nvidia-driver/doinst.sh
+++ b/system/nvidia-driver/doinst.sh
@@ -2,5 +2,3 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications
 fi
 
-./usr/sbin/nvidia-switch --install
-
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 951f4a069c..e8e7cf0a8b 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -2,7 +2,9 @@
 
 # Slackware build script for nvidia-driver
 
-# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, US
+# Copyright 2020 Lenard Spencer, Orlando, FL, USA
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +27,7 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-440.64}
+VERSION=${VERSION:-460.67}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,6 +59,14 @@ else
   exit 1
 fi
 
+# There are a couple of unresolved issues with nvidia-installer, so we
+# abort if an Nvidia driver is still installed:
+if [ -x /usr/bin/nvidia-installer ]; then
+  echo -e "\n A previous Nvidia installation has been detected!"
+  echo -e " Please remove the installed driver and rerun this script.\n"
+  exit 1
+fi
+
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
 
 # make a clean package directory tree
@@ -67,7 +77,7 @@ mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
   $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1,sbin} \
   $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \
   $PKG/usr/include/GL $PKG/etc/vulkan/{icd.d,implicit_layer.d} $PKG/etc/X11/xorg.conf.d \
-  $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64}
+  $PKG/etc/X11/glvnd/egl_vendor.d
 
 if [ "$COMPAT32" = "yes" ]; then
   mkdir -p $PKG/usr/lib/tls
@@ -81,10 +91,8 @@ rm -rf nvidia-settings-$VERSION
 tar xvf $CWD/nvidia-settings-$VERSION.tar.bz2
 rm -rf nvidia-xconfig-$VERSION
 tar xvf $CWD/nvidia-xconfig-$VERSION.tar.bz2
-rm -rf nvidia-modprobe-$VERSION.tar.bz2
+rm -rf nvidia-modprobe-$VERSION
 tar xvf $CWD/nvidia-modprobe-$VERSION.tar.bz2
-rm -rf nvidia-persistenced-$VERSION.tar.bz2
-tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2
 sh $CWD/$SRCNAM.run --extract-only
 cd $SRCNAM
 chown -R root:root .
@@ -96,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
@@ -119,17 +128,14 @@ 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 [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+if [ "${COMPAT32}" = "yes" ]; then
     COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
-    MULTI="_multi"
+    MULTI="_multilib"
 else
-    if [ ! "$ARCH" = "x86_64" ]; then
-        COMP32=""
-    else
-        COMP32="--no-install-compat32-libs"
-	MULTI=""
-    fi
+    COMP32="--no-install-compat32-libs"
+    MULTI=""
 fi
 
 # Install the binary libs using nvidia-installer compiled above
@@ -150,55 +156,37 @@ cd $TMP/$SRCNAM
   --log-file-name=$PKG/var/log/nvidia-installer.log \
   --egl-external-platform-config-path=$PKG/usr/share/egl/egl_external_platform.d \
   --no-nvidia-modprobe \
-  --install-libglvnd \
   $COMP32
 
-# Clean-up: we really do not need this:
-rm -rf $PKG/var/log/nvidia
-# If running current (15.0) remove duplicate libglvnd files and symlinks
+  # Move ICDs to $PKG and cleanup (no switch option in installer?)
+mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd
+mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json
+mv /etc/vulkan/implicit_layer.d/nvidia_layers.json $PKG/etc/vulkan/implicit_layer.d/nvidia_layers.json
+# In current, mesa now puts an entry into this directory, so we
+# leave it alone if it is not empty
+if [ -z "$(ls -A /etc/OpenCL/vendors)" ]; then
+  rm -rf /etc/OpenCL
+fi
+# just in case any other programs make an entry here
+if [ -z "$(ls -A /etc/vulkan)" ]; then
+  rm -rf /etc/vulkan
+fi
+
 if [ "$CURRENT" = "yes" ]; then
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so{,.1,.1.1.0}
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGL.so{,.1,.1.7.0}
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so{,.1,.1.2.0}
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so{,.2,.2.1.0}
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLX.so{,.0}
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libGLdispatch.so.0
-    rm -f $PKG/usr/lib$LIBDIRSUFFIX/libOpenGL.so{,.0} 
-    if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-        rm -f $PKG/usr/lib/libEGL.so{,.1,.1.1.0}
-        rm -f $PKG/usr/lib/libGL.so{,.1,.1.7.0}
-        rm -f $PKG/usr/lib/libGLESv1_CM.so{,.1,.1.2.0}
-        rm -f $PKG/usr/lib/libGLESv2.so{,.2,.2.1.0}
-        rm -f $PKG/usr/lib/libGLX.so{,.0}
-        rm -f $PKG/usr/lib/libGLdispatch.so.0
-        rm -f $PKG/usr/lib/libOpenGL.so{,.0}
-    fi
-# Don't ship .la files:
-    rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-    if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-        rm -f $PKG/usr/lib/*.la
+# libOpenCL.so is now included in current (in ocl-icd),
+# so we don't need this one.
+    rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libOpenCL.so.1.0.0
+    if [ "${COMPAT32}" = "yes" ]; then
+        rm -f $PKG/usr/lib/libOpenCL.so.1.0.0
     fi
 else
-# save libGL.la for 14.2
-    cd $PKG/usr/lib$LIBDIRSUFFIX
-    mv libGL.la libGL.la-nvidia
-    cd -
-    if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-        cd $PKG/usr/lib
-	mv libGL.la libGL.la-nvidia
-        cd -
-    fi
-# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files
-# so we don't stomp on the overlapping xorg files.
+# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia
+# files so we don't stomp on any overlapping xorg files.
 # Note: switching can be problematic ;-)
+    mkdir -p  $PKG/var/log/nvidia/{32,64}
     install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/
     sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch
     sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch
-    if [ "$GLVND" = "yes" ]; then
-        sed -i s/GLVNDFLAG/yes/g $PKG/usr/sbin/nvidia-switch
-    else
-        sed -i s/GLVNDFLAG/no/g $PKG/usr/sbin/nvidia-switch
-    fi
     if [ ${COMPAT32} = "yes" ]; then
         sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch
     else
@@ -206,14 +194,6 @@ else
     fi
 fi
 
-# add tls
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-    install -m 755 32/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/libnvidia-tls.so.$VERSION
-    cd $PKG/usr/lib
-        ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
-    cd -
-fi
-
 # Compile utilites from source, replacing the precompiled versions
 #
 # Compiling nvidia-settings
@@ -273,39 +253,17 @@ cd -
       -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
     CFLAGS="$SLKCFLAGS" make
-
-    install -m 755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/
+# must be installed suid root for nvidia-persistenced to work properly
+    install -m 4755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/
     install -m 644 _out/Linux_$TARGET/nvidia-modprobe.1.gz $PKG/usr/man/man1/
   cd -
 
-# Compiling nvidia-persistenced
-  cd $TMP/nvidia-persistenced-$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" make
-#FIXME: need rc.nvidia-persistenced script; see doc
-    install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
-    install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
-  cd -
-
-# These update or correct wrong paths
+# These update the paths in nvidia-settings.desktop
 sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop
 sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop
 sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
 
-# Move ICDs to $PKG and cleanup (no switch option in installer?)
-mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd
-mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json
-mv /etc/vulkan/implicit_layer.d/nvidia_layers.json $PKG/etc/vulkan/implicit_layer.d/nvidia_layers.json
-rm -rf /etc/OpenCL
-rm -rf /etc/vulkan
-
-# Remove xorg conf file since we take care of that in nvidia-driver
+# Remove xorg conf file since we handle that in nvidia-kernel
 rm -rf $PKG/etc/X11/xorg.conf.d
 
 cd $TMP/$SRCNAM
@@ -319,8 +277,64 @@ cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
 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|nvidia-driver: @MULTILIB@|nvidia-driver: This package includes the 32-bit libraries.|" $PKG/install/slack-desc
+else
+   sed -i "s|nvidia-driver: @MULTILIB@|nvidia-driver:|" $PKG/install/slack-desc
+fi
+
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Flag install as multlib as needed and build package.
+# 14.2 needs nvidia-switch, -current does not
+if [ "$CURRENT" = "no" ]; then
+  echo -e "usr/sbin/nvidia-switch --install\n" >> $PKG/install/doinst.sh
+fi
+
+# Add rc.nvidia-persistenced:
+if [ "${PERSISTENCED:-no}" = "yes" ]; then
+  cd $TMP
+  rm -rf nvidia-persistenced-$VERSION.tar.bz2
+  tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2
+# Compiling nvidia-persistenced
+  cd $TMP/nvidia-persistenced-$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" make
+  install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
+  install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
+
+  if ! getent group nvidia > /dev/null 2>&1; then
+    echo "Creating the group nvidia:"
+    groupadd -g 365 nvidia || exit 1
+  fi
+  if ! getent passwd nvidia > /dev/null 2>&1; then
+    echo "Creating the user nvidia:"
+    useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1
+  fi
+  mkdir -p $PKG/var/run/nvidia-persistenced
+  chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
+  mkdir -p $PKG/etc/rc.d
+  install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced
+  sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced
+  cat <<EOF >> $PKG/install/doinst.sh
+# Create group and user nvidia if they don't already exist
+if ! getent group nvidia > /dev/null 2>&1; then
+  echo "Creating the group nvidia:"
+  groupadd -g 365 nvidia || exit 1
+fi
+if ! getent passwd nvidia > /dev/null 2>&1; then
+  echo "Creating the user nvidia:"
+  useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1
+fi
+
+EOF
+fi
+
+# Flag multlib as needed and build package.
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index cde0ddf80a..ca20a48252 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
 PRGNAM="nvidia-driver"
-VERSION="440.59"
+VERSION="460.67"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.59/NVIDIA-Linux-x86_64-440.59.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-440.59.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-440.59.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-440.59.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.59.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-440.59.tar.bz2"
-MD5SUM_x86_64="ba746d5b5f50369139bbed47da04aa74 \
-               fbe92127e8d41c54059742f12eb0e347 \
-               2fffb0aca454437534029b935bf65a79 \
-               24c79658da81294c39c1fe22d0fc704e \
-               94b081b77eba7cfd2aa82ffda54cca90 \
-               80a50eb9892588d57cca02b1822cddbd"
+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="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index 30f9a66cb0..9196cf7b8a 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2020 Lenard Spencer, Orlando, FL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,40 +21,42 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# nvidia-switch utility 4.6
+# nvidia-switch utility 4.7.2
 #
-# A tool to install and cleanly remove the nvidia driver without stomping on the xorg files.
-# Note: this tool "should" allow switching on the fly, but why? Pick a driver! You will still
-# need to edit a bunch of other config files.
+# A tool to install and cleanly remove the nvidia driver without stomping
+# on the mesa files.  Note: this tool "should" allow switching on the fly,
+# but why? Pick a driver! You will stilll need to edit a bunch of other
+# config files.
 
-# TO-DO: needs more cleanup, simplify linking using system tools, add 15.0 fixes
-
-ROOT="${ROOT:-/}"
+# When ROOT=<PATH> is specified when using {install,upgrade,remove}pkg,
+# PATH is usually specified without a trailing "/", so we need to add it
+if [ "$ROOT" = "" ]; then
+  ROOT="${ROOT:-"/"}"
+else
+  ROOT="${ROOT}/"
+fi
 CWD=$(pwd)
 COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no)
 LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script
 INC="${ROOT}usr/include/GL"
 LIB="${ROOT}usr/lib${LIBSUFFIX}"
 LIB32="${ROOT}usr/lib"
-XMOD="${LIB}/xorg/modules"
-XLIB="$XMOD/extensions"
-NV_VERSION="PKGVERSION" # This will be replaced in the build script
-GL_VERSION="1.2.0"
-GLVND="yes" # This will be replaced in the build script (yes | no)
 
 save_GL(){
-# backup original mesa and xorg conflicts
+# backup original mesa conflicts
   cd $2
   case "$1" in
     "nvidia")
-      mv libGL.la libGL.la-xorg
-      mv libGL.la-nvidia libGL.la
+      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")
-       mv libGL.la libGL.la-nvidia
-       mv libGL.la-xorg libGL.la
-  ;;
+      mv /var/log/nvidia/$3/* .
+ ;;
 
   *)
         echo "nothing to do for save_gl?"
@@ -66,46 +69,49 @@ save_GL(){
 nvidia_install(){
   echo $'Installing to nvidia-driver files!\n'
   echo "Make sure the nvidia driver is ENABLED in /etc/X11/xorg.conf"
-  echo "and in /etc/X11/xorg.conf.d."
-  echo "Otherwise, this may lead to improperly working drivers."
+  echo "and/or in either /usr/share/X11/xorg.conf.d or"
+  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
 }
 
 nvidia_remove(){
   echo $'Returning to stock xorg files!\n'
-  echo "Make sure the nvidia driver is DISABLED in /usr/share/X11/xorg.conf.d"
-  echo "/etc/X11/xorg.conf and in /etc/X11/xorg.conf.d."
+  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"
 
-  save_GL "xorg" $LIB
-# Check for multilib configuration
-  if [ "$COMPAT32" = "yes" ]; then
-    save_GL "xorg" $LIB32
-  fi
-
-  if [ -e $NV_CONF ]; then
-    echo "You will need to remove/save $NV_CONF from nvidia-driver to use"
-    echo "any open source drivers."
+  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
 }
 
 usage(){
   echo "Usage:"
-  echo " --install    Set up nvidia driver files (do not use!)"
-  echo " --remove     Return to stock xorg files and restore all symlinks"
+  echo " --install    Set up nvidia driver files and update symlinks"
+  echo " --remove     Return to stock xorg files and restore symlinks"
   echo " --help	      Show this help message"
 }
 
 case "$1" in
   "--install")
     nvidia_install
-    
     ;;
   "--remove")
     nvidia_remove
diff --git a/system/nvidia-driver/rc.nvidia-persistenced b/system/nvidia-driver/rc.nvidia-persistenced
new file mode 100644
index 0000000000..59bdf18d11
--- /dev/null
+++ b/system/nvidia-driver/rc.nvidia-persistenced
@@ -0,0 +1,61 @@
+#!/bin/sh -e
+#
+# NVIDIA Persistence Daemon Init Script
+#
+# Copyright (c) 2013 NVIDIA Corporation
+#
+# 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.
+#
+
+NVPD=nvidia-persistenced
+NVPD_BIN=/usr/bin/${NVPD}
+NVPD_RUNTIME=/var/run/${NVPD}
+NVPD_PIDFILE=${NVPD_RUNTIME}/${NVPD}.pid
+NVPD_USER=__USER__
+
+if [ -f ${NVPD_PIDFILE} ]; then
+  read -r NVPD_PID < "${NVPD_PIDFILE}"
+  # Remove stale runtime files
+  if [ "${NVPD_PID}" ] && [ ! -d /proc/${NVPD_PID} ]; then
+    unset NVPD_PID
+    rm -rf "${NVPD_RUNTIME}"
+  fi
+fi
+
+case "${1}" in
+  start)
+      echo "Starting NVIDIA Persistence Daemon"
+
+      # Execute the daemon as the intended user
+      ${NVPD_BIN} --user ${NVPD_USER}
+      ;;
+  stop)
+      echo "Stopping NVIDIA Persistence Daemon"
+
+      # Stop the daemon - its PID should have been read in
+      [ ! -z "${NVPD_PID}" ] && kill ${NVPD_PID} &> /dev/null
+      ;;
+  restart)
+      $0 stop
+      sleep 2
+      $0 start
+      ;;
+  *) echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/system/nvidia-driver/slack-desc b/system/nvidia-driver/slack-desc
index 6781f2468f..165da72937 100644
--- a/system/nvidia-driver/slack-desc
+++ b/system/nvidia-driver/slack-desc
@@ -15,5 +15,5 @@ nvidia-driver:
 nvidia-driver: See /usr/doc/nvidia-driver-PKGVERSION/README.Slackware
 nvidia-driver: for more information.
 nvidia-driver:
-nvidia-driver:
-nvidia-driver:
+nvidia-driver: https://www.nvidia.com
+nvidia-driver: @MULTILIB@
diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README
index 442c313a38..35109efbf0 100644
--- a/system/nvidia-kernel/README
+++ b/system/nvidia-kernel/README
@@ -1,13 +1,15 @@
-This is the kernel-module needed by the proprietary binary nvidia driver.
-You also need the nvidia-driver package from SlackBuilds.org.
+This is the kernel-module needed by the proprietary binary nvidia
+driver.  You also need the nvidia-driver package from SlackBuilds.org.
 
 To build the package for a kernel different from the running one,
 start the script setting the KERNEL variable as in
     KERNEL=4.6.3 ./nvidia-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.
+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, 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.
 
 The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index dd79d755be..f4e42828c0 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -4,6 +4,7 @@
 
 # Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA
+# Updates cpyright 2020 Lenard Spencer, Orlando, FL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +29,7 @@
 # see nvidia-driver/changelog.txt
 
 PRGNAM=nvidia-kernel
-VERSION=${VERSION:-440.64}
+VERSION=${VERSION:-460.67}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -89,10 +90,6 @@ 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-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index fb70f7cc7d..019df6d1da 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-kernel"
-VERSION="440.64"
+VERSION="460.67"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.64/NVIDIA-Linux-x86_64-440.64.run"
-MD5SUM_x86_64="ba746d5b5f50369139bbed47da04aa74"
+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="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy340-driver/README b/system/nvidia-legacy340-driver/README
index 1ed005a5f2..28f6b894ef 100644
--- a/system/nvidia-legacy340-driver/README
+++ b/system/nvidia-legacy340-driver/README
@@ -2,7 +2,7 @@ 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 a
 part of the nvidia-kernel package at SlackBuilds.org.
 
-Installing the 32-bit compatibility libraries is available: if desired, do:
+Installing 32-bit compatibility libraries is available. If desired, do:
   COMPAT32="yes" ./nvidia-driver.SlackBuild
 
 Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
@@ -21,11 +21,11 @@ complex to install/uninstall the driver. However, installation of the
 nvidia-driver package itself backs up the conflicting files and puts the
 nvidia-specific files into place.
 
-Included is a script called nvidia-switch, which is used to switch from the
-xorg driver to the nvidia driver, but it will not edit xorg.conf for you;
-you have to do that manually. The nvidia-switch script is installed to
-/usr/sbin. NOTE: Although nvidia-switch is aware of a COMPAT32 environment,
-its use therein is not supported.
+Included is a script called nvidia-switch, which is used to switch
+from the xorg driver to the nvidia driver, but it will not edit
+xorg.conf for you; you have to do that manually. The nvidia-switch
+script is installed to /usr/sbin. NOTE: Although nvidia-switch is
+aware of a COMPAT32 environment, its use therein is not supported.
 
 Usage of nvidia-switch:
   nvidia-switch --install  <--> install the nvidia files and save the
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
index 0914aaf4f9..82a53144d8 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
@@ -23,4 +23,4 @@ MD5SUM_x86_64="28a7ec013c4ef657d3e9b978e2f653c1\
 	       da1c2d34014a4aa4e66627ba18364779"
 REQUIRES="nvidia-legacy340-kernel"
 MAINTAINER="Mats B. Tegner"
-EMAIL="mats.bertil.tegner@gmail.com"
\ No newline at end of file
+EMAIL="mats.bertil.tegner@gmail.com"
diff --git a/system/nvidia-legacy390-driver/README b/system/nvidia-legacy390-driver/README
index e608bf4c96..56e253398f 100644
--- a/system/nvidia-legacy390-driver/README
+++ b/system/nvidia-legacy390-driver/README
@@ -2,58 +2,71 @@ 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 a part
 of the nvidia-legacy390-kernel package at SlackBuilds.org.
 
-Installing the 32-bit compatibility libraries is available: if desired, do:
+Installing the 32-bit compatibility libraries is available: if desired,
+do:
   COMPAT32="yes" ./nvidia-legacy390-driver.SlackBuild
 
-GLVND GLX client libraries are now the default. If these cause any
-compatibility issues with older GLX sofware, either upgrade your software
-or try:
-  GLVND="no" ./nvidia-legacy390-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
+after removing the driver both packages will have to be reinstalled.
+
+This script now gives the option of installing the nvidia-persistenced
+daemon.  For details see README.nvidia-persistenced.
 
 Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
 nvidia-settings.  Please refer to the Nvidia documentation and 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:
--------------8<---------------
-# Create missing nvidia device nodes after reboot
-/usr/bin/nvidia-modprobe -c 0 -u
-------------->8---------------
+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 for nvidia-persistenced to work
+properly)
 
-Since this nvidia-legacy390-driver conflicts with some files of xorg, it's
-a bit complex to install/uninstall the driver.  However, installation of the
-nvidia-legacy390-driver package itself backs up the conflicting files and puts
-the nvidia-specific files into place.
+    # Create missing nvidia device nodes after reboot
+    /usr/bin/nvidia-modprobe -c 0 -u
 
-Included is a script called nvidia-switch, which is used to switch from
-the xorg driver to the nvidia driver, but it will not edit xorg.conf
-for you; you have to do that manually.  The nvidia-switch script is
-installed to /usr/sbin. NOTE: Although nvidia-switch is aware of a
-COMPAT32 environment, its use therein is not supported.
+Included is a script called nvidia-switch, which is used to switch
+between the xorg and nvidia drivers, but it will not edit xorg.conf for
+you; you have to do that manually.  The nvidia-switch script is
+installed to /usr/sbin.
 
 Usage of nvidia-switch:
-  nvidia-switch --install  <--> install the nvidia files and save the
-                                stock xorg files.
+  nvidia-switch --install  <--> save the stock xorg files and
+                                install the nvidia files and symlinks.
   nvidia-switch --remove   <--> remove the nvidia files and symlinks and
                                 restore the stock xorg files.
 
-You do NOT have to run nvidia-switch after installing the package.
+NOTES:
+Since nvidia-legacy390-driver conflicts with some files of xorg, it's a
+bit complex to install/uninstall the driver.  However, installation of
+the nvidia-legacy390-driver package backs up the conflicting files and
+puts the nvidia-specific files into place by automatically running
+nvidia-switch --install in doinst.sh.
 
-Before uninstalling or upgrading this package, it is important that
+Before uninstalling or upgrading this package, it is IMPORTANT that
 you execute 'nvidia-switch --remove', which will switch back to the
 stock xorg files and remove all links created by nvidia-switch during
 installation. If you forget to do this, you might have to do the switch
 manually, since 'nvidia-switch --install' may fail, resulting in xorg
-not working. Here are the affected files:
+not working. Here are the affected files (and their packages):
 
-  /usr/lib[64]/libGL.so.1.2
-  /usr/lib[64]/libGL.la
-  /usr/lib[64]/libGLESv1_CM.so.1.0.0
-  /usr/lib[64]/libGLESv2.so.2.0.0
-  /usr/lib[64]/libEGL.so.1.0.0
-  /usr/lib[64]/xorg/modules/libwfb.so
-  /usr/lib[64]/xorg/modules/extensions/libglx.so
+  /usr/lib[64]/libGL.so.1.2 (mesa)
+  /usr/lib[64]/libGL.la (mesa)
+  /usr/lib[64]/libGLESv1_CM.so.1.0.0 (mesa)
+  /usr/lib[64]/libGLESv2.so.2.0.0 (mesa)
+  /usr/lib[64]/libEGL.so.1.0.0 (mesa)
+  /usr/lib[64]/xorg/modules/libwfb.so (xorg-server)
+  /usr/lib[64]/xorg/modules/extensions/libglx.so (xorg-server)
 
 Simply remove the dead nvidia symlinks and and reinstall the mesa and
-xorg-server packages. See 'nvidia-switch --help'.
+xorg-server packages.  (In current, if libglx.so is a dead symlink,
+it MUST be removed before reinstalling xorg-server.)
+
diff --git a/system/nvidia-legacy390-driver/README.nvidia-persistenced b/system/nvidia-legacy390-driver/README.nvidia-persistenced
new file mode 100644
index 0000000000..38e8937cde
--- /dev/null
+++ b/system/nvidia-legacy390-driver/README.nvidia-persistenced
@@ -0,0 +1,32 @@
+The NVIDIA Persistence Daemon is a userspace daemon on Linux to support
+persistence of driver state across Cuda job runs.  The daemon targets all
+current Tesla, Quadro and GRID GPUs.  For further information, see
+
+https://docs.nvidia.com/deploy/driver-persistence/index.html
+
+The driver now includes rc.nvidia-persistenced as an option.  While it can
+be run as root, it is more secure to run it as an unpriveleged user, so we
+run it as user nvidia.
+
+To install it, Pass PERSISTENCED=yes to the script.  It will create the
+user and group nvidia, and install rc.nvidia-persistenced to /etc/rc.d.
+
+To activate the daemon, add the following to /etc/rc.d/local:
+
+# Start the nvidia-persistenced daemon:
+if  [ -x /etc/rc.d/rc.nvidia-persistenced ]; then
+    /etc/rc.d/rc.nvidia-persistenced start
+fi
+
+and then 'chmod +x /etc/rc.d/rc.nvidia-persistenced' to make it executable.
+
+Add the following to /etc/rc.d/rc.local_shutdown:
+
+# Stop the nvidia-persistenced daemon:
+if  [ -x /etc/rc.d/rc.nvidia-persistenced ]; then
+    /etc/rc.d/rc.nvidia-persistenced stop
+fi
+
+NOTE: This may not work on all systems.  If you encounter problems
+with it, just 'chmod -x /etc/rc.d/rc.persistenced' and it will no
+longer load.  YMMV.
diff --git a/system/nvidia-legacy390-driver/changelog.txt b/system/nvidia-legacy390-driver/changelog.txt
deleted file mode 100644
index b964866875..0000000000
--- a/system/nvidia-legacy390-driver/changelog.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-1.0     20-MAR-2011 New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-1.1     10-APR-2011 updated to new version, testing 13.37rc4.6692
-1.2     27-MAY-2011 new version, allow multilib option, minor edits
-1.2.1   20-JUN-2011 minor edits, thanks to Robby and Roberto
-1.5     01-JUL-2011 new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
-1.6     27-AUG-2011 version bump, minor edits
-1.7     21-OCT-2011 version bump
-1.8     24-MAR-2012 version bump, fix to nvidia-switch thanks to Phill W.
-1.9     02-AUG-2012 version bmp, fixes, updates, nvidia-switch for install/uninstall only
-2.0     21-AUG-2012 new version (important security fix), missing vdpau-nvidia, dropped *.h
-2.1     25-AUG-2012 new version -Long Lived Branch, fixed symlinks (per Das email)
-2.2     22-NOV-2012 new version -Long Lived Branch. Updates: libs, apps
-2.3     15-FEB-2013 new version -Long Lived Branch.
-2.4     19-MAY-2013 new version -Long Lived Branch.
-2.6     20-OCT-2013 new version -Long Lived Branch, add new lib, fix nvidia-switch --remove
-3.0     13-NOV-2013 new version (LLB), update libs
-3.1     12-APR-2014 new version (LLB), update libs
-3.2a	12-JUL-2014 new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm
-3.3     20-NOV-2014 new version (LLB), update libs, fix nvidia-switch
-3.4     11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES
-4.0     07-FEB-2015 new long lived branch, version update, bug fixes
-4.1     27-APR-2015 version update LLB, fix $VERSION usage
-4.2     28-JUL-2015 version update LLB, bug fixes, clean-ups.
-4.3     05-SEP-2015 version update LLB
-4.4     13-DEC-2015 version update, X.Org 1.18 support
-4.5     12-MAR-2016 version update LLB, symlink fixes, drop nvidia-installer, get ready for 14.2
-4.5a    26-MAR-2016 fixed broken symlinks
-4.6     24-APR-2016 version update LLB, fix symlinks, added to version if multilib
-4.7	31-APR-2016 version update LLB, added nvidia-installer, updated libs/symlinks
-5.0	20-FEB-2017 version update LLB, security fixes, updated libs/symlinks, nvidia-switch
-5.1     01-APR-2017 fix nvidia-switch lib names to prevent bad ldconfig symlinks on reboot
-5.2	02-JUN-2017 version update LLB, refactor/debug scripts, use nvidia-installer
-5.3	13-OCT-2017 version update LLB, bug fixes, update copyright
-5.4     18-FEB-2018 version update LLB, updates, bug fix (thanks Leo)
-5.5	25-MAR-2018 version update LLB
-5.6     23-APR-2018 version update LLB, update symlinks, fix changelog formatting
-5.7     28-MAY-2018 version update LLB
-5.8     30-JUL-2018 version update LLB
-5.9	06-SEP-2018 version update LLB
-6.0	09-NOV-2019 renamed to nvidia-legacy390; last version to support 32-bit CPU.
-6.1	26-FEB-2019 version update LLB; compatibility with recent kernels
-6.2	15-AUG-2019 version update LLB
-6.3     22-Feb-2020 version update LLB, minor edits
-
diff --git a/system/nvidia-legacy390-driver/doinst.sh b/system/nvidia-legacy390-driver/doinst.sh
index 8ee62f049e..e0d49fcf75 100644
--- a/system/nvidia-legacy390-driver/doinst.sh
+++ b/system/nvidia-legacy390-driver/doinst.sh
@@ -2,5 +2,5 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications
 fi
 
-./usr/sbin/nvidia-switch --install
+usr/sbin/nvidia-switch --install
 
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
index 8ceef4ab81..b984a32580 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for nvidia-legacy390-driver
 
 # Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2020 Lenard Spencer, Orlando, FL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,12 +26,11 @@
 # see changelog.txt
 
 PRGNAM=nvidia-legacy390-driver
-VERSION=${VERSION:-390.132}
+VERSION=${VERSION:-390.141}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-GLVND=${GLVND:-yes}
-# libglnvd may land in mesa and is Nvidia recommended
+CURRENT=${CURRENT:-no}
 
 set -e
 
@@ -69,6 +69,13 @@ else
   COMPAT32=no
 fi
 
+# Abort if an Nvidia driver is still installed:
+if [ -x /usr/bin/nvidia-installer ]; then
+  echo -e "\n A previous Nvidia installation has been detected!"
+  echo -e " Please remove the installed driver and rerun this script.\n"
+  exit 1
+fi
+
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
 
 # make a clean package directory tree
@@ -76,14 +83,11 @@ rm -rf $PKG
 rm -rf $TMP/$SRCNAM
 mkdir -p $TMP $PKG $OUTPUT $PKG/install
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
-  $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1,sbin} \
+  $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1} \
   $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \
   $PKG/usr/include/GL $PKG/etc/vulkan/icd.d $PKG/etc/X11/xorg.conf.d \
-  $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64} \
+  $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log
 
-if [ "$COMPAT32" = "yes" ]; then
-  mkdir -p $PKG/usr/lib/tls
-fi
 
 # Extract all the sources
 cd $TMP
@@ -95,8 +99,6 @@ rm -rf nvidia-xconfig-$VERSION
 tar xvf $CWD/nvidia-xconfig-$VERSION.tar.bz2
 rm -rf nvidia-modprobe-$VERSION.tar.bz2
 tar xvf $CWD/nvidia-modprobe-$VERSION.tar.bz2
-rm -rf nvidia-persistenced-$VERSION.tar.bz2
-tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2
 sh $CWD/$SRCNAM.run --extract-only
 cd $SRCNAM
 chown -R root:root .
@@ -106,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
@@ -125,22 +127,18 @@ 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
-
-# Configure options
-if [ "$GLVND" = "yes" ]; then
-  GLVNDOPT="--install-libglvnd --glvnd-glx-client --glvnd-egl-client"
-else
-  GLVNDOPT="--no-install-libglvnd --no-glvnd-glx-client --no-glvnd-egl-client"
+  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"
-    MULTI="_multi"
+    MULTI="_multilib"
+    mkdir $PKG/usr/lib
 else
     if [ ! "$ARCH" = "x86_64" ]; then
         COMP32=""
@@ -152,6 +150,7 @@ fi
 
 # Install the binary libs using nvidia-installer compiled above
 cd $TMP/$SRCNAM
+
 ./nvidia-installer -s --no-kernel-module --no-drm --no-unified-memory \
   -z -n -b --no-rpms --no-distro-scripts \
   --no-kernel-module-source --no-x-check --force-libglx-indirect \
@@ -168,17 +167,19 @@ cd $TMP/$SRCNAM
   --log-file-name=$PKG/var/log/nvidia-installer.log \
   --egl-external-platform-config-path=$PKG/usr/share/egl/egl_external_platform.d \
   --no-nvidia-modprobe \
-  $GLVNDOPT \
   $COMP32
 
-# Clean-up: we really do not need this:
-rm -rf /var/lib/nvidia
-# which 32-bit tls? why? why?
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-      install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/libnvidia-tls.so.$VERSION
-      cd $PKG/usr/lib
-          ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
-      cd -
+# Move ICDs to $PKG and cleanup (no switch option in installer?)
+mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd
+mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json
+# In current, mesa now puts an entry into this directory, so we
+# leave it alone if it is not empty
+if [ -z "$(ls -A /etc/OpenCL/vendors)" ]; then
+  rm -rf /etc/OpenCL
+fi
+# just in case any other programs make an entry here
+if [ -z "$(ls -A /etc/vulkan)" ]; then
+  rm -rf /etc/vulkan
 fi
 
 # Compile utilites from source, replacing the precompiled versions
@@ -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/
@@ -240,36 +241,24 @@ cd -
       -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
     CFLAGS="$SLKCFLAGS" make
-
-    install -m 755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/
+# must be installed suid root for nvidia-persistenced to work properly
+    install -m 4755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/
     install -m 644 _out/Linux_$TARGET/nvidia-modprobe.1.gz $PKG/usr/man/man1/
   cd -
 
-# Compiling nvidia-persistenced
-  cd $TMP/nvidia-persistenced-$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" make
-#FIXME: need rc.nvidia-persistenced script; see doc
-    install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
-    install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
-  cd -
-
 # Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files
 # so we don't stomp on the overlapping xorg files.
 # Note: switching can be problematic ;-)
+mkdir -p $PKG/usr/sbin
 install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/
 sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch
 sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch
-if [ "$GLVND" = "yes" ]; then
+if [ "$CURRENT" = "no" ]; then
   sed -i s/GLVNDFLAG/yes/g $PKG/usr/sbin/nvidia-switch
+  sed -i s/GLVERSION/1.2.0/g $PKG/usr/sbin/nvidia-switch
 else
   sed -i s/GLVNDFLAG/no/g $PKG/usr/sbin/nvidia-switch
+  sed -i s/GLVERSION/1.7.0/g $PKG/usr/sbin/nvidia-switch  
 fi
 if [ ${COMPAT32} = "yes" ]; then
   sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch
@@ -278,41 +267,26 @@ else
 fi
 
 # These add or correct wrong paths
-sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
-sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
+if [ "$CURRENT" = "no" ]; then
+  sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
+  sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
+
+  if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+    sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la
+    sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la
+    sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la
+  fi
+fi
 sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop
 sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop
 sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
 
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-  sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la
-  sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la
-  sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la
-fi
-
 # rename wrong/conficting files as needed; remove conflicting symlinks created by installer
 cd $PKG/usr/lib$LIBDIRSUFFIX
-   if [ "$GLVND" = "yes" ]; then
+   if [ "$CURRENT" = "no" ]; then
       mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia
-   fi
-   mv libGL.la libGL.la-nvidia
-   mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia
-   mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia
-   rm -f libEGL.so
-   rm -f libGL.so
-   rm -f libGL.so.1
-   rm -f libGLESv1_CM.so
-   rm -f libGLESv2.so
-   rm -f xorg/modules/libwfb.so
-   rm -f xorg/modules/extensions/libglx.so
-cd -
-
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-   cd $PKG/usr/lib
-         if [ "$GLVND" = "yes" ]; then
-            mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia
-         fi
       mv libGL.la libGL.la-nvidia
+      mv libGL.so.1.7.0 libGL.so.1.7.0-nvidia
       mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia
       mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia
       rm -f libEGL.so
@@ -320,24 +294,50 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
       rm -f libGL.so.1
       rm -f libGLESv1_CM.so
       rm -f libGLESv2.so
+   else
+      rm libGL.la
+      rm libOpenCL.so.1.0.0
+   fi
+   rm -f xorg/modules/libwfb.so
+   if [ -e xorg/modules/extensions/libglx.so ]; then
+      (cd xorg/modules/extensions
+        rm libglx.so
+      )
+   fi
+cd -
+
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+   cd $PKG/usr/lib
+         if [ "$CURRENT" = "no" ]; then
+            mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia
+            mv libGL.la libGL.la-nvidia
+            mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia
+            mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia
+            rm -f libEGL.so
+            rm -f libGL.so
+            rm -f libGL.so.1
+            rm -f libGLESv1_CM.so
+            rm -f libGLESv2.so
+         else
+            rm libGL.la
+            rm libOpenCL.so.1.0.0
+         fi
    cd -
-# FIXME With COMPAT32=yes on pure x86_64, a weird /usr/lib/libGL.so.1 symlink to $PKG/usr/lib64/libGL.so.1
-# appears? Who would do this, so ignoring for now.
+# FIXME With COMPAT32=yes on pure x86_64, a weird /usr/lib/libGL.so.1
+# symlink to $PKG/usr/lib64/libGL.so.1 appears? Who would do this,
+# so ignoring for now.
 fi
 
-# Move ICDs to $PKG and cleanup (no switch option in installer?)
-mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd
-mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json
-rm -rf /etc/OpenCL
-rm -rf /etc/vulkan
-
-# Remove xorg conf file since we take care of that in nvidia-legacy390-driver
+# Remove xorg conf file since we handle that in nvidia-legacy390-kernel
 rm -rf $PKG/etc/X11/xorg.conf.d
 
-cat <<EOF > $PKG/var/log/nvidia/README.txt
+if [ "$CURRENT" = "no" ]; then
+  mkdir -p $PKG/var/log/nvidia/{32,64}
+  cat <<EOF > $PKG/var/log/nvidia/README.txt
 Do NOT delete this directory!
 nvidia-switch will backup the original X.org libraries here.
 EOF
+fi
 
 cd $TMP/$SRCNAM
 # put docs in the right place
@@ -347,11 +347,63 @@ mv $PKG/usr/share/doc/NVIDIA_GLX-1.0 $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc
 cp -a LICENSE NVIDIA_Changelog README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
+cp $CWD/README.nvidia-persistenced $PKG/usr/doc/$PRGNAM-$VERSION
 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 compatibility libraries.|" $PKG/install/slack-desc
+else
+   sed -i "s|@MULTILIB@||" $PKG/install/slack-desc
+fi
+
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Flag install as multlib as needed and build package.
+# Add rc.nvidia-persistenced:
+if [ "${PERSISTENCED:-no}" = "yes" ]; then
+  cd $TMP
+  rm -rf nvidia-persistenced-$VERSION.tar.bz2
+  tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2
+# Compiling nvidia-persistenced
+  cd $TMP/nvidia-persistenced-$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" make
+  install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
+  install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
+
+  if ! getent group nvidia > /dev/null 2>&1; then
+    echo "Creating the group nvidia:"
+    groupadd -g 365 nvidia || exit 1
+  fi
+  if ! getent passwd nvidia > /dev/null 2>&1; then
+    echo "Creating the user nvidia:"
+    useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1
+  fi
+  mkdir -p $PKG/var/run/nvidia-persistenced
+  chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
+  mkdir -p $PKG/etc/rc.d
+  install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced
+  sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced
+  cat <<EOF >> $PKG/install/doinst.sh
+# Create group and user nvidia if they don't already exist
+if ! getent group nvidia > /dev/null 2>&1; then
+  echo "Creating the group nvidia:"
+  groupadd -g 365 nvidia || exit 1
+fi
+if ! getent passwd nvidia > /dev/null 2>&1; then
+  echo "Creating the user nvidia:"
+  useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1
+fi
+
+EOF
+fi
+
+# Flag multlib as needed and build package.
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
index 46482a95a2..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.132"
+VERSION="390.141"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run \
-          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.132.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.132.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.132.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.132.tar.bz2"
-MD5SUM="2677480ee20cd4918b1de9289b2d0af8 \
-        1f9b5ef3fb9329cf8f1b3b1880f11aa0 \
-	37a8bf0de34b9769e9c97ee1cc70f5dd \
-	9d506bcdf40fe794673dfc7c48064759 \
-	45e7cc0e1717fb23c675f11607a2d756 \
-	4d6bb6e058282d7da8673953c9755e38"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.132.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.132.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.132.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.132.tar.bz2"
-MD5SUM_x86_64="c6a37fc418ede54ad63fdf5c96f54958 \
-               1f9b5ef3fb9329cf8f1b3b1880f11aa0 \
-               37a8bf0de34b9769e9c97ee1cc70f5dd \
-               9d506bcdf40fe794673dfc7c48064759 \
-               45e7cc0e1717fb23c675f11607a2d756 \
-               4d6bb6e058282d7da8673953c9755e38"
+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="unmaintained"
-EMAIL=""
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy390-driver/nvidia-switch b/system/nvidia-legacy390-driver/nvidia-switch
index 9ae63aedca..2f57366cfd 100644
--- a/system/nvidia-legacy390-driver/nvidia-switch
+++ b/system/nvidia-legacy390-driver/nvidia-switch
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA
+# Updates copyright 2020 Lenard Spencer, Orlando, FL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,15 +21,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# nvidia-switch utility 4.0
+# nvidia-switch utility 4.0.1
 #
-# A tool to install and cleanly remove the nvidia driver without stomping on the xorg files.
-# Note: this tool "should" allow switching on the fly, but why? Pick a driver! You will still
-# need to edit a bunch of other config files.
+# A tool to install and cleanly remove the nvidia driver without
+# stomping on the xorg files.  Note: this tool "should" allow switching
+# on the fly, but why? Pick a driver! You will still need to edit a bunch
+#of other config files.
 
 # TO-DO: needs more cleanup, simplify linking using system tools
 
-ROOT="${ROOT:-/}"
+
+# When ROOT=<PATH> is specified when using {install,upgrade,remove}pkg,
+# PATH is usually specified without a trailing "/", so we add one here
+if [ "$ROOT" = "" ]; then
+  ROOT="${ROOT:-"/"}"
+else 
+  ROOT="${ROOT}/"
+fi
 CWD=$(pwd)
 COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no)
 LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script
@@ -38,9 +47,8 @@ LIB32="${ROOT}usr/lib"
 XMOD="${LIB}/xorg/modules"
 XLIB="$XMOD/extensions"
 NV_VERSION="PKGVERSION" # This will be replaced in the build script
-GL_VERSION="1.2.0"
+GL_VERSION="GLVERSION"
 GLVND="GLVNDFLAG" # This will be replaced in the build script (yes | no)
-NV_CONF="${ROOT}usr/share/X11/xorg.conf.d/10-nvidia.conf"
 SAVELIBS="${ROOT}var/log/nvidia"
 
 save_GL(){
@@ -57,54 +65,39 @@ save_GL(){
   case "$1" in
     "nvidia")
 
-      mv libGL.so.$GL_VERSION $SAVELIBS/libGL.so.$GL_VERSION
-      mv libGL.la $SAVELIBS/libGL.la
-      mv libEGL.so.1.0.0 $SAVELIBS/libEGL.so.1.0.0
-      mv libGLESv1_CM.so.1.1.0 $SAVELIBS/libGLESv1_CM.so.1.1.0
-      mv libGLESv2.so.2.0.0 $SAVELIBS/libGLESv2.so.2.0.0
-      mv libGL.la-nvidia libGL.la
-
       if [ "$GLVND" = "yes" ]; then
-        ln -sf libGL.so.1.7.0 libGL.so.1
-	ln -sf libGL.so.1.7.0 libGL.so
+        mv libGL.so.$GL_VERSION $SAVELIBS
+        mv libGL.la $SAVELIBS
+        mv libEGL.so.1.?.0 $SAVELIBS
+        mv libGLESv1_CM.so.1.1.0 $SAVELIBS
+        mv libGLESv2.so.2.0.0 $SAVELIBS
+        mv libGL.la-nvidia libGL.la
+        ln -sf libGL.so.1.7.0-nvidia libGL.so.1
+        ln -sf libGL.so.1 libGL.so
         ln -sf libEGL.so.1.1.0-nvidia libEGL.so.1.1.0
-	ln -sf libEGL.so.1.1.0-nvidia libEGL.so
-      else
-        ln -sf libGL.so.$NV_VERSION libGL.so.1
-        ln -sf libGL.so.$NV_VERSION libGL.so
-        ln -sf libEGL.so.$NV_VERSION libEGL.so.1
-        ln -sf libEGL.so.$NV_VERSION libEGL.so
+        ln -sf libEGL.so.1 libEGL.so
+        ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.libGLESv1_CM.so.1
+        ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so
+        ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2
+        ln -sf libGLESv2.so.2 libGLESv2.so
       fi
-
-      ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1.2.0
-      ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1
-      ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so
-
-      ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2.1.0
-      ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2
-      ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so
     ;;
 
     "xorg")
-       mv libGL.la libGL.la-nvidia
-       mv $SAVELIBS/libGL.so.$GL_VERSION libGL.so.$GL_VERSION
-       mv $SAVELIBS/libGL.la libGL.la
-       mv $SAVELIBS/libEGL.so.1.0.0 libEGL.so.1.0.0
-       mv $SAVELIBS/libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0
-       mv $SAVELIBS/libGLESv2.so.2.0.0 libGLESv2.so.2.0.0
-
-       ln -sf libGL.so.$GL_VERSION libGL.so.1
-       ln -sf libGL.so.$GL_VERSION libGL.so
-       ln -sf libEGL.so.1.0.0 libEGL.so.1
-       ln -sf libEGL.so.1.0.0 libEGL.so
-       rm -f libEGL.so.1.1.0
-
-       ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1
-       ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so
-       ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
-       ln -sf libGLESv2.so.2.0.0 libGLESv2.so
-       rm -f libGLESv1_CM.so.1.2.0
-       rm -f libGLESv2.so.2.1.0
+       if [ -e libGL.la ]; then
+          mv libGL.la libGL.la-nvidia
+       fi
+       if [ "$GLVND" = "yes" ]; then
+          mv $SAVELIBS/* .
+          ln -sf libGL.so.$GL_VERSION libGL.so.1
+          ln -sf libGL.so.1 libGL.so
+          ln -sf libEGL.so.1.0.0 libEGL.so.1
+          ln -sf libEGL.so.1 libEGL.so
+          ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1
+          ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so
+          ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
+          ln -sf libGLESv2.so.2.0.0 libGLESv2.so
+       fi
   ;;
 
   *)
@@ -120,17 +113,24 @@ save_glx(){
   case "$1" in
       "nvidia")
         if [ -e libglx.so ]; then
-          mv libglx.so xorg-libglx.so
+          cp -a libglx.so libglx.so-xorg
         fi
 	  ln -sf libglx.so.$NV_VERSION libglx.so
       ;;
       "xorg")
-        if [ -e xorg-libglx.so ]; then
+        if [ -e libglx.so-xorg ]; then
           rm -f libglx.so
-          mv xorg-libglx.so libglx.so
+          mv libglx.so-xorg libglx.so
         else
-          rm -f libglx.so
-        fi
+          if [ ! -e libglx.so ]; then
+            echo -e "WARNING: libglx.so not found! Please reinstall xorg-server!\n"
+          else
+            if [ -L libglx.so ]; then
+              rm libglx.so
+              echo -e "WARNING: removed dead symlink libglx.so!  Please reinstall xorg-server!\n"
+            fi
+          fi
+         fi
       ;;
         *)
           echo "nothing to do for save_glx?"
@@ -142,18 +142,12 @@ save_glx(){
 
 save_wfb(){
   cd "$XMOD"
-  if [ -e libwfb.so ]; then
-    echo "Using existing Xorg libwfb..."
-  else
-    if [ "$1" = "nvidia" ]; then
-	ln -sf libwfb.so.$NV_VERSION libwfb.so.1
-	ln -sf libwfb.so.1 libwfb.so
+   if [ "$1" = "nvidia" ]; then
+	ln -sf libnvidia-wfb.so.$NV_VERSION libnvidia-wfb.so.1
     fi
     if [ "$1" = "xorg" ]; then
-	rm -f libwfb.so
-	rm -f libwfb.so.1
+	rm -f libnvidia-wfb.so.1
     fi
-  fi
   cd "$CWD"
 }
 
@@ -162,10 +156,10 @@ nvidia_install(){
      echo "Creating missing $SAVELIB ..."
      mkdir -p $SAVELIBS
   fi
-  echo $'Installing to nvidia-legacy390-driver files!\n'
+  echo $'Installing to nvidia-legacy390-driver files:\n'
   echo "Make sure the nvidia driver is ENABLED in /etc/X11/xorg.conf"
-  echo "and in /etc/X11/xorg.conf.d."
-  echo "Otherwise, this may lead to improperly working drivers."
+  echo "and in /etc/X11/xorg.conf.d.  Otherwise, this may lead to"
+  echo -e "improperly working drivers.\n"
 
   save_glx "nvidia"
   save_GL "nvidia" $LIB
@@ -177,11 +171,13 @@ nvidia_install(){
 }
 
 nvidia_remove(){
-  echo $'Returning to stock xorg files!\n'
+  echo $'Returning to stock xorg files:\n'
   echo "Make sure the nvidia driver is DISABLED in /usr/share/X11/xorg.conf.d"
   echo "/etc/X11/xorg.conf and in /etc/X11/xorg.conf.d."
-  echo "Otherwise, this may lead to improperly working drivers."
-
+  echo -e "Otherwise, this may lead to improperly working drivers.\n"
+  if [ "$GLVND" = "yes" ]; then
+    echo -e "Be sure to run /sbin/ldconfig after removing nvidia-legacy390-driver.\n"
+  fi
   save_glx "xorg"
   save_GL "xorg" $LIB
   save_wfb "xorg"
@@ -190,63 +186,14 @@ nvidia_remove(){
   if [ "$COMPAT32" = "yes" ]; then
     save_GL "xorg" $LIB32
   fi
-
-  if [ -e $NV_CONF ]; then
-    echo "removing $NV_CONF: you will need to provide your own"
-    echo "or reinstall nvidia-legacy390-driver."
-    rm -f $NV_CONF
-  fi
 }
 
-restore(){
-# Attempt to reinstall damaged stock packages if something went wrong.
-# Obviously, you will need to run this after '--remove' and after
-# 'removepkg nvidia-legacy390-driver'.
-# User must:
-# 1. remove any dangling symlinks and xorg-*, *-nvidia files in /usr/lib*/,
-#    and any other housekeeping tasks.
-# 2. copy stock Slackware packages to /root/Slackware or provide an alternate location
-# 3. be running Slackware-14.2, not current
-# 4. realize that COMPAT32 is not stable ;-)
-
 if [ "$LIBSUFFIX" = "64" ]; then
   ARCH="x86_64"
 else
   ARCH="x86"
 fi
 
-PKGPATH=${PKGPATH:-/root/Slackware}
-MESA="mesa-11.2.2-$ARCH-1.txz"
-MESA32="mesa-compat32-11.2.2-$ARCH-1compat32.txz"
-XORG="xorg-server-1.18.3-$ARCH-2.txz"
-# Note: The above is for stock 14.2; modify as needed for /patches or
-# multilib updates
-if [ -d $PKGPATH ]; then
-  if [ `find $PKGPATH -prune -empty -type d` ]; then
-    echo "Your $PKGPATH is empty!"
-  else
-    upgradepkg --reinstall --install-new $MESA $XORG
-    if [ "COMPAT32" = "yes" ]; then
-      upgradepkg --reinstall --install-new $MESA32
-    fi
-  fi
-else
-  echo "Please create $PKGPATH containing the appropriate packages"
-fi
-}
-
-usage(){
-  echo "Usage:"
-  echo " --install    Set up nvidia driver files"
-  echo " --remove     Return to stock xorg files and restore all symlinks"
-  echo " --restore    Reinstall stock Mesa and xorg-server [EXPERIMENTAL]"
-  echo "              mesa-11.2.2, org-server-1.18.3, and optionally"
-  echo "              mesa-compat32-11.2.2 are expected in /root/Slackware"
-  echo "              Use 'PKGPATH=\"<location>\" nvidia-switch --restore'"
-  echo "              to override."
-  echo " --help	      Show this help message"
-}
-
 case "$1" in
   "--install")
     nvidia_install
@@ -254,9 +201,6 @@ case "$1" in
   "--remove")
     nvidia_remove
     ;;
-  "--restore")
-    restore
-    ;;
   "--help")
     usage
     ;;
diff --git a/system/nvidia-legacy390-driver/rc.nvidia-persistenced b/system/nvidia-legacy390-driver/rc.nvidia-persistenced
new file mode 100644
index 0000000000..59bdf18d11
--- /dev/null
+++ b/system/nvidia-legacy390-driver/rc.nvidia-persistenced
@@ -0,0 +1,61 @@
+#!/bin/sh -e
+#
+# NVIDIA Persistence Daemon Init Script
+#
+# Copyright (c) 2013 NVIDIA Corporation
+#
+# 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.
+#
+
+NVPD=nvidia-persistenced
+NVPD_BIN=/usr/bin/${NVPD}
+NVPD_RUNTIME=/var/run/${NVPD}
+NVPD_PIDFILE=${NVPD_RUNTIME}/${NVPD}.pid
+NVPD_USER=__USER__
+
+if [ -f ${NVPD_PIDFILE} ]; then
+  read -r NVPD_PID < "${NVPD_PIDFILE}"
+  # Remove stale runtime files
+  if [ "${NVPD_PID}" ] && [ ! -d /proc/${NVPD_PID} ]; then
+    unset NVPD_PID
+    rm -rf "${NVPD_RUNTIME}"
+  fi
+fi
+
+case "${1}" in
+  start)
+      echo "Starting NVIDIA Persistence Daemon"
+
+      # Execute the daemon as the intended user
+      ${NVPD_BIN} --user ${NVPD_USER}
+      ;;
+  stop)
+      echo "Stopping NVIDIA Persistence Daemon"
+
+      # Stop the daemon - its PID should have been read in
+      [ ! -z "${NVPD_PID}" ] && kill ${NVPD_PID} &> /dev/null
+      ;;
+  restart)
+      $0 stop
+      sleep 2
+      $0 start
+      ;;
+  *) echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/system/nvidia-legacy390-driver/slack-desc b/system/nvidia-legacy390-driver/slack-desc
index af1addf510..74666d37f0 100644
--- a/system/nvidia-legacy390-driver/slack-desc
+++ b/system/nvidia-legacy390-driver/slack-desc
@@ -15,5 +15,5 @@ nvidia-legacy390-driver:
 nvidia-legacy390-driver: See /usr/doc/nvidia-legacy390-driver-PKGVERSION/README.Slackware
 nvidia-legacy390-driver: for more information.
 nvidia-legacy390-driver:
-nvidia-legacy390-driver:
+nvidia-legacy390-driver: @MULTILIB@
 nvidia-legacy390-driver:
diff --git a/system/nvidia-legacy390-kernel/README b/system/nvidia-legacy390-kernel/README
index ab0d4a748f..adb7c9d3fd 100644
--- a/system/nvidia-legacy390-kernel/README
+++ b/system/nvidia-legacy390-kernel/README
@@ -1,13 +1,18 @@
-This is the kernel-module needed by the proprietary binary nvidia driver.
-You also need the nvidia-legacy390-driver package from SlackBuilds.org.
+This is the kernel-module needed by the proprietary binary nvidia
+driver.  You also need the nvidia-legacy390-driver package from
+SlackBuilds.org.
 
 To build the package for a kernel different from the running one,
 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.
+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, 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 6640ff06c3..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.132}
+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
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
index d74dee4746..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.132"
+VERSION="390.141"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run"
-MD5SUM="2677480ee20cd4918b1de9289b2d0af8"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run"
-MD5SUM_x86_64="c6a37fc418ede54ad63fdf5c96f54958"
+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="unmaintained"
-EMAIL=""
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmai.com"
diff --git a/system/nvme-cli/nvme-cli.SlackBuild b/system/nvme-cli/nvme-cli.SlackBuild
index 6d31d66899..e8980f65af 100644
--- a/system/nvme-cli/nvme-cli.SlackBuild
+++ b/system/nvme-cli/nvme-cli.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nvme-cli
-VERSION=${VERSION:-1.10.1}
+VERSION=${VERSION:-1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,8 +65,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 CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr
-make install DESTDIR=$PKG PREFIX=/usr SBINDIR=/usr/sbin
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin
+make install CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr SBINDIR=/usr/sbin DESTDIR=$PKG
+
+rm -f $PKG/etc/nvme/*
+rm -r $PKG/etc/udev
+rm -r $PKG/usr/lib/{dracut,systemd}
+rmdir --ignore-fail-on-non-empty $PKG/usr/lib
 
 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
@@ -76,14 +82,13 @@ mv $PKG/usr/share/bash-completion/completions/nvme $PKG/etc/bash_completion.d/nv
 rmdir $PKG/usr/share/bash-completion/completions/
 rmdir $PKG/usr/share/bash-completion/
 
-mv $PKG/usr/share/man $PKG/usr/
-rmdir --ignore-fail-on-non-empty $PKG/usr/share/
+mv $PKG/usr/share/man $PKG/usr/man
 
 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/completions
-cp -a CONTRIBUTING.md README.md LICENSE scripts $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING* README* LICENSE* scripts $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a completions/{README,_nvme} $PKG/usr/doc/$PRGNAM-$VERSION/completions
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/nvme-cli/nvme-cli.info b/system/nvme-cli/nvme-cli.info
index d923c65821..b5ecb010b2 100644
--- a/system/nvme-cli/nvme-cli.info
+++ b/system/nvme-cli/nvme-cli.info
@@ -1,8 +1,8 @@
 PRGNAM="nvme-cli"
-VERSION="1.10.1"
+VERSION="1.13"
 HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.10.1/nvme-cli-1.10.1.tar.gz"
-MD5SUM="47b42d4be2f80fcf0dbedac3b81c8dec"
+DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.13/nvme-cli-1.13.tar.gz"
+MD5SUM="a9a326d481fa7bd68cb03bfc5c5e7f44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/oksh/oksh.SlackBuild b/system/oksh/oksh.SlackBuild
index c58224a0c8..b1b8988316 100644
--- a/system/oksh/oksh.SlackBuild
+++ b/system/oksh/oksh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for oksh
 
-# Copyright 2019 Hunter Sezen California, USA
+# Copyright 2019-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=oksh
-VERSION=${VERSION:-6.6}
+VERSION=${VERSION:-6.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,7 +71,8 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/ \
+  --prefix=/usr \
+  --bindir=/bin \
   --mandir=/usr/man
 
 make
diff --git a/system/oksh/oksh.info b/system/oksh/oksh.info
index c207136a71..ca37cc9ba1 100644
--- a/system/oksh/oksh.info
+++ b/system/oksh/oksh.info
@@ -1,8 +1,8 @@
 PRGNAM="oksh"
-VERSION="6.6"
+VERSION="6.8.1"
 HOMEPAGE="https://github.com/ibara/oksh"
-DOWNLOAD="https://github.com/ibara/oksh/releases/download/oksh-6.6/oksh-6.6.tar.gz"
-MD5SUM="d583dfa0f9e4076714ec22a69f138cfd"
+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 c2cb8aa693..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-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
@@ -26,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openmpi
-VERSION=${VERSION:-4.0.2}
+VERSION=${VERSION:-4.1.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
diff --git a/system/openmpi/openmpi.info b/system/openmpi/openmpi.info
index 2b93a2c52f..827dbf8fcd 100644
--- a/system/openmpi/openmpi.info
+++ b/system/openmpi/openmpi.info
@@ -1,8 +1,8 @@
 PRGNAM="openmpi"
-VERSION="4.0.2"
+VERSION="4.1.0"
 HOMEPAGE="https://www.open-mpi.org/"
-DOWNLOAD="https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.2.tar.bz2"
-MD5SUM="2fdfb4d31cfe1363d8bb5e7488e57cdf"
+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/README b/system/openstego/README
index 5f5c99ed88..0879579ef1 100644
--- a/system/openstego/README
+++ b/system/openstego/README
@@ -1,6 +1,7 @@
 openstego (the free steganography solution)
 
-Note: openstego doesn't work with openjdk.
+Note: openstego works with openjdk8, if you prefer not to install the
+Oracle jdk. It does NOT work with openjdk7 or older.
 
 OpenStego is a tool implemented in Java for generic steganography,
 with support for password-based encryption of the data.
diff --git a/system/openstego/openstego.SlackBuild b/system/openstego/openstego.SlackBuild
index 1bdad7e1dd..e45c80a3e4 100644
--- a/system/openstego/openstego.SlackBuild
+++ b/system/openstego/openstego.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.
 
+# 20210221 bkw: update for v0.8.0.
+
+# 20200708 bkw:
+# - Update for v0.7.4.
+# - Add README note about openjdk8.
+
 # 20180802 bkw:
 # - Take over maintenance.
 # - Update for v0.7.3.
@@ -30,7 +36,7 @@
 #   openstego.sh. This matches upstream's recommendation.
 
 PRGNAM=openstego
-VERSION=${VERSION:-0.7.3}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/openstego/openstego.info b/system/openstego/openstego.info
index 4827e4dd5b..61928e0238 100644
--- a/system/openstego/openstego.info
+++ b/system/openstego/openstego.info
@@ -1,8 +1,8 @@
 PRGNAM="openstego"
-VERSION="0.7.3"
+VERSION="0.8.0"
 HOMEPAGE="https://www.openstego.com/"
-DOWNLOAD="https://github.com/syvaidya/openstego/releases/download/openstego-0.7.3/openstego-0.7.3.zip"
-MD5SUM="65e6acca0faab0774c7b8a6433859c2e"
+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/osinfo-db-tools/osinfo-db-tools.SlackBuild b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
index 9fb7bbf9d1..e929584590 100644
--- a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
+++ b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for osinfo-db-tools
 
-# Copyright 2016-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2020 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=osinfo-db-tools
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="CONTRIBUTING.md COPYING NEWS README"
 
 set -e
 
@@ -71,19 +71,21 @@ 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" \
-./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
+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
+  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
diff --git a/system/osinfo-db-tools/osinfo-db-tools.info b/system/osinfo-db-tools/osinfo-db-tools.info
index 906b8fceca..ca3b2013a9 100644
--- a/system/osinfo-db-tools/osinfo-db-tools.info
+++ b/system/osinfo-db-tools/osinfo-db-tools.info
@@ -1,10 +1,10 @@
 PRGNAM="osinfo-db-tools"
-VERSION="1.6.0"
+VERSION="1.8.0"
 HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.6.0.tar.gz"
-MD5SUM="edfb599f960161d348c67f3261627136"
+DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.8.0.tar.xz"
+MD5SUM="4a9c1cd3871e1809b44bdb8511cfe2d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="json-glib"
+REQUIRES="json-glib meson"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/osinfo-db/osinfo-db.SlackBuild b/system/osinfo-db/osinfo-db.SlackBuild
index 0e69ab1779..9acaaa242c 100644
--- a/system/osinfo-db/osinfo-db.SlackBuild
+++ b/system/osinfo-db/osinfo-db.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for osinfo-db
 
-# Copyright 2016-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2020 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=osinfo-db
-VERSION=${VERSION:-20190805}
+VERSION=${VERSION:-20200813}
 SLVERSION=${SLVERSION:-20190702}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/osinfo-db/osinfo-db.info b/system/osinfo-db/osinfo-db.info
index 6efe44a4c1..9d327df7ee 100644
--- a/system/osinfo-db/osinfo-db.info
+++ b/system/osinfo-db/osinfo-db.info
@@ -1,9 +1,9 @@
 PRGNAM="osinfo-db"
-VERSION="20190805"
+VERSION="20200813"
 HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20190805.tar.xz \
+DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20200813.tar.xz \
           http://ponce.cc/slackware/sources/repo/osinfo-db-slackware-20190702.tar.xz"
-MD5SUM="ecf25fea17d7db2e4281ae52e4a36b94 \
+MD5SUM="da055fc0c589a672f926c346367e218a \
         988b651d5f600eaa42cc1da91c7d765c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/osquery-bin/README b/system/osquery-bin/README
new file mode 100644
index 0000000000..3e8850a5bf
--- /dev/null
+++ b/system/osquery-bin/README
@@ -0,0 +1,4 @@
+osquery - an operating system instrumentation framework
+
+Osquery uses basic SQL commands to leverage a relational data-model to
+describe a device.
diff --git a/system/osquery-bin/doinst.sh b/system/osquery-bin/doinst.sh
new file mode 100644
index 0000000000..67b687ee90
--- /dev/null
+++ b/system/osquery-bin/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
+    rm $NEW
+  fi
+}
+
+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.osqueryd.new
diff --git a/system/osquery-bin/osquery-bin.SlackBuild b/system/osquery-bin/osquery-bin.SlackBuild
new file mode 100644
index 0000000000..a91e4ae2ff
--- /dev/null
+++ b/system/osquery-bin/osquery-bin.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for osquery-bin
+
+# Copyright 2019-2021 Andrew Clemons, Wellington New Zealand
+# 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=osquery-bin
+SRCNAM=${PRGNAM%-bin}
+VERSION=${VERSION:-4.7.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 $PKG
+
+if [ "$ARCH" = "x86_64" ]; then
+  tar xvf $CWD/$SRCNAM-$VERSION"_1.linux_x86_64.tar.gz"
+else
+  printf "$ARCH is not supported...\n"
+  exit 1
+fi
+
+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 .scripts
+
+mkdir etc/rc.d
+mv etc/init.d/osqueryd etc/rc.d/rc.osqueryd.new
+rm -rf etc/init.d
+
+mv usr/local/* usr/
+rm -rf usr/lib usr/local
+
+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/system/osquery-bin/osquery-bin.info b/system/osquery-bin/osquery-bin.info
new file mode 100644
index 0000000000..057c9aa043
--- /dev/null
+++ b/system/osquery-bin/osquery-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="osquery-bin"
+VERSION="4.7.0"
+HOMEPAGE="https://osquery.io/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+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/osquery-bin/slack-desc b/system/osquery-bin/slack-desc
new file mode 100644
index 0000000000..cc16ca601f
--- /dev/null
+++ b/system/osquery-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------------------------------------------------------|
+osquery-bin: osquery-bin (an operating system instrumentation framework)
+osquery-bin:
+osquery-bin: osquery is an operating system instrumentation framework
+osquery-bin:
+osquery-bin: https://osquery.io/
+osquery-bin:
+osquery-bin:
+osquery-bin:
+osquery-bin:
+osquery-bin:
+osquery-bin:
diff --git a/system/ossec-agent/ossec-agent.SlackBuild b/system/ossec-agent/ossec-agent.SlackBuild
index fa24c687ef..6d5963a33e 100644
--- a/system/ossec-agent/ossec-agent.SlackBuild
+++ b/system/ossec-agent/ossec-agent.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ossec-agent
 
-# Copyright 2016  Mario Preksavec, Zagreb, Croatia
+# Copyright 2016, 2020  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Special thanks to Jason Graham for patches and testing
+
 PRGNAM=ossec-agent
 VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
diff --git a/system/ossec-local/ossec-local.SlackBuild b/system/ossec-local/ossec-local.SlackBuild
index 5001c1db23..cd43e82965 100644
--- a/system/ossec-local/ossec-local.SlackBuild
+++ b/system/ossec-local/ossec-local.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ossec-local
 
-# Copyright 2016  Mario Preksavec, Zagreb, Croatia
+# Copyright 2016, 2020  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Special thanks to Jason Graham for patches and testing
+
 PRGNAM=ossec-local
 VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
diff --git a/system/ossec-server/ossec-server.SlackBuild b/system/ossec-server/ossec-server.SlackBuild
index ebf61ea349..31c9994ab8 100644
--- a/system/ossec-server/ossec-server.SlackBuild
+++ b/system/ossec-server/ossec-server.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ossec-server
 
-# Copyright 2016  Mario Preksavec, Zagreb, Croatia
+# Copyright 2016, 2020  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Special thanks to Jason Graham for patches and testing
+
 PRGNAM=ossec-server
 VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
diff --git a/system/otf2bdf/otf2bdf.info b/system/otf2bdf/otf2bdf.info
index bac247eb9b..eecb7c1950 100644
--- a/system/otf2bdf/otf2bdf.info
+++ b/system/otf2bdf/otf2bdf.info
@@ -1,7 +1,7 @@
 PRGNAM="otf2bdf"
 VERSION="3.1"
 HOMEPAGE="http://web.archive.org/web/20171026195930/https://www.math.nmsu.edu/~mleisher/Software/otf2bdf/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/otf2bdf-3.1.tbz2"
+DOWNLOAD="https://slackware.uk/~urchlay/src/otf2bdf-3.1.tbz2"
 MD5SUM="6af09173615f1dd5ae294bbf67ac52c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/pacemaker/pacemaker.SlackBuild b/system/pacemaker/pacemaker.SlackBuild
index b9135b0be0..b7a01dcfc1 100644
--- a/system/pacemaker/pacemaker.SlackBuild
+++ b/system/pacemaker/pacemaker.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for pacemaker
 
-# Copyright 2018 Pierre-Philipp Braun, Russia
+# Copyright 2018  Pierre-Philipp Braun, Russia
+# Copyright 2020  Mario Preksavec, Zagreb, Croatia
 # 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=pacemaker
-VERSION=${VERSION:-2.0.0_rc5}
+VERSION=${VERSION:-2.0.3}
 TARVER="Pacemaker-$(echo $VERSION | tr _ -)"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/pacemaker/pacemaker.info b/system/pacemaker/pacemaker.info
index dc306399be..4ab60618b5 100644
--- a/system/pacemaker/pacemaker.info
+++ b/system/pacemaker/pacemaker.info
@@ -1,10 +1,10 @@
 PRGNAM="pacemaker"
-VERSION="2.0.0_rc5"
+VERSION="2.0.3"
 HOMEPAGE="https://wiki.clusterlabs.org/wiki/Pacemaker"
-DOWNLOAD="https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-2.0.0-rc5/pacemaker-Pacemaker-2.0.0-rc5.tar.gz"
-MD5SUM="5064b505bb7d7b644991374b05f1e278"
+DOWNLOAD="https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-2.0.3/pacemaker-Pacemaker-2.0.3.tar.gz"
+MD5SUM="4fee89ca3485f3bf27689ad9bd1670cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="corosync"
-MAINTAINER="Pierre-Philipp Braun"
-EMAIL="pbraun@nethence.com"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild
index 7ffc2f6552..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:-20170622}
+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 f8ab2f619c..b9f5ef28f2 100644
--- a/system/parallel/parallel.info
+++ b/system/parallel/parallel.info
@@ -1,10 +1,12 @@
 PRGNAM="parallel"
-VERSION="20170622"
+VERSION="20210122"
 HOMEPAGE="http://www.gnu.org/software/parallel/"
-DOWNLOAD="http://gnu.uberglobalmirror.com/parallel/parallel-20170622.tar.bz2"
-MD5SUM="8494ff022451aac0162f18cf3dd3ae7f"
+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/pass-otp/README b/system/pass-otp/README
new file mode 100644
index 0000000000..40939c0745
--- /dev/null
+++ b/system/pass-otp/README
@@ -0,0 +1,2 @@
+pass-otp is a pass extension for managing one-time-password (OTP)
+tokens.
diff --git a/system/pass-otp/pass-otp.SlackBuild b/system/pass-otp/pass-otp.SlackBuild
new file mode 100644
index 0000000000..bf7e2c60c6
--- /dev/null
+++ b/system/pass-otp/pass-otp.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Slackware build script for pass-otp
+
+# 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=pass-otp
+VERSION=${VERSION:-1.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=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man/man1 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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE CHANGELOG.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/pass-otp/pass-otp.info b/system/pass-otp/pass-otp.info
new file mode 100644
index 0000000000..f0170768eb
--- /dev/null
+++ b/system/pass-otp/pass-otp.info
@@ -0,0 +1,10 @@
+PRGNAM="pass-otp"
+VERSION="1.2.0"
+HOMEPAGE="https://github.com/tadfisher/pass-otp"
+DOWNLOAD="https://github.com/tadfisher/pass-otp/releases/download/v1.2.0/pass-otp-1.2.0.tar.gz"
+MD5SUM="20cfa80273813294014577fead8714ca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="password-store qrencode oath-toolkit"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/system/pass-otp/slack-desc b/system/pass-otp/slack-desc
new file mode 100644
index 0000000000..c0694a4d42
--- /dev/null
+++ b/system/pass-otp/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------------------------------------------------------|
+pass-otp: pass-otp (Manage OTP tokens)
+pass-otp:
+pass-otp: A pass extension for managing one-time-password (OTP) tokens.
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp:
+pass-otp: https://github.com/tadfisher/pass-otp
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 e655224b2e..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.09.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 c1b699b5a7..52e1c70c0b 100644
--- a/system/passwordsafe/passwordsafe.info
+++ b/system/passwordsafe/passwordsafe.info
@@ -1,10 +1,10 @@
 PRGNAM="passwordsafe"
-VERSION="1.09.0"
+VERSION="1.13.0"
 HOMEPAGE="https://pwsafe.org"
-DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.09.0/pwsafe-1.09.0.tar.gz"
-MD5SUM="a17ffef0f96e9413255dbab780579dd3"
+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/pcf2bdf/README b/system/pcf2bdf/README
new file mode 100644
index 0000000000..d7871d3a39
--- /dev/null
+++ b/system/pcf2bdf/README
@@ -0,0 +1,5 @@
+pcf2bdf (convert X fonts from PCF to BDF)
+
+Pcf2bdf is a font de-compiler. It converts X fonts from Portable Compiled
+Format (PCF) to Bitmap Distribution Format (BDF). It can also accept a
+compressed/gzipped PCF file as input.
diff --git a/system/pcf2bdf/pcf2bdf.SlackBuild b/system/pcf2bdf/pcf2bdf.SlackBuild
new file mode 100644
index 0000000000..7dc231f4a0
--- /dev/null
+++ b/system/pcf2bdf/pcf2bdf.SlackBuild
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# Slackware build script for pcf2bdf
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=pcf2bdf
+VERSION=${VERSION:-1.06}
+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 -f Makefile.gcc all install \
+  CXXFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  MANPATH=/usr/man/man1 \
+  INSTALL_PROGRAM="install -s" \
+  DESTDIR=$PKG
+
+gzip $PKG/usr/man/man?/*.?
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.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/pcf2bdf/pcf2bdf.info b/system/pcf2bdf/pcf2bdf.info
new file mode 100644
index 0000000000..43243ad4b4
--- /dev/null
+++ b/system/pcf2bdf/pcf2bdf.info
@@ -0,0 +1,10 @@
+PRGNAM="pcf2bdf"
+VERSION="1.06"
+HOMEPAGE="https://github.com/ganaware/pcf2bdf/"
+DOWNLOAD="https://github.com/ganaware/pcf2bdf/archive/1.06/pcf2bdf-1.06.tar.gz"
+MD5SUM="7cbdf32d1df7b084dc9549c8ba5f916c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/pcf2bdf/slack-desc b/system/pcf2bdf/slack-desc
new file mode 100644
index 0000000000..0547163b9d
--- /dev/null
+++ b/system/pcf2bdf/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------------------------------------------------------|
+pcf2bdf: pcf2bdf (convert X fonts from PCF to BDF)
+pcf2bdf:
+pcf2bdf: Pcf2bdf is a font de-compiler. It converts X fonts from Portable
+pcf2bdf: Compiled Format (PCF) to Bitmap Distribution Format (BDF). It can
+pcf2bdf: also accept a compressed/gzipped PCF file as input.
+pcf2bdf:
+pcf2bdf:
+pcf2bdf:
+pcf2bdf:
+pcf2bdf:
+pcf2bdf:
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/ph/README b/system/ph/README
new file mode 100644
index 0000000000..0b8c1894a3
--- /dev/null
+++ b/system/ph/README
@@ -0,0 +1,6 @@
+ph - a fast Slackware Package History tool
+
+[ROOT=/mnt] ph [options] [-][NUM]
+
+ph prints a filtered list of the packages installed in a Slackware
+system, using the package description files in /var/log/packages/.
diff --git a/system/ph/ph.SlackBuild b/system/ph/ph.SlackBuild
new file mode 100644
index 0000000000..5d2ffe6077
--- /dev/null
+++ b/system/ph/ph.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# Slackware build script for ph
+#
+# Copyright 2013 Dave Woodfall <dave@tty1.uk>
+# 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=ph
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+README=$PKG/usr/doc/$PRGNAM-$VERSION/README
+
+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/@VERSION@/$VERSION/" ph.1
+gzip ph.1
+install -m 644 -D ph.1.gz $PKG/usr/man/man1/ph.1.gz
+install -m 755 -D ph $PKG/usr/bin/ph
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
+cat << EOF > $README
+ph - a fast Slackware Package History tool
+Copyright 2013- Dave Woodfall
+ph is licensed under a "one-clause BSD/Slackware" license.
+See the script for the full text.
+Homepage: http://tty1.uk/slackbuilds/noversion/ph
+EOF
+
+man ./ph.1.gz | col -b | expand | fmt -72 | cat -s | sed "
+    1d
+    s/\([^[:space:]]\)[[:space:]][[:space:]]*/\1 /g
+    /^$/N;/PH(1)$/D
+    " >> $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/system/ph/ph.info b/system/ph/ph.info
new file mode 100644
index 0000000000..25ee1ce7fc
--- /dev/null
+++ b/system/ph/ph.info
@@ -0,0 +1,10 @@
+PRGNAM="ph"
+VERSION="1.1.0"
+HOMEPAGE="http://tty1.uk/slackbuilds/noversion/ph"
+DOWNLOAD="http://git.tty1.uk/cgit.cgi/ph/snapshot/ph-1.1.0.tar.gz"
+MD5SUM="916cad4a723485a54d4213e5dc46ad7f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/system/ph/slack-desc b/system/ph/slack-desc
new file mode 100644
index 0000000000..8275eb17ac
--- /dev/null
+++ b/system/ph/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------------------------------------------------------|
+ph: ph (A fast Slackware Package History tool)
+ph:
+ph: ph prints a filtered list of the packages installed in a Slackware
+ph: system, using the package description files in /var/log/packages/.
+ph:
+ph: HOMEPAGE="http://tty1.uk/slackbuilds/noversion/ph"
+ph:
+ph:
+ph:
+ph:
+ph:
diff --git a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
index 5d83928740..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:-9.4.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 66cbef6ce6..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="9.4.1"
+VERSION="10.2.2"
 HOMEPAGE="https://phoronix-test-suite.com/"
-DOWNLOAD="https://www.phoronix-test-suite.com/releases/phoronix-test-suite-9.4.1.tar.gz"
-MD5SUM="7dc8f085701122f031516e03c439d347"
+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/podman/podman.SlackBuild b/system/podman/podman.SlackBuild
index 0513860b8c..7a727b07f3 100644
--- a/system/podman/podman.SlackBuild
+++ b/system/podman/podman.SlackBuild
@@ -67,7 +67,7 @@ rm -rf $REPONAME-$VERSION
 mkdir -p $REPONAME-$VERSION/src/$DOMAIN/$ORG
 cd $REPONAME-$VERSION/src/$DOMAIN/$ORG
 tar xvf $CWD/$REPONAME-$VERSION.tar.gz
-mv $REPONAME-$VERSION $REPONAME
+mv $PRGNAM-$VERSION $REPONAME
 cd $REPONAME
 chown -R root:root .
 find -L . \
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/posh/posh.SlackBuild b/system/posh/posh.SlackBuild
index fee476fe28..62f1c8dcd6 100644
--- a/system/posh/posh.SlackBuild
+++ b/system/posh/posh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for posh
 
-# Copyright 2017-2019 Hunter Sezen California, USA
+# Copyright 2017-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=posh
-VERSION=${VERSION:-0.13.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.14.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/system/posh/posh.info b/system/posh/posh.info
index 408fe5a053..5867da639a 100644
--- a/system/posh/posh.info
+++ b/system/posh/posh.info
@@ -1,8 +1,8 @@
 PRGNAM="posh"
-VERSION="0.13.2"
+VERSION="0.14.1"
 HOMEPAGE="https://packages.qa.debian.org/p/posh.html"
-DOWNLOAD="http://http.debian.net/debian/pool/main/p/posh/posh_0.13.2.tar.xz"
-MD5SUM="d4e4bd477bc68d78442f9967faab2406"
+DOWNLOAD="http://http.debian.net/debian/pool/main/p/posh/posh_0.14.1.tar.xz"
+MD5SUM="71f482c9a8815f209abf6ac134543bc9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/powerpanel/powerpanel.SlackBuild b/system/powerpanel/powerpanel.SlackBuild
index 02f3c3b86f..ae11ec630c 100644
--- a/system/powerpanel/powerpanel.SlackBuild
+++ b/system/powerpanel/powerpanel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for powerpanel
 
-# Copyright 2017  Jason Graham Baltimore, MD, USA
+# Copyright 2017,2020  Jason Graham <jgraham@compukix.net> MD, USA
 # 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=powerpanel
-VERSION=${VERSION:-1.3.2}
-PKGVER=${VERSION//./}
+VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -37,9 +36,9 @@ if [ -z "$ARCH" ]; then
 fi
 
 if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
-  PKGARCH=i386
+  PKGARCH=32
 elif [ "$ARCH" = "x86_64" ]; then
-  PKGARCH=x86_64
+  PKGARCH=64
 else
   printf "$ARCH is not supported.\n"; exit 1
 fi
@@ -55,7 +54,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$PKGVER-$PKGARCH.tar.gz
+tar xvf $CWD/PPL-$VERSION-${PKGARCH}bit.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/powerpanel/powerpanel.info b/system/powerpanel/powerpanel.info
index 6405578e56..15ba1327e1 100644
--- a/system/powerpanel/powerpanel.info
+++ b/system/powerpanel/powerpanel.info
@@ -1,10 +1,10 @@
 PRGNAM="powerpanel"
-VERSION="1.3.2"
+VERSION="1.3.3"
 HOMEPAGE="https://www.cyberpowersystems.com/products/software/power-panel-personal/"
-DOWNLOAD="https://dl4jz3rbrsfum.cloudfront.net/software/powerpanel-132-i386.tar.gz"
-MD5SUM="833f35179a8b0ca303698de08f048c8b"
-DOWNLOAD_x86_64="https://dl4jz3rbrsfum.cloudfront.net/software/powerpanel-132-x86_64.tar.gz"
-MD5SUM_x86_64="d69233e117f92611931cb820bad141df"
+DOWNLOAD="https://dl4jz3rbrsfum.cloudfront.net/software/PPL-1.3.3-32bit.tar.gz"
+MD5SUM="56a53554cbf523617c447f426521bf75"
+DOWNLOAD_x86_64="https://dl4jz3rbrsfum.cloudfront.net/software/PPL-1.3.3-64bit.tar.gz"
+MD5SUM_x86_64="d0af21f2e3f654a4813701932bb2fd2e"
 REQUIRES=""
 MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/system/powershell/README b/system/powershell/README
index e02a8b77e6..b78bb03596 100644
--- a/system/powershell/README
+++ b/system/powershell/README
@@ -1,5 +1,7 @@
 PowerShell is a task-based command-line shell and scripting language
 built on .NET. PowerShell helps system administrators and power-users
-rapidly automate tasks that manage operating systems (Linux, macOS, and Windows) and processes.
+rapidly automate tasks that manage operating systems (Linux, macOS, and
+Windows) and processes.
 
-After installing, you can start using PowerShell by typing "pwsh" in the Terminal.
+After installing, you can start using PowerShell by typing "pwsh" in the
+Terminal.
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 388deccfeb..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.0}
+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 b5bcb3ccfd..9e7c9aaa3f 100644
--- a/system/powershell/powershell.info
+++ b/system/powershell/powershell.info
@@ -1,10 +1,10 @@
 PRGNAM="powershell"
-VERSION="7.0.0"
+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.0/powershell-7.0.0-linux-x64.tar.gz"
-MD5SUM_x86_64="74eb89209645f20d2acbb92423c6e864"
+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/powershell/slack-desc b/system/powershell/slack-desc
index 49afa85822..88ee249010 100644
--- a/system/powershell/slack-desc
+++ b/system/powershell/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-powershell: powershell (A task-based command-line shell and scripting language) 
+powershell: powershell (A task-based command-line shell and scripting language)
 powershell:
 powershell: PowerShell is a task-based command-line shell and scripting language
-powershell: built on .NET. PowerShell helps system administrators and power-users 
+powershell: built on .NET. PowerShell helps system administrators and power-users
 powershell: rapidly automate tasks that manage operating systems (Linux, macOS,
 powershell: and Windows) and processes.
-powershell: PowerShell base source code is now available in GitHub 
+powershell: PowerShell base source code is now available in GitHub
 powershell: and open to community contributions.
 powershell:
 powershell: https://www.microsoft.com/powershell/
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 17b83f765f..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:-2.6.6}
+VERSION=${VERSION:-4.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/pspg/pspg.info b/system/pspg/pspg.info
index 2becdb4efa..8316fa3959 100644
--- a/system/pspg/pspg.info
+++ b/system/pspg/pspg.info
@@ -1,8 +1,8 @@
 PRGNAM="pspg"
-VERSION="2.6.6"
+VERSION="4.5.0"
 HOMEPAGE="https://github.com/okbob/pspg"
-DOWNLOAD="https://github.com/okbob/pspg/archive/2.6.6/pspg-2.6.6.tar.gz"
-MD5SUM="1f7082c9d72dc2d1388c4cac0e47823e"
+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/psuinfo/README b/system/psuinfo/README
new file mode 100644
index 0000000000..ebf249ba33
--- /dev/null
+++ b/system/psuinfo/README
@@ -0,0 +1,5 @@
+A Python3 psutil-based command to display customizable system usage
+info as icons or text. Intended for Tint2 panel executors, may also
+be used in other panels or executed in terminal.
+
+Note: required package psutil must have been built with Python3 support
diff --git a/system/psuinfo/psuinfo.SlackBuild b/system/psuinfo/psuinfo.SlackBuild
new file mode 100644
index 0000000000..23cb95e2fb
--- /dev/null
+++ b/system/psuinfo/psuinfo.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Slackware build script for psuinfo
+
+# Copyright 2020 Leonardo Citrolo, Italy
+# 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=psuinfo
+VERSION=${VERSION:-1.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 {} \;
+
+mkdir -p $PKG/usr/bin
+cp -a $PRGNAM $PKG/usr/bin
+
+mkdir -p $PKG/usr/share/$PRGNAM
+cp -a icons/* $PKG/usr/share/$PRGNAM
+
+mkdir -p $PKG/usr/share/tint2
+cp -a configs/* $PKG/usr/share/tint2
+
+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/system/psuinfo/psuinfo.info b/system/psuinfo/psuinfo.info
new file mode 100644
index 0000000000..54fcce6768
--- /dev/null
+++ b/system/psuinfo/psuinfo.info
@@ -0,0 +1,10 @@
+PRGNAM="psuinfo"
+VERSION="1.1"
+HOMEPAGE="https://github.com/nwg-piotr/psuinfo"
+DOWNLOAD="https://github.com/nwg-piotr/psuinfo/archive/v1.1/psuinfo-1.1.tar.gz"
+MD5SUM="ddbcfab6a6a9111fe3ea9e57186e9833"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="psutil python3"
+MAINTAINER="Leo C."
+EMAIL="leoc@gmx.com"
diff --git a/system/psuinfo/slack-desc b/system/psuinfo/slack-desc
new file mode 100644
index 0000000000..503c9b2bd5
--- /dev/null
+++ b/system/psuinfo/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------------------------------------------------------|
+psuinfo: psuinfo (Custom system usage info for Tint2 panel executors or CLI)
+psuinfo:
+psuinfo: A Python3 psutil-based command to display customizable system usage
+psuinfo: info as icons or text. Intended for Tint2 panel executors, may also
+psuinfo: be used in other panels or executed in terminal.
+psuinfo:
+psuinfo:
+psuinfo:
+psuinfo:
+psuinfo: Homepage: https://github.com/nwg-piotr/psuinfo
+psuinfo:
diff --git a/system/pucrunch/pucrunch.info b/system/pucrunch/pucrunch.info
index a6f3e16bc0..d7adcce7e5 100644
--- a/system/pucrunch/pucrunch.info
+++ b/system/pucrunch/pucrunch.info
@@ -1,7 +1,7 @@
 PRGNAM="pucrunch"
 VERSION="20081122"
 HOMEPAGE="http://a1bert.kapsi.fi/Dev/pucrunch/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/pucrunch-20081122.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/pucrunch-20081122.tar.xz"
 MD5SUM="dbc3e129a9d963e96f34a3495307aeff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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 46a3515c18..9046b5f8fa 100644
--- a/system/rEFInd/rEFInd.SlackBuild
+++ b/system/rEFInd/rEFInd.SlackBuild
@@ -23,7 +23,7 @@
 
 PRGNAM=rEFInd
 SRCNAME=refind
-VERSION=${VERSION:-0.11.5}
+VERSION=${VERSION:-0.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/rEFInd/rEFInd.info b/system/rEFInd/rEFInd.info
index ac361b52c7..d4bded634f 100644
--- a/system/rEFInd/rEFInd.info
+++ b/system/rEFInd/rEFInd.info
@@ -1,8 +1,8 @@
 PRGNAM="rEFInd"
-VERSION="0.11.5"
+VERSION="0.13.1"
 HOMEPAGE="http://www.rodsbooks.com/refind/index.html"
-DOWNLOAD="https://sourceforge.net/projects/refind/files/0.11.5/refind-src-0.11.5.tar.gz"
-MD5SUM="4af6e5f0274d23d5583d97b53789a1ac"
+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/README b/system/refind/README
index c84f46eaf9..5a347d4823 100644
--- a/system/refind/README
+++ b/system/refind/README
@@ -14,3 +14,5 @@ the pre-build binary then convert to Slackware's.
 
 This package is optionally depends on python3 if you want to run the
 refind-mkdefault script, otherwise you don't need python3.
+
+There is an another Sbo script "rEFInd", which builds from source.
diff --git a/system/refind/refind.SlackBuild b/system/refind/refind.SlackBuild
index 35273bdec1..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.11.5}
+VERSION=${VERSION:-0.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/refind/refind.info b/system/refind/refind.info
index 10afe67a0c..bc3c09e94d 100644
--- a/system/refind/refind.info
+++ b/system/refind/refind.info
@@ -1,8 +1,8 @@
 PRGNAM="refind"
-VERSION="0.11.5"
-HOMEPAGE="http://www.rodsbooks.com/refind/index.html"
-DOWNLOAD="http://sourceforge.net/projects/refind/files/0.11.5/refind-bin-0.11.5.zip"
-MD5SUM="f6c3a3ab85011a9e023339b540985f60"
+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/reiser4progs/reiser4progs.SlackBuild b/system/reiser4progs/reiser4progs.SlackBuild
index 1728c00da4..32714ac9b5 100644
--- a/system/reiser4progs/reiser4progs.SlackBuild
+++ b/system/reiser4progs/reiser4progs.SlackBuild
@@ -2,11 +2,9 @@
 
 # Slackware build script for reiser4progs
 
-# Written by Kurt Erickson <kurt_erickson@att.net>
-
 PRGNAM=reiser4progs
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -81,7 +79,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 AUTHORS BUGS COPYING CREDITS CUSTOM_INSTALL_README ChangeLog \
-  INSTALL INSTALL_README README THANKS TODO \
+  INSTALL INSTALL_README NEWS README THANKS TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/reiser4progs/reiser4progs.info b/system/reiser4progs/reiser4progs.info
index 65ab962b31..6ce1610ece 100644
--- a/system/reiser4progs/reiser4progs.info
+++ b/system/reiser4progs/reiser4progs.info
@@ -1,10 +1,10 @@
 PRGNAM="reiser4progs"
-VERSION="1.1.0"
+VERSION="1.2.1"
 HOMEPAGE="https://sourceforge.net/projects/reiser4/"
-DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/reiser4progs-1.1.0.tar.gz"
-MD5SUM="4abfda040a0ef152bc2f42152e247a5e"
+DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/reiser4progs-1.2.1.tar.gz"
+MD5SUM="5c3af8644a4ab291fd59ccff6539a1ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libaal"
-MAINTAINER="Kurt Erickson"
-EMAIL="kerickson@lavabit.com"
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
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/resource-agents/README b/system/resource-agents/README
index 5e29e87044..1a3187e18b 100644
--- a/system/resource-agents/README
+++ b/system/resource-agents/README
@@ -2,8 +2,8 @@ resource-agents (cluster service executables)
 
 Combined repository of OCF agents from the RHCS and Linux-HA projects
 
-You might also want to install corosync, pacemaker, resource-agents, crmsh,
-fence-agents and eventually cluster-glue.
+You might also want to install cluster-glue, heartbeat, resource-agents,
+fence-agents.
 
 Define OCF_ROOT and eventually OCF_RESKEY_<param> if you need to test the
 resource executables manually.
diff --git a/system/resource-agents/resource-agents.SlackBuild b/system/resource-agents/resource-agents.SlackBuild
index 2755856326..e25b48105e 100644
--- a/system/resource-agents/resource-agents.SlackBuild
+++ b/system/resource-agents/resource-agents.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=resource-agents
-VERSION=${VERSION:-4.1.1}
+VERSION=${VERSION:-4.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -94,7 +94,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 \
-  AUTHORS COPYING COPYING.GPLv3 COPYING.LGPL ChangeLog README \
+  AUTHORS COPYING COPYING.GPLv3 COPYING.LGPL ChangeLog NEWS README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/resource-agents/resource-agents.info b/system/resource-agents/resource-agents.info
index f926462310..1d1d04d0cf 100644
--- a/system/resource-agents/resource-agents.info
+++ b/system/resource-agents/resource-agents.info
@@ -1,8 +1,8 @@
 PRGNAM="resource-agents"
-VERSION="4.1.1"
+VERSION="4.5.0"
 HOMEPAGE="https://github.com/ClusterLabs/resource-agents"
-DOWNLOAD="https://github.com/ClusterLabs/resource-agents/archive/v4.1.1/resource-agents-4.1.1.tar.gz"
-MD5SUM="82e3a335f942347f1b7c27b9f8e8e984"
+DOWNLOAD="https://github.com/ClusterLabs/resource-agents/archive/v4.5.0/resource-agents-4.5.0.tar.gz"
+MD5SUM="265fd01a2b4119b7b733c829c4c36d32"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/resource-agents/slack-desc b/system/resource-agents/slack-desc
index 8912e4fd0a..375e8809f5 100644
--- a/system/resource-agents/slack-desc
+++ b/system/resource-agents/slack-desc
@@ -10,8 +10,8 @@ resource-agents: resource-agents (cluster service executables)
 resource-agents:
 resource-agents: Combined repository of OCF agents from the RHCS and Linux-HA projects
 resource-agents:
-resource-agents: You might also want to install corosync, pacemaker, resource-agents,
-resource-agents: crmsh, fence-agents and eventually cluster-glue.
+resource-agents: You might also want to install cluster-glue, heartbeat,
+resource-agents: resource-agents, fence-agents.
 resource-agents:
 resource-agents:
 resource-agents:
diff --git a/system/restic/README b/system/restic/README
new file mode 100644
index 0000000000..8aaf2e13bc
--- /dev/null
+++ b/system/restic/README
@@ -0,0 +1,5 @@
+restic (Modern backup program to backup your files)
+
+restic is a backup program that is fast, efficient and secure. It
+supports the three major operating systems (Linux, macOS, Windows) and
+a few smaller ones (FreeBSD, OpenBSD).
diff --git a/system/restic/restic.SlackBuild b/system/restic/restic.SlackBuild
new file mode 100644
index 0000000000..18a06b43b7
--- /dev/null
+++ b/system/restic/restic.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for restic
+
+# 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=restic
+VERSION=${VERSION:-0.12.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}
+
+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
+bzip2 -ckd $CWD/${PRGNAM}_${VERSION}_linux_${BINARCH}.bz2 > $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 {} \;
+
+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/system/restic/restic.info b/system/restic/restic.info
new file mode 100644
index 0000000000..2a720df865
--- /dev/null
+++ b/system/restic/restic.info
@@ -0,0 +1,10 @@
+PRGNAM="restic"
+VERSION="0.12.0"
+HOMEPAGE="https://restic.net/"
+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="slackbuilds@dscp.org"
diff --git a/system/restic/slack-desc b/system/restic/slack-desc
new file mode 100644
index 0000000000..b0125b8a08
--- /dev/null
+++ b/system/restic/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------------------------------------------------------|
+restic: restic (Modern backup program to backup your files)
+restic:
+restic: restic is a backup program that is fast, efficient and secure. It
+restic: supports the three major operating systems (Linux, macOS, Windows) and
+restic: a few smaller ones (FreeBSD, OpenBSD).
+restic:
+restic: Home-Page: https://restic.net/
+restic:
+restic:
+restic:
+restic:
diff --git a/system/rhash/rhash.SlackBuild b/system/rhash/rhash.SlackBuild
index c095120f80..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.3.9}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,10 +81,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
-mv RHash-$VERSION $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf RHash-$VERSION
+tar xvf $CWD/RHash-$VERSION.tar.gz
+cd RHash-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -100,9 +97,6 @@ if [ "$STATICLIB" = "yes" ]; then
   echo "+=============================+"
 fi
 
-# Patch the uk.po file. Complains about 'msgid' and 'msgstr' mismatch
-sed -i -e "s/msgstr \"Оновити вказаний хеш-файл\"/msgstr \"Оновити вказаний хеш-файл.\\\n\"/g" po/uk.po
-
 # enable-gettext - internationalization support
 ./configure \
   --prefix=/usr \
diff --git a/system/rhash/rhash.info b/system/rhash/rhash.info
index d06cce8e9e..1e86e18c74 100644
--- a/system/rhash/rhash.info
+++ b/system/rhash/rhash.info
@@ -1,10 +1,10 @@
 PRGNAM="rhash"
-VERSION="1.3.9"
-HOMEPAGE="http://rhash.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/rhash/rhash-1.3.9-src.tar.gz"
-MD5SUM="cd8460caa640ae595ccb9b05d57b9cf4"
+VERSION="1.4.1"
+HOMEPAGE="https://github.com/rhash/RHash/"
+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/ripgrep/ripgrep.SlackBuild b/system/ripgrep/ripgrep.SlackBuild
index 43f99536ad..3e469f5fd7 100644
--- a/system/ripgrep/ripgrep.SlackBuild
+++ b/system/ripgrep/ripgrep.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ripgrep
-VERSION=${VERSION:-12.0.0}
+VERSION=${VERSION:-12.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -119,7 +119,7 @@ mkdir vendor
       sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -154,7 +154,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 CHANGELOG.md COPYING FAQ.md GUIDE.md ISSUE_TEMPLATE.md LICENSE-MIT README.md UNLICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md COPYING FAQ.md GUIDE.md LICENSE-MIT README.md RELEASE-CHECKLIST.md UNLICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/ripgrep/ripgrep.info b/system/ripgrep/ripgrep.info
index 3fa1c54479..8ffbd6693e 100644
--- a/system/ripgrep/ripgrep.info
+++ b/system/ripgrep/ripgrep.info
@@ -1,52 +1,52 @@
 PRGNAM="ripgrep"
-VERSION="12.0.0"
+VERSION="12.1.1"
 HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/12.0.0/ripgrep-12.0.0.tar.gz \
+DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/12.1.1/ripgrep-12.1.1.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/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/base64/base64-0.12.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/bstr/bstr-0.2.12.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/bytecount/bytecount-0.6.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/cc/cc-1.0.50.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.54.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/clap/clap-2.33.1.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.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/encoding_rs/encoding_rs-0.8.22.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/encoding_rs_io/encoding_rs_io-0.1.7.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/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/glob/glob-0.3.0.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/hermit-abi/hermit-abi-0.1.13.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/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.67.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/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/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/num_cpus/num_cpus-1.12.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/packed_simd/packed_simd-0.3.3.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2-sys/pcre2-sys-0.2.2.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2/pcre2-0.2.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/proc-macro2/proc-macro2-1.0.9.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/proc-macro2/proc-macro2-1.0.17.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.6.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.17.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/ryu/ryu-1.0.3.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/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/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.48.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/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.16.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.27.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/textwrap/textwrap-0.11.0.crate \
           https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
@@ -54,55 +54,55 @@ DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/12.0.0/ripgrep-12.0.0.ta
           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/walkdir/walkdir-2.3.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.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/winapi/winapi-0.3.8.crate"
-MD5SUM="7093bab0da872707d100e53b8ceb34cf \
+MD5SUM="d3190853d47d51ad077a65aadbf55448 \
         abc51f82118d86e83165ba87e2521e96 \
         142cb4b9a653e56e56311f0c883b8582 \
         7c6515c4b7f4c7723a3c6d1f07acc261 \
-        bbaf2cabce203fecd54c0c294eb7fb2b \
+        468f237829e960715055da5d484681b9 \
         6799c26a7eacaf8e58d3e45c6c5add89 \
-        33229041d7f94f7187634d017a75654f \
+        d25e25d08adce75c63f3969191141f28 \
         fe9c56d3d43021538850fcad8404bdad \
         e502e6c6b0dca9c1ae2d99e92b26f645 \
-        9b688de84c233898a6e2492174b3ea26 \
+        720e6fb5478963221c58e4ef0fc44356 \
         882dbbc613a93f64c3709b0a2bd0d6dc \
-        135f6d6306e50606f0475ada50c33ce2 \
+        42af3a1e965585d80dcc1e0324fda6eb \
         e9d5377e649441c6984e17b9679f2773 \
         ff67cf2eb9668167782b8012d3b48e7b \
-        66ab26097508d72ca826bab41fd9062e \
+        cba3538d5dac64d269dda867ba6c5011 \
         98dd664015c5a6c5e1d3cfb8dce1c4ff \
-        b0fd8ad50f5e64c71f0daf8af79ca952 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
         8b98db48d2cecf5843b75e2f668c58fa \
         e7c07242a95ee1df865efe9534e10a34 \
-        b9b9083c321e04d293fc37b9695a8e49 \
+        be4d52524ec8485abc40efba317b1e4c \
         493f4bd45cf2a6c3963f66f58884f622 \
         85dae509b4cda41fa820b3ad3b302479 \
         9f10bcc7b3ab24a0cdbaa0addc65b88d \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        1bdd1213d26c0050475506d6abbf63ef \
+        0a258dcd990afe3d83e0c103edd7f095 \
         61e508ca2eee543023c5e1ba777e5ede \
         b5cf10e268e8a3bee2de8a734104245e \
         124ec4f35274a0e9c1a4ef3dc0958643 \
         bdb38691302aeb63500e053919f5f0f7 \
-        09931e9b99240bb850c9e9c9ccb22668 \
+        c36d452e37c73b1e99f40bae18cddfdb \
         9551c939b35e3eb367843e03d71ba155 \
         2cc140411a55694fa07baa857a720af2 \
         244c87ebce1ce19de9283d14e218618d \
         d6f8f8aba0bdb5edb2dc41705b9d1144 \
-        d614fed188f35da55b2d9e846d315e09 \
-        2d2578337a3ff53dce9b46fb5bf7102c \
+        e0941025a0c5ed64fa8837efd892ecce \
+        ef0afe60eee17cc47bc3cb6f88b843a6 \
         3b298ba1d0e5e75b14765b2c48d52b13 \
-        04031b2ff0f95e8fb3c09d2d1d3b3b77 \
-        8ea9f47964ca4c580f250027ceb4cefd \
-        9436ca5c7881b6e8f3caae39515498df \
+        24118e5657591c6f208dbb1d77fbc482 \
+        eee136546e9f4735577dd20f45727c69 \
+        44d95c1ed46baee736c9420ad1de3228 \
         2d8d8b377d144f5e32b4f65a69eb0b24 \
-        41f86328d71bfca707af1cf7fb14460c \
-        6ae6ed94c6787ec87ce5c7239fdad0f6 \
-        49c10b8e144e01a6985a3c1e6f7ccd47 \
+        3879349fe374e764e24f37ce40ac9824 \
+        9b7d58f6341fb619ff2190481ce13b84 \
+        ce76f5430cd6d2ab76d0d86ecb8a4f4d \
         781d4ccf5d04c98fa02af207a9639249 \
-        eecf64c53beb82d72b0386a75d753d56 \
+        6fcb4505d0da4df3c5747dc23afe6622 \
         62e883807a65ebe1ba9d0e555d703339 \
         a8de006fe0c7e373c560dd51599287a8 \
         a5dd75e77c7324f5c1d2d372c990d0a7 \
@@ -110,7 +110,7 @@ MD5SUM="7093bab0da872707d100e53b8ceb34cf \
         e628ca8adb2b572bffb210f014656b6f \
         1092a4a24e80f8856efc71af51a06114 \
         db96b50050277bf05a3c68534bbb9586 \
-        050f25d04677ff1a36ebdec55ea9df23 \
+        b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
         ce68e06a2cd4f180747cf169fc388a95"
 DOWNLOAD_x86_64=""
diff --git a/system/rmw/README.Slackware b/system/rmw/README.Slackware
index bb11343514..a93201f522 100644
--- a/system/rmw/README.Slackware
+++ b/system/rmw/README.Slackware
@@ -1,4 +1,4 @@
-# rmw-0.7.04
+# rmw-0.7.05
 
 ## Description
 
@@ -20,7 +20,7 @@ Web site: <https://remove-to-waste.info/>
 
 ## Screenshots
 
-![rmw usage output](https://remove-to-waste.info/images/Screenshot_2019-07-05_22-47-51.png)
+![rmw usage output](https://remove-to-waste.info/images/Screenshot_2020-04-11.png)
 
 [More Screenshots](https://remove-to-waste.info/screenshots.html)
 
@@ -74,11 +74,11 @@ libmenuw some other way, rmw will use `ncurses` but you may experience
 [this minor
 bug](https://github.com/theimpossibleastronaut/rmw/issues/205).
 
-Note: rmw has been built on **Windows** 2 years ago using Cygwin but it
+Note: rmw was built on **Windows** 2 years ago using Cygwin but it
 didn't use the proper directories. We have no Windows developers
 working on this project and are hoping that some will join soon!. As
 stated in the description, the goal of this project is a
-"cross-platform" utility; so getting rmw to work reliably on Windows is
+"cross-platform" utility; so getting rmw to work on Windows is
 still on the TODO list.
 
 ## Uninstall / Cleaning up
@@ -115,7 +115,7 @@ rmw is run, it will be used; if not, it will be skipped. Once you
 create "example_waste", rmw will automatically create
 example_waste/info and example_waste/files
 
-    e.g: WASTE=/mnt/sda10000/example_waste, removable
+    e.g.: WASTE=/mnt/sda10000/example_waste, removable
 
 == Features and Options ==
 
@@ -134,6 +134,8 @@ Restore FILE(s) from a WASTE directory
 -o, --orphaned            check for orphaned files (maintenance)
 -f, --force               allow purge to run
 -e, --empty               completely empty (purge) all waste folders
+-r, -R, --recursive       option used for compatibility with rm
+                          (recursive operation is enabled by default)
 -v, --verbose             increase output messages
 -w, --warranty            display warranty
 -V, --version             display version and license information
@@ -141,7 +143,7 @@ Restore FILE(s) from a WASTE directory
 
     ===] Restoring [===
 
--z, --restore <wildcard filename(s) pattern>
+-z, --restore <wildcard filename(s) pattern> (e.g. ~/.local/share/Waste/files/foo*)
 -s, --select              select files from list to restore
 -u, --undo-last           undo last ReMove
 
@@ -167,14 +169,9 @@ $HOME/.local/share/rmw (or $XDG_DATA_HOME/rmw).
 
 == -z, --restore ==
 
-To restore a file, or multiple files, specify the path to them in in the
+To restore a file, or multiple files, specify the path to them in the
 <WASTE>/files folder (wildcards ok).
-e.g. 'rmw -z ~/.local/share/Trash/files/foo*'
-
-Files can also be restored using only the basename, from within any directory.
-NOTE: That feature will not process wildcards unless the user is in a
-<WASTE>/files folder and the filespec actually exists in the present working
-directory.
+e.g. 'rmw -z ~/.local/share/Waste/files/foo*'
 
 == -f, --force ==
 
diff --git a/system/rmw/rmw.SlackBuild b/system/rmw/rmw.SlackBuild
index 5cc04d3bd6..81fd0b5f17 100644
--- a/system/rmw/rmw.SlackBuild
+++ b/system/rmw/rmw.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for rmw
 #
-# Copyright 2019 / 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.04}
+VERSION=${VERSION:-0.7.06}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/rmw/rmw.info b/system/rmw/rmw.info
index 500850584d..778de6ab12 100644
--- a/system/rmw/rmw.info
+++ b/system/rmw/rmw.info
@@ -1,8 +1,8 @@
 PRGNAM="rmw"
-VERSION="0.7.04"
+VERSION="0.7.06"
 HOMEPAGE="https://remove-to-waste.info/"
-DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.04/rmw-0.7.04.tar.gz"
-MD5SUM="4ca6fc8405883eba6ffe3d28bef43cc1"
+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/rtirq/rtirq.info b/system/rtirq/rtirq.info
index 6376ed271b..70b90d606b 100644
--- a/system/rtirq/rtirq.info
+++ b/system/rtirq/rtirq.info
@@ -1,7 +1,7 @@
 PRGNAM="rtirq"
 VERSION="20150216"
 HOMEPAGE="https://alsa.opensrc.org/Rtirq"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/rtirq-20150216.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/rtirq-20150216.tar.gz"
 MD5SUM="59e8b012c16b1e879ce8648f537400c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/runc/runc.SlackBuild b/system/runc/runc.SlackBuild
index 68a75686f5..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-2019 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,11 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=runc
-VERSION=${VERSION:-1.0.0_rc6_8084f76}
-GITHASH=${GITHASH:-8084f7611e4677174c8dbeb17152f3390fa41952}
+VERSION=${VERSION:-1.0.0_rc92}
+GITHASH=${GITHASH:-ff819c7e9184c13b7c2607fe6c30ae19403a7aff}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCVER=$(echo $VERSION | tr _ -)
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -47,9 +49,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$GITHASH
-tar xvf $CWD/$PRGNAM-$GITHASH.tar.gz
-cd $PRGNAM-$GITHASH
+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 \
@@ -57,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-$GITHASH 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-$GITHASH/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 b3839d46b4..a43ca11b09 100644
--- a/system/runc/runc.info
+++ b/system/runc/runc.info
@@ -1,10 +1,10 @@
 PRGNAM="runc"
-VERSION="1.0.0_rc6_8084f76"
+VERSION="1.0.0_rc92"
 HOMEPAGE="https://github.com/opencontainers/runc"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/8084f76/runc-8084f7611e4677174c8dbeb17152f3390fa41952.tar.gz"
-MD5SUM_x86_64="4b48d73ad5764ecbd6f002681d0b5e42"
+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/runit/config.tar b/system/runit/config.tar
index 342cc163ce..7f7beec36e 100644
--- a/system/runit/config.tar
+++ b/system/runit/config.tar
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 387a7d3182..21fdbd752a 100644
--- a/system/s6-linux-init/README
+++ b/system/s6-linux-init/README
@@ -35,8 +35,10 @@ 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
+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
 
 Upstream recommends building skarnet.org softwares with static libraries
 as most of skarnet.org softwares are small enough that using shared
diff --git a/system/s6-linux-init/s6-linux-init.SlackBuild b/system/s6-linux-init/s6-linux-init.SlackBuild
index 2b52135aec..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.0}
+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 77de978ca8..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.0"
+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.0.tar.gz"
-MD5SUM="50e4e2e21bfd37d6c7cb1532207ebd85"
+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 1f11efda40..fcc650f1d7 100644
--- a/system/s6-rc/README
+++ b/system/s6-rc/README
@@ -6,16 +6,16 @@ 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:
 
     LIVE_DIR=/path/to/directory ./s6-rc.SlackBuild
 
 Make sure /path/to/directory is readable and writable by s6-rc or it
-will not work correctly. Using a RAM filesystem as the live directory is
-preferred.
+will not work correctly. A good recommendation is to put the live
+directory inside a RAM filesystem (e.g. tmpfs).
 
 Upstream recommends building skarnet.org softwares with static libraries
 as most of skarnet.org softwares are small enough that using shared
diff --git a/system/s6-rc/s6-rc.SlackBuild b/system/s6-rc/s6-rc.SlackBuild
index 645479738c..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.1.2}
+VERSION=${VERSION:-0.5.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,24 +58,15 @@ fi
 # BUILD_SHARED=yes to this script
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
-
-if [ "$BUILD_STATIC" = "no" ]; then
-		LIBS_CONF="--disable-static"
-fi
-
-if [ "$BUILD_SHARED" = "yes" ]; then
-		LIBS_CONF="--enable-shared $LIBS_CONF"
-fi
+[ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
+[ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
 
 # By default, all binaries are linked against the static versions of the skarnet.org libraries
 # Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries
 # Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be
 # linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script
 LINK_SHARED=${LINK_SHARED:-no}
-
-if [ "$LINK_SHARED" = "yes" ]; then
-		LIBS_CONF="--disable-allstatic $LIBS_CONF"
-fi
+[ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
 
 # /run/s6-rc is the default live directory, pass LIVE_DIR=/path/to/directory to this script to change it
 # make sure /path/to/directory is readable and writable by s6-rc or it will not work correctly
diff --git a/system/s6-rc/s6-rc.info b/system/s6-rc/s6-rc.info
index 4ab522e3fd..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.1.2"
+VERSION="0.5.2.2"
 HOMEPAGE="https://skarnet.org/software/s6-rc/"
-DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.1.2.tar.gz"
-MD5SUM="4317044ae5fd8e8494989da987430183"
+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 67e4093cf5..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.1.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 0bb1bf0433..d17ff68653 100644
--- a/system/s6/s6.info
+++ b/system/s6/s6.info
@@ -1,10 +1,10 @@
 PRGNAM="s6"
-VERSION="2.9.1.0"
+VERSION="2.10.0.3"
 HOMEPAGE="https://skarnet.org/software/s6/"
-DOWNLOAD="https://skarnet.org/software/s6/s6-2.9.1.0.tar.gz"
-MD5SUM="fd2d217829064ec1a409bbd15a3b8ea3"
+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/sandbox/sandbox.SlackBuild b/system/sandbox/sandbox.SlackBuild
index 9832355b7a..e1c592ca8f 100644
--- a/system/sandbox/sandbox.SlackBuild
+++ b/system/sandbox/sandbox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sandbox
 
-# 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=sandbox
-VERSION=${VERSION:-2.18}
+VERSION=${VERSION:-2.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/sandbox/sandbox.info b/system/sandbox/sandbox.info
index 131e955d23..7ea79a2f57 100644
--- a/system/sandbox/sandbox.info
+++ b/system/sandbox/sandbox.info
@@ -1,8 +1,8 @@
 PRGNAM="sandbox"
-VERSION="2.18"
+VERSION="2.20"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-DOWNLOAD="https://gitweb.gentoo.org/proj/sandbox.git/snapshot/sandbox-2.18.tar.bz2"
-MD5SUM="8d772726ef0edd05e52e4289b76bfa14"
+DOWNLOAD="https://gitweb.gentoo.org/proj/sandbox.git/snapshot/sandbox-2.20.tar.bz2"
+MD5SUM="9f0fc6baae17190fdd78cda967936e80"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/sandy/sandy.info b/system/sandy/sandy.info
index c77f0e5943..629649b220 100644
--- a/system/sandy/sandy.info
+++ b/system/sandy/sandy.info
@@ -1,7 +1,7 @@
 PRGNAM="sandy"
 VERSION="0.4_20140727"
 HOMEPAGE="https://web.archive.org/web/20180213024506/https://tools.suckless.org/sandy"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/sandy-0.4_20140727.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/sandy-0.4_20140727.tar.gz"
 MD5SUM="b046a5271584fea2fb1e881dfc86c899"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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/system/scdoc/scdoc.SlackBuild b/system/scdoc/scdoc.SlackBuild
new file mode 100644
index 0000000000..fb7418e537
--- /dev/null
+++ b/system/scdoc/scdoc.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for scdoc
+
+# Copyright 2021 Manuel Argüelles Panama City, Panama
+# 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=scdoc
+VERSION=${VERSION:-1.11.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 || 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 {} \;
+
+zcat $CWD/fix-makefile.patch.gz | patch -p1
+
+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
+
+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 \
+  $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/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/scrypt/README b/system/scrypt/README
index 1e17314d7e..2dda616f34 100644
--- a/system/scrypt/README
+++ b/system/scrypt/README
@@ -14,16 +14,3 @@ a ten-character password using openssl.
 In addition to the scrypt command-line utility, a development library
 libscrypt-kdf can be built and installed by setting the LIB environment
 variable: LIB=yes ./scrypt.SlackBuild
-
-Before version 1.3.0 scrypt was able to read both passphrase and input
-file from standard input. This stopped to work in 1.3.0. In future
-versions it is planned to add an option to read passphrase using a
-variety of methods. This SlackBuild can patch scrypt 1.3.0 to add the
-option "--passphrase-env", which allows to read the passphrase from an
-environment variable. To this end, set the PASS environment variable:
-PASS=yes ./scrypt.SlackBuild
-
-The patch is taken fron the branch
-https://github.com/Tarsnap/scrypt/tree/passphrase-environ
-
-Warning: using this patch is not officially supported by upstream.
diff --git a/system/scrypt/passphrase-environ.patch.gz b/system/scrypt/passphrase-environ.patch.gz
deleted file mode 100644
index 10f623ef05..0000000000
--- a/system/scrypt/passphrase-environ.patch.gz
+++ /dev/null
diff --git a/system/scrypt/scrypt.SlackBuild b/system/scrypt/scrypt.SlackBuild
index bc6f1979fb..3f1f51f3c2 100644
--- a/system/scrypt/scrypt.SlackBuild
+++ b/system/scrypt/scrypt.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scrypt
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,9 +72,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 {} \;
 
-[ "${PASS:-no}" != "no" ] && \
-  zcat $CWD/passphrase-environ.patch.gz | patch -p1 --verbose
-
 CFLAGS="$SLKCFLAGS" \
     ./configure \
     --prefix=/usr \
diff --git a/system/scrypt/scrypt.info b/system/scrypt/scrypt.info
index 20bb94ecf4..5f88fd121f 100644
--- a/system/scrypt/scrypt.info
+++ b/system/scrypt/scrypt.info
@@ -1,8 +1,8 @@
 PRGNAM="scrypt"
-VERSION="1.3.0"
+VERSION="1.3.1"
 HOMEPAGE="http://www.tarsnap.com/scrypt.html"
-DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.3.0.tgz"
-MD5SUM="62a528a6b73bccb0f8b7665cbcfec0b8"
+DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.3.1.tgz"
+MD5SUM="1f5aded31478319357c2c611eb5c4f71"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/sdl-jstest/sdl-jstest.info b/system/sdl-jstest/sdl-jstest.info
index c70abad9ff..cf78c56ffc 100644
--- a/system/sdl-jstest/sdl-jstest.info
+++ b/system/sdl-jstest/sdl-jstest.info
@@ -1,7 +1,7 @@
 PRGNAM="sdl-jstest"
 VERSION="20180715_aafbdb1"
 HOMEPAGE="https://gitlab.com/sdl-jstest/sdl-jstest"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/sdl-jstest-20180715_aafbdb1.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/sdl-jstest-20180715_aafbdb1.tar.xz"
 MD5SUM="68e335dec338030aedfdb07100bc18d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/secure-delete/README b/system/secure-delete/README
index aae5cfa3b6..a9100b9943 100644
--- a/system/secure-delete/README
+++ b/system/secure-delete/README
@@ -2,7 +2,8 @@ Tools to wipe files, free disk space, swap and memory.
 
 Gutmann method based tools for securely wiping data.
 
-From files (srm), free disk space (sfill), swap (sswap) and memory (sdmem).
+From files (srm), free disk space (sfill), swap (sswap) and memory
+(sdmem).
 
-This package maybe conflict with "srm" program and "srm" manpage present in
-"srm" package also available on SlackBuilds.
+This package maybe conflict with "srm" program and "srm" manpage present
+in "srm" package also available on SlackBuilds.
diff --git a/system/secure-delete/secure-delete-3.1-do-not-use-the-kernel-module.patch b/system/secure-delete/secure-delete-3.1-do-not-use-the-kernel-module.patch
deleted file mode 100644
index a685b81bc6..0000000000
--- a/system/secure-delete/secure-delete-3.1-do-not-use-the-kernel-module.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- Makefile.old	2006-03-08 14:59:53.000000000 -0500
-+++ Makefile	2006-03-08 15:00:23.000000000 -0500
-@@ -7,7 +7,7 @@
- OPT_MOD=-D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing -pipe -mpreferred-stack-boundary=2
- #LD_MOD=-r
- 
--all: sdel-lib.o srm sfill sswap smem sdel-mod.o
-+all: sdel-lib.o srm sfill sswap smem 
- 	@echo
- 	@echo "A Puritan is someone who is deathly afraid that someone, somewhere, is"
- 	@echo "having fun."
-@@ -15,9 +15,6 @@
- 	@echo "I hope YOU have fun!"
- 	@echo
- 
--sdel-mod.o: sdel-mod.c
--	$(CC) $(OPT) $(OPT_MOD) $(LD_MOD) -I/lib/modules/`uname -r`/build/include -c sdel-mod.c
--
- sdel-lib.o: sdel-lib.c
- 	$(CC) ${OPT} -c sdel-lib.c
- 
-@@ -35,7 +32,7 @@
- 	-strip smem
- 
- clean:
--	rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~
-+	rm -f sfill srm sswap smem sdel sdel-lib.o 
- 
- install: all
- 	mkdir -p -m 755 ${INSTALL_DIR} 2> /dev/null
-@@ -47,8 +44,8 @@
- 	chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1
- 	mkdir -p -m 755 ${DOC_DIR} 2> /dev/null
- 	cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR}
--	-test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char
--#	@-test '!' -e sdel-mod.o -a `uname -s` = 'Linux' && echo "type \"make sdel-mod install\" to compile and install the Linux loadable kernel module for secure delete"
-+	-test -e 
-+#	@-test '!' -e 
- 	@echo
- 	@echo "If men could get pregnant, abortion would be a sacrament."
- 	@echo
diff --git a/system/secure-delete/secure-delete-3.1-makefile.patch b/system/secure-delete/secure-delete-3.1-makefile.patch
deleted file mode 100644
index b9aad3d04a..0000000000
--- a/system/secure-delete/secure-delete-3.1-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile	2010-08-10 10:44:37.000000000 -0400
-+++ Makefile.secure	2010-08-10 10:44:43.000000000 -0400
-@@ -18,14 +19,14 @@
- sdel-lib.o: sdel-lib.c
- 	$(CC) ${OPT} -c sdel-lib.c
- 
--srm: srm.c
--	$(CC) ${OPT} -o srm srm.c sdel-lib.o
--sfill: sfill.c
--	$(CC) ${OPT} -o sfill sfill.c sdel-lib.o
--sswap: sswap.c
--	$(CC) ${OPT} -o sswap sswap.c sdel-lib.o
--smem: smem.c
--	$(CC) ${OPT} -o smem smem.c sdel-lib.o
-+srm: srm.o sdel-lib.o
-+	$(CC) $(LDFLAGS) srm.o sdel-lib.o -o srm
-+sfill: sfill.o sdel-lib.o
-+	$(CC) $(LDFLAGS) sfill.o sdel-lib.o -o sfill
-+sswap: sswap.o sdel-lib.o
-+	$(CC) $(LDFLAGS) sswap.o sdel-lib.o -o sswap
-+smem: smem.o sdel-lib.o
-+	$(CC) $(LDFLAGS) smem.o sdel-lib.o -o smem
- 
- clean:
- 	rm -f sfill srm sswap smem sdel sdel-lib.o 
diff --git a/system/secure-delete/secure-delete.SlackBuild b/system/secure-delete/secure-delete.SlackBuild
index 813874863e..3d05a44e21 100644
--- a/system/secure-delete/secure-delete.SlackBuild
+++ b/system/secure-delete/secure-delete.SlackBuild
@@ -4,6 +4,7 @@
 #
 # Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
+# Copyright Jefferson Rocha, Curitiba, Brazil.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -23,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=secure-delete
-VERSION=${VERSION:-3.1}
-BUILD=${BUILD:-6}
+VERSION=${VERSION:-3.1_6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -73,10 +74,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 {} \;
 
-sed -i -e 's|mktemp|mkstemp|g' sfill.c
-sed -i -e "/strip/d" Makefile
-patch < $CWD/secure-delete-3.1-do-not-use-the-kernel-module.patch
-patch < $CWD/secure-delete-3.1-makefile.patch
+patch < $CWD/${PRGNAM}_${VERSION}.diff
 
 make -j1 prefix=/usr DESTDIR=$PKG
 
diff --git a/system/secure-delete/secure-delete.info b/system/secure-delete/secure-delete.info
index 1412db147d..09f4883535 100644
--- a/system/secure-delete/secure-delete.info
+++ b/system/secure-delete/secure-delete.info
@@ -1,10 +1,10 @@
 PRGNAM="secure-delete"
-VERSION="3.1"
-HOMEPAGE="https://packages.debian.org/search?keywords=secure-delete/"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main//s/secure-delete/secure-delete_3.1.orig.tar.gz"
+VERSION="3.1_6"
+HOMEPAGE="https://packages.debian.org/buster/secure-delete"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/s/secure-delete/secure-delete_3.1.orig.tar.gz"
 MD5SUM="1a9d31a049f9ee916c994cb613a2754e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
+MAINTAINER="Jefferson Rocha"
+EMAIL="root@slackjeff.com.br"
diff --git a/system/secure-delete/secure-delete_3.1_6.diff b/system/secure-delete/secure-delete_3.1_6.diff
new file mode 100644
index 0000000000..288092f59a
--- /dev/null
+++ b/system/secure-delete/secure-delete_3.1_6.diff
@@ -0,0 +1,478 @@
+--- secure-delete-3.1.orig/srm.1
++++ secure-delete-3.1/srm.1
+@@ -55,7 +55,7 @@
+ .TP
+ .B \-d
+ ignore the two special dot files . and .. on the commandline. (so you can
+-execute it like "srm -d .* *")
++execute it like "srm \-d .* *")
+ .TP
+ .B \-f
+ fast (and insecure mode): no /dev/urandom, no synchronize mode.
+@@ -65,7 +65,7 @@
+ and a final mode random values.
+ .TP
+ .B \-l
+--l for a second time lessons the security even more: only one random pass
++\-l for a second time lessons the security even more: only one random pass
+ is written.
+ .TP
+ .B \-r
+@@ -95,7 +95,7 @@
+ which comes with the
+ .I secure_deletion package
+ to ensure to wipe also the free diskspace. However, If already a small
+-file aquired a block with your precious data, no tool known to me can help
++file acquired a block with your precious data, no tool known to me can help
+ you here. For a secure deletion of the swap space
+ .I sswap
+ is available.
+@@ -136,5 +136,5 @@
+ (1),
+ .I sswap
+ (1),
+-.I smem
++.I sdmem
+ (1)
+--- secure-delete-3.1.orig/sfill.1
++++ secure-delete-3.1/sfill.1
+@@ -16,7 +16,7 @@
+ is designed to delete data which lies on available diskspace on mediums
+ in a secure manner which can not be recovered by thiefs, law enforcement
+ or other threats.
+-The wipe algorythm is based on the paper "Secure Deletion of Data from
++The wipe algorithm is based on the paper "Secure Deletion of Data from
+ Magnetic and Solid-State Memory" presented at the 6th Usenix Security
+ Symposium by Peter Gutmann, one of the leading civilian cryptographers.
+ .PP
+@@ -59,7 +59,7 @@
+ and a final mode with random values.
+ .TP
+ .B \-l
+--l for a second time lessons the security even more: only one random pass
++\-l for a second time lessons the security even more: only one random pass
+ is written.
+ .TP
+ .B \-v
+@@ -130,5 +130,5 @@
+ (1),
+ .I sswap
+ (1),
+-.I smem
++.I sdmem
+ (1)
+--- secure-delete-3.1.orig/Makefile
++++ secure-delete-3.1/Makefile
+@@ -1,19 +1,19 @@
+ CC=gcc
+-OPT=-O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++OPT=$(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ #OPT=-Wall -D_DEBUG_ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+-INSTALL_DIR=/usr/local/bin
++INSTALL_DIR=$(prefix)/bin
+ MAN_DIR=/usr/local/man
+ DOC_DIR=/usr/share/doc/secure_delete
+ OPT_MOD=-D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing -pipe -mpreferred-stack-boundary=2
+ #LD_MOD=-r
+ 
+-all: sdel-lib.o srm sfill sswap smem sdel-mod.o
+-	@echo
+-	@echo "A Puritan is someone who is deathly afraid that someone, somewhere, is"
+-	@echo "having fun."
+-	@echo
+-	@echo "I hope YOU have fun!"
+-	@echo
++all: sdel-lib.o srm sfill sswap smem
++#	@echo
++#	@echo "A Puritan is someone who is deathly afraid that someone, somewhere, is"
++#	@echo "having fun."
++#	@echo
++#	@echo "I hope YOU have fun!"
++#	@echo
+ 
+ sdel-mod.o: sdel-mod.c
+ 	$(CC) $(OPT) $(OPT_MOD) $(LD_MOD) -I/lib/modules/`uname -r`/build/include -c sdel-mod.c
+@@ -23,32 +23,28 @@
+ 
+ srm: srm.c
+ 	$(CC) ${OPT} -o srm srm.c sdel-lib.o
+-	-strip srm
+ sfill: sfill.c
+ 	$(CC) ${OPT} -o sfill sfill.c sdel-lib.o
+-	-strip sfill
+ sswap: sswap.c
+ 	$(CC) ${OPT} -o sswap sswap.c sdel-lib.o
+-	-strip sswap
+ smem: smem.c
+ 	$(CC) ${OPT} -o smem smem.c sdel-lib.o
+-	-strip smem
+ 
+ clean:
+ 	rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~
+ 
+ install: all
+ 	mkdir -p -m 755 ${INSTALL_DIR} 2> /dev/null
+-	rm -f sdel && ln -s srm sdel
+-	cp -f sdel srm sfill sswap smem the_cleaner.sh ${INSTALL_DIR}
+-	chmod 711 ${INSTALL_DIR}/srm ${INSTALL_DIR}/sfill ${INSTALL_DIR}/sswap ${INSTALL_DIR}/smem ${INSTALL_DIR}/the_cleaner.sh
+-	mkdir -p -m 755 ${MAN_DIR}/man1 2> /dev/null
+-	cp -f srm.1 sfill.1 sswap.1 smem.1 ${MAN_DIR}/man1
+-	chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1
+-	mkdir -p -m 755 ${DOC_DIR} 2> /dev/null
+-	cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR}
+-	-test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char
++#	rm -f sdel && ln -s srm sdel
++	cp -f srm sfill sswap smem ${INSTALL_DIR}
++	chmod 711 ${INSTALL_DIR}/srm ${INSTALL_DIR}/sfill ${INSTALL_DIR}/sswap ${INSTALL_DIR}/smem 
++#	mkdir -p -m 755 ${MAN_DIR}/man1 2> /dev/null
++#	cp -f srm.1 sfill.1 sswap.1 smem.1 ${MAN_DIR}/man1
++#	chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1
++#	mkdir -p -m 755 ${DOC_DIR} 2> /dev/null
++#	cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR}
++#	-test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char
+ #	@-test '!' -e sdel-mod.o -a `uname -s` = 'Linux' && echo "type \"make sdel-mod install\" to compile and install the Linux loadable kernel module for secure delete"
+-	@echo
+-	@echo "If men could get pregnant, abortion would be a sacrament."
+-	@echo
++#	@echo
++#	@echo "If men could get pregnant, abortion would be a sacrament."
++#	@echo
+--- secure-delete-3.1.orig/srm.c
++++ secure-delete-3.1/srm.c
+@@ -110,7 +110,7 @@
+ 	        if ( (filestat.st_dev != controlstat.st_dev) || (filestat.st_ino != controlstat.st_ino) ) {
+ 	            fprintf(stderr, "Race found! (directory %s became a link)\n", filename);
+ 	        } else {
+-  	            if ((dir = opendir (".")) != NULL) {
++  	            if ((dir = opendir (".")) < 0) {
+ 	                (void) chmod(".", 0700); /* ignore permission errors */
+ 	                dir = opendir (".");
+ 	            }
+@@ -166,8 +166,10 @@
+             return 3;
+         }
+ 
+-        if (sdel_overwrite(mode, fd, 0, bufsize, filestat.st_size > 0 ? filestat.st_size : 1, zero) == 0)
++        if (sdel_overwrite(mode, fd, 0, bufsize, filestat.st_size > 0 ? filestat.st_size : 1, zero) == 0) {
++            close(fd);
+             return sdel_unlink(filename, 0, 1, slow);
++		}
+     } /* end IS_REG() */
+     else {
+         if (S_ISDIR(filestat.st_mode)) {
+--- secure-delete-3.1.orig/smem.1
++++ secure-delete-3.1/smem.1
+@@ -3,16 +3,16 @@
+ .if n .sp
+ .if t .sp 0.4
+ ..
+-.TH SMEM 1
++.TH SDMEM 1
+ 
+ .SH NAME
+-smem \- secure memory wiper (secure_deletion toolkit)
++sdmem \- secure memory wiper (secure_deletion toolkit)
+ 
+ .SH SYNOPSIS
+-.B smem [-f] [-l] [-l] [-v]
++.B sdmem [-f] [-l] [-l] [-v]
+ 
+ .SH DESCRIPTION
+-.I smem
++.I sdmem
+ is designed to delete data which may lie still in your memory (RAM)
+ in a secure manner which can not be recovered by thiefs, law enforcement
+ or other threats.
+@@ -24,7 +24,7 @@
+ .PP
+ The
+ .I secure data deletion
+-process of smem goes like this:
++process of sdmem goes like this:
+ .PP
+ .TP
+ .B *
+@@ -51,20 +51,26 @@
+ and a final random one.
+ .TP
+ .B \-l
+--l for a second time lessons the security even more: only one pass with
++\-l for a second time lessons the security even more: only one pass with
+ 0x00 is written.
+ .TP
+ .B \-v
+ verbose mode
+ .PP
+ 
++.SH NOTE
++.TP
++This utility was originally called
++.I smem
++but was renamed for debian to avoid name clashes with another package.
++
+ .SH BEWARE
+ .TP
+ .B SLOW
+-Wiping the memory is very slow. You might use smem with the -ll option. (tip)
++Wiping the memory is very slow. You might use sdmem with the \-ll option. (tip)
+ .TP
+ .B BETA!
+-.I smem
++.I sdmem
+ is still beta.
+ 
+ .PP
+@@ -84,7 +90,7 @@
+ can be obtained from 
+ .I http://www.thc.org
+ .Sp
+-.I smem
++.I sdmem
+ and the
+ .I secure_deletion package
+ is (C) 1997-2003 by van Hauser / THC (vh@thc.org)
+--- secure-delete-3.1.orig/sswap.1
++++ secure-delete-3.1/sswap.1
+@@ -49,7 +49,7 @@
+ a final mode with random values.
+ .TP
+ .B \-l
+--l for a second time lessons the security even more: only one pass with
++\-l for a second time lessons the security even more: only one pass with
+ random values is written.
+ .TP
+ .B \-v
+@@ -106,5 +106,5 @@
+ (1),
+ .I sfill
+ (1),
+-.I smem
++.I sdmem
+ (1)
+--- secure-delete-3.1.orig/debian/docs
++++ secure-delete-3.1/debian/docs
+@@ -0,0 +1,4 @@
++README
++TODO
++secure_delete.doc
++usenix6-gutmann.doc
+--- secure-delete-3.1.orig/debian/control
++++ secure-delete-3.1/debian/control
+@@ -0,0 +1,13 @@
++Source: secure-delete
++Section: utils
++Priority: optional
++Maintainer: Robert Lemmen <robertle@semistable.com>
++Build-Depends: debhelper (>= 7.0.0)
++Standards-Version: 3.9.4
++
++Package: secure-delete
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Description: tools to wipe files, free disk space, swap and memory 
++ Gutmann method based tools for securely wiping data from files, free 
++ disk space, swap and memory: srm, sfill, sswap and sdmem.
+--- secure-delete-3.1.orig/debian/compat
++++ secure-delete-3.1/debian/compat
+@@ -0,0 +1 @@
++7
+--- secure-delete-3.1.orig/debian/changelog
++++ secure-delete-3.1/debian/changelog
+@@ -0,0 +1,46 @@
++secure-delete (3.1-6) unstable; urgency=low
++
++  * Enable hardening flags during build
++  * Update packaging
++  * Bump standards-version
++  * Fix a few minus-vs-hyphen bugs in manpages 
++  * Fixed a few typos (closes: #486018, #653260)
++  * Tone down description a little bit and include binary names
++    (closes: #680336, #538151)
++
++ -- Robert Lemmen <robertle@semistable.com>  Fri, 05 Jul 2013 08:50:37 +0100
++
++secure-delete (3.1-5) unstable; urgency=low
++
++  * Rename smem to sdmem to avoid name clash with smem package
++  * Bumped Standards-Version to 3.8.3 and related fixes
++
++ -- Robert Lemmen <robertle@semistable.com>  Tue, 05 Jan 2010 14:55:00 +0000
++
++secure-delete (3.1-4) unstable; urgency=low
++
++  * Fixed licensing info (closes: #428102)
++  * Fixed handling of nostrip build option (closes: #438009)
++
++ -- Robert Lemmen <robertle@semistable.com>  Tue, 28 Aug 2007 13:21:17 +0200
++
++secure-delete (3.1-3) unstable; urgency=low
++
++  * Moved from experimental
++  * Added more documentation
++
++ -- Robert Lemmen <robertle@semistable.com>  Thu,  5 Oct 2006 22:04:17 +0200
++
++secure-delete (3.1-2) experimental; urgency=low
++
++  * Upload to experimental instead of unstable.
++  * Added description on how to test security to README.Debian.
++
++ -- Robert Lemmen <robertle@semistable.com>  Mon,  2 May 2005 11:55:11 +0200
++
++secure-delete (3.1-1) unstable; urgency=low
++
++  * Initial Release.
++
++ -- Robert Lemmen <robertle@semistable.com>  Thu, 29 Jan 2004 18:09:26 +0100
++
+--- secure-delete-3.1.orig/debian/copyright
++++ secure-delete-3.1/debian/copyright
+@@ -0,0 +1,17 @@
++This package was debianized by Robert Lemmen <robertle@semistable.com> on
++Thu, 29 Jan 2004 18:09:26 +0100.
++
++It was downloaded from http://www.thc.org
++
++Upstream Author: van Hauser <vh@thc.org> 
++
++Copyright: 1999-2004 van Hauser
++
++ You are free to distribute this software under the terms of
++ the GNU General Public License.
++ On Debian systems, the complete text of the GNU General Public
++ License can be found in /usr/share/common-licenses/GPL file.
++
++The file "usenix6-gutmann.doc" is licensed under the "Creative Commons
++Attribution 3.0" license, which you can find at
++http://creativecommons.org/licenses/by/3.0/
+--- secure-delete-3.1.orig/debian/watch
++++ secure-delete-3.1/debian/watch
+@@ -0,0 +1,3 @@
++version=2
++http://www.thc.org/releases.php .*secure[-_]delete-(.*)\.tar\.gz
++
+--- secure-delete-3.1.orig/debian/README.Debian
++++ secure-delete-3.1/debian/README.Debian
+@@ -0,0 +1,56 @@
++secure-delete for Debian
++------------------------
++
++The original package and debian versions prio to  3.1-5 contained a utility
++called smem that wiped memory. This utility seems to be of limited use and
++clashes with another binary of the same name, it is therefore renamed to sdmem.
++
++The source for secure_delete contains a 2.4 kernel module that turns every 
++call to unlink() into a secure remove, this module is not yet part of this 
++package for technical reasons. if you need it please "apt_get source 
++secure-delete" and build it yourself for now.
++
++Also note that securely wiping data from magnetic media is a difficult task and
++depends a lot on the filesystem in question (among other things). So there is no
++guarantee that this program will work in your configuration, but you can and
++should check for yourself by creating a loopback filesystem, mountig it and
++creating a file in it, then securely wiping it and grepping for it's contents in
++the loopback file:
++
++dd if=/dev/zero of=disk bs=4096 count=1024
++mke2fs disk
++losetup /dev/loop0 disk
++mkdir test
++mount /dev/loop0 test
++cd test
++for ((i=0; i<10000; i++))
++do
++	echo "ofenrohr" >> file;
++done
++cd ..
++umount test
++losetup -d /dev/loop0
++grep "ofenrohr" disk
++--> this should result in a "binary file disk matches"
++losetup /dev/loop0 disk
++mount /dev/loop0 test
++cd test
++srm file
++cd ..
++umount test
++losetup -d /dev/loop0
++grep "ofenrohr" disk
++--> this should not find anything
++
++Please make sure you use the correct filesystem type and options during the 
++mkfs!
++
++Another general problem of wiping data from disks is that most harddisks will
++occasionally mark a sector as "bad" and copy it's contents to a new location
++that the disk will pretend is at the original location. Since this is completely
++transparent, there is no way to access these sectors without touching the disks
++hardware. These sectors may then contain sensitive information that could be
++retrieved from the disk. If you want better security, use an encrypting
++filesystem (dm-crypt, loop-aes), and forget the key if you want to wipe it.
++
++ -- Robert Lemmen <robertle@semistable.com>, Thu, 29 Jan 2004 18:09:26 +0100
+--- secure-delete-3.1.orig/debian/rules
++++ secure-delete-3.1/debian/rules
+@@ -0,0 +1,59 @@
++#!/usr/bin/make -f
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
++CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
++CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
++LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
++
++build: build-arch build-indep
++build-arch: build-stamp
++build-indep: build-stamp
++
++build-stamp: 
++	dh_testdir
++	CFLAGS="$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" $(MAKE)
++	touch build-stamp
++
++clean:
++	dh_testdir
++	dh_testroot
++	rm -f build-stamp 
++	$(MAKE) clean
++	dh_clean 
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_prep
++	dh_installdirs
++	$(MAKE) install prefix=$(CURDIR)/debian/secure-delete/usr
++
++
++binary-indep: build install
++
++binary-arch: build install
++	dh_testdir
++	dh_testroot
++	dh_installchangelogs CHANGES
++	dh_installdocs README TODO
++	dh_installman sfill.1 srm.1 smem.1 sswap.1
++	# rename smem
++	mv $(CURDIR)/debian/secure-delete/usr/bin/smem \
++		$(CURDIR)/debian/secure-delete/usr/bin/sdmem
++	mv $(CURDIR)/debian/secure-delete/usr/share/man/man1/smem.1 \
++		$(CURDIR)/debian/secure-delete/usr/share/man/man1/sdmem.1
++	dh_link
++	dh_strip
++	dh_compress
++	dh_fixperms
++	dh_installdeb
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install 
+--- secure-delete-3.1.orig/debian/source/format
++++ secure-delete-3.1/debian/source/format
+@@ -0,0 +1 @@
++1.0
diff --git a/system/secure-delete/slack-desc b/system/secure-delete/slack-desc
index 4b8772474e..e18b5dd8e1 100644
--- a/system/secure-delete/slack-desc
+++ b/system/secure-delete/slack-desc
@@ -10,7 +10,7 @@ secure-delete: secure-delete (wipe files, free disk space, swap and memory)
 secure-delete:
 secure-delete: Gutmann method based tools for securely wiping data.
 secure-delete:
-secure-delete: Home page: https://packages.debian.org/search?keywords=secure-delete/
+secure-delete: Home page: https://packages.debian.org/buster/secure-delete
 secure-delete:
 secure-delete:
 secure-delete:
diff --git a/system/setconf/setconf.SlackBuild b/system/setconf/setconf.SlackBuild
index f7c65e28d8..5efa224d3e 100644
--- a/system/setconf/setconf.SlackBuild
+++ b/system/setconf/setconf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for setconf
 
-# Copyright 2017-2019 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=setconf
-VERSION=${VERSION:-0.7.6}
+VERSION=${VERSION:-0.7.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/setconf/setconf.info b/system/setconf/setconf.info
index acce9cf82b..fe6a24cbd7 100644
--- a/system/setconf/setconf.info
+++ b/system/setconf/setconf.info
@@ -1,8 +1,8 @@
 PRGNAM="setconf"
-VERSION="0.7.6"
+VERSION="0.7.7"
 HOMEPAGE="http://setconf.roboticoverlords.org/"
-DOWNLOAD="http://setconf.roboticoverlords.org/setconf-0.7.6.tar.xz"
-MD5SUM="e2119e3ff5f85926a633d09f8cd05426"
+DOWNLOAD="http://setconf.roboticoverlords.org/setconf-0.7.7.tar.xz"
+MD5SUM="ee72aa823120aa3affcd0ec75667147c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/skim/skim.SlackBuild b/system/skim/skim.SlackBuild
index ea4ec981e5..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.0}
+VERSION=${VERSION:-0.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/skim/skim.info b/system/skim/skim.info
index ad88d1cf46..a971c13ed0 100644
--- a/system/skim/skim.info
+++ b/system/skim/skim.info
@@ -1,192 +1,238 @@
 PRGNAM="skim"
-VERSION="0.8.0"
+VERSION="0.9.4"
 HOMEPAGE="https://github.com/lotabout/skim"
-DOWNLOAD="https://github.com/lotabout/skim/archive/v0.8.0/skim-0.8.0.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.1.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="2afbc8229870b1417fb72c53518625cb \
-        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 \
-        ad26deac5545ac83a54ffa579c4cb28a \
-        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/skopeo/skopeo.SlackBuild b/system/skopeo/skopeo.SlackBuild
index e9a1d57cd4..20b80f6b6f 100644
--- a/system/skopeo/skopeo.SlackBuild
+++ b/system/skopeo/skopeo.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=skopeo
-VERSION=${VERSION:-0.1.39}
+VERSION=${VERSION:-0.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/skopeo/skopeo.info b/system/skopeo/skopeo.info
index b788e0ada5..bff6ed8d23 100644
--- a/system/skopeo/skopeo.info
+++ b/system/skopeo/skopeo.info
@@ -1,8 +1,8 @@
 PRGNAM="skopeo"
-VERSION="0.1.39"
+VERSION="0.2.0"
 HOMEPAGE="https://github.com/containers/skopeo"
-DOWNLOAD="https://github.com/containers/skopeo/archive/v0.1.39/skopeo-0.1.39.tar.gz"
-MD5SUM="c7148136eb1fabd321fc963031b21305"
+DOWNLOAD="https://github.com/containers/skopeo/archive/v0.2.0/skopeo-0.2.0.tar.gz"
+MD5SUM="51ec7580f5a7110bf39e885f6b1fe28f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="go-md2man"
diff --git a/system/slack-osquery/README b/system/slack-osquery/README
new file mode 100644
index 0000000000..0b825b4c5c
--- /dev/null
+++ b/system/slack-osquery/README
@@ -0,0 +1,11 @@
+slack-osquery - osquery extensions for Slackware
+
+This extension provides extra tables for osquery on slackware.
+
+After installation, you will need to configure osquery to load your extension:
+https://osquery.readthedocs.io/en/stable/deployment/extensions/
+
+The extension currently exposes the package database through a table called
+slackware_packages.
+
+NOTE: google-go-lang is only needed at compile time - not at runtime.
diff --git a/system/slack-osquery/slack-desc b/system/slack-osquery/slack-desc
new file mode 100644
index 0000000000..9c484c4c96
--- /dev/null
+++ b/system/slack-osquery/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------------------------------------------------------|
+slack-osquery: slack-osquery (osquery extensions for slackware)
+slack-osquery:
+slack-osquery: osquery extensions for slackware
+slack-osquery:
+slack-osquery: https://github.com/aclemons/slack-osquery
+slack-osquery:
+slack-osquery:
+slack-osquery:
+slack-osquery:
+slack-osquery:
+slack-osquery:
diff --git a/system/slack-osquery/slack-osquery.SlackBuild b/system/slack-osquery/slack-osquery.SlackBuild
new file mode 100644
index 0000000000..d8ec7d4871
--- /dev/null
+++ b/system/slack-osquery/slack-osquery.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for slack-osquery
+
+# Copyright 2020 Andrew Clemons, Wellington New Zealand
+# 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=slack-osquery
+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.tar.gz
+cd $PRGNAM-$VERSION
+
+mkdir -p vendor/github.com
+
+for DEPENDENCY in Microsoft/go-winio/0.4.9 \
+                  apache/thrift/0.12.0 \
+                  davecgh/go-spew/1.1.0 \
+                  kolide/osquery-go/a74aa860032dacda9b8304c6565efcb9d80dfaa9 \
+                  pkg/errors/0.8.0 \
+                  pmezard/go-difflib/1.0.0 \
+                  stretchr/testify/1.2.2 ; do
+  DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)"
+  DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)"
+  DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)"
+
+  mkdir -p "vendor/github.com/$DEPENDENCY_OWNER"
+
+  tar xf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz"
+  mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" "vendor/github.com/$DEPENDENCY_OWNER/$DEPENDENCY_NAME"
+done
+
+mkdir -p vendor/golang.org/x
+for DEPENDENCY in sys/14742f9018cd6651ec7364dc6ee08af0baaa1031 ; do
+  DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f1)"
+  DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f2)"
+
+  tar xf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz"
+  mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" "vendor/golang.org/x/$DEPENDENCY_NAME"
+done
+
+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 {} \;
+
+go build -a -mod=vendor -o target/slackware.ext
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/osquery/extensions
+
+install -m 0700 target/slackware.ext $PKG/usr/lib${LIBDIRSUFFIX}/osquery/extensions/slackware.ext
+
+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 \
+  $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/slack-osquery/slack-osquery.info b/system/slack-osquery/slack-osquery.info
new file mode 100644
index 0000000000..21b713f5f6
--- /dev/null
+++ b/system/slack-osquery/slack-osquery.info
@@ -0,0 +1,26 @@
+PRGNAM="slack-osquery"
+VERSION="1.0"
+HOMEPAGE="https://github.com/aclemosn/slack-osquery"
+DOWNLOAD="https://github.com/aclemons/slack-osquery/archive/v1.0/slack-osquery-1.0.tar.gz \
+          https://github.com/Microsoft/go-winio/archive/v0.4.9/go-winio-0.4.9.tar.gz \
+          https://github.com/apache/thrift/archive/v0.12.0/thrift-0.12.0.tar.gz \
+          https://github.com/davecgh/go-spew/archive/v1.1.0/go-spew-1.1.0.tar.gz \
+          https://github.com/kolide/osquery-go/archive/a74aa860032dacda9b8304c6565efcb9d80dfaa9/osquery-go-a74aa860032dacda9b8304c6565efcb9d80dfaa9.tar.gz \
+          https://github.com/pkg/errors/archive/v0.8.0/errors-0.8.0.tar.gz \
+          https://github.com/pmezard/go-difflib/archive/v1.0.0/go-difflib-1.0.0.tar.gz \
+          https://github.com/stretchr/testify/archive/v1.2.2/testify-1.2.2.tar.gz \
+          https://github.com/golang/sys/archive/14742f9018cd6651ec7364dc6ee08af0baaa1031/sys-14742f9018cd6651ec7364dc6ee08af0baaa1031.tar.gz"
+MD5SUM="6f9cdd4f0f8e2d5e5a41568f1c80eb7e \
+        8696fc61920c07d8591b5f5c6920cf82 \
+        ff9af01fec424b5a279fa8a3c9e95c0c \
+        89875fb674e0ea72a189e5048186206c \
+        c11f2cbf425ccf11292e0caaf9619a69 \
+        8072f1b5f0f97a9167caff82f812edeb \
+        56e81fe945d04771dcb79964ce958a5f \
+        cae3d38d807581cd78da0a9dc6b0eb70 \
+        e854fa1c61cb6d71bf9feb71b3f97f97"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/system/slack-scripts/README b/system/slack-scripts/README
deleted file mode 100644
index e58de09685..0000000000
--- a/system/slack-scripts/README
+++ /dev/null
@@ -1,83 +0,0 @@
-slack-scripts (Some Slackware Utilities)
-
-ph - A Slackware Package History
-slkcfg - A Sysvinit Script Utility
-
-============================================================
-
-ph N
-
-Lists last installed N packages by date order, newest first
-unless N is negative, then it lists oldest first. With no
-number it outputs all, suitable for grepping etc.
-
-It supports a few options about listing style such as date,
-version, tag, and can be used in conjunction with other
-applications such as removepkg.
-
-Example:
-
-ph -s 5         (list last 5 SBo packages installed)
-ph -t alien 10  (list last 10 packages with tag 'alien')
-ph -d 5         (list last 5 without printing the dates)
-pn -v 5         (list last 5 without printing versions)
-
-Or combine them:
-
-ph -v -d -s 5  (list only the names of the last 5 SBo packages)
-
-It also supports the $ROOT environmental option so that it
-will work with mounted file systems and partitions.
-
-See ph -h for more details and ph --help for more examples.
-
-============================================================
-
-slkcfg runs commands on the rc scripts in /etc/rc.d/ but
-without needing to specify the full path. Any output is
-printed.
-
-It can run the usual start/stop/restart/status commands and
-set/unset the executable bit.
-
-eg:
-
-slkcfg cups on|off (chmod +/-x)
-slkcfg cups start|stop|status
-
-and so on.
-
-It greps the rc file to find options. If it doesn't find any
-options but you know that some exist you can force the
-command by adding 'force' at the end.
-
-Running with just the name of the rc file will 'ls -l' it
-and print any found options.
-
-/etc/rc.d/rc.inet1 is treated specially and will try to
-find the names of interfaces using ifconfig -a.
-
-At the moment it supports the following: eth, wlan, br,
-virbr, vmnet, vboxnet, pan and ppp.
-
-If you would like me to add extra interface support just
-drop me a line with the details or send a patch.
-
-Example output from inet1:
-
-slkcfg inet1
--rwxr-xr-x 1 root root 10878 Nov 19  2015 /etc/rc.d/rc.inet1*
-
-Options:
-start stop restart
-lo_start lo_stop
-eth0_start eth0_stop eth0_restart
-virbr0_start virbr0_stop virbr0_restart
-wlan0_start wlan0_stop wlan0_restart
-
-slkcfg uses 'sh' to run commands (apart from chmod) so it
-should work even if the rc file isn't executable. In that
-case it will print a message to tell you at the end of the
-output.
-
-See slkcfg -h for more details.
diff --git a/system/slack-scripts/slack-desc b/system/slack-scripts/slack-desc
deleted file mode 100644
index 090e02679a..0000000000
--- a/system/slack-scripts/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------------------------------------------------------|
-slack-scripts: slack-scripts (Some Slackware Utilities)
-slack-scripts:
-slack-scripts: ph       A Slackware Package History
-slack-scripts: slkcfg   A Sysvinit Script Utility
-slack-scripts:
-slack-scripts: Use <script> -h for usage.
-slack-scripts:
-slack-scripts: http://tty1.uk
-slack-scripts:
-slack-scripts:
-slack-scripts:
diff --git a/system/slack-scripts/slack-scripts.SlackBuild b/system/slack-scripts/slack-scripts.SlackBuild
deleted file mode 100644
index a93b19f4d8..0000000000
--- a/system/slack-scripts/slack-scripts.SlackBuild
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for slack-scripts
-# Copyright 2018 David 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=slack-scripts
-VERSION=${VERSION:-0.0.3}
-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 {} \;
-
-mkdir -p $PKG/usr/{bin,sbin}
-cp ph/ph $PKG/usr/bin
-cp slkcfg/slkcfg $PKG/usr/sbin
-
-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/system/slack-scripts/slack-scripts.info b/system/slack-scripts/slack-scripts.info
deleted file mode 100644
index 86818b2938..0000000000
--- a/system/slack-scripts/slack-scripts.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="slack-scripts"
-VERSION="0.0.3"
-HOMEPAGE="http://slackbuilds.org"
-DOWNLOAD="http://unrealize.co.uk/source/slack-scripts-0.0.3.tar.gz"
-MD5SUM="25d081be066dcb16b282c727449d0772"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
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/sleepd/fix_acpica_version.patch b/system/sleepd/fix_acpica_version.patch
new file mode 100644
index 0000000000..02422ed0be
--- /dev/null
+++ b/system/sleepd/fix_acpica_version.patch
@@ -0,0 +1,12 @@
+diff -uNr sleepd-2.05.orig/acpi.c sleepd-2.05/acpi.c
+--- sleepd-2.05.orig/acpi.c	2014-05-28 04:06:50.000000000 +0800
++++ sleepd-2.05/acpi.c	2020-07-17 22:51:39.340113991 +0800
+@@ -67,7 +67,7 @@
+ 	fd = open(file, O_RDONLY);
+ 	if (fd == -1) return NULL;
+ 	end = read(fd, buf, sizeof(buf));
+-	buf[end-1] = '\0';
++	((buf[end-1]) == '\n') && (buf[end-1] = '\0');
+ 	close(fd);
+ 	return buf;
+ }
diff --git a/system/sleepd/rc.sleepd b/system/sleepd/rc.sleepd
index bbfa1b0f15..66587a2f8c 100644
--- a/system/sleepd/rc.sleepd
+++ b/system/sleepd/rc.sleepd
@@ -1,26 +1,36 @@
 #!/bin/sh
 
 # /etc/rc.d/rc.sleepd
-# Start/stop/restart the Wicd daemon
+# Start/stop/restart the sleepd daemon
 
 PIDFILE="/var/run/sleepd.pid"
 DAEMON="/usr/sbin/sleepd"
 
+. /etc/sleepd.conf
+
 # Define start and stop functions
 
 sleepd_start() {
+  [ $UID -eq 0 ] || exit 4
   if [ -e $PIDFILE ]; then
-    echo "sleepd appears to already be running."
-    echo "If this is not the case, then remove "
-    echo "$PIDFILE and try again..."
+    echo "sleepd appears to already be running. If this is not the case,"
+    echo "remove $PIDFILE and try again."
     exit 1
   else
-    echo "Starting sleepd: $DAEMON &"
-    sleepd 2>/dev/null 1>&2 &
+    echo "Starting sleepd: $DAEMON"
+    sleepd $PARAMS > /dev/null 2>&1
+    ps -p `cat $PIDFILE` > /dev/null 2>&1
+    if [ "$?" == 1 ]; then
+      rm -f $PIDFILE
+      echo "ERROR: $DAEMON failed to start."
+      echo "ERROR: For more verbosity, run \"$DAEMON -n -v\" manually."
+      echo "ERROR: Exiting..."
+    fi
   fi
 }
 
 sleepd_force_stop() {
+  [ $UID -eq 0 ] || exit 4
   echo "Force stopping sleepd..."
   if [ -e $PIDFILE ]; then
     kill $(cat $PIDFILE) 2>/dev/null
@@ -31,6 +41,7 @@ sleepd_force_stop() {
 }
 
 sleepd_stop() {
+  [ $UID -eq 0 ] || exit 4
   echo "Stopping sleepd..."
   if [ -e $PIDFILE ]; then
     kill $(cat $PIDFILE) 2>/dev/null
@@ -62,7 +73,7 @@ case $1 in
     sleepd_status
    ;;
   *)
-    echo "Usage: $0 {start|stop|restart|status}"
+    echo "Usage: $0 {start|stop|force_stop|restart|status}"
     exit 1
    ;;
 esac
diff --git a/system/sleepd/sleepd.SlackBuild b/system/sleepd/sleepd.SlackBuild
index 2d16819b8c..d4847ffee4 100644
--- a/system/sleepd/sleepd.SlackBuild
+++ b/system/sleepd/sleepd.SlackBuild
@@ -23,7 +23,7 @@
 
 PRGNAM="sleepd"
 VERSION=${VERSION:-2.05}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,6 +70,8 @@ find -L . \
 
 sed -i "s|share/man|man|"g Makefile
 
+patch -p1 < $CWD/fix_acpica_version.patch
+
 make
 make install PREFIX=$PKG
 
@@ -78,6 +80,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.sleepd > $PKG/etc/rc.d/rc.sleepd.new
+cp -a debian/default $PKG/etc/sleepd.conf
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a GPL INSTALL TODO $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/sleuthkit/sleuthkit.SlackBuild b/system/sleuthkit/sleuthkit.SlackBuild
index 5bcdd6d2d8..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.7.0 October 2019.  Barry J. Grundy
+# Updated v4.10.1 December 2020.  Barry J. Grundy
 # <bgrundy(at)linuxleo.com>
 
 PRGNAM=sleuthkit
-VERSION=${VERSION:-4.7.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 755552c277..5654baee56 100644
--- a/system/sleuthkit/sleuthkit.info
+++ b/system/sleuthkit/sleuthkit.info
@@ -1,8 +1,8 @@
 PRGNAM="sleuthkit"
-VERSION="4.7.0"
+VERSION="4.10.1"
 HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-DOWNLOAD="https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.7.0/sleuthkit-4.7.0.tar.gz"
-MD5SUM="ffd33f3130f954583527b31242bbaefa"
+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 98efdf04ce..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.8.6}
+VERSION=${VERSION:-3.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/slpkg/slpkg.info b/system/slpkg/slpkg.info
index 1a2bdf45ed..66c1162c9f 100644
--- a/system/slpkg/slpkg.info
+++ b/system/slpkg/slpkg.info
@@ -1,8 +1,8 @@
 PRGNAM="slpkg"
-VERSION="3.8.6"
+VERSION="3.9.1"
 HOMEPAGE="https://dslackw.gitlab.io/slpkg"
-DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/3.8.6/slpkg-3.8.6.tar.gz"
-MD5SUM="79019bd09837370c92fc301822da2c8b"
+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/solarize-12x29-psf/solarize-12x29-psf.info b/system/solarize-12x29-psf/solarize-12x29-psf.info
index c163f58194..7752ca27e9 100644
--- a/system/solarize-12x29-psf/solarize-12x29-psf.info
+++ b/system/solarize-12x29-psf/solarize-12x29-psf.info
@@ -1,7 +1,7 @@
 PRGNAM="solarize-12x29-psf"
 VERSION="20150529"
 HOMEPAGE="https://github.com/talamus/solarize-12x29-psf"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/solarize-12x29-psf-20150529.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/solarize-12x29-psf-20150529.tar.gz"
 MD5SUM="a43342ae0d02a2c0d19909a52681f9e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/splix/README b/system/splix/README
index d7e672df80..f8a1037680 100644
--- a/system/splix/README
+++ b/system/splix/README
@@ -1,12 +1,14 @@
-SpliX is a set of CUPS printer drivers for SPL (Samsung Printer Language)
-printers. It covers several Samsung and Xerox printers. See ppd/*.ppd in
-the tarball for supported models. Only SPL2 and SPLc printers are supported.
+SpliX is a set of CUPS printer drivers for SPL (Samsung Printer
+Language) printers. It covers several Samsung and Xerox printers. See
+ppd/*.ppd in the tarball for supported models. Only SPL2 and SPLc
+printers are supported.
 
 JBIG-KIT is an optional dependency. To build SpliX with support for JBIG printers:
   JBIG=yes ./splix.SlackBuild
 
 IMPORTANT:
-If you are upgrading your current version, you MUST delete your printer
-in the CUPS interface and install it again. This operation MUST be done
-since CUPS caches a copy of the PPD file, so if the PPD changes from one
-version of splix to the next, CUPS will still have the cached copy.
+If you are upgrading your current version, you MUST delete your
+printer in the CUPS interface and install it again. This operation
+MUST be done since CUPS caches a copy of the PPD file, so if the PPD
+changes from one version of splix to the next, CUPS will still have
+the cached copy.
diff --git a/system/splix/splix.SlackBuild b/system/splix/splix.SlackBuild
index 65d2327c20..52d2f8d914 100644
--- a/system/splix/splix.SlackBuild
+++ b/system/splix/splix.SlackBuild
@@ -5,8 +5,8 @@
 # Currently maintained by endspiel <endspiel@disroot.org>
 
 PRGNAM=splix
+VERSION=${VERSION:-2.0.0_76268c4}
 SRCVERSION=${SRCVERSION:-76268c4dd7dbc8218ea7426401104c3b40cc707a}
-VERSION=${VERSION:-2.0.0_${SRCVERSION:0:7}}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
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/sqlite2/sqlite2.info b/system/sqlite2/sqlite2.info
index 4176372a7d..aaa7b6674f 100644
--- a/system/sqlite2/sqlite2.info
+++ b/system/sqlite2/sqlite2.info
@@ -2,7 +2,7 @@ PRGNAM="sqlite2"
 VERSION="2.8.17_7"
 HOMEPAGE="http://www.sqlite.org"
 DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17.orig.tar.gz \
-          http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17-7.diff.gz"
+          http://archive.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17-7.diff.gz"
 MD5SUM="04f15ed552134b06528b3628be7d7315 \
         9d926474caaed0d12f2fb418bdcf1ccf"
 DOWNLOAD_x86_64=""
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/steghide/README b/system/steghide/README
index 021c40d4d7..70510ec141 100644
--- a/system/steghide/README
+++ b/system/steghide/README
@@ -1,4 +1,4 @@
 Steghide is a steganography program that is able to hide data in
 various kinds of image- and audio-files.
 The color- respectivly sample-frequencies are not changed thus making
-the embedding resistant against first-order statistical tests.
\ No newline at end of file
+the embedding resistant against first-order statistical tests.
diff --git a/system/steghide/steghide.SlackBuild b/system/steghide/steghide.SlackBuild
index eaf19f30a7..ce643226b8 100644
--- a/system/steghide/steghide.SlackBuild
+++ b/system/steghide/steghide.SlackBuild
@@ -103,4 +103,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:-tgz}
\ No newline at end of file
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
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/sunflower/README b/system/sunflower/README
new file mode 100644
index 0000000000..711a5bd496
--- /dev/null
+++ b/system/sunflower/README
@@ -0,0 +1,5 @@
+Sunflower is a small and highly customizable twin-panel file manager
+with support for plugins. It contains a built-in terminal.
+
+Sunflower 0.4 requires GTK+ 3.22 (and thus is unsupported on 
+Slackware 14.2).
diff --git a/system/sunflower/doinst.sh b/system/sunflower/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/sunflower/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/system/sunflower/slack-desc b/system/sunflower/slack-desc
new file mode 100644
index 0000000000..633b0afd27
--- /dev/null
+++ b/system/sunflower/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------------------------------------------------------|
+sunflower: sunflower (Twin-panel file manager)
+sunflower:
+sunflower: Sunflower is a small and highly customizable twin-panel file manager
+sunflower: with support for plugins.
+sunflower:
+sunflower:
+sunflower:
+sunflower:
+sunflower:
+sunflower:
+sunflower:
diff --git a/system/sunflower/sunflower.SlackBuild b/system/sunflower/sunflower.SlackBuild
new file mode 100644
index 0000000000..a4d545f82a
--- /dev/null
+++ b/system/sunflower/sunflower.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for sunflower
+# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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=sunflower
+VERSION=${VERSION:-0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+COMMIT=61
+
+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 Sunflower
+tar xvf $CWD/$PRGNAM-$VERSION-$COMMIT.tgz
+cd Sunflower
+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 {} \;
+
+# Treat sunflower as an executable
+mkdir -p "$PKG/usr/bin"
+[ ! -f "$PKG/usr/bin/sunflower" ] \
+   && echo -e '#!/bin/bash\nexec python /usr/share/sunflower/Sunflower.py "$@"' > "$PKG/usr/bin/sunflower"
+chmod 755 "$PKG/usr/bin/sunflower"
+
+# Copy other files
+mkdir -p "$PKG/usr/share/sunflower"
+cp -r Sunflower.py application images translations "$PKG/usr/share/sunflower/"
+install -Dm644 Sunflower.desktop "$PKG/usr/share/applications/sunflower.desktop"
+install -Dm644 images/sunflower.svg "$PKG/usr/share/pixmaps/sunflower.svg"
+install -Dm644 images/sunflower.png "$PKG/usr/share/pixmaps/sunflower.png"
+
+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 AUTHORS CHANGES COPYING DEPENDS LICENSE README.md 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/sunflower/sunflower.info b/system/sunflower/sunflower.info
new file mode 100644
index 0000000000..e2d5a51dc6
--- /dev/null
+++ b/system/sunflower/sunflower.info
@@ -0,0 +1,10 @@
+PRGNAM="sunflower"
+VERSION="0.3"
+HOMEPAGE="https://sunflower-fm.org"
+DOWNLOAD="https://sunflower-fm.org/pub/sunflower-0.3-61.tgz"
+MD5SUM="a5cd28438e83b88e5a4edeb3aacef0c6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python-chardet"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu1@isaacyu1.com"
diff --git a/system/symbola-font-ttf/README b/system/symbola-font-ttf/README
index faea3bae56..9744e70cd7 100644
--- a/system/symbola-font-ttf/README
+++ b/system/symbola-font-ttf/README
@@ -1,4 +1,6 @@
-Symbola is a ttf font, which contains many scripts, special symbols,
+Symbola is a otf font, which contains many scripts, special symbols,
 and emoji characters supported by The Unicode Standard.
 
 Symbola is free strictly for personal, non-commercial use.
+
+This script also creates the ttf font file using the FontForge.
diff --git a/system/symbola-font-ttf/doinst.sh b/system/symbola-font-ttf/doinst.sh
index 883c47ac0a..ed20b4faf0 100644
--- a/system/symbola-font-ttf/doinst.sh
+++ b/system/symbola-font-ttf/doinst.sh
@@ -1,6 +1,9 @@
 # Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+    cd /usr/share/fonts/TTF
     mkfontscale .
     mkfontdir .
   )
diff --git a/system/symbola-font-ttf/slack-desc b/system/symbola-font-ttf/slack-desc
index 2204d7d492..7276850d5a 100644
--- a/system/symbola-font-ttf/slack-desc
+++ b/system/symbola-font-ttf/slack-desc
@@ -13,7 +13,7 @@ symbola-font-ttf: and emoji characters supported by The Unicode Standard.
 symbola-font-ttf:
 symbola-font-ttf: Symbola is free strictly for personal, non-commercial use.
 symbola-font-ttf:
-symbola-font-ttf: Homepage: http://users.teilar.gr/~g1951d/
+symbola-font-ttf: Homepage: https://dn-works.com/ufas/
 symbola-font-ttf:
 symbola-font-ttf:
 symbola-font-ttf:
diff --git a/system/symbola-font-ttf/symbola-font-ttf.SlackBuild b/system/symbola-font-ttf/symbola-font-ttf.SlackBuild
index 5a9a1e9475..0c3420e93e 100644
--- a/system/symbola-font-ttf/symbola-font-ttf.SlackBuild
+++ b/system/symbola-font-ttf/symbola-font-ttf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for symbola-font-ttf
 
-# Copyright 2016-2019 Alexander Verbovetsky, Moscow, Russia
+# Copyright 2016-2020 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=symbola-font-ttf
-VERSION=${VERSION:-12.00}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-13.00}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -44,11 +44,15 @@ mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 unzip $CWD/Symbola.zip
 
-mkdir -p $PKG/usr/share/fonts/TTF/
-install -m 0644 -o root -g root Symbola_Hinted.ttf $PKG/usr/share/fonts/TTF/
+fontforge -lang=ff -c 'Open("Symbola.otf");Generate("Symbola.ttf");Close();'
+
+mkdir -p $PKG/usr/share/fonts/{O,T}TF/
+install -m 0644 -o root -g root Symbola.otf $PKG/usr/share/fonts/OTF/
+install -m 0644 -o root -g root Symbola.ttf $PKG/usr/share/fonts/TTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-install -m 0644 -o root -g root $CWD/Symbola.pdf $CWD/License.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 0644 -o root -g root Symbola.odt Symbola.pdf $CWD/License.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/symbola-font-ttf/symbola-font-ttf.info b/system/symbola-font-ttf/symbola-font-ttf.info
index 26e17fea78..c2a8c85655 100644
--- a/system/symbola-font-ttf/symbola-font-ttf.info
+++ b/system/symbola-font-ttf/symbola-font-ttf.info
@@ -1,14 +1,12 @@
 PRGNAM="symbola-font-ttf"
-VERSION="12.00"
-HOMEPAGE="http://users.teilar.gr/~g1951d/"
-DOWNLOAD="https://web.archive.org/web/20191029215733/users.teilar.gr/~g1951d/Symbola.zip \
-          https://web.archive.org/web/20191029215733/users.teilar.gr/~g1951d/Symbola.pdf \
-          https://web.archive.org/web/20191029215733/users.teilar.gr/~g1951d/License.pdf"
-MD5SUM="be7b84a1e5ba3fce6bf73338aa7013cc \
-        b1f8ae8b5e8c77b355fe5146808b63ff \
-        b4e40c1c0e7acb7184f6341f303a1bf7"
+VERSION="13.00"
+HOMEPAGE="https://dn-works.com/ufas/"
+DOWNLOAD="https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/Symbola.zip \
+          https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf"
+MD5SUM="a14dda162bd1cb407059f62d77fcc5ea \
+        bb6edb616a86a98826cd269486b095b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="fontforge"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/system/sysbench/README b/system/sysbench/README
new file mode 100644
index 0000000000..ad4a872557
--- /dev/null
+++ b/system/sysbench/README
@@ -0,0 +1,4 @@
+sysbench is a benchmark suite which allows you to quickly get an 
+impression of system performance which is important if you plan to 
+run a database under intensive load. This article explains how to 
+benchmark your CPU, file IO, and MySQL performance with sysbench.
diff --git a/system/sysbench/slack-desc b/system/sysbench/slack-desc
new file mode 100644
index 0000000000..792f18d6d7
--- /dev/null
+++ b/system/sysbench/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------------------------------------------------------|
+sysbench: sysbench (benchmark suite)
+sysbench:
+sysbench: sysbench is a benchmark suite which allows you to quickly get an 
+sysbench: impression of system performance which is important if you plan to 
+sysbench: run a database under intensive load. This article explains how to 
+sysbench: benchmark your CPU, file IO, and MySQL performance with sysbench.
+sysbench:
+sysbench:
+sysbench:
+sysbench:
+sysbench:
diff --git a/system/sysbench/sysbench.SlackBuild b/system/sysbench/sysbench.SlackBuild
new file mode 100644
index 0000000000..69dc96805f
--- /dev/null
+++ b/system/sysbench/sysbench.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for sysbench
+
+# Copyright 2020 Sergio Vicari <devteamtuc[at]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=sysbench
+VERSION=${VERSION:-1.0.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
+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 \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --bindir=/usr/bin \
+  --datarootdir=/usr/share \
+  --datadir=/usr/share \
+  --htmldir=/usr/doc/$PRGNAM-$VERSION/html
+
+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 README-Oracle.md 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/system/sysbench/sysbench.info b/system/sysbench/sysbench.info
new file mode 100644
index 0000000000..ff5bc4deaa
--- /dev/null
+++ b/system/sysbench/sysbench.info
@@ -0,0 +1,10 @@
+PRGNAM="sysbench"
+VERSION="1.0.19"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+DOWNLOAD="https://github.com/akopytov/sysbench/archive/1.0.19/sysbench-1.0.19.tar.gz"
+MD5SUM="2912bfe7238cac7351459019a84e2557"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="lua"
+MAINTAINER="Sergio Vicari"
+EMAIL="devteamtuc@gmail.com"
diff --git a/system/sysdig/sysdig.SlackBuild b/system/sysdig/sysdig.SlackBuild
index 91dcccac29..6ef570486d 100644
--- a/system/sysdig/sysdig.SlackBuild
+++ b/system/sysdig/sysdig.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sysdig
 
-# Copyright 2015-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2015-2020 Larry Hajali <larryhaja[at]gmail[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=sysdig
-VERSION=${VERSION:-0.26.4}
+VERSION=${VERSION:-0.26.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/sysdig/sysdig.info b/system/sysdig/sysdig.info
index e9592e0005..0e203261da 100644
--- a/system/sysdig/sysdig.info
+++ b/system/sysdig/sysdig.info
@@ -1,10 +1,10 @@
 PRGNAM="sysdig"
-VERSION="0.26.4"
+VERSION="0.26.6"
 HOMEPAGE="https://www.sysdig.org"
-DOWNLOAD="https://github.com/draios/sysdig/archive/0.26.4/sysdig-0.26.4.tar.gz"
-MD5SUM="5d7b57d13e70ed77799c112bbba8769e"
+DOWNLOAD="https://github.com/draios/sysdig/archive/0.26.6/sysdig-0.26.6.tar.gz"
+MD5SUM="60f9498c97b6e69639a8be8e9d6ed032"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jsoncpp lua libb64 jq tbb grpc"
+REQUIRES="jsoncpp lua libb64 jq tbb grpc gtest"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/system/system76-power/README b/system/system76-power/README
index 59f0b219f4..6e1f40fa8f 100644
--- a/system/system76-power/README
+++ b/system/system76-power/README
@@ -3,12 +3,23 @@ system76-power is a utility for managing graphics and power profiles.
 When run in daemon mode, system76-power manages the fan speed of fans
 connected to the System76 Io board on Thelio desktops.
 
-To start the daemon at boot, add the following to your /etc/rc.d/rc.local
-script and make sure rc.system76-power has executable permissions set:
+To start the daemon at boot, add the following to your
+/etc/rc.d/rc.local script and make sure rc.system76-power has executable
+permissions set:
   if [ -x /etc/rc.d/rc.system76-power ]; then
     /etc/rc.d/rc.system76-power start
   fi
 
 The system76-power daemon log messages are logged to
-/var/log/system76-power.log by default.  Logging can be disabled by setting
-LOG_FILE=/dev/null in /etc/rc.d/rc.system76-power.
+/var/log/system76-power.log by default.  Logging can be disabled by
+setting LOG_FILE=/dev/null in /etc/rc.d/rc.system76-power.
+
+This project is pinned to a specific Rust version, currently 1.41.0.  As
+such, rustup is a compile time only dependency.  If this specific
+version of the Rust toolchain is not already installed, it will be
+downloaded and installed automatically during build script execution.
+It can be installed manually beforehand by running
+  rustup toolchain install 1.41.0
+
+NOTE: The directions in rustup's README must be followed so that the
+rust installed by rustup is preferred over the system rust.
diff --git a/system/system76-power/system76-power.SlackBuild b/system/system76-power/system76-power.SlackBuild
index c0cd3c0e07..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 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.2}
+VERSION=${VERSION:-1.1.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -95,44 +95,84 @@ mkdir vendor
 (
   cd vendor
 
-  for dependency in ansi_term=0.11.0 \
-                    atty=0.2.11 \
-                    bitflags=0.7.0 \
-                    bitflags=1.0.4 \
-                    cfg-if=0.1.7 \
-                    clap=2.33.0 \
-                    dbus=0.7.1 \
-                    err-derive=0.1.5 \
-                    fern=0.5.8 \
-                    intel-pstate=0.2.0 \
-                    libc=0.2.66 \
-                    libdbus-sys=0.2.1 \
-                    log=0.4.6 \
-                    numtoa=0.1.0 \
-                    numtoa=0.2.3 \
-                    pkg-config=0.3.14 \
-                    proc-macro2=0.4.30 \
-                    quote=0.6.12 \
-                    redox_syscall=0.1.54 \
-                    redox_termios=0.1.1 \
-                    rustc_version=0.2.3 \
-                    semver=0.9.0 \
-                    semver-parser=0.7.0 \
-                    smart-default=0.5.2 \
-                    strsim=0.8.0 \
-                    syn=0.15.34 \
-                    synstructure=0.10.1 \
-                    sysfs-class=0.1.2 \
-                    termion=1.5.2 \
-                    textwrap=0.11.0 \
-                    time=0.1.42 \
-                    unicode-width=0.1.5 \
-                    unicode-xid=0.1.0 \
-                    vec_map=0.8.1 \
-                    vergen=0.1.1 \
-                    winapi=0.3.7 \
-                    winapi-i686-pc-windows-gnu=0.4.0 \
-                    winapi-x86_64-pc-windows-gnu=0.4.0; do
+  for dependency in \
+      ansi_term=0.11.0 \
+      atty=0.2.14 \
+      bitflags=1.2.1 \
+      bytes=0.5.6 \
+      cc=1.0.67 \
+      cfg-if=0.1.10 \
+      cfg-if=1.0.0 \
+      clap=2.33.3 \
+      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-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.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.86 \
+      libdbus-sys=0.2.1 \
+      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 \
+      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-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.60 \
+      synstructure=0.12.4 \
+      sysfs-class=0.1.3 \
+      textwrap=0.11.0 \
+      tokio=0.2.25 \
+      tokio-macros=0.2.6 \
+      unicode-width=0.1.8 \
+      unicode-xid=0.2.1 \
+      vec_map=0.8.2 \
+      version_check=0.9.2 \
+      winapi=0.2.8 \
+      winapi=0.3.9 \
+      winapi-build=0.1.1 \
+      winapi-i686-pc-windows-gnu=0.4.0 \
+      winapi-x86_64-pc-windows-gnu=0.4.0 \
+      ws2_32-sys=0.2.1; do
+
     dep="$(echo "$dependency" | cut -d= -f1)"
     ver="$(echo "$dependency" | cut -d= -f2)"
 
@@ -142,7 +182,7 @@ mkdir vendor
         if [ -e $CWD/$ver.tar.gz ]; then
             CRATE_FILE=$CWD/$ver.tar.gz
         else
-            CRATE_FILE=$CWD/sysfs-class-$ver.tar.gz
+            CRATE_FILE=$CWD/$dep-$ver.tar.gz
         fi
     fi
     tar xvf $CRATE_FILE
@@ -186,11 +226,6 @@ libdir=/usr/lib${LIBDIRSUFFIX} \
 make
 make install DESTDIR=$PKG
 
-# Remove suid bit on system76-power executable
-# Despite being installed SUID by the Makefile, the Debian package installed
-# on Pop!_OS has 0755 permissions for this file, so follow that convention.
-chmod u-s $PKG/usr/bin/system76-power
-
 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/system76-power/system76-power.info b/system/system76-power/system76-power.info
index 2a808eb79f..940ac9a283 100644
--- a/system/system76-power/system76-power.info
+++ b/system/system76-power/system76-power.info
@@ -1,86 +1,162 @@
 PRGNAM="system76-power"
-VERSION="1.1.2"
+VERSION="1.1.16"
 HOMEPAGE="https://github.com/pop-os/system76-power"
-DOWNLOAD="https://github.com/pop-os/system76-power/archive/1.1.2/system76-power-1.1.2.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.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-0.7.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/cfg-if/cfg-if-0.1.7.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/dbus/dbus-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/err-derive/err-derive-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fern/fern-0.5.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/intel-pstate/intel-pstate-0.2.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/atty/atty-0.2.14.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.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/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.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-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.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.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.6.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/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/pkg-config/pkg-config-0.3.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/quote/quote-0.6.12.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/rustc_version/rustc_version-0.2.3.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/smart-default/smart-default-0.5.2.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-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-0.15.34.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.10.1.crate \
-          https://github.com/pop-os/sysfs-class/archive/0.1.2/sysfs-class-0.1.2.tar.gz \
-          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/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.42.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/vec_map/vec_map-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vergen/vergen-0.1.1.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/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/version_check/version_check-0.9.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.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"
-MD5SUM="41dcd1b9733b23c5da0e41977327b500 \
+          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="dcb250b54de23e7d1c26529653668384 \
         294a49d3c53865fa7ac5d0ce2f5d5735 \
-        5d7155b7fbc0e234c017f418f0dc9d64 \
-        1dd9b755c91f0f7bb401e393a9ed69f2 \
-        e5767560aad375059c975285c07022c0 \
-        0cd2bb93a82da2e4ca526b40ae8b341e \
-        135f6d6306e50606f0475ada50c33ce2 \
-        94a04e88c1b4994f8cd5bd2ee6195a4c \
-        f2f2aaa1f19b52785665e4079ae6b903 \
-        0659d17c4a1530155d8aac2d9cab7cdb \
-        a55e4bbf06ebb689ed245fbfbf3f1dd2 \
-        36ccbe3ad01b8cdf8ae1f0e28568eae5 \
+        142cb4b9a653e56e56311f0c883b8582 \
+        6799c26a7eacaf8e58d3e45c6c5add89 \
+        d123f33f646e37ca5b825ea6eb2dd150 \
+        8637708206e07c0b9e726c7b2f4412d6 \
+        882dbbc613a93f64c3709b0a2bd0d6dc \
+        74634128440dbc3766bda76fdf0aaa05 \
+        bc79e0eb364df515a33755ac9a581cfd \
+        d2857f71826c749b5f086d57039a5e5e \
+        d228b7c6e0d220d40c064e3feaaceb7f \
+        409eecafa64d119eca370486e49dd522 \
+        9d53a61cdf8af705fd38cc26481b610d \
+        9bb99bc31c32da009e64621f4c635748 \
+        dd7c80c2d04d2e9ceba82826cf69764d \
+        54cfab480b7a5f7302eadf44129d3f4b \
+        26e7ab2c497aa1c096c0bcdd0ca609d0 \
+        5089653abbfb3f23c1c805eec737ab0d \
+        fe677f0fd8f467037f4fd5b1331c82a6 \
+        c7948dfaf0320378998df01203bb894c \
+        b98894ea67edeb6618196552c484b79d \
+        6d799b8e9321f6882053f1ceb0e3e817 \
+        2c4bc5c16b345ce4d4bbf977577fab35 \
+        551b1e3feb17b3e30fab6e9c92f129b7 \
+        e7696ea7bac5b2d62b5306498960430b \
+        639af0cca65c012e6a028acfb657e417 \
+        1c4f7ad251632c854fa67dc1f1f314e3 \
+        f1c40b9836035b69e464df711a1d2950 \
+        4379362bf1be77d47a45c7223a01eead \
+        9d033cc2daa6924420a4a89e6705773f \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        04f84e88732a1057a37b5d01c23eac1d \
         78e11acb853ee9a9c1b905e209b33d4a \
-        cc65f96341390c0f60f5216e829486e7 \
-        bbda7e9c572f651774dfdb0006b9f085 \
+        40e508baeee8cdccbc471489b0f449ff \
+        fa3630e5867493e09296155763e4f4a0 \
+        257e573f323c639630b31f147671b627 \
+        10e28d0be14899dcbad91142a228fb35 \
+        1fbbe598255c0addb31bdfbe3e76420d \
+        ff6c054468eab826f0dab7cc9a3fe557 \
+        c36d452e37c73b1e99f40bae18cddfdb \
         28a4e2e962d9723f131cdd5acb140b6d \
-        87a9d36f5ebe5eae0c3e8d69d58752e1 \
-        020c7d0be083642e24a1499122793006 \
-        54694fe2ab822610b6ee4ccc048752eb \
-        14fab6ea3c2c94779d3c50dd2dffd10e \
-        01cb5402c0fd99cebac702b76f2f2669 \
-        4d101ab24d14c54937c5f45ece8fad5f \
-        64111c20b69aa1532fb66b70c4660b55 \
-        8b4d8c7b6e3a060d365bc1ad650929fa \
-        2d3e63b50a8d82c4dccd51981e332da8 \
+        67168b70886fe5bd86af5619a3f35ce4 \
+        8771ed9f596c68a307bef4b2ac20acde \
+        cec81553116d1234d8a2a618593848ad \
+        07c75fec267864bcbb800ca7709ceae2 \
+        448bc61aee07661464d98da7660e9a1d \
+        6a32bab57772c3a1146d599b65ffb0cb \
+        7d76a523677de261dda1b65d29a93c4e \
+        c7c38eb603bed6f42edbc4294806a44a \
+        e6fd8764e2acb835d7d2f04d052e30ce \
+        0736e4f76f4f8f0a29563b0608ca3974 \
+        3233400d1bc56e7c78d4d7564d8e5b74 \
+        6261b6f5fb803ee74f3916c6550ea9b3 \
+        a69721c73263cd2040e1a5f120b03a6f \
+        e16bb0d9c46839fbf5d1a69673b00c4c \
+        6ec70075835fed0250bc4407f32d5928 \
+        f024ce4a4f4ff7326d9bbe3039017081 \
+        b006529e0475297e0e2346e2a4558931 \
+        c7bfa89e6da163f1474bb3787987bb12 \
+        26b4ac1432c227434bc943817f42872e \
         781d4ccf5d04c98fa02af207a9639249 \
-        f84584b1a3e6311ffcb517ff3e1aff0b \
-        d155c08de6c18bd55639ffed629894b9 \
-        4d96a8caaddec44a7cc692fb32f9753d \
-        9f1f6e2fe9afbbcc351a7430962a7571 \
+        c72a927acc4cc7695ae9c73c19964a6f \
+        09f09b3f56045183393726a31d8a0192 \
+        80ca0de72168dc03e90bc3c519153305 \
         a8de006fe0c7e373c560dd51599287a8 \
-        3d311d2cedf2d3d7b11b32baf470b178 \
-        d7c493ca4f84a7d50b53646421a37487 \
-        5aaf04f9a94a6450e3e4963ddd62b92d \
-        0eedbc32447f40b3045d6de3910b5415 \
-        03910f37dc041fd9402bda7825e8404f \
-        38569b37293d94fc57b6e1449a1c38aa \
+        1c63947b82fb656602a15cff8cc7c360 \
+        2c8f1fe04919c09e705eccb13a2aa583 \
+        4272c279b06b88f8b0ffce7109348e27 \
+        a51c43692084979295641a7ffba4b297 \
+        333b4ba3f64c35b6f89b521e8d64548b \
+        8b01b016a9b6deebc1b43f296057efb5 \
+        b44489eb4799c4fabac3fceb48de54f7 \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        c900e7dbce808ff8ced375077b17a163 \
         db96b50050277bf05a3c68534bbb9586 \
-        09de9d01e7331ff3da11f58be8bef0df"
+        09de9d01e7331ff3da11f58be8bef0df \
+        38346bab0933c9eb1e36d22fe4220ba7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="system76-io-dkms"
+REQUIRES="system76-io-dkms rustup %README%"
 MAINTAINER="Erich Ritz"
 EMAIL="erich.public@protonmail.com"
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/targetcli-fb/targetcli-fb.SlackBuild b/system/targetcli-fb/targetcli-fb.SlackBuild
index ddf581b88d..8a8eb91dca 100644
--- a/system/targetcli-fb/targetcli-fb.SlackBuild
+++ b/system/targetcli-fb/targetcli-fb.SlackBuild
@@ -24,9 +24,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=targetcli-fb
-VERSION=${VERSION:-2.1.51}
-RTVERSION=${RTVERSION:-2.1.71}
-CSVERSION=${CSVERSION:-1.1.27}
+VERSION=${VERSION:-2.1.53}
+RTVERSION=${RTVERSION:-2.1.73}
+CSVERSION=${CSVERSION:-1.1.28}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/targetcli-fb/targetcli-fb.info b/system/targetcli-fb/targetcli-fb.info
index 10a891f839..99d90cc03d 100644
--- a/system/targetcli-fb/targetcli-fb.info
+++ b/system/targetcli-fb/targetcli-fb.info
@@ -1,12 +1,12 @@
 PRGNAM="targetcli-fb"
-VERSION="2.1.51"
+VERSION="2.1.53"
 HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
-DOWNLOAD="https://github.com/open-iscsi/targetcli-fb/archive/v2.1.51/targetcli-fb-2.1.51.tar.gz \
-          https://github.com/open-iscsi/rtslib-fb/archive/v2.1.71/rtslib-fb-2.1.71.tar.gz \
-          https://github.com/open-iscsi/configshell-fb/archive/v1.1.27/configshell-fb-1.1.27.tar.gz"
-MD5SUM="e0971e9befda9f43fc16a5b754d2c063 \
-        e53e1a3309ac57f934850ffbd45ef993 \
-        daf5eab4666b298e4444c841d645ffee"
+DOWNLOAD="https://github.com/open-iscsi/targetcli-fb/archive/v2.1.53/targetcli-fb-2.1.53.tar.gz \
+          https://github.com/open-iscsi/rtslib-fb/archive/v2.1.73/rtslib-fb-2.1.73.tar.gz \
+          https://github.com/open-iscsi/configshell-fb/archive/v1.1.28/configshell-fb-1.1.28.tar.gz"
+MD5SUM="61cdf4c71a0b206b021232fb9e845bd8 \
+        5eb1fc54a5f16566b76b6037950c0dc6 \
+        d1908982dffb1df700fa52ed65949729"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyudev pyparsing six"
diff --git a/system/tbsm/README b/system/tbsm/README
index 6d7a8b7a0f..a02d5c305a 100644
--- a/system/tbsm/README
+++ b/system/tbsm/README
@@ -1,10 +1,11 @@
 tbsm is a pure bash session or application launcher, inspired by cdm,
 tdm and krunner.  It supports X and Wayland sessions.
 
-Autostart tbsm upon login by adding the following to $HOME/.profile:
+Autostart tbsm upon login by adding the following to $HOME/.profile
+(Reference: https://wiki.gentoo.org/wiki/Start_X_on_login):
 
-# Autostart tbsm on all TTYs
-if [[ ! ${DISPLAY} && ${XDG_VTNR} -le 2 ]]; then
+# Autostart tbsm on tty1
+if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
     exec tbsm
 fi
 
diff --git a/system/tbsm/README.SLACKWARE b/system/tbsm/README.SLACKWARE
index d80360d4df..2a04e39c6a 100644
--- a/system/tbsm/README.SLACKWARE
+++ b/system/tbsm/README.SLACKWARE
@@ -1,6 +1,6 @@
-tbsm may run desktop sessions, such as dwm, without consolekit and dbus
+tbsm may run desktop sessions, such as i3, without consolekit and dbus
 support.  Thus, given that tbsm detects available .desktop files from
 /usr/share/xsessions, create a copy of the .desktop file and modify
 the Name and Exec lines as such:
-Name=dwm-dbus
-Exec=ck-launch-session dbus-launch --sh-syntax --exit-with-session dwm
+Name=i3-dbus
+Exec=ck-launch-session dbus-launch --sh-syntax --exit-with-session i3
diff --git a/system/telegraf/telegraf.SlackBuild b/system/telegraf/telegraf.SlackBuild
index 729546bb15..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.13.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.default b/system/telegraf/telegraf.default
deleted file mode 100644
index 56276508e3..0000000000
--- a/system/telegraf/telegraf.default
+++ /dev/null
@@ -1,3 +0,0 @@
-# Telegraf options
-
-TELEGRAF_OPTS=""
diff --git a/system/telegraf/telegraf.info b/system/telegraf/telegraf.info
index 9fd762f6d7..92f01bc041 100644
--- a/system/telegraf/telegraf.info
+++ b/system/telegraf/telegraf.info
@@ -1,10 +1,10 @@
 PRGNAM="telegraf"
-VERSION="1.13.4"
+VERSION="1.18.1"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.13.4_linux_i386.tar.gz"
-MD5SUM="d722f4deae4e99f2185ae3056abe9484"
-DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.13.4_linux_amd64.tar.gz"
-MD5SUM_x86_64="94272c7e954362f2048f499f5c31c818"
+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/terminology/terminology.SlackBuild b/system/terminology/terminology.SlackBuild
index fed8189f2c..ba6ce393f3 100644
--- a/system/terminology/terminology.SlackBuild
+++ b/system/terminology/terminology.SlackBuild
@@ -23,7 +23,7 @@
 
 
 PRGNAM=terminology
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,7 +54,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="AUTHORS COPYING ChangeLog DESIGN.md NEWS README.md TODO"
+
+DOCS="AUTHORS COPYING ChangeLog ChangeLog.theme DESIGN.md NEWS README.md THEME.md TODO"
 
 set -e
 
@@ -76,8 +77,6 @@ CXXFLAGS="$SLKCFLAGS" \
 meson \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
   --mandir=/usr/man \
   . build
 
diff --git a/system/terminology/terminology.info b/system/terminology/terminology.info
index b29f33b5f8..6c5301afc7 100644
--- a/system/terminology/terminology.info
+++ b/system/terminology/terminology.info
@@ -1,10 +1,10 @@
 PRGNAM="terminology"
-VERSION="1.3.2"
+VERSION="1.8.1"
 HOMEPAGE="https://www.enlightenment.org/about-terminology"
-DOWNLOAD="https://download.enlightenment.org/rel/apps/terminology/terminology-1.3.2.tar.xz"
-MD5SUM="ab125bd9b4b183cffa1ca61143d5888b"
+DOWNLOAD="https://download.enlightenment.org/rel/apps/terminology/terminology-1.8.1.tar.xz"
+MD5SUM="a01667086dd35557ecbbe3836ba66740"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="efl meson"
+REQUIRES="efl"
 MAINTAINER="Erik Falor"
 EMAIL="ewfalor@gmail.com"
diff --git a/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild b/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild
index ffb391afff..c2ad2a330f 100644
--- a/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild
+++ b/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for thin-provisioning-tools
 
-# Copyright 2016-2019 Marek Wodzinski
+# Copyright 2016-2020 Marek Wodzinski
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=thin-provisioning-tools
-VERSION=${VERSION:-0.8.5}
+VERSION=${VERSION:-0.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/thin-provisioning-tools/thin-provisioning-tools.info b/system/thin-provisioning-tools/thin-provisioning-tools.info
index 371c3da667..096e0a9fed 100644
--- a/system/thin-provisioning-tools/thin-provisioning-tools.info
+++ b/system/thin-provisioning-tools/thin-provisioning-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="thin-provisioning-tools"
-VERSION="0.8.5"
+VERSION="0.9.0"
 HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-DOWNLOAD="https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5/thin-provisioning-tools-0.8.5.tar.gz"
-MD5SUM="4ff949e9eef65aaee68d6d923ba0862f"
+DOWNLOAD="https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0/thin-provisioning-tools-0.9.0.tar.gz"
+MD5SUM="b3ce6f476a5b7ea64c583e7d910d2db7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/thinkfan/thinkfan.SlackBuild b/system/thinkfan/thinkfan.SlackBuild
index c8e7b688aa..b3a0afefcc 100644
--- a/system/thinkfan/thinkfan.SlackBuild
+++ b/system/thinkfan/thinkfan.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for thinkfan
 
-# Copyright 2014-2019 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=thinkfan
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/thinkfan/thinkfan.info b/system/thinkfan/thinkfan.info
index 5656669cdf..736fd11b37 100644
--- a/system/thinkfan/thinkfan.info
+++ b/system/thinkfan/thinkfan.info
@@ -1,8 +1,8 @@
 PRGNAM="thinkfan"
-VERSION="1.0.2"
+VERSION="1.1"
 HOMEPAGE="https://github.com/vmatare/thinkfan"
-DOWNLOAD="https://github.com/vmatare/thinkfan/archive/1.0.2/thinkfan-1.0.2.tar.gz"
-MD5SUM="2fc604c3670a1432dffb4482d1cf2193"
+DOWNLOAD="https://github.com/vmatare/thinkfan/archive/1.1/thinkfan-1.1.tar.gz"
+MD5SUM="cf9caa107e17bea95871d78955f49e3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/tiger/tiger.SlackBuild b/system/tiger/tiger.SlackBuild
index 1561f5a513..d9ae3e69b9 100644
--- a/system/tiger/tiger.SlackBuild
+++ b/system/tiger/tiger.SlackBuild
@@ -48,7 +48,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 
-# The package can be verified with Javier Fernández-Sanguino's PGP key (0xDC814B09)
+# The package can be verified with Javier Fernández-Sanguino's PGP key (0xDC814B09)
 # If we have GnuPG installed, we try to verify the signature.
 if [ -x "/usr/bin/gpg" -a -x "/usr/bin/gpgv" ]
 then
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/tmpwatch/README b/system/tmpwatch/README
index 31a9a7f220..89a87bce2a 100644
--- a/system/tmpwatch/README
+++ b/system/tmpwatch/README
@@ -1,4 +1,5 @@
-The tmpwatch utility recursively searches through specified directories and
-removes files which have not been accessed in a specified period of time.
-tmpwatch is normally used to clean up directories which are used for
-temporarily holding files (for example, /tmp).
+The tmpwatch utility recursively searches through specified
+directories and removes files which have not been accessed in a
+specified period of time.  tmpwatch is normally used to clean up
+directories which are used for temporarily holding files (for example,
+/tmp).
diff --git a/system/tmpwatch/slack-desc b/system/tmpwatch/slack-desc
index 9e2c87a728..c6326fe026 100644
--- a/system/tmpwatch/slack-desc
+++ b/system/tmpwatch/slack-desc
@@ -16,3 +16,4 @@ tmpwatch: /tmp).  Tmpwatch ignores symlinks, won't switch filesystems and only
 tmpwatch: removes empty directories and regular files.
 tmpwatch:
 tmpwatch: https://fedorahosted.org/tmpwatch/
+tmpwatch:
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/tpc/README b/system/tpc/README
index 7c80c34b9e..01ca47b20d 100644
--- a/system/tpc/README
+++ b/system/tpc/README
@@ -1 +1 @@
-Cross-platform utility to control and tweak modern AMD processors
\ No newline at end of file
+Cross-platform utility to control and tweak modern AMD processors
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 b0d689f9d9..d6cd6a2979 100644
--- a/system/tpm/tpm.SlackBuild
+++ b/system/tpm/tpm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tpm
 
-# Copyright 2015-2016 Hunter Sezen California, USA
+# Copyright 2015-2016, 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=tpm
-VERSION=${VERSION:-1.3.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.3.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -34,7 +34,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -49,15 +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/tpm/tpm.info b/system/tpm/tpm.info
index 09f3c3f3a3..4b0f8ba320 100644
--- a/system/tpm/tpm.info
+++ b/system/tpm/tpm.info
@@ -1,8 +1,8 @@
 PRGNAM="tpm"
-VERSION="1.3.2"
+VERSION="1.3.3"
 HOMEPAGE="https://github.com/nmeum/tpm"
-DOWNLOAD="https://github.com/nmeum/tpm/archive/1.3.2/tpm-1.3.2.tar.gz"
-MD5SUM="d86118c38e908663c8d1422c79f6ce1d"
+DOWNLOAD="https://github.com/nmeum/tpm/archive/1.3.3/tpm-1.3.3.tar.gz"
+MD5SUM="9a5244e8f5e5bf0ba491ab7a029e79c1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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-ancient-fonts/README b/system/ttf-ancient-fonts/README
new file mode 100644
index 0000000000..79c9476e25
--- /dev/null
+++ b/system/ttf-ancient-fonts/README
@@ -0,0 +1,20 @@
+ttf-ancient-fonts (Unicode fonts for ancient scripts)
+
+These are free unicode fonts for Aegean Scripts, other ancient scripts
+in the greater Aegean vicinity, Egyptian Hieroglyphs, Sumero-Akkadian
+Cuneiform, and Musical Symbols in the Unicode Standard.
+
+Despite the "ttf" in the name, the package includes a few .otf fonts
+as well.
+
+The fonts installed by this package include hinting, by default. If you
+for some reason require unhinted fonts, export HINTS=no in the
+environment before running the SlackBuild. If you don't know what font
+hinting is, you probably shouldn't worry about it.
+
+The source tarball contains an older version of the Symbola font.
+By default it's not included here, as there's already a symbola-font-ttf
+on SBo. It's a much newer version of Symbola, but is licensed under
+highly restrictive terms. If you'd rather have the older but free-to-use
+version of Symbola, set SYMBOLA=yes in the environment for this build,
+and don't install symbola-font-ttf.
diff --git a/system/ttf-ancient-fonts/README.debian b/system/ttf-ancient-fonts/README.debian
new file mode 100644
index 0000000000..2978e4a02a
--- /dev/null
+++ b/system/ttf-ancient-fonts/README.debian
@@ -0,0 +1,21 @@
+Versions of the fonts included in this package
+==============================================
+
+Aegean      v.9.17  02/2017  Scripts and symbols of the Aegean world
+Textfonts   v.7.17  02/2017  Fonts based on early Greek editions
+
+Symbola     v.9.17  07/2017  Symbol blocks of The Unicode Standard
+Abydos      v.1.23  07/2017  A data-font of 7440 Egyptian Hieroglyphs
+Aegyptus    v.6.17  02/2017  Egyptian Hieroglyphs, Coptic, Meroitic
+Akkadian    v.7.17  02/2017  Sumero-Akkadian Cuneiform
+Anatolian   v.5.17  02/2017  Anatolian Hieroglyphs
+Maya        v.4.17  02/2017  Maya Hieroglyphs
+Unidings    v.9.17  07/2017  Icons for blocks of The Unicode Standard
+Musica      v.3.17  02/2017  Musical Notation
+Analecta    v.5.17  02/2017  Coptic, Gothic, Deseret
+
+The package also includes the following fonts obsoleted by the author:
+
+Alfios (superseded by Asea)
+Atavyros
+Avdira
diff --git a/system/ttf-ancient-fonts/copyright.debian b/system/ttf-ancient-fonts/copyright.debian
new file mode 100644
index 0000000000..24cd414239
--- /dev/null
+++ b/system/ttf-ancient-fonts/copyright.debian
@@ -0,0 +1,26 @@
+This package was debianized by:
+
+    Gürkan Myczko <gurkan@phys.ethz.ch> on Mon, 26 Nov 2007 12:13:25 +0100.
+
+It was downloaded from:
+
+    http://users.teilar.gr/~g1951d/
+
+Upstream Author:
+
+    George Douros <g1951d@teilar.gr>
+
+Copyright:
+
+    Copyright (C) 2007-2015 George Douros
+
+License:
+
+    Fonts are free for any use; they may be opened, edited,
+    modified, regenerated, packaged and redistributed.
+
+The Debian packaging is:
+
+    Copyright (C) 2007-2017 Gürkan Myczko <gurkan@phys.ethz.ch>
+    Copyright (C)      2015 Andrew Shadura <andrewsh@debian.org>
+    is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/system/ttf-ancient-fonts/doinst.sh b/system/ttf-ancient-fonts/doinst.sh
new file mode 100644
index 0000000000..2b48ae510c
--- /dev/null
+++ b/system/ttf-ancient-fonts/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+  ( cd usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-ancient-fonts/slack-desc b/system/ttf-ancient-fonts/slack-desc
new file mode 100644
index 0000000000..9df1af7ee8
--- /dev/null
+++ b/system/ttf-ancient-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------------------------------------------------------|
+ttf-ancient-fonts: ttf-ancient-fonts (Unicode fonts for ancient scripts)
+ttf-ancient-fonts:
+ttf-ancient-fonts: These are free unicode fonts for Aegean Scripts, other ancient scripts
+ttf-ancient-fonts: in the greater Aegean vicinity, Egyptian Hieroglyphs, Sumero-Akkadian
+ttf-ancient-fonts: Cuneiform, and Musical Symbols in the Unicode Standard.
+ttf-ancient-fonts:
+ttf-ancient-fonts: The TTF fonts in this package are @UN@hinted.
+ttf-ancient-fonts:
+ttf-ancient-fonts:
+ttf-ancient-fonts:
+ttf-ancient-fonts:
diff --git a/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild b/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild
new file mode 100644
index 0000000000..f01844ad7e
--- /dev/null
+++ b/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for ttf-ancient-fonts
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes to self (or anyone else who cares):
+
+# The tarball includes both hinted and unhinted versions of the fonts. The
+# Debian package installs <font>.ttf and <font>_hint.ttf for all the
+# fonts. However, if I do this, it's impossible to select the _hint
+# versions in any application (because the TTF names conflict). Since
+# it's possible to disable hinting in fontconfig or specific apps,
+# I'm only going to include the _hint versions here by default. User
+# can override with HINTS=no. The .otf fonts only come in one variety,
+# so they're always installed as-is.
+
+# There are newer versions of these fonts at https://dn-works.com/ufas/
+# but they're under what I consider a ludicrously restrictive license,
+# so I'm not going to touch them with a 10 foot pole. The symbola-font-ttf
+# package is the restrictive version, so I've made it possible to include
+# the older (free-to-use) Symbola here, though it's not the default.
+
+# There's no documentation in the tarball, so I borrow it from Debian.
+# There's no license info in the tarball, and neither the original site
+# nor web.archive.org still has has the "un-Debianized" zip files that
+# presumably included the licenses, so I'm including Debian's copyright
+# file that asserts these fonts are "free for any use".
+
+PRGNAM=ttf-ancient-fonts
+VERSION=${VERSION:-2.60}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+HINTS="${HINTS:-yes}"
+
+# If the user requested unhinted fonts, don't even bother to extract
+# the hinted versions.
+[ "$HINTS" != "yes" ] && UN=un && TAROPT="--exclude=*_hint.ttf"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION.orig
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.xz $TAROPT
+cd $PRGNAM-$VERSION.orig
+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 {} \+
+
+HAS_SYMBOLA=yes
+[ "${SYMBOLA:-no}" = "no" ] && rm -f Symbola* && HAS_SYMBOLA=no
+
+# If we're doing hinted fonts, get rid of the unhinted ones. I can't think
+# of a sane way to avoid extracting them in the first place...
+[ "$HINTS" = "yes" ] && /bin/ls *.ttf | grep -v _hint | xargs rm -f
+
+for i in TTF OTF; do
+  mkdir -p $PKG/usr/share/fonts/$i
+  install -m0644 *.$( echo $i | tr A-Z a-z) $PKG/usr/share/fonts/$i
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+for i in README.debian copyright.debian; do
+  cat $CWD/$i > $PKG/usr/doc/$PRGNAM-$VERSION/$i
+done
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+sed "s,@UN@,$UN," $CWD/slack-desc > $PKG/install/slack-desc
+if [ "$HAS_SYMBOLA" = "yes" ]; then
+  sed -i \
+    '17s/$/ This package includes the Symbola font, and will conflict with symbola-font-ttf/' \
+    $PKG/install/slack-desc
+fi
+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/ttf-ancient-fonts/ttf-ancient-fonts.info b/system/ttf-ancient-fonts/ttf-ancient-fonts.info
new file mode 100644
index 0000000000..3e51b06439
--- /dev/null
+++ b/system/ttf-ancient-fonts/ttf-ancient-fonts.info
@@ -0,0 +1,10 @@
+PRGNAM="ttf-ancient-fonts"
+VERSION="2.60"
+HOMEPAGE="https://packages.debian.org/sid/ttf-ancient-fonts"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/t/ttf-ancient-fonts/ttf-ancient-fonts_2.60.orig.tar.xz"
+MD5SUM="a0132b3262b3eec9bc2fc8ff8c4ed9f3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/ttf-console-fonts/ttf-console-fonts.info b/system/ttf-console-fonts/ttf-console-fonts.info
index 8121f46f78..84c4372ff6 100644
--- a/system/ttf-console-fonts/ttf-console-fonts.info
+++ b/system/ttf-console-fonts/ttf-console-fonts.info
@@ -1,7 +1,7 @@
 PRGNAM="ttf-console-fonts"
 VERSION="20170403_abc5771"
-HOMEPAGE="http://urchlay.naptime.net/repos/ttf-console-fonts/about/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ttf-console-fonts-20170403_abc5771.tar.gz"
+HOMEPAGE="https://slackware.uk/~urchlay/repos/ttf-console-fonts/about/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ttf-console-fonts-20170403_abc5771.tar.gz"
 MD5SUM="36be7b721871c2c21f15a9e9206066cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
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-ipaex/ttf-ipaex.SlackBuild b/system/ttf-ipaex/ttf-ipaex.SlackBuild
index b0504fac8d..979f694305 100644
--- a/system/ttf-ipaex/ttf-ipaex.SlackBuild
+++ b/system/ttf-ipaex/ttf-ipaex.SlackBuild
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for ttf-ipaex
-# $Id: ttf-ipaex.SlackBuild,v 1.2 2018/09/18 03:45:07 pomf Exp pomf $
 
-# Copyright 2018 pomfland
+# Copyright 2020 pomfland
 # 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=ttf-ipaex
-VERSION=${VERSION:-003.01}
+VERSION=${VERSION:-004.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/ttf-ipaex/ttf-ipaex.info b/system/ttf-ipaex/ttf-ipaex.info
index 19f9df4f8d..303be395b9 100644
--- a/system/ttf-ipaex/ttf-ipaex.info
+++ b/system/ttf-ipaex/ttf-ipaex.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-ipaex"
-VERSION="003.01"
+VERSION="004.01"
 HOMEPAGE="https://ipafont.ipa.go.jp"
-DOWNLOAD="https://oscdl.ipa.go.jp/IPAexfont/IPAexfont00301.zip"
-MD5SUM="1dfe7be38d73b389b63525b785423d2c"
+DOWNLOAD="https://ipafont.ipa.go.jp/IPAexfont/IPAexfont00401.zip"
+MD5SUM="57f2631833c1049ea89320971cc74ce5"
 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/unetbootin/unetbootin.SlackBuild b/system/unetbootin/unetbootin.SlackBuild
index dedae6b2e7..23e9f5ba58 100644
--- a/system/unetbootin/unetbootin.SlackBuild
+++ b/system/unetbootin/unetbootin.SlackBuild
@@ -9,9 +9,10 @@
 # v608: (jw) version bump to 608 21 March 2015 (also tested on multilib 14.1)
 # v647: (jw) version bump to 647 26 May 2017
 # v661: (jw) version bump to 661 29 July 2018 / take sources from github.com as the sourceforge page seems to be somehow obsolete
+# v677: (SBo) version bump to 677 14 April 2020
 
 PRGNAM=unetbootin
-VERSION=${VERSION:-661}
+VERSION=${VERSION:-677}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/unetbootin/unetbootin.info b/system/unetbootin/unetbootin.info
index d6f3dbb6d5..43633d144b 100644
--- a/system/unetbootin/unetbootin.info
+++ b/system/unetbootin/unetbootin.info
@@ -1,8 +1,8 @@
 PRGNAM="unetbootin"
-VERSION="661"
+VERSION="677"
 HOMEPAGE="https://unetbootin.github.io"
-DOWNLOAD="https://github.com/unetbootin/unetbootin/releases/download/661/unetbootin-source-661.tar.gz"
-MD5SUM="eafb57095669add5d3eef49193bcb5a9"
+DOWNLOAD="https://github.com/unetbootin/unetbootin/releases/download/677/unetbootin-source-677.tar.gz"
+MD5SUM="1478ccd53e0ea003fd33135cf458b9e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="p7zip"
diff --git a/system/unigine-heaven-benchmark/README b/system/unigine-heaven-benchmark/README
new file mode 100644
index 0000000000..81758f21e6
--- /dev/null
+++ b/system/unigine-heaven-benchmark/README
@@ -0,0 +1,9 @@
+Heaven Benchmark is a GPU-intensive benchmark that hammers graphics
+cards to the limits. This powerful tool can be effectively used
+to determine the stability of a GPU under extremely stressful
+conditions, as well as check the cooling system's potential
+under maximum heat output.
+
+Please note that the source file is 273mb if you are on a slow
+internet connection. 
+
diff --git a/system/unigine-heaven-benchmark/doinst.sh b/system/unigine-heaven-benchmark/doinst.sh
new file mode 100644
index 0000000000..392c12adb9
--- /dev/null
+++ b/system/unigine-heaven-benchmark/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
diff --git a/system/unigine-heaven-benchmark/slack-desc b/system/unigine-heaven-benchmark/slack-desc
new file mode 100644
index 0000000000..3a3cc4a94d
--- /dev/null
+++ b/system/unigine-heaven-benchmark/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------------------------------------------------------|
+unigine-heaven-benchmark: unigine-heaven-benchmark (benchmark software)
+unigine-heaven-benchmark:
+unigine-heaven-benchmark: Heaven Benchmark is a GPU-intensive benchmark that hammers graphics
+unigine-heaven-benchmark: cards to the limits. This powerful tool can be effectively used
+unigine-heaven-benchmark: to determine the stability of a GPU under extremely stressful
+unigine-heaven-benchmark: conditions, as well as check the cooling system's potential
+unigine-heaven-benchmark: under maximum heat output.
+unigine-heaven-benchmark:
+unigine-heaven-benchmark:
+unigine-heaven-benchmark:
+unigine-heaven-benchmark:
diff --git a/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild
new file mode 100644
index 0000000000..315b37cdaf
--- /dev/null
+++ b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for unigine-heaven-benchmark
+
+# Copyright 2020 Matt Dinslage Springfield, MO
+# 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=unigine-heaven-benchmark
+VERSION=${VERSION:-4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=Unigine_Heaven
+
+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
+cd $PKG
+sh $CWD/$SRCNAM-$VERSION.run --target "$PKG/opt/$PRGNAM" --noexec
+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 {} \;
+
+# copy excutable
+mkdir -p $PKG/usr/bin
+cp $PKG/opt/$PRGNAM/heaven $PKG/usr/bin
+
+# fix excutable
+sed -i 's,./bin,/opt/unigine-heaven-benchmark/bin,g' $PKG/usr/bin/heaven
+
+#add application launcher
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop 
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/opt/$PRGNAM/documentation/User_Manual.pdf $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/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop
new file mode 100644
index 0000000000..c28649c996
--- /dev/null
+++ b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=unigine-heaven-benchmark
+GenericName=System benchmarking software
+Exec=heaven
+Terminal=false
+Type=Application
+Categories=Game;
+Icon=/opt/unigine-heaven-benchmark/data/launcher/icon.png
+StartupNotify=false
diff --git a/system/unigine-heaven-benchmark/unigine-heaven-benchmark.info b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.info
new file mode 100644
index 0000000000..6feb42d90c
--- /dev/null
+++ b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.info
@@ -0,0 +1,10 @@
+PRGNAM="unigine-heaven-benchmark"
+VERSION="4.0"
+HOMEPAGE="https://benchmark.unigine.com/heaven"
+DOWNLOAD="https://assets.unigine.com/d/Unigine_Heaven-4.0.run"
+MD5SUM="71e87df9f7b7569e9a2ea307fde2d8f4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="M.Dinslage"
+EMAIL="daedra1980@gmail.com"
diff --git a/system/unigine-valley-benchmark/README b/system/unigine-valley-benchmark/README
new file mode 100644
index 0000000000..b567bdc095
--- /dev/null
+++ b/system/unigine-valley-benchmark/README
@@ -0,0 +1,7 @@
+unigine-valley-benchmark is an extreme performance and stability test
+for PC hardware: video card, power supply, cooling system. Check
+your rig in stock and overclocking modes with real-life load! Also
+includes interactive experience in a beautiful, detailed environment.
+
+Please not the source is 394mb if you are on a slow internet 
+connection. 
diff --git a/system/unigine-valley-benchmark/doinst.sh b/system/unigine-valley-benchmark/doinst.sh
new file mode 100644
index 0000000000..392c12adb9
--- /dev/null
+++ b/system/unigine-valley-benchmark/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
diff --git a/system/unigine-valley-benchmark/slack-desc b/system/unigine-valley-benchmark/slack-desc
new file mode 100644
index 0000000000..cd8e8cc8a5
--- /dev/null
+++ b/system/unigine-valley-benchmark/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------------------------------------------------------|
+unigine-valley-benchmark: unigine-valley-benchmark (System benchmark tool)
+unigine-valley-benchmark:
+unigine-valley-benchmark: unigine-valley-benchmark is an extreme performance and stability test
+unigine-valley-benchmark: for PC hardware: video card, power supply, cooling system. Check
+unigine-valley-benchmark: your rig in stock and overclocking modes with real-life load! Also
+unigine-valley-benchmark: includes interactive experience in a beautiful, detailed environment.
+unigine-valley-benchmark:
+unigine-valley-benchmark:
+unigine-valley-benchmark:
+unigine-valley-benchmark:
+unigine-valley-benchmark:
diff --git a/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild b/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild
new file mode 100644
index 0000000000..3f55ff015b
--- /dev/null
+++ b/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for unigine-valley-benchmark
+
+# Copyright 2020 Matt Dinslage Springfield, MO
+# 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=unigine-valley-benchmark
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=Unigine_Valley
+
+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
+cd $PKG
+sh $CWD/$SRCNAM-$VERSION.run --target "$PKG/opt/$PRGNAM" --noexec
+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 {} \;
+
+# copy excutable
+mkdir -p $PKG/usr/bin
+cp $PKG/opt/$PRGNAM/valley $PKG/usr/bin
+
+# fix excutable
+sed -i 's,./bin,/opt/unigine-valley-benchmark/bin,g' $PKG/usr/bin/valley
+
+#add application launcher
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop 
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/opt/$PRGNAM/documentation/*.pdf $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/unigine-valley-benchmark/unigine-valley-benchmark.desktop b/system/unigine-valley-benchmark/unigine-valley-benchmark.desktop
new file mode 100644
index 0000000000..f67847e9d3
--- /dev/null
+++ b/system/unigine-valley-benchmark/unigine-valley-benchmark.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=unigine-valley-benchmark
+GenericName=System benchmarking software
+Exec=valley
+Terminal=false
+Type=Application
+Categories=Game;
+Icon=/opt/unigine-valley-benchmark/data/launcher/icon.png
+StartupNotify=false
diff --git a/system/unigine-valley-benchmark/unigine-valley-benchmark.info b/system/unigine-valley-benchmark/unigine-valley-benchmark.info
new file mode 100644
index 0000000000..5de76a9744
--- /dev/null
+++ b/system/unigine-valley-benchmark/unigine-valley-benchmark.info
@@ -0,0 +1,10 @@
+PRGNAM="unigine-valley-benchmark"
+VERSION="1.0"
+HOMEPAGE="https://benchmark.unigine.com/valley"
+DOWNLOAD="https://assets.unigine.com/d/Unigine_Valley-1.0.run"
+MD5SUM="186268c769db82f51a01cc8e0810752f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="M.Dinslage"
+EMAIL="daedra1980@gmail.com"
diff --git a/system/unionfs-fuse/README b/system/unionfs-fuse/README
new file mode 100644
index 0000000000..15eb5cc1bc
--- /dev/null
+++ b/system/unionfs-fuse/README
@@ -0,0 +1,15 @@
+unionfs-fuse is a unionfs filesystem implementation using fuse.
+It is meant to be way more flexible than the current in-kernel unionfs
+solution.
+
+Why choose this stuff?
+ * The filesystem has to be mounted after the roots are mounted when
+   using the standard module. With unionfs-fuse, you can mount the
+   roots later and their contents will appear seamlesly.
+ * You get caching (provided by the underlying FUSE page cache) which
+   speeds things up a lot for free.
+ * Advanced features like copy-on-write and more.
+
+Why NOT choose it?
+ * Compared to kernel-space solution we need lots of useless context
+   switches which makes a kernel-only solution clear speed-winner.
diff --git a/system/unionfs-fuse/slack-desc b/system/unionfs-fuse/slack-desc
new file mode 100644
index 0000000000..e3d09b34de
--- /dev/null
+++ b/system/unionfs-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------------------------------------------------------|
+unionfs-fuse: unionfs-fuse (unionfs filesystem)
+unionfs-fuse:
+unionfs-fuse: unionfs-fuse is a unionfs filesystem implementation using fuse.
+unionfs-fuse:
+unionfs-fuse: It is meant to be way more flexible than the current in-kernel
+unionfs-fuse: unionfs solution.
+unionfs-fuse:
+unionfs-fuse: Project URL: https://github.com/rpodgorny/unionfs-fuse
+unionfs-fuse:
+unionfs-fuse:
+unionfs-fuse:
diff --git a/system/unionfs-fuse/unionfs-fuse.SlackBuild b/system/unionfs-fuse/unionfs-fuse.SlackBuild
new file mode 100644
index 0000000000..8b5241e008
--- /dev/null
+++ b/system/unionfs-fuse/unionfs-fuse.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+# Slackware build script for unionfs-fuse.
+#
+# Yth | Pont-en-Royans, France | yth@ythogtha.org
+#
+# 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=unionfs-fuse
+VERSION=${VERSION:-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
+
+DOCFILES="CREDITS LICENSE NEWS README*"
+
+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|share/man|man|' Makefile
+sed -i -e 's|usr/local|usr|' Makefile
+
+make PREFIX=/usr CFLAGS_EXTRA="$SLKCFLAGS"
+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 $DOCFILES $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/unionfs-fuse/unionfs-fuse.info b/system/unionfs-fuse/unionfs-fuse.info
new file mode 100644
index 0000000000..e8c9d31d6a
--- /dev/null
+++ b/system/unionfs-fuse/unionfs-fuse.info
@@ -0,0 +1,10 @@
+PRGNAM="unionfs-fuse"
+VERSION="2.1"
+HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
+DOWNLOAD="https://github.com/rpodgorny/unionfs-fuse/archive/v2.1/unionfs-fuse-2.1.tar.gz"
+MD5SUM="07f877d5b440b526fcf4532905183085"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
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 8550419cbf..10e0670927 100644
--- a/system/univga-font/README
+++ b/system/univga-font/README
@@ -1,17 +1,30 @@
 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 impossible with
-IBM's accents' size.
+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 allows rendering
+Latin Extended Additional glyphs with two accents, which was
+impossible with IBM's accents' size.
 
-X11 calls the font "-bolkhov-vga-medium-r-normal--16-160-75-75-c-80-iso10646-1"
-and an alias called "univga" is added, so you can say e.g. "xterm -fn univga".
+X11 calls the font:
+  -bolkhov-vga-medium-r-normal--16-160-75-75-c-80-iso10646-1
+...and an alias called "univga" is added, so you can say e.g.:
+  xterm -fn univga
 
-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.
+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/usbrelay/usbrelay.SlackBuild b/system/usbrelay/usbrelay.SlackBuild
index e57a8c8f76..1e6d5ca66d 100644
--- a/system/usbrelay/usbrelay.SlackBuild
+++ b/system/usbrelay/usbrelay.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=usbrelay
-VERSION=${VERSION:-0.3}
+VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/usbrelay/usbrelay.info b/system/usbrelay/usbrelay.info
index c6447b97e7..2c1c413699 100644
--- a/system/usbrelay/usbrelay.info
+++ b/system/usbrelay/usbrelay.info
@@ -1,8 +1,8 @@
 PRGNAM="usbrelay"
-VERSION="0.3"
+VERSION="0.7"
 HOMEPAGE="https://github.com/darrylb123/usbrelay"
-DOWNLOAD="https://github.com/darrylb123/usbrelay/archive/v0.3/usbrelay-0.3.tar.gz"
-MD5SUM="7daec063f9ad565209c6c06ea5a98821"
+DOWNLOAD="https://github.com/darrylb123/usbrelay/archive/0.7/usbrelay-0.7.tar.gz"
+MD5SUM="67b1d297db24a294722abcf7de5f9f71"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="hidapi"
diff --git a/system/usermin/usermin.SlackBuild b/system/usermin/usermin.SlackBuild
index aa271d2918..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.791}
+VERSION=${VERSION:-1.823}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/usermin/usermin.info b/system/usermin/usermin.info
index ee7dfb0ac2..79cf82e572 100644
--- a/system/usermin/usermin.info
+++ b/system/usermin/usermin.info
@@ -1,8 +1,8 @@
 PRGNAM="usermin"
-VERSION="1.791"
+VERSION="1.823"
 HOMEPAGE="http://webmin.com/usermin.html"
-DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/1.791/usermin-1.791.tar.gz"
-MD5SUM="56e69e222a243c016ee4182a3c131e38"
+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/v4l2loopback/README b/system/v4l2loopback/README
new file mode 100644
index 0000000000..2c78fe244c
--- /dev/null
+++ b/system/v4l2loopback/README
@@ -0,0 +1,9 @@
+v4l2loopback - a kernel module to create V4L2 loopback devices
+
+This module allows you to create "virtual video devices".
+Normal (v4l2) applications will read these devices as if they
+were ordinary video devices, but the video will not be read
+from, e.g. a capture card or webcam, but instead video generated
+by another application.
+
+You must rebuild this package if you upgrade your kernel.
diff --git a/system/v4l2loopback/doinst.sh b/system/v4l2loopback/doinst.sh
new file mode 100644
index 0000000000..dcfb80855f
--- /dev/null
+++ b/system/v4l2loopback/doinst.sh
@@ -0,0 +1,3 @@
+
+chroot . /sbin/depmod -a @KERNEL@ 2>/dev/null
+
diff --git a/system/v4l2loopback/slack-desc b/system/v4l2loopback/slack-desc
new file mode 100644
index 0000000000..bf660f214d
--- /dev/null
+++ b/system/v4l2loopback/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------------------------------------------------------|
+v4l2loopback: v4l2loopback (kernel module to create V4L2 loopback devices)
+v4l2loopback:
+v4l2loopback: This module allows you to create "virtual video
+v4l2loopback: devices". Normal (v4l2) applications will read these
+v4l2loopback: devices as if they were ordinary video devices, but
+v4l2loopback: the video will not be read from, e.g. a capture card
+v4l2loopback: or webcam, but instead video generated by another
+v4l2loopback: application.
+v4l2loopback:
+v4l2loopback: Project URL:
+v4l2loopback: http://github.com/umlaeute/v4l2loopback/
diff --git a/system/v4l2loopback/update_to_master_17JUN2020.patch b/system/v4l2loopback/update_to_master_17JUN2020.patch
new file mode 100644
index 0000000000..cd44185102
--- /dev/null
+++ b/system/v4l2loopback/update_to_master_17JUN2020.patch
@@ -0,0 +1,671 @@
+diff --git a/README.md b/README.md
+index d8b295a..d8d338b 100644
+--- a/README.md
++++ b/README.md
+@@ -18,9 +18,31 @@ only be of limited use...
+ 
+ # ISSUES
+ for current issues, checkout https://github.com/umlaeute/v4l2loopback/issues
+-please use the issue-tracker for reporting any problems
++please use the issue-tracker for reporting any problems.
++
++before you create a new ticket in our issue tracker, please make sure that you have read
++*this* document and followed any instructions found within.
++
++also, please search the issue-tracker *before* reporting any problems: it's much better
++to add your information to an existing ticket than to create a new ticket with essentially
++the same information.
++
++## SEEKING HELP
++the issue tracker is meant to track specific bugs in the code (and new features).
++however, it is ill-suited as a user support forum.
++
++if you have general questions or problems, please use the `v4l2loopback` tag
++on [Stack Overflow](https://stackoverflow.com/questions/tagged/v4l2loopback) instead:
++https://stackoverflow.com/questions/tagged/v4l2loopback
++
+ 
+ # DEPENDENCIES
++in order to build (compile,...) anything, you must have a *working* build-environment
++(compiler, GNU make,...).
++the kernel can be somewhat picky if you try to load a module that was compiled with
++a different compiler than was used to compile the kernel itself.
++so make sure to have the right compiler in place.
++
+ the v4l2loopback module is a *kernel module*.
+ in order to build it, you *must have* the kernel headers installed that match
+ the linux kernel with which you want to use the module (in most cases this will
+@@ -31,6 +53,12 @@ the first few number are the same.
+ (modules will be incompatible if the versions don't match. if you are lucky, the module will
+ simply refuse to load. if you are unlucky, your computer will spit in your eye or do worse.)
+ 
++there are distribution-specific differences on how to get the correct kernel headers
++(or to install a compilation toolchain).
++documenting all those possibilities would go far beyond the scope of `v4l2loopback`.
++please understnd that we cannot provide support for questions regarding dependencies.
++
++
+ # BUILD
+ to build the kernel module run:
+ 
+diff --git a/v4l2loopback.c b/v4l2loopback.c
+index bcf7667..b0f7b93 100644
+--- a/v4l2loopback.c
++++ b/v4l2loopback.c
+@@ -48,9 +48,9 @@
+ 
+ MODULE_DESCRIPTION("V4L2 loopback video device");
+ MODULE_AUTHOR("Vasily Levin, " \
+-              "IOhannes m zmoelnig <zmoelnig@iem.at>,"  \
+-              "Stefan Diewald,"                         \
+-              "Anton Novikov"                           \
++	      "IOhannes m zmoelnig <zmoelnig@iem.at>,"	\
++	      "Stefan Diewald,"				\
++	      "Anton Novikov"				\
+ 	      "et al."					\
+ 		);
+ MODULE_LICENSE("GPL");
+@@ -61,18 +61,18 @@ MODULE_LICENSE("GPL");
+ #define STRINGIFY(s) #s
+ #define STRINGIFY2(s) STRINGIFY(s)
+ 
+-#define dprintk(fmt, args...)                                           \
+-	do { if (debug > 0) {                                                 \
++#define dprintk(fmt, args...)						\
++	do { if (debug > 0) {						\
+ 		printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__) "]: " fmt, ##args); \
+ 	} } while (0)
+ 
+-#define MARK()                                                          \
+-	do { if (debug > 1) {                                                  \
++#define MARK()								\
++	do { if (debug > 1) {						\
+ 		printk(KERN_INFO "%s:%d[%s]\n", __FILE__, __LINE__, __func__);	\
+ 	} } while (0)
+ 
+-#define dprintkrw(fmt, args...)                                         \
+-	do { if (debug > 2) {                                                 \
++#define dprintkrw(fmt, args...)						\
++	do { if (debug > 2) {						\
+ 		printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__)"]: " fmt, ##args); \
+ 	} } while (0)
+ 
+@@ -85,14 +85,14 @@ struct v4l2_ctrl_handler {
+ 	int error;
+ };
+ struct v4l2_ctrl_config {
+-        void *ops;
+-        u32 id;
++	void *ops;
++	u32 id;
+ 	const char *name;
+ 	int type;
+-        s32 min;
+-        s32 max;
+-        u32 step;
+-        s32 def;
++	s32 min;
++	s32 max;
++	u32 step;
++	s32 def;
+ };
+ int v4l2_ctrl_handler_init(struct v4l2_ctrl_handler*hdl,
+ 			   unsigned nr_of_controls_hint)
+@@ -119,7 +119,7 @@ struct v4l2_device {
+ 	char name[V4L2_DEVICE_NAME_SIZE];
+ 	struct v4l2_ctrl_handler*ctrl_handler;
+ };
+-static inline int  v4l2_device_register  (void *dev, void *v4l2_dev) { return 0; }
++static inline int  v4l2_device_register(void *dev, void *v4l2_dev) { return 0; }
+ static inline void v4l2_device_unregister(struct v4l2_device *v4l2_dev) { return; }
+ #endif /*  HAVE__V4L2_DEVICE */
+ 
+@@ -155,7 +155,7 @@ static inline void v4l2l_get_timestamp(struct v4l2_buffer *b) {
+ 
+ /* module constants
+  *  can be overridden during he build process using something like
+- *      make KCPPFLAGS="-DMAX_DEVICES=100"
++ *	make KCPPFLAGS="-DMAX_DEVICES=100"
+  */
+ 
+ 
+@@ -235,13 +235,13 @@ MODULE_PARM_DESC(max_height, "maximum frame height");
+ 
+ /* control IDs */
+ #ifndef HAVE__V4L2_CTRLS
+-# define V4L2LOOPBACK_CID_BASE  (V4L2_CID_PRIVATE_BASE)
++# define V4L2LOOPBACK_CID_BASE	(V4L2_CID_PRIVATE_BASE)
+ #else
+-# define V4L2LOOPBACK_CID_BASE  (V4L2_CID_USER_BASE | 0xf000)
++# define V4L2LOOPBACK_CID_BASE	(V4L2_CID_USER_BASE | 0xf000)
+ #endif
+-#define CID_KEEP_FORMAT        (V4L2LOOPBACK_CID_BASE + 0)
++#define CID_KEEP_FORMAT	       (V4L2LOOPBACK_CID_BASE + 0)
+ #define CID_SUSTAIN_FRAMERATE  (V4L2LOOPBACK_CID_BASE + 1)
+-#define CID_TIMEOUT            (V4L2LOOPBACK_CID_BASE + 2)
++#define CID_TIMEOUT	       (V4L2LOOPBACK_CID_BASE + 2)
+ #define CID_TIMEOUT_IMAGE_IO   (V4L2LOOPBACK_CID_BASE + 3)
+ 
+ static int v4l2loopback_s_ctrl(struct v4l2_ctrl *ctrl);
+@@ -249,44 +249,44 @@ static const struct v4l2_ctrl_ops v4l2loopback_ctrl_ops = {
+ 	.s_ctrl = v4l2loopback_s_ctrl,
+ };
+ static const struct v4l2_ctrl_config v4l2loopback_ctrl_keepformat = {
+-        .ops = &v4l2loopback_ctrl_ops,
+-        .id = CID_KEEP_FORMAT,
+-        .name = "keep_format",
+-        .type = V4L2_CTRL_TYPE_BOOLEAN,
+-        .min = 0,
+-        .max = 1,
+-        .step = 1,
+-        .def = 0,
++	.ops = &v4l2loopback_ctrl_ops,
++	.id = CID_KEEP_FORMAT,
++	.name = "keep_format",
++	.type = V4L2_CTRL_TYPE_BOOLEAN,
++	.min = 0,
++	.max = 1,
++	.step = 1,
++	.def = 0,
+ };
+ static const struct v4l2_ctrl_config v4l2loopback_ctrl_sustainframerate = {
+-        .ops = &v4l2loopback_ctrl_ops,
+-        .id = CID_SUSTAIN_FRAMERATE,
+-        .name = "sustain_framerate",
+-        .type = V4L2_CTRL_TYPE_BOOLEAN,
+-        .min = 0,
+-        .max = 1,
+-        .step = 1,
+-        .def = 0,
++	.ops = &v4l2loopback_ctrl_ops,
++	.id = CID_SUSTAIN_FRAMERATE,
++	.name = "sustain_framerate",
++	.type = V4L2_CTRL_TYPE_BOOLEAN,
++	.min = 0,
++	.max = 1,
++	.step = 1,
++	.def = 0,
+ };
+ static const struct v4l2_ctrl_config v4l2loopback_ctrl_timeout = {
+-        .ops = &v4l2loopback_ctrl_ops,
+-        .id = CID_TIMEOUT,
+-        .name = "timeout",
+-        .type = V4L2_CTRL_TYPE_INTEGER,
+-        .min = 0,
+-        .max = MAX_TIMEOUT,
+-        .step = 1,
+-        .def = 0,
++	.ops = &v4l2loopback_ctrl_ops,
++	.id = CID_TIMEOUT,
++	.name = "timeout",
++	.type = V4L2_CTRL_TYPE_INTEGER,
++	.min = 0,
++	.max = MAX_TIMEOUT,
++	.step = 1,
++	.def = 0,
+ };
+ static const struct v4l2_ctrl_config v4l2loopback_ctrl_timeoutimageio = {
+-        .ops = &v4l2loopback_ctrl_ops,
+-        .id = CID_TIMEOUT_IMAGE_IO,
+-        .name = "timeout_image_io",
+-        .type = V4L2_CTRL_TYPE_BOOLEAN,
+-        .min = 0,
+-        .max = 1,
+-        .step = 1,
+-        .def = 0,
++	.ops = &v4l2loopback_ctrl_ops,
++	.id = CID_TIMEOUT_IMAGE_IO,
++	.name = "timeout_image_io",
++	.type = V4L2_CTRL_TYPE_BOOLEAN,
++	.min = 0,
++	.max = 1,
++	.step = 1,
++	.def = 0,
+ };
+ 
+ 
+@@ -321,7 +321,7 @@ struct v4l2_loopback_device {
+ 				  (close to) nominal framerate */
+ 
+ 	/* buffers stuff */
+-	u8 *image;         /* pointer to actual buffers data */
++	u8 *image;	   /* pointer to actual buffers data */
+ 	unsigned long int imagesize;  /* size of buffers data */
+ 	int buffers_number;  /* should not be big, 4 is a good choice */
+ 	struct v4l2l_buffer buffers[MAX_BUFFERS];	/* inner driver buffers */
+@@ -386,13 +386,13 @@ struct v4l2_loopback_opener {
+ /* this is heavily inspired by the bttv driver found in the linux kernel */
+ struct v4l2l_format {
+ 	char *name;
+-	int  fourcc;          /* video4linux 2      */
+-	int  depth;           /* bit/pixel          */
++	int  fourcc;	      /* video4linux 2	    */
++	int  depth;	      /* bit/pixel	    */
+ 	int  flags;
+ };
+ /* set the v4l2l_format.flags to PLANAR for non-packed formats */
+-#define FORMAT_FLAGS_PLANAR       0x01
+-#define FORMAT_FLAGS_COMPRESSED   0x02
++#define FORMAT_FLAGS_PLANAR	  0x01
++#define FORMAT_FLAGS_COMPRESSED	  0x02
+ 
+ #ifndef V4L2_PIX_FMT_VP9
+ #define V4L2_PIX_FMT_VP9  v4l2_fourcc('V', 'P', '9', '0')
+@@ -446,7 +446,7 @@ static void pix_format_set_size(struct v4l2_pix_format *f,
+ 		f->bytesperline = width; /* Y plane */
+ 		f->sizeimage = (width * height * fmt->depth) >> 3;
+ 	} else if (fmt->flags & FORMAT_FLAGS_COMPRESSED) {
+-	        /* doesn't make sense for compressed formats */
++		/* doesn't make sense for compressed formats */
+ 		f->bytesperline = 0;
+ 		f->sizeimage = (width * height * fmt->depth) >> 3;
+ 	} else {
+@@ -458,7 +458,7 @@ static void pix_format_set_size(struct v4l2_pix_format *f,
+ static int set_timeperframe(struct v4l2_loopback_device *dev,
+ 		struct v4l2_fract *tpf)
+ {
+-        if((tpf->denominator < 1) || (tpf->numerator < 1)) {
++	if((tpf->denominator < 1) || (tpf->numerator < 1)) {
+ 	  return -EINVAL;
+ 	}
+ 	dev->capture_param.timeperframe = *tpf;
+@@ -485,7 +485,7 @@ static ssize_t attr_show_format(struct device *cd,
+ 	tpf = &dev->capture_param.timeperframe;
+ 
+ 	fourcc2str(dev->pix_format.pixelformat, buf4cc);
+-        buf4cc[4]=0;
++	buf4cc[4]=0;
+ 	if (tpf->numerator == 1)
+ 		snprintf(buf_fps, sizeof(buf_fps), "%d", tpf->denominator);
+ 	else
+@@ -578,7 +578,7 @@ static void v4l2loopback_create_sysfs(struct video_device *vdev)
+ {
+ 	int res = 0;
+ 
+-#define V4L2_SYSFS_CREATE(x)     res = device_create_file(&vdev->dev, &dev_attr_##x); if (res < 0) break
++#define V4L2_SYSFS_CREATE(x)	 res = device_create_file(&vdev->dev, &dev_attr_##x); if (res < 0) break
+ 	if (!vdev)
+ 		return;
+ 	do {
+@@ -671,7 +671,7 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability
+ {
+ 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+ 	int devnr = ((struct v4l2loopback_private *)video_get_drvdata(dev->vdev))->devicenr;
+-        __u32 capabilities = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
++	__u32 capabilities = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
+ 
+ 	strlcpy(cap->driver, "v4l2 loopback", sizeof(cap->driver));
+ 	vidioc_fill_name(cap->card, sizeof(cap->card), devnr);
+@@ -698,7 +698,10 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability
+ 		}
+ 	}
+ 
+-	dev->vdev->device_caps = cap->device_caps = cap->capabilities = capabilities;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++	dev->vdev->device_caps =
++#endif /* >=linux-4.7.0 */
++	cap->device_caps = cap->capabilities = capabilities;
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
+ 	cap->capabilities |= V4L2_CAP_DEVICE_CAPS;
+@@ -891,7 +894,7 @@ static int vidioc_enum_fmt_out(struct file *file, void *fh, struct v4l2_fmtdesc
+ 		f->pixelformat = dev->pix_format.pixelformat;
+ 	} else {
+ 		/* fill in a dummy format */
+-                /* coverity[unsigned_compare] */
++		/* coverity[unsigned_compare] */
+ 		if (f->index < 0 || f->index >= FORMATS)
+ 			return -EINVAL;
+ 
+@@ -1069,11 +1072,11 @@ static int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm *
+ 
+ 	switch (parm->type) {
+ 	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+-                if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
++		if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
+ 		  return err;
+ 		break;
+ 	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+-                if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
++		if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
+ 		  return err;
+ 		break;
+ 	default:
+@@ -1249,7 +1252,7 @@ static int vidioc_enum_output(struct file *file, void *fh, struct v4l2_output *o
+ 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+ 	MARK();
+ 
+-        if (!dev->announce_all_caps && !dev->ready_for_output)
++	if (!dev->announce_all_caps && !dev->ready_for_output)
+ 		return -ENOTTY;
+ 
+ 	if (0 != index)
+@@ -1279,7 +1282,7 @@ static int vidioc_enum_output(struct file *file, void *fh, struct v4l2_output *o
+ static int vidioc_g_output(struct file *file, void *fh, unsigned int *i)
+ {
+ 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+-        if (!dev->announce_all_caps && !dev->ready_for_output)
++	if (!dev->announce_all_caps && !dev->ready_for_output)
+ 		return -ENOTTY;
+ 	if (i)
+ 		*i = 0;
+@@ -1292,7 +1295,7 @@ static int vidioc_g_output(struct file *file, void *fh, unsigned int *i)
+ static int vidioc_s_output(struct file *file, void *fh, unsigned int i)
+ {
+ 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+-        if (!dev->announce_all_caps && !dev->ready_for_output)
++	if (!dev->announce_all_caps && !dev->ready_for_output)
+ 		return -ENOTTY;
+ 
+ 	if (i)
+@@ -1340,7 +1343,7 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *inp
+ static int vidioc_g_input(struct file *file, void *fh, unsigned int *i)
+ {
+ 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+-        if (!dev->announce_all_caps && !dev->ready_for_capture)
++	if (!dev->announce_all_caps && !dev->ready_for_capture)
+ 		return -ENOTTY;
+ 	if (i)
+ 		*i = 0;
+@@ -1353,7 +1356,7 @@ static int vidioc_g_input(struct file *file, void *fh, unsigned int *i)
+ static int vidioc_s_input(struct file *file, void *fh, unsigned int i)
+ {
+ 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+-        if (!dev->announce_all_caps && !dev->ready_for_capture)
++	if (!dev->announce_all_caps && !dev->ready_for_capture)
+ 		return -ENOTTY;
+ 	if (i == 0)
+ 		return 0;
+@@ -1527,7 +1530,7 @@ static int vidioc_qbuf(struct file *file, void *private_data, struct v4l2_buffer
+ 		/*  Hopefully fix 'DQBUF return bad index if queue bigger then 2 for capture'
+ 			https://github.com/umlaeute/v4l2loopback/issues/60 */
+ 		buf->flags &= ~V4L2_BUF_FLAG_DONE;
+-	        buf->flags |= V4L2_BUF_FLAG_QUEUED;
++		buf->flags |= V4L2_BUF_FLAG_QUEUED;
+ 
+ 		wake_up_all(&dev->read_event);
+ 		return 0;
+@@ -1666,7 +1669,7 @@ static int vidioc_streamon(struct file *file, void *private_data, enum v4l2_buf_
+ 	default:
+ 		return -EINVAL;
+ 	}
+-        return -EINVAL;
++	return -EINVAL;
+ }
+ 
+ /* stop streaming
+@@ -1896,8 +1899,8 @@ static ssize_t v4l2_loopback_read(struct file *file,
+ 	dev    = v4l2loopback_getdevice(file);
+ 
+ 	read_index = get_capture_buffer(file);
+-        if (read_index < 0)
+-          return read_index;
++	if (read_index < 0)
++	  return read_index;
+ 	if (count > dev->buffer_size)
+ 		count = dev->buffer_size;
+ 	b = &dev->buffers[read_index].buffer;
+@@ -2034,20 +2037,20 @@ static void init_buffers(struct v4l2_loopback_device *dev)
+ 
+ 	for (i = 0; i < dev->buffers_number; ++i) {
+ 		struct v4l2_buffer *b = &dev->buffers[i].buffer;
+-		b->index             = i;
+-		b->bytesused         = bytesused;
+-		b->length            = buffer_size;
+-		b->field             = V4L2_FIELD_NONE;
+-		b->flags             = 0;
++		b->index	     = i;
++		b->bytesused	     = bytesused;
++		b->length	     = buffer_size;
++		b->field	     = V4L2_FIELD_NONE;
++		b->flags	     = 0;
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 1)
+-		b->input             = 0;
++		b->input	     = 0;
+ #endif
+-		b->m.offset          = i * buffer_size;
+-		b->memory            = V4L2_MEMORY_MMAP;
+-		b->sequence          = 0;
++		b->m.offset	     = i * buffer_size;
++		b->memory	     = V4L2_MEMORY_MMAP;
++		b->sequence	     = 0;
+ 		b->timestamp.tv_sec  = 0;
+ 		b->timestamp.tv_usec = 0;
+-		b->type              = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++		b->type		     = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ 
+ 		v4l2l_get_timestamp(b);
+ 	}
+@@ -2077,29 +2080,29 @@ static void init_vdev(struct video_device *vdev, int nr)
+ 	vidioc_fill_name(vdev->name, sizeof(vdev->name), nr);
+ 
+ #ifdef V4L2LOOPBACK_WITH_STD
+-	vdev->tvnorms      = V4L2_STD_ALL;
++	vdev->tvnorms	   = V4L2_STD_ALL;
+ #endif /* V4L2LOOPBACK_WITH_STD */
+ 
+-	vdev->vfl_type     = VFL_TYPE_VIDEO;
+-	vdev->fops         = &v4l2_loopback_fops;
+-	vdev->ioctl_ops    = &v4l2_loopback_ioctl_ops;
+-	vdev->release      = &video_device_release;
+-	vdev->minor        = -1;
++	vdev->vfl_type	   = VFL_TYPE_VIDEO;
++	vdev->fops	   = &v4l2_loopback_fops;
++	vdev->ioctl_ops	   = &v4l2_loopback_ioctl_ops;
++	vdev->release	   = &video_device_release;
++	vdev->minor	   = -1;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+ 	vdev->device_caps  =
+-		V4L2_CAP_DEVICE_CAPS |
++		V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
++		V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+ #ifdef V4L2_CAP_VIDEO_M2M
+-		V4L2_CAP_VIDEO_M2M |
+-#endif
+-                V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
+-                V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
++	vdev->device_caps  |= V4L2_CAP_VIDEO_M2M;
+ #endif
++#endif /* >=linux-4.7.0 */
++
+ 	if (debug > 1)
+-		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
+ 			vdev->debug = V4L2_DEBUG_IOCTL | V4L2_DEBUG_IOCTL_ARG;
+-		#else
++#else
+ 			vdev->dev_debug = V4L2_DEV_DEBUG_IOCTL | V4L2_DEV_DEBUG_IOCTL_ARG;
+-		#endif
++#endif
+ 
+ 	/* since kernel-3.7, there is a new field 'vfl_dir' that has to be
+ 	 * set to VFL_DIR_M2M for bidrectional devices */
+@@ -2114,11 +2117,11 @@ static void init_vdev(struct video_device *vdev, int nr)
+ static void init_capture_param(struct v4l2_captureparm *capture_param)
+ {
+ 	MARK();
+-	capture_param->capability               = 0;
+-	capture_param->capturemode              = 0;
+-	capture_param->extendedmode             = 0;
+-	capture_param->readbuffers              = max_buffers;
+-	capture_param->timeperframe.numerator   = 1;
++	capture_param->capability		= 0;
++	capture_param->capturemode		= 0;
++	capture_param->extendedmode		= 0;
++	capture_param->readbuffers		= max_buffers;
++	capture_param->timeperframe.numerator	= 1;
+ 	capture_param->timeperframe.denominator = 30;
+ }
+ 
+@@ -2177,10 +2180,10 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
+ 	int ret;
+ 	struct v4l2_ctrl_handler *hdl = &dev->ctrl_handler;
+ 	snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name),
+-                        "v4l2loopback-%03d", nr);
+-        ret = v4l2_device_register(NULL, &dev->v4l2_dev);
+-        if (ret)
+-                return ret;
++			"v4l2loopback-%03d", nr);
++	ret = v4l2_device_register(NULL, &dev->v4l2_dev);
++	if (ret)
++		return ret;
+ 
+ 	MARK();
+ 	dev->vdev = video_device_alloc();
+@@ -2230,7 +2233,7 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
+ 	setup_timer(&dev->sustain_timer, sustain_timer_clb, nr);
+ 	setup_timer(&dev->timeout_timer, timeout_timer_clb, nr);
+ #endif
+-        dev->reread_count = 0;
++	dev->reread_count = 0;
+ 	dev->timeout_jiffies = 0;
+ 	dev->timeout_image = NULL;
+ 	dev->timeout_happened = 0;
+@@ -2242,10 +2245,10 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
+ 	v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_sustainframerate, NULL);
+ 	v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_timeout, NULL);
+ 	v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_timeoutimageio, NULL);
+-        if (hdl->error) {
+-                ret = hdl->error;
+-                goto error;
+-        }
++	if (hdl->error) {
++		ret = hdl->error;
++		goto error;
++	}
+ 	dev->v4l2_dev.ctrl_handler = hdl;
+ 
+ 	/* FIXME set buffers to 0 */
+@@ -2267,55 +2270,55 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
+ 	return 0;
+ 
+ error:
+-        v4l2_ctrl_handler_free(&dev->ctrl_handler);
+-        v4l2_device_unregister(&dev->v4l2_dev);
++	v4l2_ctrl_handler_free(&dev->ctrl_handler);
++	v4l2_device_unregister(&dev->v4l2_dev);
+ 	kfree(dev->vdev);
+-        return ret;
++	return ret;
+ 
+ };
+ 
+ /* LINUX KERNEL */
+ static const struct v4l2_file_operations v4l2_loopback_fops = {
+-	.owner   = THIS_MODULE,
+-	.open    = v4l2_loopback_open,
++	.owner	 = THIS_MODULE,
++	.open	 = v4l2_loopback_open,
+ 	.release = v4l2_loopback_close,
+-	.read    = v4l2_loopback_read,
+-	.write   = v4l2_loopback_write,
+-	.poll    = v4l2_loopback_poll,
+-	.mmap    = v4l2_loopback_mmap,
+-	.unlocked_ioctl   = video_ioctl2,
++	.read	 = v4l2_loopback_read,
++	.write	 = v4l2_loopback_write,
++	.poll	 = v4l2_loopback_poll,
++	.mmap	 = v4l2_loopback_mmap,
++	.unlocked_ioctl	  = video_ioctl2,
+ };
+ 
+ static const struct v4l2_ioctl_ops v4l2_loopback_ioctl_ops = {
+-	.vidioc_querycap         = &vidioc_querycap,
++	.vidioc_querycap	 = &vidioc_querycap,
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+-	.vidioc_enum_framesizes  = &vidioc_enum_framesizes,
++	.vidioc_enum_framesizes	 = &vidioc_enum_framesizes,
+ 	.vidioc_enum_frameintervals = &vidioc_enum_frameintervals,
+ #endif
+ 
+ #ifndef HAVE__V4L2_CTRLS
+-	.vidioc_queryctrl         = &vidioc_queryctrl,
+-	.vidioc_g_ctrl            = &vidioc_g_ctrl,
+-	.vidioc_s_ctrl            = &vidioc_s_ctrl,
++	.vidioc_queryctrl	  = &vidioc_queryctrl,
++	.vidioc_g_ctrl		  = &vidioc_g_ctrl,
++	.vidioc_s_ctrl		  = &vidioc_s_ctrl,
+ #endif /* HAVE__V4L2_CTRLS */
+ 
+-	.vidioc_enum_output       = &vidioc_enum_output,
+-	.vidioc_g_output          = &vidioc_g_output,
+-	.vidioc_s_output          = &vidioc_s_output,
++	.vidioc_enum_output	  = &vidioc_enum_output,
++	.vidioc_g_output	  = &vidioc_g_output,
++	.vidioc_s_output	  = &vidioc_s_output,
+ 
+-	.vidioc_enum_input       = &vidioc_enum_input,
+-	.vidioc_g_input          = &vidioc_g_input,
+-	.vidioc_s_input          = &vidioc_s_input,
++	.vidioc_enum_input	 = &vidioc_enum_input,
++	.vidioc_g_input		 = &vidioc_g_input,
++	.vidioc_s_input		 = &vidioc_s_input,
+ 
+ 	.vidioc_enum_fmt_vid_cap = &vidioc_enum_fmt_cap,
+-	.vidioc_g_fmt_vid_cap    = &vidioc_g_fmt_cap,
+-	.vidioc_s_fmt_vid_cap    = &vidioc_s_fmt_cap,
+-	.vidioc_try_fmt_vid_cap  = &vidioc_try_fmt_cap,
++	.vidioc_g_fmt_vid_cap	 = &vidioc_g_fmt_cap,
++	.vidioc_s_fmt_vid_cap	 = &vidioc_s_fmt_cap,
++	.vidioc_try_fmt_vid_cap	 = &vidioc_try_fmt_cap,
+ 
+ 	.vidioc_enum_fmt_vid_out = &vidioc_enum_fmt_out,
+-	.vidioc_s_fmt_vid_out    = &vidioc_s_fmt_out,
+-	.vidioc_g_fmt_vid_out    = &vidioc_g_fmt_out,
+-	.vidioc_try_fmt_vid_out  = &vidioc_try_fmt_out,
++	.vidioc_s_fmt_vid_out	 = &vidioc_s_fmt_out,
++	.vidioc_g_fmt_vid_out	 = &vidioc_g_fmt_out,
++	.vidioc_try_fmt_vid_out	 = &vidioc_try_fmt_out,
+ 
+ #ifdef V4L2L_OVERLAY
+ 	.vidioc_s_fmt_vid_overlay = &vidioc_s_fmt_overlay,
+@@ -2323,24 +2326,24 @@ static const struct v4l2_ioctl_ops v4l2_loopback_ioctl_ops = {
+ #endif
+ 
+ #ifdef V4L2LOOPBACK_WITH_STD
+-	.vidioc_s_std            = &vidioc_s_std,
+-	.vidioc_g_std            = &vidioc_g_std,
+-	.vidioc_querystd         = &vidioc_querystd,
++	.vidioc_s_std		 = &vidioc_s_std,
++	.vidioc_g_std		 = &vidioc_g_std,
++	.vidioc_querystd	 = &vidioc_querystd,
+ #endif /* V4L2LOOPBACK_WITH_STD */
+ 
+-	.vidioc_g_parm           = &vidioc_g_parm,
+-	.vidioc_s_parm           = &vidioc_s_parm,
++	.vidioc_g_parm		 = &vidioc_g_parm,
++	.vidioc_s_parm		 = &vidioc_s_parm,
+ 
+-	.vidioc_reqbufs          = &vidioc_reqbufs,
+-	.vidioc_querybuf         = &vidioc_querybuf,
+-	.vidioc_qbuf             = &vidioc_qbuf,
+-	.vidioc_dqbuf            = &vidioc_dqbuf,
++	.vidioc_reqbufs		 = &vidioc_reqbufs,
++	.vidioc_querybuf	 = &vidioc_querybuf,
++	.vidioc_qbuf		 = &vidioc_qbuf,
++	.vidioc_dqbuf		 = &vidioc_dqbuf,
+ 
+-	.vidioc_streamon         = &vidioc_streamon,
+-	.vidioc_streamoff        = &vidioc_streamoff,
++	.vidioc_streamon	 = &vidioc_streamon,
++	.vidioc_streamoff	 = &vidioc_streamoff,
+ 
+ #ifdef CONFIG_VIDEO_V4L1_COMPAT
+-	.vidiocgmbuf             = &vidiocgmbuf,
++	.vidiocgmbuf		 = &vidiocgmbuf,
+ #endif
+ };
+ 
+@@ -2459,10 +2462,10 @@ static void v4l2loopback_cleanup_module(void)
+ #ifdef MODULE
+ int __init init_module(void)
+ {
+-        return v4l2loopback_init_module();
++	return v4l2loopback_init_module();
+ }
+ void __exit cleanup_module(void) {
+-        return v4l2loopback_cleanup_module();
++	return v4l2loopback_cleanup_module();
+ }
+ #else
+ late_initcall(v4l2loopback_init_module);
diff --git a/system/v4l2loopback/v4l2loopback.SlackBuild b/system/v4l2loopback/v4l2loopback.SlackBuild
new file mode 100644
index 0000000000..7d7fadd788
--- /dev/null
+++ b/system/v4l2loopback/v4l2loopback.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for v4l2loopback
+
+# Copyright 2020 Edward W. Koenig <kingbeowulf@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=v4l2loopback
+VERSION=${VERSION:-0.12.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 {} \;
+  
+# Fix for older kernels, etc...
+# https://github.com/umlaeute/v4l2loopback/commit/d26e624b4ead762d34152f9f825b3a51fb92fb9c
+# https://github.com/umlaeute/v4l2loopback/commit/7dced0f9e6641b7e9e54ced74c5c7611d10f729f
+# https://github.com/umlaeute/v4l2loopback/commit/72a32a67dee3a67dff76f565551907a2fc7e88e6
+# only set (struct video_device).device_caps on linux>=4.7.0 
+# Set device_caps in init_vdev() for all kernel-versions (not just >4.7.0)
+# Don't set the V4L2_CAP_DEVICE_CAPS on device_caps
+patch -p1 < $CWD/update_to_master_17JUN2020.patch
+
+make
+
+install -D -m 644 $PRGNAM.ko $PKG/lib/modules/$(uname -r)/kernel/extra/$PRGNAM.ko
+install -D -m 755 utils/$PRGNAM-ctl $PKG/usr/bin/$PRGNAM-ctl
+
+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 NEWS README.md 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
+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/v4l2loopback/v4l2loopback.info b/system/v4l2loopback/v4l2loopback.info
new file mode 100644
index 0000000000..f475983a79
--- /dev/null
+++ b/system/v4l2loopback/v4l2loopback.info
@@ -0,0 +1,10 @@
+PRGNAM="v4l2loopback"
+VERSION="0.12.5"
+HOMEPAGE="https://github.com/umlaeute/v4l2loopback/"
+DOWNLOAD="https://github.com/umlaeute/v4l2loopback/archive/v0.12.5/v4l2loopback-0.12.5.tar.gz"
+MD5SUM="4b0aaae5dd8c4f5dd0f9e2142e92e390"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edward W. Koenig"
+EMAIL="kingbeowulf@gmail.com"
diff --git a/system/vagrant/vagrant.SlackBuild b/system/vagrant/vagrant.SlackBuild
index ffaa139632..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.7}
+VERSION=${VERSION:-2.2.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/vagrant/vagrant.info b/system/vagrant/vagrant.info
index ebb06af18d..a9f104a145 100644
--- a/system/vagrant/vagrant.info
+++ b/system/vagrant/vagrant.info
@@ -1,10 +1,10 @@
 PRGNAM="vagrant"
-VERSION="2.2.7"
+VERSION="2.2.15"
 HOMEPAGE="https://www.vagrantup.com"
-DOWNLOAD="https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_i686.rpm"
-MD5SUM="7abe1e5309eee99a97caff16afe84232"
-DOWNLOAD_x86_64="https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.rpm"
-MD5SUM_x86_64="f7ccbf6fd27d4cbb41ba1442e6a1d217"
+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/vice/README b/system/vice/README
index ade2df503f..cf93780f1a 100644
--- a/system/vice/README
+++ b/system/vice/README
@@ -1,10 +1,8 @@
-VICE is the one and only Versatile Commodore Emulator. It provides emulation
-of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers.
+vice (Commodore 8-bit emulator)
 
+VICE is the one and only Versatile Commodore Emulator. It provides
+emulation of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II
+computers.
 
-Optional Dependency
-
-To enable recording of videos, you need ffmpeg. Enable this by passing
-to the script the parameter:
-
-  FFMPEG=yes ./vice.SlackBuild
+See README_SBo.txt for build options. The defaults should be fine for
+most users.
diff --git a/system/vice/README_SBo.txt b/system/vice/README_SBo.txt
new file mode 100644
index 0000000000..e8fd15f8de
--- /dev/null
+++ b/system/vice/README_SBo.txt
@@ -0,0 +1,21 @@
+Optional dependencies: ffmpeg and SDL2.
+
+Vice can use ffmpeg to record videos of the emulated machine. If
+ffmpeg is installed, it will be autodetected. If you have ffmpeg
+installed but don't want ffmpeg support, you'll have to removepkg
+ffmpeg before building (there's no way to override the autodetection).
+
+By default, vice will be built with SDL2 if it's installed, otherwise
+SDL1. You can set SDL=1 to force building with SDL1 even if SDL2 is
+installed.
+
+If you want to build without PulseAudio, set PULSE=no in the environment.
+
+Note: To use the standard application menu instead of the in-emulator
+PETSCII menu, GTK3 v3.22 is required. Slackware 14.2 ships with 3.18
+and there is no upgrade package for this. Slackware -current has
+3.22. So to use the normal application menus, either use Slackware
+-current or find a way to upgrade your Slackware 14.2's GTK3 to
+v3.22. The SlackBuild maintainer has NOT tested this build with
+Slackware -current, you're on your own if it doesn't work (fix it and
+send me a patch if you can).
diff --git a/system/vice/config/vsid.desktop b/system/vice/config/vsid.desktop
new file mode 100644
index 0000000000..c1dfd32f55
--- /dev/null
+++ b/system/vice/config/vsid.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=VICE SID Player
+Comment=A SID Player
+StartupNotify=true
+Exec=vsid
+Icon=vice
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/config/x128.desktop b/system/vice/config/x128.desktop
index d4e5d4fad8..92ab76c637 100644
--- a/system/vice/config/x128.desktop
+++ b/system/vice/config/x128.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=VICE C128 emulator
-Comment=Commodore 128 emulator from the VICE team
+Comment=A Commodore 128 emulator
 StartupNotify=true
 Exec=x128
 Icon=vice
diff --git a/system/vice/config/x64.desktop b/system/vice/config/x64.desktop
index 41e8485963..7991b5ecd9 100644
--- a/system/vice/config/x64.desktop
+++ b/system/vice/config/x64.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=VICE C64 emulator
-Comment=Commodore 64 emulator from the VICE team
+Comment=A fast Commodore 64 emulator
 StartupNotify=true
 Exec=x64
 Icon=vice
diff --git a/system/vice/config/x64dtv.desktop b/system/vice/config/x64dtv.desktop
index b6e1bc1112..f3d82b642d 100644
--- a/system/vice/config/x64dtv.desktop
+++ b/system/vice/config/x64dtv.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=VICE C64DTV emulator
-Comment=Commodore 64 DTV emulator from the VICE team
+Comment=A C64DTV emulator
 StartupNotify=true
 Exec=x64dtv
 Icon=vice
diff --git a/system/vice/config/x64sc.desktop b/system/vice/config/x64sc.desktop
new file mode 100644
index 0000000000..46d5b89ee0
--- /dev/null
+++ b/system/vice/config/x64sc.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=VICE C64 emulator
+Comment=An accurate Commodore 64 emulator
+StartupNotify=true
+Exec=x64sc
+Icon=vice
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/config/xcbm2.desktop b/system/vice/config/xcbm2.desktop
index 017254e8ac..1411e41883 100644
--- a/system/vice/config/xcbm2.desktop
+++ b/system/vice/config/xcbm2.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=VICE CBM2 emulator
-Comment=Commodore CBM2 emulator from the VICE team
+Name=VICE CBM-II emulator
+Comment=A Commodore CBM-II (6x0/7x0) emulator
 StartupNotify=true
 Exec=xcbm2
 Icon=vice
diff --git a/system/vice/config/xcbm5x0.desktop b/system/vice/config/xcbm5x0.desktop
new file mode 100644
index 0000000000..2acabe36d5
--- /dev/null
+++ b/system/vice/config/xcbm5x0.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=VICE CBM-II emulator
+Comment=A Commodore CBM-II (5x0) emulator
+StartupNotify=true
+Exec=xcbm5x0
+Icon=vice
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/config/xpet.desktop b/system/vice/config/xpet.desktop
index 53f125405d..1efabc6b61 100644
--- a/system/vice/config/xpet.desktop
+++ b/system/vice/config/xpet.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=VICE PET emulator
-Comment=Commodore PET emulator from the VICE team
+Comment=A Commodore PET emulator
 StartupNotify=true
 Exec=xpet
 Icon=vice
diff --git a/system/vice/config/xplus4.desktop b/system/vice/config/xplus4.desktop
index a10f256ef1..63f095c95a 100644
--- a/system/vice/config/xplus4.desktop
+++ b/system/vice/config/xplus4.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=VICE PLUS4 emulator
-Comment=Commodore PLUS4 emulator from the VICE team
+Name=VICE Plus4 emulator
+Comment=A Commodore Plus4 emulator
 StartupNotify=true
 Exec=xplus4
 Icon=vice
diff --git a/system/vice/config/xscpu64.desktop b/system/vice/config/xscpu64.desktop
new file mode 100644
index 0000000000..295643f0c8
--- /dev/null
+++ b/system/vice/config/xscpu64.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=VICE C64 SuperCPU emulator
+Comment=An accurate SuperCPU64 emulator
+StartupNotify=true
+Exec=xscpu64
+Icon=vice
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/config/xvic.desktop b/system/vice/config/xvic.desktop
index fe29db9bed..d06423e8be 100644
--- a/system/vice/config/xvic.desktop
+++ b/system/vice/config/xvic.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=VICE VIC-20 emulator
-Comment=Commodore VIC-20 emulator from the VICE team
+Comment=A Commodore VIC-20 emulator
 StartupNotify=true
 Exec=xvic
 Icon=vice
diff --git a/system/vice/doinst.sh b/system/vice/doinst.sh
index 8095c47d9b..2dde7a5cb4 100644
--- a/system/vice/doinst.sh
+++ b/system/vice/doinst.sh
@@ -1,9 +1,7 @@
-# Update desktop icons
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-# Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
   ( cd /usr/share/fonts/TTF
     mkfontscale .
@@ -14,3 +12,4 @@ if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
 fi
 
+chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/vice.info.gz
diff --git a/system/vice/psiddrv.h.prebuilt.3.4 b/system/vice/psiddrv.h.prebuilt.3.4
new file mode 100644
index 0000000000..c1820907b8
--- /dev/null
+++ b/system/vice/psiddrv.h.prebuilt.3.4
@@ -0,0 +1,28 @@
+ 0x01, 0x00, 0x6f, 0x36, 0x35, 0x00, 0x03, 0x00, 0x00, 0x10, 0x35, 0x01, 0x00, 0x04, 0x00, 0x00,
+ 0x00, 0x40, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x70, 0x73, 0x69, 0x64,
+ 0x64, 0x72, 0x76, 0x2e, 0x6f, 0x36, 0x35, 0x00, 0x1c, 0x03, 0x44, 0x61, 0x67, 0x20, 0x4c, 0x65,
+ 0x6d, 0x20, 0x3c, 0x72, 0x65, 0x73, 0x69, 0x64, 0x40, 0x6e, 0x69, 0x6d, 0x72, 0x6f, 0x64, 0x2e,
+ 0x6e, 0x6f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x2b,
+ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x2b, 0x11, 0x31, 0x11,
+ 0xa9, 0x00, 0x8d, 0x1a, 0xd0, 0xad, 0x19, 0xd0, 0x8d, 0x19, 0xd0, 0xa9, 0x7f, 0x8d, 0x0d, 0xdc,
+ 0x8d, 0x0d, 0xdd, 0xad, 0x0d, 0xdc, 0xad, 0x0d, 0xdd, 0xa2, 0x08, 0xbd, 0x0c, 0x10, 0x9d, 0x00,
+ 0x80, 0xca, 0x10, 0xf7, 0xad, 0x18, 0x10, 0xc9, 0x03, 0x90, 0x14, 0xd0, 0x07, 0xad, 0x17, 0x10,
+ 0xc9, 0x1a, 0x90, 0x0b, 0xa2, 0x05, 0xbd, 0x25, 0x10, 0x9d, 0x14, 0x03, 0xca, 0x10, 0xf7, 0xa9,
+ 0x1b, 0xa2, 0x00, 0x8d, 0x11, 0xd0, 0x8e, 0x12, 0xd0, 0xad, 0x21, 0x10, 0xf0, 0x06, 0xa9, 0x25,
+ 0xa2, 0x40, 0xd0, 0x04, 0xa9, 0x95, 0xa2, 0x42, 0x8d, 0x04, 0xdc, 0x8e, 0x05, 0xdc, 0xa9, 0x0f,
+ 0x8d, 0x18, 0xd4, 0xac, 0x15, 0x10, 0x88, 0xcc, 0x16, 0x10, 0x90, 0x02, 0xa0, 0x00, 0x98, 0x48,
+ 0xad, 0x1c, 0x10, 0xf0, 0x27, 0xae, 0x1c, 0x10, 0x20, 0xf9, 0x10, 0x8d, 0x24, 0x10, 0xc0, 0x20,
+ 0x90, 0x02, 0xa0, 0x1f, 0xa9, 0x00, 0xaa, 0x38, 0x2a, 0x90, 0x02, 0x2a, 0xe8, 0x88, 0x10, 0xf8,
+ 0x3d, 0x1d, 0x10, 0xd0, 0x07, 0xa9, 0x81, 0x8d, 0x1a, 0xd0, 0xd0, 0x0a, 0xa9, 0x81, 0xa2, 0x01,
+ 0x8d, 0x0d, 0xdc, 0x8e, 0x0e, 0xdc, 0xa9, 0x2f, 0x85, 0x00, 0xad, 0x1a, 0x10, 0xae, 0x23, 0x10,
+ 0x20, 0xf9, 0x10, 0x85, 0x01, 0x68, 0xaa, 0xa8, 0x20, 0xf3, 0x10, 0xad, 0x1c, 0x10, 0xf0, 0x04,
+ 0xa9, 0x36, 0x85, 0x01, 0x58, 0x4c, 0xf0, 0x10, 0x6c, 0x19, 0x10, 0x6c, 0x1b, 0x10, 0xc9, 0xe0,
+ 0x90, 0x03, 0xa9, 0x35, 0x60, 0xc9, 0xd0, 0x90, 0x03, 0xa9, 0x34, 0x60, 0xe0, 0xa0, 0x90, 0x03,
+ 0xa9, 0x36, 0x60, 0xa9, 0x37, 0x60, 0xad, 0x1c, 0x10, 0xf0, 0x0c, 0xad, 0x24, 0x10, 0x85, 0x01,
+ 0x20, 0xf6, 0x10, 0xa9, 0x36, 0x85, 0x01, 0xad, 0x19, 0xd0, 0x8d, 0x19, 0xd0, 0xad, 0x0d, 0xdc,
+ 0x68, 0xa8, 0x68, 0xaa, 0x68, 0x40, 0x2c, 0x0d, 0xdd, 0x40, 0x00, 0x00, 0x0b, 0x82, 0x1b, 0x82,
+ 0x02, 0x82, 0x02, 0x82, 0x1e, 0x82, 0x09, 0x82, 0x09, 0x82, 0x09, 0x82, 0x13, 0x82, 0x1a, 0x82,
+ 0x04, 0x82, 0x09, 0x82, 0x05, 0x82, 0x03, 0x82, 0x03, 0x82, 0x15, 0x82, 0x1a, 0x82, 0x03, 0x82,
+ 0x03, 0x82, 0x08, 0x82, 0x03, 0x82, 0x0a, 0x82, 0x03, 0x82, 0x03, 0x82, 0x1b, 0x82, 0x05, 0x82,
+ 0x05, 0x82, 0x00, 0x00, 0x00, 0x00,
diff --git a/system/vice/slack-desc b/system/vice/slack-desc
index 953758d889..589a2077b8 100644
--- a/system/vice/slack-desc
+++ b/system/vice/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-vice: vice (the one and only Versatile Commodore Emulator)
+vice: vice (Commodore 8-bit emulator)
 vice:
-vice: VICE is a program that runs on a Unix, MS-DOS, Win32, OS/2, Acorn
-vice: RISC OS, BeOS, QNX 6.x, Amiga, GP2X or Mac OS X machine and executes
-vice: programs intended for the old 8-bit computers. The current version
-vice: emulates the C64, the C128, the VIC20, almost all PET models, the
-vice: PLUS4 and the CBM-II (aka C610).
-vice:
-vice: Homepage: http://vice-emu.sourceforge.net
+vice: VICE is a program that runs on a modern machine and executes
+vice: programs intended for the the C64, the C64DTV, the C128, the
+vice: VIC20, practically all PET models, the PLUS4 and the CBM-II (aka
+vice: C610/C510). An extra emulator is provided for C64 expanded with
+vice: the CMD SuperCPU.
 vice:
+vice: Build options: ffpmeg=@FF@, sdl=@SDL@, pulse=@PA@
 vice:
+vice: Homepage: http://vice-emu.sourceforge.io
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 43c1de7bc4..0b1d3f9e64 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for VICE
 
-# Copyright 2008 Mauro Giachero (mauro dot giachero at gmail dot com)
+# Copyright 2008 Mauro Giachero (email removed)
+# Copyright 2020 B. Watson (yalhcru@gmail.com)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Initialize variables
+# 20200801 bkw:
+# - Take over maintenance
+# - Autodetect ffmpeg
+# - Allow building with SDL 1.x
+# - Allow building without pulseaudio
+# - Get rid of xa dep
+# - Install TTF fonts in correct place, get rid of other formats
+# - install-info in doinst.sh so vice.info shows up in the info dir
+# - Have slack-desc show build options
+# - Re-enable the old x64 emulator
+# - BUILD=3
+
 PRGNAM=vice
-VERSION=${VERSION:-3.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.4}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -58,13 +70,40 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Only an external ffmpeg seems to work ATM (might change from version to version)
-if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="--enable-external-ffmpeg"; else ffmpeg=""; fi
-
-# Exit if errors encountered
 set -e
 
-# Setup for package creation
+# The "--enable-shared-ffmpeg" option creates conflicts with external
+# ffmpeg libraries, so we don't use it here. Static would be OK, but
+# it won't build, so it's not an option for now either: I don't care
+# enough about it to spend any more time trying to fix it. If you do
+# care, come up with a way to build with --enable-static-ffmpeg, send
+# me a patch, and I'll include it here.
+
+[ -x /usr/bin/ffmpeg ] && ffmpeg="--enable-external-ffmpeg"
+
+SDL="${SDL:-auto}"
+if [ "$SDL" = "auto" ]; then
+  SDL=1
+  pkg-config --exists sdl2 && SDL=2
+fi
+
+case "$SDL" in
+  1)   sdlopt="--enable-sdlui"  ;;
+  2)   sdlopt="--enable-sdlui2" ;;
+  *)   echo -e "$( basename $0 ):" \
+               "invalid SDL option '$SDL'." \
+               "Valid options are:\n  auto 1 2" \
+               1>&2
+       exit 1 ;;
+esac
+
+# Anticipating 15.0's pure-alsa-system
+if [ "${PULSE:-yes}" != "yes" ]; then
+  pulseopt="--without-pulse"
+fi
+
+echo "=== sdlopt '$sdlopt', ffmpeg '$ffmpeg', pulseopt '$pulseopt'"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -72,11 +111,8 @@ 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 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 {} \+
 
 # Set proper paths in documentation.
 sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" \
@@ -86,27 +122,33 @@ sed -i 's/"\/vice_toc\.html"/"\/html\/vice_toc\.html"/g' \
 sed -i "s/\/usr\/local/\/usr/g" doc/vice.* doc/html/*html
 sed -i "s/\/usr\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" doc/vice.* doc/html/*html
 
-# Disable PDF generation because it bombs
-sed -i "s/AM_CONDITIONAL(BUILD_PDF, true)/AM_CONDITIONAL(BUILD_PDF, false)/g" \
-  configure.ac
-
-# Don't install fonts in $HOME and run fc-cache on the build system
-sed -i -e '/@HAVE_FC_CACHE_TRUE@/d' data/fonts/Makefile.am
+# Avoid the need for xa. It's only used to generate a small C header
+# file, which we include a prebuilt version of here. There's nothing
+# dynamic about this header, it's just a small chunk of 6502 object
+# code as a C array, and for a given version of vice it'll always be
+# the same code.
+cat $CWD/psiddrv.h.prebuilt.$VERSION > src/c64/psiddrv.h
 
 autoreconf -vif
 
-# Configure the software
+DOCDIR=/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/$DOCDIR
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+XA=/bin/true \
 ./configure \
+  $sdlopt \
+  $ffmpeg \
+  $pulseopt \
+  --enable-x64 \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  $ffmpeg \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=$DOCDIR \
   --with-x \
   --enable-quicktime \
   --enable-ethernet \
@@ -114,46 +156,59 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-cpuhistory \
   --build=$ARCH-slackware-linux
 
-# Build the software
 make
-make install DESTDIR=$PKG
-
-# Strip symbols from binaries
-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
-
-# Compress info files
+make install-strip DESTDIR=$PKG
 rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
+gzip -9 $PKG/usr/man/man?/*.?  $PKG/usr/info/*
 
-# Install icon and menu entries
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 install -D -m 0644 $CWD/config/*.desktop $PKG/usr/share/applications
 install -D -m 0644 $CWD/config/vice.png $PKG/usr/share/pixmaps
 
-# Move the original documentation folder to the usual place
-# and create a link to where vice expect it to be
-mkdir -p $PKG/usr/doc
-mv $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
+# Move the docs to the Slackware standard place, symlink to where vice
+# expects it to be.
+mkdir -p $PKGDOC
+mv $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc/* $PKGDOC
+( cd $PKGDOC
   chmod 644 *
   mkdir html
   mv *.html *.png *.gif *.css html/ )
-( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
-
-# Copy additional program documentation
-cp -a AUTHORS ChangeLog COPYING FEEDBACK INSTALL NEWS README \
-   $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+  rmdir doc
+  ln -s $DOCDIR doc )
+
+# 20200728 bkw: when I inherited this build, it was installing the
+# fonts to the doc dir (where they can't be used), but updating
+# the font cache in doinst.sh. I'm not so sure the fonts are
+# really necessary, but in case they are, I've moved them to
+# /usr/share/fonts/TTF (and gotten rid of the non-TTF ones).
+mkdir -p $PKG/usr/share/fonts/TTF
+mv $PKGDOC/*.ttf $PKG/usr/share/fonts/TTF
+rm -f $PKGDOC/Lato-*
+
+# This would install Commodore font where other software can use it.
+# However, the characters in the font are in PETSCII order, not ASCII
+# or Unicode, so it's not all that useful.
+#ln -s ../../../lib$LIBDIRSUFFIX/$PRGNAM/common/CBM.ttf $PKG/usr/share/fonts/TTF
+
+cp -a AUTHORS ChangeLog COPYING FEEDBACK NEWS README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+# Make the slack-desc reflect the build options.
+FF=no; SDL=1.2; PA=no
+
+# We can't use ldd to detect whether ffmpeg is built in since it
+# gets loaded with dlopen(). Hence this stuff:
+grep -q '^#define USE_SDLUI2\>'  src/config.h && SDL=2.0
+grep -q '^#define HAVE_FFMPEG\>' src/config.h && FF=yes
+grep -q '^#define USE_PULSE\>'   src/config.h && PA=yes
 
-# Setup package install directory
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s,@FF@,$FF," \
+    -e "s,@PA@,$PA," \
+    -e "s,@SDL@,$SDL," \
+ $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Create package
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/vice/vice.info b/system/vice/vice.info
index ff9cf49f60..481d98ad3f 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,10 +1,10 @@
 PRGNAM="vice"
-VERSION="3.3"
-HOMEPAGE="http://vice-emu.sourceforge.net"
-DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.3.tar.gz"
-MD5SUM="b0797f534b33f638220418207d606cf5"
+VERSION="3.4"
+HOMEPAGE="http://vice-emu.sourceforge.io"
+DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.4.tar.gz"
+MD5SUM="24d83f692910f5d87de19857e8095f0b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2 xa"
-MAINTAINER="Eric B. Pratt"
-EMAIL="eric.b.pratt@gmail.com"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
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/vinterm/vinterm.info b/system/vinterm/vinterm.info
index a456f8af70..39175b37a3 100644
--- a/system/vinterm/vinterm.info
+++ b/system/vinterm/vinterm.info
@@ -1,8 +1,8 @@
 PRGNAM="vinterm"
 VERSION="0.5.0"
 HOMEPAGE="https://github.com/andrenho/vinterm"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/vinterm-0.5.0.tar.gz \
-          http://urchlay.naptime.net/~urchlay/src/vinterm.vim"
+DOWNLOAD="https://slackware.uk/~urchlay/src/vinterm-0.5.0.tar.gz \
+          https://slackware.uk/~urchlay/src/vinterm.vim"
 MD5SUM="307d2285565d9699d62bfc72b8e445c3 \
         15fd1ef04deb529f3aad5aa11b5d1bf4"
 DOWNLOAD_x86_64=""
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 dd7b848b71..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
@@ -117,7 +119,7 @@ mkdir vendor
       sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
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 6bf840abf2..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.941}
+VERSION=${VERSION:-1.973}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/webmin/webmin.info b/system/webmin/webmin.info
index 4e7f64b126..e51856347c 100644
--- a/system/webmin/webmin.info
+++ b/system/webmin/webmin.info
@@ -1,8 +1,8 @@
 PRGNAM="webmin"
-VERSION="1.941"
-HOMEPAGE="http://www.webmin.com/"
-DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/1.941/webmin-1.941.tar.gz"
-MD5SUM="bb8f63068a86a14269726f4d934b8d38"
+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/README b/system/wine-staging/README
index cdb6a408dc..eab14d1e07 100644
--- a/system/wine-staging/README
+++ b/system/wine-staging/README
@@ -9,6 +9,11 @@ before they are integrated into the main branch.
 This is a current development branch of Wine appended with full
 patches of the Staging branch.
 
+NOTE
+
+libusb in Slackware 14.2 is too old for this version of wine, and
+consequently, USB isn't supported.
+
 ============================================================
 
 OPTIONS
@@ -35,14 +40,16 @@ The above options can be combined.
 
 OPTIONAL DEPENDENCIES
 
-fontforge:
-
-To build tahoma, tahomabd, and marlett fonts.
-
-webcore-fonts:
-
-For tahoma, lucida console, MS fonts for the web and Win
-Vista.
+fontforge: To build tahoma, tahomabd, and marlett fonts.
+webcore-fonts: For MS fonts for the web and Windows Vista.
+oss
+SDL2
+FAudio
+libcapi20
+gsm
+krb5
+OpenAL
+vulkan-sdk
 
 ============================================================
 
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index 609d80457e..da0da96bc8 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -32,7 +32,8 @@
 # Now maintained by Dave Woodfall <dave@slackbuilds.org>
 
 PRGNAM=wine-staging
-VERSION=${VERSION:-5.2}
+VERSION=${VERSION:-6.5}
+WINEVERSION=${WINEVERSION:-6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,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:
@@ -89,8 +90,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION wine-$VERSION
-tar xvf $CWD/wine-$VERSION.tar.xz
+rm -rf $PRGNAM-$VERSION wine-$WINEVERSION
+tar xvf $CWD/wine-$WINEVERSION.tar.xz
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 
 cd $PRGNAM-$VERSION/patches
@@ -101,9 +102,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 {} \;
 
-./patchinstall.sh DESTDIR=$TMP/wine-$VERSION --all
+./patchinstall.sh DESTDIR=$TMP/wine-$WINEVERSION --all
 
-cd $TMP/wine-$VERSION
+cd $TMP/wine-$WINEVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -117,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
@@ -213,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 eb21d5aa3b..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.2"
+VERSION="6.5"
 HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-DOWNLOAD="https://dl.winehq.org/wine/source/5.x/wine-5.2.tar.xz \
-          https://github.com/wine-staging/wine-staging/archive/v5.2/wine-staging-5.2.tar.gz"
-MD5SUM="91fa1b27f16301b919ac298163fbd47d \
-        f7eeeaca10b25e1629a8db3854db49a7"
+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/README b/system/wine/README
index 4bfe4f5d03..a5830f6347 100644
--- a/system/wine/README
+++ b/system/wine/README
@@ -4,7 +4,6 @@ top of X for Linux and Unix.
 NOTE: This builds the stable version of wine.  If you need
 cutting-edge then you may want to check out wine-staging.
 
-
 OPTIONS
 
 With no options this SlackBuild will build a 32 bit package,
@@ -25,17 +24,18 @@ To disable OpenGL support, use:
 
 The above options can be combined.
 
-
 OPTIONAL DEPENDENCIES
 
-fontforge:
-
-To build tahoma, tahomabd, and marlett fonts.
-
-webcore-fonts:
-
-For tahoma, lucida console, MS fonts for the web and Win
-Vista.
+fontforge: To build tahoma, tahomabd, and marlett fonts.
+webcore-fonts: For MS fonts for the web and Windows Vista.
+oss
+SDL2
+FAudio
+libcapi20
+gsm
+krb5
+OpenAL
+vulkan-sdk
 
 ============================================================
 
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild
index b3c1c520ab..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:-4.0.3}
+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 188610b6bb..44d7b362ae 100644
--- a/system/wine/wine.info
+++ b/system/wine/wine.info
@@ -1,8 +1,8 @@
 PRGNAM="wine"
-VERSION="4.0.3"
+VERSION="6.0"
 HOMEPAGE="http://www.winehq.com/"
-DOWNLOAD="https://dl.winehq.org/wine/source/4.0/wine-4.0.3.tar.xz"
-MD5SUM="0a4c3edd95031d590420f0b193afb0a6"
+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/wmgtemp/bugfix.diff b/system/wmgtemp/bugfix.diff
deleted file mode 100644
index 19916400c8..0000000000
--- a/system/wmgtemp/bugfix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur wmgtemp-1.1/src/wmgtemp.c wmgtemp-1.1.patched/src/wmgtemp.c
---- wmgtemp-1.1/src/wmgtemp.c	2010-06-21 06:54:37.000000000 -0400
-+++ wmgtemp-1.1.patched/src/wmgtemp.c	2016-08-16 08:38:01.208866564 -0400
-@@ -90,8 +90,8 @@
- int SUBFEAT_NUM_CPU = 0;
- int SUBFEAT_NUM_SYS = 0;
- 
--double cpu_history[59];
--double sys_history[59];
-+double cpu_history[60];
-+double sys_history[60];
- 
- double display_min = 20;
- double display_max = 35;
diff --git a/system/wmgtemp/wmgtemp.SlackBuild b/system/wmgtemp/wmgtemp.SlackBuild
index d48afc24a9..f8c546215f 100644
--- a/system/wmgtemp/wmgtemp.SlackBuild
+++ b/system/wmgtemp/wmgtemp.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for wmgtemp
 #
 # Copyright 2015 Gethyn ThomasQuail <email removed>
+# Copyright 2020 B. Watson <yalhcru@gmail.com>
 # All rights reserved.
 #
 # Based on:
@@ -27,6 +28,7 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
+# 20200609 bkw: update for v1.2, add libdockapp dep
 # 20160816 bkw:
 # - take over maintenance
 # - BUILD=2
@@ -37,8 +39,8 @@
 # - don't install INSTALL to doc dir
 
 PRGNAM=wmgtemp
-VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,21 +79,23 @@ 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 {} \+
 
-patch -p1 < $CWD/bugfix.diff
+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
 
-sed -i 's,/etc/sensors\.conf,/etc/sensors3.conf,' src/$PRGNAM.c $PRGNAM.1
-
-make CCFLAGS="$SLKCFLAGS -fgnu89-inline"
-mkdir -p $PKG/usr/bin
-install -s -m0755 src/$PRGNAM $PKG/usr/bin
-mkdir -p $PKG/usr/man/man1
-gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Artistic ChangeLog CREDITS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/wmgtemp/wmgtemp.info b/system/wmgtemp/wmgtemp.info
index 8723be139c..0ead6258c1 100644
--- a/system/wmgtemp/wmgtemp.info
+++ b/system/wmgtemp/wmgtemp.info
@@ -1,10 +1,10 @@
 PRGNAM="wmgtemp"
-VERSION="1.1"
-HOMEPAGE="http://fluxcode.net/projects/wmgtemp"
-DOWNLOAD="http://fluxcode.net/files/wmgtemp-1.1.tar.gz"
-MD5SUM="cce700b3a4ef74b2ec019d8e89bdf2f6"
+VERSION="1.2"
+HOMEPAGE="https://www.dockapps.net/wmgtemp"
+DOWNLOAD="https://www.dockapps.net/download/wmgtemp-1.2.tar.gz"
+MD5SUM="a595053ba7fab25e318d983df3af8ce8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libdockapp"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/system/worker/worker.SlackBuild b/system/worker/worker.SlackBuild
index 37caf6a860..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.3.0}
+VERSION=${VERSION:-4.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/worker/worker.info b/system/worker/worker.info
index a55a39b8e9..f2e68e7085 100644
--- a/system/worker/worker.info
+++ b/system/worker/worker.info
@@ -1,8 +1,8 @@
 PRGNAM="worker"
-VERSION="4.3.0"
+VERSION="4.8.0"
 HOMEPAGE="http://www.boomerangsworld.de/worker/"
-DOWNLOAD="http://www.boomerangsworld.de/cms/worker/downloads/worker-4.3.0.tar.bz2"
-MD5SUM="ef5445169ca1253993e001661ece3573"
+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 626765dc4a..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.14}
+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 5c56740a4c..bdf73f4d96 100644
--- a/system/xarchiver/xarchiver.info
+++ b/system/xarchiver/xarchiver.info
@@ -1,10 +1,10 @@
 PRGNAM="xarchiver"
-VERSION="0.5.4.14"
+VERSION="0.5.4.17"
 HOMEPAGE="https://github.com/ib/xarchiver"
-DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.14/xarchiver-0.5.4.14.tar.gz"
-MD5SUM="70e60118c59fe647f620b07f83907fc9"
+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=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf{at}gmail{dot}com"
+EMAIL="kingbeowulf@gmail.com"
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/README b/system/xen/README
index f5f8c96b6d..2999a8e54d 100644
--- a/system/xen/README
+++ b/system/xen/README
@@ -7,7 +7,8 @@ Solaris, and various versions of the BSD operating systems.
 This script has a few optional dependencies:
 
   mbootpack - creates LILO compatible kernel images
-  libssh2 - mostly used by libvirt, enable with USE_LIBSSH2=yes
+  libssh - mostly used by libvirt, enable with USE_LIBSSH=yes
+           (previously known as USE_LIBSSH2)
   ocaml-findlib - autodetected, builds oxenstored binary
   spice - enable with USE_SPICE=yes
 
@@ -15,6 +16,8 @@ Linking with the stock libraries:
 
   bluez - enable with USE_BLUEZ=yes
   gtk - enable with USE_GTK=yes
+  audio - enable with USE_AUDIO=yes
+          (or a comma-delimited list: oss alsa sdl pa)
 
 Reading material:
 
diff --git a/system/xen/dom0/README.dom0 b/system/xen/dom0/README.dom0
index 728e3bae79..68dbf815fb 100644
--- a/system/xen/dom0/README.dom0
+++ b/system/xen/dom0/README.dom0
@@ -46,7 +46,7 @@ Xen EFI binary.
 
 To make things a bit easier, a copy of Xen EFI binary can be found here:
 
-  http://slackware.hr/~mario/xen/xen-4.12.1.efi.gz
+  http://slackware.hr/~mario/xen/xen-4.13.1.efi.gz
 
 If an automatic boot to Xen kernel is desired, the binary should be renamed and
 copied to the following location: /boot/efi/EFI/BOOT/bootx64.efi
diff --git a/system/xen/dom0/config-4.4.202-xen.i686 b/system/xen/dom0/config-4.4.202-xen.i686
deleted file mode 100644
index b31c558e37..0000000000
--- a/system/xen/dom0/config-4.4.202-xen.i686
+++ /dev/null
@@ -1,7451 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.202 Kernel Configuration
-#
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_32_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=3
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-xen"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="darkstar"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_FHANDLE=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-# CONFIG_TASKS_RCU is not set
-CONFIG_RCU_STALL_COMMON=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_EXPEDITE_BOOT is not set
-CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CGROUP_WRITEBACK=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_USERFAULTFD=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_MEMBARRIER=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_UPROBES is not set
-# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_CMDLINE_PARSER is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_FAST_FEATURE_TESTS=y
-CONFIG_X86_MPPARSE=y
-CONFIG_X86_BIGSMP=y
-CONFIG_RETPOLINE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_IOSF_MBI=m
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_X86_32_IRIS=m
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-CONFIG_PARAVIRT_SPINLOCKS=y
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_GUEST=y
-# CONFIG_KVM_DEBUG_FS is not set
-# CONFIG_LGUEST_GUEST is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-CONFIG_MPENTIUMIII=y
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-CONFIG_X86_DEBUGCTLMSR=y
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_NR_CPUS=32
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_ANCIENT_MCE=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-# CONFIG_X86_LEGACY_VM86 is not set
-# CONFIG_VM86 is not set
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=y
-CONFIG_X86_CPUID=y
-# CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-CONFIG_X86_PAE=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_NUMA=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=3
-CONFIG_ARCH_HAVE_MEMORY_PRESENT=y
-CONFIG_NEED_NODE_MEMMAP_SIZE=y
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_DISCONTIGMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
-# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_ZSMALLOC=m
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_PMEM_LEGACY=y
-CONFIG_HIGHPTE=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MATH_EMULATION=y
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-# CONFIG_X86_INTEL_MPX is not set
-CONFIG_X86_INTEL_TSX_MODE_OFF=y
-# CONFIG_X86_INTEL_TSX_MODE_ON is not set
-# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-CONFIG_EFI=y
-# CONFIG_EFI_STUB is not set
-CONFIG_SECCOMP=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="\"\""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_NUMA is not set
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-CONFIG_ACPI_BGRT=y
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_ACPI_NFIT=m
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_ACPI_EXTLOG=m
-CONFIG_PMIC_OPREGION=y
-CONFIG_SFI=y
-# CONFIG_APM is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_INTEL_IDLE=y
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEAER_INJECT=m
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=y
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-# CONFIG_PCI_PRI is not set
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-CONFIG_SCx200=m
-CONFIG_SCx200HR_TIMER=m
-CONFIG_ALIX=y
-# CONFIG_NET5501 is not set
-# CONFIG_GEOS is not set
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_RAPIDIO is not set
-# CONFIG_X86_SYSFB is not set
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_PMC_ATOM=y
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_DIAG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETLABEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CONNTRACK_PROCFS is not set
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_META=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-
-#
-# DECnet: Netfilter Configuration
-#
-# CONFIG_DECNET_NF_GRABULATOR is not set
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-# CONFIG_IP_DCCP_CCID3 is not set
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-CONFIG_TIPC_MEDIA_IB=y
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-CONFIG_6LOWPAN=m
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_CANID=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_CLS_IND is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-CONFIG_BATMAN_ADV_MCAST=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_HSR=m
-CONFIG_NET_SWITCHDEV=y
-# CONFIG_NET_L3_MASTER_DEV is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_SCC=m
-CONFIG_SCC_DELAY=y
-CONFIG_SCC_TRXECHO=y
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_BAYCOM_EPP=m
-CONFIG_YAM=m
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_LEDS is not set
-CONFIG_CAN_JANZ_ICAN3=m
-CONFIG_PCH_CAN=m
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_ISA=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_EMS_PCMCIA=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_PEAK_PCMCIA=m
-CONFIG_CAN_PEAK_PCI=m
-CONFIG_CAN_PEAK_PCIEC=y
-CONFIG_CAN_KVASER_PCI=m
-CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_TSCAN1=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_M_CAN=m
-CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_ISA=m
-CONFIG_CAN_CC770_PLATFORM=m
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_KVASER_USB=m
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
-# CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_TOSHIBA_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_DEBUGFS is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_UART is not set
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-# CONFIG_NFC_MEI_PHY is not set
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-# CONFIG_NFC_FDP is not set
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-# CONFIG_NFC_MRVL_I2C is not set
-CONFIG_NFC_ST21NFCA=m
-# CONFIG_NFC_ST_NCI is not set
-CONFIG_NFC_NXP_NCI=m
-CONFIG_NFC_NXP_NCI_I2C=m
-# CONFIG_NFC_S3FWRN5_I2C is not set
-CONFIG_LWTUNNEL=y
-CONFIG_DST_CACHE=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-CONFIG_SYS_HYPERVISOR=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
-
-#
-# Bus devices
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_SM_FTL=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_MAP_BANK_WIDTH_8=y
-CONFIG_MTD_MAP_BANK_WIDTH_16=y
-CONFIG_MTD_MAP_BANK_WIDTH_32=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_I4=y
-CONFIG_MTD_CFI_I8=y
-CONFIG_MTD_OTP=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_SCx200_DOCFLASH=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICHXROM=m
-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_SCB2_FLASH=m
-CONFIG_MTD_NETtel=m
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_GPIO_ADDR=m
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-CONFIG_MTD_LATCH_ADDR=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_BCH=m
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_SM_COMMON=m
-CONFIG_MTD_NAND_DENALI=m
-CONFIG_MTD_NAND_DENALI_PCI=m
-CONFIG_MTD_NAND_DENALI_DT=m
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
-CONFIG_MTD_NAND_GPIO=m
-# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_NAND_DOCG4=m
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_NAND_HISI504=m
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_GENERIC=m
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# CONFIG_MTD_SPI_NOR is not set
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-CONFIG_MTD_UBI_GLUEBI=m
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_OF is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_FD=y
-CONFIG_PARIDE=m
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_BPCK6=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPATC8=y
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_LZ4_COMPRESS is not set
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_RAM_DAX=y
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_BACKEND=y
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_NVME=m
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_DUMMY_IRQ=m
-CONFIG_IBM_ASM=m
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_BMP085_I2C=m
-CONFIG_PCH_PHUB=m
-CONFIG_USB_SWITCH_FSA9480=m
-# CONFIG_SRAM is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_VMWARE_VMCI=m
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-# CONFIG_ECHO is not set
-# CONFIG_CXL_BASE is not set
-# CONFIG_CXL_KERNEL_API is not set
-# CONFIG_CXL_EEH is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=y
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_7000FASST=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_VMWARE_PVSCSI=m
-# CONFIG_XEN_SCSI_FRONTEND is not set
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DTC3280=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_GENERIC_NCR5380=m
-CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
-CONFIG_SCSI_GENERIC_NCR53C400=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_NCR53C406A=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_PAS16=m
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_T128=m
-CONFIG_SCSI_U14_34F=m
-# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
-# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
-CONFIG_SCSI_U14_34F_MAX_TAGS=8
-CONFIG_SCSI_ULTRASTOR=m
-CONFIG_SCSI_NSP32=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_SATA_INIC162X=y
-CONFIG_SATA_ACARD_AHCI=y
-CONFIG_SATA_SIL24=y
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_SX4=y
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=y
-CONFIG_SATA_NV=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_SVW=y
-CONFIG_SATA_ULI=y
-CONFIG_SATA_VIA=y
-CONFIG_SATA_VITESSE=y
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=y
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ARTOP=y
-CONFIG_PATA_ATIIXP=y
-CONFIG_PATA_ATP867X=y
-CONFIG_PATA_CMD64X=y
-CONFIG_PATA_CS5520=y
-CONFIG_PATA_CS5530=y
-CONFIG_PATA_CS5535=y
-CONFIG_PATA_CS5536=y
-CONFIG_PATA_CYPRESS=y
-CONFIG_PATA_EFAR=y
-CONFIG_PATA_HPT366=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_HPT3X2N=y
-CONFIG_PATA_HPT3X3=y
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=y
-CONFIG_PATA_IT821X=y
-CONFIG_PATA_JMICRON=y
-CONFIG_PATA_MARVELL=y
-CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NINJA32=y
-CONFIG_PATA_NS87415=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_OPTIDMA=y
-CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_PDC_OLD=y
-CONFIG_PATA_RADISYS=y
-CONFIG_PATA_RDC=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_SCH=y
-CONFIG_PATA_SERVERWORKS=y
-CONFIG_PATA_SIL680=y
-CONFIG_PATA_SIS=y
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=y
-CONFIG_PATA_VIA=y
-CONFIG_PATA_WINBOND=y
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=y
-CONFIG_PATA_ISAPNP=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_OPTI=y
-CONFIG_PATA_PCMCIA=m
-# CONFIG_PATA_PLATFORM is not set
-CONFIG_PATA_QDI=y
-CONFIG_PATA_RZ1000=y
-CONFIG_PATA_WINBOND_VLB=y
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=y
-CONFIG_ATA_GENERIC=y
-CONFIG_PATA_LEGACY=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID10=y
-CONFIG_MD_RAID456=y
-CONFIG_MD_MULTIPATH=y
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_MQ_DEFAULT is not set
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=y
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-# CONFIG_DM_DELAY is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-CONFIG_NET_FC=y
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_TUN=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_SUNGEM_PHY=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_ISA=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_LANCE=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NI65=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_AURORA_NB8800=m
-CONFIG_NET_CADENCE=y
-CONFIG_MACB=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNX2X_VXLAN=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_CS89x0=m
-# CONFIG_CS89x0_PLATFORM is not set
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_CX_ECAT=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_VXLAN=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_VXLAN=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBEVF=m
-CONFIG_I40E=m
-# CONFIG_I40E_VXLAN is not set
-CONFIG_I40EVF=m
-CONFIG_FM10K=m
-CONFIG_FM10K_VXLAN=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_VXLAN=y
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX5_CORE=m
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SWITCHX2=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2000=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_ULTRA=m
-CONFIG_WD80x3=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_VXLAN=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QEDE=m
-CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-CONFIG_NET_VENDOR_SAMSUNG=y
-CONFIG_SXGBE_ETH=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-# CONFIG_SFC_MCDI_LOGGING is not set
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC9194=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_DWMAC_GENERIC=m
-# CONFIG_STMMAC_PCI is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TI_CPSW_ALE=m
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AQUANTIA_PHY=m
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_ADM8211=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-# CONFIG_ATH9K_AHB is not set
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-CONFIG_ATH9K_WOW=y
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-CONFIG_WCN36XX_DEBUGFS=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCM_TRACING=y
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFIG_IWLWIFI_UAPSD is not set
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
-CONFIG_WL_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WAN=y
-CONFIG_HOSTESS_SV11=m
-CONFIG_COSA=m
-CONFIG_LANMEDIA=m
-CONFIG_SEALEVEL_4021=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-
-#
-# X.25/LAPB support is disabled
-#
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_PC300TOO is not set
-CONFIG_N2=m
-CONFIG_C101=m
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_SDLA=m
-CONFIG_SBNI=m
-# CONFIG_SBNI_MULTILINE is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_VMXNET3=m
-CONFIG_FUJITSU_ES=m
-CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_CAPI=m
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPIDRV=m
-# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-# CONFIG_GIGASET_CAPI is not set
-CONFIG_GIGASET_I4L=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-# CONFIG_GIGASET_M101 is not set
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-CONFIG_NVM=y
-# CONFIG_NVM_DEBUG is not set
-# CONFIG_NVM_GENNVM is not set
-# CONFIG_NVM_RRPC is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=y
-CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_LM8333=m
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_SAMSUNG=m
-CONFIG_KEYBOARD_STOWAWAY=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_CROS_EC=m
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_INPORT=m
-CONFIG_MOUSE_ATIXL=y
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FT6236=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_HTCPEN=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_SUR40=m
-CONFIG_TOUCHSCREEN_SX8654=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_GP2A=m
-CONFIG_INPUT_GPIO_BEEPER=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-CONFIG_INPUT_KXTJ9_POLLED_MODE=y
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_TPS65218_PWRBUTTON=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_IMS_PCU=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_INPUT_DRV260X_HAPTICS=m
-CONFIG_INPUT_DRV2665_HAPTICS=m
-CONFIG_INPUT_DRV2667_HAPTICS=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_USERIO=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_NOZOMI=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-CONFIG_LDISC_AUTOLOAD=y
-CONFIG_DEVMEM=y
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_FOURPORT=m
-CONFIG_SERIAL_8250_ACCENT=m
-CONFIG_SERIAL_8250_BOCA=m
-CONFIG_SERIAL_8250_EXAR_ST16C554=m
-CONFIG_SERIAL_8250_HUB6=m
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_DW=m
-CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_8250_FINTEK=m
-CONFIG_SERIAL_8250_MID=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SCCNXP=m
-CONFIG_SERIAL_SC16IS7XX=m
-# CONFIG_SERIAL_SC16IS7XX_I2C is not set
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_TPM=m
-CONFIG_NVRAM=m
-CONFIG_DTLK=m
-CONFIG_APPLICOM=m
-CONFIG_SONYPI=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_SCx200_GPIO=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HPET_MMAP_DEFAULT=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_TIS_I2C_ATMEL=m
-CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_TCG_TIS_I2C_NUVOTON=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-# CONFIG_TCG_XEN is not set
-CONFIG_TCG_CRB=m
-CONFIG_TCG_TIS_ST33ZP24=m
-CONFIG_TCG_TIS_ST33ZP24_I2C=m
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EG20T=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_ISA=m
-CONFIG_I2C_CROS_EC_TUNNEL=m
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-CONFIG_HSI=m
-CONFIG_HSI_BOARDINFO=y
-
-#
-# HSI controllers
-#
-
-#
-# HSI clients
-#
-CONFIG_HSI_CHAR=m
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PINCTRL=y
-
-#
-# Pin controllers
-#
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
-CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=m
-CONFIG_PINCTRL_INTEL=m
-CONFIG_PINCTRL_BROXTON=m
-CONFIG_PINCTRL_SUNRISEPOINT=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
-CONFIG_GPIO_ACPI=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_AMDPT is not set
-CONFIG_GPIO_DWAPB=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_ICH=m
-CONFIG_GPIO_LYNXPOINT=y
-CONFIG_GPIO_VX855=m
-# CONFIG_GPIO_ZX is not set
-
-#
-# Port-mapped I/O GPIO drivers
-#
-# CONFIG_GPIO_104_IDIO_16 is not set
-CONFIG_GPIO_F7188X=m
-# CONFIG_GPIO_IT87 is not set
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_SCH311X=m
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_ARIZONA=m
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_DLN2=m
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_GPIO_LP3943=m
-# CONFIG_GPIO_TIMBERDALE is not set
-# CONFIG_GPIO_UCB1400 is not set
-CONFIG_GPIO_WM8994=m
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_INTEL_MID is not set
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI or I2C GPIO expanders
-#
-# CONFIG_GPIO_MCP23S08 is not set
-
-#
-# USB GPIO expanders
-#
-CONFIG_GPIO_VIPERBOARD=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-# CONFIG_W1_SLAVE_DS2408_READBACK is not set
-CONFIG_W1_SLAVE_DS2413=m
-CONFIG_W1_SLAVE_DS2406=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_DS2781=m
-CONFIG_W1_SLAVE_DS28E04=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_GENERIC_ADC_BATTERY=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2781=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_SBS=m
-CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=y
-CONFIG_BATTERY_BQ27XXX_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_LP8727=m
-CONFIG_CHARGER_GPIO=m
-# CONFIG_CHARGER_MANAGER is not set
-CONFIG_CHARGER_BQ2415X=m
-CONFIG_CHARGER_BQ24190=m
-CONFIG_CHARGER_BQ24257=m
-CONFIG_CHARGER_BQ24735=m
-CONFIG_CHARGER_BQ25890=m
-CONFIG_CHARGER_SMB347=m
-CONFIG_CHARGER_TPS65217=m
-CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_CHARGER_RT9455=m
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_RESTART is not set
-CONFIG_POWER_AVS=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_MC13783_ADC=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IIO_HWMON=m
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_HTU21=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_MENF21BMC_HWMON=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC2978_REGULATOR=y
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_TPS40422=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THERMAL_EMULATION=y
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_MENF21BMC_WATCHDOG=m
-# CONFIG_XILINX_WATCHDOG is not set
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_RN5T618_WATCHDOG=m
-CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_SCx200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC7240_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_BCM7038_WDT=m
-CONFIG_MEN_A21_WDT=m
-# CONFIG_XEN_WDT is not set
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-CONFIG_MIXCOMWD=m
-CONFIG_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_HOST_SOC=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_GPIO is not set
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_CS5535=m
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_HTC_PASIC3=m
-CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-CONFIG_MFD_JANZ_CMODIO=m
-# CONFIG_MFD_KEMPLD is not set
-CONFIG_MFD_MT6397=m
-CONFIG_MFD_MENF21BMC=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_RN5T618=m
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-CONFIG_MFD_SKY81452=m
-# CONFIG_ABX500_CORE is not set
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_MFD_LP3943=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65217=m
-CONFIG_MFD_TPS65218=m
-# CONFIG_MFD_TPS65912 is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-CONFIG_MFD_TIMBERDALE=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-CONFIG_MFD_WM8997=y
-# CONFIG_MFD_WM8998 is not set
-CONFIG_MFD_WM8994=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_ACT8865=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_ANATOP=m
-CONFIG_REGULATOR_BCM590XX=m
-CONFIG_REGULATOR_DA9210=m
-CONFIG_REGULATOR_DA9211=m
-CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_ISL9305=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP872X=m
-CONFIG_REGULATOR_LP8755=m
-CONFIG_REGULATOR_LTC3589=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_MT6311=m
-CONFIG_REGULATOR_MT6397=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_PFUZE100=m
-CONFIG_REGULATOR_RN5T618=m
-CONFIG_REGULATOR_SKY81452=m
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65217=m
-CONFIG_REGULATOR_WM8994=m
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-CONFIG_MEDIA_RC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_HIX5HD2=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_AU0828_RC=y
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=y
-CONFIG_DVB_AS102=m
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DT3155=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_SMIPCIE=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-CONFIG_VIDEO_SH_VEU=m
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIVID=m
-CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VIM2M=m
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-
-#
-# Supported MMC/SDIO adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-# CONFIG_RADIO_SI470X is not set
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_SI4713=m
-CONFIG_PLATFORM_SI4713=m
-CONFIG_I2C_SI4713=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_RAREMONO=m
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-CONFIG_V4L_RADIO_ISA_DRIVERS=y
-CONFIG_RADIO_ISA=m
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-# CONFIG_RADIO_RTRACK2 is not set
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_ZOLTRIX=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-
-#
-# Miscellaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-
-#
-# Sensors used on soc_camera driver
-#
-
-#
-# soc_camera sensor drivers
-#
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
-CONFIG_INTEL_GTT=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_TTM=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_CIK is not set
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I810=m
-CONFIG_DRM_I915=m
-# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_HECUBA=m
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-CONFIG_FB_ARC=m
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-CONFIG_FB_N411=m
-CONFIG_FB_HGA=m
-CONFIG_FB_OPENCORES=m
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_I740=m
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_INTEL is not set
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GEODE_GX=m
-CONFIG_FB_GEODE_GX1=m
-# CONFIG_FB_SM501 is not set
-CONFIG_FB_SMSCUFX=m
-CONFIG_FB_UDL=m
-CONFIG_FB_IBM_GXT4500=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=y
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_BROADSHEET=m
-CONFIG_FB_AUO_K190X=m
-CONFIG_FB_AUO_K1900=m
-CONFIG_FB_AUO_K1901=m
-# CONFIG_FB_HYPERV is not set
-# CONFIG_FB_SIMPLE is not set
-CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_OT200=m
-CONFIG_BACKLIGHT_SKY81452=m
-CONFIG_BACKLIGHT_TPS65217=m
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_VGASTATE=m
-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
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ADLIB=m
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT1605=m
-CONFIG_SND_AZT2316=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8328=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_SC6000=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_JAZZ16=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SSCAPE=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_MSND_PINNACLE=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_PREALLOC_SIZE=2048
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CP2112=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_MON=y
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FOTG210_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_HOST=y
-
-#
-# Platform Glue Layer
-#
-
-#
-# MUSB DMA mode
-#
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_ULPI is not set
-CONFIG_USB_DWC3_HOST=y
-
-#
-# Platform Glue Driver Support
-#
-CONFIG_USB_DWC3_PCI=m
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_CHIPIDEA=m
-# CONFIG_USB_CHIPIDEA_HOST is not set
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-CONFIG_USB_ISP1760=m
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_ISP1760_HOST_ROLE=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_USB_PHY is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_TAHVO_USB is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_GADGET is not set
-CONFIG_USB_LED_TRIG=y
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_USDHI6ROL0=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_MTK=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_NET48XX=m
-CONFIG_LEDS_WRAP=m
-CONFIG_LEDS_PCA9532=m
-# CONFIG_LEDS_PCA9532_GPIO is not set
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_LP8860=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_MENF21BMC=m
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-# CONFIG_INFINIBAND_CXGB3 is not set
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=y
-# CONFIG_EDAC_MM_EDAC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_HCTOSYS is not set
-# CONFIG_RTC_SYSTOHC is not set
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_ABB5ZES3=m
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_ISL12057=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF85063=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV8803=m
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-# CONFIG_RTC_DS1685_PROC_REGS is not set
-# CONFIG_RTC_DS1685_SYSFS_REGS is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_RTC_DRV_MT6397=m
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_RTC_DRV_HID_SENSOR_TIME=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DMA_ACPI=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_PCH_DMA=m
-CONFIG_TIMB_DMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_HSU_DMA=m
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_AUXDISPLAY=y
-# CONFIG_KS0108 is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_DMEM_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_UIO_PRUSS=m
-CONFIG_UIO_MF624=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-# CONFIG_VFIO_PCI_VGA is not set
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=y
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
-# CONFIG_XEN_SCSI_BACKEND is not set
-CONFIG_XEN_PRIVCMD=y
-CONFIG_XEN_ACPI_PROCESSOR=m
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_XEN_AUTO_XLATE=y
-CONFIG_XEN_ACPI=y
-CONFIG_XEN_SYMS=y
-CONFIG_XEN_HAVE_VPMU=y
-CONFIG_STAGING=y
-# CONFIG_SLICOSS is not set
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_PANEL is not set
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_R8723AU=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_RTS5208=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-
-#
-# Analog digital bi-direction converters
-#
-CONFIG_ADT7316=m
-CONFIG_ADT7316_I2C=m
-
-#
-# Capacitance to digital converters
-#
-CONFIG_AD7150=m
-CONFIG_AD7152=m
-CONFIG_AD7746=m
-
-#
-# Direct Digital Synthesis
-#
-
-#
-# Digital gyroscope sensors
-#
-
-#
-# Network Analyzer, Impedance Converters
-#
-CONFIG_AD5933=m
-
-#
-# Light sensors
-#
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
-CONFIG_TSL2x7x=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-
-#
-# Active energy metering IC
-#
-CONFIG_ADE7854=m
-CONFIG_ADE7854_I2C=m
-
-#
-# Resolver to digital converters
-#
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-CONFIG_FB_SM750=m
-CONFIG_FB_XGI=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_I2C_BCM2048=m
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_ZILOG=m
-# CONFIG_STAGING_RDMA is not set
-
-#
-# Android
-#
-CONFIG_WIMAX_GDM72XX=m
-# CONFIG_WIMAX_GDM72XX_QOS is not set
-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-# CONFIG_WIMAX_GDM72XX_USB_PM is not set
-CONFIG_LTE_GDM724X=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_FWTTY_MAX_TOTAL_PORTS=64
-CONFIG_FWTTY_MAX_CARD_PORTS=32
-# CONFIG_LUSTRE_FS is not set
-# CONFIG_DGNC is not set
-# CONFIG_DGAP is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_WILC1000_DRIVER is not set
-# CONFIG_MOST is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_RBTN=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_TC1100_WMI=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_PVPANIC=m
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_CHROMEOS_PSTORE=m
-CONFIG_CROS_EC_CHARDEV=m
-CONFIG_CROS_EC_LPC=m
-CONFIG_CROS_EC_PROTO=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-CONFIG_COMMON_CLK_SI5351=m
-# CONFIG_COMMON_CLK_PXA is not set
-CONFIG_COMMON_CLK_CDCE706=m
-
-#
-# Hardware Spinlock drivers
-#
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKSRC_I8253=y
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# CONFIG_ATMEL_PIT is not set
-# CONFIG_SH_TIMER_CMT is not set
-# CONFIG_SH_TIMER_MTU2 is not set
-# CONFIG_SH_TIMER_TMU is not set
-# CONFIG_EM_TIMER_STI is not set
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_IOMMU_IOVA=y
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
-
-#
-# Rpmsg drivers
-#
-
-#
-# SOC (System On Chip) specific Drivers
-#
-# CONFIG_SUNXI_SRAM is not set
-# CONFIG_SOC_TI is not set
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-
-#
-# DEVFREQ Drivers
-#
-CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-CONFIG_EXTCON_USB_GPIO=m
-CONFIG_MEMORY=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-
-#
-# Accelerometers
-#
-CONFIG_BMA180=m
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_KXCJK1013=m
-CONFIG_MMA8452=m
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7291=m
-CONFIG_AD799X=m
-CONFIG_CC10001_ADC=m
-CONFIG_MAX1363=m
-CONFIG_MCP3422=m
-CONFIG_NAU7802=m
-CONFIG_TI_ADC081C=m
-CONFIG_TI_AM335X_ADC=m
-CONFIG_VIPERBOARD_ADC=m
-
-#
-# Amplifiers
-#
-
-#
-# Chemical Sensors
-#
-# CONFIG_VZ89X is not set
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-CONFIG_IIO_MS_SENSORS_I2C=m
-
-#
-# SSP Sensor Common
-#
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
-#
-# Digital to analog converters
-#
-CONFIG_AD5064=m
-CONFIG_AD5380=m
-CONFIG_AD5446=m
-CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MCP4725=m
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-
-#
-# Digital gyroscope sensors
-#
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_ITG3200=m
-
-#
-# Humidity sensors
-#
-CONFIG_DHT11=m
-CONFIG_HDC100X=m
-CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
-
-#
-# Inertial measurement units
-#
-CONFIG_KMX61=m
-CONFIG_INV_MPU6050_IIO=m
-
-#
-# Light sensors
-#
-CONFIG_ACPI_ALS=m
-CONFIG_ADJD_S311=m
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
-CONFIG_APDS9960=m
-CONFIG_BH1750=m
-CONFIG_CM32181=m
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-CONFIG_CM36651=m
-CONFIG_GP2AP020A00F=m
-CONFIG_ISL29125=m
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-CONFIG_SENSORS_LM3533=m
-CONFIG_LTR501=m
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
-CONFIG_STK3310=m
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL4531=m
-CONFIG_US5182D=m
-CONFIG_VCNL4000=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_AK8975=m
-CONFIG_AK09911=m
-CONFIG_BMC150_MAGN=m
-CONFIG_MAG3110=m
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-
-#
-# Digital potentiometers
-#
-CONFIG_MCP4531=m
-
-#
-# Pressure sensors
-#
-CONFIG_BMP280=m
-CONFIG_HID_SENSOR_PRESS=m
-CONFIG_MPL115=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_T5403=m
-
-#
-# Lightning sensors
-#
-
-#
-# Proximity sensors
-#
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_SX9500=m
-
-#
-# Temperature sensors
-#
-CONFIG_MLX90614=m
-CONFIG_TMP006=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
-CONFIG_NTB=m
-CONFIG_NTB_PINGPONG=m
-CONFIG_NTB_TOOL=m
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_TUSB1210 is not set
-CONFIG_POWERCAP=y
-CONFIG_INTEL_RAPL=m
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-CONFIG_RAS=y
-# CONFIG_AMD_MCE_INJ is not set
-CONFIG_THUNDERBOLT=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-CONFIG_LIBNVDIMM=y
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_ND_BLK=m
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=m
-CONFIG_BTT=y
-CONFIG_NVMEM=m
-CONFIG_STM=m
-CONFIG_STM_DUMMY=m
-CONFIG_STM_SOURCE_CONSOLE=m
-CONFIG_INTEL_TH=m
-CONFIG_INTEL_TH_PCI=m
-CONFIG_INTEL_TH_GTH=m
-CONFIG_INTEL_TH_STH=m
-CONFIG_INTEL_TH_MSU=m
-CONFIG_INTEL_TH_PTI=m
-# CONFIG_INTEL_TH_DEBUG is not set
-
-#
-# FPGA Configuration Support
-#
-# CONFIG_FPGA is not set
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_EDD_OFF=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_UEFI_CPER=y
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=m
-CONFIG_EXT4_FS_ENCRYPTION=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-# CONFIG_F2FS_IO_TRACE is not set
-CONFIG_FS_DAX=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_OVERLAY_FS=m
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=m
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-CONFIG_ECRYPT_FS_MESSAGING=y
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_ATIME_SUPPORT=y
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_VXFS_FS=m
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-CONFIG_QNX4FS_FS=m
-CONFIG_QNX6FS_FS=m
-# CONFIG_QNX6FS_DEBUG is not set
-CONFIG_ROMFS_FS=y
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-CONFIG_NFS_SWAP=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_GRACE_PERIOD=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
-# CONFIG_CIFS_SMB311 is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-# CONFIG_AFS_FSCACHE is not set
-CONFIG_9P_FS=m
-# CONFIG_9P_FSCACHE is not set
-# CONFIG_9P_FS_POSIX_ACL is not set
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=0
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-# CONFIG_PAGE_OWNER is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_TIMER_STATS is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PI_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_PROVE_RCU is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_TORTURE_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_MMIOTRACE is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_TRACE_ENUM_MAP_FILE is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
-
-#
-# Runtime Testing
-#
-# CONFIG_LKDTM is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-CONFIG_ATOMIC64_SELFTEST=y
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_TEST_HEXDUMP=m
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_TEST_LKM=m
-CONFIG_TEST_USER_COPY=m
-CONFIG_TEST_BPF=m
-CONFIG_TEST_FIRMWARE=m
-CONFIG_TEST_UDELAY=m
-CONFIG_MEMTEST=y
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_EARLY_PRINTK_EFI=y
-# CONFIG_X86_PTDUMP_CORE is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
-CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_ENTRY is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_INTEGRITY is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=y
-CONFIG_ASYNC_MEMCPY=y
-CONFIG_ASYNC_XOR=y
-CONFIG_ASYNC_PQ=y
-CONFIG_ASYNC_RAID6_RECOV=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER=y
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=y
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=y
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=y
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_586=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_BLOWFISH_COMMON=y
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_CAST_COMMON=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_586=y
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_ASYMMETRIC_KEY_TYPE=m
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-CONFIG_PUBLIC_KEY_ALGO_RSA=m
-CONFIG_X509_CERTIFICATE_PARSER=m
-CONFIG_PKCS7_MESSAGE_PARSER=m
-CONFIG_PKCS7_TEST_KEY=m
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-CONFIG_LGUEST=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=y
-CONFIG_BITREVERSE=y
-# CONFIG_HAVE_ARCH_BITREVERSE is not set
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=y
-CONFIG_CRC8=m
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_6x10 is not set
-CONFIG_FONT_SUN8x16=y
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_SG_SPLIT is not set
-CONFIG_ARCH_HAS_SG_CHAIN=y
-CONFIG_ARCH_HAS_MMIO_FLUSH=y
diff --git a/system/xen/dom0/config-4.4.202-xen.x86_64 b/system/xen/dom0/config-4.4.202-xen.x86_64
deleted file mode 100644
index f81a31b9ab..0000000000
--- a/system/xen/dom0/config-4.4.202-xen.x86_64
+++ /dev/null
@@ -1,7284 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.202 Kernel Configuration
-#
-CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_64_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-xen"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="darkstar"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_FHANDLE=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-# CONFIG_TASKS_RCU is not set
-CONFIG_RCU_STALL_COMMON=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_EXPEDITE_BOOT is not set
-CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_ARCH_SUPPORTS_INT128=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_USERFAULTFD=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_MEMBARRIER=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_KEXEC_CORE=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_UPROBES is not set
-# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_CMDLINE_PARSER is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_FAST_FEATURE_TESTS=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-CONFIG_RETPOLINE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_IOSF_MBI=m
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-CONFIG_PARAVIRT_SPINLOCKS=y
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_512GB=y
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_XEN_PVH=y
-CONFIG_KVM_GUEST=y
-# CONFIG_KVM_DEBUG_FS is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=256
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-# CONFIG_VM86 is not set
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
-CONFIG_X86_VSYSCALL_EMULATION=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=y
-CONFIG_X86_CPUID=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_X86_DIRECT_GBPAGES=y
-# CONFIG_NUMA is not set
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_HAVE_BOOTMEM_INFO_NODE=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-# CONFIG_MEM_SOFT_DIRTY is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_ZSMALLOC=m
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_PMEM_LEGACY=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-# CONFIG_X86_INTEL_MPX is not set
-CONFIG_X86_INTEL_TSX_MODE_OFF=y
-# CONFIG_X86_INTEL_TSX_MODE_ON is not set
-# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI_MIXED=y
-CONFIG_SECCOMP=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-CONFIG_KEXEC_FILE=y
-# CONFIG_KEXEC_VERIFY_SIG is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
-CONFIG_LEGACY_VSYSCALL_EMULATE=y
-# CONFIG_LEGACY_VSYSCALL_NONE is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_HAVE_LIVEPATCH=y
-CONFIG_LIVEPATCH=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="\"\""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_MEMORY=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-CONFIG_ACPI_BGRT=y
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_ACPI_NFIT=m
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_ACPI_EXTLOG=m
-CONFIG_PMIC_OPREGION=y
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_INTEL_IDLE=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEAER_INJECT=m
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=y
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_RAPIDIO is not set
-# CONFIG_X86_SYSFB is not set
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
-CONFIG_X86_X32=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_PMC_ATOM=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_NET_INGRESS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_DIAG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETLABEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CONNTRACK_PROCFS is not set
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_META=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-
-#
-# DECnet: Netfilter Configuration
-#
-# CONFIG_DECNET_NF_GRABULATOR is not set
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-# CONFIG_IP_DCCP_CCID3 is not set
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-CONFIG_TIPC_MEDIA_IB=y
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-CONFIG_6LOWPAN=m
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_CANID=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_CLS_IND is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-CONFIG_BATMAN_ADV_MCAST=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_HSR=m
-CONFIG_NET_SWITCHDEV=y
-# CONFIG_NET_L3_MASTER_DEV is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_LEDS is not set
-CONFIG_CAN_JANZ_ICAN3=m
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_ISA=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_EMS_PCMCIA=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_PEAK_PCMCIA=m
-CONFIG_CAN_PEAK_PCI=m
-CONFIG_CAN_PEAK_PCIEC=y
-CONFIG_CAN_KVASER_PCI=m
-CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_M_CAN=m
-CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_ISA=m
-CONFIG_CAN_CC770_PLATFORM=m
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_KVASER_USB=m
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
-# CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_DEBUGFS is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_UART is not set
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-# CONFIG_NFC_MEI_PHY is not set
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-# CONFIG_NFC_FDP is not set
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-# CONFIG_NFC_MRVL_I2C is not set
-CONFIG_NFC_ST21NFCA=m
-# CONFIG_NFC_ST_NCI is not set
-CONFIG_NFC_NXP_NCI=m
-CONFIG_NFC_NXP_NCI_I2C=m
-# CONFIG_NFC_S3FWRN5_I2C is not set
-CONFIG_LWTUNNEL=y
-CONFIG_DST_CACHE=y
-CONFIG_HAVE_BPF_JIT=y
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-CONFIG_SYS_HYPERVISOR=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
-
-#
-# Bus devices
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_SM_FTL=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_MAP_BANK_WIDTH_8=y
-CONFIG_MTD_MAP_BANK_WIDTH_16=y
-CONFIG_MTD_MAP_BANK_WIDTH_32=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_I4=y
-CONFIG_MTD_CFI_I8=y
-CONFIG_MTD_OTP=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICHXROM=m
-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_SCB2_FLASH=m
-CONFIG_MTD_NETtel=m
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_GPIO_ADDR=m
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-CONFIG_MTD_LATCH_ADDR=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_BCH=m
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_SM_COMMON=m
-CONFIG_MTD_NAND_DENALI=m
-CONFIG_MTD_NAND_DENALI_PCI=m
-CONFIG_MTD_NAND_DENALI_DT=m
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
-CONFIG_MTD_NAND_GPIO=m
-# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_NAND_DOCG4=m
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_NAND_HISI504=m
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_GENERIC=m
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# CONFIG_MTD_SPI_NOR is not set
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-CONFIG_MTD_UBI_GLUEBI=m
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_OF is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_FD=y
-CONFIG_PARIDE=m
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPATC8=y
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_LZ4_COMPRESS is not set
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_RAM_DAX=y
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_BACKEND=y
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_NVME=m
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_DUMMY_IRQ=m
-CONFIG_IBM_ASM=m
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_BMP085_I2C=m
-CONFIG_USB_SWITCH_FSA9480=m
-# CONFIG_SRAM is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_VMWARE_VMCI=m
-
-#
-# Intel MIC Bus Driver
-#
-CONFIG_INTEL_MIC_BUS=m
-
-#
-# SCIF Bus Driver
-#
-CONFIG_SCIF_BUS=m
-
-#
-# Intel MIC Host Driver
-#
-CONFIG_INTEL_MIC_HOST=m
-
-#
-# Intel MIC Card Driver
-#
-CONFIG_INTEL_MIC_CARD=m
-
-#
-# SCIF Driver
-#
-CONFIG_SCIF=m
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-CONFIG_MIC_COSM=m
-CONFIG_GENWQE=m
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
-# CONFIG_ECHO is not set
-# CONFIG_CXL_BASE is not set
-# CONFIG_CXL_KERNEL_API is not set
-# CONFIG_CXL_EEH is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=y
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_VMWARE_PVSCSI=m
-# CONFIG_XEN_SCSI_FRONTEND is not set
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_SATA_INIC162X=y
-CONFIG_SATA_ACARD_AHCI=y
-CONFIG_SATA_SIL24=y
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_SX4=y
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=y
-CONFIG_SATA_NV=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_SVW=y
-CONFIG_SATA_ULI=y
-CONFIG_SATA_VIA=y
-CONFIG_SATA_VITESSE=y
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=y
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ARTOP=y
-CONFIG_PATA_ATIIXP=y
-CONFIG_PATA_ATP867X=y
-CONFIG_PATA_CMD64X=y
-CONFIG_PATA_CYPRESS=y
-CONFIG_PATA_EFAR=y
-CONFIG_PATA_HPT366=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_HPT3X2N=y
-CONFIG_PATA_HPT3X3=y
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=y
-CONFIG_PATA_IT821X=y
-CONFIG_PATA_JMICRON=y
-CONFIG_PATA_MARVELL=y
-CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NINJA32=y
-CONFIG_PATA_NS87415=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_OPTIDMA=y
-CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_PDC_OLD=y
-CONFIG_PATA_RADISYS=y
-CONFIG_PATA_RDC=y
-CONFIG_PATA_SCH=y
-CONFIG_PATA_SERVERWORKS=y
-CONFIG_PATA_SIL680=y
-CONFIG_PATA_SIS=y
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=y
-CONFIG_PATA_VIA=y
-CONFIG_PATA_WINBOND=y
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_OPTI=y
-CONFIG_PATA_PCMCIA=m
-# CONFIG_PATA_PLATFORM is not set
-CONFIG_PATA_RZ1000=y
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=y
-CONFIG_ATA_GENERIC=y
-CONFIG_PATA_LEGACY=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID10=y
-CONFIG_MD_RAID456=y
-CONFIG_MD_MULTIPATH=y
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_MQ_DEFAULT is not set
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=y
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-# CONFIG_DM_DELAY is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-CONFIG_NET_FC=y
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_TUN=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_SUNGEM_PHY=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_AURORA_NB8800=m
-CONFIG_NET_CADENCE=y
-CONFIG_MACB=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNX2X_VXLAN=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_THUNDER_NIC_PF=m
-CONFIG_THUNDER_NIC_VF=m
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_LIQUIDIO=m
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_CX_ECAT=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_VXLAN=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_VXLAN=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_I40E=m
-# CONFIG_I40E_VXLAN is not set
-CONFIG_I40EVF=m
-CONFIG_FM10K=m
-CONFIG_FM10K_VXLAN=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_VXLAN=y
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX5_CORE=m
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SWITCHX2=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_VXLAN=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QEDE=m
-CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-CONFIG_NET_VENDOR_SAMSUNG=y
-CONFIG_SXGBE_ETH=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-# CONFIG_SFC_MCDI_LOGGING is not set
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_DWMAC_GENERIC=m
-# CONFIG_STMMAC_PCI is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TI_CPSW_ALE=m
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AQUANTIA_PHY=m
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_ADM8211=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-# CONFIG_ATH9K_AHB is not set
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-CONFIG_ATH9K_WOW=y
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-CONFIG_WCN36XX_DEBUGFS=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCM_TRACING=y
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFIG_IWLWIFI_UAPSD is not set
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
-CONFIG_WL_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WAN=y
-CONFIG_LANMEDIA=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-
-#
-# X.25/LAPB support is disabled
-#
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_PC300TOO is not set
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_SBNI=m
-# CONFIG_SBNI_MULTILINE is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_VMXNET3=m
-CONFIG_FUJITSU_ES=m
-CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPIDRV=m
-# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-# CONFIG_GIGASET_CAPI is not set
-CONFIG_GIGASET_I4L=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-# CONFIG_GIGASET_M101 is not set
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-CONFIG_NVM=y
-# CONFIG_NVM_DEBUG is not set
-# CONFIG_NVM_GENNVM is not set
-# CONFIG_NVM_RRPC is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=y
-CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_LM8333=m
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_SAMSUNG=m
-CONFIG_KEYBOARD_STOWAWAY=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_CROS_EC=m
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FT6236=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_SUR40=m
-CONFIG_TOUCHSCREEN_SX8654=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_GP2A=m
-CONFIG_INPUT_GPIO_BEEPER=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-CONFIG_INPUT_KXTJ9_POLLED_MODE=y
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_TPS65218_PWRBUTTON=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_IMS_PCU=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_INPUT_DRV260X_HAPTICS=m
-CONFIG_INPUT_DRV2665_HAPTICS=m
-CONFIG_INPUT_DRV2667_HAPTICS=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_USERIO=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_NOZOMI=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-CONFIG_LDISC_AUTOLOAD=y
-CONFIG_DEVMEM=y
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_DW=m
-CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_8250_FINTEK=m
-CONFIG_SERIAL_8250_MID=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SCCNXP=m
-CONFIG_SERIAL_SC16IS7XX=m
-# CONFIG_SERIAL_SC16IS7XX_I2C is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_TPM=m
-CONFIG_NVRAM=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HPET_MMAP_DEFAULT=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_TIS_I2C_ATMEL=m
-CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_TCG_TIS_I2C_NUVOTON=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-# CONFIG_TCG_XEN is not set
-CONFIG_TCG_CRB=m
-CONFIG_TCG_TIS_ST33ZP24=m
-CONFIG_TCG_TIS_ST33ZP24_I2C=m
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_CROS_EC_TUNNEL=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-CONFIG_HSI=m
-CONFIG_HSI_BOARDINFO=y
-
-#
-# HSI controllers
-#
-
-#
-# HSI clients
-#
-CONFIG_HSI_CHAR=m
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PINCTRL=y
-
-#
-# Pin controllers
-#
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
-CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=m
-CONFIG_PINCTRL_INTEL=m
-CONFIG_PINCTRL_BROXTON=m
-CONFIG_PINCTRL_SUNRISEPOINT=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
-CONFIG_GPIO_ACPI=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_AMDPT is not set
-CONFIG_GPIO_DWAPB=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_ICH=m
-CONFIG_GPIO_LYNXPOINT=y
-CONFIG_GPIO_VX855=m
-# CONFIG_GPIO_ZX is not set
-
-#
-# Port-mapped I/O GPIO drivers
-#
-# CONFIG_GPIO_104_IDIO_16 is not set
-CONFIG_GPIO_F7188X=m
-# CONFIG_GPIO_IT87 is not set
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_SCH311X=m
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_ARIZONA=m
-CONFIG_GPIO_DLN2=m
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_GPIO_LP3943=m
-# CONFIG_GPIO_UCB1400 is not set
-CONFIG_GPIO_WM8994=m
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_INTEL_MID is not set
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI or I2C GPIO expanders
-#
-# CONFIG_GPIO_MCP23S08 is not set
-
-#
-# USB GPIO expanders
-#
-CONFIG_GPIO_VIPERBOARD=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-# CONFIG_W1_SLAVE_DS2408_READBACK is not set
-CONFIG_W1_SLAVE_DS2413=m
-CONFIG_W1_SLAVE_DS2406=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_DS2781=m
-CONFIG_W1_SLAVE_DS28E04=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_GENERIC_ADC_BATTERY=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2781=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_SBS=m
-CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=y
-CONFIG_BATTERY_BQ27XXX_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_LP8727=m
-CONFIG_CHARGER_GPIO=m
-# CONFIG_CHARGER_MANAGER is not set
-CONFIG_CHARGER_BQ2415X=m
-CONFIG_CHARGER_BQ24190=m
-CONFIG_CHARGER_BQ24257=m
-CONFIG_CHARGER_BQ24735=m
-CONFIG_CHARGER_BQ25890=m
-CONFIG_CHARGER_SMB347=m
-CONFIG_CHARGER_TPS65217=m
-CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_CHARGER_RT9455=m
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_RESTART is not set
-CONFIG_POWER_AVS=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_MC13783_ADC=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IIO_HWMON=m
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_HTU21=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_MENF21BMC_HWMON=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC2978_REGULATOR=y
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_TPS40422=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THERMAL_EMULATION=y
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_MENF21BMC_WATCHDOG=m
-# CONFIG_XILINX_WATCHDOG is not set
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_RN5T618_WATCHDOG=m
-CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_BCM7038_WDT=m
-CONFIG_MEN_A21_WDT=m
-# CONFIG_XEN_WDT is not set
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_HOST_SOC=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_GPIO is not set
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_HTC_PASIC3=m
-CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-CONFIG_MFD_JANZ_CMODIO=m
-# CONFIG_MFD_KEMPLD is not set
-CONFIG_MFD_MT6397=m
-CONFIG_MFD_MENF21BMC=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_RN5T618=m
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-CONFIG_MFD_SKY81452=m
-# CONFIG_ABX500_CORE is not set
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_MFD_LP3943=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65217=m
-CONFIG_MFD_TPS65218=m
-# CONFIG_MFD_TPS65912 is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-CONFIG_MFD_WM8997=y
-# CONFIG_MFD_WM8998 is not set
-CONFIG_MFD_WM8994=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_ACT8865=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_ANATOP=m
-CONFIG_REGULATOR_BCM590XX=m
-CONFIG_REGULATOR_DA9210=m
-CONFIG_REGULATOR_DA9211=m
-CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_ISL9305=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP872X=m
-CONFIG_REGULATOR_LP8755=m
-CONFIG_REGULATOR_LTC3589=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_MT6311=m
-CONFIG_REGULATOR_MT6397=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_PFUZE100=m
-CONFIG_REGULATOR_RN5T618=m
-CONFIG_REGULATOR_SKY81452=m
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65217=m
-CONFIG_REGULATOR_WM8994=m
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-CONFIG_MEDIA_RC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_HIX5HD2=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_AU0828_RC=y
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=y
-CONFIG_DVB_AS102=m
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DT3155=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_SMIPCIE=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-CONFIG_VIDEO_SH_VEU=m
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIVID=m
-CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VIM2M=m
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-
-#
-# Supported MMC/SDIO adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-# CONFIG_RADIO_SI470X is not set
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_SI4713=m
-CONFIG_PLATFORM_SI4713=m
-CONFIG_I2C_SI4713=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_RAREMONO=m
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-
-#
-# Miscellaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-
-#
-# Sensors used on soc_camera driver
-#
-
-#
-# soc_camera sensor drivers
-#
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_INTEL_GTT=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_TTM=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_CIK is not set
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I810=m
-CONFIG_DRM_I915=m
-# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-CONFIG_HSA_AMD=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_HECUBA=m
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-CONFIG_FB_ARC=m
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-CONFIG_FB_N411=m
-CONFIG_FB_HGA=m
-CONFIG_FB_OPENCORES=m
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_I740=m
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_INTEL is not set
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-# CONFIG_FB_SM501 is not set
-CONFIG_FB_SMSCUFX=m
-CONFIG_FB_UDL=m
-CONFIG_FB_IBM_GXT4500=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=y
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_BROADSHEET=m
-CONFIG_FB_AUO_K190X=m
-CONFIG_FB_AUO_K1900=m
-CONFIG_FB_AUO_K1901=m
-# CONFIG_FB_HYPERV is not set
-# CONFIG_FB_SIMPLE is not set
-CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_SKY81452=m
-CONFIG_BACKLIGHT_TPS65217=m
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_VGASTATE=m
-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
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_PREALLOC_SIZE=2048
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CP2112=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_MON=y
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FOTG210_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_HOST=y
-
-#
-# Platform Glue Layer
-#
-
-#
-# MUSB DMA mode
-#
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_ULPI is not set
-CONFIG_USB_DWC3_HOST=y
-
-#
-# Platform Glue Driver Support
-#
-CONFIG_USB_DWC3_PCI=m
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_CHIPIDEA=m
-# CONFIG_USB_CHIPIDEA_HOST is not set
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-CONFIG_USB_ISP1760=m
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_ISP1760_HOST_ROLE=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_USB_PHY is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_TAHVO_USB is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_GADGET is not set
-CONFIG_USB_LED_TRIG=y
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_USDHI6ROL0=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_MTK=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_PCA9532=m
-# CONFIG_LEDS_PCA9532_GPIO is not set
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_LP8860=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_MENF21BMC=m
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_QIB_DCA=y
-# CONFIG_INFINIBAND_CXGB3 is not set
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=y
-# CONFIG_EDAC_MM_EDAC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_HCTOSYS is not set
-# CONFIG_RTC_SYSTOHC is not set
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_ABB5ZES3=m
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_ISL12057=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF85063=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV8803=m
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-# CONFIG_RTC_DS1685_PROC_REGS is not set
-# CONFIG_RTC_DS1685_SYSFS_REGS is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_RTC_DRV_MT6397=m
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_RTC_DRV_HID_SENSOR_TIME=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DMA_ACPI=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_INTEL_MIC_X100_DMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_HSU_DMA=m
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_DMA_ENGINE_RAID=y
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-# CONFIG_KS0108 is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_DMEM_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_UIO_PRUSS=m
-CONFIG_UIO_MF624=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-# CONFIG_VFIO_PCI_VGA is not set
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=y
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
-# CONFIG_XEN_SCSI_BACKEND is not set
-CONFIG_XEN_PRIVCMD=y
-CONFIG_XEN_ACPI_PROCESSOR=m
-# CONFIG_XEN_MCE_LOG is not set
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_XEN_EFI=y
-CONFIG_XEN_AUTO_XLATE=y
-CONFIG_XEN_ACPI=y
-CONFIG_XEN_SYMS=y
-CONFIG_XEN_HAVE_VPMU=y
-CONFIG_STAGING=y
-# CONFIG_SLICOSS is not set
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_PANEL is not set
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_R8723AU=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_RTS5208=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-
-#
-# Analog digital bi-direction converters
-#
-CONFIG_ADT7316=m
-CONFIG_ADT7316_I2C=m
-
-#
-# Capacitance to digital converters
-#
-CONFIG_AD7150=m
-CONFIG_AD7152=m
-CONFIG_AD7746=m
-
-#
-# Direct Digital Synthesis
-#
-
-#
-# Digital gyroscope sensors
-#
-
-#
-# Network Analyzer, Impedance Converters
-#
-CONFIG_AD5933=m
-
-#
-# Light sensors
-#
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
-CONFIG_TSL2x7x=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-
-#
-# Active energy metering IC
-#
-CONFIG_ADE7854=m
-CONFIG_ADE7854_I2C=m
-
-#
-# Resolver to digital converters
-#
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-CONFIG_FB_SM750=m
-CONFIG_FB_XGI=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_I2C_BCM2048=m
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_ZILOG=m
-# CONFIG_STAGING_RDMA is not set
-
-#
-# Android
-#
-CONFIG_WIMAX_GDM72XX=m
-# CONFIG_WIMAX_GDM72XX_QOS is not set
-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-# CONFIG_WIMAX_GDM72XX_USB_PM is not set
-CONFIG_LTE_GDM724X=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_FWTTY_MAX_TOTAL_PORTS=64
-CONFIG_FWTTY_MAX_CARD_PORTS=32
-# CONFIG_LUSTRE_FS is not set
-# CONFIG_DGNC is not set
-# CONFIG_DGAP is not set
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_CRYPTO_SKEIN=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_WILC1000_DRIVER is not set
-# CONFIG_MOST is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_RBTN=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_PVPANIC=m
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_CHROMEOS_PSTORE=m
-CONFIG_CROS_EC_CHARDEV=m
-CONFIG_CROS_EC_LPC=m
-CONFIG_CROS_EC_PROTO=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-CONFIG_COMMON_CLK_SI5351=m
-# CONFIG_COMMON_CLK_PXA is not set
-CONFIG_COMMON_CLK_CDCE706=m
-
-#
-# Hardware Spinlock drivers
-#
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# CONFIG_ATMEL_PIT is not set
-# CONFIG_SH_TIMER_CMT is not set
-# CONFIG_SH_TIMER_MTU2 is not set
-# CONFIG_SH_TIMER_TMU is not set
-# CONFIG_EM_TIMER_STI is not set
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_IOMMU_IOVA=y
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_AMD_IOMMU_V2=m
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_IRQ_REMAP=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
-
-#
-# Rpmsg drivers
-#
-
-#
-# SOC (System On Chip) specific Drivers
-#
-# CONFIG_SUNXI_SRAM is not set
-# CONFIG_SOC_TI is not set
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-
-#
-# DEVFREQ Drivers
-#
-CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-CONFIG_EXTCON_USB_GPIO=m
-CONFIG_MEMORY=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-
-#
-# Accelerometers
-#
-CONFIG_BMA180=m
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_KXCJK1013=m
-CONFIG_MMA8452=m
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7291=m
-CONFIG_AD799X=m
-CONFIG_CC10001_ADC=m
-CONFIG_MAX1363=m
-CONFIG_MCP3422=m
-CONFIG_NAU7802=m
-CONFIG_TI_ADC081C=m
-CONFIG_TI_AM335X_ADC=m
-CONFIG_VIPERBOARD_ADC=m
-
-#
-# Amplifiers
-#
-
-#
-# Chemical Sensors
-#
-# CONFIG_VZ89X is not set
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-CONFIG_IIO_MS_SENSORS_I2C=m
-
-#
-# SSP Sensor Common
-#
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
-#
-# Digital to analog converters
-#
-CONFIG_AD5064=m
-CONFIG_AD5380=m
-CONFIG_AD5446=m
-CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MCP4725=m
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-
-#
-# Digital gyroscope sensors
-#
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_ITG3200=m
-
-#
-# Humidity sensors
-#
-CONFIG_DHT11=m
-CONFIG_HDC100X=m
-CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
-
-#
-# Inertial measurement units
-#
-CONFIG_KMX61=m
-CONFIG_INV_MPU6050_IIO=m
-
-#
-# Light sensors
-#
-CONFIG_ACPI_ALS=m
-CONFIG_ADJD_S311=m
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
-CONFIG_APDS9960=m
-CONFIG_BH1750=m
-CONFIG_CM32181=m
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-CONFIG_CM36651=m
-CONFIG_GP2AP020A00F=m
-CONFIG_ISL29125=m
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-CONFIG_SENSORS_LM3533=m
-CONFIG_LTR501=m
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
-CONFIG_STK3310=m
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL4531=m
-CONFIG_US5182D=m
-CONFIG_VCNL4000=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_AK8975=m
-CONFIG_AK09911=m
-CONFIG_BMC150_MAGN=m
-CONFIG_MAG3110=m
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-
-#
-# Digital potentiometers
-#
-CONFIG_MCP4531=m
-
-#
-# Pressure sensors
-#
-CONFIG_BMP280=m
-CONFIG_HID_SENSOR_PRESS=m
-CONFIG_MPL115=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_T5403=m
-
-#
-# Lightning sensors
-#
-
-#
-# Proximity sensors
-#
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_SX9500=m
-
-#
-# Temperature sensors
-#
-CONFIG_MLX90614=m
-CONFIG_TMP006=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
-CONFIG_NTB=m
-CONFIG_NTB_INTEL=m
-CONFIG_NTB_PINGPONG=m
-CONFIG_NTB_TOOL=m
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_TUSB1210 is not set
-CONFIG_POWERCAP=y
-CONFIG_INTEL_RAPL=m
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-CONFIG_RAS=y
-# CONFIG_AMD_MCE_INJ is not set
-CONFIG_THUNDERBOLT=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-CONFIG_LIBNVDIMM=y
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_ND_BLK=m
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=m
-CONFIG_BTT=y
-CONFIG_NVMEM=m
-CONFIG_STM=m
-CONFIG_STM_DUMMY=m
-CONFIG_STM_SOURCE_CONSOLE=m
-CONFIG_INTEL_TH=m
-CONFIG_INTEL_TH_PCI=m
-CONFIG_INTEL_TH_GTH=m
-CONFIG_INTEL_TH_STH=m
-CONFIG_INTEL_TH_MSU=m
-CONFIG_INTEL_TH_PTI=m
-# CONFIG_INTEL_TH_DEBUG is not set
-
-#
-# FPGA Configuration Support
-#
-# CONFIG_FPGA is not set
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_EDD_OFF=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_RUNTIME_MAP=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_UEFI_CPER=y
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=m
-CONFIG_EXT4_FS_ENCRYPTION=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-# CONFIG_F2FS_IO_TRACE is not set
-CONFIG_FS_DAX=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_OVERLAY_FS=m
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=m
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-CONFIG_ECRYPT_FS_MESSAGING=y
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_ATIME_SUPPORT=y
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_VXFS_FS=m
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-CONFIG_QNX4FS_FS=m
-CONFIG_QNX6FS_FS=m
-# CONFIG_QNX6FS_DEBUG is not set
-CONFIG_ROMFS_FS=y
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-CONFIG_NFS_SWAP=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_GRACE_PERIOD=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
-# CONFIG_CIFS_SMB311 is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-# CONFIG_AFS_FSCACHE is not set
-CONFIG_9P_FS=m
-# CONFIG_9P_FSCACHE is not set
-# CONFIG_9P_FS_POSIX_ACL is not set
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=0
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-# CONFIG_PAGE_OWNER is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_HAVE_ARCH_KASAN=y
-# CONFIG_KASAN is not set
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_TIMER_STATS is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PI_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_PROVE_RCU is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_TORTURE_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_MMIOTRACE is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_TRACE_ENUM_MAP_FILE is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
-
-#
-# Runtime Testing
-#
-# CONFIG_LKDTM is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-CONFIG_ATOMIC64_SELFTEST=y
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_TEST_HEXDUMP=m
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_TEST_LKM=m
-CONFIG_TEST_USER_COPY=m
-CONFIG_TEST_BPF=m
-CONFIG_TEST_FIRMWARE=m
-CONFIG_TEST_UDELAY=m
-CONFIG_MEMTEST=y
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_EARLY_PRINTK_EFI=y
-# CONFIG_X86_PTDUMP_CORE is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
-CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_ENTRY is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SECURITY=y
-CONFIG_PAGE_TABLE_ISOLATION=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_INTEGRITY is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=y
-CONFIG_ASYNC_MEMCPY=y
-CONFIG_ASYNC_XOR=y
-CONFIG_ASYNC_PQ=y
-CONFIG_ASYNC_RAID6_RECOV=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER=y
-CONFIG_CRYPTO_GLUE_HELPER_X86=y
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=y
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_GHASH=y
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_POLY1305_X86_64=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=y
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-CONFIG_CRYPTO_SHA1_MB=m
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_BLOWFISH_COMMON=y
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_CAMELLIA_X86_64=y
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST_COMMON=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_SEED=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_X86_64=y
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_ASYMMETRIC_KEY_TYPE=m
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-CONFIG_PUBLIC_KEY_ALGO_RSA=m
-CONFIG_X509_CERTIFICATE_PARSER=m
-CONFIG_PKCS7_MESSAGE_PARSER=m
-CONFIG_PKCS7_TEST_KEY=m
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_COMPAT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=y
-CONFIG_BITREVERSE=y
-# CONFIG_HAVE_ARCH_BITREVERSE is not set
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=y
-CONFIG_CRC8=m
-# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_6x10 is not set
-CONFIG_FONT_SUN8x16=y
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_SG_SPLIT is not set
-CONFIG_ARCH_HAS_SG_CHAIN=y
-CONFIG_ARCH_HAS_PMEM_API=y
-CONFIG_ARCH_HAS_MMIO_FLUSH=y
diff --git a/system/xen/dom0/config-4.4.240-xen.i686 b/system/xen/dom0/config-4.4.240-xen.i686
new file mode 100644
index 0000000000..4bc001ee58
--- /dev/null
+++ b/system/xen/dom0/config-4.4.240-xen.i686
@@ -0,0 +1,7450 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 4.4.240 Kernel Configuration
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_32_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=3
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
+CONFIG_LOCALVERSION="-xen"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="darkstar"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_FHANDLE=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+# CONFIG_TASKS_RCU is not set
+CONFIG_RCU_STALL_COMMON=y
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_EXPEDITE_BOOT is not set
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_WRITEBACK=y
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+# CONFIG_BPF_SYSCALL is not set
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_USERFAULTFD=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_MEMBARRIER=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+# CONFIG_UPROBES is not set
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR_NONE is not set
+CONFIG_CC_STACKPROTECTOR_REGULAR=y
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_COPY_THREAD_TLS=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=m
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_FAST_FEATURE_TESTS=y
+CONFIG_X86_MPPARSE=y
+CONFIG_X86_BIGSMP=y
+CONFIG_RETPOLINE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=m
+# CONFIG_IOSF_MBI_DEBUG is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_X86_32_IRIS=m
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_XEN=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
+# CONFIG_LGUEST_GUEST is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_NO_BOOTMEM=y
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+CONFIG_MPENTIUMIII=y
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_DEBUGCTLMSR=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_ANCIENT_MCE=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+# CONFIG_X86_LEGACY_VM86 is not set
+# CONFIG_VM86 is not set
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX32=y
+CONFIG_TOSHIBA=m
+CONFIG_I8K=m
+CONFIG_X86_REBOOTFIXUPS=y
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+# CONFIG_NOHIGHMEM is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_NUMA=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=3
+CONFIG_ARCH_HAVE_MEMORY_PRESENT=y
+CONFIG_NEED_NODE_MEMMAP_SIZE=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_DISCONTIGMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_CMA is not set
+CONFIG_ZPOOL=m
+# CONFIG_ZBUD is not set
+CONFIG_ZSMALLOC=m
+# CONFIG_PGTABLE_MAPPING is not set
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_FRAME_VECTOR=y
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_HIGHPTE=y
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MATH_EMULATION=y
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+# CONFIG_X86_INTEL_MPX is not set
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_EFI=y
+# CONFIG_EFI_STUB is not set
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_CLK=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_NUMA is not set
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=m
+CONFIG_PMIC_OPREGION=y
+CONFIG_SFI=y
+# CONFIG_APM is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K7_ACPI=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+CONFIG_X86_SPEEDSTEP_ICH=m
+CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+CONFIG_X86_E_POWERSAVER=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_INTEL_IDLE=y
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCI_BUS_ADDR_T_64BIT=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_PCI_STUB=m
+CONFIG_XEN_PCIDEV_FRONTEND=y
+CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
+CONFIG_PCI_IOV=y
+# CONFIG_PCI_PRI is not set
+CONFIG_PCI_PASID=y
+CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
+CONFIG_ISA_DMA_API=y
+CONFIG_ISA=y
+# CONFIG_EISA is not set
+CONFIG_SCx200=m
+CONFIG_SCx200HR_TIMER=m
+CONFIG_ALIX=y
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
+CONFIG_PCMCIA_PROBE=y
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_COMPAQ=m
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+# CONFIG_RAPIDIO is not set
+# CONFIG_X86_SYSFB is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_HAVE_AOUT=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_PMC_ATOM=y
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=m
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=m
+CONFIG_NF_TABLES_NETDEV=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NF_TABLES_ARP=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NFT_REDIR_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_HWMON=y
+CONFIG_NET_DSA_TAG_BRCM=y
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+# CONFIG_VLAN_8021Q_MVRP is not set
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_LTPC=m
+CONFIG_COPS=m
+CONFIG_COPS_DAYNA=y
+CONFIG_COPS_TANGENT=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_PHONET is not set
+CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_SCC=m
+CONFIG_SCC_DELAY=y
+CONFIG_SCC_TRXECHO=y
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+# CONFIG_CAN_LEDS is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_PCH_CAN=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_ISA=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_TSCAN1=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_TOSHIBA_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_DEBUGFS is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_UART is not set
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+# CONFIG_NFC_MEI_PHY is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+# CONFIG_NFC_FDP is not set
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+# CONFIG_NFC_MRVL_I2C is not set
+CONFIG_NFC_ST21NFCA=m
+# CONFIG_NFC_ST_NCI is not set
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+# CONFIG_NFC_S3FWRN5_I2C is not set
+CONFIG_LWTUNNEL=y
+CONFIG_DST_CACHE=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+CONFIG_SYS_HYPERVISOR=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_FENCE_TRACE is not set
+
+#
+# Bus devices
+#
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_SCx200_DOCFLASH=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+CONFIG_MTD_LATCH_ADDR=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_BCH=m
+CONFIG_MTD_NAND_ECC_BCH=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_DENALI_DT=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_GPIO=m
+# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_DOCG4=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_CS553X=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_HISI504=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# CONFIG_MTD_SPI_NOR is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+CONFIG_MTD_UBI_GLUEBI=m
+# CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+# CONFIG_PNPBIOS is not set
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_BPCK6=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_LZ4_COMPRESS is not set
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_RAM_DAX=y
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_BACKEND=y
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+CONFIG_BLK_DEV_NVME=m
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_BMP085_I2C=m
+CONFIG_PCH_PHUB=m
+CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_SRAM is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_INTEL_MEI_TXE=m
+CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Bus Driver
+#
+
+#
+# SCIF Bus Driver
+#
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
+
+#
+# SCIF Driver
+#
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+# CONFIG_ECHO is not set
+# CONFIG_CXL_BASE is not set
+# CONFIG_CXL_KERNEL_API is not set
+# CONFIG_CXL_EEH is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=y
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_7000FASST=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_VMWARE_PVSCSI=m
+# CONFIG_XEN_SCSI_FRONTEND is not set
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_DTC3280=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_GENERIC_NCR5380=m
+CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
+CONFIG_SCSI_GENERIC_NCR53C400=y
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_NCR53C406A=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_PAS16=m
+CONFIG_SCSI_QLOGIC_FAS=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_SYM53C416=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_T128=m
+CONFIG_SCSI_U14_34F=m
+# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
+# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
+CONFIG_SCSI_U14_34F_MAX_TAGS=8
+CONFIG_SCSI_ULTRASTOR=m
+CONFIG_SCSI_NSP32=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+# CONFIG_SATA_ZPODD is not set
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_ACARD_AHCI=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CS5535=y
+CONFIG_PATA_CS5536=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_ISAPNP=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_PATA_QDI=y
+CONFIG_PATA_RZ1000=y
+CONFIG_PATA_WINBOND_VLB=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_MQ_DEFAULT is not set
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_CACHE_CLEANER=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=y
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_TUN=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_ISA=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_NET_DSA_MV88E6171=m
+CONFIG_NET_DSA_MV88E6352=m
+CONFIG_NET_DSA_BCM_SF2=m
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL3=m
+CONFIG_3C515=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+# CONFIG_ET131X is not set
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_LANCE=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NI65=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_AURORA_NB8800=m
+CONFIG_NET_CADENCE=y
+CONFIG_MACB=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_BNX2X_VXLAN=y
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_CS89x0=m
+# CONFIG_CS89x0_PLATFORM is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_VXLAN=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_VXLAN=y
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+# CONFIG_I40E_VXLAN is not set
+CONFIG_I40EVF=m
+CONFIG_FM10K=m
+CONFIG_FM10K_VXLAN=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_VXLAN=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_SWITCHX2=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2000=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_ULTRA=m
+CONFIG_WD80x3=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_VXLAN=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QEDE=m
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+# CONFIG_SFC_MCDI_LOGGING is not set
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC9194=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TI_CPSW_ALE=m
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_ADM8211=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+CONFIG_WCN36XX_DEBUGFS=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_BRCM_TRACING=y
+# CONFIG_BRCMDBG is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+# CONFIG_IWLWIFI_UAPSD is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_WL_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+CONFIG_WAN=y
+CONFIG_HOSTESS_SV11=m
+CONFIG_COSA=m
+CONFIG_LANMEDIA=m
+CONFIG_SEALEVEL_4021=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_N2=m
+CONFIG_C101=m
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_SDLA=m
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_BACKEND=y
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_HYPERV_NET=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_0=y
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_AVM_A1=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_IX1MICROR2=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_ASUSCOM=y
+CONFIG_HISAX_TELEINT=y
+CONFIG_HISAX_HFCS=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_SPORTSTER=y
+CONFIG_HISAX_MIC=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_ISURF=y
+CONFIG_HISAX_HSTSAPHIR=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_DRV_ICN=m
+CONFIG_ISDN_DRV_PCBIT=m
+CONFIG_ISDN_DRV_SC=m
+CONFIG_ISDN_DRV_ACT2000=m
+CONFIG_ISDN_CAPI=m
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPIDRV=m
+# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_NVM=y
+# CONFIG_NVM_DEBUG is not set
+# CONFIG_NVM_GENNVM is not set
+# CONFIG_NVM_RRPC is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_INPORT=m
+CONFIG_MOUSE_ATIXL=y
+CONFIG_MOUSE_LOGIBM=m
+CONFIG_MOUSE_PC110PAD=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FT6236=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_HTCPEN=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
+CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_KXTJ9_POLLED_MODE=y
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_TPS65218_PWRBUTTON=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVMEM=y
+CONFIG_DEVKMEM=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_FOURPORT=m
+CONFIG_SERIAL_8250_ACCENT=m
+CONFIG_SERIAL_8250_BOCA=m
+CONFIG_SERIAL_8250_EXAR_ST16C554=m
+CONFIG_SERIAL_8250_HUB6=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_FSL is not set
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_FINTEK=m
+CONFIG_SERIAL_8250_MID=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=m
+CONFIG_SERIAL_SC16IS7XX=m
+# CONFIG_SERIAL_SC16IS7XX_I2C is not set
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+# CONFIG_TTY_PRINTK is not set
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
+CONFIG_NVRAM=m
+CONFIG_DTLK=m
+CONFIG_APPLICOM=m
+CONFIG_SONYPI=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_SCx200_GPIO=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+# CONFIG_TCG_XEN is not set
+CONFIG_TCG_CRB=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+# CONFIG_XILLYBUS is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_PCA_ISA=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_SCx200_ACB=m
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+# CONFIG_SPMI is not set
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_INTEL=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_LYNXPOINT=y
+CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_ZX is not set
+
+#
+# Port-mapped I/O GPIO drivers
+#
+# CONFIG_GPIO_104_IDIO_16 is not set
+CONFIG_GPIO_F7188X=m
+# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_LP3943=m
+# CONFIG_GPIO_TIMBERDALE is not set
+# CONFIG_GPIO_UCB1400 is not set
+CONFIG_GPIO_WM8994=m
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+# CONFIG_GPIO_INTEL_MID is not set
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI or I2C GPIO expanders
+#
+# CONFIG_GPIO_MCP23S08 is not set
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
+# CONFIG_W1_SLAVE_DS2408_READBACK is not set
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=y
+CONFIG_BATTERY_BQ27XXX_PLATFORM=y
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_CHARGER_TPS65217=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_RESTART is not set
+CONFIG_POWER_AVS=y
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_HTU21=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_THERMAL_EMULATION=y
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INTEL_PCH_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+# CONFIG_XILINX_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_RN5T618_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_SCx200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_BCM7038_WDT=m
+CONFIG_MEN_A21_WDT=m
+# CONFIG_XEN_WDT is not set
+
+#
+# ISA-based Watchdog Cards
+#
+CONFIG_PCWATCHDOG=m
+CONFIG_MIXCOMWD=m
+CONFIG_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_HOST_SOC=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_PCI=y
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_CS5535=m
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_I2C=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_JANZ_CMODIO=m
+# CONFIG_MFD_KEMPLD is not set
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_RTSX_USB=m
+CONFIG_MFD_RN5T618=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+# CONFIG_MFD_SM501_GPIO is not set
+CONFIG_MFD_SKY81452=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65217=m
+CONFIG_MFD_TPS65218=m
+# CONFIG_MFD_TPS65912 is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TIMBERDALE=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+# CONFIG_MFD_WM8998 is not set
+CONFIG_MFD_WM8994=m
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_RN5T618=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65217=m
+CONFIG_REGULATOR_WM8994=m
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+# CONFIG_MEDIA_SDR_SUPPORT is not set
+CONFIG_MEDIA_RC_SUPPORT=y
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+
+#
+# Media drivers
+#
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_HIX5HD2=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
+# CONFIG_VIDEO_GO7007 is not set
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=y
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+CONFIG_DVB_SMIPCIE=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VIM2M=m
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+CONFIG_V4L_RADIO_ISA_DRIVERS=y
+CONFIG_RADIO_ISA=m
+CONFIG_RADIO_CADET=m
+CONFIG_RADIO_RTRACK=m
+# CONFIG_RADIO_RTRACK2 is not set
+CONFIG_RADIO_AZTECH=m
+CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_MIROPCM20=m
+CONFIG_RADIO_SF16FMI=m
+CONFIG_RADIO_SF16FMR2=m
+CONFIG_RADIO_TERRATEC=m
+CONFIG_RADIO_TRUST=m
+CONFIG_RADIO_TYPHOON=m
+CONFIG_RADIO_ZOLTRIX=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+
+#
+# Sensors used on soc_camera driver
+#
+
+#
+# soc_camera sensor drivers
+#
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_SP2=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_INTEL_GTT=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I915=m
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I740=m
+CONFIG_FB_I810=m
+CONFIG_FB_I810_GTF=y
+CONFIG_FB_I810_I2C=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+# CONFIG_FB_INTEL is not set
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+# CONFIG_FB_SM501 is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=y
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_FB_AUO_K190X=m
+CONFIG_FB_AUO_K1900=m
+CONFIG_FB_AUO_K1901=m
+# CONFIG_FB_HYPERV is not set
+# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SM712=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_PM8941_WLED=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_OT200=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_TPS65217=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_VGASTATE=m
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_MDA_CONSOLE=m
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_OPL4_LIB_SEQ=m
+CONFIG_SND_SBAWE_SEQ=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL4_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_WSS_LIB=m
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB8_DSP=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_ISA=y
+CONFIG_SND_ADLIB=m
+CONFIG_SND_AD1816A=m
+CONFIG_SND_AD1848=m
+CONFIG_SND_ALS100=m
+CONFIG_SND_AZT1605=m
+CONFIG_SND_AZT2316=m
+CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8328=m
+CONFIG_SND_CMI8330=m
+CONFIG_SND_CS4231=m
+CONFIG_SND_CS4236=m
+CONFIG_SND_ES1688=m
+CONFIG_SND_ES18XX=m
+CONFIG_SND_SC6000=m
+CONFIG_SND_GUSCLASSIC=m
+CONFIG_SND_GUSEXTREME=m
+CONFIG_SND_GUSMAX=m
+CONFIG_SND_INTERWAVE=m
+CONFIG_SND_INTERWAVE_STB=m
+CONFIG_SND_JAZZ16=m
+CONFIG_SND_OPL3SA2=m
+CONFIG_SND_OPTI92X_AD1848=m
+CONFIG_SND_OPTI92X_CS4231=m
+CONFIG_SND_OPTI93X=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SB16_CSP=y
+CONFIG_SND_SSCAPE=m
+CONFIG_SND_WAVEFRONT=m
+CONFIG_SND_MSND_PINNACLE=m
+CONFIG_SND_MSND_CLASSIC=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SIS7019=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_PREALLOC_SIZE=2048
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_OTG=y
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_HOST=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+CONFIG_USB_DWC3_HOST=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_CHIPIDEA=m
+# CONFIG_USB_CHIPIDEA_HOST is not set
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1760_HOST_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_LINK_LAYER_TEST=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_USB_PHY is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_TAHVO_USB is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_GADGET is not set
+CONFIG_USB_LED_TRIG=y
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_NET48XX=m
+CONFIG_LEDS_WRAP=m
+CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_LP8860=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_MENF21BMC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+# CONFIG_RTC_HCTOSYS is not set
+# CONFIG_RTC_SYSTOHC is not set
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_ISL12057=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV8803=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+# CONFIG_RTC_DS1685_PROC_REGS is not set
+# CONFIG_RTC_DS1685_SYSFS_REGS is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_ACPI=y
+CONFIG_INTEL_IDMA64=m
+CONFIG_PCH_DMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_HSU_DMA=m
+
+#
+# DMA Clients
+#
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+# CONFIG_VFIO_PCI_VGA is not set
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DEV_EVTCHN=y
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=y
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+# CONFIG_XEN_SCSI_BACKEND is not set
+CONFIG_XEN_PRIVCMD=y
+CONFIG_XEN_ACPI_PROCESSOR=m
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_STAGING=y
+# CONFIG_SLICOSS is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_COMEDI is not set
+# CONFIG_PANEL is not set
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_R8723AU=m
+CONFIG_8723AU_AP_MODE=y
+CONFIG_8723AU_BT_COEXIST=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_I2C=m
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+CONFIG_AD7152=m
+CONFIG_AD7746=m
+
+#
+# Direct Digital Synthesis
+#
+
+#
+# Digital gyroscope sensors
+#
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+
+#
+# Light sensors
+#
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_TSL2583=m
+CONFIG_TSL2x7x=m
+
+#
+# Magnetometer sensors
+#
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+
+#
+# Resolver to digital converters
+#
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+CONFIG_FB_SM750=m
+CONFIG_FB_XGI=m
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_I2C_BCM2048=m
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_ZILOG=m
+# CONFIG_STAGING_RDMA is not set
+
+#
+# Android
+#
+CONFIG_WIMAX_GDM72XX=m
+# CONFIG_WIMAX_GDM72XX_QOS is not set
+# CONFIG_WIMAX_GDM72XX_K_MODE is not set
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+# CONFIG_WIMAX_GDM72XX_USB_PM is not set
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+# CONFIG_LUSTRE_FS is not set
+# CONFIG_DGNC is not set
+# CONFIG_DGAP is not set
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_WILC1000_DRIVER is not set
+# CONFIG_MOST is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ALIENWARE_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_RBTN=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_TC1100_WMI=m
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WIRELESS=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+CONFIG_IBM_RTL=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_PVPANIC=m
+CONFIG_INTEL_PMC_IPC=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+CONFIG_COMMON_CLK_SI5351=m
+# CONFIG_COMMON_CLK_PXA is not set
+CONFIG_COMMON_CLK_CDCE706=m
+
+#
+# Hardware Spinlock drivers
+#
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_ATMEL_PIT is not set
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
+# CONFIG_MAILBOX is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IOVA=y
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
+
+#
+# Rpmsg drivers
+#
+
+#
+# SOC (System On Chip) specific Drivers
+#
+# CONFIG_SUNXI_SRAM is not set
+# CONFIG_SOC_TI is not set
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+# CONFIG_IIO_BUFFER_CB is not set
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+
+#
+# Accelerometers
+#
+CONFIG_BMA180=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_KXCJK1013=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7291=m
+CONFIG_AD799X=m
+CONFIG_CC10001_ADC=m
+CONFIG_MAX1363=m
+CONFIG_MCP3422=m
+CONFIG_NAU7802=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_VIPERBOARD_ADC=m
+
+#
+# Amplifiers
+#
+
+#
+# Chemical Sensors
+#
+# CONFIG_VZ89X is not set
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5380=m
+CONFIG_AD5446=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MCP4725=m
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_ITG3200=m
+
+#
+# Humidity sensors
+#
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+
+#
+# Inertial measurement units
+#
+CONFIG_KMX61=m
+CONFIG_INV_MPU6050_IIO=m
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_BH1750=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM36651=m
+CONFIG_GP2AP020A00F=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_STK3310=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8975=m
+CONFIG_AK09911=m
+CONFIG_BMC150_MAGN=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+
+#
+# Digital potentiometers
+#
+CONFIG_MCP4531=m
+
+#
+# Pressure sensors
+#
+CONFIG_BMP280=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_MPL115=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_T5403=m
+
+#
+# Lightning sensors
+#
+
+#
+# Proximity sensors
+#
+# CONFIG_LIDAR_LITE_V2 is not set
+CONFIG_SX9500=m
+
+#
+# Temperature sensors
+#
+CONFIG_MLX90614=m
+CONFIG_TMP006=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_NTB=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_TRANSPORT=m
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
+# CONFIG_IPACK_BUS is not set
+CONFIG_RESET_CONTROLLER=y
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_TUSB1210 is not set
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+CONFIG_RAS=y
+# CONFIG_AMD_MCE_INJ is not set
+CONFIG_THUNDERBOLT=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_NVMEM=m
+CONFIG_STM=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=m
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_UEFI_CPER=y
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_ENCRYPTION=m
+CONFIG_EXT4_FS_ENCRYPTION=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+# CONFIG_F2FS_FS_SECURITY is not set
+# CONFIG_F2FS_CHECK_FS is not set
+CONFIG_F2FS_FS_ENCRYPTION=y
+# CONFIG_F2FS_IO_TRACE is not set
+CONFIG_FS_DAX=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_OVERLAY_FS=m
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_EFIVAR_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_ATIME_SUPPORT=y
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_ORE=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V2=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+CONFIG_NFS_SWAP=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_GRACE_PERIOD=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
+# CONFIG_CIFS_SMB311 is not set
+CONFIG_CIFS_FSCACHE=y
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_POSIX_ACL is not set
+# CONFIG_9P_FS_SECURITY is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_PAGE_OWNER is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
+# CONFIG_DEBUG_TIMEKEEPING is not set
+# CONFIG_TIMER_STATS is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_TORTURE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+# CONFIG_UPROBE_EVENT is not set
+# CONFIG_PROBE_EVENTS is not set
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_TRACE_ENUM_MAP_FILE is not set
+# CONFIG_TRACING_EVENTS_GPIO is not set
+
+#
+# Runtime Testing
+#
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_TEST_HEXDUMP=m
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_TEST_LKM=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_FIRMWARE=m
+CONFIG_TEST_UDELAY=m
+CONFIG_MEMTEST=y
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
+# CONFIG_X86_PTDUMP_CORE is not set
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_WX is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+# CONFIG_PUNIT_ATOM_DEBUG is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_INTEL_TXT is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_YAMA is not set
+# CONFIG_INTEGRITY is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=m
+CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_MCRYPTD=m
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER=y
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_KEYWRAP=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=y
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_586=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_BLOWFISH_COMMON=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST_COMMON=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_586=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_586=y
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=m
+CONFIG_PKCS7_TEST_KEY=m
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
+CONFIG_LGUEST=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_BITREVERSE=y
+# CONFIG_HAVE_ARCH_BITREVERSE is not set
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_CRC8=m
+CONFIG_AUDIT_GENERIC=y
+# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_CORDIC=m
+# CONFIG_DDR is not set
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+CONFIG_FONT_SUN8x16=y
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_SG_SPLIT is not set
+CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_ARCH_HAS_MMIO_FLUSH=y
diff --git a/system/xen/dom0/config-4.4.240-xen.x86_64 b/system/xen/dom0/config-4.4.240-xen.x86_64
new file mode 100644
index 0000000000..ea3a34d322
--- /dev/null
+++ b/system/xen/dom0/config-4.4.240-xen.x86_64
@@ -0,0 +1,7283 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 4.4.240 Kernel Configuration
+#
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
+CONFIG_LOCALVERSION="-xen"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="darkstar"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_FHANDLE=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+# CONFIG_TASKS_RCU is not set
+CONFIG_RCU_STALL_COMMON=y
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_EXPEDITE_BOOT is not set
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+# CONFIG_BPF_SYSCALL is not set
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_USERFAULTFD=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_MEMBARRIER=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_KEXEC_CORE=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+# CONFIG_UPROBES is not set
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR_NONE is not set
+CONFIG_CC_STACKPROTECTOR_REGULAR=y
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_COPY_THREAD_TLS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=m
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_FAST_FEATURE_TESTS=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+CONFIG_RETPOLINE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=m
+# CONFIG_IOSF_MBI_DEBUG is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_XEN=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_512GB=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=256
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+# CONFIG_VM86 is not set
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX64=y
+CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_NUMA is not set
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_CMA is not set
+# CONFIG_MEM_SOFT_DIRTY is not set
+CONFIG_ZPOOL=m
+# CONFIG_ZBUD is not set
+CONFIG_ZSMALLOC=m
+# CONFIG_PGTABLE_MAPPING is not set
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_FRAME_VECTOR=y
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+# CONFIG_X86_INTEL_MPX is not set
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_MIXED=y
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+CONFIG_KEXEC_FILE=y
+# CONFIG_KEXEC_VERIFY_SIG is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
+CONFIG_LEGACY_VSYSCALL_EMULATE=y
+# CONFIG_LEGACY_VSYSCALL_NONE is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_CLK=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=m
+CONFIG_PMIC_OPREGION=y
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_INTEL_IDLE=y
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCI_BUS_ADDR_T_64BIT=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_PCI_STUB=m
+CONFIG_XEN_PCIDEV_FRONTEND=y
+CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+# CONFIG_RAPIDIO is not set
+# CONFIG_X86_SYSFB is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_X86_X32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_X86_DEV_DMA_OPS=y
+CONFIG_PMC_ATOM=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=m
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=m
+CONFIG_NF_TABLES_NETDEV=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NF_TABLES_ARP=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NFT_REDIR_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_HWMON=y
+CONFIG_NET_DSA_TAG_BRCM=y
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+# CONFIG_VLAN_8021Q_MVRP is not set
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_PHONET is not set
+CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+# CONFIG_CAN_LEDS is not set
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_ISA=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_DEBUGFS is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_UART is not set
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+# CONFIG_NFC_MEI_PHY is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+# CONFIG_NFC_FDP is not set
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+# CONFIG_NFC_MRVL_I2C is not set
+CONFIG_NFC_ST21NFCA=m
+# CONFIG_NFC_ST_NCI is not set
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+# CONFIG_NFC_S3FWRN5_I2C is not set
+CONFIG_LWTUNNEL=y
+CONFIG_DST_CACHE=y
+CONFIG_HAVE_BPF_JIT=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+CONFIG_SYS_HYPERVISOR=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_FENCE_TRACE is not set
+
+#
+# Bus devices
+#
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_GPIO_ADDR=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+CONFIG_MTD_LATCH_ADDR=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_BCH=m
+CONFIG_MTD_NAND_ECC_BCH=y
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_DENALI_DT=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_GPIO=m
+# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+CONFIG_MTD_NAND_DOCG4=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_HISI504=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# CONFIG_MTD_SPI_NOR is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+CONFIG_MTD_UBI_GLUEBI=m
+# CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_LZ4_COMPRESS is not set
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SKD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_RAM_DAX=y
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_BACKEND=y
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+CONFIG_BLK_DEV_NVME=m
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_BMP085_I2C=m
+CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_SRAM is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_INTEL_MEI_TXE=m
+CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Bus Driver
+#
+CONFIG_INTEL_MIC_BUS=m
+
+#
+# SCIF Bus Driver
+#
+CONFIG_SCIF_BUS=m
+
+#
+# Intel MIC Host Driver
+#
+CONFIG_INTEL_MIC_HOST=m
+
+#
+# Intel MIC Card Driver
+#
+CONFIG_INTEL_MIC_CARD=m
+
+#
+# SCIF Driver
+#
+CONFIG_SCIF=m
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+CONFIG_MIC_COSM=m
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+# CONFIG_ECHO is not set
+# CONFIG_CXL_BASE is not set
+# CONFIG_CXL_KERNEL_API is not set
+# CONFIG_CXL_EEH is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=y
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_VMWARE_PVSCSI=m
+# CONFIG_XEN_SCSI_FRONTEND is not set
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+# CONFIG_SATA_ZPODD is not set
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_ACARD_AHCI=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_MQ_DEFAULT is not set
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_CACHE_CLEANER=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=y
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_TUN=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_NET_DSA_MV88E6171=m
+CONFIG_NET_DSA_MV88E6352=m
+CONFIG_NET_DSA_BCM_SF2=m
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+# CONFIG_ET131X is not set
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_AURORA_NB8800=m
+CONFIG_NET_CADENCE=y
+CONFIG_MACB=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_BNX2X_VXLAN=y
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_LIQUIDIO=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_VXLAN=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_VXLAN=y
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+# CONFIG_I40E_VXLAN is not set
+CONFIG_I40EVF=m
+CONFIG_FM10K=m
+CONFIG_FM10K_VXLAN=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_VXLAN=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_SWITCHX2=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_VXLAN=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QEDE=m
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+# CONFIG_SFC_MCDI_LOGGING is not set
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TI_CPSW_ALE=m
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_ADM8211=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+CONFIG_WCN36XX_DEBUGFS=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_BRCM_TRACING=y
+# CONFIG_BRCMDBG is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+# CONFIG_IWLWIFI_UAPSD is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_WL_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_BACKEND=y
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_HYPERV_NET=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPIDRV=m
+# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+CONFIG_NVM=y
+# CONFIG_NVM_DEBUG is not set
+# CONFIG_NVM_GENNVM is not set
+# CONFIG_NVM_RRPC is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FT6236=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_KXTJ9_POLLED_MODE=y
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_TPS65218_PWRBUTTON=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVMEM=y
+CONFIG_DEVKMEM=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_FSL is not set
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_FINTEK=m
+CONFIG_SERIAL_8250_MID=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=m
+CONFIG_SERIAL_SC16IS7XX=m
+# CONFIG_SERIAL_SC16IS7XX_I2C is not set
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+# CONFIG_TTY_PRINTK is not set
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
+CONFIG_NVRAM=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+# CONFIG_TCG_XEN is not set
+CONFIG_TCG_CRB=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+# CONFIG_XILLYBUS is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+# CONFIG_SPMI is not set
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_INTEL=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_LYNXPOINT=y
+CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_ZX is not set
+
+#
+# Port-mapped I/O GPIO drivers
+#
+# CONFIG_GPIO_104_IDIO_16 is not set
+CONFIG_GPIO_F7188X=m
+# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_LP3943=m
+# CONFIG_GPIO_UCB1400 is not set
+CONFIG_GPIO_WM8994=m
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+# CONFIG_GPIO_INTEL_MID is not set
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI or I2C GPIO expanders
+#
+# CONFIG_GPIO_MCP23S08 is not set
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
+# CONFIG_W1_SLAVE_DS2408_READBACK is not set
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=y
+CONFIG_BATTERY_BQ27XXX_PLATFORM=y
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_CHARGER_TPS65217=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_RESTART is not set
+CONFIG_POWER_AVS=y
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_HTU21=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_THERMAL_EMULATION=y
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INTEL_PCH_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+# CONFIG_XILINX_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_RN5T618_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_BCM7038_WDT=m
+CONFIG_MEN_A21_WDT=m
+# CONFIG_XEN_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_HOST_SOC=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_PCI=y
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_I2C=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_JANZ_CMODIO=m
+# CONFIG_MFD_KEMPLD is not set
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_RTSX_USB=m
+CONFIG_MFD_RN5T618=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+# CONFIG_MFD_SM501_GPIO is not set
+CONFIG_MFD_SKY81452=m
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65217=m
+CONFIG_MFD_TPS65218=m
+# CONFIG_MFD_TPS65912 is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+# CONFIG_MFD_WM8998 is not set
+CONFIG_MFD_WM8994=m
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_RN5T618=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65217=m
+CONFIG_REGULATOR_WM8994=m
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+# CONFIG_MEDIA_SDR_SUPPORT is not set
+CONFIG_MEDIA_RC_SUPPORT=y
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+
+#
+# Media drivers
+#
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_HIX5HD2=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
+# CONFIG_VIDEO_GO7007 is not set
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=y
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+CONFIG_DVB_SMIPCIE=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VIM2M=m
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+
+#
+# Sensors used on soc_camera driver
+#
+
+#
+# soc_camera sensor drivers
+#
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_SP2=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_INTEL_GTT=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+# CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I810=m
+CONFIG_DRM_I915=m
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_HSA_AMD=m
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I740=m
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+# CONFIG_FB_INTEL is not set
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+# CONFIG_FB_SM501 is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=y
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_FB_AUO_K190X=m
+CONFIG_FB_AUO_K1900=m
+CONFIG_FB_AUO_K1901=m
+# CONFIG_FB_HYPERV is not set
+# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SM712=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_PM8941_WLED=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_TPS65217=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_VGASTATE=m
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_PREALLOC_SIZE=2048
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_OTG=y
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_MON=y
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_HOST=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+CONFIG_USB_DWC3_HOST=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_CHIPIDEA=m
+# CONFIG_USB_CHIPIDEA_HOST is not set
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1760_HOST_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_LINK_LAYER_TEST=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_USB_PHY is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_TAHVO_USB is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_GADGET is not set
+CONFIG_USB_LED_TRIG=y
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_LP8860=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=y
+# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=y
+# CONFIG_EDAC_MM_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+# CONFIG_RTC_HCTOSYS is not set
+# CONFIG_RTC_SYSTOHC is not set
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_ISL12057=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV8803=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+# CONFIG_RTC_DS1685_PROC_REGS is not set
+# CONFIG_RTC_DS1685_SYSFS_REGS is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_ACPI=y
+CONFIG_INTEL_IDMA64=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_INTEL_MIC_X100_DMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_HSU_DMA=m
+
+#
+# DMA Clients
+#
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DMA_ENGINE_RAID=y
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_KS0108 is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+# CONFIG_VFIO_PCI_VGA is not set
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DEV_EVTCHN=y
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=y
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+# CONFIG_XEN_SCSI_BACKEND is not set
+CONFIG_XEN_PRIVCMD=y
+CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_STAGING=y
+# CONFIG_SLICOSS is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_COMEDI is not set
+# CONFIG_PANEL is not set
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_R8723AU=m
+CONFIG_8723AU_AP_MODE=y
+CONFIG_8723AU_BT_COEXIST=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_I2C=m
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+CONFIG_AD7152=m
+CONFIG_AD7746=m
+
+#
+# Direct Digital Synthesis
+#
+
+#
+# Digital gyroscope sensors
+#
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+
+#
+# Light sensors
+#
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_TSL2583=m
+CONFIG_TSL2x7x=m
+
+#
+# Magnetometer sensors
+#
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+
+#
+# Resolver to digital converters
+#
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+CONFIG_FB_SM750=m
+CONFIG_FB_XGI=m
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_I2C_BCM2048=m
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_ZILOG=m
+# CONFIG_STAGING_RDMA is not set
+
+#
+# Android
+#
+CONFIG_WIMAX_GDM72XX=m
+# CONFIG_WIMAX_GDM72XX_QOS is not set
+# CONFIG_WIMAX_GDM72XX_K_MODE is not set
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+# CONFIG_WIMAX_GDM72XX_USB_PM is not set
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+# CONFIG_LUSTRE_FS is not set
+# CONFIG_DGNC is not set
+# CONFIG_DGAP is not set
+# CONFIG_GS_FPGABOOT is not set
+CONFIG_CRYPTO_SKEIN=y
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_WILC1000_DRIVER is not set
+# CONFIG_MOST is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ALIENWARE_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_RBTN=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WIRELESS=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+CONFIG_IBM_RTL=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_PVPANIC=m
+CONFIG_INTEL_PMC_IPC=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+CONFIG_COMMON_CLK_SI5351=m
+# CONFIG_COMMON_CLK_PXA is not set
+CONFIG_COMMON_CLK_CDCE706=m
+
+#
+# Hardware Spinlock drivers
+#
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_ATMEL_PIT is not set
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
+# CONFIG_MAILBOX is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IOVA=y
+CONFIG_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU_STATS is not set
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_IRQ_REMAP=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
+
+#
+# Rpmsg drivers
+#
+
+#
+# SOC (System On Chip) specific Drivers
+#
+# CONFIG_SUNXI_SRAM is not set
+# CONFIG_SOC_TI is not set
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+# CONFIG_IIO_BUFFER_CB is not set
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+
+#
+# Accelerometers
+#
+CONFIG_BMA180=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_KXCJK1013=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7291=m
+CONFIG_AD799X=m
+CONFIG_CC10001_ADC=m
+CONFIG_MAX1363=m
+CONFIG_MCP3422=m
+CONFIG_NAU7802=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_VIPERBOARD_ADC=m
+
+#
+# Amplifiers
+#
+
+#
+# Chemical Sensors
+#
+# CONFIG_VZ89X is not set
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5380=m
+CONFIG_AD5446=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MCP4725=m
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_ITG3200=m
+
+#
+# Humidity sensors
+#
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+
+#
+# Inertial measurement units
+#
+CONFIG_KMX61=m
+CONFIG_INV_MPU6050_IIO=m
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_BH1750=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM36651=m
+CONFIG_GP2AP020A00F=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_STK3310=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8975=m
+CONFIG_AK09911=m
+CONFIG_BMC150_MAGN=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+
+#
+# Digital potentiometers
+#
+CONFIG_MCP4531=m
+
+#
+# Pressure sensors
+#
+CONFIG_BMP280=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_MPL115=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_T5403=m
+
+#
+# Lightning sensors
+#
+
+#
+# Proximity sensors
+#
+# CONFIG_LIDAR_LITE_V2 is not set
+CONFIG_SX9500=m
+
+#
+# Temperature sensors
+#
+CONFIG_MLX90614=m
+CONFIG_TMP006=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_NTB=m
+CONFIG_NTB_INTEL=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_TRANSPORT=m
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
+# CONFIG_IPACK_BUS is not set
+CONFIG_RESET_CONTROLLER=y
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_TUSB1210 is not set
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+CONFIG_RAS=y
+# CONFIG_AMD_MCE_INJ is not set
+CONFIG_THUNDERBOLT=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_NVMEM=m
+CONFIG_STM=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=m
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_UEFI_CPER=y
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_ENCRYPTION=m
+CONFIG_EXT4_FS_ENCRYPTION=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+# CONFIG_F2FS_FS_SECURITY is not set
+# CONFIG_F2FS_CHECK_FS is not set
+CONFIG_F2FS_FS_ENCRYPTION=y
+# CONFIG_F2FS_IO_TRACE is not set
+CONFIG_FS_DAX=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_OVERLAY_FS=m
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_EFIVAR_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_ATIME_SUPPORT=y
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_ORE=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V2=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+CONFIG_NFS_SWAP=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_GRACE_PERIOD=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
+# CONFIG_CIFS_SMB311 is not set
+CONFIG_CIFS_FSCACHE=y
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+# CONFIG_9P_FS_POSIX_ACL is not set
+# CONFIG_9P_FS_SECURITY is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=0
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_PAGE_OWNER is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_HAVE_ARCH_KASAN=y
+# CONFIG_KASAN is not set
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
+# CONFIG_DEBUG_TIMEKEEPING is not set
+# CONFIG_TIMER_STATS is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_TORTURE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+# CONFIG_UPROBE_EVENT is not set
+# CONFIG_PROBE_EVENTS is not set
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_TRACE_ENUM_MAP_FILE is not set
+# CONFIG_TRACING_EVENTS_GPIO is not set
+
+#
+# Runtime Testing
+#
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_TEST_HEXDUMP=m
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_TEST_LKM=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_FIRMWARE=m
+CONFIG_TEST_UDELAY=m
+CONFIG_MEMTEST=y
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
+# CONFIG_X86_PTDUMP_CORE is not set
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_WX is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+# CONFIG_PUNIT_ATOM_DEBUG is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_INTEL_TXT is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_YAMA is not set
+# CONFIG_INTEGRITY is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=m
+CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_MCRYPTD=m
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER=y
+CONFIG_CRYPTO_GLUE_HELPER_X86=y
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_KEYWRAP=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=y
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SHA1_MB=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_BLOWFISH_COMMON=y
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAMELLIA_X86_64=y
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=m
+CONFIG_PKCS7_TEST_KEY=m
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_BITREVERSE=y
+# CONFIG_HAVE_ARCH_BITREVERSE is not set
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_CRC8=m
+# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_CORDIC=m
+# CONFIG_DDR is not set
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+CONFIG_FONT_SUN8x16=y
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_SG_SPLIT is not set
+CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_MMIO_FLUSH=y
diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh
index 7228dcc541..ce4c95e783 100644
--- a/system/xen/dom0/kernel-xen.sh
+++ b/system/xen/dom0/kernel-xen.sh
@@ -5,8 +5,8 @@
 # Written by Chris Abela <chris.abela@maltats.com>, 20100515
 # Modified by Mario Preksavec <mario@slackware.hr>
 
-KERNEL=${KERNEL:-4.4.202}
-XEN=${XEN:-4.12.1}
+KERNEL=${KERNEL:-4.4.240}
+XEN=${XEN:-4.13.1}
 BOOTLOADER=${BOOTLOADER:-lilo}
 
 ROOTMOD=${ROOTMOD:-ext4}
diff --git a/system/xen/domU/domU.sh b/system/xen/domU/domU.sh
index f017c1bd23..e49e3d58b9 100644
--- a/system/xen/domU/domU.sh
+++ b/system/xen/domU/domU.sh
@@ -7,7 +7,7 @@
 
 set -e
 
-KERNEL=${KERNEL:-4.4.202}
+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 52bec8230e..5c90056af9 100644
--- a/system/xen/xen.SlackBuild
+++ b/system/xen/xen.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xen
 
-# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2011, 2013, 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,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xen
-VERSION=${VERSION:-4.12.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.13.1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
-SEABIOS=${SEABIOS:-1.12.0}
-OVMF=${OVMF:-20180725_ef529e6ab7}
-IPXE=${IPXE:-d2063b7693e0e35db97b2264aa987eb6341ae779}
+SEABIOS=${SEABIOS:-1.12.1}
+OVMF=${OVMF:-20190606_20d2e5a125}
+IPXE=${IPXE:-1dd56dbd11082fb622c2ed21cfaced4f47d798a6}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -90,9 +90,9 @@ EOF
       esac
 esac
 
-case "${USE_LIBSSH2:-no}" in
-  yes) CONF_QEMUU+=" --enable-libssh2" ;;
-    *) CONF_QEMUU+=" --disable-libssh2" ;;
+case "${USE_LIBSSH:-no}" in
+  yes) CONF_QEMUU+=" --enable-libssh" ;;
+    *) CONF_QEMUU+=" --disable-libssh" ;;
 esac
 
 case "${USE_BLUEZ:-no}" in
@@ -110,6 +110,12 @@ case "${USE_SPICE:-no}" in
     *) CONF_QEMUU+=" --disable-spice" ;;
 esac
 
+case "${USE_AUDIO:-no}" in
+  yes) CONF_QEMUU+="" ;;
+   no) CONF_QEMUU+=" --audio-drv-list=" ;;
+    *) CONF_QEMUU+=" --audio-drv-list=$USE_AUDIO" ;;
+esac
+
 set -e
 
 rm -rf $PKG
@@ -142,8 +148,8 @@ cp $CWD/ipxe-git-$IPXE.tar.gz tools/firmware/etherboot/_ipxe.tar.gz
 (
   # Seabios
   cd tools/firmware
-  tar -xf $CWD/seabios-$SEABIOS.tar.?z
-  mv seabios-$SEABIOS seabios-dir-remote
+  tar -xf $CWD/seabios-$SEABIOS.tar.?z || tar -xf $CWD/seabios-rel-$SEABIOS.tar.?z
+  mv seabios-$SEABIOS seabios-dir-remote || mv seabios-rel-$SEABIOS seabios-dir-remote
   ln -s seabios-dir-remote seabios-dir
   make -C seabios-dir defconfig
   # OVMF
diff --git a/system/xen/xen.info b/system/xen/xen.info
index e0ee8e6f20..c74e7f07d1 100644
--- a/system/xen/xen.info
+++ b/system/xen/xen.info
@@ -1,8 +1,8 @@
 PRGNAM="xen"
-VERSION="4.12.1"
+VERSION="4.13.1"
 HOMEPAGE="http://www.xenproject.org/"
-DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.12.1.tar.gz \
-          http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz \
+DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.13.1.tar.gz \
+          http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz \
           http://mirror.slackware.hr/sources/xen-extfiles/lwip-1.3.0.tar.gz \
           http://mirror.slackware.hr/sources/xen-extfiles/zlib-1.2.3.tar.gz \
           http://mirror.slackware.hr/sources/xen-extfiles/newlib-1.16.0.tar.gz \
@@ -11,10 +11,10 @@ DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.12.1.tar.gz \
           http://mirror.slackware.hr/sources/xen-extfiles/polarssl-1.1.4-gpl.tgz \
           http://mirror.slackware.hr/sources/xen-extfiles/gmp-4.3.2.tar.bz2 \
           http://mirror.slackware.hr/sources/xen-extfiles/tpm_emulator-0.7.4.tar.gz \
-          http://mirror.slackware.hr/sources/xen-seabios/seabios-1.12.0.tar.gz \
-          http://mirror.slackware.hr/sources/xen-ovmf/xen-ovmf-20180725_ef529e6ab7.tar.bz2"
-MD5SUM="3f96ae93a5d6a3dd89bdf1398e30895e \
-        0de05da7aec358881bb1dff815ecca14 \
+          http://mirror.slackware.hr/sources/xen-seabios/seabios-1.12.1.tar.gz \
+          http://mirror.slackware.hr/sources/xen-ovmf/xen-ovmf-20190606_20d2e5a125.tar.bz2"
+MD5SUM="e26fe8f9ce39463734e6ede45c6e11b8 \
+        b3ab0488a989a089207302111d12e1a0 \
         36cc57650cffda9a0269493be2a169bb \
         debc62758716a169df9f62e6ab2bc634 \
         bf8f1f9e3ca83d732c00a79a6ef29bc4 \
@@ -23,8 +23,8 @@ MD5SUM="3f96ae93a5d6a3dd89bdf1398e30895e \
         7b72caf22b01464ee7d6165f2fd85f44 \
         dd60683d7057917e34630b4a787932e8 \
         e26becb8a6a2b6695f6b3e8097593db8 \
-        2fd637b323d247a0948556104a2121c9 \
-        75df1ed5ad9e08b1fb0be78c8b5234b9"
+        6cb6cba431fd725126ddb5ec529ab85c \
+        a6063a0d3d45e6f77deea8c80569653e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="acpica yajl"
diff --git a/system/xen/xsa/xsa296.patch b/system/xen/xsa/xsa296.patch
deleted file mode 100644
index e71ea7f790..0000000000
--- a/system/xen/xsa/xsa296.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: xen/hypercall: Don't use BUG() for parameter checking in hypercall_create_continuation()
-
-Since c/s 1d429034 "hypercall: update vcpu_op to take an unsigned vcpuid",
-which incorrectly swapped 'i' for 'u' in the parameter type list, guests have
-been able to hit the BUG() in next_args()'s default case.
-
-Correct these back to 'i'.
-
-In addition, make adjustments to prevent this class of issue from occurring in
-the future - crashing Xen is not an appropriate form of parameter checking.
-
-Capitalise NEXT_ARG() to catch all uses, to highlight that it is a macro doing
-non-function-like things behind the scenes, and undef it when appropriate.
-Implement a bad_fmt: block which prints an error, asserts unreachable, and
-crashes the guest.
-
-On the ARM side, drop all parameter checking of p.  It is asymmetric with the
-x86 side, and akin to expecting memcpy() or sprintf() to check their src/fmt
-parameter before use.  A caller passing "" or something other than a string
-literal will be obvious during code review.
-
-This is XSA-296.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Acked-by: Julien Grall <julien.grall@arm.com>
-
-diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
-index 941bbff4fe..a3da8e9c08 100644
---- a/xen/arch/arm/domain.c
-+++ b/xen/arch/arm/domain.c
-@@ -383,14 +383,15 @@ void sync_vcpu_execstate(struct vcpu *v)
-     /* Nothing to do -- no lazy switching */
- }
- 
--#define next_arg(fmt, args) ({                                              \
-+#define NEXT_ARG(fmt, args)                                                 \
-+({                                                                          \
-     unsigned long __arg;                                                    \
-     switch ( *(fmt)++ )                                                     \
-     {                                                                       \
-     case 'i': __arg = (unsigned long)va_arg(args, unsigned int);  break;    \
-     case 'l': __arg = (unsigned long)va_arg(args, unsigned long); break;    \
-     case 'h': __arg = (unsigned long)va_arg(args, void *);        break;    \
--    default:  __arg = 0; BUG();                                             \
-+    default:  goto bad_fmt;                                                 \
-     }                                                                       \
-     __arg;                                                                  \
- })
-@@ -405,9 +406,6 @@ unsigned long hypercall_create_continuation(
-     unsigned int i;
-     va_list args;
- 
--    /* All hypercalls take at least one argument */
--    BUG_ON( !p || *p == '\0' );
--
-     current->hcall_preempted = true;
- 
-     va_start(args, format);
-@@ -415,7 +413,7 @@ unsigned long hypercall_create_continuation(
-     if ( mcs->flags & MCSF_in_multicall )
-     {
-         for ( i = 0; *p != '\0'; i++ )
--            mcs->call.args[i] = next_arg(p, args);
-+            mcs->call.args[i] = NEXT_ARG(p, args);
- 
-         /* Return value gets written back to mcs->call.result */
-         rc = mcs->call.result;
-@@ -431,7 +429,7 @@ unsigned long hypercall_create_continuation(
- 
-             for ( i = 0; *p != '\0'; i++ )
-             {
--                arg = next_arg(p, args);
-+                arg = NEXT_ARG(p, args);
- 
-                 switch ( i )
-                 {
-@@ -454,7 +452,7 @@ unsigned long hypercall_create_continuation(
- 
-             for ( i = 0; *p != '\0'; i++ )
-             {
--                arg = next_arg(p, args);
-+                arg = NEXT_ARG(p, args);
- 
-                 switch ( i )
-                 {
-@@ -475,8 +473,16 @@ unsigned long hypercall_create_continuation(
-     va_end(args);
- 
-     return rc;
-+
-+ bad_fmt:
-+    gprintk(XENLOG_ERR, "Bad hypercall continuation format '%c'\n", *p);
-+    ASSERT_UNREACHABLE();
-+    domain_crash(current->domain);
-+    return 0;
- }
- 
-+#undef NEXT_ARG
-+
- void startup_cpu_idle_loop(void)
- {
-     struct vcpu *v = current;
-diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c
-index d483dbaa6b..4643e5eb43 100644
---- a/xen/arch/x86/hypercall.c
-+++ b/xen/arch/x86/hypercall.c
-@@ -80,14 +80,15 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] =
- #undef COMP
- #undef ARGS
- 
--#define next_arg(fmt, args) ({                                              \
-+#define NEXT_ARG(fmt, args)                                                 \
-+({                                                                          \
-     unsigned long __arg;                                                    \
-     switch ( *(fmt)++ )                                                     \
-     {                                                                       \
-     case 'i': __arg = (unsigned long)va_arg(args, unsigned int);  break;    \
-     case 'l': __arg = (unsigned long)va_arg(args, unsigned long); break;    \
-     case 'h': __arg = (unsigned long)va_arg(args, void *);        break;    \
--    default:  __arg = 0; BUG();                                             \
-+    default:  goto bad_fmt;                                                 \
-     }                                                                       \
-     __arg;                                                                  \
- })
-@@ -109,7 +110,7 @@ unsigned long hypercall_create_continuation(
-     if ( mcs->flags & MCSF_in_multicall )
-     {
-         for ( i = 0; *p != '\0'; i++ )
--            mcs->call.args[i] = next_arg(p, args);
-+            mcs->call.args[i] = NEXT_ARG(p, args);
-     }
-     else
-     {
-@@ -121,7 +122,7 @@ unsigned long hypercall_create_continuation(
-         {
-             for ( i = 0; *p != '\0'; i++ )
-             {
--                arg = next_arg(p, args);
-+                arg = NEXT_ARG(p, args);
-                 switch ( i )
-                 {
-                 case 0: regs->rdi = arg; break;
-@@ -137,7 +138,7 @@ unsigned long hypercall_create_continuation(
-         {
-             for ( i = 0; *p != '\0'; i++ )
-             {
--                arg = next_arg(p, args);
-+                arg = NEXT_ARG(p, args);
-                 switch ( i )
-                 {
-                 case 0: regs->rbx = arg; break;
-@@ -154,8 +155,16 @@ unsigned long hypercall_create_continuation(
-     va_end(args);
- 
-     return op;
-+
-+ bad_fmt:
-+    gprintk(XENLOG_ERR, "Bad hypercall continuation format '%c'\n", *p);
-+    ASSERT_UNREACHABLE();
-+    domain_crash(curr->domain);
-+    return 0;
- }
- 
-+#undef NEXT_ARG
-+
- int hypercall_xlat_continuation(unsigned int *id, unsigned int nr,
-                                 unsigned int mask, ...)
- {
-diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c
-index 39877b3ab2..2531fa7421 100644
---- a/xen/common/compat/domain.c
-+++ b/xen/common/compat/domain.c
-@@ -81,7 +81,7 @@ int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) ar
-         }
- 
-         if ( rc == -ERESTART )
--            rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh",
-+            rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iih",
-                                                cmd, vcpuid, arg);
- 
-         break;
-diff --git a/xen/common/domain.c b/xen/common/domain.c
-index 2308588052..65bcd85e34 100644
---- a/xen/common/domain.c
-+++ b/xen/common/domain.c
-@@ -1411,7 +1411,7 @@ long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg)
- 
-         rc = arch_initialise_vcpu(v, arg);
-         if ( rc == -ERESTART )
--            rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh",
-+            rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iih",
-                                                cmd, vcpuid, arg);
- 
-         break;
diff --git a/system/xen/xsa/xsa298.patch b/system/xen/xsa/xsa298.patch
deleted file mode 100644
index aa39042be5..0000000000
--- a/system/xen/xsa/xsa298.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: x86/PV: check GDT/LDT limits during emulation
-
-Accesses beyond the LDT limit originating from emulation would trigger
-the ASSERT() in pv_map_ldt_shadow_page(). On production builds such
-accesses would cause an attempt to promote the touched page (offset from
-the present LDT base address) to a segment descriptor one. If this
-happens to succeed, guest user mode would be able to elevate its
-privileges to that of the guest kernel. This is particularly easy when
-there's no LDT at all, in which case the LDT base stored internally to
-Xen is simply zero.
-
-Also adjust the ASSERT() that was triggering: It was off by one to
-begin with, and for production builds we also better use
-ASSERT_UNREACHABLE() instead with suitable recovery code afterwards.
-
-This is XSA-298.
-
-Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
----
-v2: Correct 64-bit-only limit check (by folding into the common one).
-
---- a/xen/arch/x86/pv/emul-gate-op.c
-+++ b/xen/arch/x86/pv/emul-gate-op.c
-@@ -51,7 +51,13 @@ static int read_gate_descriptor(unsigned
-     const seg_desc_t *pdesc = gdt_ldt_desc_ptr(gate_sel);
- 
-     if ( (gate_sel < 4) ||
--         ((gate_sel >= FIRST_RESERVED_GDT_BYTE) && !(gate_sel & 4)) ||
-+         /*
-+          * We're interested in call gates only, which occupy a single
-+          * seg_desc_t for 32-bit and a consecutive pair of them for 64-bit.
-+          */
-+         ((gate_sel >> 3) + !is_pv_32bit_vcpu(v) >=
-+          (gate_sel & 4 ? v->arch.pv.ldt_ents
-+                        : v->arch.pv.gdt_ents)) ||
-          __get_user(desc, pdesc) )
-         return 0;
- 
-@@ -70,7 +76,7 @@ static int read_gate_descriptor(unsigned
-     if ( !is_pv_32bit_vcpu(v) )
-     {
-         if ( (*ar & 0x1f00) != 0x0c00 ||
--             (gate_sel >= FIRST_RESERVED_GDT_BYTE - 8 && !(gate_sel & 4)) ||
-+             /* Limit check done above already. */
-              __get_user(desc, pdesc + 1) ||
-              (desc.b & 0x1f00) )
-             return 0;
---- a/xen/arch/x86/pv/emulate.c
-+++ b/xen/arch/x86/pv/emulate.c
-@@ -31,7 +31,14 @@ int pv_emul_read_descriptor(unsigned int
- {
-     seg_desc_t desc;
- 
--    if ( sel < 4)
-+    if ( sel < 4 ||
-+         /*
-+          * Don't apply the GDT limit here, as the selector may be a Xen
-+          * provided one. __get_user() will fail (without taking further
-+          * action) for ones falling in the gap between guest populated
-+          * and Xen ones.
-+          */
-+         ((sel & 4) && (sel >> 3) >= v->arch.pv.ldt_ents) )
-         desc.b = desc.a = 0;
-     else if ( __get_user(desc, gdt_ldt_desc_ptr(sel)) )
-         return 0;
---- a/xen/arch/x86/pv/mm.c
-+++ b/xen/arch/x86/pv/mm.c
-@@ -92,12 +92,16 @@ bool pv_map_ldt_shadow_page(unsigned int
-     BUG_ON(unlikely(in_irq()));
- 
-     /*
--     * Hardware limit checking should guarantee this property.  NB. This is
-+     * Prior limit checking should guarantee this property.  NB. This is
-      * safe as updates to the LDT can only be made by MMUEXT_SET_LDT to the
-      * current vcpu, and vcpu_reset() will block until this vcpu has been
-      * descheduled before continuing.
-      */
--    ASSERT((offset >> 3) <= curr->arch.pv.ldt_ents);
-+    if ( unlikely((offset >> 3) >= curr->arch.pv.ldt_ents) )
-+    {
-+        ASSERT_UNREACHABLE();
-+        return false;
-+    }
- 
-     if ( is_pv_32bit_domain(currd) )
-         linear = (uint32_t)linear;
diff --git a/system/xen/xsa/xsa299-4.12-0001-x86-mm-L1TF-checks-don-t-leave-a-partial-entry.patch b/system/xen/xsa/xsa299-4.12-0001-x86-mm-L1TF-checks-don-t-leave-a-partial-entry.patch
deleted file mode 100644
index fbb9d8086b..0000000000
--- a/system/xen/xsa/xsa299-4.12-0001-x86-mm-L1TF-checks-don-t-leave-a-partial-entry.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 33d051917d5ef38f678b507a3c832afde48b9b49 Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 01/11] x86/mm: L1TF checks don't leave a partial entry
-
-On detection of a potential L1TF issue, most validation code returns
--ERESTART to allow the switch to shadow mode to happen and cause the
-original operation to be restarted.
-
-However, in the validation code, the return value -ERESTART has been
-repurposed to indicate 1) the function has partially completed
-something which needs to be undone, and 2) calling put_page_type()
-should cleanly undo it.  This causes problems in several places.
-
-For L1 tables, on receiving an -ERESTART return from alloc_l1_table(),
-alloc_page_type() will set PGT_partial on the page.  If for some
-reason the original operation never restarts, then on domain
-destruction, relinquish_memory() will call free_page_type() on the
-page.
-
-Unfortunately, alloc_ and free_l1_table() aren't set up to deal with
-PGT_partial.  When returning a failure, alloc_l1_table() always
-de-validates whatever it's validated so far, and free_l1_table()
-always devalidates the whole page.  This means that if
-relinquish_memory() calls free_page_type() on an L1 that didn't
-complete due to an L1TF, it will call put_page_from_l1e() on "page
-entries" that have never been validated.
-
-For L2+ tables, setting rc to ERESTART causes the rest of the
-alloc_lN_table() function to *think* that the entry in question will
-have PGT_partial set.  This will cause it to set partial_pte = 1.  If
-relinqush_memory() then calls free_page_type() on one of those pages,
-then free_lN_table() will call put_page_from_lNe() on the entry when
-it shouldn't.
-
-Rather than indicating -ERESTART, indicate -EINTR.  This is the code
-to indicate that nothing has changed from when you started the call
-(which is effectively how alloc_l1_table() handles errors).
-
-mod_lN_entry() shouldn't have any of these types of problems, so leave
-potential changes there for a clean-up patch later.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 3557cd1178..a1b55c10ff 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1409,7 +1409,7 @@ static int alloc_l1_table(struct page_info *page)
-     {
-         if ( !(l1e_get_flags(pl1e[i]) & _PAGE_PRESENT) )
-         {
--            ret = pv_l1tf_check_l1e(d, pl1e[i]) ? -ERESTART : 0;
-+            ret = pv_l1tf_check_l1e(d, pl1e[i]) ? -EINTR : 0;
-             if ( ret )
-                 goto out;
-         }
-@@ -1517,7 +1517,7 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-         {
-             if ( !pv_l1tf_check_l2e(d, l2e) )
-                 continue;
--            rc = -ERESTART;
-+            rc = -EINTR;
-         }
-         else
-             rc = get_page_from_l2e(l2e, pfn, d, partial);
-@@ -1603,7 +1603,7 @@ static int alloc_l3_table(struct page_info *page)
-         {
-             if ( !pv_l1tf_check_l3e(d, l3e) )
-                 continue;
--            rc = -ERESTART;
-+            rc = -EINTR;
-         }
-         else
-             rc = get_page_from_l3e(l3e, pfn, d, partial);
-@@ -1783,7 +1783,7 @@ static int alloc_l4_table(struct page_info *page)
-         {
-             if ( !pv_l1tf_check_l4e(d, l4e) )
-                 continue;
--            rc = -ERESTART;
-+            rc = -EINTR;
-         }
-         else
-             rc = get_page_from_l4e(l4e, pfn, d, partial);
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0002-x86-mm-Don-t-re-set-PGT_pinned-on-a-partially-de-val.patch b/system/xen/xsa/xsa299-4.12-0002-x86-mm-Don-t-re-set-PGT_pinned-on-a-partially-de-val.patch
deleted file mode 100644
index a74598e597..0000000000
--- a/system/xen/xsa/xsa299-4.12-0002-x86-mm-Don-t-re-set-PGT_pinned-on-a-partially-de-val.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From b490792c18f74b76ec8161721c1e07f810e36309 Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 02/11] x86/mm: Don't re-set PGT_pinned on a partially
- de-validated page
-
-When unpinning pagetables, if an operation is interrupted,
-relinquish_memory() re-sets PGT_pinned so that the un-pin will
-pickedup again when the hypercall restarts.
-
-This is appropriate when put_page_and_type_preemptible() returns
--EINTR, which indicates that the page is back in its initial state
-(i.e., completely validated).  However, for -ERESTART, this leads to a
-state where a page has both PGT_pinned and PGT_partial set.
-
-This happens to work at the moment, although it's not really a
-"canonical" state; but in subsequent patches, where we need to make a
-distinction in handling between PGT_validated and PGT_partial pages,
-this causes issues.
-
-Move to a "canonical" state by:
-- Only re-setting PGT_pinned on -EINTR
-- Re-dropping the refcount held by PGT_pinned on -ERESTART
-
-In the latter case, the PGT_partial bit will be cleared further down
-with the rest of the other PGT_partial pages.
-
-While here, clean up some trainling whitespace.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/domain.c | 31 ++++++++++++++++++++++++++++---
- 1 file changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
-index 2585327834..59df8a6d8d 100644
---- a/xen/arch/x86/domain.c
-+++ b/xen/arch/x86/domain.c
-@@ -114,7 +114,7 @@ static void play_dead(void)
-      * this case, heap corruption or #PF can occur (when heap debugging is
-      * enabled). For example, even printk() can involve tasklet scheduling,
-      * which touches per-cpu vars.
--     * 
-+     *
-      * Consider very carefully when adding code to *dead_idle. Most hypervisor
-      * subsystems are unsafe to call.
-      */
-@@ -1909,9 +1909,34 @@ static int relinquish_memory(
-             break;
-         case -ERESTART:
-         case -EINTR:
-+            /*
-+             * -EINTR means PGT_validated has been re-set; re-set
-+             * PGT_pinned again so that it gets picked up next time
-+             * around.
-+             *
-+             * -ERESTART, OTOH, means PGT_partial is set instead.  Put
-+             * it back on the list, but don't set PGT_pinned; the
-+             * section below will finish off de-validation.  But we do
-+             * need to drop the general ref associated with
-+             * PGT_pinned, since put_page_and_type_preemptible()
-+             * didn't do it.
-+             *
-+             * NB we can do an ASSERT for PGT_validated, since we
-+             * "own" the type ref; but theoretically, the PGT_partial
-+             * could be cleared by someone else.
-+             */
-+            if ( ret == -EINTR )
-+            {
-+                ASSERT(page->u.inuse.type_info & PGT_validated);
-+                set_bit(_PGT_pinned, &page->u.inuse.type_info);
-+            }
-+            else
-+                put_page(page);
-+
-             ret = -ERESTART;
-+
-+            /* Put the page back on the list and drop the ref we grabbed above */
-             page_list_add(page, list);
--            set_bit(_PGT_pinned, &page->u.inuse.type_info);
-             put_page(page);
-             goto out;
-         default:
-@@ -2161,7 +2186,7 @@ void vcpu_kick(struct vcpu *v)
-      * pending flag. These values may fluctuate (after all, we hold no
-      * locks) but the key insight is that each change will cause
-      * evtchn_upcall_pending to be polled.
--     * 
-+     *
-      * NB2. We save the running flag across the unblock to avoid a needless
-      * IPI for domains that we IPI'd to unblock.
-      */
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0003-x86-mm-Separate-out-partial_pte-tristate-into-indivi.patch b/system/xen/xsa/xsa299-4.12-0003-x86-mm-Separate-out-partial_pte-tristate-into-indivi.patch
deleted file mode 100644
index 226e5487b1..0000000000
--- a/system/xen/xsa/xsa299-4.12-0003-x86-mm-Separate-out-partial_pte-tristate-into-indivi.patch
+++ /dev/null
@@ -1,618 +0,0 @@
-From 0f9f61e5737fdd346550ec6e30161fa99e4653fa Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 03/11] x86/mm: Separate out partial_pte tristate into
- individual flags
-
-At the moment, partial_pte is a tri-state that contains two distinct bits
-of information:
-
-1. If zero, the pte at index [nr_validated_ptes] is un-validated.  If
-   non-zero, the pte was last seen with PGT_partial set.
-
-2. If positive, the pte at index [nr_validated_ptes] does not hold a
-   general reference count.  If negative, it does.
-
-To make future patches more clear, separate out this functionality
-into two distinct, named bits: PTF_partial_set (for #1) and
-PTF_partial_general_ref (for #2).
-
-Additionally, a number of functions which need this information also
-take other flags to control behavior (such as `preemptible` and
-`defer`).  These are hard to read in the caller (since you only see
-'true' or 'false'), and ugly when many are added together.  In
-preparation for adding yet another flag in a future patch, collapse
-all of these into a single `flag` variable.
-
-NB that this does mean checking for what was previously the '-1'
-condition a bit more ugly in the put_page_from_lNe functions (since
-you have to check for both partial_set and general ref); but this
-clause will go away in a future patch.
-
-Also note that the original comment had an off-by-one error:
-partial_flags (like partial_pte before it) concerns
-plNe[nr_validated_ptes], not plNe[nr_validated_ptes+1].
-
-No functional change intended.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c        | 165 ++++++++++++++++++++++++---------------
- xen/include/asm-x86/mm.h |  41 +++++++---
- 2 files changed, 128 insertions(+), 78 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index a1b55c10ff..3f6f8cc9b8 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1094,20 +1094,35 @@ get_page_from_l1e(
- }
- 
- #ifdef CONFIG_PV
-+
-+/*
-+ * The following flags are used to specify behavior of various get and
-+ * put commands.  The first two are also stored in page->partial_flags
-+ * to indicate the state of the page pointed to by
-+ * page->pte[page->nr_validated_entries].  See the comment in mm.h for
-+ * more information.
-+ */
-+#define PTF_partial_set         (1 << 0)
-+#define PTF_partial_general_ref (1 << 1)
-+#define PTF_preemptible         (1 << 2)
-+#define PTF_defer               (1 << 3)
-+
- static int get_page_and_type_from_mfn(
-     mfn_t mfn, unsigned long type, struct domain *d,
--    int partial, int preemptible)
-+    unsigned int flags)
- {
-     struct page_info *page = mfn_to_page(mfn);
-     int rc;
-+    bool preemptible = flags & PTF_preemptible,
-+         partial_ref = flags & PTF_partial_general_ref;
- 
--    if ( likely(partial >= 0) &&
-+    if ( likely(!partial_ref) &&
-          unlikely(!get_page_from_mfn(mfn, d)) )
-         return -EINVAL;
- 
-     rc = _get_page_type(page, type, preemptible);
- 
--    if ( unlikely(rc) && partial >= 0 &&
-+    if ( unlikely(rc) && !partial_ref &&
-          (!preemptible || page != current->arch.old_guest_table) )
-         put_page(page);
- 
-@@ -1117,7 +1132,7 @@ static int get_page_and_type_from_mfn(
- define_get_linear_pagetable(l2);
- static int
- get_page_from_l2e(
--    l2_pgentry_t l2e, unsigned long pfn, struct domain *d, int partial)
-+    l2_pgentry_t l2e, unsigned long pfn, struct domain *d, unsigned int flags)
- {
-     unsigned long mfn = l2e_get_pfn(l2e);
-     int rc;
-@@ -1129,8 +1144,9 @@ get_page_from_l2e(
-         return -EINVAL;
-     }
- 
--    rc = get_page_and_type_from_mfn(_mfn(mfn), PGT_l1_page_table, d,
--                                    partial, false);
-+    ASSERT(!(flags & PTF_preemptible));
-+
-+    rc = get_page_and_type_from_mfn(_mfn(mfn), PGT_l1_page_table, d, flags);
-     if ( unlikely(rc == -EINVAL) && get_l2_linear_pagetable(l2e, pfn, d) )
-         rc = 0;
- 
-@@ -1140,7 +1156,7 @@ get_page_from_l2e(
- define_get_linear_pagetable(l3);
- static int
- get_page_from_l3e(
--    l3_pgentry_t l3e, unsigned long pfn, struct domain *d, int partial)
-+    l3_pgentry_t l3e, unsigned long pfn, struct domain *d, unsigned int flags)
- {
-     int rc;
- 
-@@ -1152,7 +1168,7 @@ get_page_from_l3e(
-     }
- 
-     rc = get_page_and_type_from_mfn(
--        l3e_get_mfn(l3e), PGT_l2_page_table, d, partial, 1);
-+        l3e_get_mfn(l3e), PGT_l2_page_table, d, flags | PTF_preemptible);
-     if ( unlikely(rc == -EINVAL) &&
-          !is_pv_32bit_domain(d) &&
-          get_l3_linear_pagetable(l3e, pfn, d) )
-@@ -1164,7 +1180,7 @@ get_page_from_l3e(
- define_get_linear_pagetable(l4);
- static int
- get_page_from_l4e(
--    l4_pgentry_t l4e, unsigned long pfn, struct domain *d, int partial)
-+    l4_pgentry_t l4e, unsigned long pfn, struct domain *d, unsigned int flags)
- {
-     int rc;
- 
-@@ -1176,7 +1192,7 @@ get_page_from_l4e(
-     }
- 
-     rc = get_page_and_type_from_mfn(
--        l4e_get_mfn(l4e), PGT_l3_page_table, d, partial, 1);
-+        l4e_get_mfn(l4e), PGT_l3_page_table, d, flags | PTF_preemptible);
-     if ( unlikely(rc == -EINVAL) && get_l4_linear_pagetable(l4e, pfn, d) )
-         rc = 0;
- 
-@@ -1277,7 +1293,7 @@ static void put_data_page(struct page_info *page, bool writeable)
-  * Note also that this automatically deals correctly with linear p.t.'s.
-  */
- static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
--                             int partial, bool defer)
-+                             unsigned int flags)
- {
-     int rc = 0;
- 
-@@ -1300,12 +1316,13 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
-         struct page_info *pg = l2e_get_page(l2e);
-         struct page_info *ptpg = mfn_to_page(_mfn(pfn));
- 
--        if ( unlikely(partial > 0) )
-+        if ( (flags & (PTF_partial_set | PTF_partial_general_ref)) ==
-+              PTF_partial_set )
-         {
--            ASSERT(!defer);
-+            ASSERT(!(flags & PTF_defer));
-             rc = _put_page_type(pg, true, ptpg);
-         }
--        else if ( defer )
-+        else if ( flags & PTF_defer )
-         {
-             current->arch.old_guest_ptpg = ptpg;
-             current->arch.old_guest_table = pg;
-@@ -1322,7 +1339,7 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
- }
- 
- static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
--                             int partial, bool defer)
-+                             unsigned int flags)
- {
-     struct page_info *pg;
-     int rc;
-@@ -1345,13 +1362,14 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
- 
-     pg = l3e_get_page(l3e);
- 
--    if ( unlikely(partial > 0) )
-+    if ( (flags & (PTF_partial_set | PTF_partial_general_ref)) ==
-+         PTF_partial_set )
-     {
--        ASSERT(!defer);
-+        ASSERT(!(flags & PTF_defer));
-         return _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-     }
- 
--    if ( defer )
-+    if ( flags & PTF_defer )
-     {
-         current->arch.old_guest_ptpg = mfn_to_page(_mfn(pfn));
-         current->arch.old_guest_table = pg;
-@@ -1366,7 +1384,7 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
- }
- 
- static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
--                             int partial, bool defer)
-+                             unsigned int flags)
- {
-     int rc = 1;
- 
-@@ -1375,13 +1393,14 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
-     {
-         struct page_info *pg = l4e_get_page(l4e);
- 
--        if ( unlikely(partial > 0) )
-+        if ( (flags & (PTF_partial_set | PTF_partial_general_ref)) ==
-+              PTF_partial_set )
-         {
--            ASSERT(!defer);
-+            ASSERT(!(flags & PTF_defer));
-             return _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-         }
- 
--        if ( defer )
-+        if ( flags & PTF_defer )
-         {
-             current->arch.old_guest_ptpg = mfn_to_page(_mfn(pfn));
-             current->arch.old_guest_table = pg;
-@@ -1492,12 +1511,13 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-     unsigned long  pfn = mfn_x(page_to_mfn(page));
-     l2_pgentry_t  *pl2e;
-     unsigned int   i;
--    int            rc = 0, partial = page->partial_pte;
-+    int            rc = 0;
-+    unsigned int   partial_flags = page->partial_flags;
- 
-     pl2e = map_domain_page(_mfn(pfn));
- 
-     for ( i = page->nr_validated_ptes; i < L2_PAGETABLE_ENTRIES;
--          i++, partial = 0 )
-+          i++, partial_flags = 0 )
-     {
-         l2_pgentry_t l2e;
- 
-@@ -1520,17 +1540,18 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-             rc = -EINTR;
-         }
-         else
--            rc = get_page_from_l2e(l2e, pfn, d, partial);
-+            rc = get_page_from_l2e(l2e, pfn, d, partial_flags);
- 
-         if ( rc == -ERESTART )
-         {
-             page->nr_validated_ptes = i;
--            page->partial_pte = partial ?: 1;
-+            /* Set 'set', retain 'general ref' */
-+            page->partial_flags = partial_flags | PTF_partial_set;
-         }
-         else if ( rc == -EINTR && i )
-         {
-             page->nr_validated_ptes = i;
--            page->partial_pte = 0;
-+            page->partial_flags = 0;
-             rc = -ERESTART;
-         }
-         else if ( rc < 0 && rc != -EINTR )
-@@ -1539,7 +1560,7 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-             if ( i )
-             {
-                 page->nr_validated_ptes = i;
--                page->partial_pte = 0;
-+                page->partial_flags = 0;
-                 current->arch.old_guest_ptpg = NULL;
-                 current->arch.old_guest_table = page;
-             }
-@@ -1563,7 +1584,8 @@ static int alloc_l3_table(struct page_info *page)
-     unsigned long  pfn = mfn_x(page_to_mfn(page));
-     l3_pgentry_t  *pl3e;
-     unsigned int   i;
--    int            rc = 0, partial = page->partial_pte;
-+    int            rc = 0;
-+    unsigned int   partial_flags = page->partial_flags;
- 
-     pl3e = map_domain_page(_mfn(pfn));
- 
-@@ -1578,7 +1600,7 @@ static int alloc_l3_table(struct page_info *page)
-         memset(pl3e + 4, 0, (L3_PAGETABLE_ENTRIES - 4) * sizeof(*pl3e));
- 
-     for ( i = page->nr_validated_ptes; i < L3_PAGETABLE_ENTRIES;
--          i++, partial = 0 )
-+          i++, partial_flags = 0 )
-     {
-         l3_pgentry_t l3e = pl3e[i];
- 
-@@ -1597,7 +1619,8 @@ static int alloc_l3_table(struct page_info *page)
-             else
-                 rc = get_page_and_type_from_mfn(
-                     l3e_get_mfn(l3e),
--                    PGT_l2_page_table | PGT_pae_xen_l2, d, partial, 1);
-+                    PGT_l2_page_table | PGT_pae_xen_l2, d,
-+                    partial_flags | PTF_preemptible);
-         }
-         else if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) )
-         {
-@@ -1606,17 +1629,18 @@ static int alloc_l3_table(struct page_info *page)
-             rc = -EINTR;
-         }
-         else
--            rc = get_page_from_l3e(l3e, pfn, d, partial);
-+            rc = get_page_from_l3e(l3e, pfn, d, partial_flags);
- 
-         if ( rc == -ERESTART )
-         {
-             page->nr_validated_ptes = i;
--            page->partial_pte = partial ?: 1;
-+            /* Set 'set', leave 'general ref' set if this entry was set */
-+            page->partial_flags = partial_flags | PTF_partial_set;
-         }
-         else if ( rc == -EINTR && i )
-         {
-             page->nr_validated_ptes = i;
--            page->partial_pte = 0;
-+            page->partial_flags = 0;
-             rc = -ERESTART;
-         }
-         if ( rc < 0 )
-@@ -1633,7 +1657,7 @@ static int alloc_l3_table(struct page_info *page)
-         if ( i )
-         {
-             page->nr_validated_ptes = i;
--            page->partial_pte = 0;
-+            page->partial_flags = 0;
-             current->arch.old_guest_ptpg = NULL;
-             current->arch.old_guest_table = page;
-         }
-@@ -1767,10 +1791,11 @@ static int alloc_l4_table(struct page_info *page)
-     unsigned long  pfn = mfn_x(page_to_mfn(page));
-     l4_pgentry_t  *pl4e = map_domain_page(_mfn(pfn));
-     unsigned int   i;
--    int            rc = 0, partial = page->partial_pte;
-+    int            rc = 0;
-+    unsigned int   partial_flags = page->partial_flags;
- 
-     for ( i = page->nr_validated_ptes; i < L4_PAGETABLE_ENTRIES;
--          i++, partial = 0 )
-+          i++, partial_flags = 0 )
-     {
-         l4_pgentry_t l4e;
- 
-@@ -1786,12 +1811,13 @@ static int alloc_l4_table(struct page_info *page)
-             rc = -EINTR;
-         }
-         else
--            rc = get_page_from_l4e(l4e, pfn, d, partial);
-+            rc = get_page_from_l4e(l4e, pfn, d, partial_flags);
- 
-         if ( rc == -ERESTART )
-         {
-             page->nr_validated_ptes = i;
--            page->partial_pte = partial ?: 1;
-+            /* Set 'set', leave 'general ref' set if this entry was set */
-+            page->partial_flags = partial_flags | PTF_partial_set;
-         }
-         else if ( rc < 0 )
-         {
-@@ -1801,7 +1827,7 @@ static int alloc_l4_table(struct page_info *page)
-             if ( i )
-             {
-                 page->nr_validated_ptes = i;
--                page->partial_pte = 0;
-+                page->partial_flags = 0;
-                 if ( rc == -EINTR )
-                     rc = -ERESTART;
-                 else
-@@ -1853,19 +1879,20 @@ static int free_l2_table(struct page_info *page)
-     struct domain *d = page_get_owner(page);
-     unsigned long pfn = mfn_x(page_to_mfn(page));
-     l2_pgentry_t *pl2e;
--    int rc = 0, partial = page->partial_pte;
--    unsigned int i = page->nr_validated_ptes - !partial;
-+    int rc = 0;
-+    unsigned int partial_flags = page->partial_flags,
-+        i = page->nr_validated_ptes - !(partial_flags & PTF_partial_set);
- 
-     pl2e = map_domain_page(_mfn(pfn));
- 
-     for ( ; ; )
-     {
-         if ( is_guest_l2_slot(d, page->u.inuse.type_info, i) )
--            rc = put_page_from_l2e(pl2e[i], pfn, partial, false);
-+            rc = put_page_from_l2e(pl2e[i], pfn, partial_flags);
-         if ( rc < 0 )
-             break;
- 
--        partial = 0;
-+        partial_flags = 0;
- 
-         if ( !i-- )
-             break;
-@@ -1887,12 +1914,14 @@ static int free_l2_table(struct page_info *page)
-     else if ( rc == -ERESTART )
-     {
-         page->nr_validated_ptes = i;
--        page->partial_pte = partial ?: -1;
-+        page->partial_flags = (partial_flags & PTF_partial_set) ?
-+            partial_flags :
-+            (PTF_partial_set | PTF_partial_general_ref);
-     }
-     else if ( rc == -EINTR && i < L2_PAGETABLE_ENTRIES - 1 )
-     {
-         page->nr_validated_ptes = i + 1;
--        page->partial_pte = 0;
-+        page->partial_flags = 0;
-         rc = -ERESTART;
-     }
- 
-@@ -1904,18 +1933,19 @@ static int free_l3_table(struct page_info *page)
-     struct domain *d = page_get_owner(page);
-     unsigned long pfn = mfn_x(page_to_mfn(page));
-     l3_pgentry_t *pl3e;
--    int rc = 0, partial = page->partial_pte;
--    unsigned int  i = page->nr_validated_ptes - !partial;
-+    int rc = 0;
-+    unsigned int partial_flags = page->partial_flags,
-+        i = page->nr_validated_ptes - !(partial_flags & PTF_partial_set);
- 
-     pl3e = map_domain_page(_mfn(pfn));
- 
-     for ( ; ; )
-     {
--        rc = put_page_from_l3e(pl3e[i], pfn, partial, 0);
-+        rc = put_page_from_l3e(pl3e[i], pfn, partial_flags);
-         if ( rc < 0 )
-             break;
- 
--        partial = 0;
-+        partial_flags = 0;
-         if ( rc == 0 )
-             pl3e[i] = unadjust_guest_l3e(pl3e[i], d);
- 
-@@ -1934,12 +1964,14 @@ static int free_l3_table(struct page_info *page)
-     if ( rc == -ERESTART )
-     {
-         page->nr_validated_ptes = i;
--        page->partial_pte = partial ?: -1;
-+        page->partial_flags = (partial_flags & PTF_partial_set) ?
-+            partial_flags :
-+            (PTF_partial_set | PTF_partial_general_ref);
-     }
-     else if ( rc == -EINTR && i < L3_PAGETABLE_ENTRIES - 1 )
-     {
-         page->nr_validated_ptes = i + 1;
--        page->partial_pte = 0;
-+        page->partial_flags = 0;
-         rc = -ERESTART;
-     }
-     return rc > 0 ? 0 : rc;
-@@ -1950,26 +1982,29 @@ static int free_l4_table(struct page_info *page)
-     struct domain *d = page_get_owner(page);
-     unsigned long pfn = mfn_x(page_to_mfn(page));
-     l4_pgentry_t *pl4e = map_domain_page(_mfn(pfn));
--    int rc = 0, partial = page->partial_pte;
--    unsigned int  i = page->nr_validated_ptes - !partial;
-+    int rc = 0;
-+    unsigned partial_flags = page->partial_flags,
-+        i = page->nr_validated_ptes - !(partial_flags & PTF_partial_set);
- 
-     do {
-         if ( is_guest_l4_slot(d, i) )
--            rc = put_page_from_l4e(pl4e[i], pfn, partial, 0);
-+            rc = put_page_from_l4e(pl4e[i], pfn, partial_flags);
-         if ( rc < 0 )
-             break;
--        partial = 0;
-+        partial_flags = 0;
-     } while ( i-- );
- 
-     if ( rc == -ERESTART )
-     {
-         page->nr_validated_ptes = i;
--        page->partial_pte = partial ?: -1;
-+        page->partial_flags = (partial_flags & PTF_partial_set) ?
-+            partial_flags :
-+            (PTF_partial_set | PTF_partial_general_ref);
-     }
-     else if ( rc == -EINTR && i < L4_PAGETABLE_ENTRIES - 1 )
-     {
-         page->nr_validated_ptes = i + 1;
--        page->partial_pte = 0;
-+        page->partial_flags = 0;
-         rc = -ERESTART;
-     }
- 
-@@ -2247,7 +2282,7 @@ static int mod_l2_entry(l2_pgentry_t *pl2e,
-         return -EBUSY;
-     }
- 
--    put_page_from_l2e(ol2e, pfn, 0, true);
-+    put_page_from_l2e(ol2e, pfn, PTF_defer);
- 
-     return rc;
- }
-@@ -2315,7 +2350,7 @@ static int mod_l3_entry(l3_pgentry_t *pl3e,
-         if ( !create_pae_xen_mappings(d, pl3e) )
-             BUG();
- 
--    put_page_from_l3e(ol3e, pfn, 0, 1);
-+    put_page_from_l3e(ol3e, pfn, PTF_defer);
-     return rc;
- }
- 
-@@ -2378,7 +2413,7 @@ static int mod_l4_entry(l4_pgentry_t *pl4e,
-         return -EFAULT;
-     }
- 
--    put_page_from_l4e(ol4e, pfn, 0, 1);
-+    put_page_from_l4e(ol4e, pfn, PTF_defer);
-     return rc;
- }
- #endif /* CONFIG_PV */
-@@ -2649,7 +2684,7 @@ int free_page_type(struct page_info *page, unsigned long type,
-     if ( !(type & PGT_partial) )
-     {
-         page->nr_validated_ptes = 1U << PAGETABLE_ORDER;
--        page->partial_pte = 0;
-+        page->partial_flags = 0;
-     }
- 
-     switch ( type & PGT_type_mask )
-@@ -2946,7 +2981,7 @@ static int _get_page_type(struct page_info *page, unsigned long type,
-         if ( !(x & PGT_partial) )
-         {
-             page->nr_validated_ptes = 0;
--            page->partial_pte = 0;
-+            page->partial_flags = 0;
-         }
-         page->linear_pt_count = 0;
-         rc = alloc_page_type(page, type, preemptible);
-@@ -3122,7 +3157,7 @@ int new_guest_cr3(mfn_t mfn)
-         return 0;
-     }
- 
--    rc = get_page_and_type_from_mfn(mfn, PGT_root_page_table, d, 0, 1);
-+    rc = get_page_and_type_from_mfn(mfn, PGT_root_page_table, d, PTF_preemptible);
-     switch ( rc )
-     {
-     case 0:
-@@ -3473,7 +3508,7 @@ long do_mmuext_op(
-             if ( op.arg1.mfn != 0 )
-             {
-                 rc = get_page_and_type_from_mfn(
--                    _mfn(op.arg1.mfn), PGT_root_page_table, currd, 0, 1);
-+                    _mfn(op.arg1.mfn), PGT_root_page_table, currd, PTF_preemptible);
- 
-                 if ( unlikely(rc) )
-                 {
-diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
-index 6faa563167..8406ac3c37 100644
---- a/xen/include/asm-x86/mm.h
-+++ b/xen/include/asm-x86/mm.h
-@@ -228,19 +228,34 @@ struct page_info
-          * setting the flag must not drop that reference, whereas the instance
-          * clearing it will have to.
-          *
--         * If @partial_pte is positive then PTE at @nr_validated_ptes+1 has
--         * been partially validated. This implies that the general reference
--         * to the page (acquired from get_page_from_lNe()) would be dropped
--         * (again due to the apparent failure) and hence must be re-acquired
--         * when resuming the validation, but must not be dropped when picking
--         * up the page for invalidation.
-+         * If partial_flags & PTF_partial_set is set, then the page at
-+         * at @nr_validated_ptes had PGT_partial set as a result of an
-+         * operation on the current page.  (That page may or may not
-+         * still have PGT_partial set.)
-          *
--         * If @partial_pte is negative then PTE at @nr_validated_ptes+1 has
--         * been partially invalidated. This is basically the opposite case of
--         * above, i.e. the general reference to the page was not dropped in
--         * put_page_from_lNe() (due to the apparent failure), and hence it
--         * must be dropped when the put operation is resumed (and completes),
--         * but it must not be acquired if picking up the page for validation.
-+         * If PTF_partial_general_ref is set, then the PTE at
-+         * @nr_validated_ptef holds a general reference count for the
-+         * page.
-+         *
-+         * This happens:
-+         * - During de-validation, if de-validation of the page was
-+         *   interrupted
-+         * - During validation, if an invalid entry is encountered and
-+         *   validation is preemptible
-+         * - During validation, if PTF_partial_general_ref was set on
-+         *   this entry to begin with (perhaps because we're picking
-+         *   up from a partial de-validation).
-+         *
-+         * When resuming validation, if PTF_partial_general_ref is clear,
-+         * then a general reference must be re-acquired; if it is set, no
-+         * reference should be acquired.
-+         *
-+         * When resuming de-validation, if PTF_partial_general_ref is
-+         * clear, no reference should be dropped; if it is set, a
-+         * reference should be dropped.
-+         *
-+         * NB that PTF_partial_set and PTF_partial_general_ref are
-+         * defined in mm.c, the only place where they are used.
-          *
-          * The 3rd field, @linear_pt_count, indicates
-          * - by a positive value, how many same-level page table entries a page
-@@ -251,7 +266,7 @@ struct page_info
-         struct {
-             u16 nr_validated_ptes:PAGETABLE_ORDER + 1;
-             u16 :16 - PAGETABLE_ORDER - 1 - 2;
--            s16 partial_pte:2;
-+            u16 partial_flags:2;
-             s16 linear_pt_count;
-         };
- 
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0004-x86-mm-Use-flags-for-_put_page_type-rather-than-a-bo.patch b/system/xen/xsa/xsa299-4.12-0004-x86-mm-Use-flags-for-_put_page_type-rather-than-a-bo.patch
deleted file mode 100644
index d07c233225..0000000000
--- a/system/xen/xsa/xsa299-4.12-0004-x86-mm-Use-flags-for-_put_page_type-rather-than-a-bo.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From db1d801aa8dcb918a27486a6e8d9cf5d7307dec3 Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 04/11] x86/mm: Use flags for _put_page_type rather than a
- boolean
-
-This is in mainly in preparation for _put_page_type taking the
-partial_flags value in the future.  It also makes it easier to read in
-the caller (since you see a flag name rather than `true` or `false`).
-
-No functional change intended.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c | 25 +++++++++++++------------
- 1 file changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 3f6f8cc9b8..0740b61af8 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1200,7 +1200,7 @@ get_page_from_l4e(
- }
- #endif /* CONFIG_PV */
- 
--static int _put_page_type(struct page_info *page, bool preemptible,
-+static int _put_page_type(struct page_info *page, unsigned int flags,
-                           struct page_info *ptpg);
- 
- void put_page_from_l1e(l1_pgentry_t l1e, struct domain *l1e_owner)
-@@ -1320,7 +1320,7 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
-               PTF_partial_set )
-         {
-             ASSERT(!(flags & PTF_defer));
--            rc = _put_page_type(pg, true, ptpg);
-+            rc = _put_page_type(pg, PTF_preemptible, ptpg);
-         }
-         else if ( flags & PTF_defer )
-         {
-@@ -1329,7 +1329,7 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
-         }
-         else
-         {
--            rc = _put_page_type(pg, true, ptpg);
-+            rc = _put_page_type(pg, PTF_preemptible, ptpg);
-             if ( likely(!rc) )
-                 put_page(pg);
-         }
-@@ -1366,7 +1366,7 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
-          PTF_partial_set )
-     {
-         ASSERT(!(flags & PTF_defer));
--        return _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-+        return _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-     }
- 
-     if ( flags & PTF_defer )
-@@ -1376,7 +1376,7 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
-         return 0;
-     }
- 
--    rc = _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-+    rc = _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-     if ( likely(!rc) )
-         put_page(pg);
- 
-@@ -1397,7 +1397,7 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
-               PTF_partial_set )
-         {
-             ASSERT(!(flags & PTF_defer));
--            return _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-+            return _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-         }
- 
-         if ( flags & PTF_defer )
-@@ -1407,7 +1407,7 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
-             return 0;
-         }
- 
--        rc = _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
-+        rc = _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-         if ( likely(!rc) )
-             put_page(pg);
-     }
-@@ -2757,10 +2757,11 @@ static int _put_final_page_type(struct page_info *page, unsigned long type,
- }
- 
- 
--static int _put_page_type(struct page_info *page, bool preemptible,
-+static int _put_page_type(struct page_info *page, unsigned int flags,
-                           struct page_info *ptpg)
- {
-     unsigned long nx, x, y = page->u.inuse.type_info;
-+    bool preemptible = flags & PTF_preemptible;
- 
-     ASSERT(current_locked_page_ne_check(page));
- 
-@@ -2969,7 +2970,7 @@ static int _get_page_type(struct page_info *page, unsigned long type,
- 
-             if ( unlikely(iommu_ret) )
-             {
--                _put_page_type(page, false, NULL);
-+                _put_page_type(page, 0, NULL);
-                 rc = iommu_ret;
-                 goto out;
-             }
-@@ -2996,7 +2997,7 @@ static int _get_page_type(struct page_info *page, unsigned long type,
- 
- void put_page_type(struct page_info *page)
- {
--    int rc = _put_page_type(page, false, NULL);
-+    int rc = _put_page_type(page, 0, NULL);
-     ASSERT(rc == 0);
-     (void)rc;
- }
-@@ -3013,7 +3014,7 @@ int get_page_type(struct page_info *page, unsigned long type)
- 
- int put_page_type_preemptible(struct page_info *page)
- {
--    return _put_page_type(page, true, NULL);
-+    return _put_page_type(page, PTF_preemptible, NULL);
- }
- 
- int get_page_type_preemptible(struct page_info *page, unsigned long type)
-@@ -3030,7 +3031,7 @@ int put_old_guest_table(struct vcpu *v)
-     if ( !v->arch.old_guest_table )
-         return 0;
- 
--    switch ( rc = _put_page_type(v->arch.old_guest_table, true,
-+    switch ( rc = _put_page_type(v->arch.old_guest_table, PTF_preemptible,
-                                  v->arch.old_guest_ptpg) )
-     {
-     case -EINTR:
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0005-x86-mm-Rework-get_page_and_type_from_mfn-conditional.patch b/system/xen/xsa/xsa299-4.12-0005-x86-mm-Rework-get_page_and_type_from_mfn-conditional.patch
deleted file mode 100644
index 9cfbb73907..0000000000
--- a/system/xen/xsa/xsa299-4.12-0005-x86-mm-Rework-get_page_and_type_from_mfn-conditional.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6f257854c8778774210281c5c21028c4b7739b44 Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 05/11] x86/mm: Rework get_page_and_type_from_mfn conditional
-
-Make it easier to read by declaring the conditions in which we will
-retain the ref, rather than the conditions under which we release it.
-
-The only way (page == current->arch.old_guest_table) can be true is if
-preemptible is true; so remove this from the query itself, and add an
-ASSERT() to that effect on the opposite path.
-
-No functional change intended.
-
-NB that alloc_lN_table() mishandle the "linear pt failure" situation
-described in the comment; this will be addressed in a future patch.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c | 39 +++++++++++++++++++++++++++++++++++++--
- 1 file changed, 37 insertions(+), 2 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 0740b61af8..0a4d39a2c3 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1122,8 +1122,43 @@ static int get_page_and_type_from_mfn(
- 
-     rc = _get_page_type(page, type, preemptible);
- 
--    if ( unlikely(rc) && !partial_ref &&
--         (!preemptible || page != current->arch.old_guest_table) )
-+    /*
-+     * Retain the refcount if:
-+     * - page is fully validated (rc == 0)
-+     * - page is not validated (rc < 0) but:
-+     *   - We came in with a reference (partial_ref)
-+     *   - page is partially validated but there's been an error
-+     *     (page == current->arch.old_guest_table)
-+     *
-+     * The partial_ref-on-error clause is worth an explanation.  There
-+     * are two scenarios where partial_ref might be true coming in:
-+     * - mfn has been partially demoted as type `type`; i.e. has
-+     *   PGT_partial set
-+     * - mfn has been partially demoted as L(type+1) (i.e., a linear
-+     *   page; e.g. we're being called from get_page_from_l2e with
-+     *   type == PGT_l1_table, but the mfn is PGT_l2_table)
-+     *
-+     * If there's an error, in the first case, _get_page_type will
-+     * either return -ERESTART, in which case we want to retain the
-+     * ref (as the caller will consider it retained), or -EINVAL, in
-+     * which case old_guest_table will be set; in both cases, we need
-+     * to retain the ref.
-+     *
-+     * In the second case, if there's an error, _get_page_type() can
-+     * *only* return -EINVAL, and *never* set old_guest_table.  In
-+     * that case we also want to retain the reference, to allow the
-+     * page to continue to be torn down (i.e., PGT_partial cleared)
-+     * safely.
-+     *
-+     * Also note that we shouldn't be able to leave with the reference
-+     * count retained unless we succeeded, or the operation was
-+     * preemptible.
-+     */
-+    if ( likely(!rc) || partial_ref )
-+        /* nothing */;
-+    else if ( page == current->arch.old_guest_table )
-+        ASSERT(preemptible);
-+    else
-         put_page(page);
- 
-     return rc;
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0006-x86-mm-Have-alloc_l-23-_table-clear-partial_flags-wh.patch b/system/xen/xsa/xsa299-4.12-0006-x86-mm-Have-alloc_l-23-_table-clear-partial_flags-wh.patch
deleted file mode 100644
index 72ee3eac9e..0000000000
--- a/system/xen/xsa/xsa299-4.12-0006-x86-mm-Have-alloc_l-23-_table-clear-partial_flags-wh.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 4ad70553611a7a4e4494d5a3b51b5cc295a488e0 Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 06/11] x86/mm: Have alloc_l[23]_table clear partial_flags when
- preempting
-
-In order to allow recursive pagetable promotions and demotions to be
-interrupted, Xen must keep track of the state of the sub-pages
-promoted or demoted.  This is stored in two elements in the page
-struct: nr_entries_validated and partial_flags.
-
-The rule is that entries [0, nr_entries_validated) should always be
-validated and hold a general reference count.  If partial_flags is
-zero, then [nr_entries_validated] is not validated and no reference
-count is held.  If PTF_partial_set is set, then [nr_entries_validated]
-is partially validated.
-
-At the moment, a distinction is made between promotion and demotion
-with regard to whether the entry itself "holds" a general reference
-count: when entry promotion is interrupted (i.e., returns -ERESTART),
-the entry is not considered to hold a reference; when entry demotion
-is interrupted, the entry is still considered to hold a general
-reference.
-
-PTF_partial_general_ref is used to distinguish between these cases.
-If clear, it's a partial promotion => no general reference count held
-by the entry; if set, it's partial demotion, so a general reference
-count held.  Because promotions and demotions can be interleaved, this
-value is passed to get_page_and_type_from_mfn and put_page_from_l*e,
-to be able to properly handle reference counts.
-
-Unfortunately, when alloc_l[23]_table check hypercall_preempt_check()
-and return -ERESTART, they set nr_entries_validated, but don't clear
-partial_flags.
-
-If we were picking up from a previously-interrupted promotion, that
-means that PTF_partial_set would be set even though
-[nr_entries_validated] was not partially validated.  This means that
-if the page in this state were de-validated, put_page_type() would
-erroneously be called on that entry.
-
-Perhaps worse, if we were racing with a de-validation, then we might
-leave both PTF_partial_set and PTF_partial_general_ref; and when
-de-validation picked up again, both the type and the general ref would
-be erroneously dropped from [nr_entries_validated].
-
-In a sense, the real issue here is code duplication.  Rather than
-duplicate the interruption code, set rc to -EINTR and fall through to
-the code which already handles that case correctly.
-
-Given the logic at this point, it should be impossible for
-partial_flags to be non-zero; add an ASSERT() to catch any changes.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c | 25 ++++++-------------------
- 1 file changed, 6 insertions(+), 19 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 0a4d39a2c3..bbd29a68f4 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1554,21 +1554,13 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-     for ( i = page->nr_validated_ptes; i < L2_PAGETABLE_ENTRIES;
-           i++, partial_flags = 0 )
-     {
--        l2_pgentry_t l2e;
-+        l2_pgentry_t l2e = pl2e[i];
- 
-         if ( i > page->nr_validated_ptes && hypercall_preempt_check() )
--        {
--            page->nr_validated_ptes = i;
--            rc = -ERESTART;
--            break;
--        }
--
--        if ( !is_guest_l2_slot(d, type, i) )
-+            rc = -EINTR;
-+        else if ( !is_guest_l2_slot(d, type, i) )
-             continue;
--
--        l2e = pl2e[i];
--
--        if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) )
-+        else if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) )
-         {
-             if ( !pv_l1tf_check_l2e(d, l2e) )
-                 continue;
-@@ -1640,13 +1632,8 @@ static int alloc_l3_table(struct page_info *page)
-         l3_pgentry_t l3e = pl3e[i];
- 
-         if ( i > page->nr_validated_ptes && hypercall_preempt_check() )
--        {
--            page->nr_validated_ptes = i;
--            rc = -ERESTART;
--            break;
--        }
--
--        if ( is_pv_32bit_domain(d) && (i == 3) )
-+            rc = -EINTR;
-+        else if ( is_pv_32bit_domain(d) && (i == 3) )
-         {
-             if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) ||
-                  (l3e_get_flags(l3e) & l3_disallow_mask(d)) )
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0007-x86-mm-Always-retain-a-general-ref-on-partial.patch b/system/xen/xsa/xsa299-4.12-0007-x86-mm-Always-retain-a-general-ref-on-partial.patch
deleted file mode 100644
index ef390e2b13..0000000000
--- a/system/xen/xsa/xsa299-4.12-0007-x86-mm-Always-retain-a-general-ref-on-partial.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-From 51fe4e67d954649fcf103116be6206a769f0db1e Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 07/11] x86/mm: Always retain a general ref on partial
-
-In order to allow recursive pagetable promotions and demotions to be
-interrupted, Xen must keep track of the state of the sub-pages
-promoted or demoted.  This is stored in two elements in the page struct:
-nr_entries_validated and partial_flags.
-
-The rule is that entries [0, nr_entries_validated) should always be
-validated and hold a general reference count.  If partial_flags is
-zero, then [nr_entries_validated] is not validated and no reference
-count is held.  If PTF_partial_set is set, then [nr_entries_validated]
-is partially validated.
-
-At the moment, a distinction is made between promotion and demotion
-with regard to whether the entry itself "holds" a general reference
-count: when entry promotion is interrupted (i.e., returns -ERESTART),
-the entry is not considered to hold a reference; when entry demotion
-is interrupted, the entry is still considered to hold a general
-reference.
-
-PTF_partial_general_ref is used to distinguish between these cases.
-If clear, it's a partial promotion => no general reference count held
-by the entry; if set, it's partial demotion, so a general reference
-count held.  Because promotions and demotions can be interleaved, this
-value is passed to get_page_and_type_from_mfn and put_page_from_l*e,
-to be able to properly handle reference counts.
-
-Unfortunately, because a refcount is not held, it is possible to
-engineer a situation where PFT_partial_set is set but the page in
-question has been assigned to another domain.  A sketch is provided in
-the appendix.
-
-Fix this by having the parent page table entry hold a general
-reference count whenever PFT_partial_set is set.  (For clarity of
-change, keep two separate flags.  These will be collapsed in a
-subsequent changeset.)
-
-This has two basic implications.  On the put_page_from_lNe() side,
-this mean that the (partial_set && !partial_ref) case can never happen,
-and no longer needs to be special-cased.
-
-Secondly, because both flags are set together, there's no need to carry over
-existing bits from partial_pte.
-
-(NB there is still another issue with calling _put_page_type() on a
-page which had PGT_partial set; that will be handled in a subsequent
-patch.)
-
-On the get_page_and_type_from_mfn() side, we need to distinguish
-between callers which hold a reference on partial (i.e.,
-alloc_lN_table()), and those which do not (new_cr3, PIN_LN_TABLE, and
-so on): pass a flag if the type should be retained on interruption.
-
-NB that since l1 promotion can't be preempted, that get_page_from_l2e
-can't return -ERESTART.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
------
-* Appendix: Engineering PTF_partial_set while a page belongs to a
-  foreign domain
-
-Suppose A is a page which can be promoted to an l3, and B is a page
-which can be promoted to an l2, and A[x] points to B.  B has
-PGC_allocated set but no other general references.
-
-V1:  PIN_L3 A.
-  A is validated, B is validated.
-  A.type_count = 1 | PGT_validated | PGT_pinned
-  B.type_count = 1 | PGT_validated
-  B.count = 2 | PGC_allocated (A[x] holds a general ref)
-
-V1: UNPIN A.
-  A begins de-validation.
-  Arrange to be interrupted when i < x
-  V1->old_guest_table = A
-  V1->old_guest_table_ref_held = false
-  A.type_count = 1 | PGT_partial
-  A.nr_validated_entries = i < x
-  B.type_count = 0
-  B.count = 1 | PGC_allocated
-
-V2: MOD_L4_ENTRY to point some l4e to A.
-  Picks up re-validation of A.
-  Arrange to be interrupted halfway through B's validation
-  B.type_count = 1 | PGT_partial
-  B.count = 2 | PGC_allocated (PGT_partial holds a general ref)
-  A.type_count = 1 | PGT_partial
-  A.nr_validated_entries = x
-  A.partial_pte = PTF_partial_set
-
-V3: MOD_L3_ENTRY to point some other l3e (not in A) to B.
-  Validates B.
-  B.type_count = 1 | PGT_validated
-  B.count = 2 | PGC_allocated ("other l3e" holds a general ref)
-
-V3: MOD_L3_ENTRY to clear l3e pointing to B.
-  Devalidates B.
-  B.type_count = 0
-  B.count = 1 | PGC_allocated
-
-V3: decrease_reservation(B)
-  Clears PGC_allocated
-  B.count = 0 => B is freed
-
-B gets assigned to a different domain
-
-V1: Restarts UNPIN of A
-  put_old_guest_table(A)
-    ...
-      free_l3_table(A)
-
-Now since A.partial_flags has PTF_partial_set, free_l3_table() will
-call put_page_from_l3e() on A[x], which points to B, while B is owned
-by another domain.
-
-If A[x] held a general refcount for B on partial validation, as it does
-for partial de-validation, then B would still have a reference count of
-1 after PGC_allocated was freed; so B wouldn't be freed until after
-put_page_from_l3e() had happend on A[x].
----
- xen/arch/x86/mm.c        | 84 +++++++++++++++++++++++-----------------
- xen/include/asm-x86/mm.h | 15 ++++---
- 2 files changed, 58 insertions(+), 41 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index bbd29a68f4..4d3ebf341d 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1102,10 +1102,11 @@ get_page_from_l1e(
-  * page->pte[page->nr_validated_entries].  See the comment in mm.h for
-  * more information.
-  */
--#define PTF_partial_set         (1 << 0)
--#define PTF_partial_general_ref (1 << 1)
--#define PTF_preemptible         (1 << 2)
--#define PTF_defer               (1 << 3)
-+#define PTF_partial_set           (1 << 0)
-+#define PTF_partial_general_ref   (1 << 1)
-+#define PTF_preemptible           (1 << 2)
-+#define PTF_defer                 (1 << 3)
-+#define PTF_retain_ref_on_restart (1 << 4)
- 
- static int get_page_and_type_from_mfn(
-     mfn_t mfn, unsigned long type, struct domain *d,
-@@ -1114,7 +1115,11 @@ static int get_page_and_type_from_mfn(
-     struct page_info *page = mfn_to_page(mfn);
-     int rc;
-     bool preemptible = flags & PTF_preemptible,
--         partial_ref = flags & PTF_partial_general_ref;
-+         partial_ref = flags & PTF_partial_general_ref,
-+         partial_set = flags & PTF_partial_set,
-+         retain_ref  = flags & PTF_retain_ref_on_restart;
-+
-+    ASSERT(partial_ref == partial_set);
- 
-     if ( likely(!partial_ref) &&
-          unlikely(!get_page_from_mfn(mfn, d)) )
-@@ -1127,13 +1132,15 @@ static int get_page_and_type_from_mfn(
-      * - page is fully validated (rc == 0)
-      * - page is not validated (rc < 0) but:
-      *   - We came in with a reference (partial_ref)
-+     *   - page is partially validated (rc == -ERESTART), and the
-+     *     caller has asked the ref to be retained in that case
-      *   - page is partially validated but there's been an error
-      *     (page == current->arch.old_guest_table)
-      *
-      * The partial_ref-on-error clause is worth an explanation.  There
-      * are two scenarios where partial_ref might be true coming in:
--     * - mfn has been partially demoted as type `type`; i.e. has
--     *   PGT_partial set
-+     * - mfn has been partially promoted / demoted as type `type`;
-+     *   i.e. has PGT_partial set
-      * - mfn has been partially demoted as L(type+1) (i.e., a linear
-      *   page; e.g. we're being called from get_page_from_l2e with
-      *   type == PGT_l1_table, but the mfn is PGT_l2_table)
-@@ -1156,7 +1163,8 @@ static int get_page_and_type_from_mfn(
-      */
-     if ( likely(!rc) || partial_ref )
-         /* nothing */;
--    else if ( page == current->arch.old_guest_table )
-+    else if ( page == current->arch.old_guest_table ||
-+              (retain_ref && rc == -ERESTART) )
-         ASSERT(preemptible);
-     else
-         put_page(page);
-@@ -1354,8 +1362,8 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
-         if ( (flags & (PTF_partial_set | PTF_partial_general_ref)) ==
-               PTF_partial_set )
-         {
--            ASSERT(!(flags & PTF_defer));
--            rc = _put_page_type(pg, PTF_preemptible, ptpg);
-+            /* partial_set should always imply partial_ref */
-+            BUG();
-         }
-         else if ( flags & PTF_defer )
-         {
-@@ -1400,8 +1408,8 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
-     if ( (flags & (PTF_partial_set | PTF_partial_general_ref)) ==
-          PTF_partial_set )
-     {
--        ASSERT(!(flags & PTF_defer));
--        return _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-+        /* partial_set should always imply partial_ref */
-+        BUG();
-     }
- 
-     if ( flags & PTF_defer )
-@@ -1431,8 +1439,8 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
-         if ( (flags & (PTF_partial_set | PTF_partial_general_ref)) ==
-               PTF_partial_set )
-         {
--            ASSERT(!(flags & PTF_defer));
--            return _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-+            /* partial_set should always imply partial_ref */
-+            BUG();
-         }
- 
-         if ( flags & PTF_defer )
-@@ -1569,13 +1577,22 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-         else
-             rc = get_page_from_l2e(l2e, pfn, d, partial_flags);
- 
--        if ( rc == -ERESTART )
--        {
--            page->nr_validated_ptes = i;
--            /* Set 'set', retain 'general ref' */
--            page->partial_flags = partial_flags | PTF_partial_set;
--        }
--        else if ( rc == -EINTR && i )
-+        /*
-+         * It shouldn't be possible for get_page_from_l2e to return
-+         * -ERESTART, since we never call this with PTF_preemptible.
-+         * (alloc_l1_table may return -EINTR on an L1TF-vulnerable
-+         * entry.)
-+         *
-+         * NB that while on a "clean" promotion, we can never get
-+         * PGT_partial.  It is possible to arrange for an l2e to
-+         * contain a partially-devalidated l2; but in that case, both
-+         * of the following functions will fail anyway (the first
-+         * because the page in question is not an l1; the second
-+         * because the page is not fully validated).
-+         */
-+        ASSERT(rc != -ERESTART);
-+
-+        if ( rc == -EINTR && i )
-         {
-             page->nr_validated_ptes = i;
-             page->partial_flags = 0;
-@@ -1584,6 +1601,7 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-         else if ( rc < 0 && rc != -EINTR )
-         {
-             gdprintk(XENLOG_WARNING, "Failure in alloc_l2_table: slot %#x\n", i);
-+            ASSERT(current->arch.old_guest_table == NULL);
-             if ( i )
-             {
-                 page->nr_validated_ptes = i;
-@@ -1642,7 +1660,7 @@ static int alloc_l3_table(struct page_info *page)
-                 rc = get_page_and_type_from_mfn(
-                     l3e_get_mfn(l3e),
-                     PGT_l2_page_table | PGT_pae_xen_l2, d,
--                    partial_flags | PTF_preemptible);
-+                    partial_flags | PTF_preemptible | PTF_retain_ref_on_restart);
-         }
-         else if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) )
-         {
-@@ -1651,13 +1669,14 @@ static int alloc_l3_table(struct page_info *page)
-             rc = -EINTR;
-         }
-         else
--            rc = get_page_from_l3e(l3e, pfn, d, partial_flags);
-+            rc = get_page_from_l3e(l3e, pfn, d,
-+                                   partial_flags | PTF_retain_ref_on_restart);
- 
-         if ( rc == -ERESTART )
-         {
-             page->nr_validated_ptes = i;
-             /* Set 'set', leave 'general ref' set if this entry was set */
--            page->partial_flags = partial_flags | PTF_partial_set;
-+            page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-         }
-         else if ( rc == -EINTR && i )
-         {
-@@ -1833,13 +1852,14 @@ static int alloc_l4_table(struct page_info *page)
-             rc = -EINTR;
-         }
-         else
--            rc = get_page_from_l4e(l4e, pfn, d, partial_flags);
-+            rc = get_page_from_l4e(l4e, pfn, d,
-+                                   partial_flags | PTF_retain_ref_on_restart);
- 
-         if ( rc == -ERESTART )
-         {
-             page->nr_validated_ptes = i;
-             /* Set 'set', leave 'general ref' set if this entry was set */
--            page->partial_flags = partial_flags | PTF_partial_set;
-+            page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-         }
-         else if ( rc < 0 )
-         {
-@@ -1936,9 +1956,7 @@ static int free_l2_table(struct page_info *page)
-     else if ( rc == -ERESTART )
-     {
-         page->nr_validated_ptes = i;
--        page->partial_flags = (partial_flags & PTF_partial_set) ?
--            partial_flags :
--            (PTF_partial_set | PTF_partial_general_ref);
-+        page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-     }
-     else if ( rc == -EINTR && i < L2_PAGETABLE_ENTRIES - 1 )
-     {
-@@ -1986,9 +2004,7 @@ static int free_l3_table(struct page_info *page)
-     if ( rc == -ERESTART )
-     {
-         page->nr_validated_ptes = i;
--        page->partial_flags = (partial_flags & PTF_partial_set) ?
--            partial_flags :
--            (PTF_partial_set | PTF_partial_general_ref);
-+        page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-     }
-     else if ( rc == -EINTR && i < L3_PAGETABLE_ENTRIES - 1 )
-     {
-@@ -2019,9 +2035,7 @@ static int free_l4_table(struct page_info *page)
-     if ( rc == -ERESTART )
-     {
-         page->nr_validated_ptes = i;
--        page->partial_flags = (partial_flags & PTF_partial_set) ?
--            partial_flags :
--            (PTF_partial_set | PTF_partial_general_ref);
-+        page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-     }
-     else if ( rc == -EINTR && i < L4_PAGETABLE_ENTRIES - 1 )
-     {
-diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
-index 8406ac3c37..02079e1324 100644
---- a/xen/include/asm-x86/mm.h
-+++ b/xen/include/asm-x86/mm.h
-@@ -238,22 +238,25 @@ struct page_info
-          * page.
-          *
-          * This happens:
--         * - During de-validation, if de-validation of the page was
-+         * - During validation or de-validation, if the operation was
-          *   interrupted
-          * - During validation, if an invalid entry is encountered and
-          *   validation is preemptible
-          * - During validation, if PTF_partial_general_ref was set on
--         *   this entry to begin with (perhaps because we're picking
--         *   up from a partial de-validation).
-+         *   this entry to begin with (perhaps because it picked up a
-+         *   previous operation)
-          *
--         * When resuming validation, if PTF_partial_general_ref is clear,
--         * then a general reference must be re-acquired; if it is set, no
--         * reference should be acquired.
-+         * When resuming validation, if PTF_partial_general_ref is
-+         * clear, then a general reference must be re-acquired; if it
-+         * is set, no reference should be acquired.
-          *
-          * When resuming de-validation, if PTF_partial_general_ref is
-          * clear, no reference should be dropped; if it is set, a
-          * reference should be dropped.
-          *
-+         * NB at the moment, PTF_partial_set should be set if and only if
-+         * PTF_partial_general_ref is set.
-+         *
-          * NB that PTF_partial_set and PTF_partial_general_ref are
-          * defined in mm.c, the only place where they are used.
-          *
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0008-x86-mm-Collapse-PTF_partial_set-and-PTF_partial_gene.patch b/system/xen/xsa/xsa299-4.12-0008-x86-mm-Collapse-PTF_partial_set-and-PTF_partial_gene.patch
deleted file mode 100644
index 6cf41d1cd6..0000000000
--- a/system/xen/xsa/xsa299-4.12-0008-x86-mm-Collapse-PTF_partial_set-and-PTF_partial_gene.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From 8a8d836f7f7418e659d37817a66cd7a6b115042b Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 08/11] x86/mm: Collapse PTF_partial_set and
- PTF_partial_general_ref into one
-
-...now that they are equivalent.  No functional change intended.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c        | 50 +++++++++++-----------------------------
- xen/include/asm-x86/mm.h | 29 +++++++++++------------
- 2 files changed, 26 insertions(+), 53 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 4d3ebf341d..886e93b8aa 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1097,13 +1097,12 @@ get_page_from_l1e(
- 
- /*
-  * The following flags are used to specify behavior of various get and
-- * put commands.  The first two are also stored in page->partial_flags
-- * to indicate the state of the page pointed to by
-+ * put commands.  The first is also stored in page->partial_flags to
-+ * indicate the state of the page pointed to by
-  * page->pte[page->nr_validated_entries].  See the comment in mm.h for
-  * more information.
-  */
- #define PTF_partial_set           (1 << 0)
--#define PTF_partial_general_ref   (1 << 1)
- #define PTF_preemptible           (1 << 2)
- #define PTF_defer                 (1 << 3)
- #define PTF_retain_ref_on_restart (1 << 4)
-@@ -1115,13 +1114,10 @@ static int get_page_and_type_from_mfn(
-     struct page_info *page = mfn_to_page(mfn);
-     int rc;
-     bool preemptible = flags & PTF_preemptible,
--         partial_ref = flags & PTF_partial_general_ref,
-          partial_set = flags & PTF_partial_set,
-          retain_ref  = flags & PTF_retain_ref_on_restart;
- 
--    ASSERT(partial_ref == partial_set);
--
--    if ( likely(!partial_ref) &&
-+    if ( likely(!partial_set) &&
-          unlikely(!get_page_from_mfn(mfn, d)) )
-         return -EINVAL;
- 
-@@ -1131,14 +1127,14 @@ static int get_page_and_type_from_mfn(
-      * Retain the refcount if:
-      * - page is fully validated (rc == 0)
-      * - page is not validated (rc < 0) but:
--     *   - We came in with a reference (partial_ref)
-+     *   - We came in with a reference (partial_set)
-      *   - page is partially validated (rc == -ERESTART), and the
-      *     caller has asked the ref to be retained in that case
-      *   - page is partially validated but there's been an error
-      *     (page == current->arch.old_guest_table)
-      *
--     * The partial_ref-on-error clause is worth an explanation.  There
--     * are two scenarios where partial_ref might be true coming in:
-+     * The partial_set-on-error clause is worth an explanation.  There
-+     * are two scenarios where partial_set might be true coming in:
-      * - mfn has been partially promoted / demoted as type `type`;
-      *   i.e. has PGT_partial set
-      * - mfn has been partially demoted as L(type+1) (i.e., a linear
-@@ -1161,7 +1157,7 @@ static int get_page_and_type_from_mfn(
-      * count retained unless we succeeded, or the operation was
-      * preemptible.
-      */
--    if ( likely(!rc) || partial_ref )
-+    if ( likely(!rc) || partial_set )
-         /* nothing */;
-     else if ( page == current->arch.old_guest_table ||
-               (retain_ref && rc == -ERESTART) )
-@@ -1359,13 +1355,7 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
-         struct page_info *pg = l2e_get_page(l2e);
-         struct page_info *ptpg = mfn_to_page(_mfn(pfn));
- 
--        if ( (flags & (PTF_partial_set | PTF_partial_general_ref)) ==
--              PTF_partial_set )
--        {
--            /* partial_set should always imply partial_ref */
--            BUG();
--        }
--        else if ( flags & PTF_defer )
-+        if ( flags & PTF_defer )
-         {
-             current->arch.old_guest_ptpg = ptpg;
-             current->arch.old_guest_table = pg;
-@@ -1405,13 +1395,6 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
- 
-     pg = l3e_get_page(l3e);
- 
--    if ( (flags & (PTF_partial_set | PTF_partial_general_ref)) ==
--         PTF_partial_set )
--    {
--        /* partial_set should always imply partial_ref */
--        BUG();
--    }
--
-     if ( flags & PTF_defer )
-     {
-         current->arch.old_guest_ptpg = mfn_to_page(_mfn(pfn));
-@@ -1436,13 +1419,6 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
-     {
-         struct page_info *pg = l4e_get_page(l4e);
- 
--        if ( (flags & (PTF_partial_set | PTF_partial_general_ref)) ==
--              PTF_partial_set )
--        {
--            /* partial_set should always imply partial_ref */
--            BUG();
--        }
--
-         if ( flags & PTF_defer )
-         {
-             current->arch.old_guest_ptpg = mfn_to_page(_mfn(pfn));
-@@ -1676,7 +1652,7 @@ static int alloc_l3_table(struct page_info *page)
-         {
-             page->nr_validated_ptes = i;
-             /* Set 'set', leave 'general ref' set if this entry was set */
--            page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-+            page->partial_flags = PTF_partial_set;
-         }
-         else if ( rc == -EINTR && i )
-         {
-@@ -1859,7 +1835,7 @@ static int alloc_l4_table(struct page_info *page)
-         {
-             page->nr_validated_ptes = i;
-             /* Set 'set', leave 'general ref' set if this entry was set */
--            page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-+            page->partial_flags = PTF_partial_set;
-         }
-         else if ( rc < 0 )
-         {
-@@ -1956,7 +1932,7 @@ static int free_l2_table(struct page_info *page)
-     else if ( rc == -ERESTART )
-     {
-         page->nr_validated_ptes = i;
--        page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-+        page->partial_flags = PTF_partial_set;
-     }
-     else if ( rc == -EINTR && i < L2_PAGETABLE_ENTRIES - 1 )
-     {
-@@ -2004,7 +1980,7 @@ static int free_l3_table(struct page_info *page)
-     if ( rc == -ERESTART )
-     {
-         page->nr_validated_ptes = i;
--        page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-+        page->partial_flags = PTF_partial_set;
-     }
-     else if ( rc == -EINTR && i < L3_PAGETABLE_ENTRIES - 1 )
-     {
-@@ -2035,7 +2011,7 @@ static int free_l4_table(struct page_info *page)
-     if ( rc == -ERESTART )
-     {
-         page->nr_validated_ptes = i;
--        page->partial_flags = PTF_partial_set | PTF_partial_general_ref;
-+        page->partial_flags = PTF_partial_set;
-     }
-     else if ( rc == -EINTR && i < L4_PAGETABLE_ENTRIES - 1 )
-     {
-diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
-index 02079e1324..f0fd35bf6b 100644
---- a/xen/include/asm-x86/mm.h
-+++ b/xen/include/asm-x86/mm.h
-@@ -233,7 +233,7 @@ struct page_info
-          * operation on the current page.  (That page may or may not
-          * still have PGT_partial set.)
-          *
--         * If PTF_partial_general_ref is set, then the PTE at
-+         * Additionally, if PTF_partial_set is set, then the PTE at
-          * @nr_validated_ptef holds a general reference count for the
-          * page.
-          *
-@@ -242,23 +242,20 @@ struct page_info
-          *   interrupted
-          * - During validation, if an invalid entry is encountered and
-          *   validation is preemptible
--         * - During validation, if PTF_partial_general_ref was set on
--         *   this entry to begin with (perhaps because it picked up a
-+         * - During validation, if PTF_partial_set was set on this
-+         *   entry to begin with (perhaps because it picked up a
-          *   previous operation)
-          *
--         * When resuming validation, if PTF_partial_general_ref is
--         * clear, then a general reference must be re-acquired; if it
--         * is set, no reference should be acquired.
-+         * When resuming validation, if PTF_partial_set is clear, then
-+         * a general reference must be re-acquired; if it is set, no
-+         * reference should be acquired.
-          *
--         * When resuming de-validation, if PTF_partial_general_ref is
--         * clear, no reference should be dropped; if it is set, a
--         * reference should be dropped.
-+         * When resuming de-validation, if PTF_partial_set is clear,
-+         * no reference should be dropped; if it is set, a reference
-+         * should be dropped.
-          *
--         * NB at the moment, PTF_partial_set should be set if and only if
--         * PTF_partial_general_ref is set.
--         *
--         * NB that PTF_partial_set and PTF_partial_general_ref are
--         * defined in mm.c, the only place where they are used.
-+         * NB that PTF_partial_set is defined in mm.c, the only place
-+         * where it is used.
-          *
-          * The 3rd field, @linear_pt_count, indicates
-          * - by a positive value, how many same-level page table entries a page
-@@ -268,8 +265,8 @@ struct page_info
-          */
-         struct {
-             u16 nr_validated_ptes:PAGETABLE_ORDER + 1;
--            u16 :16 - PAGETABLE_ORDER - 1 - 2;
--            u16 partial_flags:2;
-+            u16 :16 - PAGETABLE_ORDER - 1 - 1;
-+            u16 partial_flags:1;
-             s16 linear_pt_count;
-         };
- 
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0009-x86-mm-Properly-handle-linear-pagetable-promotion-fa.patch b/system/xen/xsa/xsa299-4.12-0009-x86-mm-Properly-handle-linear-pagetable-promotion-fa.patch
deleted file mode 100644
index bbaba794fc..0000000000
--- a/system/xen/xsa/xsa299-4.12-0009-x86-mm-Properly-handle-linear-pagetable-promotion-fa.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From da3d1d258e54fe600f7f75287183b74d957ec63b Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 09/11] x86/mm: Properly handle linear pagetable promotion
- failures
-
-In order to allow recursive pagetable promotions and demotions to be
-interrupted, Xen must keep track of the state of the sub-pages
-promoted or demoted.  This is stored in two elements in the page
-struct: nr_entries_validated and partial_flags.
-
-The rule is that entries [0, nr_entries_validated) should always be
-validated and hold a general reference count.  If partial_flags is
-zero, then [nr_entries_validated] is not validated and no reference
-count is held.  If PTF_partial_set is set, then [nr_entries_validated]
-is partially validated, and a general reference count is held.
-
-Unfortunately, in cases where an entry began with PTF_partial_set set,
-and get_page_from_lNe() returns -EINVAL, the PTF_partial_set bit is
-erroneously dropped.  (This scenario can be engineered mainly by the
-use of interleaving of promoting and demoting a page which has "linear
-pagetable" entries; see the appendix for a sketch.)  This means that
-we will "leak" a general reference count on the page in question,
-preventing the page from being freed.
-
-Fix this by setting page->partial_flags to the partial_flags local
-variable.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
------
-Appendix
-
-Suppose A and B can both be promoted to L2 pages, and A[x] points to B.
-
-V1: PIN_L2 B.
-  B.type_count = 1 | PGT_validated
-  B.count = 2 | PGC_allocated
-
-V1: MOD_L3_ENTRY pointing something to A.
-  In the process of validating A[x], grab an extra type / ref on B:
-  B.type_count = 2 | PGT_validated
-  B.count = 3 | PGC_allocated
-  A.type_count = 1 | PGT_validated
-  A.count = 2 | PGC_allocated
-
-V1: UNPIN B.
-  B.type_count = 1 | PGT_validate
-  B.count = 2 | PGC_allocated
-
-V1: MOD_L3_ENTRY removing the reference to A.
-  De-validate A, down to A[x], which points to B.
-  Drop the final type on B.  Arrange to be interrupted.
-  B.type_count = 1 | PGT_partial
-  B.count = 2 | PGC_allocated
-  A.type_count = 1 | PGT_partial
-  A.nr_validated_entries = x
-  A.partial_pte = -1
-
-V2: MOD_L3_ENTRY adds a reference to A.
-
-At this point, get_page_from_l2e(A[x]) tries
-get_page_and_type_from_mfn(), which fails because it's the wrong type;
-and get_l2_linear_pagetable() also fails, because B isn't validated as
-an l2 anymore.
----
- xen/arch/x86/mm.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 886e93b8aa..0a094291da 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1581,7 +1581,7 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-             if ( i )
-             {
-                 page->nr_validated_ptes = i;
--                page->partial_flags = 0;
-+                page->partial_flags = partial_flags;
-                 current->arch.old_guest_ptpg = NULL;
-                 current->arch.old_guest_table = page;
-             }
-@@ -1674,7 +1674,7 @@ static int alloc_l3_table(struct page_info *page)
-         if ( i )
-         {
-             page->nr_validated_ptes = i;
--            page->partial_flags = 0;
-+            page->partial_flags = partial_flags;
-             current->arch.old_guest_ptpg = NULL;
-             current->arch.old_guest_table = page;
-         }
-@@ -1845,7 +1845,7 @@ static int alloc_l4_table(struct page_info *page)
-             if ( i )
-             {
-                 page->nr_validated_ptes = i;
--                page->partial_flags = 0;
-+                page->partial_flags = partial_flags;
-                 if ( rc == -EINTR )
-                     rc = -ERESTART;
-                 else
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0010-x86-mm-Fix-nested-de-validation-on-error.patch b/system/xen/xsa/xsa299-4.12-0010-x86-mm-Fix-nested-de-validation-on-error.patch
deleted file mode 100644
index 7d5f022e89..0000000000
--- a/system/xen/xsa/xsa299-4.12-0010-x86-mm-Fix-nested-de-validation-on-error.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From b3e169dc8daeae85b0b51c25fdb142e2e552ec7f Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:49 +0100
-Subject: [PATCH 10/11] x86/mm: Fix nested de-validation on error
-
-If an invalid entry is discovered when validating a page-table tree,
-the entire tree which has so far been validated must be de-validated.
-Since this may take a long time, alloc_l[2-4]_table() set current
-vcpu's old_guest_table immediately; put_old_guest_table() will make
-sure that put_page_type() will be called to finish off the
-de-validation before any other MMU operations can happen on the vcpu.
-
-The invariant for partial pages should be:
-
-* Entries [0, nr_validated_ptes) should be completely validated;
-  put_page_type() will de-validate these.
-
-* If [nr_validated_ptes] is partially validated, partial_flags should
-  set PTF_partiaL_set.  put_page_type() will be called on this page to
-  finish off devalidation, and the appropriate refcount adjustments
-  will be done.
-
-alloc_l[2-3]_table() indicates partial validation to its callers by
-setting current->old_guest_table.
-
-Unfortunately, this is mishandled.
-
-Take the case where validating lNe[x] returns an error.
-
-First, alloc_l3_table() doesn't check old_guest_table at all; as a
-result, partial_flags is not set when it should be.  nr_validated_ptes
-is set to x; and since PFT_partial_set clear, de-validation resumes at
-nr_validated_ptes-1.  This means that the l2 page at pl3e[x] will not
-have put_page_type() called on it when de-validating the rest of the
-l3: it will be stuck in the PGT_partial state until the domain is
-destroyed, or until it is re-used as an l2.  (Any other page type will
-fail.)
-
-Worse, alloc_l4_table(), rather than setting PTF_partial_set as it
-should, sets nr_validated_ptes to x+1.  When de-validating, since
-partial is 0, this will correctly resume calling put_page_type at [x];
-but, if the put_page_type() is never called, but instead
-get_page_type() is called, validation will pick up at [x+1],
-neglecting to validate [x].  If the rest of the validation succeeds,
-the l4 will be validated even though [x] is invalid.
-
-Fix this in both cases by setting PTF_partial_set if old_guest_table
-is set.
-
-While here, add some safety catches:
-- old_guest_table must point to the page contained in
-  [nr_validated_ptes].
-- alloc_l1_page shouldn't set old_guest_table
-
-If we experience one of these situations in production builds, it's
-safer to avoid calling put_page_type for the pages in question.  If
-they have PGT_partial set, they will be cleaned up on domain
-destruction; if not, we have no idea whether a type count is safe to
-drop.  Retaining an extra type ref that should have been dropped may
-trigger a BUG() on the free_domain_page() path, but dropping a type
-count that shouldn't be dropped may cause a privilege escalation.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c | 53 +++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 51 insertions(+), 2 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 0a094291da..a432e69c74 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1580,6 +1580,20 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-             ASSERT(current->arch.old_guest_table == NULL);
-             if ( i )
-             {
-+                /*
-+                 * alloc_l1_table() doesn't set old_guest_table; it does
-+                 * its own tear-down immediately on failure.  If it
-+                 * did we'd need to check it and set partial_flags as we
-+                 * do in alloc_l[34]_table().
-+                 *
-+                 * Note on the use of ASSERT: if it's non-null and
-+                 * hasn't been cleaned up yet, it should have
-+                 * PGT_partial set; and so the type will be cleaned up
-+                 * on domain destruction.  Unfortunately, we would
-+                 * leak the general ref held by old_guest_table; but
-+                 * leaking a page is less bad than a host crash.
-+                 */
-+                ASSERT(current->arch.old_guest_table == NULL);
-                 page->nr_validated_ptes = i;
-                 page->partial_flags = partial_flags;
-                 current->arch.old_guest_ptpg = NULL;
-@@ -1607,6 +1621,7 @@ static int alloc_l3_table(struct page_info *page)
-     unsigned int   i;
-     int            rc = 0;
-     unsigned int   partial_flags = page->partial_flags;
-+    l3_pgentry_t   l3e = l3e_empty();
- 
-     pl3e = map_domain_page(_mfn(pfn));
- 
-@@ -1623,7 +1638,7 @@ static int alloc_l3_table(struct page_info *page)
-     for ( i = page->nr_validated_ptes; i < L3_PAGETABLE_ENTRIES;
-           i++, partial_flags = 0 )
-     {
--        l3_pgentry_t l3e = pl3e[i];
-+        l3e = pl3e[i];
- 
-         if ( i > page->nr_validated_ptes && hypercall_preempt_check() )
-             rc = -EINTR;
-@@ -1675,6 +1690,24 @@ static int alloc_l3_table(struct page_info *page)
-         {
-             page->nr_validated_ptes = i;
-             page->partial_flags = partial_flags;
-+            if ( current->arch.old_guest_table )
-+            {
-+                /*
-+                 * We've experienced a validation failure.  If
-+                 * old_guest_table is set, "transfer" the general
-+                 * reference count to pl3e[nr_validated_ptes] by
-+                 * setting PTF_partial_set.
-+                 *
-+                 * As a precaution, check that old_guest_table is the
-+                 * page pointed to by pl3e[nr_validated_ptes].  If
-+                 * not, it's safer to leak a type ref on production
-+                 * builds.
-+                 */
-+                if ( current->arch.old_guest_table == l3e_get_page(l3e) )
-+                    page->partial_flags = PTF_partial_set;
-+                else
-+                    ASSERT_UNREACHABLE();
-+            }
-             current->arch.old_guest_ptpg = NULL;
-             current->arch.old_guest_table = page;
-         }
-@@ -1851,7 +1884,23 @@ static int alloc_l4_table(struct page_info *page)
-                 else
-                 {
-                     if ( current->arch.old_guest_table )
--                        page->nr_validated_ptes++;
-+                    {
-+                        /*
-+                         * We've experienced a validation failure.  If
-+                         * old_guest_table is set, "transfer" the general
-+                         * reference count to pl3e[nr_validated_ptes] by
-+                         * setting PTF_partial_set.
-+                         *
-+                         * As a precaution, check that old_guest_table is the
-+                         * page pointed to by pl4e[nr_validated_ptes].  If
-+                         * not, it's safer to leak a type ref on production
-+                         * builds.
-+                         */
-+                        if ( current->arch.old_guest_table == l4e_get_page(l4e) )
-+                            page->partial_flags = PTF_partial_set;
-+                        else
-+                            ASSERT_UNREACHABLE();
-+                    }
-                     current->arch.old_guest_ptpg = NULL;
-                     current->arch.old_guest_table = page;
-                 }
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa299-4.12-0011-x86-mm-Don-t-drop-a-type-ref-unless-you-held-a-ref-t.patch b/system/xen/xsa/xsa299-4.12-0011-x86-mm-Don-t-drop-a-type-ref-unless-you-held-a-ref-t.patch
deleted file mode 100644
index ad7e6fee1b..0000000000
--- a/system/xen/xsa/xsa299-4.12-0011-x86-mm-Don-t-drop-a-type-ref-unless-you-held-a-ref-t.patch
+++ /dev/null
@@ -1,413 +0,0 @@
-From ea3dc624c5e6325a9c2f079e52a85965d4ab6ce8 Mon Sep 17 00:00:00 2001
-From: George Dunlap <george.dunlap@citrix.com>
-Date: Thu, 10 Oct 2019 17:57:50 +0100
-Subject: [PATCH 11/11] x86/mm: Don't drop a type ref unless you held a ref to
- begin with
-
-Validation and de-validation of pagetable trees may take arbitrarily
-large amounts of time, and so must be preemptible.  This is indicated
-by setting the PGT_partial bit in the type_info, and setting
-nr_validated_entries and partial_flags appropriately.  Specifically,
-if the entry at [nr_validated_entries] is partially validated,
-partial_flags should have the PGT_partial_set bit set, and the entry
-should hold a general reference count.  During de-validation,
-put_page_type() is called on partially validated entries.
-
-Unfortunately, there are a number of issues with the current algorithm.
-
-First, doing a "normal" put_page_type() is not safe when no type ref
-is held: there is nothing to stop another vcpu from coming along and
-picking up validation again: at which point the put_page_type may drop
-the only page ref on an in-use page.  Some examples are listed in the
-appendix.
-
-The core issue is that put_page_type() is being called both to clean
-up PGT_partial, and to drop a type count; and has no way of knowing
-which is which; and so if in between, PGT_partial is cleared,
-put_page_type() will drop the type ref erroneously.
-
-What is needed is to distinguish between two states:
-- Dropping a type ref which is held
-- Cleaning up a page which has been partially de/validated
-
-Fix this by telling put_page_type() which of the two activities you
-intend.
-
-When cleaning up a partial de/validation, take no action unless you
-find a page partially validated.
-
-If put_page_type() is called without PTF_partial_set, and finds the
-page in a PGT_partial state anyway, then there's certainly been a
-misaccounting somewhere, and carrying on would almost certainly cause
-a security issue, so crash the host instead.
-
-In put_page_from_lNe, pass partial_flags on to _put_page_type().
-
-old_guest_table may be set either with a fully validated page (when
-using the "deferred put" pattern), or with a partially validated page
-(when a normal "de-validation" is interrupted, or when a validation
-fails part-way through due to invalid entries).  Add a flag,
-old_guest_table_partial, to indicate which of these it is, and use
-that to pass the appropriate flag to _put_page_type().
-
-While here, delete stray trailing whitespace.
-
-This is part of XSA-299.
-
-Reported-by: George Dunlap <george.dunlap@citrix.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
------
-Appendix:
-
-Suppose page A, when interpreted as an l3 pagetable, contains all
-valid entries; and suppose A[x] points to page B, which when
-interpreted as an l2 pagetable, contains all valid entries.
-
-P1: PIN_L3_TABLE
-  A -> PGT_l3_table | 1 | valid
-  B -> PGT_l2_table | 1 | valid
-
-P1: UNPIN_TABLE
-  > Arrange to interrupt after B has been de-validated
-  B:
-    type_info -> PGT_l2_table | 0
-  A:
-    type_info -> PGT_l3_table | 1 | partial
-    nr_validated_enties -> (less than x)
-
-P2: mod_l4_entry to point to A
-  > Arrange for this to be interrupted while B is being validated
-  B:
-    type_info -> PGT_l2_table | 1 | partial
-    (nr_validated_entires &c set as appropriate)
-  A:
-    type_info -> PGT_l3_table | 1 | partial
-    nr_validated_entries -> x
-    partial_pte = 1
-
-P3: mod_l3_entry some other unrelated l3 to point to B:
-  B:
-    type_info -> PGT_l2_table | 1
-
-P1: Restart UNPIN_TABLE
-
-At this point, since A.nr_validate_entries == x and A.partial_pte !=
-0, free_l3_table() will call put_page_from_l3e() on pl3e[x], dropping
-its type count to 0 while it's still being pointed to by some other l3
-
-A similar issue arises with old_guest_table.  Consider the following
-scenario:
-
-Suppose A is a page which, when interpreted as an l2, has valid entries
-until entry x, which is invalid.
-
-V1:  PIN_L2_TABLE(A)
-  <Validate until we try to validate [x], get -EINVAL>
-  A -> PGT_l2_table | 1 | PGT_partial
-  V1 -> old_guest_table = A
-  <delayed>
-
-V2: PIN_L2_TABLE(A)
-  <Pick up where V1 left off, try to re-validate [x], get -EINVAL>
-  A -> PGT_l2_table | 1 | PGT_partial
-  V2 -> old_guest_table = A
-  <restart>
-  put_old_guest_table()
-    _put_page_type(A)
-      A -> PGT_l2_table | 0
-
-V1: <restart>
-  put_old_guest_table()
-    _put_page_type(A) # UNDERFLOW
-
-Indeed, it is possible to engineer for old_guest_table for every vcpu
-a guest has to point to the same page.
----
- xen/arch/x86/domain.c        |  6 +++
- xen/arch/x86/mm.c            | 99 +++++++++++++++++++++++++++++++-----
- xen/include/asm-x86/domain.h |  4 +-
- 3 files changed, 95 insertions(+), 14 deletions(-)
-
-diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
-index 59df8a6d8d..f1ae5f89f5 100644
---- a/xen/arch/x86/domain.c
-+++ b/xen/arch/x86/domain.c
-@@ -1104,9 +1104,15 @@ int arch_set_info_guest(
-                     rc = -ERESTART;
-                     /* Fallthrough */
-                 case -ERESTART:
-+                    /*
-+                     * NB that we're putting the kernel-mode table
-+                     * here, which we've already successfully
-+                     * validated above; hence partial = false;
-+                     */
-                     v->arch.old_guest_ptpg = NULL;
-                     v->arch.old_guest_table =
-                         pagetable_get_page(v->arch.guest_table);
-+                    v->arch.old_guest_table_partial = false;
-                     v->arch.guest_table = pagetable_null();
-                     break;
-                 default:
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index a432e69c74..81774368a0 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -1359,10 +1359,11 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn,
-         {
-             current->arch.old_guest_ptpg = ptpg;
-             current->arch.old_guest_table = pg;
-+            current->arch.old_guest_table_partial = false;
-         }
-         else
-         {
--            rc = _put_page_type(pg, PTF_preemptible, ptpg);
-+            rc = _put_page_type(pg, flags | PTF_preemptible, ptpg);
-             if ( likely(!rc) )
-                 put_page(pg);
-         }
-@@ -1385,6 +1386,7 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
-         unsigned long mfn = l3e_get_pfn(l3e);
-         bool writeable = l3e_get_flags(l3e) & _PAGE_RW;
- 
-+        ASSERT(!(flags & PTF_partial_set));
-         ASSERT(!(mfn & ((1UL << (L3_PAGETABLE_SHIFT - PAGE_SHIFT)) - 1)));
-         do {
-             put_data_page(mfn_to_page(_mfn(mfn)), writeable);
-@@ -1397,12 +1399,14 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
- 
-     if ( flags & PTF_defer )
-     {
-+        ASSERT(!(flags & PTF_partial_set));
-         current->arch.old_guest_ptpg = mfn_to_page(_mfn(pfn));
-         current->arch.old_guest_table = pg;
-+        current->arch.old_guest_table_partial = false;
-         return 0;
-     }
- 
--    rc = _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-+    rc = _put_page_type(pg, flags | PTF_preemptible, mfn_to_page(_mfn(pfn)));
-     if ( likely(!rc) )
-         put_page(pg);
- 
-@@ -1421,12 +1425,15 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
- 
-         if ( flags & PTF_defer )
-         {
-+            ASSERT(!(flags & PTF_partial_set));
-             current->arch.old_guest_ptpg = mfn_to_page(_mfn(pfn));
-             current->arch.old_guest_table = pg;
-+            current->arch.old_guest_table_partial = false;
-             return 0;
-         }
- 
--        rc = _put_page_type(pg, PTF_preemptible, mfn_to_page(_mfn(pfn)));
-+        rc = _put_page_type(pg, flags | PTF_preemptible,
-+                            mfn_to_page(_mfn(pfn)));
-         if ( likely(!rc) )
-             put_page(pg);
-     }
-@@ -1535,6 +1542,14 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
- 
-     pl2e = map_domain_page(_mfn(pfn));
- 
-+    /*
-+     * NB that alloc_l2_table will never set partial_pte on an l2; but
-+     * free_l2_table might if a linear_pagetable entry is interrupted
-+     * partway through de-validation.  In that circumstance,
-+     * get_page_from_l2e() will always return -EINVAL; and we must
-+     * retain the type ref by doing the normal partial_flags tracking.
-+     */
-+
-     for ( i = page->nr_validated_ptes; i < L2_PAGETABLE_ENTRIES;
-           i++, partial_flags = 0 )
-     {
-@@ -1598,6 +1613,7 @@ static int alloc_l2_table(struct page_info *page, unsigned long type)
-                 page->partial_flags = partial_flags;
-                 current->arch.old_guest_ptpg = NULL;
-                 current->arch.old_guest_table = page;
-+                current->arch.old_guest_table_partial = true;
-             }
-         }
-         if ( rc < 0 )
-@@ -1704,12 +1720,16 @@ static int alloc_l3_table(struct page_info *page)
-                  * builds.
-                  */
-                 if ( current->arch.old_guest_table == l3e_get_page(l3e) )
-+                {
-+                    ASSERT(current->arch.old_guest_table_partial);
-                     page->partial_flags = PTF_partial_set;
-+                }
-                 else
-                     ASSERT_UNREACHABLE();
-             }
-             current->arch.old_guest_ptpg = NULL;
-             current->arch.old_guest_table = page;
-+            current->arch.old_guest_table_partial = true;
-         }
-         while ( i-- > 0 )
-             pl3e[i] = unadjust_guest_l3e(pl3e[i], d);
-@@ -1897,12 +1917,16 @@ static int alloc_l4_table(struct page_info *page)
-                          * builds.
-                          */
-                         if ( current->arch.old_guest_table == l4e_get_page(l4e) )
-+                        {
-+                            ASSERT(current->arch.old_guest_table_partial);
-                             page->partial_flags = PTF_partial_set;
-+                        }
-                         else
-                             ASSERT_UNREACHABLE();
-                     }
-                     current->arch.old_guest_ptpg = NULL;
-                     current->arch.old_guest_table = page;
-+                    current->arch.old_guest_table_partial = true;
-                 }
-             }
-         }
-@@ -2831,6 +2855,28 @@ static int _put_page_type(struct page_info *page, unsigned int flags,
-         x  = y;
-         nx = x - 1;
- 
-+        /*
-+         * Is this expected to do a full reference drop, or only
-+         * cleanup partial validation / devalidation?
-+         *
-+         * If the former, the caller must hold a "full" type ref;
-+         * which means the page must be validated.  If the page is
-+         * *not* fully validated, continuing would almost certainly
-+         * open up a security hole.  An exception to this is during
-+         * domain destruction, where PGT_validated can be dropped
-+         * without dropping a type ref.
-+         *
-+         * If the latter, do nothing unless type PGT_partial is set.
-+         * If it is set, the type count must be 1.
-+         */
-+        if ( !(flags & PTF_partial_set) )
-+            BUG_ON((x & PGT_partial) ||
-+                   !((x & PGT_validated) || page_get_owner(page)->is_dying));
-+        else if ( !(x & PGT_partial) )
-+            return 0;
-+        else
-+            BUG_ON((x & PGT_count_mask) != 1);
-+
-         ASSERT((x & PGT_count_mask) != 0);
- 
-         switch ( nx & (PGT_locked | PGT_count_mask) )
-@@ -3092,17 +3138,34 @@ int put_old_guest_table(struct vcpu *v)
-     if ( !v->arch.old_guest_table )
-         return 0;
- 
--    switch ( rc = _put_page_type(v->arch.old_guest_table, PTF_preemptible,
--                                 v->arch.old_guest_ptpg) )
-+    rc = _put_page_type(v->arch.old_guest_table,
-+                        PTF_preemptible |
-+                        ( v->arch.old_guest_table_partial ?
-+                          PTF_partial_set : 0 ),
-+                        v->arch.old_guest_ptpg);
-+
-+    if ( rc == -ERESTART || rc == -EINTR )
-     {
--    case -EINTR:
--    case -ERESTART:
-+        v->arch.old_guest_table_partial = (rc == -ERESTART);
-         return -ERESTART;
--    case 0:
--        put_page(v->arch.old_guest_table);
-     }
- 
-+    /*
-+     * It shouldn't be possible for _put_page_type() to return
-+     * anything else at the moment; but if it does happen in
-+     * production, leaking the type ref is probably the best thing to
-+     * do.  Either way, drop the general ref held by old_guest_table.
-+     */
-+    ASSERT(rc == 0);
-+
-+    put_page(v->arch.old_guest_table);
-     v->arch.old_guest_table = NULL;
-+    v->arch.old_guest_ptpg = NULL;
-+    /*
-+     * Safest default if someone sets old_guest_table without
-+     * explicitly setting old_guest_table_partial.
-+     */
-+    v->arch.old_guest_table_partial = true;
- 
-     return rc;
- }
-@@ -3253,11 +3316,11 @@ int new_guest_cr3(mfn_t mfn)
-             switch ( rc = put_page_and_type_preemptible(page) )
-             {
-             case -EINTR:
--                rc = -ERESTART;
--                /* fallthrough */
-             case -ERESTART:
-                 curr->arch.old_guest_ptpg = NULL;
-                 curr->arch.old_guest_table = page;
-+                curr->arch.old_guest_table_partial = (rc == -ERESTART);
-+                rc = -ERESTART;
-                 break;
-             default:
-                 BUG_ON(rc);
-@@ -3494,6 +3557,7 @@ long do_mmuext_op(
-                     {
-                         curr->arch.old_guest_ptpg = NULL;
-                         curr->arch.old_guest_table = page;
-+                        curr->arch.old_guest_table_partial = false;
-                     }
-                 }
-             }
-@@ -3528,6 +3592,11 @@ long do_mmuext_op(
-             case -ERESTART:
-                 curr->arch.old_guest_ptpg = NULL;
-                 curr->arch.old_guest_table = page;
-+                /*
-+                 * EINTR means we still hold the type ref; ERESTART
-+                 * means PGT_partial holds the type ref
-+                 */
-+                curr->arch.old_guest_table_partial = (rc == -ERESTART);
-                 rc = 0;
-                 break;
-             default:
-@@ -3596,11 +3665,15 @@ long do_mmuext_op(
-                 switch ( rc = put_page_and_type_preemptible(page) )
-                 {
-                 case -EINTR:
--                    rc = -ERESTART;
--                    /* fallthrough */
-                 case -ERESTART:
-                     curr->arch.old_guest_ptpg = NULL;
-                     curr->arch.old_guest_table = page;
-+                    /*
-+                     * EINTR means we still hold the type ref;
-+                     * ERESTART means PGT_partial holds the ref
-+                     */
-+                    curr->arch.old_guest_table_partial = (rc == -ERESTART);
-+                    rc = -ERESTART;
-                     break;
-                 default:
-                     BUG_ON(rc);
-diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
-index 214e44ce1c..2cfce7b36b 100644
---- a/xen/include/asm-x86/domain.h
-+++ b/xen/include/asm-x86/domain.h
-@@ -307,7 +307,7 @@ struct arch_domain
- 
-     struct paging_domain paging;
-     struct p2m_domain *p2m;
--    /* To enforce lock ordering in the pod code wrt the 
-+    /* To enforce lock ordering in the pod code wrt the
-      * page_alloc lock */
-     int page_alloc_unlock_level;
- 
-@@ -581,6 +581,8 @@ struct arch_vcpu
-     struct page_info *old_guest_table;  /* partially destructed pagetable */
-     struct page_info *old_guest_ptpg;   /* containing page table of the */
-                                         /* former, if any */
-+    bool old_guest_table_partial;       /* Are we dropping a type ref, or just
-+                                         * finishing up a partial de-validation? */
-     /* guest_table holds a ref to the page, and also a type-count unless
-      * shadow refcounts are in use */
-     pagetable_t shadow_table[4];        /* (MFN) shadow(s) of guest */
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa301-master-1.patch b/system/xen/xsa/xsa301-master-1.patch
deleted file mode 100644
index 54cce2ce28..0000000000
--- a/system/xen/xsa/xsa301-master-1.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 19d6330f142cb941b6340a88592e8a294de0ff8c Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@arm.com>
-Date: Tue, 15 Oct 2019 17:10:40 +0100
-Subject: [PATCH 1/3] xen/arm: p2m: Avoid aliasing guest physical frame
-
-The P2M helpers implementation is quite lax and will end up to ignore
-the unused top bits of a guest physical frame.
-
-This effectively means that p2m_set_entry() will create a mapping for a
-different frame (it is always equal to gfn & (mask unused bits)). Yet
-p2m->max_mapped_gfn will be updated using the original frame.
-
-At the moment, p2m_get_entry() and p2m_resolve_translation_fault()
-assume that p2m_get_root_pointer() will always return a non-NULL pointer
-when the GFN is smaller than p2m->max_mapped_gfn.
-
-Unfortunately, because of the aliasing described above, it would be
-possible to set p2m->max_mapped_gfn high enough so it covers frame that
-would lead p2m_get_root_pointer() to return NULL.
-
-As we don't sanity check the guest physical frame provided by a guest, a
-malicious guest could craft a series of hypercalls that will hit the
-BUG_ON() and therefore DoS Xen.
-
-To prevent aliasing, the function p2m_get_root_pointer() is now reworked
-to return NULL If any of the unused top bits are not zero. The caller
-can then decide what's the appropriate action to do. Since the two paths
-(i.e. P2M_ROOT_PAGES == 1 and P2M_ROOT_PAGES != 1) are now very
-similarly, take the opportunity to consolidate them making the code a
-bit simpler.
-
-With this change, p2m_get_entry() will not try to insert a mapping as
-the root pointer is invalid.
-
-Note that root_table is now switch to unsigned long as unsigned int is
-not enough to hold part of a GFN.
-
-This is part of XSA-301.
-
-Reported-by: Julien Grall <Julien.Grall@arm.com>
-Signed-off-by: Julien Grall <julien.grall@arm.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
----
- xen/arch/arm/p2m.c | 17 +++++------------
- 1 file changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
-index a2749d9b6f..d0045a8b28 100644
---- a/xen/arch/arm/p2m.c
-+++ b/xen/arch/arm/p2m.c
-@@ -229,21 +229,14 @@ void p2m_tlb_flush_sync(struct p2m_domain *p2m)
- static lpae_t *p2m_get_root_pointer(struct p2m_domain *p2m,
-                                     gfn_t gfn)
- {
--    unsigned int root_table;
--
--    if ( P2M_ROOT_PAGES == 1 )
--        return __map_domain_page(p2m->root);
-+    unsigned long root_table;
- 
-     /*
--     * Concatenated root-level tables. The table number will be the
--     * offset at the previous level. It is not possible to
--     * concatenate a level-0 root.
-+     * While the root table index is the offset from the previous level,
-+     * we can't use (P2M_ROOT_LEVEL - 1) because the root level might be
-+     * 0. Yet we still want to check if all the unused bits are zeroed.
-      */
--    ASSERT(P2M_ROOT_LEVEL > 0);
--
--    root_table = gfn_x(gfn) >> (level_orders[P2M_ROOT_LEVEL - 1]);
--    root_table &= LPAE_ENTRY_MASK;
--
-+    root_table = gfn_x(gfn) >> (level_orders[P2M_ROOT_LEVEL] + LPAE_SHIFT);
-     if ( root_table >= P2M_ROOT_PAGES )
-         return NULL;
- 
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa301-master-2.patch b/system/xen/xsa/xsa301-master-2.patch
deleted file mode 100644
index baedc9c297..0000000000
--- a/system/xen/xsa/xsa301-master-2.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 3b896936f7505e929dd869d14afcb185d0ee75f8 Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@arm.com>
-Date: Tue, 15 Oct 2019 17:10:41 +0100
-Subject: [PATCH 2/3] xen/arm: p2m: Avoid off-by-one check on
- p2m->max_mapped_gfn
-
-The code base is using inconsistently the field p2m->max_mapped_gfn.
-Some of the useres expect that p2m->max_guest_gfn contain the highest
-mapped GFN while others expect highest + 1.
-
-p2m->max_guest_gfn is set as highest + 1, because of that the sanity
-check on the GFN in p2m_resolved_translation_fault() and
-p2m_get_entry() can be bypassed when GFN == p2m->max_guest_gfn.
-
-p2m_get_root_pointer(p2m->max_guest_gfn) may return NULL if it is
-outside of address range supported and therefore the BUG_ON() could be
-hit.
-
-The current value hold in p2m->max_mapped_gfn is inconsistent with the
-expectation of the common code (see domain_get_maximum_gpfn()) and also
-the documentation of the field.
-
-Rather than changing the check in p2m_translation_fault() and
-p2m_get_entry(), p2m->max_mapped_gfn is now containing the highest
-mapped GFN and the callers assuming "highest + 1" are now adjusted.
-
-Take the opportunity to use 1UL rather than 1 as page_order could
-theoritically big enough to overflow a 32-bit integer.
-
-Lastly, the documentation of the field max_guest_gfn to reflect how it
-is computed.
-
-This is part of XSA-301.
-
-Reported-by: Julien Grall <Julien.Grall@arm.com>
-Signed-off-by: Julien Grall <julien.grall@arm.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
----
- xen/arch/arm/p2m.c        | 6 +++---
- xen/include/asm-arm/p2m.h | 5 +----
- 2 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
-index d0045a8b28..8d20d27961 100644
---- a/xen/arch/arm/p2m.c
-+++ b/xen/arch/arm/p2m.c
-@@ -1041,7 +1041,7 @@ static int __p2m_set_entry(struct p2m_domain *p2m,
-         p2m_write_pte(entry, pte, p2m->clean_pte);
- 
-         p2m->max_mapped_gfn = gfn_max(p2m->max_mapped_gfn,
--                                      gfn_add(sgfn, 1 << page_order));
-+                                      gfn_add(sgfn, (1UL << page_order) - 1));
-         p2m->lowest_mapped_gfn = gfn_min(p2m->lowest_mapped_gfn, sgfn);
-     }
- 
-@@ -1572,7 +1572,7 @@ int relinquish_p2m_mapping(struct domain *d)
-     p2m_write_lock(p2m);
- 
-     start = p2m->lowest_mapped_gfn;
--    end = p2m->max_mapped_gfn;
-+    end = gfn_add(p2m->max_mapped_gfn, 1);
- 
-     for ( ; gfn_x(start) < gfn_x(end);
-           start = gfn_next_boundary(start, order) )
-@@ -1641,7 +1641,7 @@ int p2m_cache_flush_range(struct domain *d, gfn_t *pstart, gfn_t end)
-     p2m_read_lock(p2m);
- 
-     start = gfn_max(start, p2m->lowest_mapped_gfn);
--    end = gfn_min(end, p2m->max_mapped_gfn);
-+    end = gfn_min(end, gfn_add(p2m->max_mapped_gfn, 1));
- 
-     next_block_gfn = start;
- 
-diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
-index 89f82df380..5fdb6e8183 100644
---- a/xen/include/asm-arm/p2m.h
-+++ b/xen/include/asm-arm/p2m.h
-@@ -36,10 +36,7 @@ struct p2m_domain {
-     /* Current Translation Table Base Register for the p2m */
-     uint64_t vttbr;
- 
--    /*
--     * Highest guest frame that's ever been mapped in the p2m
--     * Only takes into account ram and foreign mapping
--     */
-+    /* Highest guest frame that's ever been mapped in the p2m */
-     gfn_t max_mapped_gfn;
- 
-     /*
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa301-master-3.patch b/system/xen/xsa/xsa301-master-3.patch
deleted file mode 100644
index 9f137b89f6..0000000000
--- a/system/xen/xsa/xsa301-master-3.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 060c2dd3b7c2674a019d94afb2b4ebf3663f6c6e Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@arm.com>
-Date: Tue, 15 Oct 2019 17:10:42 +0100
-Subject: [PATCH 3/3] xen/arm: p2m: Don't check the return of
- p2m_get_root_pointer() with BUG_ON()
-
-It turns out that the BUG_ON() was actually reachable with well-crafted
-hypercalls. The BUG_ON() is here to prevent catch logical error, so
-crashing Xen is a bit over the top.
-
-While all the holes should now be fixed, it would be better to downgrade
-the BUG_ON() to something less fatal to prevent any more DoS.
-
-The BUG_ON() in p2m_get_entry() is now replaced by ASSERT_UNREACHABLE()
-to catch mistake in debug build and return INVALID_MFN for production
-build. The interface also requires to set page_order to give an idea of
-the size of "hole". So 'level' is now set so we report a hole of size of
-the an entry of the root page-table. This stays inline with what happen
-when the GFN is higher than p2m->max_mapped_gfn.
-
-The BUG_ON() in p2m_resolve_translation_fault() is now replaced by
-ASSERT_UNREACHABLE() to catch mistake in debug build and just report a
-fault for producion build.
-
-This is part of XSA-301.
-
-Reported-by: Julien Grall <Julien.Grall@arm.com>
-Signed-off-by: Julien Grall <julien.grall@arm.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
----
- xen/arch/arm/p2m.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
-index 8d20d27961..ce59f2b503 100644
---- a/xen/arch/arm/p2m.c
-+++ b/xen/arch/arm/p2m.c
-@@ -395,7 +395,12 @@ mfn_t p2m_get_entry(struct p2m_domain *p2m, gfn_t gfn,
-      * the table should always be non-NULL because the gfn is below
-      * p2m->max_mapped_gfn and the root table pages are always present.
-      */
--    BUG_ON(table == NULL);
-+    if ( !table )
-+    {
-+        ASSERT_UNREACHABLE();
-+        level = P2M_ROOT_LEVEL;
-+        goto out;
-+    }
- 
-     for ( level = P2M_ROOT_LEVEL; level < 3; level++ )
-     {
-@@ -1196,7 +1201,11 @@ bool p2m_resolve_translation_fault(struct domain *d, gfn_t gfn)
-      * The table should always be non-NULL because the gfn is below
-      * p2m->max_mapped_gfn and the root table pages are always present.
-      */
--    BUG_ON(table == NULL);
-+    if ( !table )
-+    {
-+        ASSERT_UNREACHABLE();
-+        goto out;
-+    }
- 
-     /*
-      * Go down the page-tables until an entry has the valid bit unset or
--- 
-2.23.0
-
diff --git a/system/xen/xsa/xsa302-4.12-0001-IOMMU-add-missing-HVM-check.patch b/system/xen/xsa/xsa302-4.12-0001-IOMMU-add-missing-HVM-check.patch
deleted file mode 100644
index 5d52163406..0000000000
--- a/system/xen/xsa/xsa302-4.12-0001-IOMMU-add-missing-HVM-check.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0c9c0fbb356e3210cb77b3d738be50981b26058a Mon Sep 17 00:00:00 2001
-From: Jan Beulich <jbeulich@suse.com>
-Date: Wed, 2 Oct 2019 13:36:59 +0200
-Subject: [PATCH 1/2] IOMMU: add missing HVM check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix an unguarded d->arch.hvm access in assign_device().
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
-Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
-
-(cherry picked from commit 41fd1009cd7416b73d745a77c24b4e8d1a296fe6)
-Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
----
- xen/drivers/passthrough/pci.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
-index 8108ed5f9a..d7420bd8bf 100644
---- a/xen/drivers/passthrough/pci.c
-+++ b/xen/drivers/passthrough/pci.c
-@@ -1452,7 +1452,8 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)
- 
-     /* Prevent device assign if mem paging or mem sharing have been 
-      * enabled for this domain */
--    if ( unlikely(d->arch.hvm.mem_sharing_enabled ||
-+    if ( unlikely((is_hvm_domain(d) &&
-+                   d->arch.hvm.mem_sharing_enabled) ||
-                   vm_event_check_ring(d->vm_event_paging) ||
-                   p2m_get_hostp2m(d)->global_logdirty) )
-         return -EXDEV;
--- 
-2.11.0
-
diff --git a/system/xen/xsa/xsa302-4.12-0002-passthrough-quarantine-PCI-devices.patch b/system/xen/xsa/xsa302-4.12-0002-passthrough-quarantine-PCI-devices.patch
deleted file mode 100644
index 181ece3bb7..0000000000
--- a/system/xen/xsa/xsa302-4.12-0002-passthrough-quarantine-PCI-devices.patch
+++ /dev/null
@@ -1,499 +0,0 @@
-From 278d8e585a9f110a1af0bd92a9fc43733c9c7227 Mon Sep 17 00:00:00 2001
-From: Paul Durrant <paul.durrant@citrix.com>
-Date: Mon, 14 Oct 2019 17:52:59 +0100
-Subject: [PATCH 2/2] passthrough: quarantine PCI devices
-
-When a PCI device is assigned to an untrusted domain, it is possible for
-that domain to program the device to DMA to an arbitrary address. The
-IOMMU is used to protect the host from malicious DMA by making sure that
-the device addresses can only target memory assigned to the guest. However,
-when the guest domain is torn down the device is assigned back to dom0,
-thus allowing any in-flight DMA to potentially target critical host data.
-
-This patch introduces a 'quarantine' for PCI devices using dom_io. When
-the toolstack makes a device assignable (by binding it to pciback), it
-will now also assign it to DOMID_IO and the device will only be assigned
-back to dom0 when the device is made unassignable again. Whilst device is
-assignable it will only ever transfer between dom_io and guest domains.
-dom_io is actually only used as a sentinel domain for quarantining purposes;
-it is not configured with any IOMMU mappings. Assignment to dom_io simply
-means that the device's initiator (requestor) identifier is not present in
-the IOMMU's device table and thus any DMA transactions issued will be
-terminated with a fault condition.
-
-In addition, a fix to assignment handling is made for VT-d.  Failure
-during the assignment step should not lead to a device still being
-associated with its prior owner. Hand the device to DomIO temporarily,
-until the assignment step has completed successfully.  Remove the PI
-hooks from the source domain then earlier as well.
-
-Failure of the recovery reassign_device_ownership() may not go silent:
-There e.g. may still be left over RMRR mappings in the domain assignment
-to which has failed, and hence we can't allow that domain to continue
-executing.
-
-NOTE: This patch also includes one printk() cleanup; the
-      "XEN_DOMCTL_assign_device: " tag is dropped in iommu_do_pci_domctl(),
-      since similar printk()-s elsewhere also don't log such a tag.
-
-This is XSA-302.
-
-Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
-(cherry picked from commit ec99857f59f7f06236f11ca8b0b2303e5e745cc4)
----
- tools/libxl/libxl_pci.c                     | 25 +++++++++++-
- xen/arch/x86/mm.c                           |  2 +
- xen/common/domctl.c                         | 14 ++++++-
- xen/drivers/passthrough/amd/pci_amd_iommu.c | 10 ++++-
- xen/drivers/passthrough/iommu.c             |  9 +++++
- xen/drivers/passthrough/pci.c               | 59 ++++++++++++++++++++++-------
- xen/drivers/passthrough/vtd/iommu.c         | 40 ++++++++++++++++---
- xen/include/xen/pci.h                       |  3 ++
- 8 files changed, 138 insertions(+), 24 deletions(-)
-
-diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
-index 88c324ea23..d6a23fb5f8 100644
---- a/tools/libxl/libxl_pci.c
-+++ b/tools/libxl/libxl_pci.c
-@@ -754,6 +754,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
-                                             libxl_device_pci *pcidev,
-                                             int rebind)
- {
-+    libxl_ctx *ctx = libxl__gc_owner(gc);
-     unsigned dom, bus, dev, func;
-     char *spath, *driver_path = NULL;
-     int rc;
-@@ -779,7 +780,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
-     }
-     if ( rc ) {
-         LOG(WARN, PCI_BDF" already assigned to pciback", dom, bus, dev, func);
--        return 0;
-+        goto quarantine;
-     }
- 
-     /* Check to see if there's already a driver that we need to unbind from */
-@@ -810,6 +811,19 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
-         return ERROR_FAIL;
-     }
- 
-+quarantine:
-+    /*
-+     * DOMID_IO is just a sentinel domain, without any actual mappings,
-+     * so always pass XEN_DOMCTL_DEV_RDM_RELAXED to avoid assignment being
-+     * unnecessarily denied.
-+     */
-+    rc = xc_assign_device(ctx->xch, DOMID_IO, pcidev_encode_bdf(pcidev),
-+                          XEN_DOMCTL_DEV_RDM_RELAXED);
-+    if ( rc < 0 ) {
-+        LOG(ERROR, "failed to quarantine "PCI_BDF, dom, bus, dev, func);
-+        return ERROR_FAIL;
-+    }
-+
-     return 0;
- }
- 
-@@ -817,9 +831,18 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
-                                                libxl_device_pci *pcidev,
-                                                int rebind)
- {
-+    libxl_ctx *ctx = libxl__gc_owner(gc);
-     int rc;
-     char *driver_path;
- 
-+    /* De-quarantine */
-+    rc = xc_deassign_device(ctx->xch, DOMID_IO, pcidev_encode_bdf(pcidev));
-+    if ( rc < 0 ) {
-+        LOG(ERROR, "failed to de-quarantine "PCI_BDF, pcidev->domain, pcidev->bus,
-+            pcidev->dev, pcidev->func);
-+        return ERROR_FAIL;
-+    }
-+
-     /* Unbind from pciback */
-     if ( (rc=pciback_dev_is_assigned(gc, pcidev)) < 0 ) {
-         return ERROR_FAIL;
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 3557cd1178..11d753d8d2 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -295,9 +295,11 @@ void __init arch_init_memory(void)
-      * Initialise our DOMID_IO domain.
-      * This domain owns I/O pages that are within the range of the page_info
-      * array. Mappings occur at the priv of the caller.
-+     * Quarantined PCI devices will be associated with this domain.
-      */
-     dom_io = domain_create(DOMID_IO, NULL, false);
-     BUG_ON(IS_ERR(dom_io));
-+    INIT_LIST_HEAD(&dom_io->arch.pdev_list);
- 
-     /*
-      * Initialise our COW domain.
-diff --git a/xen/common/domctl.c b/xen/common/domctl.c
-index d08b6274e2..e3c4be2b48 100644
---- a/xen/common/domctl.c
-+++ b/xen/common/domctl.c
-@@ -391,6 +391,16 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
- 
-     switch ( op->cmd )
-     {
-+    case XEN_DOMCTL_assign_device:
-+    case XEN_DOMCTL_deassign_device:
-+        if ( op->domain == DOMID_IO )
-+        {
-+            d = dom_io;
-+            break;
-+        }
-+        else if ( op->domain == DOMID_INVALID )
-+            return -ESRCH;
-+        /* fall through */
-     case XEN_DOMCTL_test_assign_device:
-         if ( op->domain == DOMID_INVALID )
-         {
-@@ -412,7 +422,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
- 
-     if ( !domctl_lock_acquire() )
-     {
--        if ( d )
-+        if ( d && d != dom_io )
-             rcu_unlock_domain(d);
-         return hypercall_create_continuation(
-             __HYPERVISOR_domctl, "h", u_domctl);
-@@ -1074,7 +1084,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
-     domctl_lock_release();
- 
-  domctl_out_unlock_domonly:
--    if ( d )
-+    if ( d && d != dom_io )
-         rcu_unlock_domain(d);
- 
-     if ( copyback && __copy_to_guest(u_domctl, op, 1) )
-diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c
-index 33a3798f36..15c13e1163 100644
---- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
-+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
-@@ -120,6 +120,10 @@ static void amd_iommu_setup_domain_device(
-     u8 bus = pdev->bus;
-     const struct domain_iommu *hd = dom_iommu(domain);
- 
-+    /* dom_io is used as a sentinel for quarantined devices */
-+    if ( domain == dom_io )
-+        return;
-+
-     BUG_ON( !hd->arch.root_table || !hd->arch.paging_mode ||
-             !iommu->dev_table.buffer );
- 
-@@ -277,6 +281,10 @@ void amd_iommu_disable_domain_device(struct domain *domain,
-     int req_id;
-     u8 bus = pdev->bus;
- 
-+    /* dom_io is used as a sentinel for quarantined devices */
-+    if ( domain == dom_io )
-+        return;
-+
-     BUG_ON ( iommu->dev_table.buffer == NULL );
-     req_id = get_dma_requestor_id(iommu->seg, PCI_BDF2(bus, devfn));
-     dte = iommu->dev_table.buffer + (req_id * IOMMU_DEV_TABLE_ENTRY_SIZE);
-@@ -363,7 +371,7 @@ static int amd_iommu_assign_device(struct domain *d, u8 devfn,
-             ivrs_mappings[req_id].read_permission);
-     }
- 
--    return reassign_device(hardware_domain, d, devfn, pdev);
-+    return reassign_device(pdev->domain, d, devfn, pdev);
- }
- 
- static void deallocate_next_page_table(struct page_info *pg, int level)
-diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
-index a6697d58fb..2762e1342f 100644
---- a/xen/drivers/passthrough/iommu.c
-+++ b/xen/drivers/passthrough/iommu.c
-@@ -232,6 +232,9 @@ void iommu_teardown(struct domain *d)
- {
-     struct domain_iommu *hd = dom_iommu(d);
- 
-+    if ( d == dom_io )
-+        return;
-+
-     hd->status = IOMMU_STATUS_disabled;
-     hd->platform_ops->teardown(d);
-     tasklet_schedule(&iommu_pt_cleanup_tasklet);
-@@ -241,6 +244,9 @@ int iommu_construct(struct domain *d)
- {
-     struct domain_iommu *hd = dom_iommu(d);
- 
-+    if ( d == dom_io )
-+        return 0;
-+
-     if ( hd->status == IOMMU_STATUS_initialized )
-         return 0;
- 
-@@ -521,6 +527,9 @@ int __init iommu_setup(void)
-     printk("I/O virtualisation %sabled\n", iommu_enabled ? "en" : "dis");
-     if ( iommu_enabled )
-     {
-+        if ( iommu_domain_init(dom_io) )
-+            panic("Could not set up quarantine\n");
-+
-         printk(" - Dom0 mode: %s\n",
-                iommu_hwdom_passthrough ? "Passthrough" :
-                iommu_hwdom_strict ? "Strict" : "Relaxed");
-diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
-index d7420bd8bf..d66a8a1daf 100644
---- a/xen/drivers/passthrough/pci.c
-+++ b/xen/drivers/passthrough/pci.c
-@@ -1426,19 +1426,29 @@ static int iommu_remove_device(struct pci_dev *pdev)
-     return hd->platform_ops->remove_device(pdev->devfn, pci_to_dev(pdev));
- }
- 
--/*
-- * If the device isn't owned by the hardware domain, it means it already
-- * has been assigned to other domain, or it doesn't exist.
-- */
- static int device_assigned(u16 seg, u8 bus, u8 devfn)
- {
-     struct pci_dev *pdev;
-+    int rc = 0;
- 
-     pcidevs_lock();
--    pdev = pci_get_pdev_by_domain(hardware_domain, seg, bus, devfn);
-+
-+    pdev = pci_get_pdev(seg, bus, devfn);
-+
-+    if ( !pdev )
-+        rc = -ENODEV;
-+    /*
-+     * If the device exists and it is not owned by either the hardware
-+     * domain or dom_io then it must be assigned to a guest, or be
-+     * hidden (owned by dom_xen).
-+     */
-+    else if ( pdev->domain != hardware_domain &&
-+              pdev->domain != dom_io )
-+        rc = -EBUSY;
-+
-     pcidevs_unlock();
- 
--    return pdev ? 0 : -EBUSY;
-+    return rc;
- }
- 
- static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)
-@@ -1452,7 +1462,8 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)
- 
-     /* Prevent device assign if mem paging or mem sharing have been 
-      * enabled for this domain */
--    if ( unlikely((is_hvm_domain(d) &&
-+    if ( d != dom_io &&
-+         unlikely((is_hvm_domain(d) &&
-                    d->arch.hvm.mem_sharing_enabled) ||
-                   vm_event_check_ring(d->vm_event_paging) ||
-                   p2m_get_hostp2m(d)->global_logdirty) )
-@@ -1468,12 +1479,20 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)
-         return rc;
-     }
- 
--    pdev = pci_get_pdev_by_domain(hardware_domain, seg, bus, devfn);
-+    pdev = pci_get_pdev(seg, bus, devfn);
-+
-+    rc = -ENODEV;
-     if ( !pdev )
--    {
--        rc = pci_get_pdev(seg, bus, devfn) ? -EBUSY : -ENODEV;
-         goto done;
--    }
-+
-+    rc = 0;
-+    if ( d == pdev->domain )
-+        goto done;
-+
-+    rc = -EBUSY;
-+    if ( pdev->domain != hardware_domain &&
-+         pdev->domain != dom_io )
-+        goto done;
- 
-     if ( pdev->msix )
-         msixtbl_init(d);
-@@ -1496,6 +1515,10 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)
-     }
- 
-  done:
-+    /* The device is assigned to dom_io so mark it as quarantined */
-+    if ( !rc && d == dom_io )
-+        pdev->quarantine = true;
-+
-     if ( !has_arch_pdevs(d) && has_iommu_pt(d) )
-         iommu_teardown(d);
-     pcidevs_unlock();
-@@ -1508,6 +1531,7 @@ int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn)
- {
-     const struct domain_iommu *hd = dom_iommu(d);
-     struct pci_dev *pdev = NULL;
-+    struct domain *target;
-     int ret = 0;
- 
-     if ( !iommu_enabled || !hd->platform_ops )
-@@ -1518,12 +1542,16 @@ int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn)
-     if ( !pdev )
-         return -ENODEV;
- 
-+    /* De-assignment from dom_io should de-quarantine the device */
-+    target = (pdev->quarantine && pdev->domain != dom_io) ?
-+        dom_io : hardware_domain;
-+
-     while ( pdev->phantom_stride )
-     {
-         devfn += pdev->phantom_stride;
-         if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) )
-             break;
--        ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn,
-+        ret = hd->platform_ops->reassign_device(d, target, devfn,
-                                                 pci_to_dev(pdev));
-         if ( !ret )
-             continue;
-@@ -1534,7 +1562,7 @@ int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn)
-     }
- 
-     devfn = pdev->devfn;
--    ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn,
-+    ret = hd->platform_ops->reassign_device(d, target, devfn,
-                                             pci_to_dev(pdev));
-     if ( ret )
-     {
-@@ -1544,6 +1572,9 @@ int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn)
-         return ret;
-     }
- 
-+    if ( pdev->domain == hardware_domain  )
-+        pdev->quarantine = false;
-+
-     pdev->fault.count = 0;
- 
-     if ( !has_arch_pdevs(d) && has_iommu_pt(d) )
-@@ -1722,7 +1753,7 @@ int iommu_do_pci_domctl(
-             ret = hypercall_create_continuation(__HYPERVISOR_domctl,
-                                                 "h", u_domctl);
-         else if ( ret )
--            printk(XENLOG_G_ERR "XEN_DOMCTL_assign_device: "
-+            printk(XENLOG_G_ERR
-                    "assign %04x:%02x:%02x.%u to dom%d failed (%d)\n",
-                    seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
-                    d->domain_id, ret);
-diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
-index 1db1cd9f2d..a8d1baa064 100644
---- a/xen/drivers/passthrough/vtd/iommu.c
-+++ b/xen/drivers/passthrough/vtd/iommu.c
-@@ -1338,6 +1338,10 @@ int domain_context_mapping_one(
-     int agaw, rc, ret;
-     bool_t flush_dev_iotlb;
- 
-+    /* dom_io is used as a sentinel for quarantined devices */
-+    if ( domain == dom_io )
-+        return 0;
-+
-     ASSERT(pcidevs_locked());
-     spin_lock(&iommu->lock);
-     maddr = bus_to_context_maddr(iommu, bus);
-@@ -1573,6 +1577,10 @@ int domain_context_unmap_one(
-     int iommu_domid, rc, ret;
-     bool_t flush_dev_iotlb;
- 
-+    /* dom_io is used as a sentinel for quarantined devices */
-+    if ( domain == dom_io )
-+        return 0;
-+
-     ASSERT(pcidevs_locked());
-     spin_lock(&iommu->lock);
- 
-@@ -1705,6 +1713,10 @@ static int domain_context_unmap(struct domain *domain, u8 devfn,
-         goto out;
-     }
- 
-+    /* dom_io is used as a sentinel for quarantined devices */
-+    if ( domain == dom_io )
-+        goto out;
-+
-     /*
-      * if no other devices under the same iommu owned by this domain,
-      * clear iommu in iommu_bitmap and clear domain_id in domid_bitmp
-@@ -2441,6 +2453,15 @@ static int reassign_device_ownership(
-     if ( ret )
-         return ret;
- 
-+    if ( devfn == pdev->devfn )
-+    {
-+        list_move(&pdev->domain_list, &dom_io->arch.pdev_list);
-+        pdev->domain = dom_io;
-+    }
-+
-+    if ( !has_arch_pdevs(source) )
-+        vmx_pi_hooks_deassign(source);
-+
-     if ( !has_arch_pdevs(target) )
-         vmx_pi_hooks_assign(target);
- 
-@@ -2459,15 +2480,13 @@ static int reassign_device_ownership(
-         pdev->domain = target;
-     }
- 
--    if ( !has_arch_pdevs(source) )
--        vmx_pi_hooks_deassign(source);
--
-     return ret;
- }
- 
- static int intel_iommu_assign_device(
-     struct domain *d, u8 devfn, struct pci_dev *pdev, u32 flag)
- {
-+    struct domain *s = pdev->domain;
-     struct acpi_rmrr_unit *rmrr;
-     int ret = 0, i;
-     u16 bdf, seg;
-@@ -2510,8 +2529,8 @@ static int intel_iommu_assign_device(
-         }
-     }
- 
--    ret = reassign_device_ownership(hardware_domain, d, devfn, pdev);
--    if ( ret )
-+    ret = reassign_device_ownership(s, d, devfn, pdev);
-+    if ( ret || d == dom_io )
-         return ret;
- 
-     /* Setup rmrr identity mapping */
-@@ -2524,11 +2543,20 @@ static int intel_iommu_assign_device(
-             ret = rmrr_identity_mapping(d, 1, rmrr, flag);
-             if ( ret )
-             {
--                reassign_device_ownership(d, hardware_domain, devfn, pdev);
-+                int rc;
-+
-+                rc = reassign_device_ownership(d, s, devfn, pdev);
-                 printk(XENLOG_G_ERR VTDPREFIX
-                        " cannot map reserved region (%"PRIx64",%"PRIx64"] for Dom%d (%d)\n",
-                        rmrr->base_address, rmrr->end_address,
-                        d->domain_id, ret);
-+                if ( rc )
-+                {
-+                    printk(XENLOG_ERR VTDPREFIX
-+                           " failed to reclaim %04x:%02x:%02x.%u from %pd (%d)\n",
-+                           seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), d, rc);
-+                    domain_crash(d);
-+                }
-                 break;
-             }
-         }
-diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
-index 8b21e8dc84..a031fd6020 100644
---- a/xen/include/xen/pci.h
-+++ b/xen/include/xen/pci.h
-@@ -88,6 +88,9 @@ struct pci_dev {
- 
-     nodeid_t node; /* NUMA node */
- 
-+    /* Device to be quarantined, don't automatically re-assign to dom0 */
-+    bool quarantine;
-+
-     /* Device with errata, ignore the BARs. */
-     bool ignore_bars;
- 
--- 
-2.11.0
-
diff --git a/system/xen/xsa/xsa303-0001-xen-arm32-entry-Split-__DEFINE_ENTRY_TRAP-in-two.patch b/system/xen/xsa/xsa303-0001-xen-arm32-entry-Split-__DEFINE_ENTRY_TRAP-in-two.patch
deleted file mode 100644
index afb1096c1d..0000000000
--- a/system/xen/xsa/xsa303-0001-xen-arm32-entry-Split-__DEFINE_ENTRY_TRAP-in-two.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From c8cb33fa64c9ccbfa2a494a9dad2e0a763c09176 Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@arm.com>
-Date: Tue, 1 Oct 2019 13:07:53 +0100
-Subject: [PATCH 1/4] xen/arm32: entry: Split __DEFINE_ENTRY_TRAP in two
-
-The preprocessing macro __DEFINE_ENTRY_TRAP is used to generate trap
-entry function. While the macro is fairly small today, follow-up patches
-will increase the size signicantly.
-
-In general, assembly macros are more readable as they allow you to name
-parameters and avoid '\'. So the actual implementation of the trap is
-now switched to an assembly macro.
-
-This is part of XSA-303.
-
-Reported-by: Julien Grall <Julien.Grall@arm.com>
-Signed-off-by: Julien Grall <julien.grall@arm.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-Reviewed-by: Andre Przywara <andre.przywara@arm.com>
----
- xen/arch/arm/arm32/entry.S | 34 +++++++++++++++++++---------------
- 1 file changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S
-index 0b4cd19abd..4a762e04f1 100644
---- a/xen/arch/arm/arm32/entry.S
-+++ b/xen/arch/arm/arm32/entry.S
-@@ -126,24 +126,28 @@ abort_guest_exit_end:
- skip_check:
-         mov pc, lr
- 
--/*
-- * Macro to define trap entry. The iflags corresponds to the list of
-- * interrupts (Asynchronous Abort, IRQ, FIQ) to unmask.
-- */
-+        /*
-+         * Macro to define trap entry. The iflags corresponds to the list of
-+         * interrupts (Asynchronous Abort, IRQ, FIQ) to unmask.
-+         */
-+        .macro vector trap, iflags
-+        SAVE_ALL
-+        cpsie   \iflags
-+        adr     lr, return_from_trap
-+        mov     r0, sp
-+        /*
-+         * Save the stack pointer in r11. It will be restored after the
-+         * trap has been handled (see return_from_trap).
-+         */
-+        mov     r11, sp
-+        bic     sp, #7      /* Align the stack pointer (noop on guest trap) */
-+        b       do_trap_\trap
-+        .endm
-+
- #define __DEFINE_TRAP_ENTRY(trap, iflags)                               \
-         ALIGN;                                                          \
- trap_##trap:                                                            \
--        SAVE_ALL;                                                       \
--        cpsie iflags;                                                   \
--        adr lr, return_from_trap;                                       \
--        mov r0, sp;                                                     \
--        /*                                                              \
--         * Save the stack pointer in r11. It will be restored after the \
--         * trap has been handled (see return_from_trap).                \
--         */                                                             \
--        mov r11, sp;                                                    \
--        bic sp, #7; /* Align the stack pointer (noop on guest trap) */  \
--        b do_trap_##trap
-+        vector trap, iflags
- 
- /* Trap handler which unmask IRQ/Abort, keep FIQ masked */
- #define DEFINE_TRAP_ENTRY(trap) __DEFINE_TRAP_ENTRY(trap, ai)
--- 
-2.11.0
-
diff --git a/system/xen/xsa/xsa303-0002-xen-arm32-entry-Fold-the-macro-SAVE_ALL-in-the-macro.patch b/system/xen/xsa/xsa303-0002-xen-arm32-entry-Fold-the-macro-SAVE_ALL-in-the-macro.patch
deleted file mode 100644
index 35f9c0475e..0000000000
--- a/system/xen/xsa/xsa303-0002-xen-arm32-entry-Fold-the-macro-SAVE_ALL-in-the-macro.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From be7379207c83fa74f8a6c22a8ea213f02714776f Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@arm.com>
-Date: Tue, 1 Oct 2019 13:15:48 +0100
-Subject: [PATCH 2/4] xen/arm32: entry: Fold the macro SAVE_ALL in the macro
- vector
-
-Follow-up rework will require the macro vector to distinguish between
-a trap from a guest vs while in the hypervisor.
-
-The macro SAVE_ALL already has code to distinguish between the two and
-it is only called by the vector macro. So fold the former into the
-latter. This will help to avoid duplicating the check.
-
-This is part of XSA-303.
-
-Reported-by: Julien Grall <Julien.Grall@arm.com>
-Signed-off-by: Julien Grall <julien.grall@arm.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-Reviewed-by: Andre Przywara <andre.przywara@arm.com>
----
- xen/arch/arm/arm32/entry.S | 46 +++++++++++++++++++++++-----------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S
-index 4a762e04f1..150cbc0b4b 100644
---- a/xen/arch/arm/arm32/entry.S
-+++ b/xen/arch/arm/arm32/entry.S
-@@ -13,27 +13,6 @@
- #define RESTORE_BANKED(mode) \
-         RESTORE_ONE_BANKED(SP_##mode) ; RESTORE_ONE_BANKED(LR_##mode) ; RESTORE_ONE_BANKED(SPSR_##mode)
- 
--#define SAVE_ALL                                                        \
--        sub sp, #(UREGS_SP_usr - UREGS_sp); /* SP, LR, SPSR, PC */      \
--        push {r0-r12}; /* Save R0-R12 */                                \
--                                                                        \
--        mrs r11, ELR_hyp;               /* ELR_hyp is return address. */\
--        str r11, [sp, #UREGS_pc];                                       \
--                                                                        \
--        str lr, [sp, #UREGS_lr];                                        \
--                                                                        \
--        add r11, sp, #UREGS_kernel_sizeof+4;                            \
--        str r11, [sp, #UREGS_sp];                                       \
--                                                                        \
--        mrc CP32(r11, HSR);             /* Save exception syndrome */   \
--        str r11, [sp, #UREGS_hsr];                                      \
--                                                                        \
--        mrs r11, SPSR_hyp;                                              \
--        str r11, [sp, #UREGS_cpsr];                                     \
--        and r11, #PSR_MODE_MASK;                                        \
--        cmp r11, #PSR_MODE_HYP;                                         \
--        blne save_guest_regs
--
- save_guest_regs:
- #ifdef CONFIG_ARM32_HARDEN_BRANCH_PREDICTOR
-         /*
-@@ -52,7 +31,7 @@ save_guest_regs:
-         ldr r11, =0xffffffff  /* Clobber SP which is only valid for hypervisor frames. */
-         str r11, [sp, #UREGS_sp]
-         SAVE_ONE_BANKED(SP_usr)
--        /* LR_usr is the same physical register as lr and is saved in SAVE_ALL */
-+        /* LR_usr is the same physical register as lr and is saved by the caller */
-         SAVE_BANKED(svc)
-         SAVE_BANKED(abt)
-         SAVE_BANKED(und)
-@@ -131,7 +110,28 @@ skip_check:
-          * interrupts (Asynchronous Abort, IRQ, FIQ) to unmask.
-          */
-         .macro vector trap, iflags
--        SAVE_ALL
-+        /* Save registers in the stack */
-+        sub     sp, #(UREGS_SP_usr - UREGS_sp) /* SP, LR, SPSR, PC */
-+        push    {r0-r12}                       /* Save R0-R12 */
-+        mrs     r11, ELR_hyp                   /* ELR_hyp is return address */
-+        str     r11, [sp, #UREGS_pc]
-+
-+        str     lr, [sp, #UREGS_lr]
-+
-+        add     r11, sp, #(UREGS_kernel_sizeof + 4)
-+
-+        str     r11, [sp, #UREGS_sp]
-+
-+        mrc     CP32(r11, HSR)                 /* Save exception syndrome */
-+        str     r11, [sp, #UREGS_hsr]
-+
-+        mrs     r11, SPSR_hyp
-+        str     r11, [sp, #UREGS_cpsr]
-+        and     r11, #PSR_MODE_MASK
-+        cmp     r11, #PSR_MODE_HYP
-+        blne    save_guest_regs
-+
-+        /* We are ready to handle the trap, setup the registers and jump. */
-         cpsie   \iflags
-         adr     lr, return_from_trap
-         mov     r0, sp
--- 
-2.11.0
-
diff --git a/system/xen/xsa/xsa303-0003-xen-arm32-Don-t-blindly-unmask-interrupts-on-trap-wi.patch b/system/xen/xsa/xsa303-0003-xen-arm32-Don-t-blindly-unmask-interrupts-on-trap-wi.patch
deleted file mode 100644
index 5168452148..0000000000
--- a/system/xen/xsa/xsa303-0003-xen-arm32-Don-t-blindly-unmask-interrupts-on-trap-wi.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From 098fe877967870ffda2dfd9629a5fd272f6aacdc Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@arm.com>
-Date: Fri, 11 Oct 2019 17:49:28 +0100
-Subject: [PATCH 3/4] xen/arm32: Don't blindly unmask interrupts on trap
- without a change of level
-
-Exception vectors will unmask interrupts regardless the state of them in
-the interrupted context.
-
-One of the consequences is IRQ will be unmasked when receiving an
-undefined instruction exception (used by WARN*) from the hypervisor.
-This could result to unexpected behavior such as deadlock (if a lock was
-shared with interrupts).
-
-In a nutshell, interrupts should only be unmasked when it is safe to do.
-Xen only unmask IRQ and Abort interrupts, so the logic can stay simple.
-
-As vectors exceptions may be shared between guest and hypervisor, we now
-need to have a different policy for the interrupts.
-
-On exception from hypervisor, each vector will select the list of
-interrupts to inherit from the interrupted context. Any interrupts not
-listed will be kept masked.
-
-On exception from the guest, the Abort and IRQ will be unmasked
-depending on the exact vector.
-
-The interrupts will be kept unmasked when the vector cannot used by
-either guest or hypervisor.
-
-Note that each vector is not anymore preceded by ALIGN. This is fine
-because the alignment is already bigger than what we need.
-
-This is part of XSA-303.
-
-Reported-by: Julien Grall <Julien.Grall@arm.com>
-Signed-off-by: Julien Grall <julien.grall@arm.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-Reviewed-by: Andre Przywara <andre.przywara@arm.com>
----
- xen/arch/arm/arm32/entry.S | 138 +++++++++++++++++++++++++++++++++++----------
- 1 file changed, 109 insertions(+), 29 deletions(-)
-
-diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S
-index 150cbc0b4b..ec90cca093 100644
---- a/xen/arch/arm/arm32/entry.S
-+++ b/xen/arch/arm/arm32/entry.S
-@@ -4,6 +4,17 @@
- #include <asm/alternative.h>
- #include <public/xen.h>
- 
-+/*
-+ * Short-hands to defined the interrupts (A, I, F)
-+ *
-+ * _ means the interrupt state will not change
-+ * X means the state of interrupt X will change
-+ *
-+ * To be used with msr cpsr_* only
-+ */
-+#define IFLAGS_AIF      PSR_ABT_MASK | PSR_IRQ_MASK | PSR_FIQ_MASK
-+#define IFLAGS_A_F      PSR_ABT_MASK | PSR_FIQ_MASK
-+
- #define SAVE_ONE_BANKED(reg)    mrs r11, reg; str r11, [sp, #UREGS_##reg]
- #define RESTORE_ONE_BANKED(reg) ldr r11, [sp, #UREGS_##reg]; msr reg, r11
- 
-@@ -106,10 +117,18 @@ skip_check:
-         mov pc, lr
- 
-         /*
--         * Macro to define trap entry. The iflags corresponds to the list of
--         * interrupts (Asynchronous Abort, IRQ, FIQ) to unmask.
-+         * Macro to define a trap entry.
-+         *
-+         *  @guest_iflags: Optional list of interrupts to unmask when
-+         *      entering from guest context. As this is used with cpsie,
-+         *      the letter (a, i, f) should be used.
-+         *
-+         *  @hyp_iflags: Optional list of interrupts to inherit when
-+         *      entering from hypervisor context. Any interrupts not
-+         *      listed will be kept unchanged. As this is used with cpsr_*,
-+         *      IFLAGS_* short-hands should be used.
-          */
--        .macro vector trap, iflags
-+        .macro vector trap, guest_iflags=n, hyp_iflags=0
-         /* Save registers in the stack */
-         sub     sp, #(UREGS_SP_usr - UREGS_sp) /* SP, LR, SPSR, PC */
-         push    {r0-r12}                       /* Save R0-R12 */
-@@ -127,12 +146,39 @@ skip_check:
- 
-         mrs     r11, SPSR_hyp
-         str     r11, [sp, #UREGS_cpsr]
--        and     r11, #PSR_MODE_MASK
--        cmp     r11, #PSR_MODE_HYP
--        blne    save_guest_regs
- 
-+        /*
-+         * We need to distinguish whether we came from guest or
-+         * hypervisor context.
-+         */
-+        and     r0, r11, #PSR_MODE_MASK
-+        cmp     r0, #PSR_MODE_HYP
-+
-+        bne     1f
-+        /*
-+         * Trap from the hypervisor
-+         *
-+         * Inherit the state of the interrupts from the hypervisor
-+         * context. For that we need to use SPSR (stored in r11) and
-+         * modify CPSR accordingly.
-+         *
-+         * CPSR = (CPSR & ~hyp_iflags) | (SPSR & hyp_iflags)
-+         */
-+        mrs     r10, cpsr
-+        bic     r10, r10, #\hyp_iflags
-+        and     r11, r11, #\hyp_iflags
-+        orr     r10, r10, r11
-+        msr     cpsr_cx, r10
-+        b       2f
-+
-+1:
-+        /* Trap from the guest */
-+        bl      save_guest_regs
-+        .if     \guest_iflags != n
-+        cpsie   \guest_iflags
-+        .endif
-+2:
-         /* We are ready to handle the trap, setup the registers and jump. */
--        cpsie   \iflags
-         adr     lr, return_from_trap
-         mov     r0, sp
-         /*
-@@ -144,20 +190,6 @@ skip_check:
-         b       do_trap_\trap
-         .endm
- 
--#define __DEFINE_TRAP_ENTRY(trap, iflags)                               \
--        ALIGN;                                                          \
--trap_##trap:                                                            \
--        vector trap, iflags
--
--/* Trap handler which unmask IRQ/Abort, keep FIQ masked */
--#define DEFINE_TRAP_ENTRY(trap) __DEFINE_TRAP_ENTRY(trap, ai)
--
--/* Trap handler which unmask Abort, keep IRQ/FIQ masked */
--#define DEFINE_TRAP_ENTRY_NOIRQ(trap) __DEFINE_TRAP_ENTRY(trap, a)
--
--/* Trap handler which unmask IRQ, keep Abort/FIQ masked */
--#define DEFINE_TRAP_ENTRY_NOABORT(trap) __DEFINE_TRAP_ENTRY(trap, i)
--
-         .align 5
- GLOBAL(hyp_traps_vector)
-         b trap_reset                    /* 0x00 - Reset */
-@@ -228,14 +260,62 @@ decode_vectors:
- 
- #endif /* CONFIG_HARDEN_BRANCH_PREDICTOR */
- 
--DEFINE_TRAP_ENTRY(reset)
--DEFINE_TRAP_ENTRY(undefined_instruction)
--DEFINE_TRAP_ENTRY(hypervisor_call)
--DEFINE_TRAP_ENTRY(prefetch_abort)
--DEFINE_TRAP_ENTRY(guest_sync)
--DEFINE_TRAP_ENTRY_NOIRQ(irq)
--DEFINE_TRAP_ENTRY_NOIRQ(fiq)
--DEFINE_TRAP_ENTRY_NOABORT(data_abort)
-+/* Vector not used by the Hypervisor. */
-+trap_reset:
-+        vector reset
-+
-+/*
-+ * Vector only used by the Hypervisor.
-+ *
-+ * While the exception can be executed with all the interrupts (e.g.
-+ * IRQ) unmasked, the interrupted context may have purposefully masked
-+ * some of them. So we want to inherit the state from the interrupted
-+ * context.
-+ */
-+trap_undefined_instruction:
-+        vector undefined_instruction, hyp_iflags=IFLAGS_AIF
-+
-+/* We should never reach this trap */
-+trap_hypervisor_call:
-+        vector hypervisor_call
-+
-+/*
-+ * Vector only used by the hypervisor.
-+ *
-+ * While the exception can be executed with all the interrupts (e.g.
-+ * IRQ) unmasked, the interrupted context may have purposefully masked
-+ * some of them. So we want to inherit the state from the interrupted
-+ * context.
-+ */
-+trap_prefetch_abort:
-+       vector prefetch_abort, hyp_iflags=IFLAGS_AIF
-+
-+/*
-+ * Vector only used by the hypervisor.
-+ *
-+ * Data Abort should be rare and most likely fatal. It is best to not
-+ * unmask any interrupts to limit the amount of code that can run before
-+ * the Data Abort is treated.
-+ */
-+trap_data_abort:
-+        vector data_abort
-+
-+/* Vector only used by the guest. We can unmask Abort/IRQ. */
-+trap_guest_sync:
-+        vector guest_sync, guest_iflags=ai
-+
-+
-+/* Vector used by the hypervisor and the guest. */
-+trap_irq:
-+        vector irq, guest_iflags=a, hyp_iflags=IFLAGS_A_F
-+
-+/*
-+ * Vector used by the hypervisor and the guest.
-+ *
-+ * FIQ are not meant to happen, so we don't unmask any interrupts.
-+ */
-+trap_fiq:
-+        vector fiq
- 
- return_from_trap:
-         /*
--- 
-2.11.0
-
diff --git a/system/xen/xsa/xsa303-0004-xen-arm64-Don-t-blindly-unmask-interrupts-on-trap-wi.patch b/system/xen/xsa/xsa303-0004-xen-arm64-Don-t-blindly-unmask-interrupts-on-trap-wi.patch
deleted file mode 100644
index 106cbf98f1..0000000000
--- a/system/xen/xsa/xsa303-0004-xen-arm64-Don-t-blindly-unmask-interrupts-on-trap-wi.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From c6d290ce157a044dec417fdda8db71e41a37d744 Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@arm.com>
-Date: Mon, 7 Oct 2019 18:10:56 +0100
-Subject: [PATCH 4/4] xen/arm64: Don't blindly unmask interrupts on trap
- without a change of level
-
-Some of the traps without a change of the level (i.e. hypervisor ->
-hypervisor) will unmask interrupts regardless the state of them in the
-interrupted context.
-
-One of the consequences is IRQ will be unmasked when receiving a
-synchronous exception (used by WARN*()). This could result to unexpected
-behavior such as deadlock (if a lock was shared with interrupts).
-
-In a nutshell, interrupts should only be unmasked when it is safe to
-do. Xen only unmask IRQ and Abort interrupts, so the logic can stay
-simple:
-    - hyp_error: All the interrupts are now kept masked. SError should
-      be pretty rare and if ever happen then we most likely want to
-      avoid any other interrupts to be generated. The potential main
-      "caller" is during virtual SError synchronization on the exit
-      path from the guest (see check_pending_vserror).
-
-    - hyp_sync: The interrupts state is inherited from the interrupted
-      context.
-
-    - hyp_irq: All the interrupts but IRQ state are inherited from the
-      interrupted context. IRQ is kept masked.
-
-This is part of XSA-303.
-
-Reported-by: Julien Grall <Julien.Grall@arm.com>
-Signed-off-by: Julien Grall <julien.grall@arm.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-Reviewed-by: Andre Przywara <andre.przywara@arm.com>
----
- xen/arch/arm/arm64/entry.S | 47 ++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 43 insertions(+), 4 deletions(-)
-
-diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S
-index 2d9a2713a1..3e41ba65b6 100644
---- a/xen/arch/arm/arm64/entry.S
-+++ b/xen/arch/arm/arm64/entry.S
-@@ -188,24 +188,63 @@ hyp_error_invalid:
-         entry   hyp=1
-         invalid BAD_ERROR
- 
-+/*
-+ * SError received while running in the hypervisor mode.
-+ *
-+ * Technically, we could unmask the IRQ if it were unmasked in the
-+ * interrupted context. However, this require to check the PSTATE. For
-+ * simplicity, as SError should be rare and potentially fatal,
-+ * all interrupts are kept masked.
-+ */
- hyp_error:
-         entry   hyp=1
--        msr     daifclr, #2
-         mov     x0, sp
-         bl      do_trap_hyp_serror
-         exit    hyp=1
- 
--/* Traps taken in Current EL with SP_ELx */
-+/*
-+ * Synchronous exception received while running in the hypervisor mode.
-+ *
-+ * While the exception could be executed with all the interrupts (e.g.
-+ * IRQ) unmasked, the interrupted context may have purposefully masked
-+ * some of them. So we want to inherit the state from the interrupted
-+ * context.
-+ */
- hyp_sync:
-         entry   hyp=1
--        msr     daifclr, #6
-+
-+        /* Inherit interrupts */
-+        mrs     x0, SPSR_el2
-+        and     x0, x0, #(PSR_DBG_MASK | PSR_ABT_MASK | PSR_IRQ_MASK | PSR_FIQ_MASK)
-+        msr     daif, x0
-+
-         mov     x0, sp
-         bl      do_trap_hyp_sync
-         exit    hyp=1
- 
-+/*
-+ * IRQ received while running in the hypervisor mode.
-+ *
-+ * While the exception could be executed with all the interrupts but IRQ
-+ * unmasked, the interrupted context may have purposefully masked some
-+ * of them. So we want to inherit the state from the interrupt context
-+ * and keep IRQ masked.
-+ *
-+ * XXX: We may want to consider an ordering between interrupts (e.g. if
-+ * SError are masked, then IRQ should be masked too). However, this
-+ * would require some rework in some paths (e.g. panic, livepatch) to
-+ * ensure the ordering is enforced everywhere.
-+ */
- hyp_irq:
-         entry   hyp=1
--        msr     daifclr, #4
-+
-+        /* Inherit D, A, F interrupts and keep I masked */
-+        mrs     x0, SPSR_el2
-+        mov     x1, #(PSR_DBG_MASK | PSR_ABT_MASK | PSR_FIQ_MASK)
-+        and     x0, x0, x1
-+        orr     x0, x0, #PSR_IRQ_MASK
-+        msr     daif, x0
-+
-         mov     x0, sp
-         bl      do_trap_irq
-         exit    hyp=1
--- 
-2.11.0
-
diff --git a/system/xen/xsa/xsa304-4.12-1.patch b/system/xen/xsa/xsa304-4.12-1.patch
deleted file mode 100644
index c2ed2c2ced..0000000000
--- a/system/xen/xsa/xsa304-4.12-1.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/vtd: Hide superpage support for SandyBridge IOMMUs
-
-Something causes SandyBridge IOMMUs to choke when sharing EPT pagetables, and
-an EPT superpage gets shattered.  The root cause is still under investigation,
-but the end result is unusable in combination with CVE-2018-12207 protections.
-
-This is part of XSA-304 / CVE-2018-12207
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
-diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h
-index 16eada9fa2..a71c8b0f84 100644
---- a/xen/drivers/passthrough/vtd/extern.h
-+++ b/xen/drivers/passthrough/vtd/extern.h
-@@ -97,6 +97,8 @@ void vtd_ops_postamble_quirk(struct iommu* iommu);
- int __must_check me_wifi_quirk(struct domain *domain,
-                                u8 bus, u8 devfn, int map);
- void pci_vtd_quirk(const struct pci_dev *);
-+void quirk_iommu_caps(struct iommu *iommu);
-+
- bool_t platform_supports_intremap(void);
- bool_t platform_supports_x2apic(void);
- 
-diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
-index b3664ecbe0..5d34f75306 100644
---- a/xen/drivers/passthrough/vtd/iommu.c
-+++ b/xen/drivers/passthrough/vtd/iommu.c
-@@ -1215,6 +1215,8 @@ int __init iommu_alloc(struct acpi_drhd_unit *drhd)
-     if ( !(iommu->cap + 1) || !(iommu->ecap + 1) )
-         return -ENODEV;
- 
-+    quirk_iommu_caps(iommu);
-+
-     if ( cap_fault_reg_offset(iommu->cap) +
-          cap_num_fault_regs(iommu->cap) * PRIMARY_FAULT_REG_LEN >= PAGE_SIZE ||
-          ecap_iotlb_offset(iommu->ecap) >= PAGE_SIZE )
-diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c
-index d6db862678..b02688e316 100644
---- a/xen/drivers/passthrough/vtd/quirks.c
-+++ b/xen/drivers/passthrough/vtd/quirks.c
-@@ -540,3 +540,28 @@ void pci_vtd_quirk(const struct pci_dev *pdev)
-         break;
-     }
- }
-+
-+void __init quirk_iommu_caps(struct iommu *iommu)
-+{
-+    /*
-+     * IOMMU Quirks:
-+     *
-+     * SandyBridge IOMMUs claim support for 2M and 1G superpages, but don't
-+     * implement superpages internally.
-+     *
-+     * There are issues changing the walk length under in-flight DMA, which
-+     * has manifested as incompatibility between EPT/IOMMU sharing and the
-+     * workaround for CVE-2018-12207 / XSA-304.  Hide the superpages
-+     * capabilities in the IOMMU, which will prevent Xen from sharing the EPT
-+     * and IOMMU pagetables.
-+     *
-+     * Detection of SandyBridge unfortunately has to be done by processor
-+     * model because the client parts don't expose their IOMMUs as PCI devices
-+     * we could match with a Device ID.
-+     */
-+    if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&
-+         boot_cpu_data.x86 == 6 &&
-+         (boot_cpu_data.x86_model == 0x2a ||
-+          boot_cpu_data.x86_model == 0x2d) )
-+        iommu->cap &= ~(0xful << 34);
-+}
diff --git a/system/xen/xsa/xsa304-4.12-2.patch b/system/xen/xsa/xsa304-4.12-2.patch
deleted file mode 100644
index 66d4301838..0000000000
--- a/system/xen/xsa/xsa304-4.12-2.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/vtx: Disable executable EPT superpages to work around
- CVE-2018-12207
-
-CVE-2018-12207 covers a set of errata on various Intel processors, whereby a
-machine check exception can be generated in a corner case when an executable
-mapping changes size or cacheability without TLB invalidation.  HVM guest
-kernels can trigger this to DoS the host.
-
-To mitigate, in affected hardware, all EPT superpages are marked NX.  When an
-instruction fetch violation is observed against the superpage, the superpage
-is shattered to 4k and has execute permissions restored.  This prevents the
-guest kernel from being able to create the necessary preconditions in the iTLB
-to exploit the vulnerability.
-
-This does come with a workload-dependent performance overhead, caused by
-increased TLB pressure.  Performance can be restored, if guest kernels are
-trusted not to mount an attack, by specifying ept=exec-sp on the command line.
-
-This is part of XSA-304 / CVE-2018-12207
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Acked-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
-diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
-index 85081fdc94..e283017015 100644
---- a/docs/misc/xen-command-line.pandoc
-+++ b/docs/misc/xen-command-line.pandoc
-@@ -895,7 +895,7 @@ Controls for interacting with the system Extended Firmware Interface.
-     uncacheable.
- 
- ### ept
--> `= List of [ ad=<bool>, pml=<bool> ]`
-+> `= List of [ ad=<bool>, pml=<bool>, exec-sp=<bool> ]`
- 
- > Applicability: Intel
- 
-@@ -926,6 +926,16 @@ introduced with the Nehalem architecture.
-     disable PML.  `pml=0` can be used to prevent the use of PML on otherwise
-     capable hardware.
- 
-+*   The `exec-sp` boolean controls whether EPT superpages with execute
-+    permissions are permitted.  In general this is good for performance.
-+
-+    However, on processors vulnerable CVE-2018-12207, HVM guest kernels can
-+    use executable superpages to crash the host.  By default, executable
-+    superpages are disabled on affected hardware.
-+
-+    If HVM guest kernels are trusted not to mount a DoS against the system,
-+    this option can enabled to regain performance.
-+
- ### extra_guest_irqs
- > `= [<domU number>][,<dom0 number>]`
- 
-diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
-index 2089a77270..84191d4e4b 100644
---- a/xen/arch/x86/hvm/hvm.c
-+++ b/xen/arch/x86/hvm/hvm.c
-@@ -1814,6 +1814,24 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla,
-             break;
-         }
- 
-+        /*
-+         * Workaround for XSA-304 / CVE-2018-12207.  If we take an execution
-+         * fault against a non-executable superpage, shatter it to regain
-+         * execute permissions.
-+         */
-+        if ( page_order > 0 && npfec.insn_fetch && npfec.present && !violation )
-+        {
-+            int res = p2m_set_entry(p2m, _gfn(gfn), mfn, PAGE_ORDER_4K,
-+                                    p2mt, p2ma);
-+
-+            if ( res )
-+                printk(XENLOG_ERR "Failed to shatter gfn %"PRI_gfn": %d\n",
-+                       gfn, res);
-+
-+            rc = !res;
-+            goto out_put_gfn;
-+        }
-+
-         if ( violation )
-         {
-             /* Should #VE be emulated for this fault? */
-diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
-index 56519fee84..ec5ab860ad 100644
---- a/xen/arch/x86/hvm/vmx/vmcs.c
-+++ b/xen/arch/x86/hvm/vmx/vmcs.c
-@@ -67,6 +67,7 @@ integer_param("ple_window", ple_window);
- 
- static bool __read_mostly opt_ept_pml = true;
- static s8 __read_mostly opt_ept_ad = -1;
-+int8_t __read_mostly opt_ept_exec_sp = -1;
- 
- static int __init parse_ept_param(const char *s)
- {
-@@ -82,6 +83,8 @@ static int __init parse_ept_param(const char *s)
-             opt_ept_ad = val;
-         else if ( (val = parse_boolean("pml", s, ss)) >= 0 )
-             opt_ept_pml = val;
-+        else if ( (val = parse_boolean("exec-sp", s, ss)) >= 0 )
-+            opt_ept_exec_sp = val;
-         else
-             rc = -EINVAL;
- 
-diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
-index 26b7ddb5fe..28cba8ec28 100644
---- a/xen/arch/x86/hvm/vmx/vmx.c
-+++ b/xen/arch/x86/hvm/vmx/vmx.c
-@@ -2445,6 +2445,102 @@ static void pi_notification_interrupt(struct cpu_user_regs *regs)
- static void __init lbr_tsx_fixup_check(void);
- static void __init bdw_erratum_bdf14_fixup_check(void);
- 
-+/*
-+ * Calculate whether the CPU is vulnerable to Instruction Fetch page
-+ * size-change MCEs.
-+ */
-+static bool __init has_if_pschange_mc(void)
-+{
-+    uint64_t caps = 0;
-+
-+    /*
-+     * If we are virtualised, there is nothing we can do.  Our EPT tables are
-+     * shadowed by our hypervisor, and not walked by hardware.
-+     */
-+    if ( cpu_has_hypervisor )
-+        return false;
-+
-+    if ( boot_cpu_has(X86_FEATURE_ARCH_CAPS) )
-+        rdmsrl(MSR_ARCH_CAPABILITIES, caps);
-+
-+    if ( caps & ARCH_CAPS_IF_PSCHANGE_MC_NO )
-+        return false;
-+
-+    /*
-+     * IF_PSCHANGE_MC is only known to affect Intel Family 6 processors at
-+     * this time.
-+     */
-+    if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ||
-+         boot_cpu_data.x86 != 6 )
-+        return false;
-+
-+    switch ( boot_cpu_data.x86_model )
-+    {
-+        /*
-+         * Core processors since at least Nehalem are vulnerable.
-+         */
-+    case 0x1f: /* Auburndale / Havendale */
-+    case 0x1e: /* Nehalem */
-+    case 0x1a: /* Nehalem EP */
-+    case 0x2e: /* Nehalem EX */
-+    case 0x25: /* Westmere */
-+    case 0x2c: /* Westmere EP */
-+    case 0x2f: /* Westmere EX */
-+    case 0x2a: /* SandyBridge */
-+    case 0x2d: /* SandyBridge EP/EX */
-+    case 0x3a: /* IvyBridge */
-+    case 0x3e: /* IvyBridge EP/EX */
-+    case 0x3c: /* Haswell */
-+    case 0x3f: /* Haswell EX/EP */
-+    case 0x45: /* Haswell D */
-+    case 0x46: /* Haswell H */
-+    case 0x3d: /* Broadwell */
-+    case 0x47: /* Broadwell H */
-+    case 0x4f: /* Broadwell EP/EX */
-+    case 0x56: /* Broadwell D */
-+    case 0x4e: /* Skylake M */
-+    case 0x5e: /* Skylake D */
-+    case 0x55: /* Skylake-X / Cascade Lake */
-+    case 0x8e: /* Kaby / Coffee / Whiskey Lake M */
-+    case 0x9e: /* Kaby / Coffee / Whiskey Lake D */
-+        return true;
-+
-+        /*
-+         * Atom processors are not vulnerable.
-+         */
-+    case 0x1c: /* Pineview */
-+    case 0x26: /* Lincroft */
-+    case 0x27: /* Penwell */
-+    case 0x35: /* Cloverview */
-+    case 0x36: /* Cedarview */
-+    case 0x37: /* Baytrail / Valleyview (Silvermont) */
-+    case 0x4d: /* Avaton / Rangely (Silvermont) */
-+    case 0x4c: /* Cherrytrail / Brasswell */
-+    case 0x4a: /* Merrifield */
-+    case 0x5a: /* Moorefield */
-+    case 0x5c: /* Goldmont */
-+    case 0x5d: /* SoFIA 3G Granite/ES2.1 */
-+    case 0x65: /* SoFIA LTE AOSP */
-+    case 0x5f: /* Denverton */
-+    case 0x6e: /* Cougar Mountain */
-+    case 0x75: /* Lightning Mountain */
-+    case 0x7a: /* Gemini Lake */
-+    case 0x86: /* Jacobsville */
-+
-+        /*
-+         * Knights processors are not vulnerable.
-+         */
-+    case 0x57: /* Knights Landing */
-+    case 0x85: /* Knights Mill */
-+        return false;
-+
-+    default:
-+        printk("Unrecognised CPU model %#x - assuming vulnerable to IF_PSCHANGE_MC\n",
-+               boot_cpu_data.x86_model);
-+        return true;
-+    }
-+}
-+
- const struct hvm_function_table * __init start_vmx(void)
- {
-     set_in_cr4(X86_CR4_VMXE);
-@@ -2465,6 +2561,17 @@ const struct hvm_function_table * __init start_vmx(void)
-      */
-     if ( cpu_has_vmx_ept && (cpu_has_vmx_pat || opt_force_ept) )
-     {
-+        bool cpu_has_bug_pschange_mc = has_if_pschange_mc();
-+
-+        if ( opt_ept_exec_sp == -1 )
-+        {
-+            /* Default to non-executable superpages on vulnerable hardware. */
-+            opt_ept_exec_sp = !cpu_has_bug_pschange_mc;
-+
-+            if ( cpu_has_bug_pschange_mc )
-+                printk("VMX: Disabling executable EPT superpages due to CVE-2018-12207\n");
-+        }
-+
-         vmx_function_table.hap_supported = 1;
-         vmx_function_table.altp2m_supported = 1;
- 
-diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c
-index 952ebad82f..834d4798c8 100644
---- a/xen/arch/x86/mm/p2m-ept.c
-+++ b/xen/arch/x86/mm/p2m-ept.c
-@@ -174,6 +174,12 @@ static void ept_p2m_type_to_flags(struct p2m_domain *p2m, ept_entry_t *entry,
-             break;
-     }
-     
-+    /*
-+     * Don't create executable superpages if we need to shatter them to
-+     * protect against CVE-2018-12207.
-+     */
-+    if ( !opt_ept_exec_sp && is_epte_superpage(entry) )
-+        entry->x = 0;
- }
- 
- #define GUEST_TABLE_MAP_FAILED  0
-diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h
-index ebaa74449b..371b912887 100644
---- a/xen/include/asm-x86/hvm/vmx/vmx.h
-+++ b/xen/include/asm-x86/hvm/vmx/vmx.h
-@@ -28,6 +28,8 @@
- #include <asm/hvm/trace.h>
- #include <asm/hvm/vmx/vmcs.h>
- 
-+extern int8_t opt_ept_exec_sp;
-+
- typedef union {
-     struct {
-         u64 r       :   1,  /* bit 0 - Read permission */
-diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h
-index 637259bd1f..32746aa8ae 100644
---- a/xen/include/asm-x86/msr-index.h
-+++ b/xen/include/asm-x86/msr-index.h
-@@ -52,6 +52,7 @@
- #define ARCH_CAPS_SKIP_L1DFL		(_AC(1, ULL) << 3)
- #define ARCH_CAPS_SSB_NO		(_AC(1, ULL) << 4)
- #define ARCH_CAPS_MDS_NO		(_AC(1, ULL) << 5)
-+#define ARCH_CAPS_IF_PSCHANGE_MC_NO	(_AC(1, ULL) << 6)
- 
- #define MSR_FLUSH_CMD			0x0000010b
- #define FLUSH_CMD_L1D			(_AC(1, ULL) << 0)
diff --git a/system/xen/xsa/xsa304-4.12-3.patch b/system/xen/xsa/xsa304-4.12-3.patch
deleted file mode 100644
index 04b4c454f2..0000000000
--- a/system/xen/xsa/xsa304-4.12-3.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/vtx: Allow runtime modification of the exec-sp setting
-
-See patch for details.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: George Dunlap <george.dunlap@citrix.com>
-
-diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
-index e283017015..84221fe60a 100644
---- a/docs/misc/xen-command-line.pandoc
-+++ b/docs/misc/xen-command-line.pandoc
-@@ -936,6 +936,21 @@ introduced with the Nehalem architecture.
-     If HVM guest kernels are trusted not to mount a DoS against the system,
-     this option can enabled to regain performance.
- 
-+    This boolean may be modified at runtime using `xl set-parameters
-+    ept=[no-]exec-sp` to switch between fast and secure.
-+
-+    *   When switching from secure to fast, preexisting HVM domains will run
-+        at their current performance until they are rebooted; new domains will
-+        run without any overhead.
-+
-+    *   When switching from fast to secure, all HVM domains will immediately
-+        suffer a performance penalty.
-+
-+    **Warning: No guarantee is made that this runtime option will be retained
-+      indefinitely, or that it will retain this exact behaviour.  It is
-+      intended as an emergency option for people who first chose fast, then
-+      change their minds to secure, and wish not to reboot.**
-+
- ### extra_guest_irqs
- > `= [<domU number>][,<dom0 number>]`
- 
-diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
-index ec5ab860ad..c4d8a5ba78 100644
---- a/xen/arch/x86/hvm/vmx/vmcs.c
-+++ b/xen/arch/x86/hvm/vmx/vmcs.c
-@@ -95,6 +95,41 @@ static int __init parse_ept_param(const char *s)
- }
- custom_param("ept", parse_ept_param);
- 
-+static int parse_ept_param_runtime(const char *s)
-+{
-+    int val;
-+
-+    if ( !cpu_has_vmx_ept || !hvm_funcs.hap_supported ||
-+         !(hvm_funcs.hap_capabilities &
-+           (HVM_HAP_SUPERPAGE_2MB | HVM_HAP_SUPERPAGE_1GB)) )
-+    {
-+        printk("VMX: EPT not available, or not in use - ignoring\n");
-+        return 0;
-+    }
-+
-+    if ( (val = parse_boolean("exec-sp", s, NULL)) < 0 )
-+        return -EINVAL;
-+
-+    if ( val != opt_ept_exec_sp )
-+    {
-+        struct domain *d;
-+
-+        opt_ept_exec_sp = val;
-+
-+        rcu_read_lock(&domlist_read_lock);
-+        for_each_domain ( d )
-+            if ( paging_mode_hap(d) )
-+                p2m_change_entry_type_global(d, p2m_ram_rw, p2m_ram_rw);
-+        rcu_read_unlock(&domlist_read_lock);
-+    }
-+
-+    printk("VMX: EPT executable superpages %sabled\n",
-+           val ? "en" : "dis");
-+
-+    return 0;
-+}
-+custom_runtime_only_param("ept", parse_ept_param_runtime);
-+
- /* Dynamic (run-time adjusted) execution control flags. */
- u32 vmx_pin_based_exec_control __read_mostly;
- u32 vmx_cpu_based_exec_control __read_mostly;
-diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
-index f518f86493..16608098b1 100644
---- a/xen/arch/x86/mm/p2m.c
-+++ b/xen/arch/x86/mm/p2m.c
-@@ -289,15 +289,20 @@ static void change_entry_type_global(struct p2m_domain *p2m,
-                                      p2m_type_t ot, p2m_type_t nt)
- {
-     p2m->change_entry_type_global(p2m, ot, nt);
--    p2m->global_logdirty = (nt == p2m_ram_logdirty);
-+    /* Don't allow 'recalculate' operations to change the logdirty state. */
-+    if ( ot != nt )
-+        p2m->global_logdirty = (nt == p2m_ram_logdirty);
- }
- 
-+/*
-+ * May be called with ot = nt = p2m_ram_rw for its side effect of
-+ * recalculating all PTEs in the p2m.
-+ */
- void p2m_change_entry_type_global(struct domain *d,
-                                   p2m_type_t ot, p2m_type_t nt)
- {
-     struct p2m_domain *hostp2m = p2m_get_hostp2m(d);
- 
--    ASSERT(ot != nt);
-     ASSERT(p2m_is_changeable(ot) && p2m_is_changeable(nt));
- 
-     p2m_lock(hostp2m);
diff --git a/system/xen/xsa/xsa305-4.12-1.patch b/system/xen/xsa/xsa305-4.12-1.patch
deleted file mode 100644
index e1a91a5264..0000000000
--- a/system/xen/xsa/xsa305-4.12-1.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/tsx: Introduce tsx= to use MSR_TSX_CTRL when available
-
-To protect against the TSX Async Abort speculative vulnerability, Intel have
-released new microcode for affected parts which introduce the MSR_TSX_CTRL
-control, which allows TSX to be turned off.  This will be architectural on
-future parts.
-
-Introduce tsx= to provide a global on/off for TSX, including its enumeration
-via CPUID.  Provide stub virtualisation of this MSR, as it is not exposed to
-guests at the moment.
-
-VMs may have booted before microcode is loaded, or before hosts have rebooted,
-and they still want to migrate freely.  A VM which booted seeing TSX can
-migrate safely to hosts with TSX disabled - TSX will start unconditionally
-aborting, but still behave in a manner compatible with the ABI.
-
-The guest-visible behaviour is equivalent to late loading the microcode and
-setting the RTM_DISABLE bit in the course of live patching.
-
-This is part of XSA-305 / CVE-2019-11135
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
-diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
-index e283017015..b7e1bf8e8b 100644
---- a/docs/misc/xen-command-line.pandoc
-+++ b/docs/misc/xen-command-line.pandoc
-@@ -2033,6 +2033,20 @@ Xen version.
- ### tsc (x86)
- > `= unstable | skewed | stable:socket`
- 
-+### tsx
-+    = <bool>
-+
-+    Applicability: x86
-+    Default: true
-+
-+Controls for the use of Transactional Synchronization eXtensions.
-+
-+On Intel parts released in Q3 2019 (with updated microcode), and future parts,
-+a control has been introduced which allows TSX to be turned off.
-+
-+On systems with the ability to turn TSX off, this boolean offers system wide
-+control of whether TSX is enabled or disabled.
-+
- ### ucode (x86)
- > `= [<integer> | scan]`
- 
-diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
-index 8a8d8f060f..9b9a4435fb 100644
---- a/xen/arch/x86/Makefile
-+++ b/xen/arch/x86/Makefile
-@@ -66,6 +66,7 @@ obj-y += sysctl.o
- obj-y += time.o
- obj-y += trace.o
- obj-y += traps.o
-+obj-y += tsx.o
- obj-y += usercopy.o
- obj-y += x86_emulate.o
- obj-$(CONFIG_TBOOT) += tboot.o
-diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c
-index 57e80694f2..1727497459 100644
---- a/xen/arch/x86/cpuid.c
-+++ b/xen/arch/x86/cpuid.c
-@@ -524,6 +524,20 @@ void recalculate_cpuid_policy(struct domain *d)
-     if ( cpu_has_itsc && (d->disable_migrate || d->arch.vtsc) )
-         __set_bit(X86_FEATURE_ITSC, max_fs);
- 
-+    /*
-+     * On hardware with MSR_TSX_CTRL, the admin may have elected to disable
-+     * TSX and hide the feature bits.  Migrating-in VMs may have been booted
-+     * pre-mitigation when the TSX features were visbile.
-+     *
-+     * This situation is compatible (albeit with a perf hit to any TSX code in
-+     * the guest), so allow the feature bits to remain set.
-+     */
-+    if ( cpu_has_tsx_ctrl )
-+    {
-+        __set_bit(X86_FEATURE_HLE, max_fs);
-+        __set_bit(X86_FEATURE_RTM, max_fs);
-+    }
-+
-     /* Clamp the toolstacks choices to reality. */
-     for ( i = 0; i < ARRAY_SIZE(fs); i++ )
-         fs[i] &= max_fs[i];
-diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c
-index 56de0fe9e1..c2722d7c73 100644
---- a/xen/arch/x86/msr.c
-+++ b/xen/arch/x86/msr.c
-@@ -132,6 +132,7 @@ int guest_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val)
-     case MSR_FLUSH_CMD:
-         /* Write-only */
-     case MSR_TSX_FORCE_ABORT:
-+    case MSR_TSX_CTRL:
-         /* Not offered to guests. */
-         goto gp_fault;
- 
-@@ -260,6 +261,7 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val)
-     case MSR_ARCH_CAPABILITIES:
-         /* Read-only */
-     case MSR_TSX_FORCE_ABORT:
-+    case MSR_TSX_CTRL:
-         /* Not offered to guests. */
-         goto gp_fault;
- 
-diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
-index cf790f36ef..c1c7c44000 100644
---- a/xen/arch/x86/setup.c
-+++ b/xen/arch/x86/setup.c
-@@ -1594,6 +1594,8 @@ void __init noreturn __start_xen(unsigned long mbi_p)
- 
-     early_microcode_init();
- 
-+    tsx_init(); /* Needs microcode.  May change HLE/RTM feature bits. */
-+
-     identify_cpu(&boot_cpu_data);
- 
-     set_in_cr4(X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT);
-diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
-index 737a44f055..e21cf0a310 100644
---- a/xen/arch/x86/smpboot.c
-+++ b/xen/arch/x86/smpboot.c
-@@ -376,6 +376,8 @@ void start_secondary(void *unused)
-     if ( boot_cpu_has(X86_FEATURE_IBRSB) )
-         wrmsrl(MSR_SPEC_CTRL, default_xen_spec_ctrl);
- 
-+    tsx_init(); /* Needs microcode.  May change HLE/RTM feature bits. */
-+
-     if ( xen_guest )
-         hypervisor_ap_setup();
- 
-diff --git a/xen/arch/x86/tsx.c b/xen/arch/x86/tsx.c
-new file mode 100644
-index 0000000000..a8ec2ccc69
---- /dev/null
-+++ b/xen/arch/x86/tsx.c
-@@ -0,0 +1,74 @@
-+#include <xen/init.h>
-+#include <asm/msr.h>
-+
-+/*
-+ * Valid values:
-+ *   1 => Explicit tsx=1
-+ *   0 => Explicit tsx=0
-+ *  -1 => Default, implicit tsx=1
-+ *
-+ * This is arranged such that the bottom bit encodes whether TSX is actually
-+ * disabled, while identifying various explicit (>=0) and implicit (<0)
-+ * conditions.
-+ */
-+int8_t __read_mostly opt_tsx = -1;
-+int8_t __read_mostly cpu_has_tsx_ctrl = -1;
-+
-+static int __init parse_tsx(const char *s)
-+{
-+    int rc = 0, val = parse_bool(s, NULL);
-+
-+    if ( val >= 0 )
-+        opt_tsx = val;
-+    else
-+        rc = -EINVAL;
-+
-+    return rc;
-+}
-+custom_param("tsx", parse_tsx);
-+
-+void tsx_init(void)
-+{
-+    /*
-+     * This function is first called between microcode being loaded, and CPUID
-+     * being scanned generally.  Calculate from raw data whether MSR_TSX_CTRL
-+     * is available.
-+     */
-+    if ( unlikely(cpu_has_tsx_ctrl < 0) )
-+    {
-+        uint64_t caps = 0;
-+
-+        if ( boot_cpu_data.cpuid_level >= 7 &&
-+             (cpuid_count_edx(7, 0) & cpufeat_mask(X86_FEATURE_ARCH_CAPS)) )
-+            rdmsrl(MSR_ARCH_CAPABILITIES, caps);
-+
-+        cpu_has_tsx_ctrl = !!(caps & ARCH_CAPS_TSX_CTRL);
-+    }
-+
-+    if ( cpu_has_tsx_ctrl )
-+    {
-+        uint64_t val;
-+
-+        rdmsrl(MSR_TSX_CTRL, val);
-+
-+        val &= ~(TSX_CTRL_RTM_DISABLE | TSX_CTRL_CPUID_CLEAR);
-+        /* Check bottom bit only.  Higher bits are various sentinals. */
-+        if ( !(opt_tsx & 1) )
-+            val |= TSX_CTRL_RTM_DISABLE | TSX_CTRL_CPUID_CLEAR;
-+
-+        wrmsrl(MSR_TSX_CTRL, val);
-+    }
-+    else if ( opt_tsx >= 0 )
-+        printk_once(XENLOG_WARNING
-+                    "MSR_TSX_CTRL not available - Ignoring tsx= setting\n");
-+}
-+
-+/*
-+ * Local variables:
-+ * mode: C
-+ * c-file-style: "BSD"
-+ * c-basic-offset: 4
-+ * tab-width: 4
-+ * indent-tabs-mode: nil
-+ * End:
-+ */
-diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h
-index 32746aa8ae..d5f3899f73 100644
---- a/xen/include/asm-x86/msr-index.h
-+++ b/xen/include/asm-x86/msr-index.h
-@@ -53,6 +53,7 @@
- #define ARCH_CAPS_SSB_NO		(_AC(1, ULL) << 4)
- #define ARCH_CAPS_MDS_NO		(_AC(1, ULL) << 5)
- #define ARCH_CAPS_IF_PSCHANGE_MC_NO	(_AC(1, ULL) << 6)
-+#define ARCH_CAPS_TSX_CTRL		(_AC(1, ULL) << 7)
- 
- #define MSR_FLUSH_CMD			0x0000010b
- #define FLUSH_CMD_L1D			(_AC(1, ULL) << 0)
-@@ -60,6 +61,10 @@
- #define MSR_TSX_FORCE_ABORT             0x0000010f
- #define TSX_FORCE_ABORT_RTM             (_AC(1, ULL) <<  0)
- 
-+#define MSR_TSX_CTRL                    0x00000122
-+#define TSX_CTRL_RTM_DISABLE            (_AC(1, ULL) <<  0)
-+#define TSX_CTRL_CPUID_CLEAR            (_AC(1, ULL) <<  1)
-+
- /* Intel MSRs. Some also available on other CPUs */
- #define MSR_IA32_PERFCTR0		0x000000c1
- #define MSR_IA32_A_PERFCTR0		0x000004c1
-diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h
-index d33ac34d29..1b52712180 100644
---- a/xen/include/asm-x86/processor.h
-+++ b/xen/include/asm-x86/processor.h
-@@ -263,6 +263,16 @@ static always_inline unsigned int cpuid_count_ebx(
-     return ebx;
- }
- 
-+static always_inline unsigned int cpuid_count_edx(
-+    unsigned int leaf, unsigned int subleaf)
-+{
-+    unsigned int edx, tmp;
-+
-+    cpuid_count(leaf, subleaf, &tmp, &tmp, &tmp, &edx);
-+
-+    return edx;
-+}
-+
- static inline unsigned long read_cr0(void)
- {
-     unsigned long cr0;
-@@ -609,6 +619,9 @@ static inline uint8_t get_cpu_family(uint32_t raw, uint8_t *model,
-     return fam;
- }
- 
-+extern int8_t opt_tsx, cpu_has_tsx_ctrl;
-+void tsx_init(void);
-+
- #endif /* !__ASSEMBLY__ */
- 
- #endif /* __ASM_X86_PROCESSOR_H */
-diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
-index 89939f43c8..6529f12dae 100644
---- a/xen/include/xen/lib.h
-+++ b/xen/include/xen/lib.h
-@@ -114,6 +114,16 @@ extern int printk_ratelimit(void);
- #define gprintk(lvl, fmt, args...) \
-     printk(XENLOG_GUEST lvl "%pv " fmt, current, ## args)
- 
-+#define printk_once(fmt, args...)               \
-+({                                              \
-+    static bool __read_mostly once_;            \
-+    if ( unlikely(!once_) )                     \
-+    {                                           \
-+        once_ = true;                           \
-+        printk(fmt, ## args);                   \
-+    }                                           \
-+})
-+
- #ifdef NDEBUG
- 
- static inline void
diff --git a/system/xen/xsa/xsa305-4.12-2.patch b/system/xen/xsa/xsa305-4.12-2.patch
deleted file mode 100644
index 07fba86287..0000000000
--- a/system/xen/xsa/xsa305-4.12-2.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/spec-ctrl: Mitigate the TSX Asynchronous Abort sidechannel
-
-See patch documentation and comments.
-
-This is part of XSA-305 / CVE-2019-11135
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
-diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
-index b7e1bf8e8b..74e1e35b88 100644
---- a/docs/misc/xen-command-line.pandoc
-+++ b/docs/misc/xen-command-line.pandoc
-@@ -1920,7 +1920,7 @@ extreme care.**
- An overall boolean value, `spec-ctrl=no`, can be specified to turn off all
- mitigations, including pieces of infrastructure used to virtualise certain
- mitigation features for guests.  This also includes settings which `xpti`,
--`smt`, `pv-l1tf` control, unless the respective option(s) have been
-+`smt`, `pv-l1tf`, `tsx` control, unless the respective option(s) have been
- specified earlier on the command line.
- 
- Alternatively, a slightly more restricted `spec-ctrl=no-xen` can be used to
-@@ -2037,7 +2037,7 @@ Xen version.
-     = <bool>
- 
-     Applicability: x86
--    Default: true
-+    Default: false on parts vulnerable to TAA, true otherwise
- 
- Controls for the use of Transactional Synchronization eXtensions.
- 
-@@ -2047,6 +2047,19 @@ a control has been introduced which allows TSX to be turned off.
- On systems with the ability to turn TSX off, this boolean offers system wide
- control of whether TSX is enabled or disabled.
- 
-+On parts vulnerable to CVE-2019-11135 / TSX Asynchronous Abort, the following
-+logic applies:
-+
-+ * An explicit `tsx=` choice is honoured, even if it is `true` and would
-+   result in a vulnerable system.
-+
-+ * When no explicit `tsx=` choice is given, parts vulnerable to TAA will be
-+   mitigated by disabling TSX, as this is the lowest overhead option.
-+
-+ * If the use of TSX is important, the more expensive TAA mitigations can be
-+   opted in to with `smt=0 spec-ctrl=md-clear`, at which point TSX will remain
-+   active by default.
-+
- ### ucode (x86)
- > `= [<integer> | scan]`
- 
-diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
-index b37d40e643..800139d79c 100644
---- a/xen/arch/x86/spec_ctrl.c
-+++ b/xen/arch/x86/spec_ctrl.c
-@@ -96,6 +96,9 @@ static int __init parse_spec_ctrl(const char *s)
-             if ( opt_pv_l1tf_domu < 0 )
-                 opt_pv_l1tf_domu = 0;
- 
-+            if ( opt_tsx == -1 )
-+                opt_tsx = -3;
-+
-         disable_common:
-             opt_rsb_pv = false;
-             opt_rsb_hvm = false;
-@@ -306,7 +309,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
-     printk("Speculative mitigation facilities:\n");
- 
-     /* Hardware features which pertain to speculative mitigations. */
--    printk("  Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s\n",
-+    printk("  Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
-            (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "",
-            (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP"     : "",
-            (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "",
-@@ -318,7 +321,9 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
-            (caps & ARCH_CAPS_RSBA)                  ? " RSBA"      : "",
-            (caps & ARCH_CAPS_SKIP_L1DFL)            ? " SKIP_L1DFL": "",
-            (caps & ARCH_CAPS_SSB_NO)                ? " SSB_NO"    : "",
--           (caps & ARCH_CAPS_MDS_NO)                ? " MDS_NO"    : "");
-+           (caps & ARCH_CAPS_MDS_NO)                ? " MDS_NO"    : "",
-+           (caps & ARCH_CAPS_TSX_CTRL)              ? " TSX_CTRL"  : "",
-+           (caps & ARCH_CAPS_TAA_NO)                ? " TAA_NO"    : "");
- 
-     /* Compiled-in support which pertains to mitigations. */
-     if ( IS_ENABLED(CONFIG_INDIRECT_THUNK) || IS_ENABLED(CONFIG_SHADOW_PAGING) )
-@@ -332,7 +337,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
-                "\n");
- 
-     /* Settings for Xen's protection, irrespective of guests. */
--    printk("  Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s, Other:%s%s%s\n",
-+    printk("  Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s, Other:%s%s%s\n",
-            thunk == THUNK_NONE      ? "N/A" :
-            thunk == THUNK_RETPOLINE ? "RETPOLINE" :
-            thunk == THUNK_LFENCE    ? "LFENCE" :
-@@ -341,6 +346,8 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
-            (default_xen_spec_ctrl & SPEC_CTRL_IBRS)  ? "IBRS+" :  "IBRS-",
-            !boot_cpu_has(X86_FEATURE_SSBD)           ? "" :
-            (default_xen_spec_ctrl & SPEC_CTRL_SSBD)  ? " SSBD+" : " SSBD-",
-+           !(caps & ARCH_CAPS_TSX_CTRL)              ? "" :
-+           (opt_tsx & 1)                             ? " TSX+" : " TSX-",
-            opt_ibpb                                  ? " IBPB"  : "",
-            opt_l1d_flush                             ? " L1D_FLUSH" : "",
-            opt_md_clear_pv || opt_md_clear_hvm       ? " VERW"  : "");
-@@ -862,6 +869,7 @@ void __init init_speculation_mitigations(void)
- {
-     enum ind_thunk thunk = THUNK_DEFAULT;
-     bool use_spec_ctrl = false, ibrs = false, hw_smt_enabled;
-+    bool cpu_has_bug_taa;
-     uint64_t caps = 0;
- 
-     if ( boot_cpu_has(X86_FEATURE_ARCH_CAPS) )
-@@ -1086,6 +1094,53 @@ void __init init_speculation_mitigations(void)
-             "enabled.  Mitigations will not be fully effective.  Please\n"
-             "choose an explicit smt=<bool> setting.  See XSA-297.\n");
- 
-+    /*
-+     * Vulnerability to TAA is a little complicated to quantify.
-+     *
-+     * In the pipeline, it is just another way to get speculative access to
-+     * stale load port, store buffer or fill buffer data, and therefore can be
-+     * considered a superset of MDS (on TSX-capable parts).  On parts which
-+     * predate MDS_NO, the existing VERW flushing will mitigate this
-+     * sidechannel as well.
-+     *
-+     * On parts which contain MDS_NO, the lack of VERW flushing means that an
-+     * attacker can still use TSX to target microarchitectural buffers to leak
-+     * secrets.  Therefore, we consider TAA to be the set of TSX-capable parts
-+     * which have MDS_NO but lack TAA_NO.
-+     *
-+     * Note: cpu_has_rtm (== hle) could already be hidden by `tsx=0` on the
-+     *       cmdline.  MSR_TSX_CTRL will only appear on TSX-capable parts, so
-+     *       we check both to spot TSX in a microcode/cmdline independent way.
-+     */
-+    cpu_has_bug_taa =
-+        (cpu_has_rtm || (caps & ARCH_CAPS_TSX_CTRL)) &&
-+        (caps & (ARCH_CAPS_MDS_NO | ARCH_CAPS_TAA_NO)) == ARCH_CAPS_MDS_NO;
-+
-+    /*
-+     * On TAA-affected hardware, disabling TSX is the preferred mitigation, vs
-+     * the MDS mitigation of disabling HT and using VERW flushing.
-+     *
-+     * On CPUs which advertise MDS_NO, VERW has no flushing side effect until
-+     * the TSX_CTRL microcode is loaded, despite the MD_CLEAR CPUID bit being
-+     * advertised, and there isn't a MD_CLEAR_2 flag to use...
-+     *
-+     * If we're on affected hardware, able to do something about it (which
-+     * implies that VERW now works), no explicit TSX choice and traditional
-+     * MDS mitigations (no-SMT, VERW) not obviosuly in use (someone might
-+     * plausibly value TSX higher than Hyperthreading...), disable TSX to
-+     * mitigate TAA.
-+     */
-+    if ( opt_tsx == -1 && cpu_has_bug_taa && (caps & ARCH_CAPS_TSX_CTRL) &&
-+         ((hw_smt_enabled && opt_smt) ||
-+          !boot_cpu_has(X86_FEATURE_SC_VERW_IDLE)) )
-+    {
-+        setup_clear_cpu_cap(X86_FEATURE_HLE);
-+        setup_clear_cpu_cap(X86_FEATURE_RTM);
-+
-+        opt_tsx = 0;
-+        tsx_init();
-+    }
-+
-     print_details(thunk, caps);
- 
-     /*
-diff --git a/xen/arch/x86/tsx.c b/xen/arch/x86/tsx.c
-index a8ec2ccc69..2d202a0d4e 100644
---- a/xen/arch/x86/tsx.c
-+++ b/xen/arch/x86/tsx.c
-@@ -5,7 +5,8 @@
-  * Valid values:
-  *   1 => Explicit tsx=1
-  *   0 => Explicit tsx=0
-- *  -1 => Default, implicit tsx=1
-+ *  -1 => Default, implicit tsx=1, may change to 0 to mitigate TAA
-+ *  -3 => Implicit tsx=1 (feed-through from spec-ctrl=0)
-  *
-  * This is arranged such that the bottom bit encodes whether TSX is actually
-  * disabled, while identifying various explicit (>=0) and implicit (<0)
-diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h
-index d5f3899f73..3971b992d3 100644
---- a/xen/include/asm-x86/msr-index.h
-+++ b/xen/include/asm-x86/msr-index.h
-@@ -54,6 +54,7 @@
- #define ARCH_CAPS_MDS_NO		(_AC(1, ULL) << 5)
- #define ARCH_CAPS_IF_PSCHANGE_MC_NO	(_AC(1, ULL) << 6)
- #define ARCH_CAPS_TSX_CTRL		(_AC(1, ULL) << 7)
-+#define ARCH_CAPS_TAA_NO		(_AC(1, ULL) << 8)
- 
- #define MSR_FLUSH_CMD			0x0000010b
- #define FLUSH_CMD_L1D			(_AC(1, ULL) << 0)
diff --git a/system/xen/xsa/xsa317.patch b/system/xen/xsa/xsa317.patch
new file mode 100644
index 0000000000..20e2c643d0
--- /dev/null
+++ b/system/xen/xsa/xsa317.patch
@@ -0,0 +1,50 @@
+From aeb46e92f915f19a61d5a8a1f4b696793f64e6fb Mon Sep 17 00:00:00 2001
+From: Julien Grall <jgrall@amazon.com>
+Date: Thu, 19 Mar 2020 13:17:31 +0000
+Subject: [PATCH] xen/common: event_channel: Don't ignore error in
+ get_free_port()
+
+Currently, get_free_port() is assuming that the port has been allocated
+when evtchn_allocate_port() is not return -EBUSY.
+
+However, the function may return an error when:
+    - We exhausted all the event channels. This can happen if the limit
+    configured by the administrator for the guest ('max_event_channels'
+    in xl cfg) is higher than the ABI used by the guest. For instance,
+    if the guest is using 2L, the limit should not be higher than 4095.
+    - We cannot allocate memory (e.g Xen has not more memory).
+
+Users of get_free_port() (such as EVTCHNOP_alloc_unbound) will validly
+assuming the port was valid and will next call evtchn_from_port(). This
+will result to a crash as the memory backing the event channel structure
+is not present.
+
+Fixes: 368ae9a05fe ("xen/pvshim: forward evtchn ops between L0 Xen and L2 DomU")
+Signed-off-by: Julien Grall <jgrall@amazon.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+---
+ xen/common/event_channel.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
+index e86e2bfab0..a8d182b584 100644
+--- a/xen/common/event_channel.c
++++ b/xen/common/event_channel.c
+@@ -195,10 +195,10 @@ static int get_free_port(struct domain *d)
+     {
+         int rc = evtchn_allocate_port(d, port);
+ 
+-        if ( rc == -EBUSY )
+-            continue;
+-
+-        return port;
++        if ( rc == 0 )
++            return port;
++        else if ( rc != -EBUSY )
++            return rc;
+     }
+ 
+     return -ENOSPC;
+-- 
+2.17.1
+
diff --git a/system/xen/xsa/xsa319.patch b/system/xen/xsa/xsa319.patch
new file mode 100644
index 0000000000..769443c900
--- /dev/null
+++ b/system/xen/xsa/xsa319.patch
@@ -0,0 +1,27 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: x86/shadow: correct an inverted conditional in dirty VRAM tracking
+
+This originally was "mfn_x(mfn) == INVALID_MFN". Make it like this
+again, taking the opportunity to also drop the unnecessary nearby
+braces.
+
+This is XSA-319.
+
+Fixes: 246a5a3377c2 ("xen: Use a typesafe to define INVALID_MFN")
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
+
+--- a/xen/arch/x86/mm/shadow/common.c
++++ b/xen/arch/x86/mm/shadow/common.c
+@@ -3252,10 +3252,8 @@ int shadow_track_dirty_vram(struct domai
+             int dirty = 0;
+             paddr_t sl1ma = dirty_vram->sl1ma[i];
+ 
+-            if ( !mfn_eq(mfn, INVALID_MFN) )
+-            {
++            if ( mfn_eq(mfn, INVALID_MFN) )
+                 dirty = 1;
+-            }
+             else
+             {
+                 page = mfn_to_page(mfn);
diff --git a/system/xen/xsa/xsa320-4.13-1.patch b/system/xen/xsa/xsa320-4.13-1.patch
new file mode 100644
index 0000000000..09eb8ea98e
--- /dev/null
+++ b/system/xen/xsa/xsa320-4.13-1.patch
@@ -0,0 +1,117 @@
+From: Andrew Cooper <andrew.cooper3@citrix.com>
+Subject: x86/spec-ctrl: CPUID/MSR definitions for Special Register Buffer Data Sampling
+
+This is part of XSA-320 / CVE-2020-0543
+
+Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+Acked-by: Wei Liu <wl@xen.org>
+
+diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
+index 1d9d816622..9268454297 100644
+--- a/docs/misc/xen-command-line.pandoc
++++ b/docs/misc/xen-command-line.pandoc
+@@ -483,10 +483,10 @@ accounting for hardware capabilities as enumerated via CPUID.
+ 
+ Currently accepted:
+ 
+-The Speculation Control hardware features `md-clear`, `ibrsb`, `stibp`, `ibpb`,
+-`l1d-flush` and `ssbd` are used by default if available and applicable.  They can
+-be ignored, e.g. `no-ibrsb`, at which point Xen won't use them itself, and
+-won't offer them to guests.
++The Speculation Control hardware features `srbds-ctrl`, `md-clear`, `ibrsb`,
++`stibp`, `ibpb`, `l1d-flush` and `ssbd` are used by default if available and
++applicable.  They can be ignored, e.g. `no-ibrsb`, at which point Xen won't
++use them itself, and won't offer them to guests.
+ 
+ ### cpuid_mask_cpu
+ > `= fam_0f_rev_[cdefg] | fam_10_rev_[bc] | fam_11_rev_b`
+diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c
+index 6cea4227ba..a78f08b927 100644
+--- a/tools/libxl/libxl_cpuid.c
++++ b/tools/libxl/libxl_cpuid.c
+@@ -213,6 +213,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str)
+ 
+         {"avx512-4vnniw",0x00000007,  0, CPUID_REG_EDX,  2,  1},
+         {"avx512-4fmaps",0x00000007,  0, CPUID_REG_EDX,  3,  1},
++        {"srbds-ctrl",   0x00000007,  0, CPUID_REG_EDX,  9,  1},
+         {"md-clear",     0x00000007,  0, CPUID_REG_EDX, 10,  1},
+         {"cet-ibt",      0x00000007,  0, CPUID_REG_EDX, 20,  1},
+         {"ibrsb",        0x00000007,  0, CPUID_REG_EDX, 26,  1},
+diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c
+index 603e1d65fd..a09440813b 100644
+--- a/tools/misc/xen-cpuid.c
++++ b/tools/misc/xen-cpuid.c
+@@ -157,6 +157,7 @@ static const char *const str_7d0[32] =
+     [ 2] = "avx512_4vnniw", [ 3] = "avx512_4fmaps",
+     [ 4] = "fsrm",
+ 
++    /*  8 */                [ 9] = "srbds-ctrl",
+     [10] = "md-clear",
+     /* 12 */                [13] = "tsx-force-abort",
+ 
+diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c
+index 4b12103482..0cded3c0ad 100644
+--- a/xen/arch/x86/msr.c
++++ b/xen/arch/x86/msr.c
+@@ -134,6 +134,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val)
+         /* Write-only */
+     case MSR_TSX_FORCE_ABORT:
+     case MSR_TSX_CTRL:
++    case MSR_MCU_OPT_CTRL:
+     case MSR_U_CET:
+     case MSR_S_CET:
+     case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE:
+@@ -288,6 +289,7 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val)
+         /* Read-only */
+     case MSR_TSX_FORCE_ABORT:
+     case MSR_TSX_CTRL:
++    case MSR_MCU_OPT_CTRL:
+     case MSR_U_CET:
+     case MSR_S_CET:
+     case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE:
+diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
+index 6656c44aec..5fc1c6827e 100644
+--- a/xen/arch/x86/spec_ctrl.c
++++ b/xen/arch/x86/spec_ctrl.c
+@@ -312,12 +312,13 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
+     printk("Speculative mitigation facilities:\n");
+ 
+     /* Hardware features which pertain to speculative mitigations. */
+-    printk("  Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
++    printk("  Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+            (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "",
+            (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP"     : "",
+            (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "",
+            (_7d0 & cpufeat_mask(X86_FEATURE_SSBD))  ? " SSBD"      : "",
+            (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "",
++           (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "",
+            (e8b  & cpufeat_mask(X86_FEATURE_IBPB))  ? " IBPB"      : "",
+            (caps & ARCH_CAPS_IBRS_ALL)              ? " IBRS_ALL"  : "",
+            (caps & ARCH_CAPS_RDCL_NO)               ? " RDCL_NO"   : "",
+diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h
+index 7693c4a71a..91994669e1 100644
+--- a/xen/include/asm-x86/msr-index.h
++++ b/xen/include/asm-x86/msr-index.h
+@@ -179,6 +179,9 @@
+ #define MSR_IA32_VMX_TRUE_ENTRY_CTLS            0x490
+ #define MSR_IA32_VMX_VMFUNC                     0x491
+ 
++#define MSR_MCU_OPT_CTRL                    0x00000123
++#define  MCU_OPT_CTRL_RNGDS_MITG_DIS        (_AC(1, ULL) <<  0)
++
+ #define MSR_U_CET                           0x000006a0
+ #define MSR_S_CET                           0x000006a2
+ #define MSR_PL0_SSP                         0x000006a4
+diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h
+index 2835688f1c..a2482c3627 100644
+--- a/xen/include/public/arch-x86/cpufeatureset.h
++++ b/xen/include/public/arch-x86/cpufeatureset.h
+@@ -252,6 +252,7 @@ XEN_CPUFEATURE(IBPB,          8*32+12) /*A  IBPB support only (no IBRS, used by
+ /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */
+ XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A  AVX512 Neural Network Instructions */
+ XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A  AVX512 Multiply Accumulation Single Precision */
++XEN_CPUFEATURE(SRBDS_CTRL,    9*32+ 9) /*   MSR_MCU_OPT_CTRL and RNGDS_MITG_DIS. */
+ XEN_CPUFEATURE(MD_CLEAR,      9*32+10) /*A  VERW clears microarchitectural buffers */
+ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */
+ XEN_CPUFEATURE(CET_IBT,       9*32+20) /*   CET - Indirect Branch Tracking */
diff --git a/system/xen/xsa/xsa320-4.13-2.patch b/system/xen/xsa/xsa320-4.13-2.patch
new file mode 100644
index 0000000000..8a8080a312
--- /dev/null
+++ b/system/xen/xsa/xsa320-4.13-2.patch
@@ -0,0 +1,179 @@
+From: Andrew Cooper <andrew.cooper3@citrix.com>
+Subject: x86/spec-ctrl: Mitigate the Special Register Buffer Data Sampling sidechannel
+
+See patch documentation and comments.
+
+This is part of XSA-320 / CVE-2020-0543
+
+Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
+index 9268454297..c780312531 100644
+--- a/docs/misc/xen-command-line.pandoc
++++ b/docs/misc/xen-command-line.pandoc
+@@ -1991,7 +1991,7 @@ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`).
+ ### spec-ctrl (x86)
+ > `= List of [ <bool>, xen=<bool>, {pv,hvm,msr-sc,rsb,md-clear}=<bool>,
+ >              bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd,eager-fpu,
+->              l1d-flush,branch-harden}=<bool> ]`
++>              l1d-flush,branch-harden,srb-lock}=<bool> ]`
+ 
+ Controls for speculative execution sidechannel mitigations.  By default, Xen
+ will pick the most appropriate mitigations based on compiled in support,
+@@ -2068,6 +2068,12 @@ If Xen is compiled with `CONFIG_SPECULATIVE_HARDEN_BRANCH`, the
+ speculation barriers to protect selected conditional branches.  By default,
+ Xen will enable this mitigation.
+ 
++On hardware supporting SRBDS_CTRL, the `srb-lock=` option can be used to force
++or prevent Xen from protect the Special Register Buffer from leaking stale
++data. By default, Xen will enable this mitigation, except on parts where MDS
++is fixed and TAA is fixed/mitigated (in which case, there is believed to be no
++way for an attacker to obtain the stale data).
++
+ ### sync_console
+ > `= <boolean>`
+ 
+diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c
+index feb0f6ce20..75c6e34164 100644
+--- a/xen/arch/x86/acpi/power.c
++++ b/xen/arch/x86/acpi/power.c
+@@ -295,6 +295,9 @@ static int enter_state(u32 state)
+     ci->spec_ctrl_flags |= (default_spec_ctrl_flags & SCF_ist_wrmsr);
+     spec_ctrl_exit_idle(ci);
+ 
++    if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) )
++        wrmsrl(MSR_MCU_OPT_CTRL, default_xen_mcu_opt_ctrl);
++
+  done:
+     spin_debug_enable();
+     local_irq_restore(flags);
+diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
+index dc8fdac1a1..b1e51b3aff 100644
+--- a/xen/arch/x86/smpboot.c
++++ b/xen/arch/x86/smpboot.c
+@@ -361,12 +361,14 @@ void start_secondary(void *unused)
+     microcode_update_one(false);
+ 
+     /*
+-     * If MSR_SPEC_CTRL is available, apply Xen's default setting and discard
+-     * any firmware settings.  Note: MSR_SPEC_CTRL may only become available
+-     * after loading microcode.
++     * If any speculative control MSRs are available, apply Xen's default
++     * settings.  Note: These MSRs may only become available after loading
++     * microcode.
+      */
+     if ( boot_cpu_has(X86_FEATURE_IBRSB) )
+         wrmsrl(MSR_SPEC_CTRL, default_xen_spec_ctrl);
++    if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) )
++        wrmsrl(MSR_MCU_OPT_CTRL, default_xen_mcu_opt_ctrl);
+ 
+     tsx_init(); /* Needs microcode.  May change HLE/RTM feature bits. */
+ 
+diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
+index 5fc1c6827e..33343062a7 100644
+--- a/xen/arch/x86/spec_ctrl.c
++++ b/xen/arch/x86/spec_ctrl.c
+@@ -65,6 +65,9 @@ static unsigned int __initdata l1d_maxphysaddr;
+ static bool __initdata cpu_has_bug_msbds_only; /* => minimal HT impact. */
+ static bool __initdata cpu_has_bug_mds; /* Any other M{LP,SB,FB}DS combination. */
+ 
++static int8_t __initdata opt_srb_lock = -1;
++uint64_t __read_mostly default_xen_mcu_opt_ctrl;
++
+ static int __init parse_spec_ctrl(const char *s)
+ {
+     const char *ss;
+@@ -112,6 +115,7 @@ static int __init parse_spec_ctrl(const char *s)
+             opt_ssbd = false;
+             opt_l1d_flush = 0;
+             opt_branch_harden = false;
++            opt_srb_lock = 0;
+         }
+         else if ( val > 0 )
+             rc = -EINVAL;
+@@ -178,6 +182,8 @@ static int __init parse_spec_ctrl(const char *s)
+             opt_l1d_flush = val;
+         else if ( (val = parse_boolean("branch-harden", s, ss)) >= 0 )
+             opt_branch_harden = val;
++        else if ( (val = parse_boolean("srb-lock", s, ss)) >= 0 )
++            opt_srb_lock = val;
+         else
+             rc = -EINVAL;
+ 
+@@ -341,7 +347,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
+                "\n");
+ 
+     /* Settings for Xen's protection, irrespective of guests. */
+-    printk("  Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s, Other:%s%s%s%s\n",
++    printk("  Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s, Other:%s%s%s%s%s\n",
+            thunk == THUNK_NONE      ? "N/A" :
+            thunk == THUNK_RETPOLINE ? "RETPOLINE" :
+            thunk == THUNK_LFENCE    ? "LFENCE" :
+@@ -352,6 +358,8 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
+            (default_xen_spec_ctrl & SPEC_CTRL_SSBD)  ? " SSBD+" : " SSBD-",
+            !(caps & ARCH_CAPS_TSX_CTRL)              ? "" :
+            (opt_tsx & 1)                             ? " TSX+" : " TSX-",
++           !boot_cpu_has(X86_FEATURE_SRBDS_CTRL)     ? "" :
++           opt_srb_lock                              ? " SRB_LOCK+" : " SRB_LOCK-",
+            opt_ibpb                                  ? " IBPB"  : "",
+            opt_l1d_flush                             ? " L1D_FLUSH" : "",
+            opt_md_clear_pv || opt_md_clear_hvm       ? " VERW"  : "",
+@@ -1149,6 +1157,34 @@ void __init init_speculation_mitigations(void)
+         tsx_init();
+     }
+ 
++    /* Calculate suitable defaults for MSR_MCU_OPT_CTRL */
++    if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) )
++    {
++        uint64_t val;
++
++        rdmsrl(MSR_MCU_OPT_CTRL, val);
++
++        /*
++         * On some SRBDS-affected hardware, it may be safe to relax srb-lock
++         * by default.
++         *
++         * On parts which enumerate MDS_NO and not TAA_NO, TSX is the only way
++         * to access the Fill Buffer.  If TSX isn't available (inc. SKU
++         * reasons on some models), or TSX is explicitly disabled, then there
++         * is no need for the extra overhead to protect RDRAND/RDSEED.
++         */
++        if ( opt_srb_lock == -1 &&
++             (caps & (ARCH_CAPS_MDS_NO|ARCH_CAPS_TAA_NO)) == ARCH_CAPS_MDS_NO &&
++             (!cpu_has_hle || ((caps & ARCH_CAPS_TSX_CTRL) && opt_tsx == 0)) )
++            opt_srb_lock = 0;
++
++        val &= ~MCU_OPT_CTRL_RNGDS_MITG_DIS;
++        if ( !opt_srb_lock )
++            val |= MCU_OPT_CTRL_RNGDS_MITG_DIS;
++
++        default_xen_mcu_opt_ctrl = val;
++    }
++
+     print_details(thunk, caps);
+ 
+     /*
+@@ -1180,6 +1216,9 @@ void __init init_speculation_mitigations(void)
+ 
+         wrmsrl(MSR_SPEC_CTRL, bsp_delay_spec_ctrl ? 0 : default_xen_spec_ctrl);
+     }
++
++    if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) )
++        wrmsrl(MSR_MCU_OPT_CTRL, default_xen_mcu_opt_ctrl);
+ }
+ 
+ static void __init __maybe_unused build_assertions(void)
+diff --git a/xen/include/asm-x86/spec_ctrl.h b/xen/include/asm-x86/spec_ctrl.h
+index 9caecddfec..b252bb8631 100644
+--- a/xen/include/asm-x86/spec_ctrl.h
++++ b/xen/include/asm-x86/spec_ctrl.h
+@@ -54,6 +54,8 @@ extern int8_t opt_pv_l1tf_hwdom, opt_pv_l1tf_domu;
+  */
+ extern paddr_t l1tf_addr_mask, l1tf_safe_maddr;
+ 
++extern uint64_t default_xen_mcu_opt_ctrl;
++
+ static inline void init_shadow_spec_ctrl_state(void)
+ {
+     struct cpu_info *info = get_cpu_info();
diff --git a/system/xen/xsa/xsa320-4.13-3.patch b/system/xen/xsa/xsa320-4.13-3.patch
new file mode 100644
index 0000000000..b52eeb338a
--- /dev/null
+++ b/system/xen/xsa/xsa320-4.13-3.patch
@@ -0,0 +1,36 @@
+From: Andrew Cooper <andrew.cooper3@citrix.com>
+Subject: x86/spec-ctrl: Update docs with SRBDS workaround
+
+RDRAND/RDSEED can be hidden using cpuid= to mitigate SRBDS if microcode
+isn't available.
+
+This is part of XSA-320 / CVE-2020-0543.
+
+Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Acked-by: Julien Grall <jgrall@amazon.com>
+
+diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
+index c780312531..81e12d053c 100644
+--- a/docs/misc/xen-command-line.pandoc
++++ b/docs/misc/xen-command-line.pandoc
+@@ -481,12 +481,18 @@ choice of `dom0-kernel` is deprecated and not supported by all Dom0 kernels.
+ This option allows for fine tuning of the facilities Xen will use, after
+ accounting for hardware capabilities as enumerated via CPUID.
+ 
++Unless otherwise noted, options only have any effect in their negative form,
++to hide the named feature(s).  Ignoring a feature using this mechanism will
++cause Xen not to use the feature, nor offer them as usable to guests.
++
+ Currently accepted:
+ 
+ The Speculation Control hardware features `srbds-ctrl`, `md-clear`, `ibrsb`,
+ `stibp`, `ibpb`, `l1d-flush` and `ssbd` are used by default if available and
+-applicable.  They can be ignored, e.g. `no-ibrsb`, at which point Xen won't
+-use them itself, and won't offer them to guests.
++applicable.  They can all be ignored.
++
++`rdrand` and `rdseed` can be ignored, as a mitigation to XSA-320 /
++CVE-2020-0543.
+ 
+ ### cpuid_mask_cpu
+ > `= fam_0f_rev_[cdefg] | fam_10_rev_[bc] | fam_11_rev_b`
diff --git a/system/xen/xsa/xsa327.patch b/system/xen/xsa/xsa327.patch
new file mode 100644
index 0000000000..0541cfa0df
--- /dev/null
+++ b/system/xen/xsa/xsa327.patch
@@ -0,0 +1,63 @@
+From 030300ebbb86c40c12db038714479d746167c767 Mon Sep 17 00:00:00 2001
+From: Julien Grall <jgrall@amazon.com>
+Date: Tue, 26 May 2020 18:31:33 +0100
+Subject: [PATCH] xen: Check the alignment of the offset pased via
+ VCPUOP_register_vcpu_info
+
+Currently a guest is able to register any guest physical address to use
+for the vcpu_info structure as long as the structure can fits in the
+rest of the frame.
+
+This means a guest can provide an address that is not aligned to the
+natural alignment of the structure.
+
+On Arm 32-bit, unaligned access are completely forbidden by the
+hypervisor. This will result to a data abort which is fatal.
+
+On Arm 64-bit, unaligned access are only forbidden when used for atomic
+access. As the structure contains fields (such as evtchn_pending_self)
+that are updated using atomic operations, any unaligned access will be
+fatal as well.
+
+While the misalignment is only fatal on Arm, a generic check is added
+as an x86 guest shouldn't sensibly pass an unaligned address (this
+would result to a split lock).
+
+This is XSA-327.
+
+Reported-by: Julien Grall <jgrall@amazon.com>
+Signed-off-by: Julien Grall <jgrall@amazon.com>
+Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ xen/common/domain.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/xen/common/domain.c b/xen/common/domain.c
+index 7cc9526139a6..e9be05f1d05f 100644
+--- a/xen/common/domain.c
++++ b/xen/common/domain.c
+@@ -1227,10 +1227,20 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset)
+     void *mapping;
+     vcpu_info_t *new_info;
+     struct page_info *page;
++    unsigned int align;
+ 
+     if ( offset > (PAGE_SIZE - sizeof(vcpu_info_t)) )
+         return -EINVAL;
+ 
++#ifdef CONFIG_COMPAT
++    if ( has_32bit_shinfo(d) )
++        align = alignof(new_info->compat);
++    else
++#endif
++        align = alignof(*new_info);
++    if ( offset & (align - 1) )
++        return -EINVAL;
++
+     if ( !mfn_eq(v->vcpu_info_mfn, INVALID_MFN) )
+         return -EINVAL;
+ 
+-- 
+2.17.1
+
diff --git a/system/xen/xsa/xsa328-4.13-1.patch b/system/xen/xsa/xsa328-4.13-1.patch
new file mode 100644
index 0000000000..56e48de3e9
--- /dev/null
+++ b/system/xen/xsa/xsa328-4.13-1.patch
@@ -0,0 +1,118 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: x86/EPT: ept_set_middle_entry() related adjustments
+
+ept_split_super_page() wants to further modify the newly allocated
+table, so have ept_set_middle_entry() return the mapped pointer rather
+than tearing it down and then getting re-established right again.
+
+Similarly ept_next_level() wants to hand back a mapped pointer of
+the next level page, so re-use the one established by
+ept_set_middle_entry() in case that path was taken.
+
+Pull the setting of suppress_ve ahead of insertion into the higher level
+table, and don't have ept_split_super_page() set the field a 2nd time.
+
+This is part of XSA-328.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/arch/x86/mm/p2m-ept.c
++++ b/xen/arch/x86/mm/p2m-ept.c
+@@ -187,8 +187,9 @@ static void ept_p2m_type_to_flags(struct
+ #define GUEST_TABLE_SUPER_PAGE  2
+ #define GUEST_TABLE_POD_PAGE    3
+ 
+-/* Fill in middle levels of ept table */
+-static int ept_set_middle_entry(struct p2m_domain *p2m, ept_entry_t *ept_entry)
++/* Fill in middle level of ept table; return pointer to mapped new table. */
++static ept_entry_t *ept_set_middle_entry(struct p2m_domain *p2m,
++                                         ept_entry_t *ept_entry)
+ {
+     mfn_t mfn;
+     ept_entry_t *table;
+@@ -196,7 +197,12 @@ static int ept_set_middle_entry(struct p
+ 
+     mfn = p2m_alloc_ptp(p2m, 0);
+     if ( mfn_eq(mfn, INVALID_MFN) )
+-        return 0;
++        return NULL;
++
++    table = map_domain_page(mfn);
++
++    for ( i = 0; i < EPT_PAGETABLE_ENTRIES; i++ )
++        table[i].suppress_ve = 1;
+ 
+     ept_entry->epte = 0;
+     ept_entry->mfn = mfn_x(mfn);
+@@ -208,14 +214,7 @@ static int ept_set_middle_entry(struct p
+ 
+     ept_entry->suppress_ve = 1;
+ 
+-    table = map_domain_page(mfn);
+-
+-    for ( i = 0; i < EPT_PAGETABLE_ENTRIES; i++ )
+-        table[i].suppress_ve = 1;
+-
+-    unmap_domain_page(table);
+-
+-    return 1;
++    return table;
+ }
+ 
+ /* free ept sub tree behind an entry */
+@@ -253,10 +252,10 @@ static bool_t ept_split_super_page(struc
+ 
+     ASSERT(is_epte_superpage(ept_entry));
+ 
+-    if ( !ept_set_middle_entry(p2m, &new_ept) )
++    table = ept_set_middle_entry(p2m, &new_ept);
++    if ( !table )
+         return 0;
+ 
+-    table = map_domain_page(_mfn(new_ept.mfn));
+     trunk = 1UL << ((level - 1) * EPT_TABLE_ORDER);
+ 
+     for ( i = 0; i < EPT_PAGETABLE_ENTRIES; i++ )
+@@ -267,7 +266,6 @@ static bool_t ept_split_super_page(struc
+         epte->sp = (level > 1);
+         epte->mfn += i * trunk;
+         epte->snp = is_iommu_enabled(p2m->domain) && iommu_snoop;
+-        epte->suppress_ve = 1;
+ 
+         ept_p2m_type_to_flags(p2m, epte, epte->sa_p2mt, epte->access);
+ 
+@@ -306,8 +304,7 @@ static int ept_next_level(struct p2m_dom
+                           ept_entry_t **table, unsigned long *gfn_remainder,
+                           int next_level)
+ {
+-    unsigned long mfn;
+-    ept_entry_t *ept_entry, e;
++    ept_entry_t *ept_entry, *next = NULL, e;
+     u32 shift, index;
+ 
+     shift = next_level * EPT_TABLE_ORDER;
+@@ -332,19 +329,17 @@ static int ept_next_level(struct p2m_dom
+         if ( read_only )
+             return GUEST_TABLE_MAP_FAILED;
+ 
+-        if ( !ept_set_middle_entry(p2m, ept_entry) )
++        next = ept_set_middle_entry(p2m, ept_entry);
++        if ( !next )
+             return GUEST_TABLE_MAP_FAILED;
+-        else
+-            e = atomic_read_ept_entry(ept_entry); /* Refresh */
++        /* e is now stale and hence may not be used anymore below. */
+     }
+-
+     /* The only time sp would be set here is if we had hit a superpage */
+-    if ( is_epte_superpage(&e) )
++    else if ( is_epte_superpage(&e) )
+         return GUEST_TABLE_SUPER_PAGE;
+ 
+-    mfn = e.mfn;
+     unmap_domain_page(*table);
+-    *table = map_domain_page(_mfn(mfn));
++    *table = next ?: map_domain_page(_mfn(e.mfn));
+     *gfn_remainder &= (1UL << shift) - 1;
+     return GUEST_TABLE_NORMAL_PAGE;
+ }
diff --git a/system/xen/xsa/xsa328-4.13-2.patch b/system/xen/xsa/xsa328-4.13-2.patch
new file mode 100644
index 0000000000..c4f437f625
--- /dev/null
+++ b/system/xen/xsa/xsa328-4.13-2.patch
@@ -0,0 +1,48 @@
+From: <security@xenproject.org>
+Subject: x86/ept: atomically modify entries in ept_next_level
+
+ept_next_level was passing a live PTE pointer to ept_set_middle_entry,
+which was then modified without taking into account that the PTE could
+be part of a live EPT table. This wasn't a security issue because the
+pages returned by p2m_alloc_ptp are zeroed, so adding such an entry
+before actually initializing it didn't allow a guest to access
+physical memory addresses it wasn't supposed to access.
+
+This is part of XSA-328.
+
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/arch/x86/mm/p2m-ept.c
++++ b/xen/arch/x86/mm/p2m-ept.c
+@@ -307,6 +307,8 @@ static int ept_next_level(struct p2m_dom
+     ept_entry_t *ept_entry, *next = NULL, e;
+     u32 shift, index;
+ 
++    ASSERT(next_level);
++
+     shift = next_level * EPT_TABLE_ORDER;
+ 
+     index = *gfn_remainder >> shift;
+@@ -323,16 +325,20 @@ static int ept_next_level(struct p2m_dom
+ 
+     if ( !is_epte_present(&e) )
+     {
++        int rc;
++
+         if ( e.sa_p2mt == p2m_populate_on_demand )
+             return GUEST_TABLE_POD_PAGE;
+ 
+         if ( read_only )
+             return GUEST_TABLE_MAP_FAILED;
+ 
+-        next = ept_set_middle_entry(p2m, ept_entry);
++        next = ept_set_middle_entry(p2m, &e);
+         if ( !next )
+             return GUEST_TABLE_MAP_FAILED;
+-        /* e is now stale and hence may not be used anymore below. */
++
++        rc = atomic_write_ept_entry(p2m, ept_entry, e, next_level);
++        ASSERT(rc == 0);
+     }
+     /* The only time sp would be set here is if we had hit a superpage */
+     else if ( is_epte_superpage(&e) )
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-1.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-1.patch
new file mode 100644
index 0000000000..9a08ab240e
--- /dev/null
+++ b/system/xen/xsa/xsa328-post-xsa321-4.13-1.patch
@@ -0,0 +1,31 @@
+From: Jan Beulich <jbeulich@suse.com>
+Subject: vtd: improve IOMMU TLB flush
+
+Do not limit PSI flushes to order 0 pages, in order to avoid doing a
+full TLB flush if the passed in page has an order greater than 0 and
+is aligned. Should increase the performance of IOMMU TLB flushes when
+dealing with page orders greater than 0.
+
+This is part of XSA-321.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/drivers/passthrough/vtd/iommu.c
++++ b/xen/drivers/passthrough/vtd/iommu.c
+@@ -570,13 +570,14 @@ static int __must_check iommu_flush_iotl
+         if ( iommu_domid == -1 )
+             continue;
+ 
+-        if ( page_count != 1 || dfn_eq(dfn, INVALID_DFN) )
++        if ( !page_count || (page_count & (page_count - 1)) ||
++             dfn_eq(dfn, INVALID_DFN) || !IS_ALIGNED(dfn_x(dfn), page_count) )
+             rc = iommu_flush_iotlb_dsi(iommu, iommu_domid,
+                                        0, flush_dev_iotlb);
+         else
+             rc = iommu_flush_iotlb_psi(iommu, iommu_domid,
+                                        dfn_to_daddr(dfn),
+-                                       PAGE_ORDER_4K,
++                                       get_order_from_pages(page_count),
+                                        !dma_old_pte_present,
+                                        flush_dev_iotlb);
+ 
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-2.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-2.patch
new file mode 100644
index 0000000000..1e48615f2b
--- /dev/null
+++ b/system/xen/xsa/xsa328-post-xsa321-4.13-2.patch
@@ -0,0 +1,175 @@
+From: <security@xenproject.org>
+Subject: vtd: prune (and rename) cache flush functions
+
+Rename __iommu_flush_cache to iommu_sync_cache and remove
+iommu_flush_cache_page. Also remove the iommu_flush_cache_entry
+wrapper and just use iommu_sync_cache instead. Note the _entry suffix
+was meaningless as the wrapper was already taking a size parameter in
+bytes. While there also constify the addr parameter.
+
+No functional change intended.
+
+This is part of XSA-321.
+
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/drivers/passthrough/vtd/extern.h
++++ b/xen/drivers/passthrough/vtd/extern.h
+@@ -43,8 +43,7 @@ void disable_qinval(struct vtd_iommu *io
+ int enable_intremap(struct vtd_iommu *iommu, int eim);
+ void disable_intremap(struct vtd_iommu *iommu);
+ 
+-void iommu_flush_cache_entry(void *addr, unsigned int size);
+-void iommu_flush_cache_page(void *addr, unsigned long npages);
++void iommu_sync_cache(const void *addr, unsigned int size);
+ int iommu_alloc(struct acpi_drhd_unit *drhd);
+ void iommu_free(struct acpi_drhd_unit *drhd);
+ 
+--- a/xen/drivers/passthrough/vtd/intremap.c
++++ b/xen/drivers/passthrough/vtd/intremap.c
+@@ -230,7 +230,7 @@ static void free_remap_entry(struct vtd_
+                      iremap_entries, iremap_entry);
+ 
+     update_irte(iommu, iremap_entry, &new_ire, false);
+-    iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry));
++    iommu_sync_cache(iremap_entry, sizeof(*iremap_entry));
+     iommu_flush_iec_index(iommu, 0, index);
+ 
+     unmap_vtd_domain_page(iremap_entries);
+@@ -406,7 +406,7 @@ static int ioapic_rte_to_remap_entry(str
+     }
+ 
+     update_irte(iommu, iremap_entry, &new_ire, !init);
+-    iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry));
++    iommu_sync_cache(iremap_entry, sizeof(*iremap_entry));
+     iommu_flush_iec_index(iommu, 0, index);
+ 
+     unmap_vtd_domain_page(iremap_entries);
+@@ -695,7 +695,7 @@ static int msi_msg_to_remap_entry(
+     update_irte(iommu, iremap_entry, &new_ire, msi_desc->irte_initialized);
+     msi_desc->irte_initialized = true;
+ 
+-    iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry));
++    iommu_sync_cache(iremap_entry, sizeof(*iremap_entry));
+     iommu_flush_iec_index(iommu, 0, index);
+ 
+     unmap_vtd_domain_page(iremap_entries);
+--- a/xen/drivers/passthrough/vtd/iommu.c
++++ b/xen/drivers/passthrough/vtd/iommu.c
+@@ -140,7 +140,8 @@ static int context_get_domain_id(struct
+ }
+ 
+ static int iommus_incoherent;
+-static void __iommu_flush_cache(void *addr, unsigned int size)
++
++void iommu_sync_cache(const void *addr, unsigned int size)
+ {
+     int i;
+     static unsigned int clflush_size = 0;
+@@ -155,16 +156,6 @@ static void __iommu_flush_cache(void *ad
+         cacheline_flush((char *)addr + i);
+ }
+ 
+-void iommu_flush_cache_entry(void *addr, unsigned int size)
+-{
+-    __iommu_flush_cache(addr, size);
+-}
+-
+-void iommu_flush_cache_page(void *addr, unsigned long npages)
+-{
+-    __iommu_flush_cache(addr, PAGE_SIZE * npages);
+-}
+-
+ /* Allocate page table, return its machine address */
+ uint64_t alloc_pgtable_maddr(unsigned long npages, nodeid_t node)
+ {
+@@ -183,7 +174,7 @@ uint64_t alloc_pgtable_maddr(unsigned lo
+         vaddr = __map_domain_page(cur_pg);
+         memset(vaddr, 0, PAGE_SIZE);
+ 
+-        iommu_flush_cache_page(vaddr, 1);
++        iommu_sync_cache(vaddr, PAGE_SIZE);
+         unmap_domain_page(vaddr);
+         cur_pg++;
+     }
+@@ -216,7 +207,7 @@ static u64 bus_to_context_maddr(struct v
+         }
+         set_root_value(*root, maddr);
+         set_root_present(*root);
+-        iommu_flush_cache_entry(root, sizeof(struct root_entry));
++        iommu_sync_cache(root, sizeof(struct root_entry));
+     }
+     maddr = (u64) get_context_addr(*root);
+     unmap_vtd_domain_page(root_entries);
+@@ -263,7 +254,7 @@ static u64 addr_to_dma_page_maddr(struct
+              */
+             dma_set_pte_readable(*pte);
+             dma_set_pte_writable(*pte);
+-            iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
++            iommu_sync_cache(pte, sizeof(struct dma_pte));
+         }
+ 
+         if ( level == 2 )
+@@ -640,7 +631,7 @@ static int __must_check dma_pte_clear_on
+     *flush_flags |= IOMMU_FLUSHF_modified;
+ 
+     spin_unlock(&hd->arch.mapping_lock);
+-    iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
++    iommu_sync_cache(pte, sizeof(struct dma_pte));
+ 
+     unmap_vtd_domain_page(page);
+ 
+@@ -679,7 +670,7 @@ static void iommu_free_page_table(struct
+             iommu_free_pagetable(dma_pte_addr(*pte), next_level);
+ 
+         dma_clear_pte(*pte);
+-        iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
++        iommu_sync_cache(pte, sizeof(struct dma_pte));
+     }
+ 
+     unmap_vtd_domain_page(pt_vaddr);
+@@ -1400,7 +1391,7 @@ int domain_context_mapping_one(
+     context_set_address_width(*context, agaw);
+     context_set_fault_enable(*context);
+     context_set_present(*context);
+-    iommu_flush_cache_entry(context, sizeof(struct context_entry));
++    iommu_sync_cache(context, sizeof(struct context_entry));
+     spin_unlock(&iommu->lock);
+ 
+     /* Context entry was previously non-present (with domid 0). */
+@@ -1564,7 +1555,7 @@ int domain_context_unmap_one(
+ 
+     context_clear_present(*context);
+     context_clear_entry(*context);
+-    iommu_flush_cache_entry(context, sizeof(struct context_entry));
++    iommu_sync_cache(context, sizeof(struct context_entry));
+ 
+     iommu_domid= domain_iommu_domid(domain, iommu);
+     if ( iommu_domid == -1 )
+@@ -1791,7 +1782,7 @@ static int __must_check intel_iommu_map_
+ 
+     *pte = new;
+ 
+-    iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
++    iommu_sync_cache(pte, sizeof(struct dma_pte));
+     spin_unlock(&hd->arch.mapping_lock);
+     unmap_vtd_domain_page(page);
+ 
+@@ -1866,7 +1857,7 @@ int iommu_pte_flush(struct domain *d, ui
+     int iommu_domid;
+     int rc = 0;
+ 
+-    iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
++    iommu_sync_cache(pte, sizeof(struct dma_pte));
+ 
+     for_each_drhd_unit ( drhd )
+     {
+@@ -2724,7 +2715,7 @@ static int __init intel_iommu_quarantine
+             dma_set_pte_addr(*pte, maddr);
+             dma_set_pte_readable(*pte);
+         }
+-        iommu_flush_cache_page(parent, 1);
++        iommu_sync_cache(parent, PAGE_SIZE);
+ 
+         unmap_vtd_domain_page(parent);
+         parent = map_vtd_domain_page(maddr);
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-3.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-3.patch
new file mode 100644
index 0000000000..c141c4b785
--- /dev/null
+++ b/system/xen/xsa/xsa328-post-xsa321-4.13-3.patch
@@ -0,0 +1,82 @@
+From: <security@xenproject.org>
+Subject: x86/iommu: introduce a cache sync hook
+
+The hook is only implemented for VT-d and it uses the already existing
+iommu_sync_cache function present in VT-d code. The new hook is
+added so that the cache can be flushed by code outside of VT-d when
+using shared page tables.
+
+Note that alloc_pgtable_maddr must use the now locally defined
+sync_cache function, because IOMMU ops are not yet setup the first
+time the function gets called during IOMMU initialization.
+
+No functional change intended.
+
+This is part of XSA-321.
+
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/drivers/passthrough/vtd/extern.h
++++ b/xen/drivers/passthrough/vtd/extern.h
+@@ -43,7 +43,6 @@ void disable_qinval(struct vtd_iommu *io
+ int enable_intremap(struct vtd_iommu *iommu, int eim);
+ void disable_intremap(struct vtd_iommu *iommu);
+ 
+-void iommu_sync_cache(const void *addr, unsigned int size);
+ int iommu_alloc(struct acpi_drhd_unit *drhd);
+ void iommu_free(struct acpi_drhd_unit *drhd);
+ 
+--- a/xen/drivers/passthrough/vtd/iommu.c
++++ b/xen/drivers/passthrough/vtd/iommu.c
+@@ -141,7 +141,7 @@ static int context_get_domain_id(struct
+ 
+ static int iommus_incoherent;
+ 
+-void iommu_sync_cache(const void *addr, unsigned int size)
++static void sync_cache(const void *addr, unsigned int size)
+ {
+     int i;
+     static unsigned int clflush_size = 0;
+@@ -174,7 +174,7 @@ uint64_t alloc_pgtable_maddr(unsigned lo
+         vaddr = __map_domain_page(cur_pg);
+         memset(vaddr, 0, PAGE_SIZE);
+ 
+-        iommu_sync_cache(vaddr, PAGE_SIZE);
++        sync_cache(vaddr, PAGE_SIZE);
+         unmap_domain_page(vaddr);
+         cur_pg++;
+     }
+@@ -2763,6 +2763,7 @@ const struct iommu_ops __initconstrel in
+     .iotlb_flush_all = iommu_flush_iotlb_all,
+     .get_reserved_device_memory = intel_iommu_get_reserved_device_memory,
+     .dump_p2m_table = vtd_dump_p2m_table,
++    .sync_cache = sync_cache,
+ };
+ 
+ const struct iommu_init_ops __initconstrel intel_iommu_init_ops = {
+--- a/xen/include/asm-x86/iommu.h
++++ b/xen/include/asm-x86/iommu.h
+@@ -121,6 +121,13 @@ extern bool untrusted_msi;
+ int pi_update_irte(const struct pi_desc *pi_desc, const struct pirq *pirq,
+                    const uint8_t gvec);
+ 
++#define iommu_sync_cache(addr, size) ({                 \
++    const struct iommu_ops *ops = iommu_get_ops();      \
++                                                        \
++    if ( ops->sync_cache )                              \
++        iommu_vcall(ops, sync_cache, addr, size);       \
++})
++
+ #endif /* !__ARCH_X86_IOMMU_H__ */
+ /*
+  * Local variables:
+--- a/xen/include/xen/iommu.h
++++ b/xen/include/xen/iommu.h
+@@ -250,6 +250,7 @@ struct iommu_ops {
+     int (*setup_hpet_msi)(struct msi_desc *);
+ 
+     int (*adjust_irq_affinities)(void);
++    void (*sync_cache)(const void *addr, unsigned int size);
+ #endif /* CONFIG_X86 */
+ 
+     int __must_check (*suspend)(void);
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-4.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-4.patch
new file mode 100644
index 0000000000..62bbcc7271
--- /dev/null
+++ b/system/xen/xsa/xsa328-post-xsa321-4.13-4.patch
@@ -0,0 +1,36 @@
+From: <security@xenproject.org>
+Subject: vtd: don't assume addresses are aligned in sync_cache
+
+Current code in sync_cache assume that the address passed in is
+aligned to a cache line size. Fix the code to support passing in
+arbitrary addresses not necessarily aligned to a cache line size.
+
+This is part of XSA-321.
+
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/drivers/passthrough/vtd/iommu.c
++++ b/xen/drivers/passthrough/vtd/iommu.c
+@@ -143,8 +143,8 @@ static int iommus_incoherent;
+ 
+ static void sync_cache(const void *addr, unsigned int size)
+ {
+-    int i;
+-    static unsigned int clflush_size = 0;
++    static unsigned long clflush_size = 0;
++    const void *end = addr + size;
+ 
+     if ( !iommus_incoherent )
+         return;
+@@ -152,8 +152,9 @@ static void sync_cache(const void *addr,
+     if ( clflush_size == 0 )
+         clflush_size = get_cache_line_size();
+ 
+-    for ( i = 0; i < size; i += clflush_size )
+-        cacheline_flush((char *)addr + i);
++    addr -= (unsigned long)addr & (clflush_size - 1);
++    for ( ; addr < end; addr += clflush_size )
++        cacheline_flush((char *)addr);
+ }
+ 
+ /* Allocate page table, return its machine address */
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-5.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-5.patch
new file mode 100644
index 0000000000..60cfe6ccdf
--- /dev/null
+++ b/system/xen/xsa/xsa328-post-xsa321-4.13-5.patch
@@ -0,0 +1,24 @@
+From: <security@xenproject.org>
+Subject: x86/alternative: introduce alternative_2
+
+It's based on alternative_io_2 without inputs or outputs but with an
+added memory clobber.
+
+This is part of XSA-321.
+
+Acked-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/include/asm-x86/alternative.h
++++ b/xen/include/asm-x86/alternative.h
+@@ -114,6 +114,11 @@ extern void alternative_branches(void);
+ #define alternative(oldinstr, newinstr, feature)                        \
+         asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory")
+ 
++#define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \
++	asm volatile (ALTERNATIVE_2(oldinstr, newinstr1, feature1,	\
++				    newinstr2, feature2)		\
++		      : : : "memory")
++
+ /*
+  * Alternative inline assembly with input.
+  *
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-6.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-6.patch
new file mode 100644
index 0000000000..4c5c5ab0ba
--- /dev/null
+++ b/system/xen/xsa/xsa328-post-xsa321-4.13-6.patch
@@ -0,0 +1,91 @@
+From: <security@xenproject.org>
+Subject: vtd: optimize CPU cache sync
+
+Some VT-d IOMMUs are non-coherent, which requires a cache write back
+in order for the changes made by the CPU to be visible to the IOMMU.
+This cache write back was unconditionally done using clflush, but there are
+other more efficient instructions to do so, hence implement support
+for them using the alternative framework.
+
+This is part of XSA-321.
+
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/drivers/passthrough/vtd/extern.h
++++ b/xen/drivers/passthrough/vtd/extern.h
+@@ -68,7 +68,6 @@ int __must_check qinval_device_iotlb_syn
+                                           u16 did, u16 size, u64 addr);
+ 
+ unsigned int get_cache_line_size(void);
+-void cacheline_flush(char *);
+ void flush_all_cache(void);
+ 
+ uint64_t alloc_pgtable_maddr(unsigned long npages, nodeid_t node);
+--- a/xen/drivers/passthrough/vtd/iommu.c
++++ b/xen/drivers/passthrough/vtd/iommu.c
+@@ -31,6 +31,7 @@
+ #include <xen/pci_regs.h>
+ #include <xen/keyhandler.h>
+ #include <asm/msi.h>
++#include <asm/nops.h>
+ #include <asm/irq.h>
+ #include <asm/hvm/vmx/vmx.h>
+ #include <asm/p2m.h>
+@@ -154,7 +155,42 @@ static void sync_cache(const void *addr,
+ 
+     addr -= (unsigned long)addr & (clflush_size - 1);
+     for ( ; addr < end; addr += clflush_size )
+-        cacheline_flush((char *)addr);
++/*
++ * The arguments to a macro must not include preprocessor directives. Doing so
++ * results in undefined behavior, so we have to create some defines here in
++ * order to avoid it.
++ */
++#if defined(HAVE_AS_CLWB)
++# define CLWB_ENCODING "clwb %[p]"
++#elif defined(HAVE_AS_XSAVEOPT)
++# define CLWB_ENCODING "data16 xsaveopt %[p]" /* clwb */
++#else
++# define CLWB_ENCODING ".byte 0x66, 0x0f, 0xae, 0x30" /* clwb (%%rax) */
++#endif
++
++#define BASE_INPUT(addr) [p] "m" (*(const char *)(addr))
++#if defined(HAVE_AS_CLWB) || defined(HAVE_AS_XSAVEOPT)
++# define INPUT BASE_INPUT
++#else
++# define INPUT(addr) "a" (addr), BASE_INPUT(addr)
++#endif
++        /*
++         * Note regarding the use of NOP_DS_PREFIX: it's faster to do a clflush
++         * + prefix than a clflush + nop, and hence the prefix is added instead
++         * of letting the alternative framework fill the gap by appending nops.
++         */
++        alternative_io_2(".byte " __stringify(NOP_DS_PREFIX) "; clflush %[p]",
++                         "data16 clflush %[p]", /* clflushopt */
++                         X86_FEATURE_CLFLUSHOPT,
++                         CLWB_ENCODING,
++                         X86_FEATURE_CLWB, /* no outputs */,
++                         INPUT(addr));
++#undef INPUT
++#undef BASE_INPUT
++#undef CLWB_ENCODING
++
++    alternative_2("", "sfence", X86_FEATURE_CLFLUSHOPT,
++                      "sfence", X86_FEATURE_CLWB);
+ }
+ 
+ /* Allocate page table, return its machine address */
+--- a/xen/drivers/passthrough/vtd/x86/vtd.c
++++ b/xen/drivers/passthrough/vtd/x86/vtd.c
+@@ -51,11 +51,6 @@ unsigned int get_cache_line_size(void)
+     return ((cpuid_ebx(1) >> 8) & 0xff) * 8;
+ }
+ 
+-void cacheline_flush(char * addr)
+-{
+-    clflush(addr);
+-}
+-
+ void flush_all_cache()
+ {
+     wbinvd();
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-7.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-7.patch
new file mode 100644
index 0000000000..0bd018f972
--- /dev/null
+++ b/system/xen/xsa/xsa328-post-xsa321-4.13-7.patch
@@ -0,0 +1,153 @@
+From: <security@xenproject.org>
+Subject: x86/ept: flush cache when modifying PTEs and sharing page tables
+
+Modifications made to the page tables by EPT code need to be written
+to memory when the page tables are shared with the IOMMU, as Intel
+IOMMUs can be non-coherent and thus require changes to be written to
+memory in order to be visible to the IOMMU.
+
+In order to achieve this make sure data is written back to memory
+after writing an EPT entry when the recalc bit is not set in
+atomic_write_ept_entry. If such bit is set, the entry will be
+adjusted and atomic_write_ept_entry will be called a second time
+without the recalc bit set. Note that when splitting a super page the
+new tables resulting of the split should also be written back.
+
+Failure to do so can allow devices behind the IOMMU access to the
+stale super page, or cause coherency issues as changes made by the
+processor to the page tables are not visible to the IOMMU.
+
+This allows to remove the VT-d specific iommu_pte_flush helper, since
+the cache write back is now performed by atomic_write_ept_entry, and
+hence iommu_iotlb_flush can be used to flush the IOMMU TLB. The newly
+used method (iommu_iotlb_flush) can result in less flushes, since it
+might sometimes be called rightly with 0 flags, in which case it
+becomes a no-op.
+
+This is part of XSA-321.
+
+Reviewed-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/arch/x86/mm/p2m-ept.c
++++ b/xen/arch/x86/mm/p2m-ept.c
+@@ -58,6 +58,19 @@ static int atomic_write_ept_entry(struct
+ 
+     write_atomic(&entryptr->epte, new.epte);
+ 
++    /*
++     * The recalc field on the EPT is used to signal either that a
++     * recalculation of the EMT field is required (which doesn't effect the
++     * IOMMU), or a type change. Type changes can only be between ram_rw,
++     * logdirty and ioreq_server: changes to/from logdirty won't work well with
++     * an IOMMU anyway, as IOMMU #PFs are not synchronous and will lead to
++     * aborts, and changes to/from ioreq_server are already fully flushed
++     * before returning to guest context (see
++     * XEN_DMOP_map_mem_type_to_ioreq_server).
++     */
++    if ( !new.recalc && iommu_use_hap_pt(p2m->domain) )
++        iommu_sync_cache(entryptr, sizeof(*entryptr));
++
+     return 0;
+ }
+ 
+@@ -278,6 +291,9 @@ static bool_t ept_split_super_page(struc
+             break;
+     }
+ 
++    if ( iommu_use_hap_pt(p2m->domain) )
++        iommu_sync_cache(table, EPT_PAGETABLE_ENTRIES * sizeof(ept_entry_t));
++
+     unmap_domain_page(table);
+ 
+     /* Even failed we should install the newly allocated ept page. */
+@@ -337,6 +353,9 @@ static int ept_next_level(struct p2m_dom
+         if ( !next )
+             return GUEST_TABLE_MAP_FAILED;
+ 
++        if ( iommu_use_hap_pt(p2m->domain) )
++            iommu_sync_cache(next, EPT_PAGETABLE_ENTRIES * sizeof(ept_entry_t));
++
+         rc = atomic_write_ept_entry(p2m, ept_entry, e, next_level);
+         ASSERT(rc == 0);
+     }
+@@ -821,7 +840,10 @@ out:
+          need_modify_vtd_table )
+     {
+         if ( iommu_use_hap_pt(d) )
+-            rc = iommu_pte_flush(d, gfn, &ept_entry->epte, order, vtd_pte_present);
++            rc = iommu_iotlb_flush(d, _dfn(gfn), (1u << order),
++                                   (iommu_flags ? IOMMU_FLUSHF_added : 0) |
++                                   (vtd_pte_present ? IOMMU_FLUSHF_modified
++                                                    : 0));
+         else if ( need_iommu_pt_sync(d) )
+             rc = iommu_flags ?
+                 iommu_legacy_map(d, _dfn(gfn), mfn, order, iommu_flags) :
+--- a/xen/drivers/passthrough/vtd/iommu.c
++++ b/xen/drivers/passthrough/vtd/iommu.c
+@@ -1884,53 +1884,6 @@ static int intel_iommu_lookup_page(struc
+     return 0;
+ }
+ 
+-int iommu_pte_flush(struct domain *d, uint64_t dfn, uint64_t *pte,
+-                    int order, int present)
+-{
+-    struct acpi_drhd_unit *drhd;
+-    struct vtd_iommu *iommu = NULL;
+-    struct domain_iommu *hd = dom_iommu(d);
+-    bool_t flush_dev_iotlb;
+-    int iommu_domid;
+-    int rc = 0;
+-
+-    iommu_sync_cache(pte, sizeof(struct dma_pte));
+-
+-    for_each_drhd_unit ( drhd )
+-    {
+-        iommu = drhd->iommu;
+-        if ( !test_bit(iommu->index, &hd->arch.iommu_bitmap) )
+-            continue;
+-
+-        flush_dev_iotlb = !!find_ats_dev_drhd(iommu);
+-        iommu_domid= domain_iommu_domid(d, iommu);
+-        if ( iommu_domid == -1 )
+-            continue;
+-
+-        rc = iommu_flush_iotlb_psi(iommu, iommu_domid,
+-                                   __dfn_to_daddr(dfn),
+-                                   order, !present, flush_dev_iotlb);
+-        if ( rc > 0 )
+-        {
+-            iommu_flush_write_buffer(iommu);
+-            rc = 0;
+-        }
+-    }
+-
+-    if ( unlikely(rc) )
+-    {
+-        if ( !d->is_shutting_down && printk_ratelimit() )
+-            printk(XENLOG_ERR VTDPREFIX
+-                   " d%d: IOMMU pages flush failed: %d\n",
+-                   d->domain_id, rc);
+-
+-        if ( !is_hardware_domain(d) )
+-            domain_crash(d);
+-    }
+-
+-    return rc;
+-}
+-
+ static int __init vtd_ept_page_compatible(struct vtd_iommu *iommu)
+ {
+     u64 ept_cap, vtd_cap = iommu->cap;
+--- a/xen/include/asm-x86/iommu.h
++++ b/xen/include/asm-x86/iommu.h
+@@ -97,10 +97,6 @@ static inline int iommu_adjust_irq_affin
+            : 0;
+ }
+ 
+-/* While VT-d specific, this must get declared in a generic header. */
+-int __must_check iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte,
+-                                 int order, int present);
+-
+ static inline bool iommu_supports_x2apic(void)
+ {
+     return iommu_init_ops && iommu_init_ops->supports_x2apic
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/xldconfig/xldconfig.SlackBuild b/system/xldconfig/xldconfig.SlackBuild
index 24f0bd054f..519b8c7747 100644
--- a/system/xldconfig/xldconfig.SlackBuild
+++ b/system/xldconfig/xldconfig.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PRGNAM=xldconfig
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/xldconfig/xldconfig.info b/system/xldconfig/xldconfig.info
index 0bf7efca4b..3524de9603 100644
--- a/system/xldconfig/xldconfig.info
+++ b/system/xldconfig/xldconfig.info
@@ -1,8 +1,8 @@
 PRGNAM="xldconfig"
-VERSION="0.6"
+VERSION="0.7"
 HOMEPAGE="https://www.jagda.eu/linux/xldxonfig"
-DOWNLOAD="https://www.jagda.eu/linux/xldxonfig/xldconfig-0.6.tgz"
-MD5SUM="42b2034e05d64d5adf3c6576cd5cf048"
+DOWNLOAD="https://www.jagda.eu/linux/xldxonfig/xldconfig-0.7.tgz"
+MD5SUM="49693d184e56714c4fb474a99bb2e3ba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/xvfb-run/README b/system/xvfb-run/README
new file mode 100644
index 0000000000..aafb4f39bc
--- /dev/null
+++ b/system/xvfb-run/README
@@ -0,0 +1 @@
+Run a command in a virtual X server environment.
diff --git a/system/xvfb-run/slack-desc b/system/xvfb-run/slack-desc
new file mode 100644
index 0000000000..e871d8c5f0
--- /dev/null
+++ b/system/xvfb-run/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------------------------------------------------------|
+xvfb-run: xvfb-run (Run a command in a virtual X server environment)
+xvfb-run:
+xvfb-run: xvfb-run is a script using virtual framebufer X server
+xvfb-run: to run X programs from command line.
+xvfb-run:
+xvfb-run:
+xvfb-run:
+xvfb-run:
+xvfb-run:
+xvfb-run:
+xvfb-run:
diff --git a/system/xvfb-run/xvfb-run.SlackBuild b/system/xvfb-run/xvfb-run.SlackBuild
new file mode 100644
index 0000000000..9f1c3a092d
--- /dev/null
+++ b/system/xvfb-run/xvfb-run.SlackBuild
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+# Slackware build script for xvfb-run
+
+# Copyright 2020 Jan F, Chadima <jfch.jagda.eu>
+# 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=xvfb-run
+VERSION=${VERSION:-1.19.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
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+ar x $CWD/xvfb_$VERSION-*.deb
+cd $PKG
+tar xvf $TMP/$PRGNAM-$VERSION/data.tar.xz
+
+rm -f usr/bin/Xvfb
+mv usr/share/* usr
+rmdir usr/share
+rm -f usr/doc/xvfb/changelog*
+mv usr/doc/xvfb usr/doc/xvfb-bin-$VERSION
+rm -f usr/man/man1/Xvfb.1.gz
+mkdir install
+
+cat $CWD/slack-desc > install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/xvfb-run/xvfb-run.info b/system/xvfb-run/xvfb-run.info
new file mode 100644
index 0000000000..7ad63a27c7
--- /dev/null
+++ b/system/xvfb-run/xvfb-run.info
@@ -0,0 +1,10 @@
+PRGNAM="xvfb-run"
+VERSION="1.19.2"
+HOMEPAGE="https://packages.gentoo.org/packages/x11-misc/xvfb-run"
+DOWNLOAD="http://ftp.us.debian.org/debian/pool/main/x/xorg-server/xvfb_1.19.2-1+deb9u5_i386.deb"
+MD5SUM="4b467ff96d94ad07b5550d052466449c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jan F. Chadima"
+EMAIL="jfch@jagda.eu"
diff --git a/system/yaft/README b/system/yaft/README
new file mode 100644
index 0000000000..751cd4f635
--- /dev/null
+++ b/system/yaft/README
@@ -0,0 +1,23 @@
+Yet another framebuffer terminal (aka "yaft") is simple terminal emulator for minimalist,
+living without X.
+This software is being developed to replace Linux console for personal use.
+
+Features:
+
+* various framebuffer types (8/15/16/24/32bpp)
+* compatible with vt102 and Linux console (detail)
+* UTF-8 encoding and UCS2 glyphs
+* 256 colors (same as xterm)
+* wallpaper
+* DRCS (DECDLD/DRCSMMv1) (experimental)
+* sixel (experimental)
+
+OPTIONS
+
+If you need active Background Draw (always draw even if vt is not active):
+
+  BACKGROUND_DRAW=yes sh yaft.SlackBuild
+
+
+!!! NOTE !!!
+sbo-patches/background-draw.patch : For activate the BACKGROUND DRAW option
diff --git a/system/yaft/sbo-patches/background-drawm.patch b/system/yaft/sbo-patches/background-drawm.patch
new file mode 100644
index 0000000000..0ffeb7cf9f
--- /dev/null
+++ b/system/yaft/sbo-patches/background-drawm.patch
@@ -0,0 +1,11 @@
+--- conf.h	2020-09-12 15:40:06.962795268 -0300
++++ b/conf.h	2020-09-12 15:54:57.712812014 -0300
+@@ -14,7 +14,7 @@
+ 	VERBOSE          = false,  /* write dump of input to stdout, debug message to stderr */
+ 	TABSTOP          = 8,      /* hardware tabstop */
+ 	LAZY_DRAW        = true,   /* don't draw when input data size is larger than BUFSIZE */
+-	BACKGROUND_DRAW  = false,  /* always draw even if vt is not active */
++	BACKGROUND_DRAW  = true,  /* always draw even if vt is not active */
+ 	VT_CONTROL       = true,   /* handle vt switching */
+ 	FORCE_TEXT_MODE  = false,  /* force KD_TEXT mode (not use KD_GRAPHICS mode) */
+ 	SUBSTITUTE_HALF  = 0x0020, /* used for missing glyph(single width): U+0020 (SPACE) */
diff --git a/system/yaft/slack-desc b/system/yaft/slack-desc
new file mode 100644
index 0000000000..5d312533f1
--- /dev/null
+++ b/system/yaft/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------------------------------------------------------|
+yaft: yaft (Yet another framebuffer terminal)
+yaft:
+yaft: Simple terminal emulator for minimalist. Living without X.
+yaft:
+yaft:
+yaft:
+yaft:
+yaft:
+yaft:
+yaft: https://github.com/uobikiemukot/yaft
+yaft:
diff --git a/system/yaft/yaft.SlackBuild b/system/yaft/yaft.SlackBuild
new file mode 100644
index 0000000000..bc1dd40caa
--- /dev/null
+++ b/system/yaft/yaft.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+# Slackware build script for abella
+# Copyright 2020 Jefferson Rocha <jeffersoncarneiro@slackjeff.com.br>
+# 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=yaft
+VERSION=${VERSION:-0.2.9}
+UNPACK=${UNPACK:-v}
+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 {} \;
+
+# Enable Backgroun Draw!
+BACKGROUND_DRAW=${BACKGROUND_DRAW:-no}
+[ "$BACKGROUND_DRAW" = 'yes' ] && patch -p1 <${CWD}/sbo-patches/background-drawm.patch
+
+# Var MANDIR not work.
+sed -i 's|$(DESTDIR)/usr/share/man|$(DESTDIR)/usr/man|' makefile
+
+# Generate bin and install
+make PREFIX=/usr
+
+make install 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
+
+# Send original Docs and archives
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog 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/system/yaft/yaft.info b/system/yaft/yaft.info
new file mode 100644
index 0000000000..7e02516027
--- /dev/null
+++ b/system/yaft/yaft.info
@@ -0,0 +1,10 @@
+PRGNAM="yaft"
+VERSION="0.2.9"
+HOMEPAGE="https://github.com/uobikiemukot/yaft"
+DOWNLOAD="https://github.com/uobikiemukot/yaft/archive/v0.2.9/yaft-0.2.9.tar.gz"
+MD5SUM="ddcbe929c51c453b01e3d18579b0860a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jefferson Rocha"
+EMAIL="jeffersoncarneiro@slackjeff.com.br"
diff --git a/system/yash/yash.SlackBuild b/system/yash/yash.SlackBuild
index cabe3bca8d..5a93ecb8d4 100644
--- a/system/yash/yash.SlackBuild
+++ b/system/yash/yash.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for yash
 
 # Copyright 2015-2018 Leonard Schmidt <lems@gmx.net>
-# Copyright 2018-2019 Hunter Sezen <orbea@riseup.net>
+# Copyright 2018-2020 Hunter Sezen <orbea@riseup.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=yash
-VERSION=${VERSION:-2.49}
+VERSION=${VERSION:-2.51}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,6 +77,8 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man
 
 make
+# 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 4dfe162189..1267972a88 100644
--- a/system/yash/yash.info
+++ b/system/yash/yash.info
@@ -1,8 +1,8 @@
 PRGNAM="yash"
-VERSION="2.49"
+VERSION="2.51"
 HOMEPAGE="https://yash.osdn.jp/index.html.en"
-DOWNLOAD="https://osdn.net/dl/yash/yash-2.49.tar.xz"
-MD5SUM="38ff1fad5775906e62bb1b4e4fdb7255"
+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/README b/system/zfs-on-linux/README
index 43668b1c8c..fe11a0407f 100644
--- a/system/zfs-on-linux/README
+++ b/system/zfs-on-linux/README
@@ -10,6 +10,6 @@ This package is kernel dependent, so you'll need to recompile it for
 every new kernel you choose to run.
 
 Please use KERN environment variable if target kernel version differs
-from that's of the build machine, e.g. `export KERN=5.4.7`.
+from that's of the build machine, e.g. `export KERN=5.4.51`.
 
 NOTE: you should run ZFS on 64-bit systems.
diff --git a/system/zfs-on-linux/zfs-on-linux.SlackBuild b/system/zfs-on-linux/zfs-on-linux.SlackBuild
index 6647a2de13..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.3}
-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 053c068c09..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.3"
+VERSION="0.8.6"
 HOMEPAGE="https://zfsonlinux.org"
-DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz"
-MD5SUM="405ad50a9d24794a70d2709097058e63"
+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"
diff --git a/system/zsh-completions/zsh-completions.SlackBuild b/system/zsh-completions/zsh-completions.SlackBuild
index a53d32a362..3f7d830057 100644
--- a/system/zsh-completions/zsh-completions.SlackBuild
+++ b/system/zsh-completions/zsh-completions.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for the zsh-completions.
 #
-# Copyright 2018-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2018-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=zsh-completions
-VERSION=${VERSION:-0.31.0}
+VERSION=${VERSION:-0.32.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/zsh-completions/zsh-completions.info b/system/zsh-completions/zsh-completions.info
index 6da19aa364..b33d141a83 100644
--- a/system/zsh-completions/zsh-completions.info
+++ b/system/zsh-completions/zsh-completions.info
@@ -1,8 +1,8 @@
 PRGNAM="zsh-completions"
-VERSION="0.31.0"
+VERSION="0.32.0"
 HOMEPAGE="https://github.com/zsh-users/zsh-completions"
-DOWNLOAD="https://github.com/zsh-users/zsh-completions/archive/0.31.0/zsh-completions-0.31.0.tar.gz"
-MD5SUM="a0fdd1166fe691e980623c069f0b9cf7"
+DOWNLOAD="https://github.com/zsh-users/zsh-completions/archive/0.32.0/zsh-completions-0.32.0.tar.gz"
+MD5SUM="6dd2963013700d6024cf3e292cc1110c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""