<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4b6f4aec5be31006fff8dac2cd1b2aa5e15d96bd">https://github.com/macports/macports-ports/commit/4b6f4aec5be31006fff8dac2cd1b2aa5e15d96bd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4b6f4aec5be31006fff8dac2cd1b2aa5e15d96bd
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Jun 9 15:14:46 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-graph-tool: Whitespace, alignment fixes
</span>---
python/py-graph-tool/Portfile | 58 ++++++++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graph-tool/Portfile b/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 628cc5e2689..f4684528c0f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,16 +58,18 @@ if {${os.major} <= 12 && ${os.platform} eq "darwin"} {
</span> if {${name} ne ${subport}} {
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:cairomm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cgal5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/dot:graphviz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-scipy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-cairo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cairomm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cgal5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/dot:graphviz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-scipy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cairo
</span>
use_configure yes
# parallel build starts swapping with 8GB of RAM.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,11 +80,12 @@ if {${name} ne ${subport}} {
</span>
# PYTHON_EXTRA_LDFLAGS is set to work around incorrect detection of
# link flags by configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON=${python.bin} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_VERSION=${python.branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_CPPFLAGS=-I${python.include} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PYTHON_LDFLAGS=-L${python.libdir}/.. -lpython${python.branch}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PYTHON_EXTRA_LDFLAGS=-L${python.libdir}/.. -lpython${python.branch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=${python.bin} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_VERSION=${python.branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_CPPFLAGS=-I${python.include} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PYTHON_LDFLAGS=-L${python.libdir}/.. -lpython${python.branch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PYTHON_EXTRA_LDFLAGS=-L${python.libdir}/.. -lpython${python.branch}"
</span>
# https://trac.macports.org/ticket/61583#comment:8
macosx_deployment_target
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,11 +104,11 @@ if {${name} ne ${subport}} {
</span> configure.cppflags-append -I${prefix}/include -I${python.include}/..
configure.ldflags-append -L${prefix}/lib
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-boost=[boost::install_area] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --exec-prefix=${python.prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-expat=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-expat-inc=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-expat-lib="-L${prefix}/lib -lexpat"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-boost=[boost::install_area] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exec-prefix=${python.prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-expat=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-expat-inc=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-expat-lib="-L${prefix}/lib -lexpat"
</span>
# Clang uses the old libstc++ from gcc 4.2 before OS X 10.9. Boost doesn't
# include some of the tr1 headers in libstdc++ and defines its own tr1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,14 +120,17 @@ if {${name} ne ${subport}} {
</span> } else {
configure.args-append --disable-sparsehash
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir DESTDIR=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.cmd make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.destdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTDIR=${destroot}
</span>
variant gtk3 description "Enable interactive drawing with gtk3" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gtk3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:librsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librsvg
</span> }
post-destroot {
</pre><pre style='margin:0'>
</pre>