Index: math/cryptominisat/Makefile =================================================================== --- math/cryptominisat/Makefile +++ math/cryptominisat/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cryptominisat -PORTVERSION= 5.0.1 -PORTREVISION= 9 +PORTVERSION= 5.6.1 CATEGORIES= math MAINTAINER= 6yearold@gmail.com @@ -10,7 +9,8 @@ LICENSE= MIT LGPL21 LICENSE_COMB= multi -LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSE-SCALMC +LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSE.txt +LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= xxd:editors/vim-console # for xxd tool LIB_DEPENDS= libboost_program_options.so:devel/boost-libs Index: math/cryptominisat/distinfo =================================================================== --- math/cryptominisat/distinfo +++ math/cryptominisat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473692160 -SHA256 (msoos-cryptominisat-5.0.1_GH0.tar.gz) = 789d53c90ecbd5910f48e4e1bd835e374b268e0b3872a81fd5c6178a30a5e263 -SIZE (msoos-cryptominisat-5.0.1_GH0.tar.gz) = 596710 +TIMESTAMP = 1528624412 +SHA256 (msoos-cryptominisat-5.6.1_GH0.tar.gz) = f86c1cc94abcb9b9f9227fab2ea29f869b0b47f8dc83946e06e7d98b97cac2aa +SIZE (msoos-cryptominisat-5.6.1_GH0.tar.gz) = 675234 Index: math/cryptominisat/pkg-plist =================================================================== --- math/cryptominisat/pkg-plist +++ math/cryptominisat/pkg-plist @@ -2,9 +2,11 @@ bin/cryptominisat5_simple include/cryptominisat5/cryptominisat.h include/cryptominisat5/cryptominisat_c.h +include/cryptominisat5/dimacsparser.h include/cryptominisat5/solvertypesmini.h +include/cryptominisat5/streambuffer.h lib/cmake/cryptominisat5/cryptominisat5Config.cmake lib/cmake/cryptominisat5/cryptominisat5Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/cryptominisat5/cryptominisat5Targets.cmake lib/libcryptominisat5.so -lib/libcryptominisat5.so.5.0 +lib/libcryptominisat5.so.5.6 Index: math/py-cryptominisat/Makefile =================================================================== --- math/py-cryptominisat/Makefile +++ math/py-cryptominisat/Makefile @@ -1,16 +1,17 @@ # $FreeBSD$ PORTNAME= cryptominisat -PORTVERSION= 5.0.0 -PORTREVISION= 2 +PORTVERSION= 5.6.1 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= 6yearold@gmail.com COMMENT= Bindings to CryptoMiniSat (a SAT solver) -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= MIT LGPL21 +LICENSE_COMB= multi +LICENSE_FILE_LGPL21= ${WRKSRC}/../LICENSE.txt +LICENSE_FILE_MIT= ${WRKSRC}/../LICENSE.txt LIB_DEPENDS= libcryptominisat5.so:math/cryptominisat Index: math/py-cryptominisat/distinfo =================================================================== --- math/py-cryptominisat/distinfo +++ math/py-cryptominisat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1469896511 -SHA256 (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 4c000daf9886e7c55f05b00247688ed0341a19cda13de49e2f35f40e95cc9910 -SIZE (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 596712 +TIMESTAMP = 1528628948 +SHA256 (msoos-cryptominisat-5.6.1_GH0.tar.gz) = f86c1cc94abcb9b9f9227fab2ea29f869b0b47f8dc83946e06e7d98b97cac2aa +SIZE (msoos-cryptominisat-5.6.1_GH0.tar.gz) = 675234 Index: math/py-cryptominisat/files/patch-setup.py.in =================================================================== --- math/py-cryptominisat/files/patch-setup.py.in +++ math/py-cryptominisat/files/patch-setup.py.in @@ -1,8 +1,13 @@ ---- setup.py.in.orig 2016-07-06 12:22:54 UTC +--- setup.py.in.orig 2018-06-05 06:06:54 UTC +++ setup.py.in -@@ -26,9 +26,9 @@ import sys - from distutils.core import setup, Extension - from distutils import sysconfig +@@ -32,12 +32,12 @@ from distutils.cmd import Command + + __PACKAGE_VERSION__ = "0.2.0" + __LIBRARY_VERSION__ = "${CMS_FULL_VERSION}" +-os.environ["CC"] = "${CMAKE_C_COMPILER}" +-os.environ["CXX"] = "${CMAKE_CXX_COMPILER}" ++os.environ["CC"] = "cc" ++os.environ["CXX"] = "c++" -cconf = """${PY_C_CONFIG}""".split(" ") -ldconf = """${PY_LD_CONFIG}""".split(" ") @@ -13,26 +18,37 @@ def cleanup(dat): ret = [] -@@ -81,12 +81,12 @@ __version__ = '@PROJECT_VERSION@' +@@ -110,7 +110,7 @@ class TestCommand(Command): + tp.run() + + +-__version__ = '@PROJECT_VERSION@' ++__version__ = '5.6.1' - ext_kwds = dict( + # needed because Mac doesn't make use of runtime_library_dirs + extra_link_args = list(ldconf) +@@ -119,12 +119,12 @@ if platform.system() == 'Darwin': + + modules = dict( name = "pycryptosat", -- sources = ["${CMAKE_CURRENT_SOURCE_DIR}/pycryptosat.cpp"], -+ sources = ["pycryptosat.cpp"], - define_macros = [], +- sources = ["${CMAKE_CURRENT_SOURCE_DIR}/src/pycryptosat.cpp"], ++ sources = ["src/pycryptosat.cpp"], + define_macros = [('LIBRARY_VERSION', '"' + __LIBRARY_VERSION__ + '"')], - 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, + extra_link_args = extra_link_args, language = "c++", - library_dirs=['.', '${PROJECT_BINARY_DIR}/lib'], + library_dirs=['.', '/usr/local/lib'], + runtime_library_dirs=['${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}'], libraries = ['cryptominisat5'] ) - -@@ -111,5 +111,5 @@ setup( - ext_modules = [Extension(**ext_kwds)], - py_modules = ['pycryptosat'], - description = "bindings to CryptoMiniSat (a SAT solver)", +@@ -150,7 +150,7 @@ setup( + description = "Bindings to CryptoMiniSat {} (a SAT solver)".\ + format(__LIBRARY_VERSION__), + # py_modules = ['pycryptosat'], - long_description = open('${CMAKE_CURRENT_SOURCE_DIR}/README.rst').read(), + long_description = open('README.rst').read(), - ) + cmdclass={ + 'test': TestCommand + } \ No newline at end of file