Update to SWI-Prolog 5.11.0

Notable changes in SWI-Prolog 5.11.0:

* ODBC now properly handles locale.  This means you can
  use it with Unicode if you use a UTF-8 based locale.

* Recently reported manifest problems around xpce should be
  fixed with help from Degski.

* Message queues can now be destroyed while they have suspended
  writers, making pipe-like cooperation between threads much easier.

* Using set_prolog_flag(qcompile, auto), you can ask the system
  to automatically maintain quick-load versions of your source-files.
  This can greatly improve development comfort for really large
  applications.

* Jeff Rosenwald contributed an interface for Google protocol buffers


Notable changes in SWI-Prolog 5.9.10:

* A lot of stuff has been added to enhance the compatibility to SICStus.
  This involves some changes to the kernel, some additions to the libraries
  and starting and populating a SICStus emulation layer.  All this was
  initiated by the with to make the Alpino NLP parser suite
  (http://www.let.rug.nl/vannoord/alp/Alpino/) available for SWI-Prolog.
  Thanks to Gertjan van Noord, this is now almost reality (there
  are some remaining tweaks, notably with the Tcl/Tk interface).

* Also various enhancements and fixes to the tabbed-editing support for
  the built-in editor.

9 files changed, 75 insertions, 93 deletions

diff --git a/lang/swi-prolog-lite/Makefile b/lang/swi-prolog-lite/Makefile
index de41bb107b4..62ac9dadc62 100644
--- a/lang/swi-prolog-lite/Makefile
+++ b/lang/swi-prolog-lite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2010/03/24 19:43:26 asau Exp $
+# $NetBSD: Makefile,v 1.17 2010/05/16 18:46:10 asau Exp $
 
 .include "Makefile.common"
 
 PKGNAME=		swi-prolog-lite-${SWIPLVERS}
-PKGREVISION=		1
+#PKGREVISION=		1
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		ISO/Edinburgh-style Prolog compiler
diff --git a/lang/swi-prolog-lite/Makefile.common b/lang/swi-prolog-lite/Makefile.common
index 22dfb37d57f..408fb902622 100644
--- a/lang/swi-prolog-lite/Makefile.common
+++ b/lang/swi-prolog-lite/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.6 2010/02/10 21:56:41 asau Exp $
+# $NetBSD: Makefile.common,v 1.7 2010/05/16 18:46:10 asau Exp $
 
-SWIPLVERS=		5.9.7
+SWIPLVERS=		5.11.0
 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 d39afe74f16..d8d9253be37 100644
--- a/lang/swi-prolog-lite/PLIST
+++ b/lang/swi-prolog-lite/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.7 2010/02/11 19:00:18 asau Exp $
-bin/plld
-bin/plrc
+@comment $NetBSD: PLIST,v 1.8 2010/05/16 18:46:10 asau Exp $
 bin/swi-prolog
-lib/pkgconfig/pl.pc
-lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_GNU_PLATFORM}/plld
-lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_GNU_PLATFORM}/plrc
+bin/swipl-ld
+bin/swipl-rc
+lib/pkgconfig/swipl.pc
 lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_GNU_PLATFORM}/swi-prolog
-lib/swi-prolog-${PKGVERSION}/bin/swipl
+lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_GNU_PLATFORM}/swipl-ld
+lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_GNU_PLATFORM}/swipl-rc
+lib/swi-prolog-${PKGVERSION}/bin/swipl.home
 lib/swi-prolog-${PKGVERSION}/boot/apply.pl
 lib/swi-prolog-${PKGVERSION}/boot/attvar.pl
 lib/swi-prolog-${PKGVERSION}/boot/autoload.pl
@@ -192,6 +192,7 @@ 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
@@ -240,8 +241,9 @@ 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/sicstus/sicstus.h
 lib/swi-prolog-${PKGVERSION}/include/stub.c
-lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/libpl.a
+lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_GNU_PLATFORM}/libswipl.a
 lib/swi-prolog-${PKGVERSION}/library/INDEX.pl
 lib/swi-prolog-${PKGVERSION}/library/MANUAL
 lib/swi-prolog-${PKGVERSION}/library/aggregate.pl
@@ -268,9 +270,33 @@ lib/swi-prolog-${PKGVERSION}/library/date.pl
 lib/swi-prolog-${PKGVERSION}/library/debug.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect.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/classic.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/format.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/read.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/regtypes.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao/sockets.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/write.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/commons.pl
 lib/swi-prolog-${PKGVERSION}/library/dialect/hprolog.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
+lib/swi-prolog-${PKGVERSION}/library/dialect/sicstus/block.pl
+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/timeout.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
@@ -279,6 +305,7 @@ 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/heaps.pl
@@ -331,7 +358,7 @@ lib/swi-prolog-${PKGVERSION}/library/utf8.pl
 lib/swi-prolog-${PKGVERSION}/library/vm.pl
 lib/swi-prolog-${PKGVERSION}/library/when.pl
 lib/swi-prolog-${PKGVERSION}/library/www_browser.pl
-lib/swi-prolog-${PKGVERSION}/swipl
-man/man1/plld.1
-man/man1/plrc.1
+lib/swi-prolog-${PKGVERSION}/swipl.home
 man/man1/swi-prolog.1
+man/man1/swipl-ld.1
+man/man1/swipl-rc.1
diff --git a/lang/swi-prolog-lite/distinfo b/lang/swi-prolog-lite/distinfo
index 79e21262337..a2ae6a8ec32 100644
--- a/lang/swi-prolog-lite/distinfo
+++ b/lang/swi-prolog-lite/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.9 2010/02/10 21:56:41 asau Exp $
+$NetBSD: distinfo,v 1.10 2010/05/16 18:46:10 asau Exp $
 
-SHA1 (swi-prolog/pl-5.9.7.tar.gz) = 50d163bb2a24f83d1ee7811434f31266e2aaf44e
-RMD160 (swi-prolog/pl-5.9.7.tar.gz) = 720637581faa4c3bf1a96340956ec220de845db0
-Size (swi-prolog/pl-5.9.7.tar.gz) = 13077112 bytes
-SHA1 (patch-ad) = 5b54528554e63eb069e7efa7245db4ed20030512
-SHA1 (patch-ao) = ee3f49f0c889c09247bfa1761c1a633bcc6cc9e1
-SHA1 (patch-ap) = c001f721aa2d1868b8014a1a70d0b929f3d84a4e
-SHA1 (patch-aq) = 23a50b6b433de24acf785c92c815aabae729bf6c
+SHA1 (swi-prolog/pl-5.11.0.tar.gz) = be355025bfcbf19f58e652973695506b49c1160d
+RMD160 (swi-prolog/pl-5.11.0.tar.gz) = 0075c16c82b3c4f0ff37de0b5ca5e7061bfecad5
+Size (swi-prolog/pl-5.11.0.tar.gz) = 12882832 bytes
+SHA1 (patch-ad) = 7b3899fe4162582efe955c67d5dc3ed42e7d1702
+SHA1 (patch-aq) = 5bda4d5bec0520e1019b663326e32d74b9c2ee08
+SHA1 (patch-ar) = 2bf3648f29c6263ea2efe13b95309a1fe72b14b8
diff --git a/lang/swi-prolog-lite/patches/patch-ad b/lang/swi-prolog-lite/patches/patch-ad
index 05fc3b0a32b..f361faeba7b 100644
--- a/lang/swi-prolog-lite/patches/patch-ad
+++ b/lang/swi-prolog-lite/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.3 2010/02/10 21:56:41 asau Exp $
+$NetBSD: patch-ad,v 1.4 2010/05/16 18:46:10 asau Exp $
 
 Fix path to include files.
 Split install target.
 
---- packages/Makefile.in.orig	2010-01-10 16:53:32.000000000 +0300
-+++ packages/Makefile.in	2010-01-19 02:29:05.000000000 +0300
-@@ -36,7 +36,7 @@
+--- 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`)
@@ -13,8 +13,8 @@ Split install target.
 +PLINCL=$(PLDIR)/src
  LIBDIR=$(PLDIR)/lib/$(PLARCH)
  PLSHARED=@PLSHARED@
- INSTALL=@INSTALL@
-@@ -83,6 +83,8 @@
+ PLTHREADS=@PLTHREADS@
+@@ -82,6 +82,8 @@
  	for p in $(PKG); do \
  	    if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ) || exit 1; fi; \
          done
@@ -22,4 +22,4 @@ Split install target.
 +post-install::
  	@echo "*** Forcing update of library index ***"
  	rm -f $(DESTDIR)$(PLLIB)/INDEX.pl
- 	./pl.sh -f none -g "make_library_index('$(DESTDIR)$(PLLIB)')" -t halt
+ 	./swipl.sh -f none -g "make_library_index('$(DESTDIR)$(PLLIB)')" -t halt
diff --git a/lang/swi-prolog-lite/patches/patch-ao b/lang/swi-prolog-lite/patches/patch-ao
deleted file mode 100644
index c4f267e7cbf..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ao
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2010/02/10 21:56:41 asau Exp $
-
-Avoid conflict with library function.
-
---- src/pl-arith.c.orig	2009-10-19 17:00:42.000000000 +0400
-+++ src/pl-arith.c	2009-10-20 08:54:57.000000000 +0400
-@@ -2268,7 +2268,7 @@
- 
- 
- static int
--popcount64(int64_t i)
-+ar_popcount64(int64_t i)
- { int c;
-   size_t j;
-   int64_t m = LL(1);
-@@ -2292,7 +2292,7 @@
-       if (  n1->value.i < 0 )
- 	return notLessThanZero("popcount", 1, n1);
- 
--      r->value.i = popcount64(n1->value.i);
-+      r->value.i = ar_popcount64(n1->value.i);
-       r->type = V_INTEGER;
-       succeed;
- #ifdef O_GMP
diff --git a/lang/swi-prolog-lite/patches/patch-ap b/lang/swi-prolog-lite/patches/patch-ap
deleted file mode 100644
index 3609447dd84..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ap
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2010/02/10 21:56:41 asau Exp $
-
-"test" portability.
-Reported as applied upstream.
-
---- packages/space/configure.in.orig	2010-01-10 16:35:20.000000000 +0300
-+++ packages/space/configure.in	2010-01-17 19:19:50.000000000 +0300
-@@ -88,12 +88,12 @@
- 
- AC_CHECK_HEADERS(spatialindex/SpatialIndex.h,[si=1],[si=0])
- #AC_TRY_LINK([#include <spatialindex/SpatialIndex.h>],[SpatialIndex::Point *p=new SpatialIndex::Point();],[si=1],[si=0])
--if test $si == 0; then
-+if test $si = 0; then
-    AC_ERROR("Cannot find spatialindex. Spatialindex must be installed first (http://trac.gispython.org/spatialindex/)")
- fi
- 
- AC_CHECK_HEADERS(geos_c.h,[geos=1],[geos=0])
--if test $si == 0; then
-+if test $si = 0; then
-    AC_ERROR("Cannot find GEOS library. GEOS must be installed first (http://trac.osgeo.org/geos/)")
- fi
- 
diff --git a/lang/swi-prolog-lite/patches/patch-aq b/lang/swi-prolog-lite/patches/patch-aq
index ad3fd628b81..4f15b5ef4f6 100644
--- a/lang/swi-prolog-lite/patches/patch-aq
+++ b/lang/swi-prolog-lite/patches/patch-aq
@@ -1,25 +1,15 @@
-$NetBSD: patch-aq,v 1.1 2010/02/10 21:56:41 asau Exp $
+$NetBSD: patch-aq,v 1.2 2010/05/16 18:46:11 asau Exp $
 
 "test" portability.
-Reported as applied upstream.
 
---- packages/space/configure.orig	2010-01-17 19:18:27.000000000 +0300
-+++ packages/space/configure	2010-01-17 19:20:26.000000000 +0300
-@@ -3797,7 +3797,7 @@
- done
- 
- #AC_TRY_LINK([#include <spatialindex/SpatialIndex.h>],[SpatialIndex::Point *p=new SpatialIndex::Point();],[si=1],[si=0])
--if test $si == 0; then
-+if test $si = 0; then
-    { { $as_echo "$as_me:$LINENO: error: \"Cannot find spatialindex. Spatialindex must be installed first (http://trac.gispython.org/spatialindex/)\"" >&5
- $as_echo "$as_me: error: \"Cannot find spatialindex. Spatialindex must be installed first (http://trac.gispython.org/spatialindex/)\"" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -3951,7 +3951,7 @@
+--- packages/space/configure.orig	2010-03-01 16:22:16.000000000 +0300
++++ packages/space/configure	2010-05-16 18:03:13.000000000 +0400
+@@ -4768,7 +4768,7 @@
  
  done
  
 -if test $si == 0; then
 +if test $si = 0; then
-    { { $as_echo "$as_me:$LINENO: error: \"Cannot find GEOS library. GEOS must be installed first (http://trac.osgeo.org/geos/)\"" >&5
- $as_echo "$as_me: error: \"Cannot find GEOS library. GEOS must be installed first (http://trac.osgeo.org/geos/)\"" >&2;}
-    { (exit 1); exit 1; }; }
+    as_fn_error "\"Cannot find GEOS library. GEOS must be installed first (http://trac.osgeo.org/geos/)\"" "$LINENO" 5
+ fi
+ 
diff --git a/lang/swi-prolog-lite/patches/patch-ar b/lang/swi-prolog-lite/patches/patch-ar
new file mode 100644
index 00000000000..eade3c393d9
--- /dev/null
+++ b/lang/swi-prolog-lite/patches/patch-ar
@@ -0,0 +1,12 @@
+$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 "$@"