From owner-svn-ports-all@freebsd.org Sat Feb 23 16:31:49 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8304C151BEE1; Sat, 23 Feb 2019 16:31:49 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 26B1F923BF; Sat, 23 Feb 2019 16:31:49 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C9421FD58; Sat, 23 Feb 2019 16:31:49 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1NGVmMX037605; Sat, 23 Feb 2019 16:31:48 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1NGVlKK037600; Sat, 23 Feb 2019 16:31:47 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <201902231631.x1NGVlKK037600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Sat, 23 Feb 2019 16:31:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493704 - in head/math: cryptominisat cryptominisat/files py-cryptominisat py-cryptominisat/files X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: in head/math: cryptominisat cryptominisat/files py-cryptominisat py-cryptominisat/files X-SVN-Commit-Revision: 493704 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 26B1F923BF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2019 16:31:49 -0000 Author: arrowd Date: Sat Feb 23 16:31:47 2019 New Revision: 493704 URL: https://svnweb.freebsd.org/changeset/ports/493704 Log: math/cryptominisat and math/py-cryptominisat to 5.6.8. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D19302 Deleted: head/math/cryptominisat/files/ Modified: head/math/cryptominisat/Makefile head/math/cryptominisat/distinfo head/math/py-cryptominisat/Makefile head/math/py-cryptominisat/distinfo head/math/py-cryptominisat/files/patch-setup.py.in Modified: head/math/cryptominisat/Makefile ============================================================================== --- head/math/cryptominisat/Makefile Sat Feb 23 16:30:41 2019 (r493703) +++ head/math/cryptominisat/Makefile Sat Feb 23 16:31:47 2019 (r493704) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cryptominisat -DISTVERSION= 5.6.3 -PORTREVISION= 3 +DISTVERSION= 5.6.8 CATEGORIES= math MAINTAINER= arrowd@FreeBSD.org Modified: head/math/cryptominisat/distinfo ============================================================================== --- head/math/cryptominisat/distinfo Sat Feb 23 16:30:41 2019 (r493703) +++ head/math/cryptominisat/distinfo Sat Feb 23 16:31:47 2019 (r493704) @@ -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 Modified: head/math/py-cryptominisat/Makefile ============================================================================== --- head/math/py-cryptominisat/Makefile Sat Feb 23 16:30:41 2019 (r493703) +++ head/math/py-cryptominisat/Makefile Sat Feb 23 16:31:47 2019 (r493704) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cryptominisat -DISTVERSION= 5.6.3 -PORTREVISION= 1 +DISTVERSION= 5.6.8 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -32,8 +31,10 @@ post-patch: -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 Modified: head/math/py-cryptominisat/distinfo ============================================================================== --- head/math/py-cryptominisat/distinfo Sat Feb 23 16:30:41 2019 (r493703) +++ head/math/py-cryptominisat/distinfo Sat Feb 23 16:31:47 2019 (r493704) @@ -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 Modified: head/math/py-cryptominisat/files/patch-setup.py.in ============================================================================== --- head/math/py-cryptominisat/files/patch-setup.py.in Sat Feb 23 16:30:41 2019 (r493703) +++ head/math/py-cryptominisat/files/patch-setup.py.in Sat Feb 23 16:31:47 2019 (r493704) @@ -1,22 +1,22 @@ ---- 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'],