Update to Yap 6.2.0

New in Yap-6.2.0:

YAP now includes the ProbLog language, developed at Leuven.

Better compatibility with SWI-Prolog, YAP now includes most
of the SWI web stuff, the constraint solvers, the plunit code,
and the Java and python interfaces.

The MYDDAS SQL and odbc interfaces are now integrated and
enabled by default.

YAP also now includes support for rational numbers, a lot of new
math operations, lots of bug fixes, a few engine optimisations.

New libraries include Neumerkel's lambda library, a first step
at coinduction support, and Nicos excellent R-interface.
The co-routing code has been totally cleaned up.


Changes in Yap-6.0.7:

NEW: YAP_SetYAPFlag (request from Theo Mantadelis).
NEW: support div/2 as per WG17.
FIXED: restore from / file should just try that file.
FIXED: bad things can happen to P when user code is called (obs from Ingo Thon).
NEW: coinduction.yap.
FIXED: remove leftover files including two lib*.a (obs from Bernd Gutmann).
FIXED: Make clean should result in recompiling all *.o (obs from Bernd Gutmann).
NEW: Ulrich Neumerkel's lambda library.
DELETE: ^/2 and ^/3 as grammar built-ins.
FIXED: make install in clpqr was broken if we used local install_sh .
DELETE: atan/2 arithmetic function, use atan2/2 instead (WG17).
FIXED: compilation in Solaris was broken because  of conflict in declaration of gethostname.
FIXED: acyclic_term/1 is now built-in (WG17).
NEW: subsumes_term/2 (WG17).

5 files changed, 51 insertions, 14 deletions

diff --git a/lang/yap/Makefile b/lang/yap/Makefile
index ec5f2bd3de5..b4bbc2631e4 100644
--- a/lang/yap/Makefile
+++ b/lang/yap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/08/10 07:49:57 asau Exp $
+# $NetBSD: Makefile,v 1.11 2010/10/27 12:32:52 asau Exp $
 #
 
-DISTNAME=		yap-6.0.6
+DISTNAME=		yap-6.2.0
 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 719f8adf401..89022a5297b 100644
--- a/lang/yap/PLIST
+++ b/lang/yap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/08/10 08:26:20 asau Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/10/27 12:32:52 asau Exp $
 bin/yap
 include/Yap/Atoms.h
 include/Yap/Regs.h
@@ -215,6 +215,7 @@ share/Yap/clpr/itf_r.pl
 share/Yap/clpr/nf_r.pl
 share/Yap/clpr/store_r.pl
 share/Yap/cnf.pl
+share/Yap/coinduction.yap
 share/Yap/crypt.pl
 share/Yap/ctypes.pl
 share/Yap/date.pl
@@ -228,6 +229,7 @@ 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/dtproblog.yap
 share/Yap/error.pl
 share/Yap/expand_macros.yap
 share/Yap/filesex.pl
@@ -282,6 +284,7 @@ share/Yap/icon_address.pl
 share/Yap/iso_639.pl
 share/Yap/itries.yap
 share/Yap/lam_mpi.yap
+share/Yap/lambda.pl
 share/Yap/lineutils.yap
 share/Yap/lists.yap
 share/Yap/maplist.pl
@@ -347,14 +350,31 @@ share/Yap/pltotex.pl
 share/Yap/plunit.pl
 share/Yap/prandom.yap
 share/Yap/problog.yap
+share/Yap/problog/extlists.yap
 share/Yap/problog/flags.yap
+share/Yap/problog/gflags.yap
+share/Yap/problog/hash_table.yap
+share/Yap/problog/intervals.yap
+share/Yap/problog/logger.yap
+share/Yap/problog/mc_DNF_sampling.yap
+share/Yap/problog/os.yap
 share/Yap/problog/print.yap
+share/Yap/problog/print_learning.yap
+share/Yap/problog/sampling.yap
+share/Yap/problog/tabling.yap
+share/Yap/problog/timer.yap
 share/Yap/problog/tptree.yap
+share/Yap/problog/utils_learning.yap
+share/Yap/problog/variable_elimination.yap
+share/Yap/problog/variables.yap
+share/Yap/problog/version_control.yap
 share/Yap/problog_examples/graph.pl
+share/Yap/problog_examples/graph_tabled.pl
 share/Yap/problog_examples/learn_graph.pl
+share/Yap/problog_examples/office.pl
+share/Yap/problog_examples/viralmarketing.pl
+share/Yap/problog_examples/viralmarketing_tabled.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
@@ -362,6 +382,7 @@ share/Yap/prolog_xref.pl
 share/Yap/pwp.pl
 share/Yap/queues.yap
 share/Yap/quintus.pl
+share/Yap/r_session.yap
 share/Yap/random.pl
 share/Yap/random.yap
 share/Yap/rbtrees.yap
diff --git a/lang/yap/distinfo b/lang/yap/distinfo
index 25605d4c6c8..cfa247741d7 100644
--- a/lang/yap/distinfo
+++ b/lang/yap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2010/08/10 08:26:20 asau Exp $
+$NetBSD: distinfo,v 1.10 2010/10/27 12:32:52 asau Exp $
 
-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 (yap-6.2.0.tar.gz) = 884406c6a6333c796ab19d0f40529918be6cae97
+RMD160 (yap-6.2.0.tar.gz) = af5bb81590105234644dc072f14c37f696e7db2a
+Size (yap-6.2.0.tar.gz) = 4990807 bytes
 SHA1 (patch-aa) = dca2acac805aabd8e2815b509ad516294484ad0f
 SHA1 (patch-ab) = b311db4efa89f0b67952e62be6cd489e3e32165f
 SHA1 (patch-ac) = e945c3e4c19d8d02b53a5030ad5ac0d44b25b959
@@ -10,4 +10,5 @@ SHA1 (patch-ad) = e3765c0d6729b4d531cdea59dc8e442055091d10
 SHA1 (patch-ae) = cf4a79ccd0c34e42ca3d8a108619a9974288cde6
 SHA1 (patch-af) = 135f2f3e82242d7b17ade4a797a3077834719e77
 SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648
-SHA1 (patch-aj) = 41ae8b5649143299cd1b03d70b1b38bd623bace9
+SHA1 (patch-aj) = 61a53b4ef921270544edc79ddcb0f816824fd3ce
+SHA1 (patch-ak) = b4a31508e5d63f5e6d1099874aeb15a69859d6b5
diff --git a/lang/yap/patches/patch-aj b/lang/yap/patches/patch-aj
index 927ff350cd6..a739b6cc606 100644
--- a/lang/yap/patches/patch-aj
+++ b/lang/yap/patches/patch-aj
@@ -1,14 +1,14 @@
-$NetBSD: patch-aj,v 1.2 2010/08/10 08:26:20 asau Exp $
+$NetBSD: patch-aj,v 1.3 2010/10/27 12:32:52 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 12:22:07.000000000 +0400
+--- packages/http/Makefile.in.orig	2010-10-18 12:48:21.000000000 +0400
++++ packages/http/Makefile.in	2010-10-27 00:40:44.000000000 +0400
 @@ -110,11 +110,11 @@
  		$(INSTALL_PROGRAM) $(SOLIBS) $(BINTARGET)
  		mkdir -p $(PLTARGET)
  		mkdir -p $(PLTARGET)/web/icons
--		mkdir -p $(LIBDIR)/web/css
+-		mkdir -p $(DESTDIR)$(LIBDIR)/web/css
 +		mkdir -p $(PLTARGET)/web/css
  		$(INSTALL_DATA) $(LIBPL) $(PLTARGET)
  		$(INSTALL_DATA) $(srcdir)/README $(PLTARGET)
diff --git a/lang/yap/patches/patch-ak b/lang/yap/patches/patch-ak
new file mode 100644
index 00000000000..bc8d0b267b8
--- /dev/null
+++ b/lang/yap/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2010/10/27 12:32:52 asau Exp $
+
+Dragonfly support.
+
+--- packages/clib/sha1/brg_endian.h.orig	2010-10-18 12:48:20.000000000 +0400
++++ packages/clib/sha1/brg_endian.h	2010-10-27 03:03:34.000000000 +0400
+@@ -39,7 +39,7 @@
+ /* Include files where endian defines and byteswap functions may reside */
+ #if defined(__sun__)
+ #  include <sys/isa_defs.h>
+-#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ )
++#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__ )