diff --git a/lang/swipl/Makefile b/lang/swipl/Makefile
index 6bc76e122e66..ab32094ba735 100644
--- a/lang/swipl/Makefile
+++ b/lang/swipl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	swi-pl
 DISTVERSION=	9.2.9
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.swi-prolog.org/download/stable/src/
 DISTNAME=	swipl-${DISTVERSION}
diff --git a/lang/swipl/pkg-plist b/lang/swipl/pkg-plist
index 06d1f7d90e80..0def6706e26a 100644
--- a/lang/swipl/pkg-plist
+++ b/lang/swipl/pkg-plist
@@ -9,7 +9,7 @@ lib/swipl/README.md
 lib/swipl/app/README.md
 lib/swipl/app/app.pl
 lib/swipl/app/latex2html.pl
-lib/swipl/app/mqi.pl
+%%THREADED%%lib/swipl/app/mqi.pl
 lib/swipl/app/pack.pl
 lib/swipl/app/qlf.pl
 lib/swipl/bin/%%ARCH%%-%%OS%%/swipl
@@ -83,10 +83,10 @@ lib/swipl/lib/%%ARCH%%-%%OS%%/porter_stem.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/process.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/prolog_stream.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/protobufs.so
-lib/swipl/lib/%%ARCH%%-%%OS%%/rdf_db.so
+%%THREADED%%lib/swipl/lib/%%ARCH%%-%%OS%%/rdf_db.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/readline4pl.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/readutil.so
-lib/swipl/lib/%%ARCH%%-%%OS%%/redis4pl.so
+%%THREADED%%lib/swipl/lib/%%ARCH%%-%%OS%%/redis4pl.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/rlimit.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/sched.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/sgml2pl.so
@@ -99,19 +99,19 @@ lib/swipl/lib/%%ARCH%%-%%OS%%/sweep-module.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/syslog.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/table.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/tex.so
-lib/swipl/lib/%%ARCH%%-%%OS%%/time.so
+%%THREADED%%lib/swipl/lib/%%ARCH%%-%%OS%%/time.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/turtle.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/uid.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/unicode4pl.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/unix.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/uri.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/uuid.so
-lib/swipl/lib/%%ARCH%%-%%OS%%/websocket.so
+%%THREADED%%lib/swipl/lib/%%ARCH%%-%%OS%%/websocket.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/yaml4pl.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/zlib4pl.so
-lib/swipl/lib/swiplserver/LICENSE
-lib/swipl/lib/swiplserver/__init__.py
-lib/swipl/lib/swiplserver/prologmqi.py
+%%THREADED%%lib/swipl/lib/swiplserver/LICENSE
+%%THREADED%%lib/swipl/lib/swiplserver/__init__.py
+%%THREADED%%lib/swipl/lib/swiplserver/prologmqi.py
 lib/swipl/library/INDEX.pl
 lib/swipl/library/aggregate.pl
 lib/swipl/library/ansi_term.pl
@@ -201,8 +201,8 @@ lib/swipl/library/dialect/xsb/source.pl
 lib/swipl/library/dialect/xsb/standard.pl
 lib/swipl/library/dialect/xsb/storage.pl
 lib/swipl/library/dialect/xsb/string.pl
-lib/swipl/library/dialect/xsb/thread.pl
-lib/swipl/library/dialect/xsb/timed_call.pl
+%%THREADED%%lib/swipl/library/dialect/xsb/thread.pl
+%%THREADED%%lib/swipl/library/dialect/xsb/timed_call.pl
 lib/swipl/library/dialect/yap.pl
 lib/swipl/library/dialect/yap/README.TXT
 lib/swipl/library/dicts.pl
@@ -258,7 +258,7 @@ lib/swipl/library/ext/clib/socket.pl
 lib/swipl/library/ext/clib/streaminfo.pl
 lib/swipl/library/ext/clib/streampool.pl
 lib/swipl/library/ext/clib/syslog.pl
-lib/swipl/library/ext/clib/time.pl
+%%THREADED%%lib/swipl/library/ext/clib/time.pl
 lib/swipl/library/ext/clib/udp_broadcast.pl
 lib/swipl/library/ext/clib/uid.pl
 lib/swipl/library/ext/clib/unix.pl
@@ -298,48 +298,48 @@ lib/swipl/library/ext/clpqr/clpr/store_r.pl
 %%ODBC%%lib/swipl/library/ext/cql/cql/sql_tokenizer.pl
 %%ODBC%%lib/swipl/library/ext/cql/cql/sql_write.pl
 lib/swipl/library/ext/http/http/INDEX.pl
-lib/swipl/library/ext/http/http/README.md
-lib/swipl/library/ext/http/http/ax.pl
+%%THREADED%%lib/swipl/library/ext/http/http/README.md
+%%THREADED%%lib/swipl/library/ext/http/http/ax.pl
 lib/swipl/library/ext/http/http/dcg_basics.pl
-lib/swipl/library/ext/http/http/graphql.pl
+%%THREADED%%lib/swipl/library/ext/http/http/graphql.pl
 lib/swipl/library/ext/http/http/html_head.pl
 lib/swipl/library/ext/http/http/html_quasiquotations.pl
 lib/swipl/library/ext/http/http/html_write.pl
-lib/swipl/library/ext/http/http/htmx.pl
-lib/swipl/library/ext/http/http/http_authenticate.pl
+%%THREADED%%lib/swipl/library/ext/http/http/htmx.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_authenticate.pl
 lib/swipl/library/ext/http/http/http_client.pl
-lib/swipl/library/ext/http/http/http_cookie.pl
-lib/swipl/library/ext/http/http/http_cors.pl
-lib/swipl/library/ext/http/http/http_digest.pl
-lib/swipl/library/ext/http/http/http_dirindex.pl
-lib/swipl/library/ext/http/http/http_dispatch.pl
-lib/swipl/library/ext/http/http/http_dyn_workers.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_cookie.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_cors.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_digest.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_dirindex.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_dispatch.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_dyn_workers.pl
 lib/swipl/library/ext/http/http/http_error.pl
-lib/swipl/library/ext/http/http/http_exception.pl
-lib/swipl/library/ext/http/http/http_files.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_exception.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_files.pl
 lib/swipl/library/ext/http/http/http_header.pl
-lib/swipl/library/ext/http/http/http_hook.pl
-lib/swipl/library/ext/http/http/http_host.pl
-lib/swipl/library/ext/http/http/http_json.pl
-lib/swipl/library/ext/http/http/http_load.pl
-lib/swipl/library/ext/http/http/http_log.pl
-lib/swipl/library/ext/http/http/http_multipart_plugin.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_hook.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_host.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_json.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_load.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_log.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_multipart_plugin.pl
 lib/swipl/library/ext/http/http/http_open.pl
-lib/swipl/library/ext/http/http/http_openid.pl
-lib/swipl/library/ext/http/http/http_parameters.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_openid.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_parameters.pl
 lib/swipl/library/ext/http/http/http_path.pl
 lib/swipl/library/ext/http/http/http_proxy.pl
-lib/swipl/library/ext/http/http/http_pwp.pl
-lib/swipl/library/ext/http/http/http_redis_plugin.pl
-lib/swipl/library/ext/http/http/http_server.pl
-lib/swipl/library/ext/http/http/http_server_files.pl
-lib/swipl/library/ext/http/http/http_server_health.pl
-lib/swipl/library/ext/http/http/http_session.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_pwp.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_redis_plugin.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_server.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_server_files.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_server_health.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_session.pl
 lib/swipl/library/ext/http/http/http_sgml_plugin.pl
 lib/swipl/library/ext/http/http/http_stream.pl
-lib/swipl/library/ext/http/http/http_unix_daemon.pl
-lib/swipl/library/ext/http/http/http_wrapper.pl
-lib/swipl/library/ext/http/http/hub.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_unix_daemon.pl
+%%THREADED%%lib/swipl/library/ext/http/http/http_wrapper.pl
+%%THREADED%%lib/swipl/library/ext/http/http/hub.pl
 lib/swipl/library/ext/http/http/js_grammar.pl
 lib/swipl/library/ext/http/http/js_write.pl
 lib/swipl/library/ext/http/http/json.pl
@@ -347,19 +347,19 @@ lib/swipl/library/ext/http/http/json_convert.pl
 lib/swipl/library/ext/http/http/mimepack.pl
 lib/swipl/library/ext/http/http/mimetype.pl
 lib/swipl/library/ext/http/http/term_html.pl
-lib/swipl/library/ext/http/http/thread_httpd.pl
-lib/swipl/library/ext/http/http/web/css/dirindex.css
-lib/swipl/library/ext/http/http/web/css/openid.css
-lib/swipl/library/ext/http/http/web/icons/back.png
-lib/swipl/library/ext/http/http/web/icons/c.png
-lib/swipl/library/ext/http/http/web/icons/compressed.png
-lib/swipl/library/ext/http/http/web/icons/folder.png
-lib/swipl/library/ext/http/http/web/icons/generic.png
-lib/swipl/library/ext/http/http/web/icons/layout.png
-lib/swipl/library/ext/http/http/web/icons/openid-logo-square.png
-lib/swipl/library/ext/http/http/web/icons/openid-logo-tiny.png
-lib/swipl/library/ext/http/http/websocket.pl
-lib/swipl/library/ext/http/http/yadis.pl
+%%THREADED%%lib/swipl/library/ext/http/http/thread_httpd.pl
+%%THREADED%%lib/swipl/library/ext/http/http/web/css/dirindex.css
+%%THREADED%%lib/swipl/library/ext/http/http/web/css/openid.css
+%%THREADED%%lib/swipl/library/ext/http/http/web/icons/back.png
+%%THREADED%%lib/swipl/library/ext/http/http/web/icons/c.png
+%%THREADED%%lib/swipl/library/ext/http/http/web/icons/compressed.png
+%%THREADED%%lib/swipl/library/ext/http/http/web/icons/folder.png
+%%THREADED%%lib/swipl/library/ext/http/http/web/icons/generic.png
+%%THREADED%%lib/swipl/library/ext/http/http/web/icons/layout.png
+%%THREADED%%lib/swipl/library/ext/http/http/web/icons/openid-logo-square.png
+%%THREADED%%lib/swipl/library/ext/http/http/web/icons/openid-logo-tiny.png
+%%THREADED%%lib/swipl/library/ext/http/http/websocket.pl
+%%THREADED%%lib/swipl/library/ext/http/http/yadis.pl
 lib/swipl/library/ext/inclpr/inclpr.pl
 lib/swipl/library/ext/inclpr/inclpr/inclpr_consistency.pl
 lib/swipl/library/ext/inclpr/inclpr/inclpr_core.pl
@@ -385,29 +385,29 @@ lib/swipl/library/ext/ltx2htm/pldoc.cmd
 lib/swipl/library/ext/ltx2htm/sty_pldoc.pl
 lib/swipl/library/ext/ltx2htm/sty_xpce.pl
 lib/swipl/library/ext/ltx2htm/xpce.cmd
-lib/swipl/library/ext/mqi/INDEX.pl
-lib/swipl/library/ext/mqi/mqi.pl
+%%THREADED%%lib/swipl/library/ext/mqi/INDEX.pl
+%%THREADED%%lib/swipl/library/ext/mqi/mqi.pl
 lib/swipl/library/ext/nlp/INDEX.pl
 lib/swipl/library/ext/nlp/double_metaphone.pl
 lib/swipl/library/ext/nlp/isub.pl
 lib/swipl/library/ext/nlp/porter_stem.pl
 lib/swipl/library/ext/nlp/snowball.pl
-lib/swipl/library/ext/odbc/INDEX.pl
-lib/swipl/library/ext/odbc/odbc.pl
+%%ODBC%%lib/swipl/library/ext/odbc/INDEX.pl
+%%ODBC%%lib/swipl/library/ext/odbc/odbc.pl
 lib/swipl/library/ext/paxos/INDEX.pl
 lib/swipl/library/ext/paxos/paxos.pl
 lib/swipl/library/ext/pcre/INDEX.pl
 lib/swipl/library/ext/pcre/pcre.pl
-lib/swipl/library/ext/pengines/INDEX.pl
-lib/swipl/library/ext/pengines/http/web/css/plterm.css
-lib/swipl/library/ext/pengines/http/web/js/pengines.js
-lib/swipl/library/ext/pengines/pengines.pl
-lib/swipl/library/ext/pengines/pengines_io.pl
-lib/swipl/library/ext/pengines/pengines_sandbox.pl
-lib/swipl/library/ext/pengines/term_to_json.pl
+%%THREADED%%lib/swipl/library/ext/pengines/INDEX.pl
+%%THREADED%%lib/swipl/library/ext/pengines/http/web/css/plterm.css
+%%THREADED%%lib/swipl/library/ext/pengines/http/web/js/pengines.js
+%%THREADED%%lib/swipl/library/ext/pengines/pengines.pl
+%%THREADED%%lib/swipl/library/ext/pengines/pengines_io.pl
+%%THREADED%%lib/swipl/library/ext/pengines/pengines_sandbox.pl
+%%THREADED%%lib/swipl/library/ext/pengines/term_to_json.pl
 lib/swipl/library/ext/pldoc/INDEX.pl
 lib/swipl/library/ext/pldoc/doc_files.pl
-lib/swipl/library/ext/pldoc/doc_http.pl
+%%THREADED%%lib/swipl/library/ext/pldoc/doc_http.pl
 lib/swipl/library/ext/pldoc/doc_latex.pl
 lib/swipl/library/ext/pldoc/doc_markdown.pl
 lib/swipl/library/ext/pldoc/pldoc.pl
@@ -457,30 +457,30 @@ lib/swipl/library/ext/protobufs/protobufs/gen_pb/google/protobuf/compiler/plugin
 lib/swipl/library/ext/protobufs/protobufs/gen_pb/google/protobuf/descriptor_pb.pl
 lib/swipl/library/ext/readline/INDEX.pl
 lib/swipl/library/ext/readline/readline.pl
-lib/swipl/library/ext/redis/INDEX.pl
-lib/swipl/library/ext/redis/redis.pl
-lib/swipl/library/ext/redis/redis_streams.pl
+%%THREADED%%lib/swipl/library/ext/redis/INDEX.pl
+%%THREADED%%lib/swipl/library/ext/redis/redis.pl
+%%THREADED%%lib/swipl/library/ext/redis/redis_streams.pl
 lib/swipl/library/ext/semweb/semweb/INDEX.pl
-lib/swipl/library/ext/semweb/semweb/rdf11.pl
-lib/swipl/library/ext/semweb/semweb/rdf11_containers.pl
-lib/swipl/library/ext/semweb/semweb/rdf_cache.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf11.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf11_containers.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_cache.pl
 lib/swipl/library/ext/semweb/semweb/rdf_compare.pl
-lib/swipl/library/ext/semweb/semweb/rdf_db.pl
-lib/swipl/library/ext/semweb/semweb/rdf_edit.pl
-lib/swipl/library/ext/semweb/semweb/rdf_http_plugin.pl
-lib/swipl/library/ext/semweb/semweb/rdf_library.pl
-lib/swipl/library/ext/semweb/semweb/rdf_litindex.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_db.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_edit.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_http_plugin.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_library.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_litindex.pl
 lib/swipl/library/ext/semweb/semweb/rdf_ntriples.pl
-lib/swipl/library/ext/semweb/semweb/rdf_persistency.pl
-lib/swipl/library/ext/semweb/semweb/rdf_portray.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_persistency.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_portray.pl
 lib/swipl/library/ext/semweb/semweb/rdf_prefixes.pl
-lib/swipl/library/ext/semweb/semweb/rdf_sandbox.pl
-lib/swipl/library/ext/semweb/semweb/rdf_turtle.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_sandbox.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_turtle.pl
 lib/swipl/library/ext/semweb/semweb/rdf_turtle_write.pl
-lib/swipl/library/ext/semweb/semweb/rdf_zlib_plugin.pl
-lib/swipl/library/ext/semweb/semweb/rdfa.pl
-lib/swipl/library/ext/semweb/semweb/rdfs.pl
-lib/swipl/library/ext/semweb/semweb/sparql_client.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdf_zlib_plugin.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdfa.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/rdfs.pl
+%%THREADED%%lib/swipl/library/ext/semweb/semweb/sparql_client.pl
 lib/swipl/library/ext/semweb/semweb/turtle.pl
 lib/swipl/library/ext/sgml/DTD/HTML4.dcl
 lib/swipl/library/ext/sgml/DTD/HTML4.dtd
@@ -505,8 +505,8 @@ lib/swipl/library/ext/ssl/saml.pl
 lib/swipl/library/ext/ssl/ssl.pl
 lib/swipl/library/ext/ssl/xmldsig.pl
 lib/swipl/library/ext/ssl/xmlenc.pl
-lib/swipl/library/ext/stomp/INDEX.pl
-lib/swipl/library/ext/stomp/stomp.pl
+%%THREADED%%lib/swipl/library/ext/stomp/INDEX.pl
+%%THREADED%%lib/swipl/library/ext/stomp/stomp.pl
 lib/swipl/library/ext/sweep/INDEX.pl
 lib/swipl/library/ext/sweep/sweep_link.pl
 lib/swipl/library/ext/swipy/INDEX.pl
@@ -530,8 +530,8 @@ lib/swipl/library/hashtable.pl
 lib/swipl/library/heaps.pl
 %%PORTDOCS%%lib/swipl/library/help.pl
 lib/swipl/library/hotfix.pl
-lib/swipl/library/http/jquery.pl
-lib/swipl/library/http/web/js/jquery-3.6.0.min.js
+%%THREADED%%lib/swipl/library/http/jquery.pl
+%%THREADED%%lib/swipl/library/http/web/js/jquery-3.6.0.min.js
 lib/swipl/library/increval.pl
 lib/swipl/library/intercept.pl
 lib/swipl/library/iostream.pl
@@ -580,7 +580,7 @@ lib/swipl/library/prolog_history.pl
 lib/swipl/library/prolog_jiti.pl
 lib/swipl/library/prolog_metainference.pl
 lib/swipl/library/prolog_pack.pl
-lib/swipl/library/prolog_profile.pl
+%%THREADED%%lib/swipl/library/prolog_profile.pl
 lib/swipl/library/prolog_source.pl
 lib/swipl/library/prolog_stack.pl
 lib/swipl/library/prolog_trace.pl
@@ -599,13 +599,13 @@ lib/swipl/library/rbtrees.pl
 lib/swipl/library/readln.pl
 lib/swipl/library/readutil.pl
 lib/swipl/library/record.pl
-lib/swipl/library/rwlocks.pl
+%%THREADED%%lib/swipl/library/rwlocks.pl
 lib/swipl/library/sandbox.pl
-lib/swipl/library/semweb/dc.rdfs
-lib/swipl/library/semweb/eor.rdfs
-lib/swipl/library/semweb/owl.owl
-lib/swipl/library/semweb/rdf_library.ttl
-lib/swipl/library/semweb/rdfs.rdfs
+%%THREADED%%lib/swipl/library/semweb/dc.rdfs
+%%THREADED%%lib/swipl/library/semweb/eor.rdfs
+%%THREADED%%lib/swipl/library/semweb/owl.owl
+%%THREADED%%lib/swipl/library/semweb/rdf_library.ttl
+%%THREADED%%lib/swipl/library/semweb/rdfs.rdfs
 lib/swipl/library/settings.pl
 lib/swipl/library/shell.pl
 lib/swipl/library/shlib.pl
@@ -620,9 +620,9 @@ lib/swipl/library/tabling.pl
 lib/swipl/library/terms.pl
 lib/swipl/library/theme/auto.pl
 lib/swipl/library/theme/dark.pl
-lib/swipl/library/thread.pl
-lib/swipl/library/thread_pool.pl
-lib/swipl/library/threadutil.pl
+%%THREADED%%lib/swipl/library/thread.pl
+%%THREADED%%lib/swipl/library/thread_pool.pl
+%%THREADED%%lib/swipl/library/threadutil.pl
 lib/swipl/library/tty.pl
 lib/swipl/library/ugraphs.pl
 lib/swipl/library/unicode/INDEX.pl
@@ -639,7 +639,7 @@ lib/swipl/library/www_browser.pl
 lib/swipl/library/yall.pl
 lib/swipl/library/zip.pl
 lib/swipl/swipl.home
-lib/swipl/swipl.rc
+%%XPCE%%lib/swipl/swipl.rc
 share/man/man1/swipl-ld.1.gz
 share/man/man1/swipl.1.gz
 libdata/pkgconfig/swipl.pc
@@ -832,8 +832,8 @@ libdata/pkgconfig/swipl.pc
 %%PORTDOCS%%lib/swipl/doc/Manual/predsummary.html
 %%PORTDOCS%%lib/swipl/doc/Manual/prev.gif
 %%PORTDOCS%%lib/swipl/doc/Manual/printmsg.html
-%%PORTDOCS%%lib/swipl/doc/Manual/profile.html
-%%PORTDOCS%%lib/swipl/doc/Manual/profnode.png
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/Manual/profile.html
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/Manual/profnode.png
 %%PORTDOCS%%lib/swipl/doc/Manual/program-resources.html
 %%PORTDOCS%%lib/swipl/doc/Manual/projectfiles.html
 %%PORTDOCS%%lib/swipl/doc/Manual/prolog-event.html
@@ -856,7 +856,7 @@ libdata/pkgconfig/swipl.pc
 %%PORTDOCS%%lib/swipl/doc/Manual/registry.html
 %%PORTDOCS%%lib/swipl/doc/Manual/resmodules.html
 %%PORTDOCS%%lib/swipl/doc/Manual/runtime.html
-%%PORTDOCS%%lib/swipl/doc/Manual/rwlocks.html
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/Manual/rwlocks.html
 %%PORTDOCS%%lib/swipl/doc/Manual/saved-states.html
 %%PORTDOCS%%lib/swipl/doc/Manual/settings.html
 %%PORTDOCS%%lib/swipl/doc/Manual/signal.html
@@ -892,10 +892,10 @@ libdata/pkgconfig/swipl.pc
 %%PORTDOCS%%lib/swipl/doc/Manual/terms.html
 %%PORTDOCS%%lib/swipl/doc/Manual/theme.html
 %%PORTDOCS%%lib/swipl/doc/Manual/thmonitor.html
-%%PORTDOCS%%lib/swipl/doc/Manual/thread.html
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/Manual/thread.html
 %%PORTDOCS%%lib/swipl/doc/Manual/threadcom.html
 %%PORTDOCS%%lib/swipl/doc/Manual/threadcreate.html
-%%PORTDOCS%%lib/swipl/doc/Manual/threadpool.html
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/Manual/threadpool.html
 %%PORTDOCS%%lib/swipl/doc/Manual/threads.html
 %%PORTDOCS%%lib/swipl/doc/Manual/threadsync.html
 %%PORTDOCS%%lib/swipl/doc/Manual/thutil.html
@@ -930,26 +930,26 @@ libdata/pkgconfig/swipl.pc
 %%PORTDOCS%%lib/swipl/doc/packages/index.html
 %%PORTDOCS%%lib/swipl/doc/packages/janus.html
 %%PORTDOCS%%lib/swipl/doc/packages/libedit.html
-%%PORTDOCS%%lib/swipl/doc/packages/mqi.html
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/packages/mqi.html
 %%PORTDOCS%%lib/swipl/doc/packages/nlp.html
 %%ODBC%%%%PORTDOCS%%lib/swipl/doc/packages/odbc.html
 %%PORTDOCS%%lib/swipl/doc/packages/paxos.html
 %%PORTDOCS%%lib/swipl/doc/packages/pcre.html
-%%PORTDOCS%%lib/swipl/doc/packages/penarch.png
-%%PORTDOCS%%lib/swipl/doc/packages/pengines.html
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/packages/penarch.png
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/packages/pengines.html
 %%PORTDOCS%%lib/swipl/doc/packages/pl2cpp.html
 %%PORTDOCS%%lib/swipl/doc/packages/pldoc.html
-%%PORTDOCS%%lib/swipl/doc/packages/pltpruncolour.png
-%%PORTDOCS%%lib/swipl/doc/packages/pltpsynch.png
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/packages/pltpruncolour.png
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/packages/pltpsynch.png
 %%PORTDOCS%%lib/swipl/doc/packages/plunit.html
 %%PORTDOCS%%lib/swipl/doc/packages/protobufs.html
 %%PORTDOCS%%lib/swipl/doc/packages/rdf2pl.html
 %%PORTDOCS%%lib/swipl/doc/packages/readline.html
-%%PORTDOCS%%lib/swipl/doc/packages/redis.html
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/packages/redis.html
 %%PORTDOCS%%lib/swipl/doc/packages/semweb.html
 %%PORTDOCS%%lib/swipl/doc/packages/sgml.html
 %%PORTDOCS%%lib/swipl/doc/packages/ssl.html
-%%PORTDOCS%%lib/swipl/doc/packages/stomp.html
+%%THREADED%%%%PORTDOCS%%lib/swipl/doc/packages/stomp.html
 %%PORTDOCS%%lib/swipl/doc/packages/sweep.html
 %%PORTDOCS%%lib/swipl/doc/packages/table.html
 %%PORTDOCS%%lib/swipl/doc/packages/utf8proc.html
@@ -971,45 +971,45 @@ libdata/pkgconfig/swipl.pc
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/cpp/test_cpp.cpp
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/cpp/test_ffi.c
 %%ODBC%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/cql/cql_demo.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/README.md
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/calc.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_body.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_client.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_daemon.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_files.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_hello.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_login.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_openid.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_pwp.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_rest.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_threads.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/linux-init-script
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/context.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/index.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp1.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp2.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp3.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp4.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp5.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp6.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp7.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp8.pwp
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwpdb.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/systemd-script.service
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/upstart-script.conf
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/README.md
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/calc.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_body.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_client.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_daemon.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_files.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_hello.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_login.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_openid.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_pwp.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_rest.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/demo_threads.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/linux-init-script
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/context.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/index.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp1.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp2.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp3.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp4.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp5.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp6.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp7.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwp8.pwp
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/pwp/pwpdb.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/systemd-script.service
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/http/upstart-script.conf
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/inclpr/benchmarks.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/client.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/server.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/chunking.html
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/debugging.html
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/hack.html
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/index.html
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/input_output.html
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/pengine.html
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/queen.png
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/queens.html
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/simple.html
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/update-jquery
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/client.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/server.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/chunking.html
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/debugging.html
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/hack.html
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/index.html
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/input_output.html
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/pengine.html
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/queen.png
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/queens.html
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/simple.html
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pengines/web/update-jquery
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pldoc/README
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/pldoc/man_server.pl
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/plunit/read.pl
@@ -1041,10 +1041,10 @@ libdata/pkgconfig/swipl.pc
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/protobufs/interop/unittest_import_public.proto
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/protobufs/some_message.proto
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/protobufs/some_message.py
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/redis/README.md
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/redis/common.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/redis/prime-node.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/redis/primes.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/redis/README.md
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/redis/common.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/redis/prime-node.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/redis/primes.pl
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/ssl/client.pl
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/ssl/etc/README
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/ssl/etc/client/client-cert.p12
@@ -1063,12 +1063,12 @@ libdata/pkgconfig/swipl.pc
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/ssl/etc/server/server-key.pem
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/ssl/https.pl
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/ssl/server.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/ping.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/pong.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/server-loop.sh
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/simple.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/stress_client.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/stress_server.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/ping.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/pong.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/server-loop.sh
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/simple.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/stress_client.pl
+%%THREADED%%%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/stomp/stress_server.pl
 %%XPCE%%lib/swipl/xpce/Defaults
 %%XPCE%%lib/swipl/xpce/Defaults.user
 %%XPCE%%lib/swipl/xpce/appl-help/customise.hlp