<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2baec441a4ca20c2688409072e4d538440005eb7">https://github.com/macports/macports-ports/commit/2baec441a4ca20c2688409072e4d538440005eb7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2baec441a4ca20c2688409072e4d538440005eb7
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jul 16 12:36:10 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-cvxopt: update version 1.1.8->1.1.9
</span>---
python/py-cvxopt/Portfile | 19 +++++++++---------
python/py-cvxopt/files/patch-setup.py.diff | 31 ++++++++++++------------------
2 files changed, 21 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cvxopt/Portfile b/python/py-cvxopt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59c5e6f..b946dde 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cvxopt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cvxopt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup github 1.0
</span> PortGroup linear_algebra 1.0
linalg.setup noveclibfort
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup cvxopt cvxopt 1.1.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup cvxopt cvxopt 1.1.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> name py-cvxopt
categories-append math
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,14 +28,13 @@ long_description CVXOPT is a free software package for convex \
</span> programming language.
homepage http://cvxopt.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0f527df6da0d9d940b337306a7ed7bb55cd63b30 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bdc67b65471486e09e51fc1811d102b89fb95041e5deec71f3a74b132d4941fe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bff5c419f73203fe35dc23a1be74f7d4c3aa7322 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5cbc2f3ab1573bace9fca6d39cddab86370828f0a50c84fdbd056269c6ec10ac
</span>
python.versions 27 33 34 35 36
if {${subport} ne ${name}} {
# ignore empty BLAS and LAPACK inputs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix typo
</span> patchfiles patch-setup.py.diff
build.env-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +53,8 @@ if {${subport} ne ${name}} {
</span> }
build.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CVXOPT_BLAS_LIB=[join ${blas_lib} ","] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CVXOPT_BLAS_EXTRA_LINK_ARGS=[join ${blas_extra_link_args} ","]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_BLAS_LIB=[join ${blas_lib} ";"] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_BLAS_EXTRA_LINK_ARGS=[join ${blas_extra_link_args} ";"]
</span> }
variant gsl description {Build GSL module} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,9 +96,9 @@ if {${subport} ne ${name}} {
</span> # link against MacPorts SuiteSparse
depends_lib-append port:SuiteSparse
build.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CVXOPT_SUITESPARSE_EXT_LIB=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CVXOPT_AMD_EXT_LIB=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CVXOPT_AMD_EXT_INC=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_SUITESPARSE_SRC_DIR="" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_SUITESPARSE_LIB_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_SUITESPARSE_INC_DIR=${prefix}/include
</span>
default_variants +gsl +glpk +fftw +dsdp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cvxopt/files/patch-setup.py.diff b/python/py-cvxopt/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5fa97d2..6c895da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cvxopt/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cvxopt/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2015-09-21 22:26:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2017-07-16 10:48:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,9 +70,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LAPACK_LIB = os.environ.get("CVXOPT_LAPACK_LIB",LAPACK_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2016-11-30 00:35:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2017-07-16 11:02:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,10 +81,10 @@
</span> BLAS_LIB_DIR = os.environ.get("CVXOPT_BLAS_LIB_DIR",BLAS_LIB_DIR)
BLAS_EXTRA_LINK_ARGS = os.environ.get("CVXOPT_BLAS_EXTRA_LINK_ARGS",BLAS_EXTRA_LINK_ARGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if type(BLAS_LIB) is str: BLAS_LIB = BLAS_LIB.strip().split(',')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if type(LAPACK_LIB) is str: LAPACK_LIB = LAPACK_LIB.strip().split(',')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if type(BLAS_EXTRA_LINK_ARGS) is str: BLAS_EXTRA_LINK_ARGS = BLAS_EXTRA_LINK_ARGS.strip().split(',')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if type(BLAS_LIB) is str: BLAS_LIB = list(filter(None,BLAS_LIB.strip().split(',')))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if type(LAPACK_LIB) is str: LAPACK_LIB = list(filter(None,LAPACK_LIB.strip().split(',')))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if type(BLAS_EXTRA_LINK_ARGS) is str: BLAS_EXTRA_LINK_ARGS = list(filter(None,BLAS_EXTRA_LINK_ARGS.strip().split(',')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DATA_FILES = os.environ.get("CVXOPT_DATA_FILES",[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if type(BLAS_LIB) is str: BLAS_LIB = BLAS_LIB.strip().split(';')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if type(LAPACK_LIB) is str: LAPACK_LIB = LAPACK_LIB.strip().split(';')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if type(BLAS_EXTRA_LINK_ARGS) is str: BLAS_EXTRA_LINK_ARGS = BLAS_EXTRA_LINK_ARGS.strip().split(';')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if type(DATA_FILES) is str: DATA_FILES = DATA_FILES.strip().split(';')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if type(BLAS_LIB) is str: BLAS_LIB = list(filter(None,BLAS_LIB.strip().split(';')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if type(LAPACK_LIB) is str: LAPACK_LIB = list(filter(None,LAPACK_LIB.strip().split(';')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if type(BLAS_EXTRA_LINK_ARGS) is str: BLAS_EXTRA_LINK_ARGS = list(filter(None,BLAS_EXTRA_LINK_ARGS.strip().split(';')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if type(DATA_FILES) is str: DATA_FILES = list(filter(None,DATA_FILES.strip().split(';')))
</span> BUILD_GSL = int(os.environ.get("CVXOPT_BUILD_GSL",BUILD_GSL))
GSL_LIB_DIR = os.environ.get("CVXOPT_GSL_LIB_DIR",GSL_LIB_DIR)
GSL_INC_DIR = os.environ.get("CVXOPT_GSL_INC_DIR",GSL_INC_DIR)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DSDP_INC_DIR = os.environ.get("CVXOPT_DSDP_INC_DIR",DSDP_INC_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUITESPARSE_EXT_LIB = os.environ.get("CVXOPT_SUITESPARSE_EXT_LIB",SUITESPARSE_EXT_LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUITESPARSE_LIB_DIR = os.environ.get("CVXOPT_AMD_EXT_LIB",SUITESPARSE_LIB_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUITESPARSE_INC_DIR = os.environ.get("CVXOPT_AMD_EXT_LIB",SUITESPARSE_INC_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SUITESPARSE_INC_DIR = os.environ.get("CVXOPT_AMD_EXT_INC",SUITESPARSE_INC_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extmods = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>