Date: Wed, 6 Jan 2016 14:07:05 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405351 - in head/math: cryptominisat cryptominisat/files py-cryptominisat py-cryptominisat/files Message-ID: <201601061407.u06E75jc073680@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Wed Jan 6 14:07:05 2016 New Revision: 405351 URL: https://svnweb.freebsd.org/changeset/ports/405351 Log: math/{py-}cryptominisat: Update to 4.5.3 Common: - Update PORTVERSION and distinfo checksum (4.5.3) [1] - Switch to GITHUB for DISTFILES, remove USES=tar accordingly [1] py-cryptominisat: - Convert into fully fledged port - Add distinfo and proper (unique) pkg-descr - Remove MASTER port overrides accordingly - Match COMMENT to upstream setup.py:description - De-scope USES=compiler to compiler only - Remove upstreamed patches - Patch to properly use distutils and autoplist instead of an uncessary cmake build (Also add post-patch for this) - Strip shared library cryptominisat: - Remove slave port overrides - Add BUILD_DEPENDS on vim-lite for xxd(8) tool [1] - Remove upstreamed patches [1] - Add patches for missing includes breaking builds on 9.3 [1] - Update pkg-plist [1] [1] https://github.com/msoos/cryptominisat/issues/304 PR: 204850 [1] Submitted by: maintainer [1] Approved by: maintainer [*] Added: head/math/cryptominisat/files/patch-src_dimacsparser.cpp (contents, props changed) head/math/cryptominisat/files/patch-src_dimacsparser.h (contents, props changed) head/math/py-cryptominisat/distinfo (contents, props changed) head/math/py-cryptominisat/files/patch-setup.py.in (contents, props changed) head/math/py-cryptominisat/pkg-descr (contents, props changed) Deleted: head/math/cryptominisat/files/patch-cryptominisat4_CMakeLists.txt head/math/cryptominisat/files/patch-cryptominisat4_bva.cpp head/math/py-cryptominisat/files/patch-pycryptosat.cpp Modified: head/math/cryptominisat/Makefile head/math/cryptominisat/distinfo head/math/cryptominisat/pkg-plist head/math/py-cryptominisat/Makefile Modified: head/math/cryptominisat/Makefile ============================================================================== --- head/math/cryptominisat/Makefile Wed Jan 6 13:02:15 2016 (r405350) +++ head/math/cryptominisat/Makefile Wed Jan 6 14:07:05 2016 (r405351) @@ -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 <bsd.port.mk> Modified: head/math/cryptominisat/distinfo ============================================================================== --- head/math/cryptominisat/distinfo Wed Jan 6 13:02:15 2016 (r405350) +++ head/math/cryptominisat/distinfo Wed Jan 6 14:07:05 2016 (r405351) @@ -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 Added: head/math/cryptominisat/files/patch-src_dimacsparser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/cryptominisat/files/patch-src_dimacsparser.cpp Wed Jan 6 14:07:05 2016 (r405351) @@ -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! " Added: head/math/cryptominisat/files/patch-src_dimacsparser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/cryptominisat/files/patch-src_dimacsparser.h Wed Jan 6 14:07:05 2016 (r405351) @@ -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 <string> ++#include <cstdlib> + #include "streambuffer.h" + #include "cryptominisat4/cryptominisat.h" + Modified: head/math/cryptominisat/pkg-plist ============================================================================== --- head/math/cryptominisat/pkg-plist Wed Jan 6 13:02:15 2016 (r405350) +++ head/math/cryptominisat/pkg-plist Wed Jan 6 14:07:05 2016 (r405351) @@ -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 Modified: head/math/py-cryptominisat/Makefile ============================================================================== --- head/math/py-cryptominisat/Makefile Wed Jan 6 13:02:15 2016 (r405350) +++ head/math/py-cryptominisat/Makefile Wed Jan 6 14:07:05 2016 (r405351) @@ -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 <bsd.port.mk> Added: head/math/py-cryptominisat/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/py-cryptominisat/distinfo Wed Jan 6 14:07:05 2016 (r405351) @@ -0,0 +1,2 @@ +SHA256 (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 114da20e25734dc368dada47afd8cb7d44717f2159ad66d5bac742062fa3eb4c +SIZE (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 467221 Added: head/math/py-cryptominisat/files/patch-setup.py.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/py-cryptominisat/files/patch-setup.py.in Wed Jan 6 14:07:05 2016 (r405351) @@ -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(), + ) Added: head/math/py-cryptominisat/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/py-cryptominisat/pkg-descr Wed Jan 6 14:07:05 2016 (r405351) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601061407.u06E75jc073680>