- Add a few more port options (DOCS GMP THREADED ODBC)

PR:		252482
Submitted by:	mailinglist@diamondbox.dk(maintainer)

2 files changed, 321 insertions, 23 deletions

diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index bb7a38bec780..10b7555757cb 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	swi-pl
 DISTVERSION=	8.2.3
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.swi-prolog.org/download/stable/src/
 DISTNAME=	swipl-${DISTVERSION}
@@ -16,23 +17,25 @@ BROKEN_i386=	fails to link: libswipl.so: undefined reference to __atomic_compare
 BROKEN_mips=	fails to link: libswipl.so: undefined reference to '__sync_sub_and_fetch_4'
 BROKEN_mips64=	fails to link: libswipl.so: undefined reference to '__sync_sub_and_fetch_4'
 
-LIB_DEPENDS=	libgmp.so:math/gmp \
-		libodbc.so:databases/unixODBC \
-		libpcre.so:devel/pcre \
+LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libossp-uuid.so:misc/ossp-uuid \
 		libyaml.so:textproc/libyaml
 
 USES=		compiler:c11 libedit cmake libarchive pathfix pkgconfig \
-		readline shebangfix ssl
+		shebangfix ssl
 USE_XORG=	ice sm x11 xext xft xinerama xpm xt
 
-OPTIONS_DEFINE=		TCMALLOC EXAMPLES XPCE
-OPTIONS_DEFAULT=	XPCE TCMALLOC
+OPTIONS_DEFINE=		DOCS TCMALLOC EXAMPLES XPCE GMP THREADED ODBC
+OPTIONS_DEFAULT=	XPCE TCMALLOC GMP THREADED ODBC
 OPTIONS_SUB=    	yes
 
-CMAKE_ARGS=	-DSWIPL_PACKAGES_JAVA=OFF -DBUILD_TESTING=OFF -DINSTALL_DOCUMENTATION=OFF
+MAKE_ENV=	XDG_DATA_DIRS=/dummy
+CMAKE_ARGS=	-DSWIPL_PACKAGES_JAVA=OFF -DBUILD_TESTING=OFF
 
-TCMALLOC_DESC=		Use tcmalloc instead of default malloc
+DOCS_CMAKE_ON=	-DINSTALL_DOCUMENTATION=ON
+DOCS_CMAKE_OFF=	-DINSTALL_DOCUMENTATION=OFF
+
+TCMALLOC_DESC=		Use tcmalloc instead of default freebsd jemalloc
 TCMALLOC_CMAKE_ON=	-DUSE_TCMALLOC=ON
 TCMALLOC_CMAKE_OFF=	-DUSE_TCMALLOC=OFF
 TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
@@ -45,6 +48,20 @@ XPCE_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libjpeg.so:graphics/jpeg-turbo
 XCPE_USES=		jpeg xorg
 
+GMP_DESC=		Enable bignum and rational numbers
+GMP_CMAKE_ON=		-DUSE_GMP=ON
+GMP_CMAKE_OFF=		-DUSE_GMP=OFF
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
+
+THREADED_DESC=		Enable support for Prolog threads
+THREADED_CMAKE_ON=	-DMULTI_THREADED=ON
+THREADED_CMAKE_OFF=	-DMULTI_THREADED=OFF
+
+ODBC_DESC=		Enable ODBC and CQL packages
+ODBC_CMAKE_ON=		-DSWIPL_PACKAGES_ODBC=ON
+ODBC_CMAKE_OFF=		-DSWIPL_PACKAGES_ODBC=OFF
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+
 .include <bsd.port.options.mk>
 
 SHEBANG_FILES=	library/dialect/sicstus/swipl-lfr.pl
diff --git a/lang/swi-pl/pkg-plist b/lang/swi-pl/pkg-plist
index fe5ab8d75aa4..802eaaca752d 100644
--- a/lang/swi-pl/pkg-plist
+++ b/lang/swi-pl/pkg-plist
@@ -40,6 +40,262 @@ lib/swipl/customize/edit
 lib/swipl/customize/init.pl
 lib/swipl/demo/README.md
 lib/swipl/demo/likes.pl
+%%PORTDOCS%%lib/swipl/doc/Manual/64bits.html
+%%PORTDOCS%%lib/swipl/doc/Manual/Bibliography.html
+%%PORTDOCS%%lib/swipl/doc/Manual/Contents.html
+%%PORTDOCS%%lib/swipl/doc/Manual/DCG.html
+%%PORTDOCS%%lib/swipl/doc/Manual/DDE.html
+%%PORTDOCS%%lib/swipl/doc/Manual/DocIndex.html
+%%PORTDOCS%%lib/swipl/doc/Manual/IDE.html
+%%PORTDOCS%%lib/swipl/doc/Manual/IO.html
+%%PORTDOCS%%lib/swipl/doc/Manual/WFS.html
+%%PORTDOCS%%lib/swipl/doc/Manual/abi-versions.html
+%%PORTDOCS%%lib/swipl/doc/Manual/acknowledge.html
+%%PORTDOCS%%lib/swipl/doc/Manual/aggregate.html
+%%PORTDOCS%%lib/swipl/doc/Manual/allsolutions.html
+%%PORTDOCS%%lib/swipl/doc/Manual/altmoduleapi.html
+%%PORTDOCS%%lib/swipl/doc/Manual/ancestral-cut.html
+%%PORTDOCS%%lib/swipl/doc/Manual/ansiterm.html
+%%PORTDOCS%%lib/swipl/doc/Manual/apply.html
+%%PORTDOCS%%lib/swipl/doc/Manual/arith.html
+%%PORTDOCS%%lib/swipl/doc/Manual/assoc.html
+%%PORTDOCS%%lib/swipl/doc/Manual/attvar.html
+%%PORTDOCS%%lib/swipl/doc/Manual/autoload.html
+%%PORTDOCS%%lib/swipl/doc/Manual/basics.html
+%%PORTDOCS%%lib/swipl/doc/Manual/bidicts.html
+%%PORTDOCS%%lib/swipl/doc/Manual/breakpoint.html
+%%PORTDOCS%%lib/swipl/doc/Manual/broadcast.html
+%%PORTDOCS%%lib/swipl/doc/Manual/broadcast.png
+%%PORTDOCS%%lib/swipl/doc/Manual/builtin.html
+%%PORTDOCS%%lib/swipl/doc/Manual/builtinlist.html
+%%PORTDOCS%%lib/swipl/doc/Manual/by-sa.png
+%%PORTDOCS%%lib/swipl/doc/Manual/charconv.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chario.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chars.html
+%%PORTDOCS%%lib/swipl/doc/Manual/charsio.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chartype.html
+%%PORTDOCS%%lib/swipl/doc/Manual/check.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chr-compatibility.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chr-debugging.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chr-errors.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chr-examples.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chr-guidelines.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chr-intro.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chr-syntaxandsemantics.html
+%%PORTDOCS%%lib/swipl/doc/Manual/chr.html
+%%PORTDOCS%%lib/swipl/doc/Manual/clp.html
+%%PORTDOCS%%lib/swipl/doc/Manual/clpb.html
+%%PORTDOCS%%lib/swipl/doc/Manual/clpfd.html
+%%PORTDOCS%%lib/swipl/doc/Manual/clpqr.html
+%%PORTDOCS%%lib/swipl/doc/Manual/cmdline.html
+%%PORTDOCS%%lib/swipl/doc/Manual/compare.html
+%%PORTDOCS%%lib/swipl/doc/Manual/compilation.html
+%%PORTDOCS%%lib/swipl/doc/Manual/consulting.html
+%%PORTDOCS%%lib/swipl/doc/Manual/contrib.html
+%%PORTDOCS%%lib/swipl/doc/Manual/control.html
+%%PORTDOCS%%lib/swipl/doc/Manual/coroutining.html
+%%PORTDOCS%%lib/swipl/doc/Manual/csv.html
+%%PORTDOCS%%lib/swipl/doc/Manual/ctxmodule.html
+%%PORTDOCS%%lib/swipl/doc/Manual/cyclic.html
+%%PORTDOCS%%lib/swipl/doc/Manual/db.html
+%%PORTDOCS%%lib/swipl/doc/Manual/debug-deployed-systems.html
+%%PORTDOCS%%lib/swipl/doc/Manual/debug.html
+%%PORTDOCS%%lib/swipl/doc/Manual/debugger.html
+%%PORTDOCS%%lib/swipl/doc/Manual/debugoverview.html
+%%PORTDOCS%%lib/swipl/doc/Manual/defmodule.html
+%%PORTDOCS%%lib/swipl/doc/Manual/delcont.html
+%%PORTDOCS%%lib/swipl/doc/Manual/deployment-options.html
+%%PORTDOCS%%lib/swipl/doc/Manual/dialect-notes.html
+%%PORTDOCS%%lib/swipl/doc/Manual/dialect.html
+%%PORTDOCS%%lib/swipl/doc/Manual/dicts.html
+%%PORTDOCS%%lib/swipl/doc/Manual/dynamic-modules.html
+%%PORTDOCS%%lib/swipl/doc/Manual/dynamic.html
+%%PORTDOCS%%lib/swipl/doc/Manual/edit.html
+%%PORTDOCS%%lib/swipl/doc/Manual/editreload.html
+%%PORTDOCS%%lib/swipl/doc/Manual/engine-examples.html
+%%PORTDOCS%%lib/swipl/doc/Manual/engine-predicates.html
+%%PORTDOCS%%lib/swipl/doc/Manual/engine-resources.html
+%%PORTDOCS%%lib/swipl/doc/Manual/engines.html
+%%PORTDOCS%%lib/swipl/doc/Manual/error.html
+%%PORTDOCS%%lib/swipl/doc/Manual/examineprog.html
+%%PORTDOCS%%lib/swipl/doc/Manual/excepthook.html
+%%PORTDOCS%%lib/swipl/doc/Manual/exception.html
+%%PORTDOCS%%lib/swipl/doc/Manual/exception3.html
+%%PORTDOCS%%lib/swipl/doc/Manual/ext-integration.html
+%%PORTDOCS%%lib/swipl/doc/Manual/ext-issues.html
+%%PORTDOCS%%lib/swipl/doc/Manual/ext-lists.html
+%%PORTDOCS%%lib/swipl/doc/Manual/ext-syntax.html
+%%PORTDOCS%%lib/swipl/doc/Manual/extensions.html
+%%PORTDOCS%%lib/swipl/doc/Manual/files.html
+%%PORTDOCS%%lib/swipl/doc/Manual/findappfile.html
+%%PORTDOCS%%lib/swipl/doc/Manual/findhome.html
+%%PORTDOCS%%lib/swipl/doc/Manual/flags.html
+%%PORTDOCS%%lib/swipl/doc/Manual/forall2.html
+%%PORTDOCS%%lib/swipl/doc/Manual/foreign.html
+%%PORTDOCS%%lib/swipl/doc/Manual/foreigninclude.html
+%%PORTDOCS%%lib/swipl/doc/Manual/foreignlink.html
+%%PORTDOCS%%lib/swipl/doc/Manual/foreignnotes.html
+%%PORTDOCS%%lib/swipl/doc/Manual/foreignoverview.html
+%%PORTDOCS%%lib/swipl/doc/Manual/foreignthread.html
+%%PORTDOCS%%lib/swipl/doc/Manual/foreigntypes.html
+%%PORTDOCS%%lib/swipl/doc/Manual/foreignxmp.html
+%%PORTDOCS%%lib/swipl/doc/Manual/format.html
+%%PORTDOCS%%lib/swipl/doc/Manual/funcsummary.html
+%%PORTDOCS%%lib/swipl/doc/Manual/gemacs.html
+%%PORTDOCS%%lib/swipl/doc/Manual/gensym.html
+%%PORTDOCS%%lib/swipl/doc/Manual/glossary.html
+%%PORTDOCS%%lib/swipl/doc/Manual/guitracer.html
+%%PORTDOCS%%lib/swipl/doc/Manual/gvar.html
+%%PORTDOCS%%lib/swipl/doc/Manual/hack.html
+%%PORTDOCS%%lib/swipl/doc/Manual/highorder.html
+%%PORTDOCS%%lib/swipl/doc/Manual/history.html
+%%PORTDOCS%%lib/swipl/doc/Manual/home.gif
+%%PORTDOCS%%lib/swipl/doc/Manual/hooks.html
+%%PORTDOCS%%lib/swipl/doc/Manual/idepreds.html
+%%PORTDOCS%%lib/swipl/doc/Manual/idesummary.html
+%%PORTDOCS%%lib/swipl/doc/Manual/implhistory.html
+%%PORTDOCS%%lib/swipl/doc/Manual/import.html
+%%PORTDOCS%%lib/swipl/doc/Manual/importmodule.html
+%%PORTDOCS%%lib/swipl/doc/Manual/index.gif
+%%PORTDOCS%%lib/swipl/doc/Manual/index.html
+%%PORTDOCS%%lib/swipl/doc/Manual/info.gif
+%%PORTDOCS%%lib/swipl/doc/Manual/initfile.html
+%%PORTDOCS%%lib/swipl/doc/Manual/initgoal.html
+%%PORTDOCS%%lib/swipl/doc/Manual/intercept.html
+%%PORTDOCS%%lib/swipl/doc/Manual/intlibs.html
+%%PORTDOCS%%lib/swipl/doc/Manual/intro.html
+%%PORTDOCS%%lib/swipl/doc/Manual/iostream.html
+%%PORTDOCS%%lib/swipl/doc/Manual/jitindex.html
+%%PORTDOCS%%lib/swipl/doc/Manual/libpl.html
+%%PORTDOCS%%lib/swipl/doc/Manual/library.html
+%%PORTDOCS%%lib/swipl/doc/Manual/license.html
+%%PORTDOCS%%lib/swipl/doc/Manual/limits.html
+%%PORTDOCS%%lib/swipl/doc/Manual/listing.html
+%%PORTDOCS%%lib/swipl/doc/Manual/lists.html
+%%PORTDOCS%%lib/swipl/doc/Manual/loadfilehook.html
+%%PORTDOCS%%lib/swipl/doc/Manual/locale.html
+%%PORTDOCS%%lib/swipl/doc/Manual/main.html
+%%PORTDOCS%%lib/swipl/doc/Manual/manipatom.html
+%%PORTDOCS%%lib/swipl/doc/Manual/manipmodule.html
+%%PORTDOCS%%lib/swipl/doc/Manual/manipstack.html
+%%PORTDOCS%%lib/swipl/doc/Manual/manipterm.html
+%%PORTDOCS%%lib/swipl/doc/Manual/memory.html
+%%PORTDOCS%%lib/swipl/doc/Manual/metacall.html
+%%PORTDOCS%%lib/swipl/doc/Manual/metapred.html
+%%PORTDOCS%%lib/swipl/doc/Manual/miscarith.html
+%%PORTDOCS%%lib/swipl/doc/Manual/miscpreds.html
+%%PORTDOCS%%lib/swipl/doc/Manual/module-autoload.html
+%%PORTDOCS%%lib/swipl/doc/Manual/modulecompat.html
+%%PORTDOCS%%lib/swipl/doc/Manual/moduleop.html
+%%PORTDOCS%%lib/swipl/doc/Manual/modules.html
+%%PORTDOCS%%lib/swipl/doc/Manual/mt-xpce.html
+%%PORTDOCS%%lib/swipl/doc/Manual/mtoplevel.html
+%%PORTDOCS%%lib/swipl/doc/Manual/navigator.html
+%%PORTDOCS%%lib/swipl/doc/Manual/nb_set.html
+%%PORTDOCS%%lib/swipl/doc/Manual/next.gif
+%%PORTDOCS%%lib/swipl/doc/Manual/occurs.html
+%%PORTDOCS%%lib/swipl/doc/Manual/online-help.html
+%%PORTDOCS%%lib/swipl/doc/Manual/operators.html
+%%PORTDOCS%%lib/swipl/doc/Manual/opsummary.html
+%%PORTDOCS%%lib/swipl/doc/Manual/option.html
+%%PORTDOCS%%lib/swipl/doc/Manual/optparse.html
+%%PORTDOCS%%lib/swipl/doc/Manual/ordsets.html
+%%PORTDOCS%%lib/swipl/doc/Manual/otherlicenses.html
+%%PORTDOCS%%lib/swipl/doc/Manual/overrule.html
+%%PORTDOCS%%lib/swipl/doc/Manual/overview.html
+%%PORTDOCS%%lib/swipl/doc/Manual/packs.html
+%%PORTDOCS%%lib/swipl/doc/Manual/pairs.html
+%%PORTDOCS%%lib/swipl/doc/Manual/pceemacs.html
+%%PORTDOCS%%lib/swipl/doc/Manual/persistency.html
+%%PORTDOCS%%lib/swipl/doc/Manual/pio.html
+%%PORTDOCS%%lib/swipl/doc/Manual/plld.html
+%%PORTDOCS%%lib/swipl/doc/Manual/portabilitystrategies.html
+%%PORTDOCS%%lib/swipl/doc/Manual/practical.html
+%%PORTDOCS%%lib/swipl/doc/Manual/preddesc.html
+%%PORTDOCS%%lib/swipl/doc/Manual/predicate_options.html
+%%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
+%%PORTDOCS%%lib/swipl/doc/Manual/program-resources.html
+%%PORTDOCS%%lib/swipl/doc/Manual/projectfiles.html
+%%PORTDOCS%%lib/swipl/doc/Manual/prolog-event.html
+%%PORTDOCS%%lib/swipl/doc/Manual/prologjiti.html
+%%PORTDOCS%%lib/swipl/doc/Manual/prologpack.html
+%%PORTDOCS%%lib/swipl/doc/Manual/prologxref.html
+%%PORTDOCS%%lib/swipl/doc/Manual/protect-code.html
+%%PORTDOCS%%lib/swipl/doc/Manual/protocol.html
+%%PORTDOCS%%lib/swipl/doc/Manual/quasiquotations.html
+%%PORTDOCS%%lib/swipl/doc/Manual/quickstart.html
+%%PORTDOCS%%lib/swipl/doc/Manual/random.html
+%%PORTDOCS%%lib/swipl/doc/Manual/readutil.html
+%%PORTDOCS%%lib/swipl/doc/Manual/record.html
+%%PORTDOCS%%lib/swipl/doc/Manual/reexport.html
+%%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/saved-states.html
+%%PORTDOCS%%lib/swipl/doc/Manual/settings.html
+%%PORTDOCS%%lib/swipl/doc/Manual/signal.html
+%%GMP%%%%PORTDOCS%%lib/swipl/doc/Manual/simplex.html
+%%PORTDOCS%%lib/swipl/doc/Manual/softlicense.html
+%%PORTDOCS%%lib/swipl/doc/Manual/solutionsequences.html
+%%PORTDOCS%%lib/swipl/doc/Manual/sponsor.html
+%%PORTDOCS%%lib/swipl/doc/Manual/state-initialization.html
+%%PORTDOCS%%lib/swipl/doc/Manual/statistics.html
+%%PORTDOCS%%lib/swipl/doc/Manual/status.html
+%%PORTDOCS%%lib/swipl/doc/Manual/streamstat.html
+%%PORTDOCS%%lib/swipl/doc/Manual/strings.html
+%%PORTDOCS%%lib/swipl/doc/Manual/summary.html
+%%PORTDOCS%%lib/swipl/doc/Manual/swiorother.html
+%%PORTDOCS%%lib/swipl/doc/Manual/swiprolog.html
+%%PORTDOCS%%lib/swipl/doc/Manual/syntax.html
+%%PORTDOCS%%lib/swipl/doc/Manual/system.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tables.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling-about.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling-incremental.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling-memoize.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling-mode-directed.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling-non-termination.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling-preds.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling-restraints.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling-shared.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling-subsumptive.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tabling.html
+%%PORTDOCS%%lib/swipl/doc/Manual/termrw.html
+%%PORTDOCS%%lib/swipl/doc/Manual/theme.html
+%%PORTDOCS%%lib/swipl/doc/Manual/thmonitor.html
+%%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
+%%PORTDOCS%%lib/swipl/doc/Manual/threads.html
+%%PORTDOCS%%lib/swipl/doc/Manual/threadsync.html
+%%PORTDOCS%%lib/swipl/doc/Manual/thutil.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tnotpure.html
+%%PORTDOCS%%lib/swipl/doc/Manual/toplevel.html
+%%PORTDOCS%%lib/swipl/doc/Manual/topvars.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tracehook.html
+%%PORTDOCS%%lib/swipl/doc/Manual/tty.html
+%%PORTDOCS%%lib/swipl/doc/Manual/typetest.html
+%%PORTDOCS%%lib/swipl/doc/Manual/ugraphs.html
+%%PORTDOCS%%lib/swipl/doc/Manual/up.gif
+%%PORTDOCS%%lib/swipl/doc/Manual/url.html
+%%PORTDOCS%%lib/swipl/doc/Manual/usingmodules.html
+%%PORTDOCS%%lib/swipl/doc/Manual/varnumbers.html
+%%PORTDOCS%%lib/swipl/doc/Manual/whymodules.html
+%%PORTDOCS%%lib/swipl/doc/Manual/widechars.html
+%%PORTDOCS%%lib/swipl/doc/Manual/www_browser.html
+%%PORTDOCS%%lib/swipl/doc/Manual/xref.html
+%%PORTDOCS%%lib/swipl/doc/Manual/xrefchatdep.png
+%%PORTDOCS%%lib/swipl/doc/Manual/xrefchatfile.png
+%%PORTDOCS%%lib/swipl/doc/Manual/yall.html
+%%PORTDOCS%%lib/swipl/doc/Manual/yellow_pages.gif
+%%PORTDOCS%%lib/swipl/doc/manindex.db
+%%PORTDOCS%%lib/swipl/doc/packages/archive.html
+%%PORTDOCS%%lib/swipl/doc/packages/clib.html
+%%ODBC%%%%PORTDOCS%%lib/swipl/doc/packages/cql.html
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/chr/bool.chr
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/chr/chrdif.chr
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/chr/chrfreeze.chr
@@ -55,7 +311,7 @@ lib/swipl/demo/likes.pl
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/cpp/likes.pl
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/cpp/test.cpp
 %%PORTEXAMPLES%%lib/swipl/doc/packages/examples/cpp/test.pl
-%%PORTEXAMPLES%%lib/swipl/doc/packages/examples/cql/cql_demo.pl
+%%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
@@ -121,6 +377,30 @@ lib/swipl/demo/likes.pl
 %%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
+%%PORTDOCS%%lib/swipl/doc/packages/http.html
+%%PORTDOCS%%lib/swipl/doc/packages/index.html
+%%PORTDOCS%%lib/swipl/doc/packages/libedit.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
+%%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
+%%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/semweb.html
+%%PORTDOCS%%lib/swipl/doc/packages/sgml.html
+%%PORTDOCS%%lib/swipl/doc/packages/ssl.html
+%%PORTDOCS%%lib/swipl/doc/packages/table.html
+%%PORTDOCS%%lib/swipl/doc/packages/utf8proc.html
+%%PORTDOCS%%lib/swipl/doc/packages/yaml.html
+%%PORTDOCS%%lib/swipl/doc/packages/zlib.html
 lib/swipl/include/SWI-Prolog.h
 lib/swipl/include/SWI-Stream.h
 lib/swipl/include/SWI-cpp.h
@@ -144,7 +424,7 @@ lib/swipl/lib/%%ARCH%%-%%OS%%/libswipl.so.8.2.3
 lib/swipl/lib/%%ARCH%%-%%OS%%/md54pl.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/memfile.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/ntriples.so
-lib/swipl/lib/%%ARCH%%-%%OS%%/odbc4pl.so
+%%ODBC%%lib/swipl/lib/%%ARCH%%-%%OS%%/odbc4pl.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/pcre4pl.so
 lib/swipl/lib/%%ARCH%%-%%OS%%/pdt_console.so
 %%XPCE%%lib/swipl/lib/%%ARCH%%-%%OS%%/pl2xpce.so
@@ -260,19 +540,19 @@ lib/swipl/library/clp/inclpr/inclpr_natural_interval_extension.pl
 lib/swipl/library/clp/inclpr/inclpr_newton.pl
 lib/swipl/library/clp/inclpr/inclpr_ordering.pl
 lib/swipl/library/clp/inclpr/inclpr_symbolic_processing.pl
-lib/swipl/library/clp/simplex.pl
+%%GMP%%lib/swipl/library/clp/simplex.pl
 lib/swipl/library/codesio.pl
 lib/swipl/library/coinduction.pl
 lib/swipl/library/console_input.pl
-lib/swipl/library/cql/INDEX.pl
-lib/swipl/library/cql/cql.pl
-lib/swipl/library/cql/cql_autoschema.pl
-lib/swipl/library/cql/cql_database.pl
-lib/swipl/library/cql/cql_hooks.pl
-lib/swipl/library/cql/sql_keywords.pl
-lib/swipl/library/cql/sql_parser.pl
-lib/swipl/library/cql/sql_tokenizer.pl
-lib/swipl/library/cql/sql_write.pl
+%%ODBC%%lib/swipl/library/cql/INDEX.pl
+%%ODBC%%lib/swipl/library/cql/cql.pl
+%%ODBC%%lib/swipl/library/cql/cql_autoschema.pl
+%%ODBC%%lib/swipl/library/cql/cql_database.pl
+%%ODBC%%lib/swipl/library/cql/cql_hooks.pl
+%%ODBC%%lib/swipl/library/cql/sql_keywords.pl
+%%ODBC%%lib/swipl/library/cql/sql_parser.pl
+%%ODBC%%lib/swipl/library/cql/sql_tokenizer.pl
+%%ODBC%%lib/swipl/library/cql/sql_write.pl
 lib/swipl/library/crypt.pl
 lib/swipl/library/crypto.pl
 lib/swipl/library/csv.pl
@@ -341,6 +621,7 @@ lib/swipl/library/gensym.pl
 lib/swipl/library/git.pl
 lib/swipl/library/hash_stream.pl
 lib/swipl/library/heaps.pl
+%%PORTDOCS%%lib/swipl/library/help.pl
 lib/swipl/library/hotfix.pl
 lib/swipl/library/http/INDEX.pl
 lib/swipl/library/http/README.md
@@ -441,7 +722,7 @@ lib/swipl/library/nb_rbtrees.pl
 lib/swipl/library/nb_set.pl
 lib/swipl/library/obfuscate.pl
 lib/swipl/library/occurs.pl
-lib/swipl/library/odbc.pl
+%%ODBC%%lib/swipl/library/odbc.pl
 lib/swipl/library/operators.pl
 lib/swipl/library/option.pl
 lib/swipl/library/optparse.pl
@@ -617,7 +898,7 @@ lib/swipl/library/varnumbers.pl
 lib/swipl/library/vm.pl
 lib/swipl/library/wfs.pl
 lib/swipl/library/when.pl
-lib/swipl/library/win_menu.pl
+%%THREADED%%lib/swipl/library/win_menu.pl
 lib/swipl/library/writef.pl
 lib/swipl/library/www_browser.pl
 lib/swipl/library/xmldsig.pl
@@ -628,7 +909,7 @@ lib/swipl/library/yall.pl
 lib/swipl/library/yaml.pl
 lib/swipl/library/zip.pl
 lib/swipl/library/zlib.pl
-%%XPCE%%lib/swipl/swipl-win.rc
+%%THREADED%%%%XPCE%%lib/swipl/swipl-win.rc
 lib/swipl/swipl.home
 %%XPCE%%lib/swipl/swipl.rc
 %%XPCE%%lib/swipl/xpce/Defaults