Update to Yap 6.0.6

Highlights:

- configure system rewritten and simplified
- better emulation of SWI, especially of C-interface, allows:
  o port of SWI  packages: sgml and plunit work better, clib, RDF,
    zlib and http seem to be working well, semweb compiles
  o better integration with C: it is now possible to call YAP from JPL
    reliably (all tests in the demos/java directory succeed in Linux)
  o it is now possible to create a stream with SWI routines and use
    YAP IO (parser, writer) on it
  o pyswip: YAP now includes a version of the pyswip package for
    experimentation: all the demos seem to be work (YAP must be compiled
    as a dynamic library)
- compilation in Sun and NetBSD
- YAP can now handle very, very large terms in compiled clauses.
- several new builtins
- improve thread implementation, especially locking in IO routines and indexing
    o fix C thread interface
- fix odbc support in MYDDAS
- fix overflow in ==
- fix bad call to subsumes/2
- new version of trie library, developed by Theo and Ricardo

7 files changed, 174 insertions, 31 deletions

diff --git a/lang/yap/Makefile b/lang/yap/Makefile
index b34d10f0deb..ec5f2bd3de5 100644
--- a/lang/yap/Makefile
+++ b/lang/yap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/05/18 09:24:43 asau Exp $
+# $NetBSD: Makefile,v 1.10 2010/08/10 07:49:57 asau Exp $
 #
 
-DISTNAME=		yap-6.0.5
+DISTNAME=		yap-6.0.6
 CATEGORIES=		lang
 # MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=yap/}
 MASTER_SITES=		http://www.dcc.fc.up.pt/~vsc/Yap/ \
diff --git a/lang/yap/PLIST b/lang/yap/PLIST
index 16484e2326a..39387ed6906 100644
--- a/lang/yap/PLIST
+++ b/lang/yap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/05/18 09:24:43 asau Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/08/10 07:49:57 asau Exp $
 bin/yap
 include/Yap/Atoms.h
 include/Yap/Regs.h
@@ -81,18 +81,40 @@ include/Yap/trim_trail.h
 include/Yap/udi.h
 include/Yap/yap_structs.h
 include/Yap/yapio.h
+lib/Yap/cgi.so
+lib/Yap/crypt.so
+lib/Yap/files.so
+lib/Yap/http_stream.so
 lib/Yap/itries.so
+lib/Yap/json.so
+lib/Yap/libplstream.so
 lib/Yap/matrix.so
+lib/Yap/memfile.so
+lib/Yap/mime.so
 lib/Yap/pl-minisat.so
-lib/Yap/plstream.so
+lib/Yap/pl-tai.so
+lib/Yap/process.so
 lib/Yap/random.so
+lib/Yap/rdf_db.so
+lib/Yap/readutil.so
 lib/Yap/regexp.so
 lib/Yap/sgml2pl.so
+lib/Yap/sha4pl.so
+lib/Yap/socket.so
 lib/Yap/startup.yss
+lib/Yap/streaminfo.so
 lib/Yap/sys.so
+lib/Yap/time.so
 lib/Yap/tries.so
+lib/Yap/turtle.so
+lib/Yap/unix.so
+lib/Yap/uri.so
+lib/Yap/yap_random.so
 lib/Yap/yap_rl.so
+lib/Yap/zlib4pl.so
 lib/libYap.a
+lib/web/css/dirindex.css
+lib/web/css/openid.css
 share/Yap/DTD/HTML4.dcl
 share/Yap/DTD/HTML4.dtd
 share/Yap/DTD/HTML4.soc
@@ -108,7 +130,10 @@ share/Yap/assoc.yap
 share/Yap/atts.yap
 share/Yap/autoloader.yap
 share/Yap/avl.yap
+share/Yap/base64.pl
 share/Yap/bhash.yap
+share/Yap/broadcast.pl
+share/Yap/cgi.pl
 share/Yap/charsio.yap
 share/Yap/chr.pl
 share/Yap/chr/README
@@ -192,6 +217,9 @@ share/Yap/clpr/itf_r.pl
 share/Yap/clpr/nf_r.pl
 share/Yap/clpr/store_r.pl
 share/Yap/cnf.pl
+share/Yap/crypt.pl
+share/Yap/ctypes.pl
+share/Yap/date.pl
 share/Yap/dbqueues.yap
 share/Yap/dbusage.yap
 share/Yap/debug.pl
@@ -201,11 +229,55 @@ share/Yap/dialect/hprolog.yap
 share/Yap/dialect/swi.yap
 share/Yap/dialect/swi/INDEX.pl
 share/Yap/dialect/swi/listing.pl
+share/Yap/dialect/swi/readutil.pl
 share/Yap/error.pl
 share/Yap/expand_macros.yap
+share/Yap/filesex.pl
 share/Yap/gensym.yap
 share/Yap/hacks.yap
 share/Yap/heaps.yap
+share/Yap/http/README
+share/Yap/http/dcg_basics.pl
+share/Yap/http/html_head.pl
+share/Yap/http/html_write.pl
+share/Yap/http/http_authenticate.pl
+share/Yap/http/http_client.pl
+share/Yap/http/http_dirindex.pl
+share/Yap/http/http_dispatch.pl
+share/Yap/http/http_error.pl
+share/Yap/http/http_exception.pl
+share/Yap/http/http_header.pl
+share/Yap/http/http_hook.pl
+share/Yap/http/http_host.pl
+share/Yap/http/http_json.pl
+share/Yap/http/http_log.pl
+share/Yap/http/http_mime_plugin.pl
+share/Yap/http/http_open.pl
+share/Yap/http/http_openid.pl
+share/Yap/http/http_parameters.pl
+share/Yap/http/http_path.pl
+share/Yap/http/http_pwp.pl
+share/Yap/http/http_server_files.pl
+share/Yap/http/http_session.pl
+share/Yap/http/http_sgml_plugin.pl
+share/Yap/http/http_stream.pl
+share/Yap/http/http_wrapper.pl
+share/Yap/http/inetd_httpd.pl
+share/Yap/http/js_write.pl
+share/Yap/http/json.pl
+share/Yap/http/json_convert.pl
+share/Yap/http/mimepack.pl
+share/Yap/http/mimetype.pl
+share/Yap/http/thread_httpd.pl
+share/Yap/http/web/icons/back.png
+share/Yap/http/web/icons/c.png
+share/Yap/http/web/icons/compressed.png
+share/Yap/http/web/icons/folder.png
+share/Yap/http/web/icons/generic.png
+share/Yap/http/web/icons/layout.png
+share/Yap/http/web/icons/openid-logo-square.png
+share/Yap/http/web/icons/openid-logo-tiny.png
+share/Yap/http/xpce_httpd.pl
 share/Yap/icon_address.pl
 share/Yap/iso_639.pl
 share/Yap/itries.yap
@@ -216,10 +288,13 @@ share/Yap/maplist.pl
 share/Yap/maplist.yap
 share/Yap/matlab.yap
 share/Yap/matrix.yap
+share/Yap/memfile.pl
+share/Yap/mime.pl
 share/Yap/minisat.pl
 share/Yap/minisat_examples/adder.pl
 share/Yap/minisat_examples/pearl_examples.pl
 share/Yap/nb.yap
+share/Yap/nb_set.pl
 share/Yap/occurs.yap
 share/Yap/operators.pl
 share/Yap/option.pl
@@ -249,6 +324,7 @@ share/Yap/pl/ground.yap
 share/Yap/pl/hacks.yap
 share/Yap/pl/init.yap
 share/Yap/pl/listing.yap
+share/Yap/pl/lists.yap
 share/Yap/pl/load_foreign.yap
 share/Yap/pl/messages.yap
 share/Yap/pl/modules.yap
@@ -267,6 +343,7 @@ share/Yap/pl/udi.yap
 share/Yap/pl/utils.yap
 share/Yap/pl/yapor.yap
 share/Yap/pl/yio.yap
+share/Yap/pltotex.pl
 share/Yap/plunit.pl
 share/Yap/prandom.yap
 share/Yap/problog.yap
@@ -278,33 +355,78 @@ share/Yap/problog_examples/learn_graph.pl
 share/Yap/problog_learning.yap
 share/Yap/problog_learning/flags_learning.yap
 share/Yap/problog_learning/logger.yap
+share/Yap/process.pl
+share/Yap/prolog_server.pl
 share/Yap/prolog_source.pl
 share/Yap/prolog_xref.pl
+share/Yap/pwp.pl
 share/Yap/queues.yap
+share/Yap/quintus.pl
+share/Yap/random.pl
 share/Yap/random.yap
 share/Yap/rbtrees.yap
+share/Yap/rdf.pl
+share/Yap/rdf_ntriples.pl
+share/Yap/rdf_parser.pl
+share/Yap/rdf_triple.pl
+share/Yap/rdf_write.pl
 share/Yap/readutil.yap
+share/Yap/record.pl
 share/Yap/regexp.yap
+share/Yap/rewrite.pl
 share/Yap/rltree.yap
+share/Yap/semweb/README
+share/Yap/semweb/dc.rdfs
+share/Yap/semweb/eor.rdfs
+share/Yap/semweb/owl.owl
+share/Yap/semweb/rdf_cache.pl
+share/Yap/semweb/rdf_compare.pl
+share/Yap/semweb/rdf_db.pl
+share/Yap/semweb/rdf_edit.pl
+share/Yap/semweb/rdf_http_plugin.pl
+share/Yap/semweb/rdf_library.pl
+share/Yap/semweb/rdf_library.ttl
+share/Yap/semweb/rdf_litindex.pl
+share/Yap/semweb/rdf_persistency.pl
+share/Yap/semweb/rdf_portray.pl
+share/Yap/semweb/rdf_turtle.pl
+share/Yap/semweb/rdf_turtle_write.pl
+share/Yap/semweb/rdf_zlib_plugin.pl
+share/Yap/semweb/rdfs.pl
+share/Yap/semweb/rdfs.rdfs
+share/Yap/semweb/sparql_client.pl
+share/Yap/semweb/turtle_base.pl
+share/Yap/settings.pl
 share/Yap/sgml.pl
 share/Yap/sgml_write.pl
+share/Yap/sha.pl
+share/Yap/shlib.pl
+share/Yap/socket.pl
 share/Yap/splay.yap
+share/Yap/streaminfo.pl
 share/Yap/stringutils.yap
 share/Yap/system.yap
 share/Yap/terms.yap
 share/Yap/test_cover.pl
 share/Yap/test_wizard.pl
+share/Yap/time.pl
 share/Yap/timeout.yap
 share/Yap/trees.yap
 share/Yap/tries.yap
 share/Yap/ugraphs.yap
 share/Yap/undgraphs.yap
+share/Yap/unix.pl
+share/Yap/uri.pl
+share/Yap/url.pl
+share/Yap/utf8.pl
 share/Yap/varnumbers.yap
 share/Yap/wdgraphs.yap
 share/Yap/wgraphs.yap
 share/Yap/wundgraphs.yap
+share/Yap/xpath.pl
 share/Yap/xsdp_types.pl
 share/Yap/ypp.yap
+share/Yap/zlib.pl
 share/docs/Yap/Artistic
 share/docs/Yap/COPYING
 share/docs/Yap/README
diff --git a/lang/yap/distinfo b/lang/yap/distinfo
index 7421c5e9517..b41e51b54c2 100644
--- a/lang/yap/distinfo
+++ b/lang/yap/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.7 2010/05/18 09:24:43 asau Exp $
+$NetBSD: distinfo,v 1.8 2010/08/10 07:49:57 asau Exp $
 
-SHA1 (yap-6.0.5.tar.gz) = 1084b1630b48a430d60d6aee8e31914ecc6d5369
-RMD160 (yap-6.0.5.tar.gz) = b35264a7911c73d095426fb3790a104d41d44157
-Size (yap-6.0.5.tar.gz) = 3744819 bytes
+SHA1 (yap-6.0.6.tar.gz) = 8fa25cd70fde024c6fa0bc455b0e7b1aa117b6f3
+RMD160 (yap-6.0.6.tar.gz) = 9e3538933967257c59a441d10ddda0d6935a9d2e
+Size (yap-6.0.6.tar.gz) = 5099543 bytes
 SHA1 (patch-aa) = dca2acac805aabd8e2815b509ad516294484ad0f
-SHA1 (patch-ab) = 76e1a2b4a183215c37ede5c8cbec624e901fe427
-SHA1 (patch-ac) = c0d382127f9bc3a962d01a0da34c99968f7388ab
+SHA1 (patch-ab) = b311db4efa89f0b67952e62be6cd489e3e32165f
+SHA1 (patch-ac) = e945c3e4c19d8d02b53a5030ad5ac0d44b25b959
 SHA1 (patch-ad) = e3765c0d6729b4d531cdea59dc8e442055091d10
 SHA1 (patch-ae) = cf4a79ccd0c34e42ca3d8a108619a9974288cde6
-SHA1 (patch-af) = e49296d42247aec7ead7f65d67a42f93b400ca0f
+SHA1 (patch-af) = 135f2f3e82242d7b17ade4a797a3077834719e77
 SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648
+SHA1 (patch-za) = e45a450ebcef34e1e042eff62a9a72142c80984a
+SHA1 (patch-zb) = 15562c2b81adf1684987dda980ed925008dfe4d8
diff --git a/lang/yap/patches/patch-ab b/lang/yap/patches/patch-ab
index 522fb39775b..2038615d745 100644
--- a/lang/yap/patches/patch-ab
+++ b/lang/yap/patches/patch-ab
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2010/02/11 20:43:49 asau Exp $
+$NetBSD: patch-ab,v 1.3 2010/08/10 07:49:57 asau Exp $
 
---- H/Yap.h.orig	2008-05-23 14:02:13.000000000 +0400
-+++ H/Yap.h	2009-02-06 21:36:00.000000000 +0300
-@@ -231,7 +231,7 @@
+DragonFly support.
+
+--- H/Yap.h.orig	2010-08-04 21:36:28.000000000 +0400
++++ H/Yap.h	2010-08-10 11:01:04.000000000 +0400
+@@ -257,7 +257,7 @@
  #endif
  
  #if !defined(IN_SECOND_QUADRANT)
@@ -11,12 +13,12 @@ $NetBSD: patch-ab,v 1.2 2010/02/11 20:43:49 asau Exp $
  #if defined(YAPOR) && defined(__alpha)
  
  #define MMAP_ADDR 0x40000000
-@@ -650,7 +650,7 @@
+@@ -683,7 +683,7 @@
  	if you place things in the lower addresses (power to the libc people).
  */
  
--#if (defined(_AIX) || (defined(__APPLE__) && !defined(__LP64__)) || defined(_WIN32) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(_POWER) || defined(__POWERPC__) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__))
-+#if (defined(_AIX) || (defined(__APPLE__) && !defined(__LP64__)) || defined(_WIN32) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(_POWER) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__))
+-#if (defined(_AIX) || (defined(__APPLE__) && !defined(__LP64__)) || defined(_WIN32) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(_POWER) || defined(__POWERPC__) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__)) || defined(__NetBSD__)
++#if (defined(_AIX) || (defined(__APPLE__) && !defined(__LP64__)) || defined(_WIN32) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(_POWER) || defined(__POWERPC__) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__)) || defined(__NetBSD__) || defined(__DragonFly__)
  #define USE_LOW32_TAGS 1
  #endif
  
diff --git a/lang/yap/patches/patch-ac b/lang/yap/patches/patch-ac
index d65137dc2b1..e2b5e18d705 100644
--- a/lang/yap/patches/patch-ac
+++ b/lang/yap/patches/patch-ac
@@ -1,10 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2010/02/11 20:43:49 asau Exp $
+$NetBSD: patch-ac,v 1.3 2010/08/10 07:49:57 asau Exp $
 
---- configure.orig	2008-05-24 02:29:49.000000000 +0400
-+++ configure	2009-02-06 21:25:15.000000000 +0300
-@@ -7002,7 +7002,7 @@
- 	JAVALIBPATH="-L/System/Library/Frameworks/JavaVM.framework/Libraries"
- 	JAVAINCPATH="-I/System/Library/Frameworks/JavaVM.framework/Headers"
+DragonFly support.
+
+--- configure.orig	2010-08-04 21:36:28.000000000 +0400
++++ configure	2010-08-10 11:03:31.000000000 +0400
+@@ -7052,7 +7052,7 @@
+         YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
+         PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
  	;;
 -      *netbsd*|*freebsd*)
 +      *netbsd*|*freebsd*|*dragonfly*)
diff --git a/lang/yap/patches/patch-af b/lang/yap/patches/patch-af
index fd712efd796..29730baa251 100644
--- a/lang/yap/patches/patch-af
+++ b/lang/yap/patches/patch-af
@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.1 2010/02/11 20:43:49 asau Exp $
+$NetBSD: patch-af,v 1.2 2010/08/10 07:49:57 asau Exp $
 
-No "struct mallinfo" on NetBSD (?)
+Use canonical macro.
 
---- H/dlmalloc.h.orig	2005-11-23 06:01:33.000000000 +0300
-+++ H/dlmalloc.h	2009-04-19 05:14:25.000000000 +0400
-@@ -489,7 +489,7 @@
+--- H/dlmalloc.h.orig	2010-08-04 21:36:28.000000000 +0400
++++ H/dlmalloc.h	2010-08-10 11:04:45.000000000 +0400
+@@ -493,7 +493,7 @@
    HAVE_USR_INCLUDE_MALLOC_H.
  */
  
--#if HAVE_MALLOC_H && !defined(_WIN32)
-+#if HAVE_MALLOC_H && !defined(__NetBSD__) && !defined(_WIN32)
+-#if HAVE_MALLOC_H && !defined(_WIN32) && !defined(__NetBSD_Version__)
++#if HAVE_MALLOC_H && !defined(_WIN32) && !defined(__NetBSD__)
  #define HAVE_USR_INCLUDE_MALLOC_H 1
  #endif
  
diff --git a/lang/yap/patches/patch-aj b/lang/yap/patches/patch-aj
new file mode 100644
index 00000000000..f3895c11b28
--- /dev/null
+++ b/lang/yap/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2010/08/10 07:49:57 asau Exp $
+
+Fix staged installation.
+
+--- packages/http/Makefile.in.orig	2010-08-04 21:36:28.000000000 +0400
++++ packages/http/Makefile.in	2010-08-10 11:26:28.000000000 +0400
+@@ -110,7 +110,7 @@
+ 		$(INSTALL_PROGRAM) $(SOLIBS) $(BINTARGET)
+ 		mkdir -p $(PLTARGET)
+ 		mkdir -p $(PLTARGET)/web/icons
+-		mkdir -p $(LIBDIR)/web/css
++		mkdir -p $(DESTDIR)$(LIBDIR)/web/css
+ 		$(INSTALL_DATA) $(LIBPL) $(PLTARGET)
+ 		$(INSTALL_DATA) $(srcdir)/README $(PLTARGET)
+ 		$(INSTALL_DATA) $(srcdir)/web/icons/*.png $(PLTARGET)/web/icons