svn commit: r349723 - in head/math/minisat: . files

[Vsevolod Stakhov]

Author: vsevolod
Date: Mon Mar 31 10:52:41 2014
New Revision: 349723
URL: http://svnweb.freebsd.org/changeset/ports/349723
QAT: https://qat.redports.org/buildarchive/r349723/

Log:
  - Unbreak with clang 3.4 (not bumping revision).

Added:
  head/math/minisat/files/
  head/math/minisat/files/patch-minisat-core-SolverTypes.h   (contents, props changed)
Modified:
  head/math/minisat/Makefile

Modified: head/math/minisat/Makefile
==============================================================================
--- head/math/minisat/Makefile	Mon Mar 31 10:51:18 2014	(r349722)
+++ head/math/minisat/Makefile	Mon Mar 31 10:52:41 2014	(r349723)
@@ -11,6 +11,6 @@ COMMENT=	A minimalistic, open-source SAT
 
 USES=	gmake
 USE_LDCONFIG=	yes
-MAKE_ENV=	prefix=${PREFIX}
+MAKE_ENV=	prefix=${PREFIX} CFLAGS="-std=c++03"
 
 .include <bsd.port.mk>

Added: head/math/minisat/files/patch-minisat-core-SolverTypes.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/minisat/files/patch-minisat-core-SolverTypes.h	Mon Mar 31 10:52:41 2014	(r349723)
@@ -0,0 +1,20 @@
+--- minisat/core/SolverTypes.h.orig	2014-03-31 11:50:09.479636337 +0100
++++ minisat/core/SolverTypes.h	2014-03-31 11:50:32.079953517 +0100
+@@ -52,7 +52,7 @@
+     int     x;
+ 
+     // Use this as a constructor:
+-    friend Lit mkLit(Var var, bool sign = false);
++    friend Lit mkLit(Var var, bool sign);
+ 
+     bool operator == (Lit p) const { return x == p.x; }
+     bool operator != (Lit p) const { return x != p.x; }
+@@ -60,7 +60,7 @@
+ };
+ 
+ 
+-inline  Lit  mkLit     (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
++inline  Lit  mkLit     (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
+ inline  Lit  operator ~(Lit p)              { Lit q; q.x = p.x ^ 1; return q; }
+ inline  Lit  operator ^(Lit p, bool b)      { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
+ inline  bool sign      (Lit p)              { return p.x & 1; }