Attachment #156406 for bug #199929

Lines 94-99 Link Here

(-)b/math/Makefile (+2 lines)
94	SUBDIR += convertall	94	SUBDIR += convertall
95	SUBDIR += coq	95	SUBDIR += coq
96	SUBDIR += crlibm	96	SUBDIR += crlibm
		97	SUBDIR += cryptominisat
97	SUBDIR += cvc3	98	SUBDIR += cvc3
98	SUBDIR += dcdflib	99	SUBDIR += dcdflib
99	SUBDIR += diehard	100	SUBDIR += diehard
Lines 546-551 Link Here
546	SUBDIR += py-basemap-data	547	SUBDIR += py-basemap-data
547	SUBDIR += py-bitvector	548	SUBDIR += py-bitvector
548	SUBDIR += py-bottleneck	549	SUBDIR += py-bottleneck
		550	SUBDIR += py-cryptominisat
549	SUBDIR += py-fastcluster	551	SUBDIR += py-fastcluster
550	SUBDIR += py-ffc	552	SUBDIR += py-ffc
551	SUBDIR += py-fiat	553	SUBDIR += py-fiat




# $FreeBSD$

PORTNAME=	cryptominisat
PORTVERSION=	4.2.0
PORTREVISION?=	0
CATEGORIES?=	math
MASTER_SITES=	http://msoos.org/largefiles/

MAINTAINER=	6yearold@gmail.com
COMMENT?=	General-purpose award-winning SAT solver

LICENSE?=	LGPL3

LIB_DEPENDS?=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs

USES?=		cmake compiler:c++11-lib tar:bzip2
CMAKE_ARGS=	-DNOMYSQL=1 -DNOM4RI=1
WRKSRC=		${WRKDIR}/${PORTNAME}4-${PORTVERSION}
USE_LDCONFIG=	yes

.include <bsd.port.mk>

Added Link Here

(-)b/math/cryptominisat/distinfo (+2 lines)
1	SHA256 (cryptominisat-4.2.0.tar.bz2) = 4fb35b3f91a5fddcdd021a92e6e9f1a9049fb03f354860b118e9937a15a8ff02
2	SIZE (cryptominisat-4.2.0.tar.bz2) = 634464

Added Link Here

(-)b/math/cryptominisat/files/patch-cryptominisat4_CMakeLists.txt (+10 lines)
1	--- cryptominisat4/CMakeLists.txt.orig 2014-07-16 21:45:53 UTC
2	+++ cryptominisat4/CMakeLists.txt
3	@@ -85,6 +85,7 @@ target_link_libraries(libcryptominisat4
4	set_target_properties(libcryptominisat4 PROPERTIES
5	OUTPUT_NAME cryptominisat4
6	PUBLIC_HEADER "${cryptominisat4_public_headers}"
7	+ SOVERSION 0
8	)
9
10	cmsat_add_public_header(libcryptominisat4 cryptominisat.h )

Added Link Here

(-)b/math/cryptominisat/files/patch-cryptominisat4_bva.cpp (+10 lines)
1	--- cryptominisat4/bva.cpp.orig 2014-07-14 22:45:03 UTC
2	+++ cryptominisat4/bva.cpp
3	@@ -25,6 +25,7 @@
4	#include "clausecleaner.h"
5	#include "subsumeimplicit.h"
6	#include "sqlstats.h"
7	+#include <cmath>
8	#include <functional>
9
10	using namespace CMSat;

Added Link Here

(-)b/math/cryptominisat/pkg-descr (+6 lines)
1	CryptoMiniSat is a modern, multi-threaded, feature-rich, simplifying SAT
2	solver, featuring over 100 configurable parameters to tune to specific
3	need, collection of statistical data to MySQL database + javascript-based
4	visualization of it and clean C++ and python interfaces.
5
6	WWW: http://www.msoos.org/cryptominisat4/

Added Link Here

(-)b/math/cryptominisat/pkg-plist (+9 lines)
1	bin/cryptominisat
2	include/cryptominisat4/cryptominisat.h
3	include/cryptominisat4/solverconf.h
4	include/cryptominisat4/solvertypesmini.h
5	lib/cmake/cryptominisat4/cryptominisat4Config.cmake
6	lib/cmake/cryptominisat4/cryptominisat4Targets-%%CMAKE_BUILD_TYPE%%.cmake
7	lib/cmake/cryptominisat4/cryptominisat4Targets.cmake
8	lib/libcryptominisat4.so
9	lib/libcryptominisat4.so.0




# $FreeBSD$

CATEGORIES=	math python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

COMMENT=	Python bindings to CryptoMiniSat

LICENSE=	MIT

LIB_DEPENDS=	libcryptominisat4.so:${PORTSDIR}/math/cryptominisat

USES=		compiler:c++11-lib python:2.7 tar:bzip2
USE_PYTHON=	autoplist distutils
WRKSRC_SUBDIR=	python

MASTERDIR=	${.CURDIR}/../cryptominisat
PATCHDIR=	${.CURDIR}/files
PLIST=		${.CURDIR}/pkg-plist

post-install:
	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \
		-exec ${STRIP_CMD} {} +

.include "${MASTERDIR}/Makefile"




On FreeBSD -std=c++11 turns NULL into nullptr which sometimes breaks:

  pycryptosat.cpp:393:12: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
      return NULL;
             ^~~~
  /usr/include/sys/_null.h:35:14: note: expanded from macro 'NULL'
  #define NULL    nullptr
                  ^~~~~~~
--- pycryptosat.cpp.orig	2014-07-06 23:41:16 UTC
+++ pycryptosat.cpp
@@ -390,7 +390,7 @@ Solver_init(Solver *self, PyObject *args
     if (!self->cmsat) {
         return -1;
     }
-    return NULL;
+    return 0;
 }
 
 static PyMemberDef Solver_members[] = {

Return to bug 199929

Added Link Here

(-)b/math/cryptominisat/Makefile (+21 lines)
1	# $FreeBSD$
2
3	PORTNAME= cryptominisat
4	PORTVERSION= 4.2.0
5	PORTREVISION?= 0
6	CATEGORIES?= math
7	MASTER_SITES= http://msoos.org/largefiles/
8
9	MAINTAINER= 6yearold@gmail.com
10	COMMENT?= General-purpose award-winning SAT solver
11
12	LICENSE?= LGPL3
13
14	LIB_DEPENDS?= libboost_program_options.so:${PORTSDIR}/devel/boost-libs
15
16	USES?= cmake compiler:c++11-lib tar:bzip2
17	CMAKE_ARGS= -DNOMYSQL=1 -DNOM4RI=1
18	WRKSRC= ${WRKDIR}/${PORTNAME}4-${PORTVERSION}
19	USE_LDCONFIG= yes
20
21	.include <bsd.port.mk>

Added Link Here

(-)b/math/py-cryptominisat/Makefile (+24 lines)
1	# $FreeBSD$
2
3	CATEGORIES= math python
4	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
5
6	COMMENT= Python bindings to CryptoMiniSat
7
8	LICENSE= MIT
9
10	LIB_DEPENDS= libcryptominisat4.so:${PORTSDIR}/math/cryptominisat
11
12	USES= compiler:c++11-lib python:2.7 tar:bzip2
13	USE_PYTHON= autoplist distutils
14	WRKSRC_SUBDIR= python
15
16	MASTERDIR= ${.CURDIR}/../cryptominisat
17	PATCHDIR= ${.CURDIR}/files
18	PLIST= ${.CURDIR}/pkg-plist
19
20	post-install:
21	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \
22	-exec ${STRIP_CMD} {} +
23
24	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/math/py-cryptominisat/files/patch-pycryptosat.cpp (+19 lines)
1	On FreeBSD -std=c++11 turns NULL into nullptr which sometimes breaks:
2
3	pycryptosat.cpp:393:12: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
4	return NULL;
5	^~~~
6	/usr/include/sys/_null.h:35:14: note: expanded from macro 'NULL'
7	#define NULL nullptr
8	^~~~~~~
9	--- pycryptosat.cpp.orig 2014-07-06 23:41:16 UTC
10	+++ pycryptosat.cpp
11	@@ -390,7 +390,7 @@ Solver_init(Solver self, PyObject args
12	if (!self->cmsat) {
13	return -1;
14	}
15	- return NULL;
16	+ return 0;
17	}
18
19	static PyMemberDef Solver_members[] = {