Update to YAP 6.3.3

Notable changes in YAP 6.3.3

- exo compilation, a way to store large DBs much more compactly
- a new way to do save/restore
- improvements on the SWI interface, including improved support
  of SWI packages. The core IO code has been updated to the latest SWI devel.
- interfaces Prolog->R (r..eal from Nicos and all) and YAP->Python
- PRiSM port
- PFL, a new language to write graphical models, by Tiago Gomes
- gobs of bug fixes.


Notable changes in YAP 6.3.2

- new tabling code that supports a global table and answer subsumption
- an interface to gecode
- a low-level interface to R
- a low-level interface to CUDD and also to c2d
- a PRISM interface

- the gprof interface works again, it has been rewritten to save the log as a file.
- the save/restore now can save a module only, and does not depend on memory tricks.
- there is a first (needs lots of work) Windows console (based on SWI code).

- Lots of bug fixes


Notable changes in YAP 6.3

- YAP now uses the SWI Input/Output routines.
  This includes the SWI streams handling code,
  and the SWI write routines.
- YAP also includes support to the pldoc and plunit libraries.
- New implementation of saved state routines allows saving modules.
- GECODE interface.

4 files changed, 25 insertions, 70 deletions

diff --git a/lang/yap/patches/patch-ae b/lang/yap/patches/patch-ae
index 7c902d7f44d..2dc7d9ab7e8 100644
--- a/lang/yap/patches/patch-ae
+++ b/lang/yap/patches/patch-ae
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.1 2010/02/11 20:43:49 asau Exp $
+$NetBSD: patch-ae,v 1.2 2013/06/12 20:28:41 asau Exp $
 
---- C/c_interface.c.orig	2008-06-17 17:37:48.000000000 +0400
-+++ C/c_interface.c	2009-02-06 22:53:50.000000000 +0300
-@@ -326,6 +326,9 @@
- #if HAVE_STDARG_H
- #include <stdarg.h>
- #endif
-+#if USE_SYSTEM_MALLOC
-+#include <stdlib.h>
-+#endif
- #if HAVE_STRING_H
- #include <string.h>
- #endif
+--- C/c_interface.c.orig	2013-01-19 20:37:25.000000000 +0100
++++ C/c_interface.c	2013-03-07 12:03:41.320513600 +0100
+@@ -360,9 +360,6 @@
+ #ifdef CUT_C
+ #include "cut_c.h"
+ #endif /* CUT_C */
+-#if HAVE_MALLOC_H
+-#include <malloc.h>
+-#endif
+ 
+ #if !HAVE_STRNCPY
+ #define strncpy(X,Y,Z) strcpy(X,Y)
diff --git a/lang/yap/patches/patch-aj b/lang/yap/patches/patch-aj
index a739b6cc606..d5c35159b6e 100644
--- a/lang/yap/patches/patch-aj
+++ b/lang/yap/patches/patch-aj
@@ -1,20 +1,15 @@
-$NetBSD: patch-aj,v 1.3 2010/10/27 12:32:52 asau Exp $
+$NetBSD: patch-aj,v 1.4 2013/06/12 20:28:41 asau Exp $
 
-Fix staged installation.
+Don't attempt to strip scripts, it doesn't work.
 
---- 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 $(DESTDIR)$(LIBDIR)/web/css
-+		mkdir -p $(PLTARGET)/web/css
- 		$(INSTALL_DATA) $(LIBPL) $(PLTARGET)
- 		$(INSTALL_DATA) $(srcdir)/README $(PLTARGET)
- 		$(INSTALL_DATA) $(srcdir)/web/icons/*.png $(PLTARGET)/web/icons
--		$(INSTALL_DATA) $(srcdir)/web/css/*.css $(DESTDIR)$(LIBDIR)/web/css
-+		$(INSTALL_DATA) $(srcdir)/web/css/*.css $(PLTARGET)/web/css
- 		$(PL) -f none -g make -t halt
+--- packages/http/Makefile.in.orig	2012-07-07 02:14:37.000000000 +0200
++++ packages/http/Makefile.in	2013-03-07 12:27:41.027386177 +0100
+@@ -60,7 +60,7 @@
+ 		mkdir -p $(DESTDIR)$(EXDIR)/pwp
+ 		(cd $(srcdir)/examples && $(INSTALL_DATA) $(EXAMPLES) $(DESTDIR)$(EXDIR))
+ 		(cd $(srcdir)/examples/pwp && $(INSTALL_DATA) *.pwp *.pl $(DESTDIR)$(EXDIR)/pwp)
+-		(cd $(srcdir)/examples && $(INSTALL_PROGRAM) $(EXAMPLEEXE) $(DESTDIR)$(EXDIR))
++		(cd $(srcdir)/examples && $(INSTALL_SCRIPT) $(EXAMPLEEXE) $(DESTDIR)$(EXDIR))
  
- ln-install:	$(LIBPL)
+ uninstall::
+ 		(cd $(LIBDIR) && rm -f $(LIBPL))
diff --git a/lang/yap/patches/patch-packages_swi-minisat2_C_Solver.C b/lang/yap/patches/patch-packages_swi-minisat2_C_Solver.C
deleted file mode 100644
index 946e3afa79a..00000000000
--- a/lang/yap/patches/patch-packages_swi-minisat2_C_Solver.C
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-packages_swi-minisat2_C_Solver.C,v 1.1 2012/06/15 18:53:30 joerg Exp $
-
-See SolverType.h.
-
---- packages/swi-minisat2/C/Solver.C.orig	2012-06-15 18:36:17.000000000 +0000
-+++ packages/swi-minisat2/C/Solver.C
-@@ -26,6 +26,14 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
- //=================================================================================================
- // Constructor/Destructor:
- 
-+template<class V> Clause* Clause_new(const V& ps, bool learnt)
-+{
-+  assert(sizeof(Lit)      == sizeof(uint32_t));
-+  assert(sizeof(float)    == sizeof(uint32_t));
-+  void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size()));
-+  return new (mem) Clause(ps, learnt);
-+}
-+
- 
- Solver::Solver() :
- 
diff --git a/lang/yap/patches/patch-packages_swi-minisat2_C_SolverTypes.h b/lang/yap/patches/patch-packages_swi-minisat2_C_SolverTypes.h
deleted file mode 100644
index 121cdfc30b9..00000000000
--- a/lang/yap/patches/patch-packages_swi-minisat2_C_SolverTypes.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-packages_swi-minisat2_C_SolverTypes.h,v 1.1 2012/06/15 18:53:30 joerg Exp $
-
-Templated friend must be declared outside class.
-
---- packages/swi-minisat2/C/SolverTypes.h.orig	2011-06-11 15:38:37.000000000 +0000
-+++ packages/swi-minisat2/C/SolverTypes.h
-@@ -119,11 +119,7 @@ public:
- 
-     // -- use this function instead:
-     template<class V>
--    friend Clause* Clause_new(const V& ps, bool learnt = false) {
--        assert(sizeof(Lit)      == sizeof(uint32_t));
--        assert(sizeof(float)    == sizeof(uint32_t));
--        void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size()));
--        return new (mem) Clause(ps, learnt); }
-+    friend Clause* Clause_new(const V& ps, bool learnt = false);
- 
-     int          size        ()      const   { return size_etc >> 3; }
-     void         shrink      (int i)         { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); }