svn commit: r421212 - in head/math: cryptominisat cryptominisat/files py-cryptominisat py-cryptominisat/files
Carlos J. Puga Medina
cpm at FreeBSD.org
Thu Sep 1 13:25:51 UTC 2016
Author: cpm
Date: Thu Sep 1 13:25:49 2016
New Revision: 421212
URL: https://svnweb.freebsd.org/changeset/ports/421212
Log:
- Update math/cryptominisat and math/py-cryptominisat to 5.0.0
PR: 211460
Submitted by: maintainer
Reviewed by: koobs, feld (mentor)
Approved by: feld (mentor)
Deleted:
head/math/cryptominisat/files/
Modified:
head/math/cryptominisat/Makefile
head/math/cryptominisat/distinfo
head/math/cryptominisat/pkg-descr
head/math/cryptominisat/pkg-plist
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 Thu Sep 1 13:20:13 2016 (r421211)
+++ head/math/cryptominisat/Makefile Thu Sep 1 13:25:49 2016 (r421212)
@@ -1,14 +1,14 @@
# $FreeBSD$
PORTNAME= cryptominisat
-PORTVERSION= 4.5.3
+PORTVERSION= 5.0.0
CATEGORIES= math
MAINTAINER= 6yearold at gmail.com
COMMENT= General-purpose award-winning SAT solver
LICENSE= LGPL3
-LICENSE_FILE= ${WRKSRC}/LICENSE-LGPL
+LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= xxd:editors/vim-lite # for xxd tool
LIB_DEPENDS= libboost_program_options.so:devel/boost-libs
@@ -19,6 +19,6 @@ GH_ACCOUNT= msoos
USES= cmake compiler:c++11-lib
USE_LDCONFIG= yes
-CMAKE_ARGS= -DNOMYSQL=1 -DNOM4RI=1 -DPYTHON_EXECUTABLE=0
+CMAKE_ARGS= -DNOM4RI=1 -DENABLE_PYTHON_INTERFACE=OFF
.include <bsd.port.mk>
Modified: head/math/cryptominisat/distinfo
==============================================================================
--- head/math/cryptominisat/distinfo Thu Sep 1 13:20:13 2016 (r421211)
+++ head/math/cryptominisat/distinfo Thu Sep 1 13:25:49 2016 (r421212)
@@ -1,2 +1,3 @@
-SHA256 (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 114da20e25734dc368dada47afd8cb7d44717f2159ad66d5bac742062fa3eb4c
-SIZE (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 467221
+TIMESTAMP = 1469882294
+SHA256 (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 4c000daf9886e7c55f05b00247688ed0341a19cda13de49e2f35f40e95cc9910
+SIZE (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 596712
Modified: head/math/cryptominisat/pkg-descr
==============================================================================
--- head/math/cryptominisat/pkg-descr Thu Sep 1 13:20:13 2016 (r421211)
+++ head/math/cryptominisat/pkg-descr Thu Sep 1 13:25:49 2016 (r421212)
@@ -3,4 +3,4 @@ solver, featuring over 100 configurable
need, collection of statistical data to MySQL database + javascript-based
visualization of it and clean C++ and python interfaces.
-WWW: http://www.msoos.org/cryptominisat4/
+WWW: https://github.com/msoos/cryptominisat/
Modified: head/math/cryptominisat/pkg-plist
==============================================================================
--- head/math/cryptominisat/pkg-plist Thu Sep 1 13:20:13 2016 (r421211)
+++ head/math/cryptominisat/pkg-plist Thu Sep 1 13:25:49 2016 (r421212)
@@ -1,10 +1,9 @@
-bin/cryptominisat4
-bin/cryptominisat4_simple
-include/cryptominisat4/cryptominisat.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.4.5
+bin/cryptominisat5
+bin/cryptominisat5_simple
+include/cryptominisat5/cryptominisat.h
+include/cryptominisat5/solvertypesmini.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
Modified: head/math/py-cryptominisat/Makefile
==============================================================================
--- head/math/py-cryptominisat/Makefile Thu Sep 1 13:20:13 2016 (r421211)
+++ head/math/py-cryptominisat/Makefile Thu Sep 1 13:25:49 2016 (r421212)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cryptominisat
-PORTVERSION= 4.5.3
+PORTVERSION= 5.0.0
CATEGORIES= math python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ COMMENT= Bindings to CryptoMiniSat (a SA
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libcryptominisat4.so:math/cryptominisat
+LIB_DEPENDS= libcryptominisat5.so:math/cryptominisat
USES= compiler:c++11-lang python:-2.7
USE_PYTHON= autoplist distutils
@@ -24,6 +24,7 @@ WRKSRC_SUBDIR= python
PYDISTUTILS_BUILDTARGET= build_ext --include-dirs=${LOCALBASE}/include
post-patch:
+ ${REINPLACE_CMD} -e 's|@PROJECT_VERSION@|${PORTVERSION}|' ${WRKSRC}/setup.py.in
${CP} ${WRKSRC}/setup.py.in ${WRKSRC}/setup.py
post-install:
Modified: head/math/py-cryptominisat/distinfo
==============================================================================
--- head/math/py-cryptominisat/distinfo Thu Sep 1 13:20:13 2016 (r421211)
+++ head/math/py-cryptominisat/distinfo Thu Sep 1 13:25:49 2016 (r421212)
@@ -1,2 +1,3 @@
-SHA256 (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 114da20e25734dc368dada47afd8cb7d44717f2159ad66d5bac742062fa3eb4c
-SIZE (msoos-cryptominisat-4.5.3_GH0.tar.gz) = 467221
+TIMESTAMP = 1469896511
+SHA256 (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 4c000daf9886e7c55f05b00247688ed0341a19cda13de49e2f35f40e95cc9910
+SIZE (msoos-cryptominisat-5.0.0_GH0.tar.gz) = 596712
Modified: head/math/py-cryptominisat/files/patch-setup.py.in
==============================================================================
--- head/math/py-cryptominisat/files/patch-setup.py.in Thu Sep 1 13:20:13 2016 (r421211)
+++ head/math/py-cryptominisat/files/patch-setup.py.in Thu Sep 1 13:25:49 2016 (r421212)
@@ -1,28 +1,37 @@
---- setup.py.in.orig 2015-08-26 23:32:30 UTC
+--- setup.py.in.orig 2016-07-06 12:22:54 UTC
+++ setup.py.in
-@@ -51,15 +51,15 @@ def _init_posix(init):
- return wrapper
- sysconfig._init_posix = _init_posix(sysconfig._init_posix)
+@@ -26,9 +26,9 @@ import sys
+ from distutils.core import setup, Extension
+ from distutils import sysconfig
--__version__ = '@PROJECT_VERSION@'
-+__version__ = '4.5.3'
+-cconf = """${PY_C_CONFIG}""".split(" ")
+-ldconf = """${PY_LD_CONFIG}""".split(" ")
+-is_apple = """${APPLE}"""
++cconf = """""".split(" ")
++ldconf = """""".split(" ")
++is_apple = """"""
+
+ def cleanup(dat):
+ ret = []
+@@ -81,12 +81,12 @@ __version__ = '@PROJECT_VERSION@'
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'],
+- 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,
language = "c++",
-- library_dirs=['.', '/usr/local/lib', '${PROJECT_BINARY_DIR}/lib'],
+- library_dirs=['.', '${PROJECT_BINARY_DIR}/lib'],
+ library_dirs=['.', '/usr/local/lib'],
- libraries = ['cryptominisat4']
+ libraries = ['cryptominisat5']
)
-@@ -84,5 +84,5 @@ setup(
+@@ -111,5 +111,5 @@ setup(
ext_modules = [Extension(**ext_kwds)],
- py_modules = ['test_pycryptosat'],
+ py_modules = ['pycryptosat'],
description = "bindings to CryptoMiniSat (a SAT solver)",
- long_description = open('${CMAKE_CURRENT_SOURCE_DIR}/README.rst').read(),
+ long_description = open('README.rst').read(),
More information about the svn-ports-all
mailing list