Index: cryptominisat/Makefile =================================================================== --- cryptominisat/Makefile (revision 405074) +++ cryptominisat/Makefile (working copy) @@ -1,21 +1,24 @@ # $FreeBSD$ PORTNAME= cryptominisat -PORTVERSION= 4.2.0 -PORTREVISION?= 0 -CATEGORIES?= math -MASTER_SITES= http://msoos.org/largefiles/ +PORTVERSION= 4.5.3 +CATEGORIES= math MAINTAINER= 6yearold@gmail.com -COMMENT?= General-purpose award-winning SAT solver +COMMENT= General-purpose award-winning SAT solver -LICENSE?= LGPL3 +LICENSE= LGPL3 +LICENSE_FILE= ${WRKSRC}/LICENSE-LGPL -LIB_DEPENDS?= libboost_program_options.so:${PORTSDIR}/devel/boost-libs +BUILD_DEPENDS= xxd:${PORTSDIR}/editors/vim-lite # for xxd tool +LIB_DEPENDS= libboost_program_options.so:${PORTSDIR}/devel/boost-libs -USES?= cmake compiler:c++11-lib tar:bzip2 -CMAKE_ARGS= -DNOMYSQL=1 -DNOM4RI=1 -DPYTHON_EXECUTABLE=0 -WRKSRC= ${WRKDIR}/${PORTNAME}4-${PORTVERSION} +USE_GITHUB= yes +GH_ACCOUNT= msoos + +USES= cmake compiler:c++11-lib USE_LDCONFIG= yes +CMAKE_ARGS= -DNOMYSQL=1 -DNOM4RI=1 -DPYTHON_EXECUTABLE=0 + .include Index: cryptominisat/distinfo =================================================================== --- cryptominisat/distinfo (revision 405074) +++ cryptominisat/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (cryptominisat-4.2.0.tar.bz2) = 4fb35b3f91a5fddcdd021a92e6e9f1a9049fb03f354860b118e9937a15a8ff02 -SIZE (cryptominisat-4.2.0.tar.bz2) = 634464 +SHA256 (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 114da20e25734dc368dada47afd8cb7d44717f2159ad66d5bac742062fa3eb4c +SIZE (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 467221 Index: cryptominisat/files/patch-cryptominisat4_CMakeLists.txt =================================================================== --- cryptominisat/files/patch-cryptominisat4_CMakeLists.txt (revision 405074) +++ cryptominisat/files/patch-cryptominisat4_CMakeLists.txt (nonexistent) @@ -1,10 +0,0 @@ ---- cryptominisat4/CMakeLists.txt.orig 2014-07-16 21:45:53 UTC -+++ cryptominisat4/CMakeLists.txt -@@ -85,6 +85,7 @@ target_link_libraries(libcryptominisat4 - set_target_properties(libcryptominisat4 PROPERTIES - OUTPUT_NAME cryptominisat4 - PUBLIC_HEADER "${cryptominisat4_public_headers}" -+ SOVERSION 0 - ) - - cmsat_add_public_header(libcryptominisat4 cryptominisat.h ) Property changes on: cryptominisat/files/patch-cryptominisat4_CMakeLists.txt ___________________________________________________________________ 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: cryptominisat/files/patch-cryptominisat4_bva.cpp =================================================================== --- cryptominisat/files/patch-cryptominisat4_bva.cpp (revision 405074) +++ cryptominisat/files/patch-cryptominisat4_bva.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- cryptominisat4/bva.cpp.orig 2014-07-14 22:45:03 UTC -+++ cryptominisat4/bva.cpp -@@ -25,6 +25,7 @@ - #include "clausecleaner.h" - #include "subsumeimplicit.h" - #include "sqlstats.h" -+#include - #include - - using namespace CMSat; Property changes on: cryptominisat/files/patch-cryptominisat4_bva.cpp ___________________________________________________________________ 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: cryptominisat/files/patch-src_dimacsparser.cpp =================================================================== --- cryptominisat/files/patch-src_dimacsparser.cpp (nonexistent) +++ cryptominisat/files/patch-src_dimacsparser.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/dimacsparser.cpp.orig 2015-08-26 23:32:30 UTC ++++ src/dimacsparser.cpp +@@ -126,7 +126,7 @@ void DimacsParser::readClause(StreamBuff + for (;;) { + parsed_lit = parseInt(in); + if (parsed_lit == 0) break; +- var = abs(parsed_lit)-1; ++ var = std::abs(parsed_lit)-1; + if (var >= (1ULL<<28)) { + std::cerr + << "ERROR! " Property changes on: cryptominisat/files/patch-src_dimacsparser.cpp ___________________________________________________________________ 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:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: cryptominisat/files/patch-src_dimacsparser.h =================================================================== --- cryptominisat/files/patch-src_dimacsparser.h (nonexistent) +++ cryptominisat/files/patch-src_dimacsparser.h (working copy) @@ -0,0 +1,10 @@ +--- src/dimacsparser.h.orig 2016-01-05 09:44:15 UTC ++++ src/dimacsparser.h +@@ -25,6 +25,7 @@ THE SOFTWARE. + #define DIMACSPARSER_H + + #include ++#include + #include "streambuffer.h" + #include "cryptominisat4/cryptominisat.h" + Property changes on: cryptominisat/files/patch-src_dimacsparser.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:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: cryptominisat/pkg-plist =================================================================== --- cryptominisat/pkg-plist (revision 405074) +++ cryptominisat/pkg-plist (working copy) @@ -1,9 +1,10 @@ -bin/cryptominisat +bin/cryptominisat4 +bin/cryptominisat4_simple include/cryptominisat4/cryptominisat.h -include/cryptominisat4/solverconf.h include/cryptominisat4/solvertypesmini.h lib/cmake/cryptominisat4/cryptominisat4Config.cmake lib/cmake/cryptominisat4/cryptominisat4Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/cryptominisat4/cryptominisat4Targets.cmake +lib/libcryptominisat4.a lib/libcryptominisat4.so -lib/libcryptominisat4.so.0 +lib/libcryptominisat4.so.4.5 Index: py-cryptominisat/Makefile =================================================================== --- py-cryptominisat/Makefile (revision 405074) +++ py-cryptominisat/Makefile (working copy) @@ -1,24 +1,32 @@ # $FreeBSD$ +PORTNAME= cryptominisat +PORTVERSION= 4.5.3 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -COMMENT= Python bindings to CryptoMiniSat +MAINTAINER= 6yearold@gmail.com +COMMENT= Bindings to CryptoMiniSat (a SAT solver) LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcryptominisat4.so:${PORTSDIR}/math/cryptominisat -USES= compiler:c++11-lib python:2.7 tar:bzip2 +USES= compiler:c++11-lang python:-2.7 USE_PYTHON= autoplist distutils +USE_GITHUB= yes + +GH_ACCOUNT= msoos + WRKSRC_SUBDIR= python -MASTERDIR= ${.CURDIR}/../cryptominisat -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist +PYDISTUTILS_BUILDTARGET= build_ext --include-dirs=${LOCALBASE}/include +post-patch: + ${CP} ${WRKSRC}/setup.py.in ${WRKSRC}/setup.py + post-install: - ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \ - -exec ${STRIP_CMD} {} + + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pycryptosat.so -.include "${MASTERDIR}/Makefile" +.include Index: py-cryptominisat/distinfo =================================================================== --- py-cryptominisat/distinfo (nonexistent) +++ py-cryptominisat/distinfo (working copy) @@ -0,0 +1,2 @@ +SHA256 (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 114da20e25734dc368dada47afd8cb7d44717f2159ad66d5bac742062fa3eb4c +SIZE (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 467221 Property changes on: py-cryptominisat/distinfo ___________________________________________________________________ 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: py-cryptominisat/files/patch-pycryptosat.cpp =================================================================== --- py-cryptominisat/files/patch-pycryptosat.cpp (revision 405074) +++ py-cryptominisat/files/patch-pycryptosat.cpp (nonexistent) @@ -1,19 +0,0 @@ -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[] = { Property changes on: py-cryptominisat/files/patch-pycryptosat.cpp ___________________________________________________________________ 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: py-cryptominisat/files/patch-setup.py.in =================================================================== --- py-cryptominisat/files/patch-setup.py.in (nonexistent) +++ py-cryptominisat/files/patch-setup.py.in (working copy) @@ -0,0 +1,29 @@ +--- setup.py.in.orig 2015-08-26 23:32:30 UTC ++++ setup.py.in +@@ -51,15 +51,15 @@ def _init_posix(init): + return wrapper + sysconfig._init_posix = _init_posix(sysconfig._init_posix) + +-__version__ = '@PROJECT_VERSION@' ++__version__ = '4.5.3' + + ext_kwds = dict( + name = "pycryptosat", +- sources = ["${CMAKE_CURRENT_SOURCE_DIR}/pycryptosat.cpp"], ++ sources = ["pycryptosat.cpp"], + define_macros = [], +- extra_compile_args = ['-I${PROJECT_SOURCE_DIR}', '-I${PROJECT_BINARY_DIR}/cmsat4-src'], ++ extra_compile_args = ['-I/usr/local/include', '-I..cmsat4-src'], + language = "c++", +- library_dirs=['.', '/usr/local/lib', '${PROJECT_BINARY_DIR}/lib'], ++ library_dirs=['.', '/usr/local/lib'], + libraries = ['cryptominisat4'] + ) + +@@ -84,5 +84,5 @@ setup( + ext_modules = [Extension(**ext_kwds)], + py_modules = ['test_pycryptosat'], + description = "bindings to CryptoMiniSat (a SAT solver)", +- long_description = open('${CMAKE_CURRENT_SOURCE_DIR}/README.rst').read(), ++ long_description = open('README.rst').read(), + ) Property changes on: py-cryptominisat/files/patch-setup.py.in ___________________________________________________________________ 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:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: py-cryptominisat/pkg-descr =================================================================== --- py-cryptominisat/pkg-descr (nonexistent) +++ py-cryptominisat/pkg-descr (working copy) @@ -0,0 +1,5 @@ +This package provides Python bindings to CryptoMiniSat on the C++ level, +i.e. when importing pycryptosat, the CryptoMiniSat solver becomes part of the +Python process itself. + +WWW: https://github.com/msoos/cryptominisat Property changes on: py-cryptominisat/pkg-descr ___________________________________________________________________ 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