Index: head/math/cryptominisat/files/patch-CMakeLists.txt =================================================================== --- head/math/cryptominisat/files/patch-CMakeLists.txt (revision 493703) +++ head/math/cryptominisat/files/patch-CMakeLists.txt (nonexistent) @@ -1,17 +0,0 @@ -The `-mtune=native` flag is not supported on aarch64, remove it. - ---- CMakeLists.txt.orig 2018-07-11 20:29:53 UTC -+++ CMakeLists.txt -@@ -182,11 +182,11 @@ if (NOT MSVC) - add_compile_options( -pthread ) - - add_compile_options("$<$:-O2>") -- add_compile_options("$<$:-mtune=native>") -+ #add_compile_options("$<$:-mtune=native>") - - add_compile_options("$<$:-O2>") - add_compile_options("$<$:-g0>") -- add_compile_options("$<$:-mtune=native>") -+ #add_compile_options("$<$:-mtune=native>") - - add_compile_options("$<$:-O0>") Property changes on: head/math/cryptominisat/files/patch-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: head/math/cryptominisat/Makefile =================================================================== --- head/math/cryptominisat/Makefile (revision 493703) +++ head/math/cryptominisat/Makefile (revision 493704) @@ -1,27 +1,26 @@ # $FreeBSD$ PORTNAME= cryptominisat -DISTVERSION= 5.6.3 -PORTREVISION= 3 +DISTVERSION= 5.6.8 CATEGORIES= math MAINTAINER= arrowd@FreeBSD.org COMMENT= General-purpose award-winning SAT solver LICENSE= MIT LGPL21 LICENSE_COMB= multi LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSE.txt LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libboost_program_options.so:devel/boost-libs USES= cmake compiler:c++11-lib USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= msoos CMAKE_ON= NOM4RI CMAKE_OFF= ENABLE_PYTHON_INTERFACE .include Index: head/math/cryptominisat/distinfo =================================================================== --- head/math/cryptominisat/distinfo (revision 493703) +++ head/math/cryptominisat/distinfo (revision 493704) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533812522 -SHA256 (msoos-cryptominisat-5.6.3_GH0.tar.gz) = c2fb4912cc8d8f3135af94581f11f30fd82347ee15ad8fb905e12a499e6fa87f -SIZE (msoos-cryptominisat-5.6.3_GH0.tar.gz) = 683713 +TIMESTAMP = 1550904410 +SHA256 (msoos-cryptominisat-5.6.8_GH0.tar.gz) = 38add382c2257b702bdd4f1edf73544f29efc6e050516b6cacd2d81e35744b55 +SIZE (msoos-cryptominisat-5.6.8_GH0.tar.gz) = 701037 Index: head/math/py-cryptominisat/Makefile =================================================================== --- head/math/py-cryptominisat/Makefile (revision 493703) +++ head/math/py-cryptominisat/Makefile (revision 493704) @@ -1,41 +1,42 @@ # $FreeBSD$ PORTNAME= cryptominisat -DISTVERSION= 5.6.3 -PORTREVISION= 1 +DISTVERSION= 5.6.8 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= arrowd@FreeBSD.org COMMENT= Bindings to CryptoMiniSat (a SAT solver) LICENSE= MIT LGPL21 LICENSE_COMB= multi LICENSE_FILE_LGPL21= ${WRKSRC}/../LICENSE.txt LICENSE_FILE_MIT= ${WRKSRC}/../LICENSE.txt LIB_DEPENDS= libcryptominisat5.so:math/cryptominisat USES= compiler:c++11-lib python USE_PYTHON= autoplist distutils USE_GITHUB= yes GH_ACCOUNT= msoos WRKSRC_SUBDIR= python PYDISTUTILS_BUILDTARGET= build_ext --include-dirs=${LOCALBASE}/include post-patch: ${REINPLACE_CMD} -e 's|@PROJECT_VERSION@|${PORTVERSION}|' \ -e 's|$${CMAKE_C_COMPILER}|${CC}|' \ -e 's|$${CMAKE_CXX_COMPILER}|${CXX}|' \ -e 's|$${PY_C_CONFIG}||' \ -e 's|$${PY_LD_CONFIG}||' \ + -e 's|$${CMS_FULL_VERSION}|${PORTVERSION}|' \ -e 's|$${APPLE}||' ${WRKSRC}/setup.py.in ${CP} ${WRKSRC}/setup.py.in ${WRKSRC}/setup.py + ${CP} ${WRKSRC}/src/pycryptosat.cpp.in ${WRKSRC}/src/pycryptosat.cpp post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pycryptosat.so .include Index: head/math/py-cryptominisat/distinfo =================================================================== --- head/math/py-cryptominisat/distinfo (revision 493703) +++ head/math/py-cryptominisat/distinfo (revision 493704) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533812572 -SHA256 (msoos-cryptominisat-5.6.3_GH0.tar.gz) = c2fb4912cc8d8f3135af94581f11f30fd82347ee15ad8fb905e12a499e6fa87f -SIZE (msoos-cryptominisat-5.6.3_GH0.tar.gz) = 683713 +TIMESTAMP = 1550905881 +SHA256 (msoos-cryptominisat-5.6.8_GH0.tar.gz) = 38add382c2257b702bdd4f1edf73544f29efc6e050516b6cacd2d81e35744b55 +SIZE (msoos-cryptominisat-5.6.8_GH0.tar.gz) = 701037 Index: head/math/py-cryptominisat/files/patch-setup.py.in =================================================================== --- head/math/py-cryptominisat/files/patch-setup.py.in (revision 493703) +++ head/math/py-cryptominisat/files/patch-setup.py.in (revision 493704) @@ -1,27 +1,27 @@ ---- setup.py.in.orig 2018-06-05 06:06:54 UTC +--- setup.py.in.orig 2019-02-19 20:49:20 UTC +++ setup.py.in -@@ -119,12 +119,12 @@ if platform.system() == 'Darwin': +@@ -118,12 +118,12 @@ else: modules = dict( name = "pycryptosat", -- sources = ["${CMAKE_CURRENT_SOURCE_DIR}/src/pycryptosat.cpp"], +- sources = ["${CMAKE_CURRENT_BINARY_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_compile_args = cconf + ['-I/usr/local/include', '-I../cmsat5-src', '-xc++'], extra_link_args = extra_link_args, language = "c++", -- library_dirs=['.', '${PROJECT_BINARY_DIR}/lib'], +- library_dirs=['.', '${PROJECT_BINARY_DIR}/lib', '${PROJECT_BINARY_DIR}/lib/${CMAKE_BUILD_TYPE}'], + library_dirs=['.', '/usr/local/lib'], runtime_library_dirs=['${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}'], - libraries = ['cryptominisat5'] + libraries = [libname] ) -@@ -150,7 +150,7 @@ setup( +@@ -152,7 +152,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 }