Attachment #173121 for bug #211460

View | Details | Raw Unified | Return to bug 211460
Collapse All | Expand All




# $FreeBSD: head/math/cryptominisat/Makefile 412348 2016-04-01 14:17:44Z mat $

PORTNAME=	cryptominisat
PORTVERSION=	5.0.0
CATEGORIES=	math

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

LICENSE=	LGPL3
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	xxd:editors/vim-lite # for xxd tool
LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs

USES=		cmake compiler:c++11-lib
USE_LDCONFIG=	yes

CMAKE_ARGS=	-DNOM4RI=1 -DENABLE_PYTHON_INTERFACE=OFF

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)cryptominisat/distinfo (-2 / +3 lines)
1	SHA256 (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 114da20e25734dc368dada47afd8cb7d44717f2159ad66d5bac742062fa3eb4c	1	TIMESTAMP = 1469882294
2	SIZE (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 467221	2	SHA256 (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 4c000daf9886e7c55f05b00247688ed0341a19cda13de49e2f35f40e95cc9910
		3	SIZE (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 596712

Lines 1-11 Link Here

(-)cryptominisat/files/patch-src_dimacsparser.cpp (-11 lines)
1	--- src/dimacsparser.cpp.orig 2015-08-26 23:32:30 UTC
2	+++ src/dimacsparser.cpp
3	@@ -126,7 +126,7 @@ void DimacsParser::readClause(StreamBuff
4	for (;;) {
5	parsed_lit = parseInt(in);
6	if (parsed_lit == 0) break;
7	- var = abs(parsed_lit)-1;
8	+ var = std::abs(parsed_lit)-1;
9	if (var >= (1ULL<<28)) {
10	std::cerr
11	<< "ERROR! "

Lines 1-10 Link Here

(-)cryptominisat/files/patch-src_dimacsparser.h (-10 lines)
1	--- src/dimacsparser.h.orig 2016-01-05 09:44:15 UTC
2	+++ src/dimacsparser.h
3	@@ -25,6 +25,7 @@ THE SOFTWARE.
4	#define DIMACSPARSER_H
5
6	#include <string>
7	+#include <cstdlib>
8	#include "streambuffer.h"
9	#include "cryptominisat4/cryptominisat.h"
10

Lines 3-6 Link Here

(-)cryptominisat/pkg-descr (-1 / +1 lines)
3	need, collection of statistical data to MySQL database + javascript-based	3	need, collection of statistical data to MySQL database + javascript-based
4	visualization of it and clean C++ and python interfaces.	4	visualization of it and clean C++ and python interfaces.
5		5
6	WWW: http://www.msoos.org/cryptominisat4/	6	WWW: https://github.com/msoos/cryptominisat/

Lines 1-10 Link Here

(-)cryptominisat/pkg-plist (-10 / +9 lines)
1	bin/cryptominisat4	1	bin/cryptominisat5
2	bin/cryptominisat4_simple	2	bin/cryptominisat5_simple
3	include/cryptominisat4/cryptominisat.h	3	include/cryptominisat5/cryptominisat.h
4	include/cryptominisat4/solvertypesmini.h	4	include/cryptominisat5/solvertypesmini.h
5	lib/cmake/cryptominisat4/cryptominisat4Config.cmake	5	lib/cmake/cryptominisat5/cryptominisat5Config.cmake
6	lib/cmake/cryptominisat4/cryptominisat4Targets-%%CMAKE_BUILD_TYPE%%.cmake	6	lib/cmake/cryptominisat5/cryptominisat5Targets-%%CMAKE_BUILD_TYPE%%.cmake
7	lib/cmake/cryptominisat4/cryptominisat4Targets.cmake	7	lib/cmake/cryptominisat5/cryptominisat5Targets.cmake
8	lib/libcryptominisat4.a	8	lib/libcryptominisat5.so
9	lib/libcryptominisat4.so	9	lib/libcryptominisat5.so.5.0
10	lib/libcryptominisat4.so.4.5




# $FreeBSD: head/math/py-cryptominisat/Makefile 412348 2016-04-01 14:17:44Z mat $

PORTNAME=	cryptominisat
PORTVERSION=	5.0.0
CATEGORIES=	math python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libcryptominisat5.so:math/cryptominisat

USES=		compiler:c++11-lang python:-2.7
USE_PYTHON=	autoplist distutils

PYDISTUTILS_BUILDTARGET=	build_ext --include-dirs=${LOCALBASE}/include

post-patch:
	${REINPLACE_CMD} -e 's|@PROJECT_VERSION@|${PORTVERSION}|' ${WRKSRC}/setup.py.in
	${CP} ${WRKSRC}/setup.py.in ${WRKSRC}/setup.py

post-install:

Lines 1-2 Link Here

(-)py-cryptominisat/distinfo (-2 / +3 lines)
1	SHA256 (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 114da20e25734dc368dada47afd8cb7d44717f2159ad66d5bac742062fa3eb4c	1	TIMESTAMP = 1469896511
2	SIZE (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 467221	2	SHA256 (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 4c000daf9886e7c55f05b00247688ed0341a19cda13de49e2f35f40e95cc9910
		3	SIZE (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 596712




--- setup.py.in.orig	2016-07-06 12:22:54 UTC
+++ setup.py.in
@@ -26,9 +26,9 @@ import sys
 from distutils.core import setup, Extension
 from distutils import sysconfig
 
-cconf = """${PY_C_CONFIG}""".split(" ")
-ldconf = """${PY_LD_CONFIG}""".split(" ")
-is_apple = """${APPLE}"""
+cconf = """""".split(" ")
+ldconf = """""".split(" ")
+is_apple = """"""
 
 def cleanup(dat):
     ret = []
@@ -81,12 +81,12 @@ __version__ = '@PROJECT_VERSION@'
 
 ext_kwds = dict(
     name = "pycryptosat",
-    sources = ["${CMAKE_CURRENT_SOURCE_DIR}/pycryptosat.cpp"],
+    sources = ["pycryptosat.cpp"],
     define_macros = [],
-    extra_compile_args = cconf + ['-I${PROJECT_SOURCE_DIR}', '-I${PROJECT_BINARY_DIR}/cmsat5-src'],
+    extra_compile_args = cconf + ['-I/usr/local/include', '-I../cmsat5-src'],
     extra_link_args = ldconf,
     language = "c++",
-    library_dirs=['.', '${PROJECT_BINARY_DIR}/lib'],
+    library_dirs=['.', '/usr/local/lib'],
     libraries = ['cryptominisat5']
 )
 
@@ -111,5 +111,5 @@ setup(
     ext_modules = [Extension(**ext_kwds)],
     py_modules = ['pycryptosat'],
     description = "bindings to CryptoMiniSat (a SAT solver)",
-    long_description = open('${CMAKE_CURRENT_SOURCE_DIR}/README.rst').read(),
+    long_description = open('README.rst').read(),

Return to bug 211460

Lines 1-14 Link Here

(-)cryptominisat/Makefile (-3 / +3 lines)
1	# $FreeBSD: head/math/cryptominisat/Makefile 412348 2016-04-01 14:17:44Z mat $	1	# $FreeBSD: head/math/cryptominisat/Makefile 412348 2016-04-01 14:17:44Z mat $
2		2
3	PORTNAME= cryptominisat	3	PORTNAME= cryptominisat
4	PORTVERSION= 4.5.3	4	PORTVERSION= 5.0.0
5	CATEGORIES= math	5	CATEGORIES= math
6		6
7	MAINTAINER= 6yearold@gmail.com	7	MAINTAINER= 6yearold@gmail.com
8	COMMENT= General-purpose award-winning SAT solver	8	COMMENT= General-purpose award-winning SAT solver
9		9
10	LICENSE= LGPL3	10	LICENSE= LGPL3
11	LICENSE_FILE= ${WRKSRC}/LICENSE-LGPL	11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
13	BUILD_DEPENDS= xxd:editors/vim-lite # for xxd tool	13	BUILD_DEPENDS= xxd:editors/vim-lite # for xxd tool
14	LIB_DEPENDS= libboost_program_options.so:devel/boost-libs	14	LIB_DEPENDS= libboost_program_options.so:devel/boost-libs
Lines 19-24 Link Here
19	USES= cmake compiler:c++11-lib	19	USES= cmake compiler:c++11-lib
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21		21
22	CMAKE_ARGS= -DNOMYSQL=1 -DNOM4RI=1 -DPYTHON_EXECUTABLE=0	22	CMAKE_ARGS= -DNOM4RI=1 -DENABLE_PYTHON_INTERFACE=OFF
23		23
24	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Lines 1-7 Link Here

(-)py-cryptominisat/Makefile (-2 / +3 lines)
1	# $FreeBSD: head/math/py-cryptominisat/Makefile 412348 2016-04-01 14:17:44Z mat $	1	# $FreeBSD: head/math/py-cryptominisat/Makefile 412348 2016-04-01 14:17:44Z mat $
2		2
3	PORTNAME= cryptominisat	3	PORTNAME= cryptominisat
4	PORTVERSION= 4.5.3	4	PORTVERSION= 5.0.0
5	CATEGORIES= math python	5	CATEGORIES= math python
6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
7		7
Lines 11-17 Link Here
11	LICENSE= MIT	11	LICENSE= MIT
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	LIB_DEPENDS= libcryptominisat4.so:math/cryptominisat	14	LIB_DEPENDS= libcryptominisat5.so:math/cryptominisat
15		15
16	USES= compiler:c++11-lang python:-2.7	16	USES= compiler:c++11-lang python:-2.7
17	USE_PYTHON= autoplist distutils	17	USE_PYTHON= autoplist distutils
Lines 24-29 Link Here
24	PYDISTUTILS_BUILDTARGET= build_ext --include-dirs=${LOCALBASE}/include	24	PYDISTUTILS_BUILDTARGET= build_ext --include-dirs=${LOCALBASE}/include
25		25
26	post-patch:	26	post-patch:
		27	${REINPLACE_CMD} -e 's\|@PROJECT_VERSION@\|${PORTVERSION}\|' ${WRKSRC}/setup.py.in
27	${CP} ${WRKSRC}/setup.py.in ${WRKSRC}/setup.py	28	${CP} ${WRKSRC}/setup.py.in ${WRKSRC}/setup.py
28		29
29	post-install:	30	post-install:

Lines 1-28 Link Here

(-)py-cryptominisat/files/patch-setup.py.in (-12 / +21 lines)
1	--- setup.py.in.orig 2015-08-26 23:32:30 UTC	1	--- setup.py.in.orig 2016-07-06 12:22:54 UTC
2	+++ setup.py.in	2	+++ setup.py.in
3	@@ -51,15 +51,15 @@ def _init_posix(init):	3	@@ -26,9 +26,9 @@ import sys
4	return wrapper	4	from distutils.core import setup, Extension
5	sysconfig._init_posix = _init_posix(sysconfig._init_posix)	5	from distutils import sysconfig
6		6
7	-__version__ = '@PROJECT_VERSION@'	7	-cconf = """${PY_C_CONFIG}""".split(" ")
8	+__version__ = '4.5.3'	8	-ldconf = """${PY_LD_CONFIG}""".split(" ")
		9	-is_apple = """${APPLE}"""
		10	+cconf = """""".split(" ")
		11	+ldconf = """""".split(" ")
		12	+is_apple = """"""
		13
		14	def cleanup(dat):
		15	ret = []
		16	@@ -81,12 +81,12 @@ __version__ = '@PROJECT_VERSION@'
9		17
10	ext_kwds = dict(	18	ext_kwds = dict(
11	name = "pycryptosat",	19	name = "pycryptosat",
12	- sources = ["${CMAKE_CURRENT_SOURCE_DIR}/pycryptosat.cpp"],	20	- sources = ["${CMAKE_CURRENT_SOURCE_DIR}/pycryptosat.cpp"],
13	+ sources = ["pycryptosat.cpp"],	21	+ sources = ["pycryptosat.cpp"],
14	define_macros = [],	22	define_macros = [],
15	- extra_compile_args = ['-I${PROJECT_SOURCE_DIR}', '-I${PROJECT_BINARY_DIR}/cmsat4-src'],	23	- extra_compile_args = cconf + ['-I${PROJECT_SOURCE_DIR}', '-I${PROJECT_BINARY_DIR}/cmsat5-src'],
16	+ extra_compile_args = ['-I/usr/local/include', '-I..cmsat4-src'],	24	+ extra_compile_args = cconf + ['-I/usr/local/include', '-I../cmsat5-src'],
		25	extra_link_args = ldconf,
17	language = "c++",	26	language = "c++",
18	- library_dirs=['.', '/usr/local/lib', '${PROJECT_BINARY_DIR}/lib'],	27	- library_dirs=['.', '${PROJECT_BINARY_DIR}/lib'],
19	+ library_dirs=['.', '/usr/local/lib'],	28	+ library_dirs=['.', '/usr/local/lib'],
20	libraries = ['cryptominisat4']	29	libraries = ['cryptominisat5']
21	)	30	)
22		31
23	@@ -84,5 +84,5 @@ setup(	32	@@ -111,5 +111,5 @@ setup(
24	ext_modules = [Extension(**ext_kwds)],	33	ext_modules = [Extension(**ext_kwds)],
25	py_modules = ['test_pycryptosat'],	34	py_modules = ['pycryptosat'],
26	description = "bindings to CryptoMiniSat (a SAT solver)",	35	description = "bindings to CryptoMiniSat (a SAT solver)",
27	- long_description = open('${CMAKE_CURRENT_SOURCE_DIR}/README.rst').read(),	36	- long_description = open('${CMAKE_CURRENT_SOURCE_DIR}/README.rst').read(),
28	+ long_description = open('README.rst').read(),	37	+ long_description = open('README.rst').read(),