From owner-svn-ports-all@FreeBSD.ORG Mon Mar 31 10:52:42 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BE6CFC2; Mon, 31 Mar 2014 10:52:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 505B7A34; Mon, 31 Mar 2014 10:52:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2VAqg4s032322; Mon, 31 Mar 2014 10:52:42 GMT (envelope-from vsevolod@svn.freebsd.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2VAqfuB032320; Mon, 31 Mar 2014 10:52:41 GMT (envelope-from vsevolod@svn.freebsd.org) Message-Id: <201403311052.s2VAqfuB032320@svn.freebsd.org> From: Vsevolod Stakhov Date: Mon, 31 Mar 2014 10:52:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349723 - in head/math/minisat: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Mar 2014 10:52:42 -0000 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 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; }