Don't use false as pointer. Don't use default arguments in friend

definition.

3 files changed, 38 insertions, 1 deletions

diff --git a/lang/yap/distinfo b/lang/yap/distinfo
index c76b70111d6..72328de5a15 100644
--- a/lang/yap/distinfo
+++ b/lang/yap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2013/06/13 21:44:06 joerg Exp $
+$NetBSD: distinfo,v 1.17 2013/07/19 12:51:56 joerg Exp $
 
 SHA1 (yap-6.3.3.tar.gz) = d191e419e5cf74b11e003aae5fe148f3f2f26ac5
 RMD160 (yap-6.3.3.tar.gz) = 6c92880670d58b1e885cbb52709b61773db65808
@@ -11,4 +11,6 @@ SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648
 SHA1 (patch-aj) = 9d8c1cde65c52f963f72b4f5364e611db96e59c7
 SHA1 (patch-configure) = a88448bb21ba103fab3579dfec7e9dbc812491f3
 SHA1 (patch-configure.in) = cbe3f2f503ba56c953fa4454881ea4917f275460
+SHA1 (patch-packages_CLPBN_horus_HorusCli.cpp) = 82879fa9e998c993a10850bce729e658f73bec11
 SHA1 (patch-packages_pldoc_Makefile.in) = 821a281c2066f6ebb7e03e197e3e5eb32ac299e8
+SHA1 (patch-packages_swi-minisat2_C_SolverTypes.h) = 88ee9ab4dd7fc43e3433d02633513c204981ece2
diff --git a/lang/yap/patches/patch-packages_CLPBN_horus_HorusCli.cpp b/lang/yap/patches/patch-packages_CLPBN_horus_HorusCli.cpp
new file mode 100644
index 00000000000..b60da24b644
--- /dev/null
+++ b/lang/yap/patches/patch-packages_CLPBN_horus_HorusCli.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-packages_CLPBN_horus_HorusCli.cpp,v 1.1 2013/07/19 12:51:56 joerg Exp $
+
+--- packages/CLPBN/horus/HorusCli.cpp.orig	2013-07-19 10:05:58.000000000 +0000
++++ packages/CLPBN/horus/HorusCli.cpp
+@@ -121,7 +121,7 @@ readQueryAndEvidence (
+       }
+       VarId vid = Util::stringToUnsigned (arg);
+       VarNode* queryVar = fg.getVarNode (vid);
+-      if (queryVar == false) {
++      if (queryVar == NULL) {
+         cerr << "Error: unknow variable with id " ;
+         cerr << "`" << vid << "'."  << endl;
+         exit (EXIT_FAILURE);
+@@ -143,7 +143,7 @@ readQueryAndEvidence (
+       }
+       VarId vid = Util::stringToUnsigned (leftArg);
+       VarNode* observedVar = fg.getVarNode (vid);
+-      if (observedVar == false) {
++      if (observedVar == NULL) {
+         cerr << "Error: unknow variable with id " ;
+         cerr << "`" << vid << "'."  << endl;
+         exit (EXIT_FAILURE);
diff --git a/lang/yap/patches/patch-packages_swi-minisat2_C_SolverTypes.h b/lang/yap/patches/patch-packages_swi-minisat2_C_SolverTypes.h
new file mode 100644
index 00000000000..feb717dfc81
--- /dev/null
+++ b/lang/yap/patches/patch-packages_swi-minisat2_C_SolverTypes.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-packages_swi-minisat2_C_SolverTypes.h,v 1.3 2013/07/19 12:51:56 joerg Exp $
+
+--- packages/swi-minisat2/C/SolverTypes.h.orig	2012-06-29 21:19:52.000000000 +0000
++++ packages/swi-minisat2/C/SolverTypes.h
+@@ -119,7 +119,7 @@ public:
+ 
+     // -- use this function instead:
+     template<class V>
+-    friend Clause* Clause_new(const V& ps, bool learnt = false);
++    friend Clause* Clause_new(const V& ps, bool learnt);
+ 
+     int          size        ()      const   { return size_etc >> 3; }
+     void         shrink      (int i)         { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); }