Index: head/math/minisat/Makefile =================================================================== --- head/math/minisat/Makefile (revision 390671) +++ head/math/minisat/Makefile (revision 390672) @@ -1,16 +1,24 @@ # Created by: Vsevolod Stakhov # $FreeBSD$ PORTNAME= minisat PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= math devel MASTER_SITES= http://highsecure.ru/distfiles/ MAINTAINER= vsevolod@FreeBSD.org COMMENT= Minimalistic, open-source SAT solver -USES= gmake +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= gmake USE_LDCONFIG= yes MAKE_ENV= prefix=${PREFIX} CFLAGS="-std=c++03" + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/lib/libminisat.so .include Index: head/math/minisat/files/patch-minisat-core-SolverTypes.h =================================================================== --- head/math/minisat/files/patch-minisat-core-SolverTypes.h (revision 390671) +++ head/math/minisat/files/patch-minisat-core-SolverTypes.h (nonexistent) @@ -1,20 +0,0 @@ ---- 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; } Property changes on: head/math/minisat/files/patch-minisat-core-SolverTypes.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/minisat/files/patch-minisat_core_SolverTypes.h =================================================================== --- head/math/minisat/files/patch-minisat_core_SolverTypes.h (nonexistent) +++ head/math/minisat/files/patch-minisat_core_SolverTypes.h (revision 390672) @@ -0,0 +1,20 @@ +--- minisat/core/SolverTypes.h.orig 2012-11-19 13:50:09 UTC ++++ minisat/core/SolverTypes.h +@@ -52,7 +52,7 @@ struct Lit { + 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 @@ struct Lit { + }; + + +-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; } Property changes on: head/math/minisat/files/patch-minisat_core_SolverTypes.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/minisat/files/patch-minisat_utils_Options.h =================================================================== --- head/math/minisat/files/patch-minisat_utils_Options.h (nonexistent) +++ head/math/minisat/files/patch-minisat_utils_Options.h (revision 390672) @@ -0,0 +1,21 @@ +--- minisat/utils/Options.h.orig 2012-11-19 13:50:09 UTC ++++ minisat/utils/Options.h +@@ -282,15 +282,15 @@ class Int64Option : public Option + if (range.begin == INT64_MIN) + fprintf(stderr, "imin"); + else +- fprintf(stderr, "%4"PRIi64, range.begin); ++ fprintf(stderr, "%4" PRIi64, range.begin); + + fprintf(stderr, " .. "); + if (range.end == INT64_MAX) + fprintf(stderr, "imax"); + else +- fprintf(stderr, "%4"PRIi64, range.end); ++ fprintf(stderr, "%4" PRIi64, range.end); + +- fprintf(stderr, "] (default: %"PRIi64")\n", value); ++ fprintf(stderr, "] (default: %" PRIi64")\n", value); + if (verbose){ + fprintf(stderr, "\n %s\n", description); + fprintf(stderr, "\n"); Property changes on: head/math/minisat/files/patch-minisat_utils_Options.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/minisat/pkg-plist =================================================================== --- head/math/minisat/pkg-plist (revision 390671) +++ head/math/minisat/pkg-plist (revision 390672) @@ -1,24 +1,23 @@ - bin/minisat -include/minisat/mtl/XAlloc.h -include/minisat/mtl/Heap.h -include/minisat/mtl/IntTypes.h -include/minisat/mtl/IntMap.h -include/minisat/mtl/Sort.h -include/minisat/mtl/Rnd.h +include/minisat/core/Dimacs.h +include/minisat/core/Solver.h +include/minisat/core/SolverTypes.h include/minisat/mtl/Alg.h -include/minisat/mtl/Vec.h include/minisat/mtl/Alloc.h +include/minisat/mtl/Heap.h +include/minisat/mtl/IntMap.h +include/minisat/mtl/IntTypes.h include/minisat/mtl/Map.h include/minisat/mtl/Queue.h +include/minisat/mtl/Rnd.h +include/minisat/mtl/Sort.h +include/minisat/mtl/Vec.h +include/minisat/mtl/XAlloc.h +include/minisat/simp/SimpSolver.h include/minisat/utils/Options.h include/minisat/utils/ParseUtils.h include/minisat/utils/System.h -include/minisat/core/Solver.h -include/minisat/core/Dimacs.h -include/minisat/core/SolverTypes.h -include/minisat/simp/SimpSolver.h -lib/libminisat.so.2.1.0 -lib/libminisat.so.2 -lib/libminisat.so lib/libminisat.a +lib/libminisat.so +lib/libminisat.so.2 +lib/libminisat.so.2.1.0