Fri Jul 19 12:51:56 2013 UTC ()
Don't use false as pointer. Don't use default arguments in friend
definition.


(joerg)
diff -r1.16 -r1.17 pkgsrc/lang/yap/distinfo
diff -r0 -r1.1 pkgsrc/lang/yap/patches/patch-packages_CLPBN_horus_HorusCli.cpp
diff -r0 -r1.3 pkgsrc/lang/yap/patches/patch-packages_swi-minisat2_C_SolverTypes.h

cvs diff -r1.16 -r1.17 pkgsrc/lang/yap/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/yap/distinfo 2013/06/13 21:44:06 1.16
+++ pkgsrc/lang/yap/distinfo 2013/07/19 12:51:56 1.17
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: distinfo,v 1.16 2013/06/13 21:44:06 joerg Exp $ 1$NetBSD: distinfo,v 1.17 2013/07/19 12:51:56 joerg Exp $
2 2
3SHA1 (yap-6.3.3.tar.gz) = d191e419e5cf74b11e003aae5fe148f3f2f26ac5 3SHA1 (yap-6.3.3.tar.gz) = d191e419e5cf74b11e003aae5fe148f3f2f26ac5
4RMD160 (yap-6.3.3.tar.gz) = 6c92880670d58b1e885cbb52709b61773db65808 4RMD160 (yap-6.3.3.tar.gz) = 6c92880670d58b1e885cbb52709b61773db65808
5Size (yap-6.3.3.tar.gz) = 7879301 bytes 5Size (yap-6.3.3.tar.gz) = 7879301 bytes
6SHA1 (patch-aa) = 113f443f57fac208632701fc7eddca18d98d240d 6SHA1 (patch-aa) = 113f443f57fac208632701fc7eddca18d98d240d
7SHA1 (patch-ad) = e3765c0d6729b4d531cdea59dc8e442055091d10 7SHA1 (patch-ad) = e3765c0d6729b4d531cdea59dc8e442055091d10
8SHA1 (patch-ae) = 1bc060490ff5e2ba698a4f680a6d030f69683e01 8SHA1 (patch-ae) = 1bc060490ff5e2ba698a4f680a6d030f69683e01
9SHA1 (patch-af) = a042950ee63fac0f5863c3caa3f7c07227c46b4b 9SHA1 (patch-af) = a042950ee63fac0f5863c3caa3f7c07227c46b4b
10SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648 10SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648
11SHA1 (patch-aj) = 9d8c1cde65c52f963f72b4f5364e611db96e59c7 11SHA1 (patch-aj) = 9d8c1cde65c52f963f72b4f5364e611db96e59c7
12SHA1 (patch-configure) = a88448bb21ba103fab3579dfec7e9dbc812491f3 12SHA1 (patch-configure) = a88448bb21ba103fab3579dfec7e9dbc812491f3
13SHA1 (patch-configure.in) = cbe3f2f503ba56c953fa4454881ea4917f275460 13SHA1 (patch-configure.in) = cbe3f2f503ba56c953fa4454881ea4917f275460
 14SHA1 (patch-packages_CLPBN_horus_HorusCli.cpp) = 82879fa9e998c993a10850bce729e658f73bec11
14SHA1 (patch-packages_pldoc_Makefile.in) = 821a281c2066f6ebb7e03e197e3e5eb32ac299e8 15SHA1 (patch-packages_pldoc_Makefile.in) = 821a281c2066f6ebb7e03e197e3e5eb32ac299e8
 16SHA1 (patch-packages_swi-minisat2_C_SolverTypes.h) = 88ee9ab4dd7fc43e3433d02633513c204981ece2

File Added: pkgsrc/lang/yap/patches/patch-packages_CLPBN_horus_HorusCli.cpp
$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);

File Added: pkgsrc/lang/yap/patches/patch-packages_swi-minisat2_C_SolverTypes.h
$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); }