Update to 6.6.5

3 years of bug fixes and updates.

13 files changed, 127 insertions, 208 deletions

diff --git a/lang/swi-prolog-lite/Makefile b/lang/swi-prolog-lite/Makefile
index f03d0e081ee..4603a6884ac 100644
--- a/lang/swi-prolog-lite/Makefile
+++ b/lang/swi-prolog-lite/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2013/07/26 09:29:34 is Exp $
+# $NetBSD: Makefile,v 1.23 2014/05/28 10:29:12 markd Exp $
 
 .include "Makefile.common"
 
 PKGNAME=		swi-prolog-lite-${SWIPLVERS}
-PKGREVISION=		2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		ISO/Edinburgh-style Prolog compiler
@@ -12,7 +11,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		src
 
 CONFIGURE_ENV+=		PL=swi-prolog
-CONFIGURE_ENV+=		ARCH=${MACHINE_GNU_PLATFORM}	# make PLIST consistent
+CONFIGURE_ENV+=		PLARCH=${MACHINE_GNU_PLATFORM}	# make PLIST consistent
 USE_TOOLS+=		gmake bash:run
 REPLACE_BASH+=		dotfiles/edit
 
diff --git a/lang/swi-prolog-lite/Makefile.common b/lang/swi-prolog-lite/Makefile.common
index ecdeb5230fc..7c6b4559d66 100644
--- a/lang/swi-prolog-lite/Makefile.common
+++ b/lang/swi-prolog-lite/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.10 2011/04/12 23:16:42 asau Exp $
+# $NetBSD: Makefile.common,v 1.11 2014/05/28 10:29:12 markd Exp $
 
-SWIPLVERS=		5.11.18
+SWIPLVERS=		6.6.5
 DISTNAME=		pl-${SWIPLVERS}
 CATEGORIES=		lang
 MASTER_SITES=		http://www.swi-prolog.org/download/stable/src/ \
diff --git a/lang/swi-prolog-lite/PLIST b/lang/swi-prolog-lite/PLIST
index cd0dbbe1332..3fff3465d62 100644
--- a/lang/swi-prolog-lite/PLIST
+++ b/lang/swi-prolog-lite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2011/04/12 23:16:42 asau Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/05/28 10:29:12 markd Exp $
 bin/swi-prolog
 bin/swipl-ld
 bin/swipl-rc
@@ -19,14 +19,19 @@ lib/swi-prolog-${PKGVERSION}/boot/init.pl
 lib/swi-prolog-${PKGVERSION}/boot/license.pl
 lib/swi-prolog-${PKGVERSION}/boot/load.pl
 lib/swi-prolog-${PKGVERSION}/boot/messages.pl
+lib/swi-prolog-${PKGVERSION}/boot/packs.pl
 lib/swi-prolog-${PKGVERSION}/boot/parms.pl
+lib/swi-prolog-${PKGVERSION}/boot/predopts.pl
 lib/swi-prolog-${PKGVERSION}/boot/qlf.pl
 lib/swi-prolog-${PKGVERSION}/boot/rc.pl
 lib/swi-prolog-${PKGVERSION}/boot/syspred.pl
 lib/swi-prolog-${PKGVERSION}/boot/toplevel.pl
 lib/swi-prolog-${PKGVERSION}/boot/topvars.pl
-lib/swi-prolog-${PKGVERSION}/boot/writef.pl
 lib/swi-prolog-${PKGVERSION}/boot${BITS}.prc
+lib/swi-prolog-${PKGVERSION}/customize/README
+lib/swi-prolog-${PKGVERSION}/customize/dotplrc
+lib/swi-prolog-${PKGVERSION}/customize/dotxpcerc
+lib/swi-prolog-${PKGVERSION}/customize/edit
 lib/swi-prolog-${PKGVERSION}/demo/README
 lib/swi-prolog-${PKGVERSION}/demo/likes.pl
 lib/swi-prolog-${PKGVERSION}/doc/Manual/64bits.html
@@ -34,7 +39,6 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/Bibliography.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/Contents.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/DCG.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/DDE.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/DLL.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/DocIndex.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/IDE.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/IO.html
@@ -42,13 +46,14 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/SyntaxAndSemantics.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/acknowledge.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/aggregate.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/allsolutions.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/altmoduleapi.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/ancestral-cut.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/apply.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/applylist.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/arith.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/assoc.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/attvar.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/autoload.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/block3.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/breakpoint.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/broadcast.gif
 lib/swi-prolog-${PKGVERSION}/doc/Manual/broadcast.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/builtin.html
@@ -83,7 +88,7 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/defmodule.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/dialect.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/dynamic-modules.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/dynamic.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/dynstatic.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/edit.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/editreload.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/errors.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/examineprog.html
@@ -91,7 +96,6 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/examples.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/excepthook.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/exception.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/exception3.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/extendarith.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/extvar.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/files.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/findappfile.html
@@ -122,6 +126,7 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/home.gif
 lib/swi-prolog-${PKGVERSION}/doc/Manual/hooks.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/idepreds.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/idesummary.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/implhistory.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/import.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/importmodule.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/index.gif
@@ -131,7 +136,7 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/initfile.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/initgoal.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/intlibs.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/intro.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/iso.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/jitindex.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/libpl.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/library.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/license.html
@@ -139,13 +144,13 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/limits.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/listing.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/lists.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/loadfilehook.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/locale.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/manipatom.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/manipmodule.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/manipstack.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/manipterm.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/memory.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/metacall.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/metainmodule.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/metapred.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/miscarith.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/miscpreds.html
@@ -154,15 +159,15 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/moduleop.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/modules.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/mt-xpce.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/mtoplevel.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/mtunbound.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/navigator.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/nb_set.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/nbset.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/next.gif
 lib/swi-prolog-${PKGVERSION}/doc/Manual/operators.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/opsummary.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/option.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/optparse.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/ordsets.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/otherlicenses.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/overrule.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/overview.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/pairs.html
@@ -172,28 +177,27 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/plld.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/portabilitystrategies.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/practical.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/preddesc.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/predicate_options.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/predsummary.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/prev.gif
 lib/swi-prolog-${PKGVERSION}/doc/Manual/profile.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/profnode.gif
 lib/swi-prolog-${PKGVERSION}/doc/Manual/projectfiles.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/prolog_xref.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/prologxref.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/prologpack.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/protocol.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/qsaveforeign.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/qsavelimits.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/quasiquotations.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/quickstart.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/random.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/readline.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/readutil.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/record.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/reexport.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/registry.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/relnotes.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/resmodules.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/runenv.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/runtime.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/sec-5.11.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/sec-E.4.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/sicstus-chr.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/signal.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/simplex.html
@@ -207,6 +211,7 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/summary.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/swiorother.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/swiprolog.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/syntax.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/syntaxext.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/system.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/termrw.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/thmonitor.html
@@ -224,26 +229,20 @@ lib/swi-prolog-${PKGVERSION}/doc/Manual/typetest.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/ugraphs.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/up.gif
 lib/swi-prolog-${PKGVERSION}/doc/Manual/url.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/usemodules.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/useresource.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/usingmodules.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/whichmodules.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/varnumbers.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/whymodules.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/widechars.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/www_browser.html
-lib/swi-prolog-${PKGVERSION}/doc/Manual/xpce.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/xref.html
 lib/swi-prolog-${PKGVERSION}/doc/Manual/xrefchatdep.gif
 lib/swi-prolog-${PKGVERSION}/doc/Manual/xrefchatfile.gif
 lib/swi-prolog-${PKGVERSION}/doc/Manual/yellow_pages.gif
-lib/swi-prolog-${PKGVERSION}/dotfiles/README
-lib/swi-prolog-${PKGVERSION}/dotfiles/dotplrc
-lib/swi-prolog-${PKGVERSION}/dotfiles/dotxpcerc
-lib/swi-prolog-${PKGVERSION}/dotfiles/edit
 lib/swi-prolog-${PKGVERSION}/include/SWI-Prolog.h
 lib/swi-prolog-${PKGVERSION}/include/SWI-Stream.h
+lib/swi-prolog-${PKGVERSION}/include/Yap/YapInterface.h
 lib/swi-prolog-${PKGVERSION}/include/sicstus/sicstus.h
-lib/swi-prolog-${PKGVERSION}/include/stub.c
 lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/libswipl.a
 lib/swi-prolog-${PKGVERSION}/library/INDEX.pl
 lib/swi-prolog-${PKGVERSION}/library/MANUAL
@@ -252,11 +251,11 @@ lib/swi-prolog-${PKGVERSION}/library/am_match.pl
 lib/swi-prolog-${PKGVERSION}/library/ansi_term.pl
 lib/swi-prolog-${PKGVERSION}/library/apply.pl
 lib/swi-prolog-${PKGVERSION}/library/apply_macros.pl
+lib/swi-prolog-${PKGVERSION}/library/arithmetic.pl
 lib/swi-prolog-${PKGVERSION}/library/assoc.pl
 lib/swi-prolog-${PKGVERSION}/library/backcomp.pl
 lib/swi-prolog-${PKGVERSION}/library/base32.pl
 lib/swi-prolog-${PKGVERSION}/library/base64.pl
-lib/swi-prolog-${PKGVERSION}/library/bim.pl
 lib/swi-prolog-${PKGVERSION}/library/broadcast.pl
 lib/swi-prolog-${PKGVERSION}/library/charsio.pl
 lib/swi-prolog-${PKGVERSION}/library/check.pl
@@ -267,31 +266,61 @@ lib/swi-prolog-${PKGVERSION}/library/clp/clp_distinct.pl
 lib/swi-prolog-${PKGVERSION}/library/clp/clp_events.pl
 lib/swi-prolog-${PKGVERSION}/library/clp/clpfd.pl
 lib/swi-prolog-${PKGVERSION}/library/clp/simplex.pl
+lib/swi-prolog-${PKGVERSION}/library/codesio.pl
 lib/swi-prolog-${PKGVERSION}/library/coinduction.pl
+lib/swi-prolog-${PKGVERSION}/library/console_input.pl
 lib/swi-prolog-${PKGVERSION}/library/csv.pl
 lib/swi-prolog-${PKGVERSION}/library/ctypes.pl
 lib/swi-prolog-${PKGVERSION}/library/date.pl
+lib/swi-prolog-${PKGVERSION}/library/dcg/basics.pl
 lib/swi-prolog-${PKGVERSION}/library/debug.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/bim.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/aggregates.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/assertions.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/basicmodes.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/classic.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/dcg.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/engine/attributes.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/engine/basic_props.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/engine/basiccontrol.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/engine/exceptions.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/engine/exceptions_db.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/engine/hiord_rt.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/engine/internals.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/engine/io_aux.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/file_utils.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/format.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/freeze.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/hiord.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/hiordlib.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/iso_misc.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/isomodes.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/lists.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/llists.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/nativeprops.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/nortchecks.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/odd.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/prolog_flags.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/read.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/regtypes.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/regtypes/regtypes_tr.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/sockets.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/sort.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/streams.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/strings.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/system.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/terms.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/terms_check.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/terms_vars.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/unittestdecls.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/unittestprops.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/write.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/commons.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/hprolog.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/hprolog/format.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ifprolog.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/iso/iso_predicates.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/sicstus.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/sicstus/arrays.pl
@@ -300,18 +329,20 @@ lib/swi-prolog-${PKGVERSION}/library/dialect/sicstus/lists.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/sicstus/sockets.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/sicstus/swipl-lfr.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/sicstus/system.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/sicstus/terms.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/sicstus/timeout.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/swi/syspred_options.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/yap.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/yap/README.TXT
 lib/swi-prolog-${PKGVERSION}/library/dif.pl
 lib/swi-prolog-${PKGVERSION}/library/edinburgh.pl
 lib/swi-prolog-${PKGVERSION}/library/edit.pl
-lib/swi-prolog-${PKGVERSION}/library/emacs_interface.pl
 lib/swi-prolog-${PKGVERSION}/library/error.pl
 lib/swi-prolog-${PKGVERSION}/library/explain.pl
 lib/swi-prolog-${PKGVERSION}/library/fastrw.pl
 lib/swi-prolog-${PKGVERSION}/library/files.pl
 lib/swi-prolog-${PKGVERSION}/library/gensym.pl
+lib/swi-prolog-${PKGVERSION}/library/git.pl
 lib/swi-prolog-${PKGVERSION}/library/heaps.pl
 lib/swi-prolog-${PKGVERSION}/library/help.pl
 lib/swi-prolog-${PKGVERSION}/library/helpidx.pl
@@ -325,25 +356,36 @@ lib/swi-prolog-${PKGVERSION}/library/nb_set.pl
 lib/swi-prolog-${PKGVERSION}/library/occurs.pl
 lib/swi-prolog-${PKGVERSION}/library/operators.pl
 lib/swi-prolog-${PKGVERSION}/library/option.pl
+lib/swi-prolog-${PKGVERSION}/library/optparse.pl
 lib/swi-prolog-${PKGVERSION}/library/ordsets.pl
 lib/swi-prolog-${PKGVERSION}/library/oset.pl
 lib/swi-prolog-${PKGVERSION}/library/pairs.pl
 lib/swi-prolog-${PKGVERSION}/library/persistency.pl
 lib/swi-prolog-${PKGVERSION}/library/pio.pl
 lib/swi-prolog-${PKGVERSION}/library/portray_text.pl
+lib/swi-prolog-${PKGVERSION}/library/predicate_options.pl
+lib/swi-prolog-${PKGVERSION}/library/prolog_autoload.pl
+lib/swi-prolog-${PKGVERSION}/library/prolog_breakpoints.pl
 lib/swi-prolog-${PKGVERSION}/library/prolog_clause.pl
+lib/swi-prolog-${PKGVERSION}/library/prolog_codewalk.pl
+lib/swi-prolog-${PKGVERSION}/library/prolog_colour.pl
 lib/swi-prolog-${PKGVERSION}/library/prolog_history.pl
+lib/swi-prolog-${PKGVERSION}/library/prolog_metainference.pl
+lib/swi-prolog-${PKGVERSION}/library/prolog_pack.pl
 lib/swi-prolog-${PKGVERSION}/library/prolog_source.pl
 lib/swi-prolog-${PKGVERSION}/library/prolog_stack.pl
 lib/swi-prolog-${PKGVERSION}/library/prolog_xref.pl
 lib/swi-prolog-${PKGVERSION}/library/pure_input.pl
 lib/swi-prolog-${PKGVERSION}/library/qpforeign.pl
 lib/swi-prolog-${PKGVERSION}/library/qsave.pl
+lib/swi-prolog-${PKGVERSION}/library/quasi_quotations.pl
 lib/swi-prolog-${PKGVERSION}/library/quintus.pl
+lib/swi-prolog-${PKGVERSION}/library/random.pl
 lib/swi-prolog-${PKGVERSION}/library/rbtrees.pl
 lib/swi-prolog-${PKGVERSION}/library/readln.pl
 lib/swi-prolog-${PKGVERSION}/library/readutil.pl
 lib/swi-prolog-${PKGVERSION}/library/record.pl
+lib/swi-prolog-${PKGVERSION}/library/sandbox.pl
 lib/swi-prolog-${PKGVERSION}/library/settings.pl
 lib/swi-prolog-${PKGVERSION}/library/shell.pl
 lib/swi-prolog-${PKGVERSION}/library/shlib.pl
@@ -360,10 +402,14 @@ lib/swi-prolog-${PKGVERSION}/library/unicode/blocks.pl
 lib/swi-prolog-${PKGVERSION}/library/unicode/unicode_data.pl
 lib/swi-prolog-${PKGVERSION}/library/url.pl
 lib/swi-prolog-${PKGVERSION}/library/utf8.pl
+lib/swi-prolog-${PKGVERSION}/library/varnumbers.pl
 lib/swi-prolog-${PKGVERSION}/library/vm.pl
 lib/swi-prolog-${PKGVERSION}/library/when.pl
+lib/swi-prolog-${PKGVERSION}/library/win_menu.pl
+lib/swi-prolog-${PKGVERSION}/library/writef.pl
 lib/swi-prolog-${PKGVERSION}/library/www_browser.pl
 lib/swi-prolog-${PKGVERSION}/swipl.home
 man/man1/swi-prolog.1
 man/man1/swipl-ld.1
 man/man1/swipl-rc.1
+@pkgdir lib/swi-prolog-${PKGVERSION}/library/dialect/ifprolog
diff --git a/lang/swi-prolog-lite/distinfo b/lang/swi-prolog-lite/distinfo
index d96259699e6..d43b94a36bd 100644
--- a/lang/swi-prolog-lite/distinfo
+++ b/lang/swi-prolog-lite/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.17 2014/04/16 21:03:51 joerg Exp $
+$NetBSD: distinfo,v 1.18 2014/05/28 10:29:12 markd Exp $
 
-SHA1 (swi-prolog/pl-5.11.18.tar.gz) = b929d47f2e92230e2afcaaaf25e9a34c40adc54e
-RMD160 (swi-prolog/pl-5.11.18.tar.gz) = 1cbf0dab3a9cd63b3178d6a43c983b31402d7b7f
-Size (swi-prolog/pl-5.11.18.tar.gz) = 13330292 bytes
-SHA1 (patch-ad) = 7b3899fe4162582efe955c67d5dc3ed42e7d1702
-SHA1 (patch-ae) = 4135212b4c5faf70e01e78e45df5e1a0ccc927a6
-SHA1 (patch-ar) = 2bf3648f29c6263ea2efe13b95309a1fe72b14b8
-SHA1 (patch-packages_clib_sha1_brg_endian.h) = db9f50eb0d0f92e44a79048d0bb84b690945964b
-SHA1 (patch-packages_xpce_src_img_gifread.c) = 5ef16b048f8343cde92a17d9fd3c78b0c3e7c374
-SHA1 (patch-src_os_pl-fmt.c) = dc3dd7ff6349557afc5b7d5d0f6de9c9815e6403
-SHA1 (patch-src_pl-funcs.h) = 792257fcc533c835a607e6d660ed42058b7a8a95
-SHA1 (patch-src_pl-rl.c) = ed0cd8d1df40bd1e1ab1e9c4a4cb5b77c4dec14b
+SHA1 (swi-prolog/pl-6.6.5.tar.gz) = ae86b29f1b78a4c1530990a761fefb0c86ba57f2
+RMD160 (swi-prolog/pl-6.6.5.tar.gz) = 6d5d974ee5245bacb5d7d62e6683357d4b53612e
+Size (swi-prolog/pl-6.6.5.tar.gz) = 14837423 bytes
+SHA1 (patch-ad) = a6c0b88f4e2f2a26ba1f2e56eb620d8a467f939f
+SHA1 (patch-packages_Dialect.defs.in) = f75ceac51bae428a81ba2001d39d8408ccb099f9
+SHA1 (patch-packages_clib_sha1_brg_endian.h) = 6ab1f8e87be6193a5dc11bff4b1cf7bfe959a243
+SHA1 (patch-src_pl-funcs.h) = fd821e245ca49a42e595096d05a21ee20d25c41c
diff --git a/lang/swi-prolog-lite/patches/patch-ad b/lang/swi-prolog-lite/patches/patch-ad
index f361faeba7b..23dcb7fff5d 100644
--- a/lang/swi-prolog-lite/patches/patch-ad
+++ b/lang/swi-prolog-lite/patches/patch-ad
@@ -1,25 +1,15 @@
-$NetBSD: patch-ad,v 1.4 2010/05/16 18:46:10 asau Exp $
+$NetBSD: patch-ad,v 1.5 2014/05/28 10:29:12 markd Exp $
 
-Fix path to include files.
 Split install target.
 
---- packages/Makefile.in.orig	2010-02-24 01:25:23.000000000 +0300
-+++ packages/Makefile.in	2010-02-25 02:00:09.000000000 +0300
-@@ -34,7 +34,7 @@
- PLARCH=@ARCH@
- PLLDFLAGS=@LDFLAGS@
- PLDIR=$(shell dirname `pwd`)
--PLINCL=$(PLDIR)/include
-+PLINCL=$(PLDIR)/src
- LIBDIR=$(PLDIR)/lib/$(PLARCH)
- PLSHARED=@PLSHARED@
- PLTHREADS=@PLTHREADS@
-@@ -82,6 +82,8 @@
+--- packages/Makefile.in.orig	2014-04-25 14:06:38.000000000 +0000
++++ packages/Makefile.in
+@@ -91,6 +91,8 @@ install::
  	for p in $(PKG); do \
- 	    if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ) || exit 1; fi; \
+ 	    if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \
          done
 +
 +post-install::
- 	@echo "*** Forcing update of library index ***"
- 	rm -f $(DESTDIR)$(PLLIB)/INDEX.pl
- 	./swipl.sh -f none -g "make_library_index('$(DESTDIR)$(PLLIB)')" -t halt
+ 	$(FORCE_MKINDEX)
+ 
+ rpm-install: html-install
diff --git a/lang/swi-prolog-lite/patches/patch-ae b/lang/swi-prolog-lite/patches/patch-ae
deleted file mode 100644
index ca7f204896d..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2011/04/12 23:16:43 asau Exp $
-
---- packages/xpce/pl/src/Makefile.orig	2011-03-23 21:57:54.000000000 +0300
-+++ packages/xpce/pl/src/Makefile	2011-04-12 18:46:41.000000000 +0400
-@@ -25,7 +25,7 @@
- OBJDIR=		../../$(builddir)/pl
- CONFIG=		../../$(builddir)/config.h
- 
--CPLIFLAGS=	-I$(PLINCL) -I../../$(builddir) -I../../src
-+CPLIFLAGS=	-I$(PLINCL) -I$(PLINCL)/os -I../../$(builddir) -I../../src
- PL=     	pl
- PLLD=		plld -pl $(PL)
- ITFOBJ= 	$(addprefix $(OBJDIR)/, interface.o link.o pcecall.o)
diff --git a/lang/swi-prolog-lite/patches/patch-ar b/lang/swi-prolog-lite/patches/patch-ar
deleted file mode 100644
index eade3c393d9..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2010/05/16 18:46:11 asau Exp $
-
-Use installed swipl-ld wrapper.
-
---- packages/swipl-ld.sh.in.orig	2010-05-07 00:13:28.000000000 +0400
-+++ packages/swipl-ld.sh.in	2010-05-16 18:36:32.000000000 +0400
-@@ -21,4 +21,4 @@
- fi
- export @DLLIBVAR@
- 
--$bdir/swipl-ld -pl $bdir/$PL "$@"
-+swipl-ld -pl $bdir/$PL "$@"
diff --git a/lang/swi-prolog-lite/patches/patch-packages_Dialect.defs.in b/lang/swi-prolog-lite/patches/patch-packages_Dialect.defs.in
new file mode 100644
index 00000000000..d3572d46b20
--- /dev/null
+++ b/lang/swi-prolog-lite/patches/patch-packages_Dialect.defs.in
@@ -0,0 +1,22 @@
+$NetBSD: patch-packages_Dialect.defs.in,v 1.1 2014/05/28 10:29:12 markd Exp $
+
+--- packages/Dialect.defs.in.orig	2014-05-27 12:23:38.000000000 +0000
++++ packages/Dialect.defs.in
+@@ -44,7 +44,7 @@ SO=@SO_EXT@
+ SO_PATH=@SO_PATH@
+ COFLAGS=@COFLAGS@
+ CWFLAGS=@CWFLAGS@
+-CMFLAGS=@CMFLAGS@
++CMFLAGS=@CMFLAGS@ -fPIC
+ CIFLAGS=@CIFLAGS@ -I@abs_top_builddir@/../include
+ DEFS=@DEFS@ -D__SWI_PROLOG__
+ CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) $(PKGCFLAGS) $(DEFS)
+@@ -57,7 +57,7 @@ else
+ LIBPLSO=$(LIBPLEMBED)
+ endif
+ 
+-PLLDFLAGS=@LDFLAGS@ -L@abs_top_builddir@/../lib/$(PLARCH)
++PLLDFLAGS=@LDFLAGS@ -L$(PLBASE)/lib/$(PLARCH)
+ LDSOFLAGS=@SO_LDFLAGS@ $(PLLDFLAGS) $(PKGLDFLAGS)
+ LDFLAGS=$(PLLDFLAGS) $(PKGLDFLAGS)
+ 
diff --git a/lang/swi-prolog-lite/patches/patch-packages_clib_sha1_brg_endian.h b/lang/swi-prolog-lite/patches/patch-packages_clib_sha1_brg_endian.h
index d59182410af..b346c3215ba 100644
--- a/lang/swi-prolog-lite/patches/patch-packages_clib_sha1_brg_endian.h
+++ b/lang/swi-prolog-lite/patches/patch-packages_clib_sha1_brg_endian.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-packages_clib_sha1_brg_endian.h,v 1.1 2011/12/17 16:11:25 marino Exp $
+$NetBSD: patch-packages_clib_sha1_brg_endian.h,v 1.2 2014/05/28 10:29:12 markd Exp $
 
---- packages/clib/sha1/brg_endian.h.orig	2011-03-18 18:18:22.000000000 +0000
+--- packages/clib/sha1/brg_endian.h.orig	2014-04-13 08:40:33.000000000 +0000
 +++ packages/clib/sha1/brg_endian.h
 @@ -39,7 +39,7 @@
  /* Include files where endian defines and byteswap functions may reside */
@@ -10,4 +10,4 @@ $NetBSD: patch-packages_clib_sha1_brg_endian.h,v 1.1 2011/12/17 16:11:25 marino
 +#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) || defined( __DragonFly__)
  #  include <sys/endian.h>
  #elif defined( BSD ) && ( BSD >= 199103 ) || defined( __APPLE__ ) || \
-       defined( __CYGWIN32__ ) || defined( __DJGPP__ ) || defined( __osf__ )
+       defined( __CYGWIN__ ) || defined( __DJGPP__ ) || defined( __osf__ )
diff --git a/lang/swi-prolog-lite/patches/patch-packages_xpce_src_img_gifread.c b/lang/swi-prolog-lite/patches/patch-packages_xpce_src_img_gifread.c
deleted file mode 100644
index 57cb2bd927d..00000000000
--- a/lang/swi-prolog-lite/patches/patch-packages_xpce_src_img_gifread.c
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-packages_xpce_src_img_gifread.c,v 1.1 2013/01/24 12:03:09 is Exp $
-
---- gifread.c.orig	2011-03-23 18:57:54.000000000 +0000
-+++ packages/xpce/src/img/gifread.c
-@@ -169,7 +169,7 @@ GIFReadFD(IOSTREAM *fd,
-   /* read colormaps */
-   if ( BitSet((UCHAR) buf[4], LOCALCOLORMAP) )
-   { if ( (rval=ReadColorMap(fd, GifScreen.BitPixel, at, ac, closure))
--	 							!= GIF_OK )
-+								!= GIF_OK )
-     { setGifError("Error reading GIF colormap");
-       return rval;
-     }
-@@ -466,7 +466,7 @@ LZWReadByte(IOSTREAM * fd, int flag, int
-       firstcode = oldcode = GetCode(fd, code_size, FALSE);
-     }
-     while (firstcode == clear_code);
--    return firstcode;
-+    return (firstcode&255);
-   }
-   if (sp > stack)
-     return *--sp;
-@@ -487,11 +487,11 @@ LZWReadByte(IOSTREAM * fd, int flag, int
-       max_code = clear_code + 2;
-       sp = stack;
-       firstcode = oldcode = GetCode(fd, code_size, FALSE);
--      return firstcode;
--    } else if (code == end_code)
-+      return (firstcode&255);
-+    } else if (code == end_code || code > max_code)
-     {
-       int count;
--      UCHAR buf[260];
-+      UCHAR buf[260];			/* Block buffer */
- 
-       if (ZeroDataBlock)
- 	return -2;
-@@ -505,11 +505,12 @@ LZWReadByte(IOSTREAM * fd, int flag, int
-     incode = code;
- 
-     if (code >= max_code)
--    {
--      *sp++ = firstcode;
-+    { if ( sp < stack+sizeof(stack) )  /* stack is UCHAR */
-+         *sp++ = firstcode;
-+
-       code = oldcode;
-     }
--    while (code >= clear_code)
-+    while (code >= clear_code && sp < stack+sizeof(stack))
-     {
-       *sp++ = vals[code];
-       if (code == (int) next[code])
-@@ -520,7 +521,8 @@ LZWReadByte(IOSTREAM * fd, int flag, int
-       code = next[code];
-     }
- 
--    *sp++ = firstcode = vals[code];
-+    if ( sp < stack+sizeof(stack) )
-+      *sp++ = firstcode = vals[code];
- 
-     if ((code = max_code) < (1 << MAX_LZW_BITS))
-     {
-@@ -537,9 +539,9 @@ LZWReadByte(IOSTREAM * fd, int flag, int
-     oldcode = incode;
- 
-     if (sp > stack)
--      return *--sp;
-+      return ((*--sp) & 255);
-   }
--  return code;
-+  return (code&255);
- }
- 
- 
-@@ -554,7 +556,7 @@ ReadImage(IOSTREAM *fd,
-   int xpos = 0, ypos = 0, pass = 0;
-   long curidx;
- 
--  if (!ReadOK(fd, &c, 1))
-+  if ( !ReadOK(fd, &c, 1) || c > MAX_LZW_BITS )
-   { return GIF_INVALID;
-   }
-   if (LZWReadByte(fd, TRUE, c) < 0)
diff --git a/lang/swi-prolog-lite/patches/patch-src_os_pl-fmt.c b/lang/swi-prolog-lite/patches/patch-src_os_pl-fmt.c
deleted file mode 100644
index 719dbbed12c..00000000000
--- a/lang/swi-prolog-lite/patches/patch-src_os_pl-fmt.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_os_pl-fmt.c,v 1.1 2014/04/16 21:03:51 joerg Exp $
-
---- src/os/pl-fmt.c.orig	2014-04-16 20:47:33.000000000 +0000
-+++ src/os/pl-fmt.c
-@@ -917,7 +917,7 @@ formatNumber(bool split, int div, int ra
-       { char *s;
- 
- 	for(s=buf; *s; s++)
--	  *s = toupper(*s);
-+	  *s = toupper((unsigned char)*s);
-       }
-       if ( split || div > 0 )
-       { int before = (int)(len-div);
diff --git a/lang/swi-prolog-lite/patches/patch-src_pl-funcs.h b/lang/swi-prolog-lite/patches/patch-src_pl-funcs.h
index 4c868ac0a04..b44e05fc2fd 100644
--- a/lang/swi-prolog-lite/patches/patch-src_pl-funcs.h
+++ b/lang/swi-prolog-lite/patches/patch-src_pl-funcs.h
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_pl-funcs.h,v 1.1 2012/11/07 15:30:04 joerg Exp $
+$NetBSD: patch-src_pl-funcs.h,v 1.2 2014/05/28 10:29:12 markd Exp $
 
 Don't change visibility of a system prototype.
 
---- src/pl-funcs.h.orig	2012-11-04 22:29:01.000000000 +0000
+--- src/pl-funcs.h.orig	2014-04-25 14:06:38.000000000 +0000
 +++ src/pl-funcs.h
-@@ -426,7 +426,9 @@ COMMON(void) 		RemoveTemporaryFiles(void
- COMMON(bool) 		OpenStream(int fd);
- COMMON(bool) 		expandVars(const char *pattern, char *expanded, int len);
- COMMON(char *) 		ExpandOneFile(const char *spec, char *file);
+@@ -347,7 +347,9 @@ COMMON(void)		setOSPrologFlags(void);
+ COMMON(void)		RemoveTemporaryFiles(void);
+ COMMON(bool)		OpenStream(int fd);
+ COMMON(char *)		expandVars(const char *pattern, char *expanded, int len);
 +#ifndef HAVE_GETWD
- COMMON(char *) 		getwd(char *buf);
+ COMMON(char *)		getwd(char *buf);
 +#endif
- COMMON(char *) 		AbsoluteFile(const char *spec, char *path);
- COMMON(int) 		IsAbsolutePath(const char *spec);
- COMMON(char *) 		BaseName(const char *f);
+ COMMON(char *)		AbsoluteFile(const char *spec, char *path);
+ COMMON(int)		IsAbsolutePath(const char *spec);
+ COMMON(char *)		BaseName(const char *f);
diff --git a/lang/swi-prolog-lite/patches/patch-src_pl-rl.c b/lang/swi-prolog-lite/patches/patch-src_pl-rl.c
deleted file mode 100644
index 8a6f6997d2a..00000000000
--- a/lang/swi-prolog-lite/patches/patch-src_pl-rl.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_pl-rl.c,v 1.1 2014/04/16 21:03:51 joerg Exp $
-
---- src/pl-rl.c.orig	2014-04-16 20:47:02.000000000 +0000
-+++ src/pl-rl.c
-@@ -93,7 +93,6 @@ extern void add_history(char *);	/* shou
- 					/* readline.h versions */
- extern int rl_begin_undo_group(void);	/* delete when conflict arrises! */
- extern int rl_end_undo_group(void);
--extern Function *rl_event_hook;
- #ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION
- #define rl_filename_completion_function filename_completion_function
- extern char *filename_completion_function(const char *, int);